From 7d4fffa8b6a1e50b4b9f9617c7418e9af3fb108e Mon Sep 17 00:00:00 2001
From: Contribucious <4764956+contribucious@users.noreply.github.com>
Date: Mon, 4 May 2020 15:25:53 +0200
Subject: [PATCH] Adblock Browser: support for v2+ (stable/beta) + Autofill
 Framework (#868)

* Adblock Browser (AccessibilityHelpers.SupportedBrowsers): add support for v2+ (stable/beta)

Support for older versions (based on Firefox for Android, instead of Chromium) in the list remains.

* Adblock Browser (AutofillHelpers.CompatBrowsers): add it to the list

* Adblock Browser (autofillservice.xml): add it to the list
---
 src/Android/Accessibility/AccessibilityHelpers.cs | 3 ++-
 src/Android/Autofill/AutofillHelpers.cs           | 2 ++
 src/Android/Resources/xml/autofillservice.xml     | 6 ++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Android/Accessibility/AccessibilityHelpers.cs b/src/Android/Accessibility/AccessibilityHelpers.cs
index 3066e7078..ccb413c9d 100644
--- a/src/Android/Accessibility/AccessibilityHelpers.cs
+++ b/src/Android/Accessibility/AccessibilityHelpers.cs
@@ -73,7 +73,8 @@ namespace Bit.Droid.Accessibility
             new Browser("jp.co.fenrir.android.sleipnir_test", "url_text"),
             new Browser("mark.via.gp", "aw"),
             new Browser("mobi.mgeek.TunnyBrowser", "title"),
-            new Browser("org.adblockplus.browser", "url_bar_title"),
+            new Browser("org.adblockplus.browser", "url_bar,url_bar_title"),
+            new Browser("org.adblockplus.browser.beta", "url_bar,url_bar_title"),
             new Browser("org.bromite.bromite", "url_bar"),
             new Browser("org.chromium.chrome", "url_bar"),
             new Browser("org.codeaurora.swe.browser", "url_bar"),
diff --git a/src/Android/Autofill/AutofillHelpers.cs b/src/Android/Autofill/AutofillHelpers.cs
index 68c341715..251905cff 100644
--- a/src/Android/Autofill/AutofillHelpers.cs
+++ b/src/Android/Autofill/AutofillHelpers.cs
@@ -61,6 +61,8 @@ namespace Bit.Droid.Autofill
             "com.vivaldi.browser.sopranos",
             "com.yandex.browser",
             "mark.via.gp",
+            "org.adblockplus.browser",
+            "org.adblockplus.browser.beta",
             "org.bromite.bromite",
             "org.chromium.chrome",
             "org.codeaurora.swe.browser",
diff --git a/src/Android/Resources/xml/autofillservice.xml b/src/Android/Resources/xml/autofillservice.xml
index 4be892aab..7bfc2b166 100644
--- a/src/Android/Resources/xml/autofillservice.xml
+++ b/src/Android/Resources/xml/autofillservice.xml
@@ -95,6 +95,12 @@
   <compatibility-package
     android:name="mark.via.gp"
     android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="org.adblockplus.browser"
+    android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="org.adblockplus.browser.beta"
+    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="org.bromite.bromite"
     android:maxLongVersionCode="10000000000"/>