From 425be32c15d39733520920496a84190022594570 Mon Sep 17 00:00:00 2001
From: mp-bw <59324545+mp-bw@users.noreply.github.com>
Date: Tue, 27 Sep 2022 14:03:06 -0400
Subject: [PATCH] added a11y disclosure prompt for Android (#2102)

---
 .../Resources/xml/accessibilityservice.xml    |  3 +-
 .../Pages/Settings/AutofillServicesPage.xaml  |  2 +-
 .../Settings/AutofillServicesPage.xaml.cs     |  8 -----
 .../Settings/AutofillServicesPageViewModel.cs | 22 ++++++++++++-
 src/App/Resources/AppResources.Designer.cs    | 33 ++++++++++++++++---
 src/App/Resources/AppResources.resx           | 12 +++++++
 6 files changed, 64 insertions(+), 16 deletions(-)

diff --git a/src/Android/Resources/xml/accessibilityservice.xml b/src/Android/Resources/xml/accessibilityservice.xml
index e65df58b1..dcb4a1f02 100644
--- a/src/Android/Resources/xml/accessibilityservice.xml
+++ b/src/Android/Resources/xml/accessibilityservice.xml
@@ -6,4 +6,5 @@
     android:accessibilityFeedbackType="feedbackGeneric"
     android:accessibilityFlags="flagReportViewIds|flagRetrieveInteractiveWindows"
     android:notificationTimeout="100"
-    android:canRetrieveWindowContent="true"/>
\ No newline at end of file
+    android:canRetrieveWindowContent="true"
+    android:isAccessibilityTool="false"/>
\ No newline at end of file
diff --git a/src/App/Pages/Settings/AutofillServicesPage.xaml b/src/App/Pages/Settings/AutofillServicesPage.xaml
index 15f5c9b2a..38ad244f7 100644
--- a/src/App/Pages/Settings/AutofillServicesPage.xaml
+++ b/src/App/Pages/Settings/AutofillServicesPage.xaml
@@ -83,7 +83,7 @@
                             StyleClass="box-value"
                             HorizontalOptions="End" />
                         <Button
-                            Clicked="ToggleAccessibility"
+                            Command="{Binding ToggleAccessibilityCommand}"
                             StyleClass="box-overlay"
                             RelativeLayout.XConstraint="0"
                             RelativeLayout.YConstraint="0"
diff --git a/src/App/Pages/Settings/AutofillServicesPage.xaml.cs b/src/App/Pages/Settings/AutofillServicesPage.xaml.cs
index 906f2e617..59e999859 100644
--- a/src/App/Pages/Settings/AutofillServicesPage.xaml.cs
+++ b/src/App/Pages/Settings/AutofillServicesPage.xaml.cs
@@ -55,14 +55,6 @@ namespace Bit.App.Pages
             _vm.ToggleInlineAutofill();
         }
 
