Allow restoring tabs from previous instance using ctrl+shift+t (#5985)

Author: winston-de

Files/Helpers/AppUpdater.cs

@@ -78,6 +78,7 @@ private async Task<StorePackageUpdateResult> DownloadUpdates(IReadOnlyList<Store
                 context = await Task.Run(() => StoreContext.GetDefault());
             }
 
+            App.SaveSessionTabs(); // save the tabs so they can be restored after the update completes
             var downloadOperation = context.RequestDownloadAndInstallStorePackageUpdatesAsync(updateList);
             return await downloadOperation.AsTask();
         }

Files/Helpers/ContextFlyoutItemHelper.cs

@@ -869,7 +869,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(BaseLayo
                         OverlayLayerGlyph = "\uF026",
                     },
                     Command = commandsViewModel.ShareItemCommand,
-                    ShowItem = DataTransferManager.IsSupported() && !selectedItems.Any(i => i.IsHiddenItem || (i.IsShortcutItem && !i.IsLinkItem) || i.PrimaryItemAttribute == StorageItemTypes.Folder),
+                    ShowItem = DataTransferManager.IsSupported() && !selectedItems.Any(i => i.IsHiddenItem || (i.IsShortcutItem && !i.IsLinkItem) || (i.PrimaryItemAttribute == StorageItemTypes.Folder && !i.IsZipItem)),
                 },
                 new ContextMenuFlyoutItemViewModel()
                 {

Files/Interacts/BaseLayoutCommandImplementationModel.cs

@@ -378,7 +378,7 @@ async void Manager_DataRequested(DataTransferManager sender, DataRequestedEventA
                             return;
                         }
                     }
-                    else if (item.PrimaryItemAttribute == StorageItemTypes.Folder)
+                    else if (item.PrimaryItemAttribute == StorageItemTypes.Folder && !item.IsZipItem)
                     {
                         if (await StorageItemHelpers.ToStorageItem<BaseStorageFolder>(item.ItemPath, associatedInstance) is BaseStorageFolder folder)
                         {

Files/UserControls/MultitaskingControl/BaseMultitaskingControl.cs

@@ -41,7 +41,7 @@ public BaseMultitaskingControl()
         public ObservableCollection<TabItem> Items => MainPageViewModel.AppInstances;
 
         // RecentlyClosedTabs is shared between all multitasking controls
-        public static List<ITabItem> RecentlyClosedTabs { get; private set; } = new List<ITabItem>();
+        public static List<TabItemArguments[]> RecentlyClosedTabs { get; private set; } = new List<TabItemArguments[]>();
 
         private void MultitaskingControl_CurrentInstanceChanged(object sender, CurrentInstanceChangedEventArgs e)
         {
@@ -111,9 +111,12 @@ public async void ReopenClosedTab(object sender, RoutedEventArgs e)
             if (!isRestoringClosedTab && RecentlyClosedTabs.Any())
             {
                 isRestoringClosedTab = true;
-                ITabItem lastTab = RecentlyClosedTabs.Last();
+                var lastTab = RecentlyClosedTabs.Last();
                 RecentlyClosedTabs.Remove(lastTab);
-                await MainPageViewModel.AddNewTabByParam(lastTab.TabItemArguments.InitialPageType, lastTab.TabItemArguments.NavigationArg);
+                foreach (var item in lastTab)
+                {
+                    await MainPageViewModel.AddNewTabByParam(item.InitialPageType, item.NavigationArg);
+                }
                 isRestoringClosedTab = false;
             }
         }
@@ -133,7 +136,9 @@ public void CloseTab(TabItem tabItem)
             {
                 Items.Remove(tabItem);
                 tabItem?.Unload(); // Dispose and save tab arguments
-                RecentlyClosedTabs.Add((ITabItem)tabItem);
+                RecentlyClosedTabs.Add(new TabItemArguments[] {
+                    tabItem.TabItemArguments
+                });
             }
         }
 

Files/ViewModels/MainPageViewModel.cs

@@ -330,6 +330,18 @@ public async void OnNavigatedTo(NavigationEventArgs e)
                 {
                     try
                     {
+                        // add last session tabs to closed tabs stack if those tabs are not about to be opened
+                        if(!App.AppSettings.ResumeAfterRestart && !App.AppSettings.ContinueLastSessionOnStartUp)
+                        {
+                            var items = new TabItemArguments[App.AppSettings.LastSessionPages.Length];
+                            for(int i = 0; i < items.Length; i++)
+                            {
+                                var tabArgs = TabItemArguments.Deserialize(App.AppSettings.LastSessionPages[i]);
+                                items[i] = tabArgs;
+                            }
+                            BaseMultitaskingControl.RecentlyClosedTabs.Add(items);
+                        }
+
                         if (App.AppSettings.ResumeAfterRestart)
                         {
                             App.AppSettings.ResumeAfterRestart = false;

Files/ViewModels/NavToolbarViewModel.cs

@@ -976,7 +976,7 @@ public List<ListedItem> SelectedItems
         }
 
         public bool CanCopy => SelectedItems is not null && SelectedItems.Any();
-        public bool CanShare => SelectedItems is not null && SelectedItems.Any() && DataTransferManager.IsSupported() && !SelectedItems.Any(x => (x.IsShortcutItem && !x.IsLinkItem) || x.IsHiddenItem || x.PrimaryItemAttribute == StorageItemTypes.Folder);
+        public bool CanShare => SelectedItems is not null && SelectedItems.Any() && DataTransferManager.IsSupported() && !SelectedItems.Any(x => (x.IsShortcutItem && !x.IsLinkItem) || x.IsHiddenItem || (x.PrimaryItemAttribute == StorageItemTypes.Folder && !x.IsZipItem));
         public bool CanRename => SelectedItems is not null && SelectedItems.Count == 1;
 
         public void Dispose()