From 7e3c985c54bb94c81491de93d7f347a1f88558ec Mon Sep 17 00:00:00 2001
From: Wiktor Kwapisiewicz <wiktor@metacode.biz>
Date: Wed, 23 May 2018 15:02:10 +0200
Subject: [PATCH] Add intent filter for handling WKD link in Firefox

Firefox for Android requires `mimeType` condition on the intent filter.
Built-in browsers (e.g. Chrome) need an intent filter that will *not* have
`mimeType` conditions.

Using two common MIME types: `application/octet-stream` is mentioned in
the I-D and `application/pgp-keys` is a common type for keys used in the
wild.
---
 OpenKeychain/src/main/AndroidManifest.xml | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 257fbcf78..b6ab4338d 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -719,7 +719,7 @@
                 <data android:pathPattern="/..*/publickey/download" />
             </intent-filter>
 
-            <!-- VIEW from Web Key Directory urls opened in a browser -->
+            <!-- VIEW from Web Key Directory urls opened in a browser/Chrome -->
             <intent-filter android:label="@string/intent_import_key">
                 <action android:name="android.intent.action.VIEW" />
 
@@ -732,6 +732,27 @@
                 <data android:host="*" />
 
                 <data android:pathPattern="/.well-known/openpgpkey/hu/.*" />
+
+                <!-- Chrome/Built-in browser will not be triggered if there is mimeType -->
+            </intent-filter>
+
+            <!-- VIEW from Web Key Directory urls opened in Firefox for Android -->
+            <intent-filter android:label="@string/intent_import_key">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:scheme="https" />
+
+                <!-- if we don't specify a host, pathPattern will be ignored-->
+                <data android:host="*" />
+
+                <data android:pathPattern="/.well-known/openpgpkey/hu/.*" />
+
+                <!-- Firefox for Android requires mimeType -->
+                <data android:mimeType="application/octet-stream" />
+                <data android:mimeType="application/pgp-keys" />
             </intent-filter>
 
             <!-- IMPORT_KEY with files TODO: does this work? -->