PM-3194 Fix biometrics button to be shown on upgrade when no UserKey is present yet

renaming bio key and fix build
Merge branch 'auth/pm-2713/drop-master-key-dependency' into add-bio-key-migration
2026-02-03 10:03:16 +00:00 · 2023-08-07 11:48:21 -03:00 · 2023-08-07 09:59:23 -04:00 · 2023-08-07 09:57:53 -04:00 · 2023-08-04 18:39:16 -03:00 · 2023-08-04 16:34:27 -04:00
1314 changed files with 3042 additions and 273471 deletions
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@

 # Bitwarden Mobile Application

-<a href="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden" target="_blank"><img alt="Get it on Google Play" src="https://imgur.com/YQzmZi9.png" width="153" height="46"></a> <a href="https://mobileapp.bitwarden.com/fdroid/" target="_blank"><img alt="Get it on F-Droid" src="https://i.imgur.com/HDicnzz.png" width="154" height="46"></a> <a href="https://itunes.apple.com/us/app/bitwarden-free-password-manager/id1137397744?mt=8" target="_blank"><img src="https://imgur.com/GdGqPMY.png" width="135" height="40"></a>
+<a href="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden" target="_blank"><img alt="Get it on Google Play" src="https://imgur.com/YQzmZi9.png" width="153" height="46"></a> <a href="https://mobileapp.bitwarden.com/fdroid/" target="_blank"><img alt="Get it on Google Play" src="https://i.imgur.com/HDicnzz.png" width="154" height="46"></a> <a href="https://itunes.apple.com/us/app/bitwarden-free-password-manager/id1137397744?mt=8" target="_blank"><img src="https://imgur.com/GdGqPMY.png" width="135" height="40"></a>

 The Bitwarden mobile application is written in C# with Xamarin Android, Xamarin iOS, and Xamarin Forms.

--- a/global.json
+++ b/global.json
@@ -1,5 +0,0 @@
-{
-  "sdk": {
-    "version": "7.0.306"
-  }
-}
--- a/src/Android/Assets/bwi-font.ttf
+++ b/src/Android/Assets/bwi-font.ttf
--- a/src/Android/MainApplication.cs
+++ b/src/Android/MainApplication.cs
@@ -156,9 +156,9 @@ namespace Bit.Droid
                messagingService, broadcasterService);
            var autofillHandler = new AutofillHandler(stateService, messagingService, clipboardService,
                platformUtilsService, new LazyResolve<IEventService>());
-            var biometricService = new BiometricService(stateService);
            var cryptoFunctionService = new PclCryptoFunctionService(cryptoPrimitiveService);
            var cryptoService = new CryptoService(stateService, cryptoFunctionService);
+            var biometricService = new BiometricService(stateService, cryptoService);
            var passwordRepromptService = new MobilePasswordRepromptService(platformUtilsService, cryptoService);

            ServiceContainer.Register<ISynchronousStorageService>(preferencesStorage);
--- a/src/Android/Services/BiometricService.cs
+++ b/src/Android/Services/BiometricService.cs
@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using Android.OS;
 using Android.Security.Keystore;
+using Bit.App.Services;
 using Bit.Core.Abstractions;
 using Bit.Core.Services;
 using Java.Security;
