From b9bd752f24714bcd5aa838f1046c83f38927dc5e Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Wed, 26 Sep 2018 11:40:09 +0100
Subject: [PATCH] Try to make links clickable.

---
 briar-android/src/main/AndroidManifest.xml    |  3 +++
 .../contact/ContactLinkInputActivity.java     | 23 ++++++++++++-------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/briar-android/src/main/AndroidManifest.xml b/briar-android/src/main/AndroidManifest.xml
index a872e7c4d..e172bfc98 100644
--- a/briar-android/src/main/AndroidManifest.xml
+++ b/briar-android/src/main/AndroidManifest.xml
@@ -425,6 +425,9 @@
 			android:label="@string/open_link_title"
 			android:windowSoftInputMode="stateHidden|adjustResize">
 			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
 				<data android:scheme="briar"/>
 			</intent-filter>
 			<intent-filter>
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactLinkInputActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactLinkInputActivity.java
index 7533f7cd6..bc05e51a3 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactLinkInputActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactLinkInputActivity.java
@@ -30,6 +30,7 @@ import javax.inject.Inject;
 import static android.app.AlarmManager.ELAPSED_REALTIME;
 import static android.content.ClipDescription.MIMETYPE_TEXT_PLAIN;
 import static android.content.Intent.ACTION_SEND;
+import static android.content.Intent.ACTION_VIEW;
 import static android.content.Intent.EXTRA_TEXT;
 import static android.os.SystemClock.elapsedRealtime;
 import static java.util.Objects.requireNonNull;
@@ -82,13 +83,18 @@ public class ContactLinkInputActivity extends BriarActivity
 		addButton.setOnClickListener(v -> onAddButtonClicked());
 
 		Intent i = getIntent();
-		if (i != null && ACTION_SEND.equals(i.getAction())) {
-			String text = i.getStringExtra(EXTRA_TEXT);
-			if (text != null) linkInput.setText(text);
-		} else if (i != null && "addContact".equals(i.getAction())) {
-			removeFakeRequest(i.getStringExtra("name"),
-					i.getLongExtra("timestamp", 0));
-			finish();
+		if (i != null) {
+			String action = i.getAction();
+			if (ACTION_SEND.equals(action) || ACTION_VIEW.equals(action)) {
+				String text = i.getStringExtra(EXTRA_TEXT);
+				if (text != null) linkInput.setText(text);
+				String uri = i.getDataString();
+				if (uri != null) linkInput.setText(uri);
+			} else if ("addContact".equals(action)) {
+				removeFakeRequest(i.getStringExtra("name"),
+						i.getLongExtra("timestamp", 0));
+				finish();
+			}
 		}
 	}
 
@@ -182,7 +188,8 @@ public class ContactLinkInputActivity extends BriarActivity
 		PendingIntent pendingIntent = PendingIntent.getActivity(this, 42, i, 0);
 		alarmManager.set(ELAPSED_REALTIME, triggerAt, pendingIntent);
 
-		Log.e("TEST", "Setting Alarm in " + MILLISECONDS.toSeconds(fromNow) + " seconds");
+		Log.e("TEST", "Setting Alarm in " + MILLISECONDS.toSeconds(fromNow) +
+				" seconds");
 		Log.e("TEST", "with contact: " + name);
 	}