Merge branch 'main' into feature/maui-migration-passkeys

src/App/Platforms/Android/Services/DeviceActionService.cs

@@ -72,6 +72,8 @@ namespace Bit.Droid.Services
         }
 
         public bool LaunchApp(string appName)
+        {
+            try
             {
                 if ((int)Build.VERSION.SdkInt < 33)
                 {
@@ -85,6 +87,15 @@ namespace Bit.Droid.Services
                 launchIntentSender?.SendIntent(activity, Result.Ok, null, null, null);
                 return launchIntentSender != null;
             }
+            catch (IntentSender.SendIntentException)
+            {
+                return false;
+            }
+            catch (Android.Util.AndroidException)
+            {
+                return false;
+            }
+        }
 
         public async Task ShowLoadingAsync(string text)
         {

src/Core/App.xaml.cs

@@ -9,6 +9,7 @@ using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
+using Bit.Core.Models.Domain;
 using Bit.Core.Models.Response;
 using Bit.Core.Pages;
 using Bit.Core.Services;
@@ -167,18 +168,27 @@ namespace Bit.App
 
             _accountsManager.Init(() => Options, this);
 
+            _broadcasterService.Subscribe(nameof(App), BroadcastServiceMessageCallbackAsync);
+
             Bootstrap();
-            _broadcasterService.Subscribe(nameof(App), async (message) =>
+        }
+
+        private async void BroadcastServiceMessageCallbackAsync(Message message)
         {
            try
            {
+                ArgumentNullException.ThrowIfNull(message);
                 if (message.Command == "showDialog")
                 {
                     var details = message.Data as DialogDetails;
+                    ArgumentNullException.ThrowIfNull(details);
+                    ArgumentNullException.ThrowIfNull(MainPage);
+                    
                     var confirmed = true;
                     var confirmText = string.IsNullOrWhiteSpace(details.ConfirmText) ?
                         AppResources.Ok : details.ConfirmText;
-                        await MainThread.InvokeOnMainThreadAsync(async () =>
+                    await MainThread.InvokeOnMainThreadAsync(ShowDialogAction);
+                    async Task ShowDialogAction()
                     {
                         if (!string.IsNullOrWhiteSpace(details.CancelText))
                         {
@@ -190,7 +200,7 @@ namespace Bit.App
                             await MainPage.DisplayAlert(details.Title, details.Text, confirmText);
                         }
                         _messagingService.Send("showDialogResolve", new Tuple<int, bool>(details.DialogId, confirmed));
-                        });
+                    }
                 }
 #if IOS
                 else if (message.Command == AppHelpers.RESUMED_MESSAGE_COMMAND)
@@ -218,10 +228,13 @@ namespace Bit.App
                         Options.OtpData = new OtpData((string)message.Data);
                     }
 
-                        await MainThread.InvokeOnMainThreadAsync(async () =>
+                    await MainThread.InvokeOnMainThreadAsync(ExecuteNavigationAction); 
+                    async Task ExecuteNavigationAction()
                     {
                         if (MainPage is TabsPage tabsPage)
                         {
+                            ArgumentNullException.ThrowIfNull(tabsPage.Navigation);
+                            ArgumentNullException.ThrowIfNull(tabsPage.Navigation.ModalStack);
                             while (tabsPage.Navigation.ModalStack.Count > 0)
                             {
                                 await tabsPage.Navigation.PopModalAsync(false);
@@ -247,31 +260,41 @@ namespace Bit.App
                             else if (message.Command == DeepLinkContext.NEW_OTP_MESSAGE)
                             {
                                 tabsPage.ResetToVaultPage();
+                                ArgumentNullException.ThrowIfNull(tabsPage.Navigation);
                                 await tabsPage.Navigation.PushModalAsync(new NavigationPage(new CipherSelectionPage(Options)));
                             }
                         }
-                        });
+                    }
                 }
                 else if (message.Command == "convertAccountToKeyConnector")
                 {
-                        await MainThread.InvokeOnMainThreadAsync(async () =>
+                    ArgumentNullException.ThrowIfNull(MainPage);
+                    await MainThread.InvokeOnMainThreadAsync(NavigateToRemoveMasterPasswordPageAction);
+                    async Task NavigateToRemoveMasterPasswordPageAction()
                     {
                         await MainPage.Navigation.PushModalAsync(
                             new NavigationPage(new RemoveMasterPasswordPage()));
-                        });
+                    }
                 }
                 else if (message.Command == Constants.ForceUpdatePassword)
                 {
-                        await MainThread.InvokeOnMainThreadAsync(async () =>
+                    ArgumentNullException.ThrowIfNull(MainPage);
+                    await MainThread.InvokeOnMainThreadAsync(NavigateToUpdateTempPasswordPageAction);
+                    async Task NavigateToUpdateTempPasswordPageAction()
                     {
                         await MainPage.Navigation.PushModalAsync(
                             new NavigationPage(new UpdateTempPasswordPage()));
-                        });
+                    }
                 }
                 else if (message.Command == Constants.ForceSetPassword)
                 {
-                        await MainThread.InvokeOnMainThreadAsync(() => MainPage.Navigation.PushModalAsync(
+                    ArgumentNullException.ThrowIfNull(MainPage);
-                                new NavigationPage(new SetPasswordPage(orgIdentifier: (string)message.Data))));
+                    await MainThread.InvokeOnMainThreadAsync(NavigateToSetPasswordPageAction);
+                    void NavigateToSetPasswordPageAction()
+                    {
+                        MainPage.Navigation.PushModalAsync(
+                            new NavigationPage(new SetPasswordPage(orgIdentifier: (string)message.Data)));
+                    }
                 }
                 else if (message.Command == "syncCompleted")
                 {
@@ -292,7 +315,6 @@ namespace Bit.App
            {
                LoggerHelper.LogEvenIfCantBeResolved(ex);
            }
-            });
         }
 
         private async Task CheckPasswordlessLoginRequestsAsync()