-        private void ToggleAccessibility(object sender, EventArgs e)
-        {
-            if (DoOnce())
-            {
-                _vm.ToggleAccessibility();
-            }
-        }
-
         private void ToggleDrawOver(object sender, EventArgs e)
         {
             if (DoOnce())
diff --git a/src/App/Pages/Settings/AutofillServicesPageViewModel.cs b/src/App/Pages/Settings/AutofillServicesPageViewModel.cs
index 06720826f..5af80bcf2 100644
--- a/src/App/Pages/Settings/AutofillServicesPageViewModel.cs
+++ b/src/App/Pages/Settings/AutofillServicesPageViewModel.cs
@@ -1,9 +1,11 @@
 using System.Threading.Tasks;
+using System.Windows.Input;
 using Bit.App.Abstractions;
 using Bit.App.Resources;
 using Bit.App.Services;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
+using Xamarin.CommunityToolkit.ObjectModel;
 
 namespace Bit.App.Pages
 {
@@ -12,6 +14,8 @@ namespace Bit.App.Pages
         private readonly IDeviceActionService _deviceActionService;
         private readonly IStateService _stateService;
         private readonly MobileI18nService _i18nService;
+        private readonly IPlatformUtilsService _platformUtilsService;
+        readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>("logger");
 
         private bool _autofillServiceToggled;
         private bool _inlineAutofillToggled;
@@ -24,7 +28,11 @@ namespace Bit.App.Pages
             _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
             _stateService = ServiceContainer.Resolve<IStateService>("stateService");
             _i18nService = ServiceContainer.Resolve<II18nService>("i18nService") as MobileI18nService;
+            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
             PageTitle = AppResources.AutofillServices;
+            ToggleAccessibilityCommand = new AsyncCommand(ToggleAccessibilityAsync,
+                onException: ex => _logger.Value.Exception(ex),
+                allowsMultipleExecutions: false);
         }
 
         #region Autofill Service
@@ -74,6 +82,8 @@ namespace Bit.App.Pages
 
         #region Accessibility
 
+        public ICommand ToggleAccessibilityCommand { get; }
+
         public string AccessibilityDescriptionLabel
         {
             get
@@ -176,8 +186,18 @@ namespace Bit.App.Pages
             InlineAutofillToggled = !InlineAutofillToggled;
         }
 
-        public void ToggleAccessibility()
+        public async Task ToggleAccessibilityAsync()
         {
+            if (!_deviceActionService.AutofillAccessibilityServiceRunning())
+            {
+                var accept = await _platformUtilsService.ShowDialogAsync(AppResources.AccessibilityDisclosureText,
+                    AppResources.AccessibilityServiceDisclosure, AppResources.Accept,
+                    AppResources.Decline);
+                if (!accept)
+                {
+                    return;
+                }
+            }
             _deviceActionService.OpenAccessibilitySettings();
         }
 
diff --git a/src/App/Resources/AppResources.Designer.cs b/src/App/Resources/AppResources.Designer.cs
index 3bad2f441..e923b8b9e 100644
--- a/src/App/Resources/AppResources.Designer.cs
+++ b/src/App/Resources/AppResources.Designer.cs
@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.42000
@@ -4265,13 +4265,12 @@ namespace Bit.App.Resources {
             }
         }
         
-        public static string AllNotifications
-        {
-            get
-            {
+        public static string AllNotifications {
+            get {
                 return ResourceManager.GetString("AllNotifications", resourceCulture);
             }
         }
+        
         public static string PasswordType {
             get {
                 return ResourceManager.GetString("PasswordType", resourceCulture);
@@ -4415,5 +4414,29 @@ namespace Bit.App.Resources {
                 return ResourceManager.GetString("Random", resourceCulture);
             }
         }
+        
+        public static string AccessibilityServiceDisclosure {
+            get {
+                return ResourceManager.GetString("AccessibilityServiceDisclosure", resourceCulture);
+            }
+        }
+        
+        public static string AccessibilityDisclosureText {
+            get {
+                return ResourceManager.GetString("AccessibilityDisclosureText", resourceCulture);
+            }
+        }
+        
+        public static string Accept {
+            get {
+                return ResourceManager.GetString("Accept", resourceCulture);
+            }
+        }
+        
+        public static string Decline {
+            get {
+                return ResourceManager.GetString("Decline", resourceCulture);
+            }
+        }
     }
 }
diff --git a/src/App/Resources/AppResources.resx b/src/App/Resources/AppResources.resx
index d752684fe..7afdd3eea 100644
--- a/src/App/Resources/AppResources.resx
+++ b/src/App/Resources/AppResources.resx
@@ -2449,4 +2449,16 @@ select Add TOTP to store the key safely</value>
   <data name="Random" xml:space="preserve">
     <value>Random</value>
   </data>
+  <data name="AccessibilityServiceDisclosure" xml:space="preserve">
+    <value>Accessibility Service Disclosure</value>
+  </data>
+  <data name="AccessibilityDisclosureText" xml:space="preserve">
+    <value>Bitwarden uses the Accessibility Service to search for login fields in apps and websites, then establish the appropriate field IDs for entering a username &amp; password when a match for the app or site is found. We do not store any of the information presented to us by the service, nor do we make any attempt to control any on-screen elements beyond text entry of credentials.</value>
+  </data>
+  <data name="Accept" xml:space="preserve">
+    <value>Accept</value>
+  </data>
+  <data name="Decline" xml:space="preserve">
+    <value>Decline</value>
+  </data>
 </root>