diff --git a/briar-android/res/layout/invitation_bluetooth_start.xml b/briar-android/res/layout/invitation_bluetooth_start.xml index 63bf3ea6d549a7763ffd340b746aa3c6bd89223c..9198f7537fba193244d028c2c5c68d7e0f5e6f3d 100644 --- a/briar-android/res/layout/invitation_bluetooth_start.xml +++ b/briar-android/res/layout/invitation_bluetooth_start.xml @@ -39,14 +39,6 @@ android:spinnerMode="dropdown" android:layout_marginTop="@dimen/margin_medium"/> - <TextView - android:id="@+id/faceToFaceView" - style="@style/BriarTextBody" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/face_to_face" - android:layout_marginTop="@dimen/margin_medium"/> - <ImageView android:layout_width="match_parent" android:layout_height="wrap_content" @@ -57,11 +49,11 @@ android:layout_marginTop="@dimen/margin_medium"/> <TextView - android:id="@+id/explanationView" + android:id="@+id/faceToFaceView" style="@style/BriarTextBody" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/bluetooth_explanation" + android:text="@string/face_to_face" android:layout_marginTop="@dimen/margin_medium"/> <Button diff --git a/briar-android/res/values/strings.xml b/briar-android/res/values/strings.xml index 8a6c06144b649b1ad3c1dc91aaffb0f00b0904e3..1df0b4897ad53800926576f5c861e6c86ecbc1f1 100644 --- a/briar-android/res/values/strings.xml +++ b/briar-android/res/values/strings.xml @@ -37,8 +37,7 @@ <string name="no_contacts">No contacts</string> <string name="add_contact_title">Add a Contact</string> <string name="your_nickname">Please select the identity you want to use:</string> - <string name="face_to_face">For security reasons you must be face-to-face with the person you want to add as a contact.\n\nThis will prevent anyone from impersonating you or reading your messages in future.</string> - <string name="bluetooth_explanation">Contacts need to add each other at the same time. Please continue together and allow Bluetooth to be enabled for the process to work.</string> + <string name="face_to_face">You must be face-to-face with the person you want to add as a contact. This will prevent anyone from impersonating you or reading your messages in future.</string> <string name="continue_button">Continue</string> <string name="your_invitation_code">Your invitation code is</string> <string name="enter_invitation_code">Please enter your contact\'s invitation code:</string>