PM-3349 PM-3350 Improved code safety with try...catch, better invoke on main thread and better null handling.

src/App/Platforms/Android/Handlers/CustomTabbedPageHandler.cs

@@ -1,5 +1,6 @@
 using AndroidX.AppCompat.View.Menu;
 using Bit.Core.Abstractions;
+using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Google.Android.Material.BottomNavigation;
 using Microsoft.Maui.Handlers;
@@ -90,7 +91,17 @@ namespace Bit.App.Handlers
 			if(e.Item is MenuItemImpl item)
 			{
 				System.Diagnostics.Debug.WriteLine($"Tab '{item.Title}' was reselected so we'll PopToRoot.");
-                MainThread.BeginInvokeOnMainThread(async () => await _tabbedPage.CurrentPage.Navigation.PopToRootAsync());
+                MainThread.BeginInvokeOnMainThread(async () =>
+                {
+                    try
+                    {
+                        await _tabbedPage.CurrentPage.Navigation.PopToRootAsync();
+                    }
+                    catch (Exception ex)
+                    {
+                        LoggerHelper.LogEvenIfCantBeResolved(ex);
+                    }
+                });
 			}
         }
 

src/App/Platforms/iOS/AppDelegate.cs

@@ -15,6 +15,7 @@ using CoreNFC;
 using Foundation;
 using Microsoft.Maui.Platform;
 using UIKit;
+using UserNotifications;
 using WatchConnectivity;
 
 namespace Bit.iOS
@@ -41,9 +42,11 @@ namespace Bit.iOS
         private IStateService _stateService;
         private IEventService _eventService;
 
-        private LazyResolve<IDeepLinkContext> _deepLinkContext = new LazyResolve<IDeepLinkContext>();
+        private readonly LazyResolve<IDeepLinkContext> _deepLinkContext = new LazyResolve<IDeepLinkContext>();
 
         public override bool FinishedLaunching(UIApplication app, NSDictionary options)
