[EC-519] Refactor Split DeviceActionService (#2081)

* EC-519 Refactored IDeviceActionService to be split into IFileService and IAutofillManager also some cleanups were made * EC-519 Fix format * EC-519 Fix merge to use the new AutofillHandler
2026-01-09 12:03:16 +00:00 · 2022-10-11 18:19:32 -03:00
parent d800e9a43e
commit ba677a96aa
35 changed files with 883 additions and 798 deletions
--- a/src/App/Abstractions/IDeviceActionService.cs
+++ b/src/App/Abstractions/IDeviceActionService.cs
@@ -1,6 +1,5 @@
 using System.Threading.Tasks;
 using Bit.Core.Enums;
-using Bit.Core.Models.View;

 namespace Bit.App.Abstractions
 {
@@ -8,44 +7,32 @@ namespace Bit.App.Abstractions
    {
        string DeviceUserAgent { get; }
        DeviceType DeviceType { get; }
+        int SystemMajorVersion();
+        string SystemModel();
+        string GetBuildNumber();
+
        void Toast(string text, bool longDuration = false);
-        bool LaunchApp(string appName);
        Task ShowLoadingAsync(string text);
        Task HideLoadingAsync();
-        bool OpenFile(byte[] fileData, string id, string fileName);
-        bool SaveFile(byte[] fileData, string id, string fileName, string contentUri);
-        bool CanOpenFile(string fileName);
-        Task ClearCacheAsync();
-        Task SelectFileAsync();
        Task<string> DisplayPromptAync(string title = null, string description = null, string text = null,
            string okButtonText = null, string cancelButtonText = null, bool numericKeyboard = false,
            bool autofocus = true, bool password = false);
-        void RateApp();
+        Task<string> DisplayAlertAsync(string title, string message, string cancel, params string[] buttons);
+        Task<string> DisplayActionSheetAsync(string title, string cancel, string destruction, params string[] buttons);
+
        bool SupportsFaceBiometric();
        Task<bool> SupportsFaceBiometricAsync();
        bool SupportsNfc();
        bool SupportsCamera();
-        bool SupportsAutofillService();
-        int SystemMajorVersion();
-        string SystemModel();
-        Task<string> DisplayAlertAsync(string title, string message, string cancel, params string[] buttons);
-        Task<string> DisplayActionSheetAsync(string title, string cancel, string destruction, params string[] buttons);
-        void Autofill(CipherView cipher);
-        void CloseAutofill();
-        void Background();
-        bool AutofillAccessibilityServiceRunning();
-        bool AutofillAccessibilityOverlayPermitted();
-        bool HasAutofillService();
-        bool AutofillServiceEnabled();
-        void DisableAutofillService();
-        bool AutofillServicesEnabled();
-        string GetBuildNumber();
+        bool SupportsFido2();
+
+        bool LaunchApp(string appName);
+        void RateApp();
        void OpenAccessibilitySettings();
        void OpenAccessibilityOverlayPermissionSettings();
        void OpenAutofillSettings();
        long GetActiveTime();
        void CloseMainApp();
-        bool SupportsFido2();
        float GetSystemFontSizeScale();
        Task OnAccountSwitchCompleteAsync();
        Task SetScreenCaptureAllowedAsync();
--- a/src/App/App.xaml.cs
+++ b/src/App/App.xaml.cs
@@ -28,6 +28,7 @@ namespace Bit.App
        private readonly ISyncService _syncService;
        private readonly IAuthService _authService;
        private readonly IDeviceActionService _deviceActionService;
+        private readonly IFileService _fileService;
        private readonly IAccountsManager _accountsManager;
        private readonly IPushNotificationService _pushNotificationService;
        private static bool _isResumed;
@@ -49,6 +50,7 @@ namespace Bit.App
            _syncService = ServiceContainer.Resolve<ISyncService>("syncService");
            _authService = ServiceContainer.Resolve<IAuthService>("authService");
            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            _fileService = ServiceContainer.Resolve<IFileService>();
            _accountsManager = ServiceContainer.Resolve<IAccountsManager>("accountsManager");
            _pushNotificationService = ServiceContainer.Resolve<IPushNotificationService>();

@@ -301,7 +303,7 @@ namespace Bit.App
            var lastClear = await _stateService.GetLastFileCacheClearAsync();
            if ((DateTime.UtcNow - lastClear.GetValueOrDefault(DateTime.MinValue)).TotalDays >= 1)
            {
-                var task = Task.Run(() => _deviceActionService.ClearCacheAsync());
+                var task = Task.Run(() => _fileService.ClearCacheAsync());
            }
        }

--- a/src/App/Pages/Send/SendAddEditPageViewModel.cs
+++ b/src/App/Pages/Send/SendAddEditPageViewModel.cs
@@ -19,6 +19,7 @@ namespace Bit.App.Pages
    public class SendAddEditPageViewModel : BaseViewModel
    {
        private readonly IDeviceActionService _deviceActionService;
+        private readonly IFileService _fileService;
        private readonly IPlatformUtilsService _platformUtilsService;
        private readonly IMessagingService _messagingService;
        private readonly IStateService _stateService;
@@ -51,6 +52,7 @@ namespace Bit.App.Pages
        public SendAddEditPageViewModel()
        {
            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            _fileService = ServiceContainer.Resolve<IFileService>();
            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
@@ -292,7 +294,7 @@ namespace Bit.App.Pages

        public async Task ChooseFileAsync()
        {
-            await _deviceActionService.SelectFileAsync();
+            await _fileService.SelectFileAsync();
        }

        public void ClearExpirationDate()
--- a/src/App/Pages/Send/SendGroupingsPage/SendGroupingsPageViewModel.cs
+++ b/src/App/Pages/Send/SendGroupingsPage/SendGroupingsPageViewModel.cs
@@ -144,7 +144,7 @@ namespace Bit.App.Pages
            {
                await LoadDataAsync();

-                var uppercaseGroupNames = _deviceActionService.DeviceType == DeviceType.iOS;
+                var uppercaseGroupNames = Device.RuntimePlatform == Device.iOS;
                if (MainPage)
                {
                    groupedSends.Add(new SendGroupingsPageListGroup(
--- a/src/App/Pages/Settings/AutofillServicesPageViewModel.cs
+++ b/src/App/Pages/Settings/AutofillServicesPageViewModel.cs
@@ -12,6 +12,7 @@ namespace Bit.App.Pages
    public class AutofillServicesPageViewModel : BaseViewModel
    {
        private readonly IDeviceActionService _deviceActionService;
+        private readonly IAutofillHandler _autofillHandler;
        private readonly IStateService _stateService;
        private readonly MobileI18nService _i18nService;
        private readonly IPlatformUtilsService _platformUtilsService;
@@ -26,6 +27,7 @@ namespace Bit.App.Pages
        public AutofillServicesPageViewModel()
        {
            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            _autofillHandler = ServiceContainer.Resolve<IAutofillHandler>();
            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
            _i18nService = ServiceContainer.Resolve<II18nService>("i18nService") as MobileI18nService;
            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
@@ -173,7 +175,7 @@ namespace Bit.App.Pages
            }
            else
            {
-                _deviceActionService.DisableAutofillService();
+                _autofillHandler.DisableAutofillService();
            }
        }

@@ -188,7 +190,7 @@ namespace Bit.App.Pages

        public async Task ToggleAccessibilityAsync()
        {
-            if (!_deviceActionService.AutofillAccessibilityServiceRunning())
+            if (!_autofillHandler.AutofillAccessibilityServiceRunning())
            {
                var accept = await _platformUtilsService.ShowDialogAsync(AppResources.AccessibilityDisclosureText,
                    AppResources.AccessibilityServiceDisclosure, AppResources.Accept,
@@ -213,9 +215,9 @@ namespace Bit.App.Pages
        public void UpdateEnabled()
        {
            AutofillServiceToggled =
-                _deviceActionService.HasAutofillService() && _deviceActionService.AutofillServiceEnabled();
-            AccessibilityToggled = _deviceActionService.AutofillAccessibilityServiceRunning();
-            DrawOverToggled = _deviceActionService.AutofillAccessibilityOverlayPermitted();
+                _autofillHandler.SupportsAutofillService() && _autofillHandler.AutofillServiceEnabled();
+            AccessibilityToggled = _autofillHandler.AutofillAccessibilityServiceRunning();
+            DrawOverToggled = _autofillHandler.AutofillAccessibilityOverlayPermitted();
        }

        private async Task UpdateInlineAutofillToggledAsync()
--- a/src/App/Pages/Settings/ExportVaultPageViewModel.cs
+++ b/src/App/Pages/Settings/ExportVaultPageViewModel.cs
@@ -16,6 +16,7 @@ namespace Bit.App.Pages
    public class ExportVaultPageViewModel : BaseViewModel
    {
        private readonly IDeviceActionService _deviceActionService;
+        private readonly IFileService _fileService;
        private readonly IPlatformUtilsService _platformUtilsService;
        private readonly II18nService _i18nService;
        private readonly IExportService _exportService;
@@ -39,6 +40,7 @@ namespace Bit.App.Pages
        public ExportVaultPageViewModel()
        {
            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            _fileService = ServiceContainer.Resolve<IFileService>();
            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
            _i18nService = ServiceContainer.Resolve<II18nService>("i18nService");
            _exportService = ServiceContainer.Resolve<IExportService>("exportService");
@@ -182,7 +184,7 @@ namespace Bit.App.Pages
                _defaultFilename = _exportService.GetFileName(null, fileFormat);
                _exportResult = Encoding.UTF8.GetBytes(data);

-                if (!_deviceActionService.SaveFile(_exportResult, null, _defaultFilename, null))
+                if (!_fileService.SaveFile(_exportResult, null, _defaultFilename, null))
                {
                    ClearResult();
                    await _platformUtilsService.ShowDialogAsync(_i18nService.T("ExportVaultFailure"));
@@ -220,7 +222,7 @@ namespace Bit.App.Pages

        public async void SaveFileSelected(string contentUri, string filename)
        {
-            if (_deviceActionService.SaveFile(_exportResult, null, filename ?? _defaultFilename, contentUri))
+            if (_fileService.SaveFile(_exportResult, null, filename ?? _defaultFilename, contentUri))
            {
                ClearResult();
                _platformUtilsService.ShowToast("success", null, _i18nService.T("ExportVaultSuccess"));
--- a/src/App/Pages/Settings/OptionsPage.xaml.cs
+++ b/src/App/Pages/Settings/OptionsPage.xaml.cs
@@ -1,5 +1,6 @@
 using Bit.App.Abstractions;
 using Bit.App.Resources;
+using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
 using Xamarin.Forms;
 using Xamarin.Forms.PlatformConfiguration;
@@ -9,12 +10,12 @@ namespace Bit.App.Pages
 {
    public partial class OptionsPage : BaseContentPage
    {
-        private readonly IDeviceActionService _deviceActionService;
+        private readonly IAutofillHandler _autofillHandler;
        private readonly OptionsPageViewModel _vm;

        public OptionsPage()
        {
-            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            _autofillHandler = ServiceContainer.Resolve<IAutofillHandler>();
            InitializeComponent();
            _vm = BindingContext as OptionsPageViewModel;
            _vm.Page = this;
@@ -25,7 +26,7 @@ namespace Bit.App.Pages
            if (Device.RuntimePlatform == Device.Android)
            {
                ToolbarItems.RemoveAt(0);
-                _vm.ShowAndroidAutofillSettings = _deviceActionService.SupportsAutofillService();
+                _vm.ShowAndroidAutofillSettings = _autofillHandler.SupportsAutofillService();
            }
            else
            {
--- a/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs
+++ b/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs
@@ -20,6 +20,7 @@ namespace Bit.App.Pages
        private readonly ICryptoService _cryptoService;
        private readonly IStateService _stateService;
        private readonly IDeviceActionService _deviceActionService;
+        private readonly IAutofillHandler _autofillHandler;
        private readonly IEnvironmentService _environmentService;
        private readonly IMessagingService _messagingService;
        private readonly IVaultTimeoutService _vaultTimeoutService;
@@ -74,6 +75,7 @@ namespace Bit.App.Pages
            _cryptoService = ServiceContainer.Resolve<ICryptoService>("cryptoService");
            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            _autofillHandler = ServiceContainer.Resolve<IAutofillHandler>();
            _environmentService = ServiceContainer.Resolve<IEnvironmentService>("environmentService");
            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
@@ -454,7 +456,7 @@ namespace Bit.App.Pages
            else if (await _platformUtilsService.SupportsBiometricAsync())
            {
                _biometric = await _platformUtilsService.AuthenticateBiometricAsync(null,
-                    _deviceActionService.DeviceType == Core.Enums.DeviceType.Android ? "." : null);
+                    Device.RuntimePlatform == Device.Android ? "." : null);
            }
            if (_biometric == current)
            {
@@ -485,7 +487,7 @@ namespace Bit.App.Pages
                autofillItems.Add(new SettingsPageListItem
                {
                    Name = AppResources.AutofillServices,
-                    SubLabel = _deviceActionService.AutofillServicesEnabled() ? AppResources.On : AppResources.Off,
+                    SubLabel = _autofillHandler.AutofillServicesEnabled() ? AppResources.On : AppResources.Off,
                    ExecuteAsync = () => Page.Navigation.PushModalAsync(new NavigationPage(new AutofillServicesPage(Page as SettingsPage)))
                });
            }
--- a/src/App/Pages/Vault/AttachmentsPageViewModel.cs
+++ b/src/App/Pages/Vault/AttachmentsPageViewModel.cs
@@ -18,6 +18,7 @@ namespace Bit.App.Pages
    public class AttachmentsPageViewModel : BaseViewModel
    {
        private readonly IDeviceActionService _deviceActionService;
+        private readonly IFileService _fileService;
        private readonly ICipherService _cipherService;
        private readonly ICryptoService _cryptoService;
        private readonly IStateService _stateService;
@@ -34,6 +35,7 @@ namespace Bit.App.Pages
        public AttachmentsPageViewModel()
        {
            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            _fileService = ServiceContainer.Resolve<IFileService>();
            _cipherService = ServiceContainer.Resolve<ICipherService>("cipherService");
            _cryptoService = ServiceContainer.Resolve<ICryptoService>("cryptoService");
            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
@@ -156,7 +158,7 @@ namespace Bit.App.Pages
            {
                _vaultTimeoutService.DelayLockAndLogoutMs = 60000;
            }
-            await _deviceActionService.SelectFileAsync();
+            await _fileService.SelectFileAsync();
        }

        private async void DeleteAsync(AttachmentView attachment)
--- a/src/App/Pages/Vault/AutofillCiphersPageViewModel.cs
+++ b/src/App/Pages/Vault/AutofillCiphersPageViewModel.cs
@@ -21,6 +21,7 @@ namespace Bit.App.Pages
    {
        private readonly IPlatformUtilsService _platformUtilsService;
        private readonly IDeviceActionService _deviceActionService;
+        private readonly IAutofillHandler _autofillHandler;
        private readonly ICipherService _cipherService;
        private readonly IStateService _stateService;
        private readonly IPasswordRepromptService _passwordRepromptService;
@@ -37,6 +38,7 @@ namespace Bit.App.Pages
            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
            _cipherService = ServiceContainer.Resolve<ICipherService>("cipherService");
            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            _autofillHandler = ServiceContainer.Resolve<IAutofillHandler>();
            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
            _passwordRepromptService = ServiceContainer.Resolve<IPasswordRepromptService>("passwordRepromptService");
            _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
@@ -232,7 +234,7 @@ namespace Bit.App.Pages
                }
                if (autofillResponse == AppResources.Yes || autofillResponse == AppResources.YesAndSave)
                {
-                    _deviceActionService.Autofill(cipher);
+                    _autofillHandler.Autofill(cipher);
                }
            }
        }
--- a/src/App/Pages/Vault/BaseCipherViewModel.cs
+++ b/src/App/Pages/Vault/BaseCipherViewModel.cs
@@ -14,6 +14,7 @@ namespace Bit.App.Pages
    {
        private readonly IAuditService _auditService;
        protected readonly IDeviceActionService _deviceActionService;
+        protected readonly IFileService _fileService;
        protected readonly ILogger _logger;
        protected readonly IPlatformUtilsService _platformUtilsService;
        private CipherView _cipher;
@@ -22,6 +23,7 @@ namespace Bit.App.Pages
        public BaseCipherViewModel()
        {
            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            _fileService = ServiceContainer.Resolve<IFileService>();
            _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
            _auditService = ServiceContainer.Resolve<IAuditService>("auditService");
            _logger = ServiceContainer.Resolve<ILogger>("logger");
--- a/src/App/Pages/Vault/CipherAddEditPage.xaml.cs
+++ b/src/App/Pages/Vault/CipherAddEditPage.xaml.cs
@@ -19,6 +19,7 @@ namespace Bit.App.Pages
        private readonly AppOptions _appOptions;
        private readonly IStateService _stateService;
        private readonly IDeviceActionService _deviceActionService;
+        private readonly IAutofillHandler _autofillHandler;
        private readonly IVaultTimeoutService _vaultTimeoutService;
        private readonly IKeyConnectorService _keyConnectorService;

@@ -40,6 +41,7 @@ namespace Bit.App.Pages
        {
            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            _autofillHandler = ServiceContainer.Resolve<IAutofillHandler>();
            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
            _keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");

@@ -350,8 +352,8 @@ namespace Bit.App.Pages
                        }
                    }
                    else if (Device.RuntimePlatform == Device.Android &&
-                        !_deviceActionService.AutofillAccessibilityServiceRunning() &&
-                        !_deviceActionService.AutofillServiceEnabled())
+                        !_autofillHandler.AutofillAccessibilityServiceRunning() &&
+                        !_autofillHandler.AutofillServiceEnabled())
                    {
                        await DisplayAlert(AppResources.BitwardenAutofillService,
                            AppResources.BitwardenAutofillServiceAlert2, AppResources.Ok);
--- a/src/App/Pages/Vault/CipherAddEditPageViewModel.cs
+++ b/src/App/Pages/Vault/CipherAddEditPageViewModel.cs
@@ -28,6 +28,7 @@ namespace Bit.App.Pages
        private readonly IPolicyService _policyService;
        private readonly ICustomFieldItemFactory _customFieldItemFactory;
        private readonly IClipboardService _clipboardService;
+        private readonly IAutofillHandler _autofillHandler;

        private bool _showNotesSeparator;
        private bool _showPassword;
@@ -78,6 +79,7 @@ namespace Bit.App.Pages
            _policyService = ServiceContainer.Resolve<IPolicyService>("policyService");
            _customFieldItemFactory = ServiceContainer.Resolve<ICustomFieldItemFactory>("customFieldItemFactory");
            _clipboardService = ServiceContainer.Resolve<IClipboardService>("clipboardService");
+            _autofillHandler = ServiceContainer.Resolve<IAutofillHandler>();

            GeneratePasswordCommand = new Command(GeneratePassword);
            TogglePasswordCommand = new Command(TogglePassword);
@@ -508,7 +510,7 @@ namespace Bit.App.Pages
                if (Page is CipherAddEditPage page && page.FromAutofillFramework)
                {
                    // Close and go back to app
-                    _deviceActionService.CloseAutofill();
+                    _autofillHandler.CloseAutofill();
                }
                else
                {
--- a/src/App/Pages/Vault/CipherDetailsPageViewModel.cs
+++ b/src/App/Pages/Vault/CipherDetailsPageViewModel.cs
@@ -493,7 +493,7 @@ namespace Bit.App.Pages
                }

                var canOpenFile = true;
-                if (!_deviceActionService.CanOpenFile(attachment.FileName))
+                if (!_fileService.CanOpenFile(attachment.FileName))
                {
                    if (Device.RuntimePlatform == Device.iOS)
                    {
@@ -562,7 +562,7 @@ namespace Bit.App.Pages

        public async void OpenAttachment(byte[] data, AttachmentView attachment)
        {
-            if (!_deviceActionService.OpenFile(data, attachment.Id, attachment.FileName))
+            if (!_fileService.OpenFile(data, attachment.Id, attachment.FileName))
            {
                await _platformUtilsService.ShowDialogAsync(AppResources.UnableToOpenFile);
                return;
@@ -573,7 +573,7 @@ namespace Bit.App.Pages
        {
            _attachmentData = data;
            _attachmentFilename = attachment.FileName;
-            if (!_deviceActionService.SaveFile(_attachmentData, null, _attachmentFilename, null))
+            if (!_fileService.SaveFile(_attachmentData, null, _attachmentFilename, null))
            {
                ClearAttachmentData();
                await _platformUtilsService.ShowDialogAsync(AppResources.UnableToSaveAttachment);
@@ -582,7 +582,7 @@ namespace Bit.App.Pages

        public async void SaveFileSelected(string contentUri, string filename)
        {
-            if (_deviceActionService.SaveFile(_attachmentData, null, filename ?? _attachmentFilename, contentUri))
+            if (_fileService.SaveFile(_attachmentData, null, filename ?? _attachmentFilename, contentUri))
            {
                ClearAttachmentData();
                _platformUtilsService.ShowToast("success", null, AppResources.SaveAttachmentSuccess);
--- a/src/App/Pages/Vault/CiphersPage.xaml.cs
+++ b/src/App/Pages/Vault/CiphersPage.xaml.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Linq;
-using Bit.App.Abstractions;
 using Bit.App.Controls;
 using Bit.App.Resources;
+using Bit.Core.Abstractions;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
 using Xamarin.Forms;
@@ -12,7 +12,7 @@ namespace Bit.App.Pages
    public partial class CiphersPage : BaseContentPage
    {
        private readonly string _autofillUrl;
-        private readonly IDeviceActionService _deviceActionService;
+        private readonly IAutofillHandler _autofillHandler;

        private CiphersPageViewModel _vm;
        private bool _hasFocused;
@@ -48,7 +48,7 @@ namespace Bit.App.Pages
            {
                NavigationPage.SetTitleView(this, _titleLayout);
            }
-            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            _autofillHandler = ServiceContainer.Resolve<IAutofillHandler>();
        }

        public SearchBar SearchBar => _searchBar;
@@ -107,7 +107,7 @@ namespace Bit.App.Pages
            }
            else
            {
-                _deviceActionService.CloseAutofill();
+                _autofillHandler.CloseAutofill();
            }
        }

--- a/src/App/Pages/Vault/CiphersPageViewModel.cs
+++ b/src/App/Pages/Vault/CiphersPageViewModel.cs
@@ -20,6 +20,7 @@ namespace Bit.App.Pages
        private readonly ICipherService _cipherService;
        private readonly ISearchService _searchService;
        private readonly IDeviceActionService _deviceActionService;
+        private readonly IAutofillHandler _autofillHandler;
        private readonly IStateService _stateService;
        private readonly IPasswordRepromptService _passwordRepromptService;
        private readonly IOrganizationService _organizationService;
@@ -37,6 +38,7 @@ namespace Bit.App.Pages
            _cipherService = ServiceContainer.Resolve<ICipherService>("cipherService");
            _searchService = ServiceContainer.Resolve<ISearchService>("searchService");
            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            _autofillHandler = ServiceContainer.Resolve<IAutofillHandler>();
            _stateService = ServiceContainer.Resolve<IStateService>("stateService");
            _passwordRepromptService = ServiceContainer.Resolve<IPasswordRepromptService>("passwordRepromptService");
            _organizationService = ServiceContainer.Resolve<IOrganizationService>("organizationService");
@@ -196,7 +198,7 @@ namespace Bit.App.Pages
                }
                else
                {
-                    _deviceActionService.Autofill(cipher);
+                    _autofillHandler.Autofill(cipher);
                }
            }
        }
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs
@@ -220,7 +220,7 @@ namespace Bit.App.Pages
                    NestedFolders = NestedFolders.GetRange(0, NestedFolders.Count - 1);
                }

-                var uppercaseGroupNames = _deviceActionService.DeviceType == DeviceType.iOS;
+                var uppercaseGroupNames = Device.RuntimePlatform == Device.iOS;
                var hasFavorites = FavoriteCiphers?.Any() ?? false;
                if (hasFavorites)
                {
@@ -400,7 +400,7 @@ namespace Bit.App.Pages

        private void CreateCipherGroupedItems(List<GroupingsPageListGroup> groupedItems)
        {
-            var uppercaseGroupNames = _deviceActionService.DeviceType == DeviceType.iOS;
+            var uppercaseGroupNames = Device.RuntimePlatform == Device.iOS;
            _totpTickCts?.Cancel();
            if (ShowTotp)
            {
--- a/src/App/Services/MobilePlatformUtilsService.cs
+++ b/src/App/Services/MobilePlatformUtilsService.cs
@@ -72,8 +72,13 @@ namespace Bit.App.Services
            });
        }

+        /// <summary>
+        /// Gets the device type on the server enum
+        /// </summary>
        public Core.Enums.DeviceType GetDevice()
        {
+            // Can't use Device.RuntimePlatform here because it gets called before Forms.Init() and throws.
+            // so we need to get the DeviceType ourselves
            return _deviceActionService.DeviceType;
        }

@@ -117,11 +122,6 @@ namespace Bit.App.Services
            }
        }

-        public void SaveFile()
-        {
-            // TODO
-        }
-
        public string GetApplicationVersion()
        {
            return AppInfo.VersionString;
@@ -208,11 +208,6 @@ namespace Bit.App.Services
            return (password, valid);
        }

-        public bool IsDev()
-        {
-            return Core.Utilities.CoreHelpers.InDebugMode();
-        }
-
        public bool IsSelfHost()
        {
            return false;
--- a/src/App/Utilities/AppHelpers.cs
+++ b/src/App/Utilities/AppHelpers.cs
@@ -564,7 +564,7 @@ namespace Bit.App.Utilities
            var sendService = ServiceContainer.Resolve<ISendService>("sendService");
            var passwordGenerationService = ServiceContainer.Resolve<IPasswordGenerationService>(
                "passwordGenerationService");
-            var deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            var fileService = ServiceContainer.Resolve<IFileService>();
            var policyService = ServiceContainer.Resolve<IPolicyService>("policyService");
            var searchService = ServiceContainer.Resolve<ISearchService>("searchService");
            var usernameGenerationService = ServiceContainer.Resolve<IUsernameGenerationService>(
@@ -572,7 +572,7 @@ namespace Bit.App.Utilities

            await Task.WhenAll(
                cipherService.ClearCacheAsync(),
-                deviceActionService.ClearCacheAsync());
+                fileService.ClearCacheAsync());
            tokenService.ClearCache();
            cryptoService.ClearCache();
            settingsService.ClearCache();