Fixed Google Drive enumeration

Author: d2dyno1

src/Platforms/SecureFolderFS.Maui/Views/MainPage.xaml

@@ -154,11 +154,15 @@
                             <Grid Grid.Column="2" Margin="0,0,8,0">
                                 <mi:MauiIcon
                                     Icon="{mi_material:Material ChevronRight}"
+                                    IconColor="{AppThemeBinding Light={StaticResource PrimaryContrastingLightColor},
+                                                                Dark={StaticResource PrimaryContrastingDarkColor}}"
                                     IconSize="16"
                                     OnPlatforms="Android"
                                     Opacity="0.8" />
                                 <mi:MauiIcon
                                     Icon="{mi_cupertino:Cupertino ChevronRight}"
+                                    IconColor="{AppThemeBinding Light={StaticResource PrimaryContrastingLightColor},
+                                                                Dark={StaticResource PrimaryContrastingDarkColor}}"
                                     IconSize="16"
                                     OnPlatforms="iOS"
                                     Opacity="0.8" />

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

@@ -31,7 +31,7 @@ public partial class MainWizardPage : BaseModalPage, IOverlayControl
         private readonly List<IViewable> _views;
         private readonly INavigation _sourceNavigation;
         private readonly TaskCompletionSource<IResult> _modalTcs;
-        private IStagingView? _previousView;
+        private IViewDesignation? _previousView;
 
         public MainWizardViewModel? ViewModel { get; private set; }
 