+        {
+            try
             {
                 InitApp();
 
@@ -70,14 +73,14 @@ namespace Bit.iOS
                         }
                         else if (message.Command is ThemeManager.UPDATED_THEME_MESSAGE_KEY)
                         {
-                        MainThread.BeginInvokeOnMainThread(() =>
+                            await MainThread.InvokeOnMainThreadAsync(() =>
                             {
                                 iOSCoreHelpers.AppearanceAdjustments();
                             });
                         }
-                    else if (message.Command == "listenYubiKeyOTP")
+                        else if (message.Command == "listenYubiKeyOTP" && message.Data is bool listen)
                         {
-                        iOSCoreHelpers.ListenYubiKey((bool)message.Data, _deviceActionService, _nfcSession, _nfcDelegate);
+                            iOSCoreHelpers.ListenYubiKey(listen, _deviceActionService, _nfcSession, _nfcDelegate);
                         }
                         else if (message.Command == "unlocked")
                         {
@@ -90,13 +93,13 @@ namespace Bit.iOS
                         }
                         else if (message.Command == "showAppExtension")
                         {
-                        MainThread.BeginInvokeOnMainThread(() => ShowAppExtension((ExtensionPageViewModel)message.Data));
+                            await MainThread.InvokeOnMainThreadAsync(() => ShowAppExtension((ExtensionPageViewModel)message.Data));
                         }
                         else if (message.Command == "syncCompleted")
                         {
-                        if (message.Data is Dictionary<string, object> data && data.ContainsKey("successfully"))
+                            if (message.Data is Dictionary<string, object> data && data.TryGetValue("successfully", out var value))
                             {
-                            var success = data["successfully"] as bool?;
+                                var success = value as bool?;
                                 if (success.GetValueOrDefault() && _deviceActionService.SystemMajorVersion() >= 12)
                                 {
                                     await ASHelpers.ReplaceAllIdentities();
@@ -106,8 +109,11 @@ namespace Bit.iOS
                         else if (message.Command == "addedCipher" || message.Command == "editedCipher" ||
                             message.Command == "restoredCipher")
                         {
-                        if (_deviceActionService.SystemMajorVersion() >= 12)
+                            if (!UIDevice.CurrentDevice.CheckSystemVersion(12, 0))
                             {
+                                return;
+                            }
+
                             if (await ASHelpers.IdentitiesCanIncremental())
                             {
                                 var cipherId = message.Data as string;
@@ -125,11 +131,13 @@ namespace Bit.iOS
                             }
                             await ASHelpers.ReplaceAllIdentities();
                         }
-                    }
                         else if (message.Command == "deletedCipher" || message.Command == "softDeletedCipher")
                         {
-                        if (_deviceActionService.SystemMajorVersion() >= 12)
+                            if (!UIDevice.CurrentDevice.CheckSystemVersion(12, 0))
                             {
+                                return;
+                            }
+
                             if (await ASHelpers.IdentitiesCanIncremental())
                             {
                                 var identity = ASHelpers.ToCredentialIdentity(
@@ -144,16 +152,12 @@ namespace Bit.iOS
                             }
                             await ASHelpers.ReplaceAllIdentities();
                         }
-                    }
+                        else if (message.Command == "logout" && UIDevice.CurrentDevice.CheckSystemVersion(12, 0))
-                    else if (message.Command == "logout")
-                    {
-                        if (_deviceActionService.SystemMajorVersion() >= 12)
                         {
                             await ASCredentialIdentityStore.SharedStore?.RemoveAllCredentialIdentitiesAsync();
                         }
-                    }
                         else if ((message.Command == "softDeletedCipher" || message.Command == "restoredCipher")
-                        && _deviceActionService.SystemMajorVersion() >= 12)
+                            && UIDevice.CurrentDevice.CheckSystemVersion(12, 0))
                         {
                             await ASHelpers.ReplaceAllIdentities();
                         }
@@ -161,9 +165,12 @@ namespace Bit.iOS
                         {
                             var timeoutAction = await _stateService.GetVaultTimeoutActionAsync();
                             if (timeoutAction == VaultTimeoutAction.Logout)
+                            {
+                                if (UIDevice.CurrentDevice.CheckSystemVersion(12, 0))
                                 {
                                     await ASCredentialIdentityStore.SharedStore?.RemoveAllCredentialIdentitiesAsync();
                                 }
+                            }
                             else
                             {
                                 await ASHelpers.ReplaceAllIdentities();
@@ -183,8 +190,16 @@ namespace Bit.iOS
 
                 return finishedLaunching;
             }
+            catch (Exception ex)
+            {
+                LoggerHelper.LogEvenIfCantBeResolved(ex);
+                throw;
+            }
+        }
 
         public override void OnResignActivation(UIApplication uiApplication)
+        {
+            try
             {
                 if (UIApplication.SharedApplication.KeyWindow != null)
                 {
@@ -212,8 +227,16 @@ namespace Bit.iOS
                 }
                 base.OnResignActivation(uiApplication);
             }
+            catch (Exception ex)
+            {
+                LoggerHelper.LogEvenIfCantBeResolved(ex);
+                throw;
+            }
+        }
 
         public override void DidEnterBackground(UIApplication uiApplication)
+        {
+            try
             {
                 if (_stateService != null && _deviceActionService != null)
                 {
@@ -223,23 +246,52 @@ namespace Bit.iOS
                 _messagingService?.Send("slept");
                 base.DidEnterBackground(uiApplication);
             }
+            catch (Exception ex)
+            {
+                LoggerHelper.LogEvenIfCantBeResolved(ex);
+                throw;
+            }
+        }
 
-        public override void OnActivated(UIApplication uiApplication)
+        public override async void OnActivated(UIApplication uiApplication)
+        {
+            try
             {
                 base.OnActivated(uiApplication);
+
+                if (UIDevice.CurrentDevice.CheckSystemVersion(17, 0))
+                {
+                    await UNUserNotificationCenter.Current.SetBadgeCountAsync(0);
+                }
+                else
+                {
                     UIApplication.SharedApplication.ApplicationIconBadgeNumber = 0;
+                }
+
                 UIApplication.SharedApplication.KeyWindow?
                     .ViewWithTag(SPLASH_VIEW_TAG)?
                     .RemoveFromSuperview();
 
                 ThemeManager.UpdateThemeOnPagesAsync();
             }
+            catch (Exception ex)
+            {
+                LoggerHelper.LogEvenIfCantBeResolved(ex);
+            }
+        }
 
         public override void WillEnterForeground(UIApplication uiApplication)
+        {
+            try
             {
                 _messagingService?.Send(AppHelpers.RESUMED_MESSAGE_COMMAND);
                 base.WillEnterForeground(uiApplication);
             }
+            catch (Exception ex)
+            {
+                LoggerHelper.LogEvenIfCantBeResolved(ex);
+            }
+        }
 
         [Export("application:openURL:sourceApplication:annotation:")]
         public bool OpenUrl(UIApplication application, NSUrl url, string sourceApplication, NSObject annotation)
@@ -248,51 +300,101 @@ namespace Bit.iOS
         }
 
         public override bool OpenUrl(UIApplication app, NSUrl url, NSDictionary options)
+        {
+            try
             {
                 return _deepLinkContext.Value.OnNewUri(url) || base.OpenUrl(app, url, options);
             }
+            catch (Exception ex)
+            {
+                LoggerHelper.LogEvenIfCantBeResolved(ex);
+                return false;
+            }
+        }
 
         public override bool ContinueUserActivity(UIApplication application, NSUserActivity userActivity,
             UIApplicationRestorationHandler completionHandler)
+        {
+            try
             {
                 if (Microsoft.Maui.ApplicationModel.Platform.ContinueUserActivity(application, userActivity, completionHandler))
                 {
                     return true;
                 }
+            }
+            catch (Exception ex)
+            {
+                LoggerHelper.LogEvenIfCantBeResolved(ex);
+            }
             return base.ContinueUserActivity(application, userActivity, completionHandler);
         }
 
         [Export("application:didFailToRegisterForRemoteNotificationsWithError:")]
         public void FailedToRegisterForRemoteNotifications(UIApplication application, NSError error)
+        {
+            try
             {
                 _pushHandler?.OnErrorReceived(error);
             }
+            catch (Exception ex)
+            {
+                LoggerHelper.LogEvenIfCantBeResolved(ex);
+            }
+        }
 
         [Export("application:didRegisterForRemoteNotificationsWithDeviceToken:")]
         public void RegisteredForRemoteNotifications(UIApplication application, NSData deviceToken)
+        {
+            try
             {
                 _pushHandler?.OnRegisteredSuccess(deviceToken);
             }
+            catch (Exception ex)
+            {
+                LoggerHelper.LogEvenIfCantBeResolved(ex);
+            }
+        }
 
         [Export("application:didRegisterUserNotificationSettings:")]
         public void DidRegisterUserNotificationSettings(UIApplication application,
             UIUserNotificationSettings notificationSettings)
+        {
+            try
             {
                 application.RegisterForRemoteNotifications();
             }
+            catch (Exception ex)
+            {
+                LoggerHelper.LogEvenIfCantBeResolved(ex);
+            }
+        }
 
         [Export("application:didReceiveRemoteNotification:fetchCompletionHandler:")]
         public void DidReceiveRemoteNotification(UIApplication application, NSDictionary userInfo,
             Action<UIBackgroundFetchResult> completionHandler)
+        {
+            try
             {
                 _pushHandler?.OnMessageReceived(userInfo);
             }
+            catch (Exception ex)
+            {
+                LoggerHelper.LogEvenIfCantBeResolved(ex);
+            }
+        }
 
         [Export("application:didReceiveRemoteNotification:")]
         public void ReceivedRemoteNotification(UIApplication application, NSDictionary userInfo)
+        {
+            try
             {
                 _pushHandler?.OnMessageReceived(userInfo);
             }
+            catch (Exception ex)
+            {
+                LoggerHelper.LogEvenIfCantBeResolved(ex);
+            }
+        }
 
         public void InitApp()
         {
@@ -304,17 +406,6 @@ namespace Bit.iOS
             // Migration services
             ServiceContainer.Register<INativeLogService>("nativeLogService", new ConsoleLogService());
 
-            // Note: This might cause a race condition. Investigate more.
-            //Task.Run(() =>
-            //{
-            //    FFImageLoading.Forms.Platform.CachedImageRenderer.Init();
-            //    FFImageLoading.ImageService.Instance.Initialize(new FFImageLoading.Config.Configuration
-            //    {
-            //        FadeAnimationEnabled = false,
-            //        FadeAnimationForCachedImages = false
-            //    });
-            //});
-
             iOSCoreHelpers.RegisterLocalServices();
             RegisterPush();
             var deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
@@ -328,7 +419,7 @@ namespace Bit.iOS
             _nfcDelegate = new Core.NFCReaderDelegate((success, message) =>
                 _messagingService.Send("gotYubiKeyOTP", message));
 
-            iOSCoreHelpers.Bootstrap(async () => await ApplyManagedSettingsAsync());
+            iOSCoreHelpers.Bootstrap(ApplyManagedSettingsAsync);
         }
 
         private void RegisterPush()
@@ -372,15 +463,24 @@ namespace Bit.iOS
             _eventTimer?.Dispose();
             _eventTimer = null;
             MainThread.BeginInvokeOnMainThread(() =>
+            {
+                try
                 {
                     _eventTimer = NSTimer.CreateScheduledTimer(60, true, timer =>
                     {
-                    var task = Task.Run(() => _eventService.UploadEventsAsync());
+                        _eventService?.UploadEventsAsync().FireAndForget();
                     });
+                }
+                catch (Exception ex)
+                {
+                    LoggerHelper.LogEvenIfCantBeResolved(ex);
+                }
             });
         }
 
         private async Task StopEventTimerAsync()
+        {
+            try
             {
                 _eventTimer?.Invalidate();
                 _eventTimer?.Dispose();
@@ -399,6 +499,11 @@ namespace Bit.iOS
                 UIApplication.SharedApplication.EndBackgroundTask(_eventBackgroundTaskId);
                 _eventBackgroundTaskId = 0;
             }
+            catch (Exception ex)
+            {
+                LoggerHelper.LogEvenIfCantBeResolved(ex);
+            }
+        }
 
         private async Task ApplyManagedSettingsAsync()
         {

src/Core/App.xaml.cs

@@ -81,7 +81,7 @@ namespace Bit.App
         {
             get
             {
-                return Application.Current.Windows.OfType<ResumeWindow>().FirstOrDefault(w => w.IsActive);
+                return Application.Current?.Windows.OfType<ResumeWindow>().FirstOrDefault(w => w.IsActive);
             }
         }
 
@@ -145,13 +145,16 @@ namespace Bit.App
         {
             get
             {
-                return Application.Current.MainPage;
+                return Application.Current?.MainPage;
             }
             set
+            {
+                if (Application.Current != null)
                 {
                     Application.Current.MainPage = value;
                 }
             }
+        }   
 #endif
 
         public App() : this(null)

src/Core/Pages/Accounts/LockPage.xaml.cs

@@ -81,7 +81,7 @@ namespace Bit.App.Pages
                 {
                     if (message.Command == Constants.ClearSensitiveFields)
                     {
-                        MainThread.BeginInvokeOnMainThread(_vm.ResetPinPasswordFields);
+                        MainThread.BeginInvokeOnMainThread(() => _vm?.ResetPinPasswordFields());
                     }
                 });
                 if (_appeared)

src/Core/Pages/Accounts/LockPageViewModel.cs

@@ -245,9 +245,9 @@ namespace Bit.App.Pages
 
         public async Task SubmitAsync()
         {
-            ShowPassword = false;
             try
             {
+                ShowPassword = false;
                 var kdfConfig = await _stateService.GetActiveUserCustomDataAsync(a => new KdfConfig(a?.Profile));
                 if (PinEnabled)
                 {
@@ -257,12 +257,15 @@ namespace Bit.App.Pages
                 {
                     await UnlockWithMasterPasswordAsync(kdfConfig);
                 }
-
             }
             catch (LegacyUserException)
             {
                 await HandleLegacyUserAsync();
             }
+            catch (Exception ex)
+            {
+                HandleException(ex);
+            }
         }
 
         private async Task UnlockWithPinAsync(KdfConfig kdfConfig)

src/Core/Pages/Accounts/LoginPage.xaml.cs

@@ -3,6 +3,7 @@ using Bit.App.Utilities;
 using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
+using Bit.Core.Services;
 using Bit.Core.Utilities;
 
 namespace Bit.App.Pages
@@ -74,7 +75,7 @@ namespace Bit.App.Pages
             {
                 if (message.Command == Constants.ClearSensitiveFields)
                 {
-                    MainThread.BeginInvokeOnMainThread(_vm.ResetPasswordField);
+                    MainThread.BeginInvokeOnMainThread(() => _vm?.ResetPasswordField());
                 }
             });
             _mainContent.Content = _mainLayout;
@@ -187,6 +188,8 @@ namespace Bit.App.Pages
         }
 
         private async Task LogInSuccessAsync()
+        {
+            try
             {
                 if (AppHelpers.SetAlternateMainPage(_appOptions))
                 {
@@ -195,6 +198,12 @@ namespace Bit.App.Pages
                 var previousPage = await AppHelpers.ClearPreviousPage();
                 App.MainPage = new TabsPage(_appOptions, previousPage);
             }
+            catch (Exception ex)
+            {
+                LoggerHelper.LogEvenIfCantBeResolved(ex);
+                throw;
+            }
+        }
 
         private async Task UpdateTempPasswordAsync()
         {

src/Core/Pages/Accounts/LoginPasswordlessRequestPage.xaml.cs

@@ -1,6 +1,7 @@
 using Bit.App.Models;
 using Bit.App.Utilities;
 using Bit.Core.Enums;
+using Bit.Core.Services;
 
 namespace Bit.App.Pages
 {
@@ -47,6 +48,8 @@ namespace Bit.App.Pages
         }
 
         private async Task LogInSuccessAsync()
+        {
+            try
             {
                 if (AppHelpers.SetAlternateMainPage(_appOptions))
                 {
@@ -55,6 +58,12 @@ namespace Bit.App.Pages
                 var previousPage = await AppHelpers.ClearPreviousPage();
                 App.MainPage = new TabsPage(_appOptions, previousPage);
             }
+            catch (Exception ex)
+            {
+                LoggerHelper.LogEvenIfCantBeResolved(ex);
+                throw;
+            }
+        }
 
         private async Task UpdateTempPasswordAsync()
         {

src/Core/Pages/Accounts/LoginSsoPage.xaml.cs

@@ -1,6 +1,7 @@
 using Bit.App.Models;
 using Bit.App.Utilities;
 using Bit.Core.Abstractions;
+using Bit.Core.Services;
 using Bit.Core.Utilities;
 
 namespace Bit.App.Pages
@@ -88,18 +89,32 @@ namespace Bit.App.Pages
         }
 
         private async Task StartTwoFactorAsync()
+        {
+            try
             {
                 RestoreAppOptionsFromCopy();
                 var page = new TwoFactorPage(true, _appOptions, _vm.OrgIdentifier);
                 await Navigation.PushModalAsync(new NavigationPage(page));
             }
+            catch (Exception ex)
+            {
+                LoggerHelper.LogEvenIfCantBeResolved(ex);
+            }
+        }
 
         private async Task StartSetPasswordAsync()
+        {
+            try
             {
                 RestoreAppOptionsFromCopy();
                 var page = new SetPasswordPage(_appOptions, _vm.OrgIdentifier);
                 await Navigation.PushModalAsync(new NavigationPage(page));
             }
+            catch (Exception ex)
+            {
+                LoggerHelper.LogEvenIfCantBeResolved(ex);
+            }
+        }
 
         private async Task UpdateTempPasswordAsync()
         {
@@ -114,6 +129,8 @@ namespace Bit.App.Pages
         }
 
         private async Task SsoAuthSuccessAsync()
+        {
+            try
             {
                 RestoreAppOptionsFromCopy();
                 await AppHelpers.ClearPreviousPage();
@@ -127,5 +144,10 @@ namespace Bit.App.Pages
                     App.MainPage = new TabsPage(_appOptions, null);
                 }
             }
+            catch (Exception ex)
+            {
+                LoggerHelper.LogEvenIfCantBeResolved(ex);
+            }
+        }
     }
 }

src/Core/Pages/Accounts/SetPasswordPage.xaml.cs

@@ -1,5 +1,6 @@
 using Bit.App.Models;
 using Bit.App.Utilities;
+using Bit.Core.Services;
 
 namespace Bit.App.Pages
 {
@@ -63,6 +64,8 @@ namespace Bit.App.Pages
         }
 
         private async Task SetPasswordSuccessAsync()
+        {
+            try
             {
                 if (AppHelpers.SetAlternateMainPage(_appOptions))
                 {
@@ -71,5 +74,10 @@ namespace Bit.App.Pages
                 var previousPage = await AppHelpers.ClearPreviousPage();
                 App.MainPage = new TabsPage(_appOptions, previousPage);
             }
+            catch (Exception ex)
+            {
+                LoggerHelper.LogEvenIfCantBeResolved(ex);
+            }
+        }
     }
 }

