From 97aa9744433d6e5fe0373e60125c7a672fa43cd4 Mon Sep 17 00:00:00 2001
From: stevenlele <15964380+stevenlele@users.noreply.github.com>
Date: Wed, 21 Oct 2020 21:10:31 +0800
Subject: [PATCH] Update support for several browsers and HTML viewer (#1121)

* Update accessibility support for Via browser

* Add Via browser (CN) & HTML viewer to AutofillHelpers

* Add Via browser (CN) & HTML viewer to autofillservice

* Add browsers to AccessibilityHelpers

* Add browsers to AutofillHelpers

* Add browsers to autofillservice
---
 .../Accessibility/AccessibilityHelpers.cs     |  6 +++++-
 src/Android/Autofill/AutofillHelpers.cs       |  5 +++++
 src/Android/Resources/xml/autofillservice.xml | 21 ++++++++++++++++---
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/Android/Accessibility/AccessibilityHelpers.cs b/src/Android/Accessibility/AccessibilityHelpers.cs
index 5918f455d..3e2229155 100644
--- a/src/Android/Accessibility/AccessibilityHelpers.cs
+++ b/src/Android/Accessibility/AccessibilityHelpers.cs
@@ -50,6 +50,8 @@ namespace Bit.Droid.Accessibility
             new Browser("com.google.android.apps.chrome_dev", "url_bar"),
             new Browser("com.kiwibrowser.browser", "url_bar"),
             new Browser("com.microsoft.emmx", "url_bar"),
+            new Browser("com.mmbox.browser", "search_box"),
+            new Browser("com.mmbox.xbrowser", "search_box"),
             new Browser("com.naver.whale", "url_bar"),
             new Browser("com.opera.browser", "url_field"),
             new Browser("com.opera.browser.beta", "url_field"),
@@ -66,11 +68,13 @@ namespace Bit.Droid.Accessibility
             new Browser("com.vivaldi.browser.sopranos", "url_bar"),
             new Browser("com.yandex.browser", "bro_omnibar_address_title_text,bro_omnibox_collapsed_title",
                 (s) => s.Split(new char[]{' ', ' '}).FirstOrDefault()), // 0 = Regular Space, 1 = No-break space (00A0)
+            new Browser("com.z28j.feel", "g2"), // "g2" for version 0.9.8.4 (984)
             new Browser("idm.internet.download.manager", "search"),
             new Browser("idm.internet.download.manager.adm.lite", "search"),
             new Browser("idm.internet.download.manager.plus", "search"),
             new Browser("io.github.forkmaintainers.iceraven", "mozac_browser_toolbar_url_view"),
-            new Browser("mark.via.gp", "aw"),
+            new Browser("mark.via", "o"), // "o" for version 4.0.7 (20200929)
+            new Browser("mark.via.gp", "o"), // "o" for version 4.0.7 (20200929)
             new Browser("org.adblockplus.browser", "url_bar,url_bar_title"), // 2nd = Legacy (before v2)
             new Browser("org.adblockplus.browser.beta", "url_bar,url_bar_title"), // 2nd = Legacy (before v2)
             new Browser("org.bromite.bromite", "url_bar"),
diff --git a/src/Android/Autofill/AutofillHelpers.cs b/src/Android/Autofill/AutofillHelpers.cs
index 3fc7cca93..cb9008b4c 100644
--- a/src/Android/Autofill/AutofillHelpers.cs
+++ b/src/Android/Autofill/AutofillHelpers.cs
@@ -41,6 +41,7 @@ namespace Bit.Droid.Autofill
             "com.amazon.cloud9",
             "com.android.browser",
             "com.android.chrome",
+            "com.android.htmlviewer",
             "com.avast.android.secure.browser",
             "com.avg.android.secure.browser",
             "com.brave.browser",
@@ -56,6 +57,8 @@ namespace Bit.Droid.Autofill
             "com.google.android.apps.chrome_dev",
             "com.kiwibrowser.browser",
             "com.microsoft.emmx",
+            "com.mmbox.browser",
+            "com.mmbox.xbrowser",
             "com.naver.whale",
             "com.opera.browser",
             "com.opera.browser.beta",
@@ -71,10 +74,12 @@ namespace Bit.Droid.Autofill
             "com.vivaldi.browser.snapshot",
             "com.vivaldi.browser.sopranos",
             "com.yandex.browser",
+            "com.z28j.feel",
             "idm.internet.download.manager",
             "idm.internet.download.manager.adm.lite",
             "idm.internet.download.manager.plus",
             "io.github.forkmaintainers.iceraven",
+            "mark.via",
             "mark.via.gp",
             "org.adblockplus.browser",
             "org.adblockplus.browser.beta",
diff --git a/src/Android/Resources/xml/autofillservice.xml b/src/Android/Resources/xml/autofillservice.xml
index e0c8e2722..45ca538a7 100644
--- a/src/Android/Resources/xml/autofillservice.xml
+++ b/src/Android/Resources/xml/autofillservice.xml
@@ -19,6 +19,9 @@
   <compatibility-package
     android:name="com.android.chrome"
     android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="com.android.htmlviewer"
+    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="com.avast.android.secure.browser"
     android:maxLongVersionCode="10000000000"/>
@@ -64,6 +67,12 @@
   <compatibility-package
     android:name="com.microsoft.emmx"
     android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="com.mmbox.browser"
+    android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="com.mmbox.xbrowser"
+    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="com.naver.whale"
     android:maxLongVersionCode="10000000000"/>
@@ -109,18 +118,24 @@
   <compatibility-package
     android:name="com.yandex.browser"
     android:maxLongVersionCode="10000000000"/>
-    <compatibility-package
+  <compatibility-package
+    android:name="com.z28j.feel"
+    android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
     android:name="idm.internet.download.manager"
     android:maxLongVersionCode="10000000000"/>
-    <compatibility-package
+  <compatibility-package
     android:name="idm.internet.download.manager.adm.lite"
     android:maxLongVersionCode="10000000000"/>
-    <compatibility-package
+  <compatibility-package
     android:name="idm.internet.download.manager.plus"
     android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="io.github.forkmaintainers.iceraven"
     android:maxLongVersionCode="10000000000"/>
+  <compatibility-package
+    android:name="mark.via"
+    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="mark.via.gp"
     android:maxLongVersionCode="10000000000"/>