@@ -307,7 +329,6 @@ namespace Bit.App
             {
                 return;
             }
-
             var notification = await _stateService.GetPasswordlessLoginNotificationAsync();
             if (notification == null)
             {

src/Core/Resources/Localization/AppResources.ar.resx

@@ -2878,12 +2878,12 @@
     <value>أعدنّ ميزة إلغاء القُفْل لتغيير إجراء مهلة المخزن الخاص بك.</value>
   </data>
   <data name="DuoTwoStepLoginIsRequiredForYourAccount" xml:space="preserve">
-    <value>Duo two-step login is required for your account. </value>
+    <value>تسجيل الدخول لـ Duo من خطوتين مطلوب لحسابك. </value>
   </data>
   <data name="FollowTheStepsFromDuoToFinishLoggingIn" xml:space="preserve">
-    <value>Follow the steps from Duo to finish logging in.</value>
+    <value>اتبع الخطوات من Duo لإنهاء تسجيل الدخول.</value>
   </data>
   <data name="LaunchDuo" xml:space="preserve">
-    <value>Launch Duo</value>
+    <value>تشغيل Duo</value>
   </data>
 </root>

src/Core/Resources/Localization/AppResources.nl.resx

@@ -371,7 +371,7 @@
     <comment>Label for a username.</comment>
   </data>
   <data name="ValidationFieldRequired" xml:space="preserve">
-    <value>Het {0}-veld is vereist.</value>
+    <value>Vul het veld {0} in.</value>
     <comment>Validation message for when a form field is left blank and is required to be entered.</comment>
   </data>
   <data name="ValueHasBeenCopied" xml:space="preserve">
@@ -996,7 +996,7 @@ Het scannen gebeurt automatisch.</value>
     <value>Beveiligingscode kopiëren</value>
   </data>
   <data name="Number" xml:space="preserve">
-    <value>Kaartummer</value>
+    <value>Kaartnummer</value>
   </data>
   <data name="SecurityCode" xml:space="preserve">
     <value>Beveiligingscode</value>

src/Core/Resources/Localization/AppResources.sv.resx

@@ -2879,12 +2879,12 @@ Vill du byta till detta konto?</value>
     <value>Ställ in ett upplåsningsalternativ för att ändra vad som händer när tidsgränsen uppnås.</value>
   </data>
   <data name="DuoTwoStepLoginIsRequiredForYourAccount" xml:space="preserve">
-    <value>Duo two-step login is required for your account. </value>
+    <value>Duo tvåstegsverifiering krävs för ditt konto. </value>
   </data>
   <data name="FollowTheStepsFromDuoToFinishLoggingIn" xml:space="preserve">
-    <value>Follow the steps from Duo to finish logging in.</value>
+    <value>Följ stegen från Duo för att slutföra inloggningen.</value>
   </data>
   <data name="LaunchDuo" xml:space="preserve">
-    <value>Launch Duo</value>
+    <value>Starta Duo</value>
   </data>
 </root>