src/Core/Pages/Accounts/TwoFactorPage.xaml.cs

@@ -2,6 +2,7 @@
 using Bit.App.Models;
 using Bit.App.Utilities;
 using Bit.Core.Abstractions;
+using Bit.Core.Services;
 using Bit.Core.Utilities;
 
 namespace Bit.App.Pages
@@ -63,11 +64,11 @@ namespace Bit.App.Pages
                     if (_vm.YubikeyMethod && !string.IsNullOrWhiteSpace(token) &&
                         token.Length == 44 && !token.Contains(" "))
                     {
-                        MainThread.BeginInvokeOnMainThread(async () =>
+                        MainThread.BeginInvokeOnMainThread(() =>
                         {
                             _vm.Token = token;
-                            await _vm.SubmitAsync();
                         });
+                        _vm.SubmitCommand.Execute(null);
                     }
                 }
                 else if (message.Command == "resumeYubiKey")
@@ -124,12 +125,9 @@ namespace Bit.App.Pages
             return base.OnBackButtonPressed();
         }
 
-        private async void Continue_Clicked(object sender, EventArgs e)
+        private void Continue_Clicked(object sender, EventArgs e)
         {
-            if (DoOnce())
+            _vm.SubmitCommand.Execute(null);
-            {
-                await _vm.SubmitAsync();
-            }
         }
 
         private async void Methods_Clicked(object sender, EventArgs e)
