Merge branch 'feature/maui-migration-android-autofill' into feature/maui-migration-android-autofill-redirect-page

.github/workflows/build.yml

@@ -493,7 +493,7 @@ jobs:
       app_ci_output_filename: App_x64_Debug
     steps:
       - name: Set XCode version
-        uses: maxim-lobanov/setup-xcode@v1
+        uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0
         with:
           xcode-version: 15.0.1
 

.github/workflows/version-bump.yml

@@ -38,7 +38,7 @@ jobs:
         uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
         with:
           repository: bitwarden/mobile
-          ref: master
+          ref: main
           token: ${{ steps.retrieve-secrets.outputs.github-pat-bitwarden-devops-bot-repo-scope }}
 
       - name: Import GPG key

src/App/App.csproj

@@ -55,7 +55,7 @@
 	  <CodesignProvision>Automatic</CodesignProvision>
 	  <CodesignKey>iPhone Developer</CodesignKey>
 	  <CodesignEntitlements>Platforms\iOS\Entitlements.plist</CodesignEntitlements>
-	  <MtouchInterpreter>all</MtouchInterpreter>
+	  <UseInterpreter>true</UseInterpreter>
 	  <!--TODO: add argon2id load when library is built with the corresponding architecture for iOS Simulator-->
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(RuntimeIdentifier)'=='Debug|net8.0-ios|ios-arm64'">
@@ -66,9 +66,13 @@
       <CodesignProvision>Automatic:AppStore</CodesignProvision>
       <CodesignKey>iPhone Distribution</CodesignKey>
 	  <CodesignEntitlements>Platforms\iOS\Entitlements.plist</CodesignEntitlements>
-	  <MtouchInterpreter>all</MtouchInterpreter>
+	  <UseInterpreter>true</UseInterpreter>
 	  <MtouchExtraArgs>-gcc_flags "-L$(ProjectDir)../../lib/ios -largon2 -force_load $(ProjectDir)../../lib/ios/libargon2.a"</MtouchExtraArgs>
 	</PropertyGroup>
+	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
+		<!--This is needed for PCLCrypto to work correctly-->
+		<TrimmerRootAssembly Include="System.Security.Cryptography" />
+	</ItemGroup>
 	<ItemGroup>
 	  <AndroidNativeLibrary Include="Platforms\Android\lib\arm64-v8a\libargon2.so" />
 	  <AndroidNativeLibrary Include="Platforms\Android\lib\armeabi-v7a\libargon2.so" />
@@ -90,7 +94,7 @@
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="zxcvbn-core" Version="7.0.92" />
 		<PackageReference Include="CommunityToolkit.Maui" Version="5.2.0" />
-		<PackageReference Include="Plugin.Fingerprint" Version="2.1.5" />
+		<PackageReference Include="Plugin.Fingerprint" Version="3.0.0-beta.1" />
 		<PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.4-preview.84" />
 		<PackageReference Include="SkiaSharp.Views.Maui.Controls.Compatibility" Version="2.88.4-preview.84" />
 		<PackageReference Include="FFImageLoadingCompat.Maui" Version="0.1.1" />
@@ -216,8 +220,8 @@
     <WatchAppBuildPath Condition=" '$(Configuration)' == 'Debug' ">$(Home)/Library/Developer/Xcode/DerivedData/bitwarden-acgkbpwvmebfiofokotvoerzkqcl/Build/Products</WatchAppBuildPath>
     <WatchAppBuildPath Condition=" '$(Configuration)' != 'Debug' ">$([System.IO.Path]::GetFullPath('$(MSBuildProjectDirectory)\..'))/watchOS/bitwarden.xcarchive/Products/Applications/bitwarden.app/Watch</WatchAppBuildPath>
     <WatchAppBundle>Bitwarden.app</WatchAppBundle>
