From 41997d5fe0c9556d30cc6e18f1436e226726dbc7 Mon Sep 17 00:00:00 2001
From: Matt Portune <59324545+mportune-bw@users.noreply.github.com>
Date: Wed, 15 Apr 2020 13:58:00 -0400
Subject: [PATCH] Resync autofill compatibility package list with values from
 AutofillHelpers (#834)

---
 src/Android/Autofill/AutofillHelpers.cs       | 35 ++++++++++---------
 src/Android/Resources/xml/autofillservice.xml | 16 +++++++++
 2 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/src/Android/Autofill/AutofillHelpers.cs b/src/Android/Autofill/AutofillHelpers.cs
index 52dec625a..ed169b65a 100644
--- a/src/Android/Autofill/AutofillHelpers.cs
+++ b/src/Android/Autofill/AutofillHelpers.cs
@@ -25,25 +25,34 @@ namespace Bit.Droid.Autofill
         };
 
         // These browsers work using the compatibility shim for the autofill framework
+        // Be sure to keep this in sync with values in Resources/xml/autofillservice.xml
         public static HashSet<string> CompatBrowsers = new HashSet<string>
         {
-            "org.mozilla.firefox",
-            "org.mozilla.firefox_beta",
-            "com.microsoft.emmx",
+            "com.android.browser",
             "com.android.chrome",
             "com.chrome.beta",
-            "com.android.browser",
-            "com.brave.browser",
+            "com.chrome.dev",
+            "com.chrome.canary",
+            "com.microsoft.emmx",
             "com.opera.browser",
             "com.opera.browser.beta",
             "com.opera.mini.native",
-            "com.chrome.dev",
-            "com.chrome.canary",
+            "com.opera.mini.native.beta",
+            "com.opera.touch",
+            "com.sec.android.app.sbrowser",
+            "com.sec.android.app.sbrowser.beta",
+            "org.mozilla.fennec_aurora",
+            "org.mozilla.fennec_fdroid",
+            "org.mozilla.firefox",
+            "org.mozilla.firefox_beta",
+            "org.mozilla.fenix",
+            "org.mozilla.fenix.nightly",
+            "org.mozilla.reference.browser",
+            "org.mozilla.rocket",
+            "com.brave.browser",
             "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",
@@ -51,15 +60,7 @@ namespace Bit.Droid.Autofill
             "org.chromium.chrome",
             "com.kiwibrowser.browser",
             "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.fenix.nightly",
-            "org.mozilla.reference.browser",
-            "org.mozilla.rocket",
             "org.torproject.torbrowser",
             "com.vivaldi.browser",
             "com.vivaldi.browser.snapshot",
diff --git a/src/Android/Resources/xml/autofillservice.xml b/src/Android/Resources/xml/autofillservice.xml
index 153296f1b..a71403f28 100644
--- a/src/Android/Resources/xml/autofillservice.xml
+++ b/src/Android/Resources/xml/autofillservice.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!-- Be sure to keep this in sync with values in AutofillHelpers.CompatBrowsers -->
 <autofill-service xmlns:android="http://schemas.android.com/apk/res/android">
+  <compatibility-package
+    android:name="com.android.browser"
+    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="com.android.chrome"
     android:maxLongVersionCode="10000000000"/>
@@ -27,6 +31,9 @@
   <compatibility-package
     android:name="com.opera.mini.native.beta"
     android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="com.opera.touch"
+    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="com.sec.android.app.sbrowser"
     android:maxLongVersionCode="10000000000"/>
@@ -90,7 +97,16 @@
   <compatibility-package
     android:name="com.ecosia.android"
     android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="com.qwant.liberty"
+    android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="org.torproject.torbrowser"
+    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="com.vivaldi.browser"
     android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="com.vivaldi.browser.snapshot"
+    android:maxLongVersionCode="10000000000"/>
 </autofill-service>