@@ -157,6 +155,8 @@ namespace Bit.App.Pages
         }
 
         private async void TryAgain_Clicked(object sender, EventArgs e)
+        {
+            try
             {
                 if (DoOnce())
                 {
@@ -170,6 +170,11 @@ namespace Bit.App.Pages
                     }
                 }
             }
+            catch (Exception ex)
+            {
+                LoggerHelper.LogEvenIfCantBeResolved(ex);
+            }
+        }
 
         private async Task StartSetPasswordAsync()
         {

src/Core/Pages/Accounts/TwoFactorPageViewModel.cs

@@ -1,25 +1,16 @@
-using System;
+using System.Net;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
 using System.Windows.Input;
 using Bit.App.Abstractions;
-using Bit.Core.Resources.Localization;
 using Bit.App.Utilities;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Domain;
 using Bit.Core.Models.Request;
-using Bit.Core.Services;
+using Bit.Core.Resources.Localization;
 using Bit.Core.Utilities;
 using Newtonsoft.Json;
 
-using Microsoft.Maui.Authentication;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
-
 namespace Bit.App.Pages
 {
     public class TwoFactorPageViewModel : CaptchaProtectedViewModel
@@ -62,7 +53,7 @@ namespace Bit.App.Pages
             _deviceTrustCryptoService = ServiceContainer.Resolve<IDeviceTrustCryptoService>();
 
             PageTitle = AppResources.TwoStepLogin;
-            SubmitCommand = new Command(async () => await SubmitAsync());
+            SubmitCommand = CreateDefaultAsyncRelayCommand(() => MainThread.InvokeOnMainThreadAsync(async () => await SubmitAsync()), allowsMultipleExecutions: false);
             MoreCommand = CreateDefaultAsyncRelayCommand(MoreAsync, onException: _logger.Exception, allowsMultipleExecutions: false);
         }
 
@@ -91,8 +82,7 @@ namespace Bit.App.Pages
 
         public bool TotpMethod => AuthenticatorMethod || EmailMethod;
 
-        public bool ShowTryAgain => (YubikeyMethod && // TODO Xamarin.Forms.Device.RuntimePlatform is no longer supported. Use Microsoft.Maui.Devices.DeviceInfo.Platform instead. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes
+        public bool ShowTryAgain => (YubikeyMethod && DeviceInfo.Platform == DevicePlatform.iOS) || Fido2Method;
-Device.RuntimePlatform == Device.iOS) || Fido2Method;
 
         public bool ShowContinue
         {
@@ -106,9 +96,11 @@ Device.RuntimePlatform == Device.iOS) || Fido2Method;
             set => SetProperty(ref _enableContinue, value);
         }
 