@@ -9,10 +10,8 @@ using Javax.Crypto;

 namespace Bit.Droid.Services
 {
-    public class BiometricService : IBiometricService
+    public class BiometricService : BaseBiometricService
    {
-        private readonly IStateService _stateService;
-
        private const string KeyName = "com.8bit.bitwarden.biometric_integrity";

        private const string KeyStoreName = "AndroidKeyStore";
@@ -24,14 +23,14 @@ namespace Bit.Droid.Services

        private readonly KeyStore _keystore;

-        public BiometricService(IStateService stateService)
+        public BiometricService(IStateService stateService, ICryptoService cryptoService)
+            : base(stateService, cryptoService)
        {
-            _stateService = stateService;
            _keystore = KeyStore.GetInstance(KeyStoreName);
            _keystore.Load(null);
        }

-        public async Task<bool> SetupBiometricAsync(string bioIntegritySrcKey = null)
+        public override async Task<bool> SetupBiometricAsync(string bioIntegritySrcKey = null)
        {
            if (Build.VERSION.SdkInt >= BuildVersionCodes.M)
            {
@@ -41,7 +40,7 @@ namespace Bit.Droid.Services
            return true;
        }

-        public async Task<bool> IsSystemBiometricIntegrityValidAsync(string bioIntegritySrcKey = null)
+        public override async Task<bool> IsSystemBiometricIntegrityValidAsync(string bioIntegritySrcKey = null)
        {
            if (Build.VERSION.SdkInt < BuildVersionCodes.M)
            {
--- a/src/Android/Services/DeviceActionService.cs
+++ b/src/Android/Services/DeviceActionService.cs
@@ -3,6 +3,7 @@ using System.Threading.Tasks;
 using Android.App;
 using Android.Content;
 using Android.Content.PM;
+using Android.Media;
 using Android.Nfc;
 using Android.OS;
 using Android.Provider;
@@ -17,9 +18,14 @@ using Bit.App.Utilities;
 using Bit.App.Utilities.Prompts;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
+using Bit.Core.Utilities;
 using Bit.Droid.Utilities;
 using Plugin.CurrentActivity;
 using Xamarin.Forms.Platform.Android;
+using static Android.Icu.Text.CaseMap;
+using static Android.Renderscripts.ScriptGroup;
+using static Android.Util.EventLogTags;
+using static Bit.App.Pages.SettingsPageViewModel;

 namespace Bit.Droid.Services
 {
@@ -261,7 +267,6 @@ namespace Bit.Droid.Services
            
            var result = new TaskCompletionSource<ValidatablePromptResponse?>();

-            alertBuilder.SetOnCancelListener(new BasicDialogWithResultCancelListener(result));
            alertBuilder.SetPositiveButton(config.OkButtonText ?? AppResources.Ok, listener: null);
            alertBuilder.SetNegativeButton(config.CancelButtonText ?? AppResources.Cancel, (sender, args) => result.TrySetResult(null));
            if (!string.IsNullOrEmpty(config.ThirdButtonText))
@@ -609,20 +614,4 @@ namespace Bit.Droid.Services
 #pragma warning restore CS0618 // Type or member is obsolete
        }
    }
-
-    class BasicDialogWithResultCancelListener : Java.Lang.Object, IDialogInterfaceOnCancelListener
-    {
-        private readonly TaskCompletionSource<ValidatablePromptResponse?> _taskCompletionSource;
-
-        public BasicDialogWithResultCancelListener(TaskCompletionSource<ValidatablePromptResponse?> taskCompletionSource)
-        {
-            _taskCompletionSource = taskCompletionSource;
-        }
-
-        public void OnCancel(IDialogInterface dialog)
-        {
-            _taskCompletionSource?.TrySetResult(null);
-            dialog?.Dismiss();
-        }
-    }
 }
--- a/src/App/App.csproj
+++ b/src/App/App.csproj
@@ -1,28 +1,33 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
    <RootNamespace>Bit.App</RootNamespace>
    <AssemblyName>BitwardenApp</AssemblyName>
    <Configurations>Debug;Release;FDroid</Configurations>
-    <TargetFrameworks>net7.0-android;net7.0-ios</TargetFrameworks>
-    <UseMaui>True</UseMaui>
-    <OutputType>Library</OutputType>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <SingleProject>true</SingleProject>
  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DebugType>pdbonly</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+
  <ItemGroup>
    <PackageReference Include="Plugin.Fingerprint" Version="2.1.5" />
+    <PackageReference Include="SkiaSharp.Views.Forms" Version="2.88.3" />
+    <PackageReference Include="Xamarin.CommunityToolkit" Version="2.0.6" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.7.5" />
    <PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.4.11.982" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2578" />
    <PackageReference Include="ZXing.Net.Mobile" Version="2.4.1" />
    <PackageReference Include="ZXing.Net.Mobile.Forms" Version="2.4.1" />
    <PackageReference Include="MessagePack" Version="2.4.59" />
-    <PackageReference Include="SkiaSharp.Views.Maui.Core" Version="2.88.3" />
-    <PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.3" />
-    <PackageReference Include="SkiaSharp.Views.Maui.Controls.Compatibility" Version="2.88.3" />
-    <PackageReference Include="CommunityToolkit.Maui" Version="5.2.0" />
  </ItemGroup>
+
  <ItemGroup>
    <ProjectReference Include="..\Core\Core.csproj" />
  </ItemGroup>
+
  <ItemGroup>
    <Compile Update="Pages\Accounts\EnvironmentPage.xaml.cs">
      <DependentUpon>EnvironmentPage.xaml</DependentUpon>
@@ -125,6 +130,7 @@
      <DependentUpon>LoginPasswordlessRequestPage.xaml</DependentUpon>
    </Compile>
  </ItemGroup>
+
  <ItemGroup>
    <Folder Include="Resources\" />
    <Folder Include="Behaviors\" />
@@ -142,9 +148,11 @@
    <Folder Include="Utilities\Automation\" />
    <Folder Include="Utilities\Prompts\" />
  </ItemGroup>
+
  <ItemGroup>
    <EmbeddedResource Remove="Pages\Accounts\AccountsPopupPage.xaml" />
  </ItemGroup>
+
  <ItemGroup>
    <Compile Update="Styles\Black.xaml.cs">
      <DependentUpon>Black.xaml</DependentUpon>
@@ -168,6 +176,7 @@
      <DependentUpon>Android.xaml</DependentUpon>
    </Compile>
  </ItemGroup>
+
  <ItemGroup>
    <Compile Update="Resources\AppResources.cs.Designer.cs">
      <DependentUpon>AppResources.cs.resx</DependentUpon>
@@ -305,6 +314,7 @@
      <AutoGen>True</AutoGen>
    </Compile>
  </ItemGroup>
+
  <ItemGroup>
    <EmbeddedResource Update="Resources\AppResources.cs.resx">
      <LastGenOutput>AppResources.cs.Designer.cs</LastGenOutput>
@@ -415,6 +425,7 @@
      <Generator>ResXFileCodeGenerator</Generator>
    </EmbeddedResource>
  </ItemGroup>
+
  <ItemGroup>
    <None Remove="Behaviors\" />
    <None Remove="Xamarin.CommunityToolkit" />
@@ -434,4 +445,4 @@
    <None Remove="Utilities\Automation\" />
    <None Remove="Utilities\Prompts\" />
  </ItemGroup>
-</Project>
+</Project>
--- a/src/App/App.xaml
+++ b/src/App/App.xaml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+<?xml version="1.0" encoding="utf-8" ?>
+<Application xmlns="http://xamarin.com/schemas/2014/forms"
             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
             x:Class="Bit.App.App">
    <Application.Resources>
--- a/src/App/App.xaml.cs
+++ b/src/App/App.xaml.cs
@@ -15,9 +15,8 @@ using Bit.Core.Models.Data;
 using Bit.Core.Models.Response;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
-using Microsoft.Maui.Controls.Xaml;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;

 [assembly: XamlCompilation(XamlCompilationOptions.Compile)]
 namespace Bit.App
@@ -94,7 +93,6 @@ namespace Bit.App
                    }
                    else if (message.Command == "resumed")
                    {
-                        // 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 (Device.RuntimePlatform == Device.iOS)
                        {
                            ResumedAsync().FireAndForget();
@@ -102,7 +100,6 @@ namespace Bit.App
                    }
                    else if (message.Command == "slept")
                    {
-                        // 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 (Device.RuntimePlatform == Device.iOS)
                        {
                            await SleptAsync();
@@ -124,7 +121,7 @@ namespace Bit.App
                            Options.OtpData = new OtpData((string)message.Data);
                        }

-                        Device.InvokeOnMainThreadAsync(async () =>
+                        await Device.InvokeOnMainThreadAsync(async () =>
                        {
                            if (Current.MainPage is TabsPage tabsPage)
                            {
@@ -296,7 +293,6 @@ namespace Bit.App
            {
                _messagingService.Send(Constants.PasswordlessLoginRequestKey);
            }
-            // 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 (Device.RuntimePlatform == Device.Android)
            {
                await _vaultTimeoutService.CheckVaultTimeoutAsync();
@@ -312,7 +308,6 @@ namespace Bit.App
        {
            System.Diagnostics.Debug.WriteLine("XF App: OnSleep");
            _isResumed = false;
-            // 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 (Device.RuntimePlatform == Device.Android)
            {
                var isLocked = await _vaultTimeoutService.IsLockedAsync();
@@ -336,7 +331,6 @@ namespace Bit.App
            {
                _messagingService.Send(Constants.PasswordlessLoginRequestKey);
            }
-            // 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 (Device.RuntimePlatform == Device.Android)
            {
                ResumedAsync().FireAndForget();
@@ -402,7 +396,6 @@ namespace Bit.App

        private void ClearAutofillUri()
        {
-            // 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 (Device.RuntimePlatform == Device.Android && !string.IsNullOrWhiteSpace(Options.Uri))
            {
                Options.Uri = null;
@@ -411,7 +404,6 @@ namespace Bit.App

        private bool SetTabsPageFromAutofill(bool isLocked)
        {
-            // 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 (Device.RuntimePlatform == Device.Android && !string.IsNullOrWhiteSpace(Options.Uri) &&
                !Options.FromAutofillFramework)
            {
@@ -460,7 +452,7 @@ namespace Bit.App

        private void SyncIfNeeded()
        {
-            if (Microsoft.Maui.Networking.Connectivity.NetworkAccess == Microsoft.Maui.Networking.NetworkAccess.None)
+            if (Xamarin.Essentials.Connectivity.NetworkAccess == Xamarin.Essentials.NetworkAccess.None)
            {
                return;
            }
--- a/src/App/Behaviors/EditorPreventAutoBottomScrollingOnFocusedBehavior.cs
+++ b/src/App/Behaviors/EditorPreventAutoBottomScrollingOnFocusedBehavior.cs
@@ -1,5 +1,5 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Essentials;
+using Xamarin.Forms;

 namespace Bit.App.Behaviors
 {
--- a/src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayView.xaml
+++ b/src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayView.xaml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <ContentView
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns="http://xamarin.com/schemas/2014/forms"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:xct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+    xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
    xmlns:controls="clr-namespace:Bit.App.Controls"
    xmlns:effects="clr-namespace:Bit.App.Effects"
    xmlns:view="clr-namespace:Bit.Core.Models.View;assembly=BitwardenCore"
--- a/src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayView.xaml.cs
+++ b/src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayView.xaml.cs
@@ -4,8 +4,7 @@ using System.Windows.Input;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
@@ -62,8 +61,7 @@ namespace Bit.App.Controls

        public ICommand LongPressAccountCommand { get; }

-        public int AccountListRowHeight => // 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
-Device.RuntimePlatform == Device.Android ? 74 : 70;
+        public int AccountListRowHeight => Device.RuntimePlatform == Device.Android ? 74 : 70;

        public bool LongPressAccountEnabled { get; set; } = true;

--- a/src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayViewModel.cs
+++ b/src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayViewModel.cs
@@ -7,8 +7,7 @@ using Bit.Core.Abstractions;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/AccountViewCell/AccountViewCell.xaml
+++ b/src/App/Controls/AccountViewCell/AccountViewCell.xaml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ViewCell xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewCell xmlns="http://xamarin.com/schemas/2014/forms"
          xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-          xmlns:xct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+          xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
          x:Class="Bit.App.Controls.AccountViewCell"
          xmlns:controls="clr-namespace:Bit.App.Controls"
          xmlns:u="clr-namespace:Bit.App.Utilities"
--- a/src/App/Controls/AccountViewCell/AccountViewCell.xaml.cs
+++ b/src/App/Controls/AccountViewCell/AccountViewCell.xaml.cs
@@ -1,7 +1,6 @@
 using System.Windows.Input;
 using Bit.Core.Models.View;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml
+++ b/src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<controls:ExtendedGrid xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+<controls:ExtendedGrid xmlns="http://xamarin.com/schemas/2014/forms"
                       xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
                       x:Class="Bit.App.Controls.AuthenticatorViewCell"
                       xmlns:controls="clr-namespace:Bit.App.Controls"
--- a/src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml.cs
+++ b/src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml.cs
@@ -3,8 +3,7 @@ using Bit.App.Pages;
 using Bit.App.Utilities;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/AvatarImageSource.cs
+++ b/src/App/Controls/AvatarImageSource.cs
@@ -5,8 +5,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Bit.Core.Utilities;
 using SkiaSharp;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
@@ -161,7 +160,7 @@ namespace Bit.App.Controls
        {
            if (str == null)
            {
-                return Color.FromArgb("#33ffffff");
+                return Color.FromHex("#33ffffff");
            }
            var hash = 0;
            for (var i = 0; i < str.Length; i++)
@@ -175,7 +174,7 @@ namespace Bit.App.Controls
                var base16 = "00" + Convert.ToString(value, 16);
                color += base16.Substring(base16.Length - 2);
            }
-            return Color.FromArgb(color);
+            return Color.FromHex(color);
        }
    }
 }
--- a/src/App/Controls/CipherViewCell/CipherViewCell.xaml
+++ b/src/App/Controls/CipherViewCell/CipherViewCell.xaml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<controls:ExtendedGrid xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+<?xml version="1.0" encoding="UTF-8"?>
+<controls:ExtendedGrid xmlns="http://xamarin.com/schemas/2014/forms"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Controls.CipherViewCell"
    xmlns:controls="clr-namespace:Bit.App.Controls"
--- a/src/App/Controls/CipherViewCell/CipherViewCell.xaml.cs
+++ b/src/App/Controls/CipherViewCell/CipherViewCell.xaml.cs
@@ -3,8 +3,7 @@ using System.Windows.Input;
 using Bit.App.Abstractions;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/CipherViewCell/CipherViewCellViewModel.cs
+++ b/src/App/Controls/CipherViewCell/CipherViewCellViewModel.cs
@@ -31,7 +31,7 @@ namespace Bit.App.Controls
        public bool ShowIconImage
        {
            get => WebsiteIconsEnabled
-                && !string.IsNullOrWhiteSpace(Cipher.LaunchUri)
+                && !string.IsNullOrWhiteSpace(Cipher.Login?.Uri)
                && IconImageSource != null;
        }

@@ -41,7 +41,7 @@ namespace Bit.App.Controls
            {
                if (_iconImageSource == string.Empty) // default value since icon source can return null
                {
-                    _iconImageSource = IconImageHelper.GetIconImage(Cipher);
+                    _iconImageSource = IconImageHelper.GetLoginIconImage(Cipher);
                }
                return _iconImageSource;
            }
--- a/src/App/Controls/CircularProgressbarView.cs
+++ b/src/App/Controls/CircularProgressbarView.cs
@@ -1,11 +1,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using SkiaSharp;
-using Microsoft.Maui.Graphics;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
-using SkiaSharp.Views.Maui.Controls;
-using SkiaSharp.Views.Maui;
+using SkiaSharp.Views.Forms;
+using Xamarin.Essentials;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
@@ -23,13 +21,13 @@ namespace Bit.App.Controls
            nameof(StrokeWidth), typeof(float), typeof(CircularProgressbarView), 3f);

        public static readonly BindableProperty ProgressColorProperty = BindableProperty.Create(
-            nameof(ProgressColor), typeof(Color), typeof(CircularProgressbarView), Color.FromArgb("175DDC"));
+            nameof(ProgressColor), typeof(Color), typeof(CircularProgressbarView), Color.FromHex("175DDC"));

        public static readonly BindableProperty EndingProgressColorProperty = BindableProperty.Create(
-            nameof(EndingProgressColor), typeof(Color), typeof(CircularProgressbarView), Color.FromArgb("dd4b39"));
+            nameof(EndingProgressColor), typeof(Color), typeof(CircularProgressbarView), Color.FromHex("dd4b39"));

        public static readonly BindableProperty BackgroundProgressColorProperty = BindableProperty.Create(
-            nameof(BackgroundProgressColor), typeof(Color), typeof(CircularProgressbarView), Colors.White);
+            nameof(BackgroundProgressColor), typeof(Color), typeof(CircularProgressbarView), Color.White);

        public double Progress
        {
--- a/src/App/Controls/CustomLabel.cs
+++ b/src/App/Controls/CustomLabel.cs
@@ -1,5 +1,4 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/DateTime/DateTimePicker.xaml
+++ b/src/App/Controls/DateTime/DateTimePicker.xaml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <Grid
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns="http://xamarin.com/schemas/2014/forms"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    xmlns:controls="clr-namespace:Bit.App.Controls"
    x:Class="Bit.App.Controls.DateTimePicker"
--- a/src/App/Controls/DateTime/DateTimePicker.xaml.cs
+++ b/src/App/Controls/DateTime/DateTimePicker.xaml.cs
@@ -1,12 +1,6 @@
 using System.Runtime.CompilerServices;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
-using CommunityToolkit.Maui.Converters;
-using CommunityToolkit.Maui.ImageSources;
-using CommunityToolkit.Maui;
-using CommunityToolkit.Maui.Core;
-using CommunityToolkit.Maui.Layouts;
-using CommunityToolkit.Maui.Views;
+using Xamarin.CommunityToolkit.UI.Views;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/ExtendedCollectionView.cs
+++ b/src/App/Controls/ExtendedCollectionView.cs
@@ -1,7 +1,6 @@
 using System.Linq;
-using CommunityToolkit.Maui.Converters;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.CommunityToolkit.Converters;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/ExtendedDatePicker.cs
+++ b/src/App/Controls/ExtendedDatePicker.cs
@@ -1,6 +1,5 @@
 using System;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/ExtendedGrid.cs
+++ b/src/App/Controls/ExtendedGrid.cs
@@ -1,5 +1,4 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/ExtendedSearchBar.cs
+++ b/src/App/Controls/ExtendedSearchBar.cs
@@ -1,7 +1,5 @@
 using Bit.App.Utilities;
-using Microsoft.Maui.Graphics;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
@@ -9,7 +7,6 @@ namespace Bit.App.Controls
    {
        public ExtendedSearchBar()
        {
-            // 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 (Device.RuntimePlatform == Device.iOS)
            {
                if (ThemeManager.UsingLightTheme)
--- a/src/App/Controls/ExtendedSlider.cs
+++ b/src/App/Controls/ExtendedSlider.cs
@@ -1,12 +1,11 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
    public class ExtendedSlider : Slider
    {
        public static readonly BindableProperty ThumbBorderColorProperty = BindableProperty.Create(
-            nameof(ThumbBorderColor), typeof(Color), typeof(ExtendedSlider), Color.FromArgb("b5b5b5"));
+            nameof(ThumbBorderColor), typeof(Color), typeof(ExtendedSlider), Color.FromHex("b5b5b5"));

        public Color ThumbBorderColor
        {
--- a/src/App/Controls/ExtendedStackLayout.cs
+++ b/src/App/Controls/ExtendedStackLayout.cs
@@ -1,5 +1,4 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/ExtendedStepper.cs
+++ b/src/App/Controls/ExtendedStepper.cs
@@ -1,16 +1,14 @@
-using Microsoft.Maui.Graphics;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
    public class ExtendedStepper : Stepper
    {
        public static readonly BindableProperty StepperBackgroundColorProperty = BindableProperty.Create(
-            nameof(StepperBackgroundColor), typeof(Color), typeof(ExtendedStepper), Colors.White);
+            nameof(StepperBackgroundColor), typeof(Color), typeof(ExtendedStepper), Color.White);

        public static readonly BindableProperty StepperForegroundColorProperty = BindableProperty.Create(
-            nameof(StepperForegroundColor), typeof(Color), typeof(ExtendedStepper), Colors.Black);
+            nameof(StepperForegroundColor), typeof(Color), typeof(ExtendedStepper), Color.Black);

        public Color StepperBackgroundColor
        {
--- a/src/App/Controls/ExtendedTimePicker.cs
+++ b/src/App/Controls/ExtendedTimePicker.cs
@@ -1,6 +1,5 @@
 using System;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/ExtendedToolbarItem.cs
+++ b/src/App/Controls/ExtendedToolbarItem.cs
@@ -1,6 +1,5 @@
 using System;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/HybridWebView.cs
+++ b/src/App/Controls/HybridWebView.cs
@@ -1,6 +1,5 @@
 using System;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/IconButton.cs
+++ b/src/App/Controls/IconButton.cs
@@ -1,6 +1,5 @@
 using Bit.App.Effects;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
@@ -9,7 +8,6 @@ namespace Bit.App.Controls
        public IconButton()
        {
            Padding = 0;
-            // 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
            switch (Device.RuntimePlatform)
            {
                case Device.iOS:
--- a/src/App/Controls/IconLabel.cs
+++ b/src/App/Controls/IconLabel.cs
@@ -1,6 +1,5 @@
 using Bit.App.Effects;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
@@ -10,7 +9,6 @@ namespace Bit.App.Controls

        public IconLabel()
        {
-            // 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
            switch (Device.RuntimePlatform)
            {
                case Device.iOS:
--- a/src/App/Controls/IconLabelButton/IconLabelButton.xaml
+++ b/src/App/Controls/IconLabelButton/IconLabelButton.xaml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Frame xmlns="http://schemas.microsoft.com/dotnet/2021/maui" 
+<?xml version="1.0" encoding="UTF-8"?>
+<Frame xmlns="http://xamarin.com/schemas/2014/forms" 
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Controls.IconLabelButton"
    xmlns:controls="clr-namespace:Bit.App.Controls"
--- a/src/App/Controls/IconLabelButton/IconLabelButton.xaml.cs
+++ b/src/App/Controls/IconLabelButton/IconLabelButton.xaml.cs
@@ -5,10 +5,8 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
 using Bit.Core.Models.Domain;
-using Microsoft.Maui.Controls.Xaml;
-using Microsoft.Maui.Graphics;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;

 namespace Bit.App.Controls
 {
@@ -24,13 +22,13 @@ namespace Bit.App.Controls
            nameof(ButtonCommand), typeof(ICommand), typeof(IconLabelButton));

        public static readonly BindableProperty IconLabelColorProperty = BindableProperty.Create(
-            nameof(IconLabelColor), typeof(Color), typeof(IconLabelButton), Colors.White);
+            nameof(IconLabelColor), typeof(Color), typeof(IconLabelButton), Color.White);

        public static readonly BindableProperty IconLabelBackgroundColorProperty = BindableProperty.Create(
-            nameof(IconLabelBackgroundColor), typeof(Color), typeof(IconLabelButton), Colors.White);
+            nameof(IconLabelBackgroundColor), typeof(Color), typeof(IconLabelButton), Color.White);

        public static readonly BindableProperty IconLabelBorderColorProperty = BindableProperty.Create(
-            nameof(IconLabelBorderColor), typeof(Color), typeof(IconLabelButton), Colors.White);
+            nameof(IconLabelBorderColor), typeof(Color), typeof(IconLabelButton), Color.White);

        public IconLabelButton()
        {
--- a/src/App/Controls/MiButton.cs
+++ b/src/App/Controls/MiButton.cs
@@ -1,5 +1,4 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
@@ -8,7 +7,6 @@ namespace Bit.App.Controls
        public MiButton()
        {
            Padding = 0;
-            // 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
            switch (Device.RuntimePlatform)
            {
                case Device.iOS:
--- a/src/App/Controls/MiLabel.cs
+++ b/src/App/Controls/MiLabel.cs
@@ -1,5 +1,4 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
@@ -7,7 +6,6 @@ namespace Bit.App.Controls
    {
        public MiLabel()
        {
-            // 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
            switch (Device.RuntimePlatform)
            {
                case Device.iOS:
--- a/src/App/Controls/MonoEntry.cs
+++ b/src/App/Controls/MonoEntry.cs
@@ -1,5 +1,4 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
@@ -7,7 +6,6 @@ namespace Bit.App.Controls
    {
        public MonoEntry()
        {
-            // 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
            switch (Device.RuntimePlatform)
            {
                case Device.iOS:
--- a/src/App/Controls/MonoLabel.cs
+++ b/src/App/Controls/MonoLabel.cs
@@ -1,5 +1,4 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
@@ -7,7 +6,6 @@ namespace Bit.App.Controls
    {
        public MonoLabel()
        {
-            // 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
            switch (Device.RuntimePlatform)
            {
                case Device.iOS:
--- a/src/App/Controls/PasswordStrengthProgressBar/PasswordStrengthProgressBar.xaml
+++ b/src/App/Controls/PasswordStrengthProgressBar/PasswordStrengthProgressBar.xaml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <StackLayout
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns="http://xamarin.com/schemas/2014/forms"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    xmlns:controls="clr-namespace:Bit.App.Controls"
    xmlns:u="clr-namespace:Bit.App.Utilities"
--- a/src/App/Controls/PasswordStrengthProgressBar/PasswordStrengthProgressBar.xaml.cs
+++ b/src/App/Controls/PasswordStrengthProgressBar/PasswordStrengthProgressBar.xaml.cs
@@ -1,7 +1,5 @@
 using System;
-using Microsoft.Maui.Graphics;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
@@ -102,7 +100,7 @@ namespace Bit.App.Controls
                case Controls.PasswordStrengthLevel.Strong:
                    return StrongColor;
                default:
-                    return Colors.Transparent;
+                    return Color.Transparent;
            }
        }
    }
--- a/src/App/Controls/PasswordStrengthProgressBar/PasswordStrengthViewModel.cs
+++ b/src/App/Controls/PasswordStrengthProgressBar/PasswordStrengthViewModel.cs
@@ -1,8 +1,7 @@
 using System.Collections.Generic;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/RepeaterView.cs
+++ b/src/App/Controls/RepeaterView.cs
@@ -1,8 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Specialized;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/SelectableLabel.cs
+++ b/src/App/Controls/SelectableLabel.cs
@@ -1,6 +1,5 @@
 using System;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
--- a/src/App/Controls/SendViewCell/SendViewCell.xaml
+++ b/src/App/Controls/SendViewCell/SendViewCell.xaml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<controls:ExtendedGrid xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+<?xml version="1.0" encoding="UTF-8"?>
+<controls:ExtendedGrid xmlns="http://xamarin.com/schemas/2014/forms"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Controls.SendViewCell"
    xmlns:controls="clr-namespace:Bit.App.Controls"
--- a/src/App/Controls/SendViewCell/SendViewCell.xaml.cs
+++ b/src/App/Controls/SendViewCell/SendViewCell.xaml.cs
@@ -2,8 +2,7 @@
 using Bit.App.Abstractions;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Controls
 {
--- a/src/App/Effects/FabShadowEffect.cs
+++ b/src/App/Effects/FabShadowEffect.cs
@@ -1,5 +1,4 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Effects
 {
--- a/src/App/Effects/FixedSizeEffect.cs
+++ b/src/App/Effects/FixedSizeEffect.cs
@@ -1,5 +1,4 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Effects
 {
--- a/src/App/Effects/NoEmojiKeyboardEffect.cs
+++ b/src/App/Effects/NoEmojiKeyboardEffect.cs
@@ -1,6 +1,5 @@
 using System;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Effects
 {
--- a/src/App/Effects/RemoveFontPaddingEffect.cs
+++ b/src/App/Effects/RemoveFontPaddingEffect.cs
@@ -1,6 +1,5 @@
 using System;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Effects
 {
--- a/src/App/Effects/ScrollEnabledEffect.cs
+++ b/src/App/Effects/ScrollEnabledEffect.cs
@@ -1,5 +1,4 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Effects
 {
--- a/src/App/Effects/ScrollViewContentInsetAdjustmentBehaviorEffect.cs
+++ b/src/App/Effects/ScrollViewContentInsetAdjustmentBehaviorEffect.cs
@@ -1,5 +1,4 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Effects
 {
--- a/src/App/Effects/TabBarEffect.cs
+++ b/src/App/Effects/TabBarEffect.cs
@@ -1,5 +1,4 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Effects
 {
--- a/src/App/Lists/DataTemplateSelectors/CustomFieldItemTemplateSelector.cs
+++ b/src/App/Lists/DataTemplateSelectors/CustomFieldItemTemplateSelector.cs
@@ -1,6 +1,5 @@
 using Bit.App.Lists.ItemViewModels.CustomFields;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Lists.DataTemplateSelectors
 {
--- a/src/App/Lists/ItemLayouts/CustomFields/BooleanCustomFieldItemLayout.xaml
+++ b/src/App/Lists/ItemLayouts/CustomFields/BooleanCustomFieldItemLayout.xaml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <StackLayout
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns="http://xamarin.com/schemas/2014/forms"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Lists.ItemLayouts.CustomFields.BooleanCustomFieldItemLayout"
    xmlns:u="clr-namespace:Bit.App.Utilities"
--- a/src/App/Lists/ItemLayouts/CustomFields/BooleanCustomFieldItemLayout.xaml.cs
+++ b/src/App/Lists/ItemLayouts/CustomFields/BooleanCustomFieldItemLayout.xaml.cs
@@ -1,5 +1,4 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Lists.ItemLayouts.CustomFields
 {
--- a/src/App/Lists/ItemLayouts/CustomFields/HiddenCustomFieldItemLayout.xaml
+++ b/src/App/Lists/ItemLayouts/CustomFields/HiddenCustomFieldItemLayout.xaml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<StackLayout xmlns="http://schemas.microsoft.com/dotnet/2021/maui" 
+<?xml version="1.0" encoding="UTF-8"?>
+<StackLayout xmlns="http://xamarin.com/schemas/2014/forms" 
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Lists.ItemLayouts.CustomFields.HiddenCustomFieldItemLayout"
    xmlns:controls="clr-namespace:Bit.App.Controls"
--- a/src/App/Lists/ItemLayouts/CustomFields/HiddenCustomFieldItemLayout.xaml.cs
+++ b/src/App/Lists/ItemLayouts/CustomFields/HiddenCustomFieldItemLayout.xaml.cs
@@ -1,5 +1,4 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Lists.ItemLayouts.CustomFields
 {
--- a/src/App/Lists/ItemLayouts/CustomFields/LinkedCustomFieldItemLayout.xaml
+++ b/src/App/Lists/ItemLayouts/CustomFields/LinkedCustomFieldItemLayout.xaml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<StackLayout xmlns="http://schemas.microsoft.com/dotnet/2021/maui" 
+<?xml version="1.0" encoding="UTF-8"?>
+<StackLayout xmlns="http://xamarin.com/schemas/2014/forms" 
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Lists.ItemLayouts.CustomFields.LinkedCustomFieldItemLayout"
    xmlns:controls="clr-namespace:Bit.App.Controls"
--- a/src/App/Lists/ItemLayouts/CustomFields/LinkedCustomFieldItemLayout.xaml.cs
+++ b/src/App/Lists/ItemLayouts/CustomFields/LinkedCustomFieldItemLayout.xaml.cs
@@ -1,5 +1,4 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Lists.ItemLayouts.CustomFields
 {
--- a/src/App/Lists/ItemLayouts/CustomFields/TextCustomFieldItemLayout.xaml
+++ b/src/App/Lists/ItemLayouts/CustomFields/TextCustomFieldItemLayout.xaml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<StackLayout xmlns="http://schemas.microsoft.com/dotnet/2021/maui" 
+<?xml version="1.0" encoding="UTF-8"?>
+<StackLayout xmlns="http://xamarin.com/schemas/2014/forms" 
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Lists.ItemLayouts.CustomFields.TextCustomFieldItemLayout"
    xmlns:controls="clr-namespace:Bit.App.Controls"
--- a/src/App/Lists/ItemLayouts/CustomFields/TextCustomFieldItemLayout.xaml.cs
+++ b/src/App/Lists/ItemLayouts/CustomFields/TextCustomFieldItemLayout.xaml.cs
@@ -1,5 +1,4 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Lists.ItemLayouts.CustomFields
 {
--- a/src/App/Lists/ItemViewModels/CustomFields/BaseCustomFieldItemViewModel.cs
+++ b/src/App/Lists/ItemViewModels/CustomFields/BaseCustomFieldItemViewModel.cs
@@ -1,8 +1,7 @@
 using System.Windows.Input;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Lists.ItemViewModels.CustomFields
 {
--- a/src/App/Lists/ItemViewModels/CustomFields/HiddenCustomFieldItemViewModel.cs
+++ b/src/App/Lists/ItemViewModels/CustomFields/HiddenCustomFieldItemViewModel.cs
@@ -5,8 +5,7 @@ using Bit.App.Utilities;
 using Bit.Core.Abstractions;
 using Bit.Core.Models.View;
 using Xamarin.CommunityToolkit.ObjectModel;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Lists.ItemViewModels.CustomFields
 {
--- a/src/App/Lists/ItemViewModels/CustomFields/TextCustomFieldItemViewModel.cs
+++ b/src/App/Lists/ItemViewModels/CustomFields/TextCustomFieldItemViewModel.cs
@@ -1,7 +1,6 @@
 using System.Windows.Input;
 using Bit.Core.Models.View;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Lists.ItemViewModels.CustomFields
 {
--- a/src/App/Pages/Accounts/BaseChangePasswordViewModel.cs
+++ b/src/App/Pages/Accounts/BaseChangePasswordViewModel.cs
@@ -6,6 +6,7 @@ using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Models.Domain;
 using Bit.Core.Utilities;
+using Xamarin.Essentials;

 namespace Bit.App.Pages
 {
--- a/src/App/Pages/Accounts/DeleteAccountPage.xaml
+++ b/src/App/Pages/Accounts/DeleteAccountPage.xaml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <pages:BaseContentPage
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns="http://xamarin.com/schemas/2014/forms"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Pages.Accounts.DeleteAccountPage"
    xmlns:pages="clr-namespace:Bit.App.Pages"
--- a/src/App/Pages/Accounts/DeleteAccountPage.xaml.cs
+++ b/src/App/Pages/Accounts/DeleteAccountPage.xaml.cs
@@ -1,6 +1,5 @@
 using System;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Pages.Accounts
 {
--- a/src/App/Pages/Accounts/DeleteAccountViewModel.cs
+++ b/src/App/Pages/Accounts/DeleteAccountViewModel.cs
@@ -27,7 +27,7 @@ namespace Bit.App.Pages
        {
            try
            {
-                if (Microsoft.Maui.Networking.Connectivity.NetworkAccess == Microsoft.Maui.Networking.NetworkAccess.None)
+                if (Xamarin.Essentials.Connectivity.NetworkAccess == Xamarin.Essentials.NetworkAccess.None)
                {
                    await _platformUtilsService.ShowDialogAsync(AppResources.InternetConnectionRequiredMessage,
                        AppResources.InternetConnectionRequiredTitle, AppResources.Ok);
--- a/src/App/Pages/Accounts/EnvironmentPage.xaml
+++ b/src/App/Pages/Accounts/EnvironmentPage.xaml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <pages:BaseContentPage 
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns="http://xamarin.com/schemas/2014/forms"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Pages.EnvironmentPage"
    xmlns:pages="clr-namespace:Bit.App.Pages"
--- a/src/App/Pages/Accounts/EnvironmentPage.xaml.cs
+++ b/src/App/Pages/Accounts/EnvironmentPage.xaml.cs
@@ -3,8 +3,7 @@ using System.Threading.Tasks;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Pages
 {
@@ -19,7 +18,6 @@ namespace Bit.App.Pages
            InitializeComponent();
            _vm = BindingContext as EnvironmentPageViewModel;
            _vm.Page = this;
-            // 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 (Device.RuntimePlatform == Device.Android)
            {
                ToolbarItems.RemoveAt(0);
--- a/src/App/Pages/Accounts/HintPage.xaml
+++ b/src/App/Pages/Accounts/HintPage.xaml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <pages:BaseContentPage 
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns="http://xamarin.com/schemas/2014/forms"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Pages.HintPage"
    xmlns:pages="clr-namespace:Bit.App.Pages"
--- a/src/App/Pages/Accounts/HintPage.xaml.cs
+++ b/src/App/Pages/Accounts/HintPage.xaml.cs
@@ -1,5 +1,4 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Pages
 {
@@ -13,7 +12,6 @@ namespace Bit.App.Pages
            _vm = BindingContext as HintPageViewModel;
            _vm.Page = this;
            _vm.Email = email;
-            // 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 (Device.RuntimePlatform == Device.Android)
            {
                ToolbarItems.RemoveAt(0);
--- a/src/App/Pages/Accounts/HintPageViewModel.cs
+++ b/src/App/Pages/Accounts/HintPageViewModel.cs
@@ -44,7 +44,7 @@ namespace Bit.App.Pages

        public async Task SubmitAsync()
        {
-            if (Microsoft.Maui.Networking.Connectivity.NetworkAccess == Microsoft.Maui.Networking.NetworkAccess.None)
+            if (Xamarin.Essentials.Connectivity.NetworkAccess == Xamarin.Essentials.NetworkAccess.None)
            {
                await _platformUtilsService.ShowDialogAsync(AppResources.InternetConnectionRequiredMessage,
                    AppResources.InternetConnectionRequiredTitle);
--- a/src/App/Pages/Accounts/HomePage.xaml
+++ b/src/App/Pages/Accounts/HomePage.xaml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <pages:BaseContentPage 
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns="http://xamarin.com/schemas/2014/forms"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Pages.HomePage"
    xmlns:pages="clr-namespace:Bit.App.Pages"
--- a/src/App/Pages/Accounts/HomePage.xaml.cs
+++ b/src/App/Pages/Accounts/HomePage.xaml.cs
@@ -4,8 +4,7 @@ using Bit.App.Models;
 using Bit.App.Utilities;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Pages
 {
--- a/src/App/Pages/Accounts/HomePageViewModel.cs
+++ b/src/App/Pages/Accounts/HomePageViewModel.cs
@@ -11,8 +11,8 @@ using Bit.Core.Models.Response;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Essentials;
+using Xamarin.Forms;

 namespace Bit.App.Pages
 {
@@ -52,9 +52,9 @@ namespace Bit.App.Pages
            };
            RememberEmailCommand = new Command(() => RememberEmail = !RememberEmail);
            ContinueCommand = new AsyncCommand(ContinueToLoginStepAsync, allowsMultipleExecutions: false);
-            CreateAccountCommand = new AsyncCommand(async () => Device.InvokeOnMainThreadAsync(StartRegisterAction),
+            CreateAccountCommand = new AsyncCommand(async () => await Device.InvokeOnMainThreadAsync(StartRegisterAction),
                onException: _logger.Exception, allowsMultipleExecutions: false);
-            CloseCommand = new AsyncCommand(async () => Device.InvokeOnMainThreadAsync(CloseAction),
+            CloseCommand = new AsyncCommand(async () => await Device.InvokeOnMainThreadAsync(CloseAction),
                onException: _logger.Exception, allowsMultipleExecutions: false);
            ShowEnvironmentPickerCommand = new AsyncCommand(ShowEnvironmentPickerAsync,
                onException: _logger.Exception, allowsMultipleExecutions: false);
--- a/src/App/Pages/Accounts/LockPage.xaml
+++ b/src/App/Pages/Accounts/LockPage.xaml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <pages:BaseContentPage 
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns="http://xamarin.com/schemas/2014/forms"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Pages.LockPage"
    xmlns:pages="clr-namespace:Bit.App.Pages"
@@ -46,7 +46,7 @@
                    <StackLayout StyleClass="box">
                        <Grid
                            StyleClass="box-row"
-                            IsVisible="{Binding PinLock}"
+                            IsVisible="{Binding PinEnabled}"
                            Padding="0, 10, 0, 0">
                            <Grid.RowDefinitions>
                                <RowDefinition Height="Auto" />
@@ -89,7 +89,7 @@
                        <Grid
                            x:Name="_passwordGrid"
                            StyleClass="box-row"
-                            IsVisible="{Binding PinLock, Converter={StaticResource inverseBool}}"
+                            IsVisible="{Binding PinEnabled, Converter={StaticResource inverseBool}}"
                            Padding="0, 10, 0, 0">
                            <Grid.RowDefinitions>
                                <RowDefinition Height="Auto" />
--- a/src/App/Pages/Accounts/LockPage.xaml.cs
+++ b/src/App/Pages/Accounts/LockPage.xaml.cs
@@ -6,8 +6,7 @@ using Bit.App.Utilities;
 using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Pages
 {
@@ -31,7 +30,6 @@ namespace Bit.App.Pages
            _vm.Page = this;
            _vm.UnlockedAction = () => Device.BeginInvokeOnMainThread(async () => await UnlockedAsync());

-            // 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 (Device.RuntimePlatform == Device.iOS)
            {
                ToolbarItems.Add(_moreItem);
@@ -46,7 +44,7 @@ namespace Bit.App.Pages
        {
            get
            {
-                if (_vm?.PinLock ?? false)
+                if (_vm?.PinEnabled ?? false)
                {
                    return _pin;
                }
@@ -56,7 +54,7 @@ namespace Bit.App.Pages

        public async Task PromptBiometricAfterResumeAsync()
        {
-            if (_vm.BiometricLock)
+            if (_vm.BiometricEnabled)
            {
                await Task.Delay(500);
                if (!_promptedAfterResume)
@@ -93,13 +91,13 @@ namespace Bit.App.Pages

            _vm.FocusSecretEntry += PerformFocusSecretEntry;

-            if (!_vm.BiometricLock)
+            if (!_vm.BiometricEnabled)
            {
                RequestFocus(SecretEntry);
            }
            else
            {
-                if (_vm.UsingKeyConnector && !_vm.PinLock)
+                if (_vm.UsingKeyConnector && !_vm.PinEnabled)
                {
                    _passwordGrid.IsVisible = false;
                    _unlockButton.IsVisible = false;
--- a/src/App/Pages/Accounts/LockPageViewModel.cs
+++ b/src/App/Pages/Accounts/LockPageViewModel.cs
@@ -11,9 +11,8 @@ using Bit.Core.Models.Domain;
 using Bit.Core.Models.Request;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
-using CommunityToolkit.Maui.Converters;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.CommunityToolkit.Helpers;
+using Xamarin.Forms;

 namespace Bit.App.Pages
 {
@@ -39,16 +38,15 @@ namespace Bit.App.Pages
        private string _masterPassword;
        private string _pin;
        private bool _showPassword;
-        private bool _pinLock;
-        private bool _biometricLock;
+        private PinLockType _pinStatus;
+        private bool _pinEnabled;
+        private bool _biometricEnabled;
        private bool _biometricIntegrityValid = true;
        private bool _biometricButtonVisible;
        private bool _usingKeyConnector;
        private string _biometricButtonText;
        private string _loggedInAsText;
        private string _lockedVerifyText;
-        private bool _isPinProtected;
-        private bool _isPinProtectedWithKey;

        public LockPageViewModel()
        {
@@ -101,10 +99,10 @@ namespace Bit.App.Pages
                });
        }

-        public bool PinLock
+        public bool PinEnabled
        {
-            get => _pinLock;
-            set => SetProperty(ref _pinLock, value);
+            get => _pinEnabled;
+            set => SetProperty(ref _pinEnabled, value);
        }

        public bool UsingKeyConnector
@@ -112,10 +110,10 @@ namespace Bit.App.Pages
            get => _usingKeyConnector;
        }

-        public bool BiometricLock
+        public bool BiometricEnabled
        {
-            get => _biometricLock;
-            set => SetProperty(ref _biometricLock, value);
+            get => _biometricEnabled;
+            set => SetProperty(ref _biometricEnabled, value);
        }

        public bool BiometricIntegrityValid
@@ -163,14 +161,18 @@ namespace Bit.App.Pages

        public async Task InitAsync()
        {
-            (_isPinProtected, _isPinProtectedWithKey) = await _vaultTimeoutService.IsPinLockSetAsync();
-            PinLock = (_isPinProtected && await _stateService.GetPinProtectedKeyAsync() != null) ||
-                      _isPinProtectedWithKey;
-            BiometricLock = await _vaultTimeoutService.IsBiometricLockSetAsync() && await _cryptoService.HasKeyAsync();
+            _pinStatus = await _vaultTimeoutService.GetPinLockTypeAsync();
+
+            var ephemeralPinSet = await _stateService.GetPinKeyEncryptedUserKeyEphemeralAsync()
+                ?? await _stateService.GetPinProtectedKeyAsync();
+            PinEnabled = (_pinStatus == PinLockType.Transient && ephemeralPinSet != null) ||
+                      _pinStatus == PinLockType.Persistent;
+
+            BiometricEnabled = await _vaultTimeoutService.IsBiometricLockSetAsync() && await _biometricService.CanUseBiometricsUnlockAsync();

            // Users with key connector and without biometric or pin has no MP to unlock with
-            _usingKeyConnector = await _keyConnectorService.GetUsesKeyConnector();
-            if (_usingKeyConnector && !(BiometricLock || PinLock))
+            _usingKeyConnector = await _keyConnectorService.GetUsesKeyConnectorAsync();
+            if (_usingKeyConnector && !(BiometricEnabled || PinEnabled))
            {
                await _vaultTimeoutService.LogOutAsync();
                return;
@@ -189,7 +191,7 @@ namespace Bit.App.Pages
            }
            var webVaultHostname = CoreHelpers.GetHostname(webVault);
            LoggedInAsText = string.Format(AppResources.LoggedInAsOn, _email, webVaultHostname);
-            if (PinLock)
+            if (PinEnabled)
            {
                PageTitle = AppResources.VerifyPIN;
                LockedVerifyText = AppResources.VaultLockedPIN;
@@ -208,7 +210,7 @@ namespace Bit.App.Pages
                }
            }

-            if (BiometricLock)
+            if (BiometricEnabled)
            {
                BiometricIntegrityValid = await _platformUtilsService.IsBiometricIntegrityValidAsync();
                if (!_biometricIntegrityValid)
@@ -218,7 +220,6 @@ namespace Bit.App.Pages
                }
                BiometricButtonVisible = true;
                BiometricButtonText = AppResources.UseBiometricsToUnlock;
-                // 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 (Device.RuntimePlatform == Device.iOS)
                {
                    var supportsFace = await _deviceActionService.SupportsFaceBiometricAsync();
@@ -231,14 +232,14 @@ namespace Bit.App.Pages

        public async Task SubmitAsync()
        {
-            if (PinLock && string.IsNullOrWhiteSpace(Pin))
+            if (PinEnabled && string.IsNullOrWhiteSpace(Pin))
            {
                await Page.DisplayAlert(AppResources.AnErrorHasOccurred,
                    string.Format(AppResources.ValidationFieldRequired, AppResources.PIN),
                    AppResources.Ok);
                return;
            }
-            if (!PinLock && string.IsNullOrWhiteSpace(MasterPassword))
+            if (!PinEnabled && string.IsNullOrWhiteSpace(MasterPassword))
            {
                await Page.DisplayAlert(AppResources.AnErrorHasOccurred,
                    string.Format(AppResources.ValidationFieldRequired, AppResources.MasterPassword),
@@ -249,34 +250,54 @@ namespace Bit.App.Pages
            ShowPassword = false;
            var kdfConfig = await _stateService.GetActiveUserCustomDataAsync(a => new KdfConfig(a?.Profile));

-            if (PinLock)
+            if (PinEnabled)
            {
                var failed = true;
                try
                {
-                    if (_isPinProtected)
+                    EncString userKeyPin = null;
+                    EncString oldPinProtected = null;
+                    if (_pinStatus == PinLockType.Persistent)
                    {
-                        var key = await _cryptoService.MakeKeyFromPinAsync(Pin, _email,
+                        userKeyPin = await _stateService.GetPinKeyEncryptedUserKeyAsync();
+                        var oldEncryptedKey = await _stateService.GetPinProtectedAsync();
+                        oldPinProtected = oldEncryptedKey != null ? new EncString(oldEncryptedKey) : null;
+                    }
+                    else if (_pinStatus == PinLockType.Transient)
+                    {
+                        userKeyPin = await _stateService.GetPinKeyEncryptedUserKeyEphemeralAsync();
+                        oldPinProtected = await _stateService.GetPinProtectedKeyAsync();
+                    }
+
+                    UserKey userKey;
+                    if (oldPinProtected != null)
+                    {
+                        userKey = await _cryptoService.DecryptAndMigrateOldPinKeyAsync(
+                            _pinStatus == PinLockType.Transient,
+                            Pin,
+                            _email,
                            kdfConfig,
-                            await _stateService.GetPinProtectedKeyAsync());
-                        var encKey = await _cryptoService.GetEncKeyAsync(key);
-                        var protectedPin = await _stateService.GetProtectedPinAsync();
-                        var decPin = await _cryptoService.DecryptToUtf8Async(new EncString(protectedPin), encKey);
-                        failed = decPin != Pin;
-                        if (!failed)
-                        {
-                            Pin = string.Empty;
-                            await AppHelpers.ResetInvalidUnlockAttemptsAsync();
-                            await SetKeyAndContinueAsync(key);
-                        }
+                            oldPinProtected
+                        );
                    }
                    else
                    {
-                        var key = await _cryptoService.MakeKeyFromPinAsync(Pin, _email, kdfConfig);
-                        failed = false;
+                        userKey = await _cryptoService.DecryptUserKeyWithPinAsync(
+                            Pin,
+                            _email,
+                            kdfConfig,
+                            userKeyPin
+                        );
+                    }
+
+                    var protectedPin = await _stateService.GetProtectedPinAsync();
+                    var decryptedPin = await _cryptoService.DecryptToUtf8Async(new EncString(protectedPin), userKey);
+                    failed = decryptedPin != Pin;
+                    if (!failed)
+                    {
                        Pin = string.Empty;
                        await AppHelpers.ResetInvalidUnlockAttemptsAsync();
-                        await SetKeyAndContinueAsync(key);
+                        await SetUserKeyAndContinueAsync(userKey);
                    }
                }
                catch
@@ -297,19 +318,21 @@ namespace Bit.App.Pages
            }
            else
            {
-                var key = await _cryptoService.MakeKeyAsync(MasterPassword, _email, kdfConfig);
-                var storedKeyHash = await _cryptoService.GetKeyHashAsync();
+                var masterKey = await _cryptoService.MakeMasterKeyAsync(MasterPassword, _email, kdfConfig);
+                var storedKeyHash = await _cryptoService.GetMasterKeyHashAsync();
                var passwordValid = false;
                MasterPasswordPolicyOptions enforcedMasterPasswordOptions = null;

                if (storedKeyHash != null)
                {
-                    passwordValid = await _cryptoService.CompareAndUpdateKeyHashAsync(MasterPassword, key);
+                    // Offline unlock possible
+                    passwordValid = await _cryptoService.CompareAndUpdateKeyHashAsync(MasterPassword, masterKey);
                }
                else
                {
+                    // Online unlock required
                    await _deviceActionService.ShowLoadingAsync(AppResources.Loading);
-                    var keyHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.ServerAuthorization);
+                    var keyHash = await _cryptoService.HashMasterKeyAsync(MasterPassword, masterKey, HashPurpose.ServerAuthorization);
                    var request = new PasswordVerificationRequest();
                    request.MasterPasswordHash = keyHash;

@@ -318,8 +341,8 @@ namespace Bit.App.Pages
                        var response = await _apiService.PostAccountVerifyPasswordAsync(request);
                        enforcedMasterPasswordOptions = response.MasterPasswordPolicy;
                        passwordValid = true;
-                        var localKeyHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.LocalAuthorization);
-                        await _cryptoService.SetKeyHashAsync(localKeyHash);
+                        var localKeyHash = await _cryptoService.HashMasterKeyAsync(MasterPassword, masterKey, HashPurpose.LocalAuthorization);
+                        await _cryptoService.SetMasterKeyHashAsync(localKeyHash);
                    }
                    catch (Exception e)
                    {
@@ -329,15 +352,6 @@ namespace Bit.App.Pages
                }
                if (passwordValid)
                {
-                    if (_isPinProtected)
-                    {
-                        var protectedPin = await _stateService.GetProtectedPinAsync();
-                        var encKey = await _cryptoService.GetEncKeyAsync(key);
-                        var decPin = await _cryptoService.DecryptToUtf8Async(new EncString(protectedPin), encKey);
-                        var pinKey = await _cryptoService.MakePinKeyAysnc(decPin, _email, kdfConfig);
-                        await _stateService.SetPinProtectedKeyAsync(await _cryptoService.EncryptAsync(key.Key, pinKey));
-                    }
-
                    if (await RequirePasswordChangeAsync(enforcedMasterPasswordOptions))
                    {
                        // Save the ForcePasswordResetReason to force a password reset after unlock
@@ -347,10 +361,13 @@ namespace Bit.App.Pages

                    MasterPassword = string.Empty;
                    await AppHelpers.ResetInvalidUnlockAttemptsAsync();
-                    await SetKeyAndContinueAsync(key);
+
+                    var userKey = await _cryptoService.DecryptUserKeyWithMasterKeyAsync(masterKey);
+                    await _cryptoService.SetMasterKeyAsync(masterKey);
+                    await SetUserKeyAndContinueAsync(userKey);

                    // Re-enable biometrics
-                    if (BiometricLock & !BiometricIntegrityValid)
+                    if (BiometricEnabled & !BiometricIntegrityValid)
                    {
                        await _biometricService.SetupBiometricAsync();
                    }
@@ -427,7 +444,7 @@ namespace Bit.App.Pages
        public void TogglePassword()
        {
            ShowPassword = !ShowPassword;
-            var secret = PinLock ? Pin : MasterPassword;
+            var secret = PinEnabled ? Pin : MasterPassword;
            _secretEntryFocusWeakEventManager.RaiseEvent(string.IsNullOrEmpty(secret) ? 0 : secret.Length, nameof(FocusSecretEntry));
        }

@@ -435,26 +452,27 @@ namespace Bit.App.Pages
        {
            BiometricIntegrityValid = await _platformUtilsService.IsBiometricIntegrityValidAsync();
            BiometricButtonVisible = BiometricIntegrityValid;
-            if (!BiometricLock || !BiometricIntegrityValid)
+            if (!BiometricEnabled || !BiometricIntegrityValid)
            {
                return;
            }
            var success = await _platformUtilsService.AuthenticateBiometricAsync(null,
-                PinLock ? AppResources.PIN : AppResources.MasterPassword,
+                PinEnabled ? AppResources.PIN : AppResources.MasterPassword,
                () => _secretEntryFocusWeakEventManager.RaiseEvent((int?)null, nameof(FocusSecretEntry)));
            await _stateService.SetBiometricLockedAsync(!success);
            if (success)
            {
-                await DoContinueAsync();
+                var userKey = await _cryptoService.GetBiometricUnlockKeyAsync();
+                await SetUserKeyAndContinueAsync(userKey);
            }
        }

-        private async Task SetKeyAndContinueAsync(SymmetricCryptoKey key)
+        private async Task SetUserKeyAndContinueAsync(UserKey key)
        {
-            var hasKey = await _cryptoService.HasKeyAsync();
+            var hasKey = await _cryptoService.HasUserKeyAsync();
            if (!hasKey)
            {
-                await _cryptoService.SetKeyAsync(key);
+                await _cryptoService.SetUserKeyAsync(key);
            }
            await DoContinueAsync();
        }
--- a/src/App/Pages/Accounts/LoginPage.xaml
+++ b/src/App/Pages/Accounts/LoginPage.xaml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <pages:BaseContentPage 
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns="http://xamarin.com/schemas/2014/forms"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Pages.LoginPage"
    xmlns:pages="clr-namespace:Bit.App.Pages"
--- a/src/App/Pages/Accounts/LoginPage.xaml.cs
+++ b/src/App/Pages/Accounts/LoginPage.xaml.cs
@@ -7,8 +7,7 @@ using Bit.Core.Abstractions;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Pages
 {
@@ -49,7 +48,6 @@ namespace Bit.App.Pages
            _vm.Email = email;
            MasterPasswordEntry = _masterPassword;

-            // 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 (Device.RuntimePlatform == Device.iOS)
            {
                ToolbarItems.Add(_moreItem);
@@ -95,7 +93,6 @@ namespace Bit.App.Pages
                RequestFocus(_masterPassword);
                _inputFocused = true;
            }
-            // 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 (Device.RuntimePlatform == Device.Android && !_vm.CanRemoveAccount)
            {
                ToolbarItems.Add(_removeAccount);
--- a/src/App/Pages/Accounts/LoginPageViewModel.cs
+++ b/src/App/Pages/Accounts/LoginPageViewModel.cs
@@ -16,8 +16,7 @@ using Bit.Core.Models.View;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Pages
 {
@@ -182,7 +181,7 @@ namespace Bit.App.Pages

        public async Task LogInAsync(bool showLoading = true, bool checkForExistingAccount = false)
        {
-            if (Microsoft.Maui.Networking.Connectivity.NetworkAccess == Microsoft.Maui.Networking.NetworkAccess.None)
+            if (Xamarin.Essentials.Connectivity.NetworkAccess == Xamarin.Essentials.NetworkAccess.None)
            {
                await _platformUtilsService.ShowDialogAsync(AppResources.InternetConnectionRequiredMessage,
                    AppResources.InternetConnectionRequiredTitle, AppResources.Ok);
--- a/src/App/Pages/Accounts/LoginPasswordlessPage.xaml
+++ b/src/App/Pages/Accounts/LoginPasswordlessPage.xaml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <pages:BaseContentPage
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns="http://xamarin.com/schemas/2014/forms"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Pages.LoginPasswordlessPage"
    xmlns:pages="clr-namespace:Bit.App.Pages"
--- a/src/App/Pages/Accounts/LoginPasswordlessPage.xaml.cs
+++ b/src/App/Pages/Accounts/LoginPasswordlessPage.xaml.cs
@@ -1,5 +1,4 @@
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Pages
 {
--- a/src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml
+++ b/src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <pages:BaseContentPage
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns="http://xamarin.com/schemas/2014/forms"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Pages.LoginPasswordlessRequestPage"
    xmlns:pages="clr-namespace:Bit.App.Pages"
--- a/src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml.cs
+++ b/src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml.cs
@@ -3,8 +3,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using Bit.App.Models;
 using Bit.App.Utilities;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Pages
 {
--- a/src/App/Pages/Accounts/LoginPasswordlessRequestViewModel.cs
+++ b/src/App/Pages/Accounts/LoginPasswordlessRequestViewModel.cs
@@ -15,8 +15,8 @@ using Bit.Core.Models.Domain;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Essentials;
+using Xamarin.Forms;

 namespace Bit.App.Pages
 {
@@ -182,7 +182,7 @@ namespace Bit.App.Pages

        private void HandleException(Exception ex)
        {
-            Microsoft.Maui.ApplicationModel.MainThread.InvokeOnMainThreadAsync(async () =>
+            Xamarin.Essentials.MainThread.InvokeOnMainThreadAsync(async () =>
            {
                await _deviceActionService.HideLoadingAsync();
                await _platformUtilsService.ShowDialogAsync(AppResources.GenericErrorMessage);
--- a/src/App/Pages/Accounts/LoginPasswordlessViewModel.cs
+++ b/src/App/Pages/Accounts/LoginPasswordlessViewModel.cs
@@ -13,8 +13,7 @@ using Bit.Core.Enums;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Pages
 {
--- a/src/App/Pages/Accounts/LoginSsoPage.xaml
+++ b/src/App/Pages/Accounts/LoginSsoPage.xaml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <pages:BaseContentPage 
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns="http://xamarin.com/schemas/2014/forms"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Pages.LoginSsoPage"
    xmlns:pages="clr-namespace:Bit.App.Pages"
--- a/src/App/Pages/Accounts/LoginSsoPage.xaml.cs
+++ b/src/App/Pages/Accounts/LoginSsoPage.xaml.cs
@@ -4,8 +4,7 @@ using Bit.App.Models;
 using Bit.App.Utilities;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Pages
 {
@@ -34,7 +33,6 @@ namespace Bit.App.Pages
            {
                await Navigation.PopModalAsync();
            };
-            // 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 (Device.RuntimePlatform == Device.Android)
            {
                ToolbarItems.RemoveAt(0);
--- a/src/App/Pages/Accounts/LoginSsoPageViewModel.cs
+++ b/src/App/Pages/Accounts/LoginSsoPageViewModel.cs
@@ -11,6 +11,7 @@ using Bit.Core.Exceptions;
 using Bit.Core.Models.Domain;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
+using Xamarin.Essentials;

 namespace Bit.App.Pages
 {
--- a/src/App/Pages/Accounts/RegisterPage.xaml
+++ b/src/App/Pages/Accounts/RegisterPage.xaml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <pages:BaseContentPage 
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns="http://xamarin.com/schemas/2014/forms"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Pages.RegisterPage"
    xmlns:pages="clr-namespace:Bit.App.Pages"
--- a/src/App/Pages/Accounts/RegisterPage.xaml.cs
+++ b/src/App/Pages/Accounts/RegisterPage.xaml.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Threading.Tasks;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Pages
 {
@@ -23,7 +22,6 @@ namespace Bit.App.Pages
            };
            MasterPasswordEntry = _masterPassword;
            ConfirmMasterPasswordEntry = _confirmMasterPassword;
-            // 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 (Device.RuntimePlatform == Device.Android)
            {
                ToolbarItems.RemoveAt(0);
--- a/src/App/Pages/Accounts/RegisterPageViewModel.cs
+++ b/src/App/Pages/Accounts/RegisterPageViewModel.cs
@@ -13,8 +13,7 @@ using Bit.Core.Exceptions;
 using Bit.Core.Models.Request;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using Xamarin.Forms;

 namespace Bit.App.Pages
 {
@@ -119,7 +118,7 @@ namespace Bit.App.Pages

        public async Task SubmitAsync(bool showLoading = true)
        {
-            if (Microsoft.Maui.Networking.Connectivity.NetworkAccess == Microsoft.Maui.Networking.NetworkAccess.None)
+            if (Xamarin.Essentials.Connectivity.NetworkAccess == Xamarin.Essentials.NetworkAccess.None)
            {
                await _platformUtilsService.ShowDialogAsync(AppResources.InternetConnectionRequiredMessage,
                    AppResources.InternetConnectionRequiredTitle, AppResources.Ok);
@@ -178,25 +177,25 @@ namespace Bit.App.Pages
            Name = string.IsNullOrWhiteSpace(Name) ? null : Name;
            Email = Email.Trim().ToLower();
            var kdfConfig = new KdfConfig(KdfType.PBKDF2_SHA256, Constants.Pbkdf2Iterations, null, null);
-            var key = await _cryptoService.MakeKeyAsync(MasterPassword, Email, kdfConfig);
-            var encKey = await _cryptoService.MakeEncKeyAsync(key);
-            var hashedPassword = await _cryptoService.HashPasswordAsync(MasterPassword, key);
-            var keys = await _cryptoService.MakeKeyPairAsync(encKey.Item1);
+            var newMasterKey = await _cryptoService.MakeMasterKeyAsync(MasterPassword, Email, kdfConfig);
+            var (newUserKey, newProtectedUserKey) = await _cryptoService.EncryptUserKeyWithMasterKeyAsync(newMasterKey);
+            var hashedPassword = await _cryptoService.HashMasterKeyAsync(MasterPassword, newMasterKey);
+            var (newPublicKey, newProtectedPrivateKey) = await _cryptoService.MakeKeyPairAsync(newUserKey);
            var request = new RegisterRequest
            {
                Email = Email,
                Name = Name,
                MasterPasswordHash = hashedPassword,
                MasterPasswordHint = Hint,
-                Key = encKey.Item2.EncryptedString,
+                Key = newProtectedUserKey.EncryptedString,
                Kdf = kdfConfig.Type,
                KdfIterations = kdfConfig.Iterations,
                KdfMemory = kdfConfig.Memory,
                KdfParallelism = kdfConfig.Parallelism,
                Keys = new KeysRequest
                {
-                    PublicKey = keys.Item1,
-                    EncryptedPrivateKey = keys.Item2.EncryptedString
+                    PublicKey = newPublicKey,
+                    EncryptedPrivateKey = newProtectedPrivateKey.EncryptedString
                },
                CaptchaResponse = _captchaToken,
            };
--- a/src/App/Pages/Accounts/RemoveMasterPasswordPage.xaml
+++ b/src/App/Pages/Accounts/RemoveMasterPasswordPage.xaml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <pages:BaseContentPage
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns="http://xamarin.com/schemas/2014/forms"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
    x:Class="Bit.App.Pages.RemoveMasterPasswordPage"
    xmlns:pages="clr-namespace:Bit.App.Pages"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Federico Maccaroni	fc2a91c435	PM-3194 Fix biometrics button to be shown on upgrade when no UserKey is present yet	2023-08-07 11:48:21 -03:00
Jacob Fink	4e1361e94a	renaming bio key and fix build	2023-08-07 09:59:23 -04:00
Jacob Fink	d6567fe819	Merge branch 'auth/pm-2713/drop-master-key-dependency' into add-bio-key-migration	2023-08-07 09:57:53 -04:00
Federico Maccaroni	bf749d39de	PM-2713 Fix auto-migrating EncKeyEncrypted into MasterKey encrypted UserKey when requesting DecryptUserKeyWithMasterKeyAsync is called	2023-08-04 18:39:16 -03:00
Jacob Fink	2522bbc60f	Get UserKey from bio state on unlock	2023-08-04 16:34:27 -04:00
Jacob Fink	b620a9c09f	add state for biometric key and accept UserKey instead of string for auto key	2023-08-04 16:20:39 -04:00
Jacob Fink	903f099134	[PM-2713] rename ephemeral pin key	2023-08-04 15:58:04 -04:00
Jacob Fink	fd5ef49811	[PM-2713] add async to key connector service methods	2023-08-04 13:38:04 -04:00
Jacob Fink	78004dbdb9	[PM-2713] clear service cache when adding new account	2023-08-03 16:28:04 -04:00
Jacob Fink	e820408a64	[PM-2713] make method async again - returning null from a task thats not async throws	2023-08-03 15:44:41 -04:00
Jacob Fink	c595b1626e	fix formatting	2023-08-03 14:34:50 -04:00
Jacob Fink	270a395d9f	[PM-2713] set enc user key during kc onboarding	2023-08-03 13:41:19 -04:00
Jacob Fink	4fa8d2ba28	[PM-2713] set user key on set password page	2023-08-03 13:30:45 -04:00
Jacob Fink	e076c9fe04	[PM-2713] add auto unlock key to mobile	2023-08-03 10:49:55 -04:00
Jacob Fink	ee0dcd23f5	rename account keys to be more descriptive	2023-08-01 20:08:41 -04:00
Jacob Fink	1e8ed1b5ce	[PM-2713] replace generic with inherited class	2023-08-01 10:47:02 -04:00
Jacob Fink	7fb89fa1a5	[PM-2713] consolidate attachment key creation - also fix ios files missed during symbol rename	2023-08-01 09:30:00 -04:00
Jacob Fink	b1eb263fef	[PM-2713] combine makeDataEncKey methods	2023-08-01 08:54:19 -04:00
Jacob Fink	61aac20555	[PM-2713] rename state methods	2023-08-01 08:46:02 -04:00
Jacob Fink	3e87d74061	[PM-2713] revert feedback for build	2023-07-31 17:09:47 -04:00
Jacob Fink	89a9185b20	[PM-2713] rename get pin lock type method	2023-07-31 16:49:41 -04:00
Jacob Fink	e323e196c0	[PM-2713] PR feedback	2023-07-31 15:31:46 -04:00
Jacob Fink	c793260689	[PM-2713] pr feedback	2023-07-31 13:13:29 -04:00
Jacob Fink	c2ddbb7eff	[PM-2713] rename toggle method, don't reset enc user key	2023-07-31 12:57:50 -04:00
Jacob Fink	bb5a7383a8	[PM-2713] don't pass user key as param when encrypting	2023-07-31 12:42:56 -04:00
Jacob Fink	de5113ede7	[PM-2713] rename PinLockEnum to PinLockType	2023-07-27 16:26:23 -04:00
Jacob Fink	ba6d260565	[PM-2713] rename PrivateKey methods to UserPrivateKey on crypto service	2023-07-27 16:24:31 -04:00
Jacob Fink	7562c688c5	[PM-2713] deconstruct new key pair	2023-07-27 16:20:33 -04:00
Jacob Fink	10574a7117	[PM-2713] remove broken casting	2023-07-20 16:17:30 -04:00
Jacob Fink	a2f1ca583a	[PM-2713] remove extra comment	2023-07-20 16:14:40 -04:00
Jacob Fink	813ac841c6	[PM-2713] fix casting issues and pin	2023-07-20 13:57:32 -04:00
Jacob Fink	0da3d25955	[PM-2713] rename password hash to master key hash	2023-07-20 12:30:02 -04:00
Jacob Fink	f8c9cde2ed	[PM-2713] optimize async code in crypto service	2023-07-20 11:17:57 -04:00
Jacob Fink	a3183857b9	[PM-2713] set decrypt and set user key in login helper	2023-07-19 21:23:21 -04:00
Jacob Fink	bedbca841d	[PM-2713] remove unused cached values in crypto service	2023-07-19 21:23:21 -04:00
Jacob Fink	0ff314f076	[PM-2713] use new crypto service api in auth service	2023-07-19 21:23:21 -04:00
Jacob Fink	c9a7c29190	[PM-2713] More conversions to crypto api	2023-07-19 21:23:20 -04:00
Jacob Fink	546bf8dcb1	[PM-2713] convert cipher service and others to crypto service api	2023-07-19 21:23:20 -04:00
Jacob Fink	7fdc5597fc	[PM-2713] more conversions to new crypto service api	2023-07-19 21:23:20 -04:00
Jacob Fink	7c664f58b3	[PM-2713] add migration for pin on lock screens	2023-07-19 21:23:20 -04:00
Jacob Fink	bdfe806846	[PM-2713] converting calls to new crypto service api	2023-07-19 21:23:19 -04:00
Jacob Fink	5ed567ab90	[PM-2713] add toggle method to crypto service for keys	2023-07-19 21:23:19 -04:00
Jacob Fink	cd4f44e6f6	[PM-2713] use new MakeMasterKey method	2023-07-19 21:23:19 -04:00
Jacob Fink	d58f0b281b	[PM-2713] refresh pin key when setting user key	2023-07-19 21:23:19 -04:00
Jacob Fink	5ba3fac0c0	[PM-2713] add make user key method to crypto service	2023-07-19 21:23:19 -04:00
Jacob Fink	1e30524985	[PM-2713] fix signature of GetUserKeyPin	2023-07-19 21:23:18 -04:00
Jacob Fink	515decb4c9	[PM-2713] add new pin methods to state service	2023-07-19 21:23:18 -04:00
Jacob Fink	bf28d373e9	[PM-2713] more updates to crypto service	2023-07-19 21:23:18 -04:00
Jacob Fink	69d38d4d75	[PM-2713] continue organizing crypto service	2023-07-19 21:23:18 -04:00
Jacob Fink	c1619536aa	[PM-2713] rename key hash to password hash & begin add methods to crypto service	2023-07-19 21:23:17 -04:00
Jacob Fink	079e02e4e5	[PM-271] add UserKey and MasterKey support to crypto service	2023-07-19 21:23:17 -04:00
Jacob Fink	15d3da607b	[PM-2713] add new state for new keys and obsolete old ones - UserKey - MasterKey - UserKeyMasterKey (enc UserKey from User Table)	2023-07-19 21:23:17 -04:00
Jacob Fink	b5cf9fd79d	[PM-2731] add user key and master key types	2023-07-19 21:23:17 -04:00