Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 14:19:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '2397-wrong-type-of-qr-code' into 'master'

Browse Source 
Show appropriate error message if user scans wrong kind of QR code

Closes #2397

See merge request briar/briar!1748
This commit is contained in:
akwizgran
2022-12-19 15:43:16 +00:00
parent ec84ddb38b ab8734e373
commit c6e9554026
37 changed files with 620 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/src/main/res/layout/fragment_error_contact_exchange.xml
View File

@@ -51,12 +51,12 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_xlarge"
android:text="@string/add_contact_error_two_way"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
app:layout_constraintBottom_toTopOf="@+id/sendFeedback"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/errorTitle"
tools:text="error explanation" />
app:layout_constraintTop_toBottomOf="@+id/errorTitle" />
<TextView
android:id="@+id/sendFeedback"