-        public string YubikeyInstruction => // TODO Xamarin.Forms.Device.RuntimePlatform is no longer supported. Use Microsoft.Maui.Devices.DeviceInfo.Platform instead. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes
+#if IOS
-Device.RuntimePlatform == Device.iOS ? AppResources.YubiKeyInstructionIos :
+        public string YubikeyInstruction => AppResources.YubiKeyInstructionIos;
-            AppResources.YubiKeyInstruction;
+#else
+        public string YubikeyInstruction => AppResources.YubiKeyInstruction;
+#endif
 
         public TwoFactorProviderType? SelectedProviderType
         {
@@ -124,7 +116,7 @@ Device.RuntimePlatform == Device.iOS ? AppResources.YubiKeyInstructionIos :
                 nameof(ShowTryAgain),
             });
         }
-        public Command SubmitCommand { get; }
+        public ICommand SubmitCommand { get; }
         public ICommand MoreCommand { get; }
         public Action TwoFactorAuthSuccessAction { get; set; }
         public Action LockAction { get; set; }
@@ -186,7 +178,7 @@ Device.RuntimePlatform == Device.iOS ? AppResources.YubiKeyInstructionIos :
                     page.DuoWebView.RegisterAction(sig =>
                     {
                         Token = sig;
-                        Device.BeginInvokeOnMainThread(async () => await SubmitAsync());
+                        SubmitCommand.Execute(null);
                     });
                     break;
                 case TwoFactorProviderType.Email:
@@ -212,6 +204,8 @@ Device.RuntimePlatform == Device.iOS ? AppResources.YubiKeyInstructionIos :
         }
 
         public async Task Fido2AuthenticateAsync(Dictionary<string, object> providerData = null)
+        {
+            try
             {
                 await _deviceActionService.ShowLoadingAsync(AppResources.Validating);
 
@@ -276,6 +270,12 @@ Device.RuntimePlatform == Device.iOS ? AppResources.YubiKeyInstructionIos :
                             AppResources.AnErrorHasOccurred, AppResources.Ok);
                     }
                 }
+
+            }
+            catch (Exception ex)
+            {
+                HandleException(ex);
+            }
         }
 
         public async Task SubmitAsync(bool showLoading = true)

src/Core/Pages/BaseContentPage.cs

@@ -169,9 +169,16 @@ namespace Bit.App.Pages
         protected void RequestFocus(InputView input)
         {
             Task.Run(async () =>
+            {
+                try
                 {
                     await Task.Delay(ShowModalAnimationDelay);
                     MainThread.BeginInvokeOnMainThread(() => input.Focus());
+                }
+                catch (Exception ex)
+                {
+                    _logger.Value.Exception(ex);
+                }
             });
         }
 

