Merge branch 'feature/maui-migration-passkeys' into feature/maui-migr…

…aton-passkeys-android-unlock
bitwarden · Apr 2, 2024 · e30e68b · e30e68b
2 parents 3441f14 + 856a084
commit e30e68b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/src/Core/Pages/Accounts/EnvironmentPage.xaml b/src/Core/Pages/Accounts/EnvironmentPage.xaml
@@ -21,10 +21,6 @@
     <ScrollView>
         <StackLayout Spacing="20">
             <StackLayout StyleClass="box">
-                <StackLayout StyleClass="box-row-header">
-                    <Label Text="MAUI APP"
-                           StyleClass="box-header, box-header-platform" />
-                </StackLayout>
                 <StackLayout StyleClass="box-row-header">
                     <Label Text="{u:I18n SelfHostedEnvironment, Header=True}"
                            StyleClass="box-header, box-header-platform" />

diff --git a/src/Core/Pages/Settings/AboutSettingsPageViewModel.cs b/src/Core/Pages/Settings/AboutSettingsPageViewModel.cs
@@ -68,8 +68,7 @@ public string AppInfo
         {
             get
             {
-                // TODO: REMOVE WHEN MERGED INTO MAIN BRANCH
-                var appInfo = string.Format("MAUI {0}: {1} ({2})",
+                var appInfo = string.Format("{0}: {1} ({2})",
                     AppResources.Version,
                     _platformUtilsService.GetApplicationVersion(),
                     _deviceActionService.GetBuildNumber());

diff --git a/src/iOS.Autofill/LoginListViewController.cs b/src/iOS.Autofill/LoginListViewController.cs
@@ -215,9 +215,14 @@ public async Task DoFido2GetAssertionAsync(IFido2GetAssertionUserInterface fido2
                 {
                     if (Context?.IsExecutingWithoutUserInteraction == false)
                     {
-                        await _platformUtilsService.Value.ShowDialogAsync(
+                        _ = _platformUtilsService.Value.ShowDialogAsync(
                             string.Format(AppResources.ThereWasAProblemReadingAPasskeyForXTryAgainLater, Context.PasskeyCredentialRequestParameters.RelyingPartyIdentifier),
                             AppResources.ErrorReadingPasskey);
+
+                        TableView.SectionHeaderHeight = 0; 
+                        Context.IsPasswordFallback = true;
+                        await ReloadItemsAsync();
+                        _alreadyLoadItemsOnce = true;
                     }
                 }
                 catch (Exception ex)

diff --git a/src/iOS.Autofill/Models/Context.cs b/src/iOS.Autofill/Models/Context.cs
@@ -70,7 +70,9 @@ public ASPasskeyCredentialIdentity PasskeyCredentialIdentity
 
         public bool IsPasskey => PasskeyCredentialRequest != null;
 
-        public bool IsPreparingListForPasskey => PasskeyCredentialRequestParameters != null;
+        public bool IsPasswordFallback { get; set; }
+
+        public bool IsPreparingListForPasskey => PasskeyCredentialRequestParameters != null && !IsPasswordFallback;
 
         public bool IsCreatingOrPreparingListForPasskey => IsCreatingPasskey || IsPreparingListForPasskey;
     }