From 6c59bf8717eebe42f2b2bd9fd0da659506c35aa8 Mon Sep 17 00:00:00 2001
From: "Dustin C. Hatch" <github@dustinhatch.me>
Date: Fri, 12 Apr 2019 19:32:58 +0000
Subject: [PATCH] Android: Support autofill in Fennec F-Droid (#483)

The F-Droid build of Firefox (Fennec) has a different package name.
This name needs to be explicitly listed in order for autofill support to
work correctly.
---
 src/Android/Autofill/AutofillHelpers.cs       | 7 ++++---
 src/Android/AutofillService.cs                | 1 +
 src/Android/Resources/xml/autofillservice.xml | 3 +++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Android/Autofill/AutofillHelpers.cs b/src/Android/Autofill/AutofillHelpers.cs
index e7a0a388c..f441f8a3b 100644
--- a/src/Android/Autofill/AutofillHelpers.cs
+++ b/src/Android/Autofill/AutofillHelpers.cs
@@ -32,8 +32,9 @@ namespace Bit.Android.Autofill
             "com.google.android.apps.chrome","com.google.android.apps.chrome_dev","com.yandex.browser",
             "com.sec.android.app.sbrowser","com.sec.android.app.sbrowser.beta","org.codeaurora.swe.browser",
             "com.amazon.cloud9","mark.via.gp","org.bromite.bromite","org.chromium.chrome","com.kiwibrowser.browser",
-            "com.ecosia.android","com.opera.mini.native.beta","org.mozilla.fennec_aurora","com.qwant.liberty",
-            "com.opera.touch","org.mozilla.fenix","org.mozilla.reference.browser","org.mozilla.rocket"
+            "com.ecosia.android","com.opera.mini.native.beta","org.mozilla.fennec_aurora","org.mozilla.fennec_fdroid",
+	    "com.qwant.liberty", "com.opera.touch","org.mozilla.fenix","org.mozilla.reference.browser",
+	    "org.mozilla.rocket"
         };
 
         // The URLs are blacklisted from autofilling
@@ -180,4 +181,4 @@ namespace Bit.Android.Autofill
             responseBuilder.SetSaveInfo(saveBuilder.Build());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Android/AutofillService.cs b/src/Android/AutofillService.cs
index 019470343..1a2bc46c4 100644
--- a/src/Android/AutofillService.cs
+++ b/src/Android/AutofillService.cs
@@ -49,6 +49,7 @@ namespace Bit.Android
             new Browser("org.mozilla.firefox", "url_bar_title"),
             new Browser("org.mozilla.firefox_beta", "url_bar_title"),
             new Browser("org.mozilla.fennec_aurora", "url_bar_title"),
+            new Browser("org.mozilla.fennec_fdroid", "url_bar_title"),
             new Browser("org.mozilla.focus", "display_url"),
             new Browser("org.mozilla.klar", "display_url"),
             new Browser("org.mozilla.fenix", "mozac_browser_toolbar_url_view"),
diff --git a/src/Android/Resources/xml/autofillservice.xml b/src/Android/Resources/xml/autofillservice.xml
index ad262b50a..a857d6231 100644
--- a/src/Android/Resources/xml/autofillservice.xml
+++ b/src/Android/Resources/xml/autofillservice.xml
@@ -36,6 +36,9 @@
   <compatibility-package
     android:name="org.mozilla.fennec_aurora"
     android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="org.mozilla.fennec_fdroid"
+    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="org.mozilla.firefox"
     android:maxLongVersionCode="10000000000"/>