src/iOS.Core/Handlers/CustomTabbedHandler.cs

@@ -1,5 +1,4 @@
-using Bit.App.Abstractions;
+using Bit.App.Pages;
-using Bit.App.Pages;
 using Bit.App.Utilities;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
@@ -13,7 +12,7 @@ namespace Bit.iOS.Core.Handlers
     public partial class CustomTabbedHandler : TabbedRenderer
     {
         private IBroadcasterService _broadcasterService;
-        private UITabBarItem _previousSelectedItem;
+        private UITabBarItem? _previousSelectedItem;
 
         public CustomTabbedHandler()
         {
@@ -73,8 +72,7 @@ namespace Bit.iOS.Core.Handlers
         private void UpdateTabBarAppearance()
         {
             // https://developer.apple.com/forums/thread/682420
-            var deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            if (UIDevice.CurrentDevice.CheckSystemVersion(15,0))
-            if (deviceActionService.SystemMajorVersion() >= 15)
             {
                 var appearance = new UITabBarAppearance();
                 appearance.ConfigureWithOpaqueBackground();

src/iOS.Core/Services/LocalizeService.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Diagnostics;
-using System.Diagnostics;
 using System.Globalization;
 using Bit.App.Abstractions;
 using Bit.App.Models;
@@ -20,7 +19,7 @@ namespace Bit.iOS.Core.Services
             }
 
             // This gets called a lot - try/catch can be expensive so consider caching or something
-            CultureInfo ci = null;
+            CultureInfo? ci;
             try
             {
                 ci = new CultureInfo(netLanguage);
@@ -108,7 +107,7 @@ namespace Bit.iOS.Core.Services
             {
                 df.Locale = NSLocale.CurrentLocale;
                 df.DateStyle = NSDateFormatterStyle.Short;
-                return df.StringFor((NSDate)date);
+                return df.StringFor((NSDate?)date);
             }
         }
 
@@ -118,7 +117,7 @@ namespace Bit.iOS.Core.Services
             {
                 df.Locale = NSLocale.CurrentLocale;
                 df.TimeStyle = NSDateFormatterStyle.Short;
-                return df.StringFor((NSDate)time);
+                return df.StringFor((NSDate?)time);
             }
         }
     }

src/iOS.Core/Utilities/DictionaryExtensions.cs

@@ -1,8 +1,4 @@
-using System;
+using Foundation;
-using System.Collections.Generic;
-using System.Linq;
-using Bit.Core.Models.Domain;
-using Foundation;
 using Newtonsoft.Json;
 
 namespace Bit.iOS.Core.Utilities
@@ -15,6 +11,7 @@ namespace Bit.iOS.Core.Utilities
         }
 
         public static NSDictionary<KTo,VTo> ToNSDictionary<KFrom,VFrom,KTo,VTo>(this Dictionary<KFrom, VFrom> dict, Func<KFrom, KTo> keyConverter, Func<VFrom, VTo> valueConverter)
+            where KFrom : notnull
             where KTo : NSObject
             where VTo : NSObject
         {
@@ -23,19 +20,20 @@ namespace Bit.iOS.Core.Utilities
             return NSDictionary<KTo, VTo>.FromObjectsAndKeys(NSValues, NSKeys, NSKeys.Count());
         }
 
-        public static Dictionary<string, object> ToDictionary(this NSDictionary<NSString, NSObject> nsDict)
+        public static Dictionary<string, object?> ToDictionary(this NSDictionary<NSString, NSObject> nsDict)
         {
-            return nsDict.ToDictionary(v => v?.ToString() as object);
+            return nsDict.ToDictionary(v => v?.ToString());
         }
 
-        public static Dictionary<string, object> ToDictionary(this NSDictionary<NSString, NSObject> nsDict, Func<NSObject, object> valueTransformer)
+        public static Dictionary<string, object?> ToDictionary(this NSDictionary<NSString, NSObject> nsDict, Func<NSObject, object?> valueTransformer)
         {
             return nsDict.ToDictionary(k => k.ToString(), v => valueTransformer(v));
         }
 
-        public static Dictionary<KTo, VTo> ToDictionary<KFrom, VFrom, KTo, VTo>(this NSDictionary<KFrom, VFrom> nsDict, Func<KFrom, KTo> keyConverter, Func<VFrom, VTo> valueConverter)
+        public static Dictionary<KTo, VTo?> ToDictionary<KFrom, VFrom, KTo, VTo>(this NSDictionary<KFrom, VFrom> nsDict, Func<KFrom, KTo> keyConverter, Func<VFrom, VTo?> valueConverter)
             where KFrom : NSObject
             where VFrom : NSObject
