From 681c557e9ef174543c290aff4346a52326ba3950 Mon Sep 17 00:00:00 2001
From: Fabian Henneke <FabianHenneke@users.noreply.github.com>
Date: Tue, 14 Jul 2020 11:30:29 +0200
Subject: Revert "Work around Chrome Autofill issue (#921)" (#933)

---
 app/src/main/res/values-v28/bools.xml                    |  8 --------
 app/src/main/res/values/bools.xml                        |  1 -
 app/src/main/res/values/strings.xml                      | 11 -----------
 app/src/main/res/xml/oreo_autofill_chrome_compat_fix.xml | 13 -------------
 app/src/main/res/xml/preference.xml                      |  5 -----
 5 files changed, 38 deletions(-)
 delete mode 100644 app/src/main/res/values-v28/bools.xml
 delete mode 100644 app/src/main/res/xml/oreo_autofill_chrome_compat_fix.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/values-v28/bools.xml b/app/src/main/res/values-v28/bools.xml
deleted file mode 100644
index 3dc8bf79..00000000
--- a/app/src/main/res/values-v28/bools.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
-  ~ SPDX-License-Identifier: GPL-3.0-only
-  -->
-
-<resources>
-    <bool name="enable_chrome_compat_fix">true</bool>
-</resources>
diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml
index b19e7848..475702a1 100644
--- a/app/src/main/res/values/bools.xml
+++ b/app/src/main/res/values/bools.xml
@@ -7,5 +7,4 @@
     <bool name="leak_canary_allow_in_non_debuggable_build">true</bool>
     <bool name="enable_accessibility_autofill">true</bool>
     <bool name="light_status_bar">true</bool>
-    <bool name="enable_chrome_compat_fix">false</bool>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0834b96e..a616896f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -275,16 +275,6 @@
     <string name="oreo_autofill_enable_dialog_description">Password Store can offer to fill login forms and even save credentials you enter in apps or on websites.</string>
     <string name="oreo_autofill_enable_dialog_instructions">To enable this feature, tap OK to go to Autofill settings. There, select Password Store from the list and confirm the confirmation prompt with OK.</string>
     <string name="oreo_autofill_enable_dialog_installed_browsers">Autofill support with installed browsers:</string>
-    <string name="oreo_autofill_chrome_compat_fix_summary">Make Autofill more reliable in Chrome</string>
-    <string name="oreo_autofill_chrome_compat_fix_description">This accessibility service makes
-        Autofill work more reliably in Chrome. It can only be activated if you are already using
-        Password Store as your Autofill service.\n\nThis service is only active while you are
-        using Chrome. It does not access any data or take any actions on your behalf, but forces
-        Chrome to properly forward user interactions to the Password Store Autofill
-        service.\n\nChrome\'s performance should not be noticeably affected. If you are experiencing
-        any problems with this service, please create an issue at
-        https://msfjarvis.dev/aps.
-    </string>
 
     <!-- Autofill -->
     <string name="autofill_description">Autofills password fields in apps. Only works for Android versions 4.3 and up. Does not rely on the clipboard for Android versions 5.0 and up.</string>
@@ -399,7 +389,6 @@
     <string name="otp_import_success">Successfully imported TOTP configuration</string>
     <string name="otp_import_failure">Failed to import TOTP configuration</string>
     <string name="oreo_autofill_chrome_compat_fix_preference_title">Improve reliability in Chrome</string>
-    <string name="oreo_autofill_chrome_compat_fix_preference_summary">Requires activating an accessibility service and may affect overall Chrome performance</string>
     <string name="exporting_passwords">Exporting passwords…</string>
     <string name="invalid_filename_text">File name must not contain \'/\', set directory above</string>
     <string name="directory_hint">Directory</string>
diff --git a/app/src/main/res/xml/oreo_autofill_chrome_compat_fix.xml b/app/src/main/res/xml/oreo_autofill_chrome_compat_fix.xml
deleted file mode 100644
index 196c93d5..00000000
--- a/app/src/main/res/xml/oreo_autofill_chrome_compat_fix.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
-  ~ SPDX-License-Identifier: GPL-3.0-only
-  -->
-<accessibility-service xmlns:android="http://schemas.android.com/apk/res/android"
-    android:accessibilityEventTypes="typeWindowContentChanged|typeAnnouncement|typeWindowStateChanged"
-    android:accessibilityFeedbackType="feedbackGeneric"
-    android:accessibilityFlags="flagDefault"
-    android:canRetrieveWindowContent="true"
-    android:description="@string/oreo_autofill_chrome_compat_fix_description"
-    android:notificationTimeout="100"
-    android:packageNames="com.android.chrome,com.chrome.beta,com.chrome.dev,com.chrome.canary"
-    android:summary="@string/oreo_autofill_chrome_compat_fix_summary" />
diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml
index d4ec4139..0d71d6cc 100644
--- a/app/src/main/res/xml/preference.xml
+++ b/app/src/main/res/xml/preference.xml
@@ -10,11 +10,6 @@
             app:defaultValue="true"
             app:key="autofill_enable"
             app:title="@string/pref_autofill_enable_title" />
-        <SwitchPreferenceCompat
-            app:defaultValue="true"
-            app:key="oreo_autofill_chrome_compat_fix"
-            app:summary="@string/oreo_autofill_chrome_compat_fix_preference_summary"
-            app:title="@string/oreo_autofill_chrome_compat_fix_preference_title" />
         <ListPreference
             app:defaultValue="file"
             app:entries="@array/oreo_autofill_directory_structure_entries"
-- 
cgit v1.2.3