@@ -286,7 +286,7 @@ private async void ViewModel_NavigationRequested(object? sender, NavigationReque
                     return;
 
                 _previousView = OverlayViewModel.CurrentViewModel;
-                OverlayViewModel.CurrentViewModel = nextViewModel as IStagingView;
+                OverlayViewModel.CurrentViewModel = nextViewModel as IViewDesignation;
 
                 await Navigation.PushAsync(page, true);
                 e.TaskCompletion?.TrySetResult(true);

src/Sdk/SecureFolderFS.Sdk.GoogleDrive/Storage/GDriveStorable.cs

@@ -8,6 +8,8 @@ namespace SecureFolderFS.Sdk.GoogleDrive.Storage
 {
     public abstract class GDriveStorable : IStorableChild
     {
+        public const string ROOT_ID = "root";
+
         /// <summary>
         /// Gets the ID of the object that can exist independently of the parent context.
         /// </summary>
@@ -39,7 +41,13 @@ protected GDriveStorable(DriveService driveService, string id, string name, IFol
             Id = id;
             Name = name;
             ParentFolder = parent;
-            DetachedId = Path.GetFileName(Id);
+
+            // Google Drive root can be represented as an empty path segment in app code.
+            // Normalize it so API queries always use the canonical root alias.
+            var normalizedId = Id.TrimEnd('/');
+            DetachedId = string.IsNullOrEmpty(normalizedId)
+                ? ROOT_ID
+                : Path.GetFileName(normalizedId);
         }
 
         /// <inheritdoc/>

src/Sdk/SecureFolderFS.Sdk.GoogleDrive/ViewModels/GDriveAccountViewModel.cs

@@ -305,7 +305,7 @@ private async Task<UserCredential> AuthorizeAsync(string userId, bool forcePromp
 
         private static IFolder GetRootGDriveFolder(DriveService driveService)
         {
-            return new GDriveFolder(driveService, string.Empty, "Drive");
+            return new GDriveFolder(driveService, GDriveStorable.ROOT_ID, "Drive");
         }
 
         public static void AssertApiAccess()

src/Sdk/SecureFolderFS.Sdk/ViewModels/Controls/Storage/Browser/FolderViewModel.cs

@@ -83,7 +83,7 @@ public async Task ListContentsAsync(CancellationToken cancellationToken = defaul
             Items.Clear();
 
             var isPickingFolder = BrowserViewModel.TransferViewModel?.IsPickingFolder ?? false;
-            var items = await Folder.GetItemsAsync(StorableType.All, cancellationToken).ToArrayAsyncImpl(cancellationToken: cancellationToken);
+            var items = await Folder.GetItemsAsync(isPickingFolder ? StorableType.Folder : StorableType.All, cancellationToken).ToArrayAsyncImpl(cancellationToken: cancellationToken);
             BrowserViewModel.Layouts.GetSorter().SortCollection(items.Where(x => !isPickingFolder || x is IFolder).Select(x => (BrowserItemViewModel)(x switch
             {
                 IFile file => new FileViewModel(file, BrowserViewModel, this),

src/Sdk/SecureFolderFS.Sdk/ViewModels/Views/Overlays/WizardOverlayViewModel.cs

@@ -16,7 +16,7 @@ namespace SecureFolderFS.Sdk.ViewModels.Views.Overlays
     [Bindable(true)]
     public sealed partial class WizardOverlayViewModel : OverlayViewModel, IStagingView, INavigatable, IDisposable
     {
-        [ObservableProperty] private IStagingView? _CurrentViewModel;
+        [ObservableProperty] private IViewDesignation? _CurrentViewModel;
 
         public IVaultCollectionModel VaultCollectionModel { get; }
 
@@ -40,10 +40,10 @@ public override void OnDisappearing()
         /// <inheritdoc />
         public async Task<IResult> TryContinueAsync(CancellationToken cancellationToken)
         {
-            if (CurrentViewModel is null)
+            if (CurrentViewModel is not IStagingView stagingView)
                 return Result.Failure(null);
 
-            var result = await CurrentViewModel.TryContinueAsync(cancellationToken);
+            var result = await stagingView.TryContinueAsync(cancellationToken);
             if (result.Successful)
                 NavigationRequested?.Invoke(this, new WizardNavigationRequestedEventArgs(result, CurrentViewModel));
 
@@ -53,10 +53,10 @@ public async Task<IResult> TryContinueAsync(CancellationToken cancellationToken)
         /// <inheritdoc />
         public async Task<IResult> TryCancelAsync(CancellationToken cancellationToken)
         {
-            if (CurrentViewModel is null)
+            if (CurrentViewModel is not IStagingView stagingView)
                 return Result.Failure(null);
 
-            var result = await CurrentViewModel.TryCancelAsync(cancellationToken);
+            var result = await stagingView.TryCancelAsync(cancellationToken);
             if (result.Successful)
                 NavigationRequested?.Invoke(this, new DismissNavigationRequestedEventArgs(CurrentViewModel));
 
@@ -78,26 +78,22 @@ private async Task CancellationAsync(IEventDispatch? eventDispatch, Cancellation
                 eventDispatch?.PreventForwarding();
         }
 
-        partial void OnCurrentViewModelChanging(IStagingView? oldValue, IStagingView? newValue)
+        partial void OnCurrentViewModelChanging(IViewDesignation? oldValue, IViewDesignation? newValue)
         {
-            if (oldValue is not null)
-            {
-                oldValue.PropertyChanged -= CurrentViewModel_PropertyChanged;
-                oldValue.OnDisappearing();
-            }
+            oldValue?.PropertyChanged -= CurrentViewModel_PropertyChanged;
+            oldValue?.OnDisappearing();
+
+            newValue?.PropertyChanged += CurrentViewModel_PropertyChanged;
+            newValue?.OnAppearing();
+            Title = newValue?.Title;
 
             if (newValue is OverlayViewModel overlayViewModel)
             {
-                overlayViewModel.PropertyChanged += CurrentViewModel_PropertyChanged;
-                overlayViewModel.OnAppearing();
-
                 CanContinue = overlayViewModel.CanContinue;
                 CanCancel = overlayViewModel.CanCancel;
                 PrimaryText = overlayViewModel.PrimaryText;
                 SecondaryText = overlayViewModel.SecondaryText;
             }
-
-            Title = newValue?.Title;
         }
 
         private void CurrentViewModel_PropertyChanged(object? sender, PropertyChangedEventArgs e)

src/Sdk/SecureFolderFS.Sdk/ViewModels/Views/Vault/BrowserViewModel.cs

@@ -7,7 +7,6 @@
 using SecureFolderFS.Sdk.Enums;
 using SecureFolderFS.Sdk.Extensions;
 using SecureFolderFS.Sdk.Services;
-using SecureFolderFS.Sdk.ViewModels.Controls;
 using SecureFolderFS.Sdk.ViewModels.Controls.Storage;
 using SecureFolderFS.Sdk.ViewModels.Controls.Storage.Browser;
 using SecureFolderFS.Sdk.ViewModels.Controls.Transfer;
@@ -101,6 +100,7 @@ public override void OnDisappearing()
 
             try
             {
+                TransferViewModel.IsPickingFolder = true;
                 await OuterNavigator.NavigateAsync(this);
                 using var cts = TransferViewModel.GetCancellation(cancellationToken);
                 return await TransferViewModel.PickFolderAsync(new TransferOptions(TransferType.Select), false, cts.Token);
@@ -111,6 +111,7 @@ public override void OnDisappearing()
             }
             finally
             {
+                TransferViewModel.IsPickingFolder = false;
                 await OuterNavigator.GoBackAsync();
                 Dispose();
             }

src/Sdk/SecureFolderFS.Sdk/ViewModels/Views/Wizard/DataSources/AccountSourceWizardViewModel.cs

@@ -168,7 +168,6 @@ private async Task SelectAccountAsync(AccountViewModel? accountViewModel, Cancel
                 var browser = BrowserHelpers.CreateBrowser(rootFolder, new FileSystemOptions(), accountViewModel, outerNavigator: this);
 
                 // Prompt the user to pick a folder
-                browser.OnAppearing();
                 _selectedFolder = await browser.PickFolderAsync(null, true, cancellationToken);
                 if (_selectedFolder is null)
                     return;