+            where KTo : notnull
         {
             var keys = nsDict.Keys.Select(k => keyConverter(k)).ToArray();
             var values = nsDict.Values.Select(v => valueConverter(v)).ToArray();

src/iOS.Core/Utilities/WCSessionManager.cs

@@ -1,14 +1,8 @@
-using System;
+using System.Diagnostics;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Core.Models.Domain;
 using Bit.Core.Services;
 using Bit.iOS.Core.Utilities;
 using Foundation;
 using Newtonsoft.Json;
-using ObjCRuntime;
 
 namespace WatchConnectivity
 {
@@ -17,35 +11,45 @@ namespace WatchConnectivity
         // Setup is converted from https://www.natashatherobot.com/watchconnectivity-say-hello-to-wcsession/ 
         // with some extra bits
         private static readonly WCSessionManager sharedManager = new WCSessionManager();
-        private static WCSession session = WCSession.IsSupported ? WCSession.DefaultSession : null;
+        private static WCSession? session = WCSession.IsSupported ? WCSession.DefaultSession : null;
 
-        public event WCSessionReceiveDataHandler OnApplicationContextUpdated;
+        public event WCSessionReceiveDataHandler? OnApplicationContextUpdated;
-        public event WCSessionReceiveDataHandler OnMessagedReceived;
+        public event WCSessionReceiveDataHandler? OnMessagedReceived;
-        public delegate void WCSessionReceiveDataHandler(WCSession session, Dictionary<string, object> data);
+        public delegate void WCSessionReceiveDataHandler(WCSession session, Dictionary<string, object?> data);
 
-        WCSessionUserInfoTransfer _transf;
+        WCSessionUserInfoTransfer? _transf;
 
-        private WCSession validSession
+        private WCSession? validSession
         {
             get
             {
+                if (session is null)
+                {
+                    return null;
+                }
+
                 Debug.WriteLine($"Paired status:{(session.Paired ? '✓' : '✗')}\n");
                 Debug.WriteLine($"Watch App Installed status:{(session.WatchAppInstalled ? '✓' : '✗')}\n");
                 return (session.Paired && session.WatchAppInstalled) ? session : null;
             }
         }
 
-        private WCSession validReachableSession
+        private WCSession? validReachableSession
         {
             get
             {
+                if (session is null)
+                {
+                    return null;
+                }
+
                 return session.Reachable ? validSession : null;
             }
         }
 
         public bool IsValidSession => validSession != null;
 
-        public bool IsSessionReachable => session.Reachable;
+        public bool IsSessionReachable => session?.Reachable ?? false;
 
         public bool IsSessionActivated => validSession?.ActivationState == WCSessionActivationState.Activated;
 
@@ -71,7 +75,7 @@ namespace WatchConnectivity
 
         public override void SessionReachabilityDidChange(WCSession session)
         {
-            Debug.WriteLine($"Watch connectivity Reachable:{(session.Reachable ? '✓' : '✗')}");
+            Debug.WriteLine($"Watch connectivity Reachable:{(session?.Reachable == true ? '✓' : '✗')}");
         }
 
         public void SendBackgroundHighPriorityMessage(NSDictionary<NSString, NSObject> applicationContext)
@@ -102,7 +106,7 @@ namespace WatchConnectivity
 
         public void SendBackgroundFifoHighPriorityMessage(Dictionary<string, object> message)
         {
-            if(validSession is null || validSession.ActivationState != WCSessionActivationState.Activated)
+            if (session is null || validSession is null || validSession.ActivationState != WCSessionActivationState.Activated)
             {
                 return;
             }
@@ -112,6 +116,10 @@ namespace WatchConnectivity
             Debug.WriteLine("Started transferring user info");
 
             _transf = session.TransferUserInfo(message.ToNSDictionary());
+            if (_transf is null)
+            {
+                return;
+            }
 
             Task.Run(async () =>
             {
@@ -136,7 +144,7 @@ namespace WatchConnectivity
             if (OnApplicationContextUpdated != null)
             {
                 var keys = applicationContext.Keys.Select(k => k.ToString()).ToArray();
-                var values = applicationContext.Values.Select(v => JsonConvert.DeserializeObject(v.ToString())).ToArray();
+                var values = applicationContext.Values.Select(v => v != null ? JsonConvert.DeserializeObject(v.ToString()) : null).ToArray();
                 var dictionary = keys.Zip(values, (k, v) => new { Key = k, Value = v })
                                      .ToDictionary(x => x.Key, x => x.Value);
 

src/iOS.Core/Utilities/iOSCoreHelpers.cs

@@ -116,8 +116,12 @@ namespace Bit.iOS.Core.Utilities
                 ServiceContainer.Register<INativeLogService>("nativeLogService", new ConsoleLogService());
             }
 
-            ILogger logger = null;
+            ILogger? logger = null;
-            if (ServiceContainer.Resolve<ILogger>("logger", true) == null)
+            if (ServiceContainer.TryResolve<ILogger>(out var resolvedLogger))
+            {
+                logger = resolvedLogger;
+            }
+            else
             { 
 #if DEBUG
                 logger = DebugLogger.Instance;
@@ -129,6 +133,12 @@ namespace Bit.iOS.Core.Utilities
 
             var preferencesStorage = new PreferencesStorageService(AppGroupId);
             var appGroupContainer = new NSFileManager().GetContainerUrl(AppGroupId);
+            if (appGroupContainer?.Path is null)
+            {
+                var nreAppGroupContainer = new NullReferenceException("appGroupContainer or its Path is null when registering local services");
+                logger!.Exception(nreAppGroupContainer);
+                throw nreAppGroupContainer;
+            }
             var liteDbStorage = new LiteDbStorageService(
                 Path.Combine(appGroupContainer.Path, "Library", "bitwarden.db"));
             var localizeService = new LocalizeService();
@@ -187,14 +197,14 @@ namespace Bit.iOS.Core.Utilities
                 ServiceContainer.Resolve<ILogger>()));
         }
 
-        public static void Bootstrap(Func<Task> postBootstrapFunc = null)
+        public static void Bootstrap(Func<Task>? postBootstrapFunc = null)
         {
             var locale = ServiceContainer.Resolve<IStateService>().GetLocale();
             (ServiceContainer.Resolve<II18nService>("i18nService") as MobileI18nService)
-                .Init(locale != null ? new System.Globalization.CultureInfo(locale) : null);
+                ?.Init(locale != null ? new System.Globalization.CultureInfo(locale) : null);
             ServiceContainer.Resolve<IAuthService>("authService").Init();
             (ServiceContainer.
-                Resolve<IPlatformUtilsService>("platformUtilsService") as MobilePlatformUtilsService).Init();
+                Resolve<IPlatformUtilsService>("platformUtilsService") as MobilePlatformUtilsService)?.Init();
 
             var accountsManager = new AccountsManager(
                 ServiceContainer.Resolve<IBroadcasterService>("broadcasterService"),
@@ -231,20 +241,31 @@ namespace Bit.iOS.Core.Utilities
                 if (message.Command == "showDialog")
                 {
                     var details = message.Data as DialogDetails;
+                    if (details is null)
+                    {
+                        return;
+                    }
                     var confirmText = string.IsNullOrWhiteSpace(details.ConfirmText) ?
                         AppResources.Ok : details.ConfirmText;
 
                     NSRunLoop.Main.BeginInvokeOnMainThread(async () =>
+                    {
+                        try
                         {
                             var result = await deviceActionService.DisplayAlertAsync(details.Title, details.Text,
                                details.CancelText, confirmText);
                             var confirmed = result == details.ConfirmText;
                             messagingService.Send("showDialogResolve", new Tuple<int, bool>(details.DialogId, confirmed));
+                        }
+                        catch (Exception ex)
+                        {
+                            LoggerHelper.LogEvenIfCantBeResolved(ex);
+                        }
                     });
                 }
-                else if (message.Command == "listenYubiKeyOTP")
+                else if (message.Command == "listenYubiKeyOTP" && message.Data is bool listen)
                 {
-                    ListenYubiKey((bool)message.Data, deviceActionService, nfcSession, nfcDelegate);
+                    ListenYubiKey(listen, deviceActionService, nfcSession, nfcDelegate);
                 }
             });
         }
@@ -268,7 +289,9 @@ namespace Bit.iOS.Core.Utilities
             }
         }
 
