From 9f06c9a0516d5d22c78cd9553b5c94ae1a9f4e73 Mon Sep 17 00:00:00 2001 From: Matt Portune <59324545+mportune-bw@users.noreply.github.com> Date: Fri, 10 Jan 2020 11:34:17 -0500 Subject: [PATCH] Removal of deprecated Android Accessibility Service options (#698) --- src/App/Pages/Settings/OptionsPage.xaml | 49 ------------ src/App/Pages/Settings/OptionsPage.xaml.cs | 1 - .../Pages/Settings/OptionsPageViewModel.cs | 80 ------------------- src/App/Resources/AppResources.Designer.cs | 54 ------------- src/App/Resources/AppResources.resx | 18 ----- src/App/Services/MobileStorageService.cs | 2 - src/Core/Constants.cs | 2 - 7 files changed, 206 deletions(-) diff --git a/src/App/Pages/Settings/OptionsPage.xaml b/src/App/Pages/Settings/OptionsPage.xaml index 18a973538..cdc633944 100644 --- a/src/App/Pages/Settings/OptionsPage.xaml +++ b/src/App/Pages/Settings/OptionsPage.xaml @@ -132,55 +132,6 @@ Text="{u:I18n BlacklistedUrisDescription}" StyleClass="box-footer-label" /> - - - - - - - - - - - - - - diff --git a/src/App/Pages/Settings/OptionsPage.xaml.cs b/src/App/Pages/Settings/OptionsPage.xaml.cs index 2e919fa55..7133dca12 100644 --- a/src/App/Pages/Settings/OptionsPage.xaml.cs +++ b/src/App/Pages/Settings/OptionsPage.xaml.cs @@ -24,7 +24,6 @@ namespace Bit.App.Pages if(Device.RuntimePlatform == Device.Android) { ToolbarItems.RemoveAt(0); - _vm.ShowAndroidAccessibilitySettings = false; _vm.ShowAndroidAutofillSettings = _deviceActionService.SupportsAutofillService(); _themeDescriptionLabel.Text = string.Concat(_themeDescriptionLabel.Text, " ", AppResources.RestartIsRequired); diff --git a/src/App/Pages/Settings/OptionsPageViewModel.cs b/src/App/Pages/Settings/OptionsPageViewModel.cs index 08d7b0638..5e13328a2 100644 --- a/src/App/Pages/Settings/OptionsPageViewModel.cs +++ b/src/App/Pages/Settings/OptionsPageViewModel.cs @@ -21,9 +21,6 @@ namespace Bit.App.Pages private readonly IMessagingService _messagingService; - private bool _autofillAlwaysScan; - private bool _autofillPersistNotification; - private bool _autofillPasswordField; private bool _autofillDisableSavePrompt; private string _autofillBlacklistedUris; private bool _disableFavicon; @@ -33,7 +30,6 @@ namespace Bit.App.Pages private int _uriMatchSelectedIndex; private bool _inited; private bool _updatingAutofill; - private bool _showAndroidAccessibilitySettings; private bool _showAndroidAutofillSettings; public OptionsPageViewModel() @@ -144,42 +140,6 @@ namespace Bit.App.Pages } } - public bool AutofillAlwaysScan - { - get => _autofillAlwaysScan; - set - { - if(SetProperty(ref _autofillAlwaysScan, value)) - { - var task = UpdateAutofillAsync(false, false); - } - } - } - - public bool AutofillPersistNotification - { - get => _autofillPersistNotification; - set - { - if(SetProperty(ref _autofillPersistNotification, value)) - { - var task = UpdateAutofillAsync(value, false); - } - } - } - - public bool AutofillPasswordField - { - get => _autofillPasswordField; - set - { - if(SetProperty(ref _autofillPasswordField, value)) - { - var task = UpdateAutofillAsync(false, value); - } - } - } - public bool AutofillDisableSavePrompt { get => _autofillDisableSavePrompt; @@ -198,12 +158,6 @@ namespace Bit.App.Pages set => SetProperty(ref _autofillBlacklistedUris, value); } - public bool ShowAndroidAccessibilitySettings - { - get => _showAndroidAccessibilitySettings; - set => SetProperty(ref _showAndroidAccessibilitySettings, value); - } - public bool ShowAndroidAutofillSettings { get => _showAndroidAutofillSettings; @@ -217,11 +171,6 @@ namespace Bit.App.Pages var blacklistedUrisList = await _storageService.GetAsync>( Constants.AutofillBlacklistedUrisKey); AutofillBlacklistedUris = blacklistedUrisList != null ? string.Join(", ", blacklistedUrisList) : null; - AutofillPersistNotification = (await _storageService.GetAsync( - Constants.AccessibilityAutofillPersistNotificationKey)).GetValueOrDefault(); - AutofillPasswordField = (await _storageService.GetAsync( - Constants.AccessibilityAutofillPasswordFieldKey)).GetValueOrDefault(); - AutofillAlwaysScan = !AutofillPersistNotification && !AutofillPasswordField; DisableAutoTotpCopy = !(await _totpService.IsAutoCopyEnabledAsync()); DisableFavicon = (await _storageService.GetAsync(Constants.DisableFaviconKey)).GetValueOrDefault(); var theme = await _storageService.GetAsync(Constants.ThemeKey); @@ -234,35 +183,6 @@ namespace Bit.App.Pages _inited = true; } - private async Task UpdateAutofillAsync(bool persistNotification, bool passwordField) - { - if(_inited && !_updatingAutofill) - { - _updatingAutofill = true; - if(persistNotification) - { - AutofillAlwaysScan = false; - AutofillPasswordField = false; - } - else if(passwordField) - { - AutofillAlwaysScan = false; - AutofillPersistNotification = false; - } - else - { - AutofillAlwaysScan = true; - AutofillPersistNotification = false; - AutofillPasswordField = false; - } - await _storageService.SaveAsync(Constants.AccessibilityAutofillPersistNotificationKey, - AutofillPersistNotification); - await _storageService.SaveAsync(Constants.AccessibilityAutofillPasswordFieldKey, - AutofillPasswordField); - _updatingAutofill = false; - } - } - private async Task UpdateAutoTotpCopyAsync() { if(_inited) diff --git a/src/App/Resources/AppResources.Designer.cs b/src/App/Resources/AppResources.Designer.cs index 848215ca9..acbb2c1da 100644 --- a/src/App/Resources/AppResources.Designer.cs +++ b/src/App/Resources/AppResources.Designer.cs @@ -339,24 +339,6 @@ namespace Bit.App.Resources { } } - /// - /// Looks up a localized string similar to Always Scan. - /// - public static string AutofillAlways { - get { - return ResourceManager.GetString("AutofillAlways", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Always scan the screen for fields and only offer an auto-fill notification if password fields are found. This is the default setting.. - /// - public static string AutofillAlwaysDescription { - get { - return ResourceManager.GetString("AutofillAlwaysDescription", resourceCulture); - } - } - /// /// Looks up a localized string similar to Auto-fill and save. /// @@ -375,42 +357,6 @@ namespace Bit.App.Resources { } } - /// - /// Looks up a localized string similar to Scan When Password Field Focused. - /// - public static string AutofillPasswordField { - get { - return ResourceManager.GetString("AutofillPasswordField", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Only scan the screen for fields and offer an auto-fill notification whenever you select a password field. This setting may help conserve battery life.. - /// - public static string AutofillPasswordFieldDescription { - get { - return ResourceManager.GetString("AutofillPasswordFieldDescription", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Persist Notification. - /// - public static string AutofillPersistNotification { - get { - return ResourceManager.GetString("AutofillPersistNotification", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Always offer an auto-fill notification and only scan for fields after attempting an auto-fill. This setting may help conserve battery life.. - /// - public static string AutofillPersistNotificationDescription { - get { - return ResourceManager.GetString("AutofillPersistNotificationDescription", resourceCulture); - } - } - /// /// Looks up a localized string similar to Auto-fill Service. /// diff --git a/src/App/Resources/AppResources.resx b/src/App/Resources/AppResources.resx index ad723532c..c2c800854 100644 --- a/src/App/Resources/AppResources.resx +++ b/src/App/Resources/AppResources.resx @@ -779,24 +779,6 @@ Share Your Vault - - Scan When Password Field Focused - - - Only scan the screen for fields and offer an auto-fill notification whenever you select a password field. This setting may help conserve battery life. - - - Persist Notification - - - Always offer an auto-fill notification and only scan for fields after attempting an auto-fill. This setting may help conserve battery life. - - - Always Scan - - - Always scan the screen for fields and only offer an auto-fill notification if password fields are found. This is the default setting. - Cannot open the app "{0}". Message shown when trying to launch an app that does not exist on the user's device. diff --git a/src/App/Services/MobileStorageService.cs b/src/App/Services/MobileStorageService.cs index e81f144fe..a80b039ea 100644 --- a/src/App/Services/MobileStorageService.cs +++ b/src/App/Services/MobileStorageService.cs @@ -18,8 +18,6 @@ namespace Bit.App.Services Constants.DisableAutoTotpCopyKey, Constants.DisableFaviconKey, Constants.ClearClipboardKey, - Constants.AccessibilityAutofillPasswordFieldKey, - Constants.AccessibilityAutofillPersistNotificationKey, Constants.AutofillDisableSavePromptKey, Constants.LastActiveKey, Constants.PushInitialPromptShownKey, diff --git a/src/Core/Constants.cs b/src/Core/Constants.cs index 03c53db89..0e6420bff 100644 --- a/src/Core/Constants.cs +++ b/src/Core/Constants.cs @@ -13,8 +13,6 @@ public static string DisableAutoTotpCopyKey = "disableAutoTotpCopy"; public static string EnvironmentUrlsKey = "environmentUrls"; public static string LastFileCacheClearKey = "lastFileCacheClear"; - public static string AccessibilityAutofillPasswordFieldKey = "accessibilityAutofillPasswordField"; - public static string AccessibilityAutofillPersistNotificationKey = "accessibilityAutofillPersistNotification"; public static string AutofillDisableSavePromptKey = "autofillDisableSavePrompt"; public static string AutofillBlacklistedUrisKey = "autofillBlacklistedUris"; public static string DisableFaviconKey = "disableFavicon";