-		<WatchAppConfiguration Condition="'$(RuntimeIdentifier)'!='ios-arm64'"> >watchsimulator</WatchAppConfiguration>
+		<WatchAppConfiguration Condition="'$(RuntimeIdentifier)'!='ios-arm64'">watchsimulator</WatchAppConfiguration>
-		<WatchAppConfiguration Condition="'$(RuntimeIdentifier)'=='ios-arm64'"> >watchos</WatchAppConfiguration>
+		<WatchAppConfiguration Condition="'$(RuntimeIdentifier)'=='ios-arm64'">watchos</WatchAppConfiguration>
     <WatchAppBundleFullPath Condition=" '$(Configuration)' == 'Debug' ">$(WatchAppBuildPath)/$(Configuration)-$(WatchAppConfiguration)/$(WatchAppBundle)</WatchAppBundleFullPath>
     <WatchAppBundleFullPath Condition=" '$(Configuration)' != 'Debug' ">$(WatchAppBuildPath)/$(WatchAppBundle)</WatchAppBundleFullPath>
   </PropertyGroup>

src/App/Platforms/Android/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2023.12.1" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="34" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.NFC" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

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

@@ -41,13 +41,13 @@ namespace Bit.Droid.Services
             JavaSystem.LoadLibrary("argon2");
             int keySize = 32;
             var key = new byte[keySize];
-            //argon2id_hash_raw(iterations, memory, parallelism,
+            argon2id_hash_raw(iterations, memory, parallelism,
-            //    password, password.Length, salt, salt.Length, key, key.Length);
+                password, password.Length, salt, salt.Length, key, key.Length);
             return key;
         }
 
-        //[DllImport("argon2", EntryPoint = "argon2id_hash_raw")]
+        [DllImport("argon2", EntryPoint = "argon2id_hash_raw")]
-        //private static extern int argon2id_hash_raw(int timeCost, int memoryCost, int parallelism,
+        private static extern int argon2id_hash_raw(int timeCost, int memoryCost, int parallelism,
-        //    byte[] pwd, int pwdlen, byte[] salt, int saltlen, byte[] hash, int hashlen);
+            byte[] pwd, int pwdlen, byte[] salt, int saltlen, byte[] hash, int hashlen);
     }
 }

src/Core/Core.csproj

@@ -38,7 +38,7 @@
 	    <PrivateAssets>all</PrivateAssets>
 	  </PackageReference>		
 		<PackageReference Include="CommunityToolkit.Maui" Version="5.2.0" />
-		<PackageReference Include="Plugin.Fingerprint" Version="2.1.5" />
+		<PackageReference Include="Plugin.Fingerprint" Version="3.0.0-beta.1" />
 		<PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.4-preview.84" />
 		<PackageReference Include="SkiaSharp.Views.Maui.Controls.Compatibility" Version="2.88.4-preview.84" />
 		<PackageReference Include="FFImageLoadingCompat.Maui" Version="0.1.1" />

src/Core/Utilities/IconImageConverter.cs

