Streamlined app close method. (#1394)

Author: soumyamahunt

Files/App.xaml.cs

@@ -19,6 +19,7 @@
 using Windows.ApplicationModel.DataTransfer;
 using Windows.Storage;
 using Windows.UI.Core;
+using Windows.UI.ViewManagement;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Media.Animation;
@@ -407,6 +408,11 @@ private void OnSuspending(object sender, SuspendingEventArgs e)
             AppSettings?.Dispose();
             deferral.Complete();
         }
+
+        public static async void CloseApp()
+        {
+            if (!await ApplicationView.GetForCurrentView().TryConsolidateAsync()) Application.Current.Exit();
+        }
     }
 
     public class WSLDistroItem : INavigationControlItem

Files/Dialogs/ExceptionDialog.xaml.cs

@@ -20,7 +20,7 @@ private void ContentDialog_PrimaryButtonClick(ContentDialog sender, ContentDialo
         {
             if (InstanceTabsView.tabView.TabItems.Count == 1)
             {
-                Application.Current.Exit();
+                App.CloseApp();
             }
             else if (InstanceTabsView.tabView.TabItems.Count > 1)
             {
@@ -30,7 +30,7 @@ private void ContentDialog_PrimaryButtonClick(ContentDialog sender, ContentDialo
 
         private void ContentDialog_SecondaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
         {
-            Application.Current.Exit();
+            App.CloseApp();
         }
 
         private void ExpandMoreInfo_Click(object sender, RoutedEventArgs e)

Files/Interacts/Interaction.cs

@@ -463,11 +463,11 @@ private async void OpenSelectedItems(bool displayApplicationPicker)
             }
         }
 
-        public async void CloseTab()
+        public void CloseTab()
         {
             if (((Window.Current.Content as Frame).Content as InstanceTabsView).TabStrip.TabItems.Count == 1)
             {
-                await ApplicationView.GetForCurrentView().TryConsolidateAsync();
+                App.CloseApp();
             }
             else if (((Window.Current.Content as Frame).Content as InstanceTabsView).TabStrip.TabItems.Count > 1)
             {

Files/Views/InstanceTabsView.xaml.cs

@@ -425,7 +425,7 @@ private void NavigateToNumberedTabKeyboardAccelerator_Invoked(KeyboardAccelerato
             args.Handled = true;
         }
 
-        private async void CloseSelectedTabKeyboardAccelerator_Invoked(KeyboardAccelerator sender, KeyboardAcceleratorInvokedEventArgs args)
+        private void CloseSelectedTabKeyboardAccelerator_Invoked(KeyboardAccelerator sender, KeyboardAcceleratorInvokedEventArgs args)
         {
             var InvokedTabView = (args.Element as TabView);
 
@@ -434,7 +434,7 @@ private async void CloseSelectedTabKeyboardAccelerator_Invoked(KeyboardAccelerat
             {
                 if (TabStrip.TabItems.Count == 1)
                 {
-                    await ApplicationView.GetForCurrentView().TryConsolidateAsync();
+                    App.CloseApp();
                 }
                 else
                 {
@@ -500,11 +500,11 @@ public void TabStrip_SelectionChanged(object sender, SelectionChangedEventArgs e
             }
         }
 
-        private async void TabStrip_TabCloseRequested(Microsoft.UI.Xaml.Controls.TabView sender, Microsoft.UI.Xaml.Controls.TabViewTabCloseRequestedEventArgs args)
+        private void TabStrip_TabCloseRequested(Microsoft.UI.Xaml.Controls.TabView sender, Microsoft.UI.Xaml.Controls.TabViewTabCloseRequestedEventArgs args)
         {
             if (TabStrip.TabItems.Count == 1)
             {
-                await ApplicationView.GetForCurrentView().TryConsolidateAsync();
+                App.CloseApp();
             }
             else if (TabStrip.TabItems.Count > 1)
             {