-        private static async Task BootstrapAsync(Func<Task> postBootstrapFunc = null)
+        private static async Task BootstrapAsync(Func<Task>? postBootstrapFunc = null)
+        {
+            try
             {
                 await ServiceContainer.Resolve<IEnvironmentService>("environmentService").SetUrlsFromStorageAsync();
 
@@ -293,6 +316,11 @@ namespace Bit.iOS.Core.Utilities
                     await postBootstrapFunc.Invoke();
                 }
             }
+            catch (Exception ex)
+            {
+                LoggerHelper.LogEvenIfCantBeResolved(ex);
+            }
+        }
 
         private static void InitializeAppSetup()
         {

src/iOS.Core/Views/ExtensionSearchDelegate.cs

@@ -1,6 +1,4 @@
-using System;
+using Bit.Core.Services;
-using System.Threading;
-using System.Threading.Tasks;
 using Foundation;
 using UIKit;
 
@@ -9,7 +7,7 @@ namespace Bit.iOS.Core.Views
     public class ExtensionSearchDelegate : UISearchBarDelegate
     {
         private readonly UITableView _tableView;
-        private CancellationTokenSource _filterResultsCancellationTokenSource;
+        private CancellationTokenSource? _filterResultsCancellationTokenSource;
 
         public ExtensionSearchDelegate(UITableView tableView)
         {
@@ -22,6 +20,8 @@ namespace Bit.iOS.Core.Views
             Task.Run(() =>
             {
                 NSRunLoop.Main.BeginInvokeOnMainThread(async () =>
+                {
+                    try
                     {
                         if (!string.IsNullOrWhiteSpace(searchText))
                         {
@@ -42,6 +42,13 @@ namespace Bit.iOS.Core.Views
                         }
                         catch (OperationCanceledException) { }
                         _filterResultsCancellationTokenSource = cts;
+                    }
+                    catch (Exception ex)
+                    {
+                        LoggerHelper.LogEvenIfCantBeResolved(ex);
+                        _filterResultsCancellationTokenSource?.Cancel();
+                        cts?.Cancel();
+                    }
                 });
             }, cts.Token);
         }

src/iOS.Extension/LoadingViewController.cs

@@ -478,17 +478,24 @@ namespace Bit.iOS.Extension
         private void LogoutIfAuthed()
         {
             NSRunLoop.Main.BeginInvokeOnMainThread(async () =>
+            {
+                try
                 {
                     if (await IsAuthed())
                     {
                         var stateService = ServiceContainer.Resolve<IStateService>("stateService");
                         await AppHelpers.LogOutAsync(await stateService.GetActiveUserIdAsync());
-                    var deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+                        if (UIDevice.CurrentDevice.CheckSystemVersion(12, 0))
-                    if (deviceActionService.SystemMajorVersion() >= 12)
                         {
                             await ASCredentialIdentityStore.SharedStore?.RemoveAllCredentialIdentitiesAsync();
                         }
                     }
+                }
+                catch (Exception ex)
+                {
+                    LoggerHelper.LogEvenIfCantBeResolved(ex);
+                    throw;
+                }
             });
         }
 

src/iOS.ShareExtension/LoadingViewController.cs

@@ -273,6 +273,8 @@ namespace Bit.iOS.ShareExtension
         private void LogoutIfAuthed()
         {
             NSRunLoop.Main.BeginInvokeOnMainThread(async () =>
+            {
+                try
                 {
                     if (await IsAuthed())
                     {
@@ -282,6 +284,12 @@ namespace Bit.iOS.ShareExtension
                             await ASCredentialIdentityStore.SharedStore?.RemoveAllCredentialIdentitiesAsync();
                         }
                     }
+                }
+                catch (Exception ex)
+                {
+                    LoggerHelper.LogEvenIfCantBeResolved(ex);
+                    throw;
+                }
             });
         }