@@ -40,7 +40,7 @@ namespace Bit.App.Utilities
             string image = null;
             if (cipher.Login.HasUris)
             {
-                foreach (var uri in cipher.Login.Uris)
+                foreach (var uri in cipher.Login.Uris.Where(u => u.Uri != null))
                 {
                     var hostnameUri = uri.Uri;
                     var isWebsite = false;

src/iOS.Autofill/iOS.Autofill.csproj

@@ -25,7 +25,7 @@
 	  <CodesignProvision>Automatic</CodesignProvision>
 	  <CodesignKey>iPhone Developer</CodesignKey>
 	  <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-	  <MtouchInterpreter>all</MtouchInterpreter>
+	  <UseInterpreter>true</UseInterpreter>
     <!--
     Note: The linkskip needs 2 dashes in front but if we put it in the comment then the project can't load so leaving it with 1 for now
     <MtouchExtraArgs>-linkskip=LiteDB -gcc_flags "-L$(ProjectDir)../../lib/ios -largon2 -force_load $(ProjectDir)../../lib/ios/libargon2.a"</MtouchExtraArgs>-->
@@ -37,11 +37,15 @@
 	</PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-ios|AnyCPU'">
     <CreatePackage>false</CreatePackage>
+	  <UseInterpreter>true</UseInterpreter>
     <MtouchExtraArgs>-gcc_flags "-L$(ProjectDir)../../lib/ios -largon2 -force_load $(ProjectDir)../../lib/ios/libargon2.a"</MtouchExtraArgs>
     <CodesignKey>iPhone Distribution</CodesignKey>
     <CodesignProvision>Automatic:AppStore</CodesignProvision>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
   </PropertyGroup>
+	<ItemGroup>
+		<TrimmerRootAssembly Include="System.Security.Cryptography" />
+	</ItemGroup>
   <ItemGroup>
     <Compile Include="CredentialProviderViewController.cs" />
     <Compile Include="CredentialProviderViewController.designer.cs">

src/iOS.Core/Services/CryptoPrimitiveService.cs

@@ -1,8 +1,7 @@
-using Bit.Core.Abstractions;
+using System.Runtime.InteropServices;
+using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Foundation;
-using System;
-using System.Runtime.InteropServices;
 
 namespace Bit.iOS.Core.Services
 {
@@ -48,8 +47,8 @@ namespace Bit.iOS.Core.Services
             var passwordData = NSData.FromArray(password);
             var saltData = NSData.FromArray(salt);
 
-            //argon2id_hash_raw(iterations, memory, parallelism, passwordData.Bytes, passwordData.Length,
+            argon2id_hash_raw(iterations, memory, parallelism, passwordData.Bytes, passwordData.Length,
-            //    saltData.Bytes, saltData.Length,  keyData.MutableBytes, keyData.Length);
+                saltData.Bytes, saltData.Length,  keyData.MutableBytes, keyData.Length);
 
             var keyBytes = new byte[keyData.Length];
             Marshal.Copy(keyData.Bytes, keyBytes, 0, Convert.ToInt32(keyData.Length));
@@ -61,8 +60,8 @@ namespace Bit.iOS.Core.Services
         private static extern int CCKeyCerivationPBKDF(uint algorithm, IntPtr password, nuint passwordLen,
             IntPtr salt, nuint saltLen, uint prf, nuint rounds, IntPtr derivedKey, nuint derivedKeyLength);
 
-        //[DllImport("__Internal", EntryPoint = "argon2id_hash_raw")]
+        [DllImport("__Internal", EntryPoint = "argon2id_hash_raw")]
-        //private static extern int argon2id_hash_raw(int timeCost, int memoryCost, int parallelism, IntPtr pwd,
+        private static extern int argon2id_hash_raw(int timeCost, int memoryCost, int parallelism, IntPtr pwd,
-        //    nuint pwdlen, IntPtr salt, nuint saltlen, IntPtr hash, nuint hashlen);
+            nuint pwdlen, IntPtr salt, nuint saltlen, IntPtr hash, nuint hashlen);
     }
 }

src/iOS.Extension/iOS.Extension.csproj

@@ -34,11 +34,15 @@
 	</PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-ios|AnyCPU'">
     <CreatePackage>false</CreatePackage>
+	  <UseInterpreter>true</UseInterpreter>
     <MtouchExtraArgs>-gcc_flags "-L$(ProjectDir)../../lib/ios -largon2 -force_load $(ProjectDir)../../lib/ios/libargon2.a"</MtouchExtraArgs>
     <CodesignKey>iPhone Distribution</CodesignKey>
     <CodesignProvision>Automatic:AppStore</CodesignProvision>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
   </PropertyGroup>
+	<ItemGroup>
+		<TrimmerRootAssembly Include="System.Security.Cryptography" />
+	</ItemGroup>
   <ItemGroup>
     <Compile Include="LoadingViewController.cs" />
     <Compile Include="LoadingViewController.designer.cs">

src/iOS.ShareExtension/iOS.ShareExtension.csproj

@@ -36,11 +36,15 @@
 	</PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-ios|AnyCPU'">
     <CreatePackage>false</CreatePackage>
+	  <UseInterpreter>true</UseInterpreter>
     <MtouchExtraArgs>-gcc_flags "-L$(ProjectDir)../../lib/ios -largon2 -force_load $(ProjectDir)../../lib/ios/libargon2.a"</MtouchExtraArgs>
     <CodesignKey>iPhone Distribution</CodesignKey>
     <CodesignProvision>Automatic:AppStore</CodesignProvision>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
   </PropertyGroup>
+	<ItemGroup>
+		<TrimmerRootAssembly Include="System.Security.Cryptography" />
+	</ItemGroup>
   <ItemGroup>
     <Folder Include="Resources\" />
     <Folder Include="Models\" />