Fixed Android build

Author: d2dyno1

src/Platforms/Directory.Packages.props

@@ -37,5 +37,6 @@
     <PackageVersion Include="Vanara.PInvoke.Shell32" Version="4.1.2" />
     <PackageVersion Include="VideoLAN.LibVLC.Android" Version="3.5.3" />
     <PackageVersion Include="VideoLAN.LibVLC.iOS" Version="3.6.1" />
+    <PackageVersion Include="Xamarin.AndroidX.DocumentFile" Version="1.0.1.31" />
   </ItemGroup>
 </Project>

src/Platforms/SecureFolderFS.Maui/Localization/ResourceString.cs

@@ -43,7 +43,7 @@ private string GetLocalized()
             if (LocalizationService is null)
                 return $"{{{Rid}}}";
 
-            return LocalizationService.TryGetString(Rid ?? string.Empty) ?? $"{{{Rid}}}";
+            return LocalizationService.GetResource(Rid ?? string.Empty) ?? $"{{{Rid}}}";
         }
     }
 }

src/Platforms/SecureFolderFS.Maui/Platforms/Android/Helpers/AndroidLifecycleHelper.cs

@@ -15,7 +15,7 @@ namespace SecureFolderFS.Maui.Platforms.Android.Helpers
     internal sealed class AndroidLifecycleHelper : BaseLifecycleHelper
     {
         /// <inheritdoc/>
-        protected override string AppDirectory { get; } = FileSystem.Current.AppDataDirectory;
+        public override string AppDirectory { get; } = FileSystem.Current.AppDataDirectory;
 
         /// <inheritdoc/>
         public override Task InitAsync(CancellationToken cancellationToken = default)

src/Platforms/SecureFolderFS.Maui/Platforms/Android/ServiceImplementation/AndroidVaultFileSystemService.cs

@@ -1,8 +1,19 @@
 using System.Runtime.CompilerServices;
+using MauiIcons.Core;
+using MauiIcons.Cupertino;
 using SecureFolderFS.Core.MobileFS.Platforms.Android;
+using SecureFolderFS.Maui.AppModels;
+using SecureFolderFS.Sdk.Enums;
+using SecureFolderFS.Sdk.Extensions;
+using SecureFolderFS.Sdk.Models;
 using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Sdk.ViewModels.Views.Wizard;
+using SecureFolderFS.Sdk.ViewModels.Views.Wizard.DataSources;
+using SecureFolderFS.Shared;
 using SecureFolderFS.UI.ServiceImplementation;
 using IFileSystem = SecureFolderFS.Storage.VirtualFileSystem.IFileSystem;
+using static SecureFolderFS.Sdk.Constants.DataSources;
+using static SecureFolderFS.Sdk.Ftp.Constants;
 
 namespace SecureFolderFS.Maui.Platforms.Android.ServiceImplementation
 {
@@ -15,5 +26,37 @@ public override async IAsyncEnumerable<IFileSystem> GetFileSystemsAsync([Enumera
             await Task.CompletedTask;
             yield return new AndroidFileSystem();
         }
+
+        /// <inheritdoc/>
+        public override async IAsyncEnumerable<BaseDataSourceWizardViewModel> GetSourcesAsync(IVaultCollectionModel vaultCollectionModel, NewVaultMode mode, [EnumeratorCancellation] CancellationToken cancellationToken = default)
+        {
+            var fileExplorerService = DI.Service<IFileExplorerService>();
+            yield return new PickerSourceWizardViewModel(DATA_SOURCE_PICKER, fileExplorerService, mode, vaultCollectionModel)
+            {
+                Icon = new ImageIcon(new MauiIcon() { Icon = CupertinoIcons.Tray2 })
+            };
+
+            yield return new AccountSourceWizardViewModel(DATA_SOURCE_FTP, "FTP".ToLocalized(), mode, vaultCollectionModel)
+            {
+                Icon = new ImageResourceFile("source_network_drive_macos.png", false) 
+            };
+
+            yield return new AccountSourceWizardViewModel($"{nameof(SecureFolderFS)}.GoogleDrive", "GoogleDrive".ToLocalized(), mode, vaultCollectionModel)
+            {
+                Icon = new ImageResourceFile("source_gdrive.png", false) 
+            };
+            
+            yield return new AccountSourceWizardViewModel($"{nameof(SecureFolderFS)}.OneDrive", "OneDrive".ToLocalized(), mode, vaultCollectionModel)
+            {
+                Icon = new ImageResourceFile("source_onedrive.png", false) 
+            };
+            
+            yield return new AccountSourceWizardViewModel($"{nameof(SecureFolderFS)}.AmazonS3", "AmazonS3".ToLocalized(), mode, vaultCollectionModel)
+            {
+                Icon = new ImageResourceFile("source_aws_s3.png", false) 
+            };
+
+            await Task.CompletedTask;
+        }
     }
 }

src/Platforms/SecureFolderFS.Maui/Platforms/Android/ViewModels/AndroidBiometricCreationViewModel.cs

@@ -1,5 +1,6 @@
 using OwlCore.Storage;
 using SecureFolderFS.Core;
+using SecureFolderFS.Core.DataModels;
 using SecureFolderFS.Core.VaultAccess;
 using SecureFolderFS.Sdk.EventArguments;
 using SecureFolderFS.Shared.Models;
@@ -22,15 +23,15 @@ protected override async Task ProvideCredentialsAsync(CancellationToken cancella
             using var challenge = VaultHelpers.GenerateChallenge(VaultId);
 
             // Write authentication data to the vault
-            await vaultWriter.WriteAuthenticationAsync($"{Id}{Constants.Vault.Names.CONFIGURATION_EXTENSION}", new()
+            await vaultWriter.WriteAuthenticationAsync<VaultChallengeDataModel>($"{Id}{Constants.Vault.Names.CONFIGURATION_EXTENSION}", new()
             {
                 Capability = "supportsChallenge", // TODO: Put somewhere in Constants
                 Challenge = challenge.Key
             }, cancellationToken);
 
             try
             {
-                var key = await CreateAsync(VaultId, challenge.Key, cancellationToken);
+                var key = await EnrollAsync(VaultId, challenge.Key, cancellationToken);
                 var tcs = new TaskCompletionSource();
                 CredentialsProvided?.Invoke(this, new(key, tcs));
 

src/Platforms/SecureFolderFS.Maui/Platforms/Android/ViewModels/AndroidBiometricLoginViewModel.cs

@@ -1,4 +1,5 @@
 using OwlCore.Storage;
+using SecureFolderFS.Core.DataModels;
 using SecureFolderFS.Core.VaultAccess;
 using SecureFolderFS.Sdk.EventArguments;
 using SecureFolderFS.Shared.Models;
@@ -17,7 +18,7 @@ internal sealed class AndroidBiometricLoginViewModel(IFolder vaultFolder, string
         protected override async Task ProvideCredentialsAsync(CancellationToken cancellationToken)
         {
             var vaultReader = new VaultReader(VaultFolder, StreamSerializer.Instance);
-            var auth = await vaultReader.ReadAuthenticationAsync($"{Id}{Core.Constants.Vault.Names.CONFIGURATION_EXTENSION}", cancellationToken);
+            var auth = await vaultReader.ReadAuthenticationAsync<VaultChallengeDataModel>($"{Id}{Core.Constants.Vault.Names.CONFIGURATION_EXTENSION}", cancellationToken);
 
             if (auth?.Challenge is null)
             {
@@ -28,7 +29,7 @@ protected override async Task ProvideCredentialsAsync(CancellationToken cancella
             try
             {
                 // Ask for credentials
-                var key = await SignAsync(VaultId, auth.Challenge, cancellationToken);
+                var key = await AcquireAsync(VaultId, auth.Challenge, cancellationToken);
                 var tcs = new TaskCompletionSource();
 
                 // Report that credentials were provided and new provision needs to be applied

src/Platforms/SecureFolderFS.Maui/Platforms/Android/ViewModels/AndroidBiometricViewModel.cs

@@ -61,7 +61,7 @@ public override Task RevokeAsync(string? id, CancellationToken cancellationToken
         }
 
         /// <inheritdoc/>
-        public override async Task<IKey> CreateAsync(string id, byte[]? data, CancellationToken cancellationToken = default)
+        public override async Task<IKey> EnrollAsync(string id, byte[]? data, CancellationToken cancellationToken = default)
         {
             ArgumentNullException.ThrowIfNull(data);
             var keyStore = KeyStore.GetInstance(KEYSTORE_PROVIDER);
@@ -89,7 +89,7 @@ public override async Task<IKey> CreateAsync(string id, byte[]? data, Cancellati
         }
 
         /// <inheritdoc/>
-        public override async Task<IKey> SignAsync(string id, byte[]? data, CancellationToken cancellationToken = default)
+        public override async Task<IKey> AcquireAsync(string id, byte[]? data, CancellationToken cancellationToken = default)
         {
             ArgumentNullException.ThrowIfNull(data);
             var keyStore = KeyStore.GetInstance(KEYSTORE_PROVIDER);

src/Platforms/SecureFolderFS.Maui/SecureFolderFS.Maui.csproj

@@ -125,6 +125,7 @@
     <PackageReference Include="Microsoft.Maui.Essentials" />
     <PackageReference Include="Plugin.Maui.BottomSheet" />
     <PackageReference Include="SkiaSharp" />
+    <PackageReference Include="Xamarin.AndroidX.DocumentFile" />
   </ItemGroup>
 
   <ItemGroup>

src/Platforms/SecureFolderFS.Maui/Views/Modals/BaseModalPage.xaml

@@ -97,7 +97,7 @@
                     <Grid
                         x:Name="ButtonsGrid"
                         Grid.Row="2"
-                        Padding="8"
+                        Padding="16,8"
                         ColumnSpacing="8"
                         HorizontalOptions="Fill"
                         IsVisible="False">

src/Platforms/SecureFolderFS.Maui/Views/Modals/Wizard/MainWizardPage.xaml.cs

@@ -55,7 +55,7 @@ public async Task<IResult> ShowAsync()
             var navigationPage = new NavigationPage(this);
 #if ANDROID
             navigationPage.BackgroundColor = Color.FromArgb("#80000000");
-            await _sourceNavigation.PushModalAsync(_navigationPage);
+            await _sourceNavigation.PushModalAsync(navigationPage);
 #elif IOS
             NavigationPage.SetIconColor(navigationPage, Color.FromArgb("#007bff"));
             navigationPage.On<iOS>().SetModalPresentationStyle(UIModalPresentationStyle.PageSheet);