From d17331b578280d546f2d0903f23778d8449b8253 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Fri, 3 May 2019 10:18:47 -0300 Subject: [PATCH] [android] Set handshake link when received via sharing intent or link click --- .../android/contact/add/remote/AddContactViewModel.java | 5 +++++ .../android/contact/add/remote/LinkExchangeFragment.java | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactViewModel.java index bc58fabfc..19e566101 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactViewModel.java @@ -68,6 +68,11 @@ public class AddContactViewModel extends AndroidViewModel { return handshakeLink; } + @Nullable + String getRemoteHandshakeLink() { + return remoteHandshakeLink; + } + void setRemoteHandshakeLink(String link) { remoteHandshakeLink = link; } 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 bca1876e4..60450c1f5 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 @@ -72,6 +72,10 @@ public class LinkExchangeFragment extends BaseFragment { linkInputLayout = v.findViewById(R.id.linkInputLayout); linkInput = v.findViewById(R.id.linkInput); + if (viewModel.getRemoteHandshakeLink() != null) { + // This can happen if the link was set via an incoming Intent + linkInput.setText(viewModel.getRemoteHandshakeLink()); + } clipboard = (ClipboardManager) requireNonNull( getContext().getSystemService(CLIPBOARD_SERVICE));