diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java index 42097e32a..9acde98b6 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java @@ -122,6 +122,9 @@ public class LinkExchangeFragment extends BaseFragment { .startChooser()); shareButton.setEnabled(true); + TextView infoText = v.findViewById(R.id.info_text); + infoText.setText(R.string.info_both_must_enter_links); + Button continueButton = v.findViewById(R.id.addButton); continueButton.setOnClickListener(view -> onContinueButtonClicked()); continueButton.setEnabled(true); diff --git a/briar-android/src/main/res/layout/fragment_link_exchange.xml b/briar-android/src/main/res/layout/fragment_link_exchange.xml index 4ebd1a64c..9b8bab8e6 100644 --- a/briar-android/src/main/res/layout/fragment_link_exchange.xml +++ b/briar-android/src/main/res/layout/fragment_link_exchange.xml @@ -30,8 +30,7 @@ app:layout_constraintBottom_toTopOf="@+id/stepOneText" app:layout_constraintEnd_toStartOf="@+id/guideline" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintVertical_bias="0.0" /> + app:layout_constraintTop_toTopOf="parent" /> @@ -226,8 +223,18 @@ app:layout_constraintHorizontal_bias="1.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/linkInputLayout" + app:layout_constraintBottom_toTopOf="@+id/infoView" app:layout_constraintVertical_bias="0.0" /> + + diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml index 83a90004c..dcb578ad2 100644 --- a/briar-android/src/main/res/values/strings.xml +++ b/briar-android/src/main/res/values/strings.xml @@ -318,6 +318,7 @@ Different Person %1$s and %2$s sent you the same link.\n\nOne of them may be trying to discover who your contacts are.\n\nDon\'t tell them you received the same link from someone else. Pending contact updated + You must both add each other\'s links