Merge branch 'master' into issue_2248

Author: gave92

Files.Launcher/Program.cs

@@ -153,7 +153,7 @@ private static async void InitializeAppServiceConnection()
             if (status != AppServiceConnectionStatus.Success)
             {
                 // TODO: error handling
-                connection.Dispose();
+                connection?.Dispose();
                 connection = null;
             }
         }

Files.Package/Package.appxmanifest

@@ -9,7 +9,7 @@
          xmlns:uap4="http://schemas.microsoft.com/appx/manifest/uap/windows10/4"
          xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"
          IgnorableNamespaces="uap uap5 mp rescap desktop4 desktop">
-    <Identity Name="FilesDev" Publisher="CN=53EC4384-7F5B-4CF6-8C23-513FFE9D1AB7" Version="0.19.0.0" />
+    <Identity Name="FilesDev" Publisher="CN=53EC4384-7F5B-4CF6-8C23-513FFE9D1AB7" Version="0.19.2.0" />
     <Properties>
         <DisplayName>Files - Dev</DisplayName>
         <PublisherDisplayName>Yair A</PublisherDisplayName>

Files/App.xaml.cs

@@ -39,26 +39,8 @@ namespace Files
 {
     sealed partial class App : Application
     {
-        public static IMultitaskingControl MultitaskingControl = null;
-
-        private static IShellPage currentInstance;
         private static bool ShowErrorNotification = false;
 
-        public static IShellPage CurrentInstance
-        {
-            get
-            {
-                return currentInstance;
-            }
-            set
-            {
-                if (value != currentInstance && value != null)
-                {
-                    currentInstance = value;
-                }
-            }
-        }
-
         public static SettingsViewModel AppSettings { get; set; }
         public static InteractionViewModel InteractionViewModel { get; set; }
         public static JumpListManager JumpList { get; } = new JumpListManager();
@@ -73,6 +55,7 @@ public App()
             InitializeComponent();
             Suspending += OnSuspending;
             LeavingBackground += OnLeavingBackground;
+
             // Initialize NLog
             StorageFolder storageFolder = ApplicationData.Current.LocalFolder;
             LogManager.Configuration.Variables["LogPath"] = storageFolder.Path;
@@ -99,92 +82,9 @@ private async void StartAppCenter()
 
         private void OnLeavingBackground(object sender, LeavingBackgroundEventArgs e)
         {
-            // Need to reinitialize AppService when app is resuming
-            InitializeAppServiceConnection();
             AppSettings?.DrivesManager?.ResumeDeviceWatcher();
         }
 
-        public static AppServiceConnection Connection;
-
-        private async void InitializeAppServiceConnection()
-        {
-            Connection = new AppServiceConnection();
-            Connection.AppServiceName = "FilesInteropService";
-            Connection.PackageFamilyName = Package.Current.Id.FamilyName;
-            Connection.RequestReceived += Connection_RequestReceived;
-            Connection.ServiceClosed += Connection_ServiceClosed;
-
-            AppServiceConnectionStatus status = await Connection.OpenAsync();
-            if (status != AppServiceConnectionStatus.Success)
-            {
-                // TODO: error handling
-                Connection.Dispose();
-                Connection = null;
-            }
-
-            // Launch fulltrust process
-            await FullTrustProcessLauncher.LaunchFullTrustProcessForCurrentAppAsync();
-        }
-
-        private void Connection_ServiceClosed(AppServiceConnection sender, AppServiceClosedEventArgs args)
-        {
-            Connection = null;
-        }
-
-        private async void Connection_RequestReceived(AppServiceConnection sender, AppServiceRequestReceivedEventArgs args)
-        {
-            // Get a deferral because we use an awaitable API below to respond to the message
-            // and we don't want this call to get cancelled while we are waiting.
-            var messageDeferral = args.GetDeferral();
-
-            // The fulltrust process signaled that something in the recycle bin folder has changed
-            if (args.Request.Message.ContainsKey("FileSystem"))
-            {
-                var folderPath = (string)args.Request.Message["FileSystem"];
-                var itemPath = (string)args.Request.Message["Path"];
-                var changeType = (string)args.Request.Message["Type"];
-                var newItem = JsonConvert.DeserializeObject<ShellFileItem>(args.Request.Message.Get("Item", ""));
-                Debug.WriteLine("{0}: {1}", folderPath, changeType);
-                await CoreApplication.MainView.ExecuteOnUIThreadAsync(async () =>
-                {
-                    // If we are currently displaying the reycle bin lets refresh the items
-                    if (CurrentInstance.FilesystemViewModel?.CurrentFolder?.ItemPath == folderPath)
-                    {
-                        switch (changeType)
-                        {
-                            case "Created":
-                                CurrentInstance.FilesystemViewModel.AddFileOrFolderFromShellFile(newItem);
-                                break;
-
-                            case "Deleted":
-                                await CurrentInstance.FilesystemViewModel.RemoveFileOrFolder(itemPath);
-                                break;
-
-                            default:
-                                CurrentInstance.FilesystemViewModel.RefreshItems();
-                                break;
-                        }
-                    }
-                });
-            }
-
-            // Complete the deferral so that the platform knows that we're done responding to the app service call.
-            // Note for error handling: this must be called even if SendResponseAsync() throws an exception.
-            messageDeferral.Complete();
-        }
-
-        private void CoreWindow_PointerPressed(CoreWindow sender, PointerEventArgs args)
-        {
-            if (args.CurrentPoint.Properties.IsXButton1Pressed)
-            {
-                NavigationActions.Back_Click(null, null);
-            }
-            else if (args.CurrentPoint.Properties.IsXButton2Pressed)
-            {
-                NavigationActions.Forward_Click(null, null);
-            }
-        }
-
         public static INavigationControlItem rightClickedItem;
 
         public static void UnpinItem_Click(object sender, RoutedEventArgs e)
@@ -256,10 +156,7 @@ protected override async void OnLaunched(LaunchActivatedEventArgs e)
 
                 // Ensure the current window is active
                 Window.Current.Activate();
-                Window.Current.CoreWindow.PointerPressed += CoreWindow_PointerPressed;
                 Window.Current.CoreWindow.Activated += CoreWindow_Activated;
-                var currentView = SystemNavigationManager.GetForCurrentView();
-                currentView.BackRequested += Window_BackRequested;
             }
         }
 
@@ -273,19 +170,6 @@ private void CoreWindow_Activated(CoreWindow sender, WindowActivatedEventArgs ar
             }
         }
 
-        private void Window_BackRequested(object sender, BackRequestedEventArgs e)
-        {
-            if (CurrentInstance.ContentFrame.CanGoBack)
-            {
-                e.Handled = true;
-                NavigationActions.Back_Click(null, null);
-            }
-            else
-            {
-                e.Handled = false;
-            }
-        }
-
         protected override async void OnActivated(IActivatedEventArgs args)
         {
             Logger.Info("App activated");
@@ -316,9 +200,7 @@ protected override async void OnActivated(IActivatedEventArgs args)
 
                     // Ensure the current window is active.
                     Window.Current.Activate();
-                    Window.Current.CoreWindow.PointerPressed += CoreWindow_PointerPressed;
                     Window.Current.CoreWindow.Activated += CoreWindow_Activated;
-                    currentView.BackRequested += Window_BackRequested;
                     return;
 
                 case ActivationKind.CommandLineLaunch:
@@ -340,9 +222,7 @@ protected override async void OnActivated(IActivatedEventArgs args)
 
                                     // Ensure the current window is active.
                                     Window.Current.Activate();
-                                    Window.Current.CoreWindow.PointerPressed += CoreWindow_PointerPressed;
                                     Window.Current.CoreWindow.Activated += CoreWindow_Activated;
-                                    currentView.BackRequested += Window_BackRequested;
                                     return;
 
                                 case ParsedCommandType.OpenPath:
@@ -355,9 +235,7 @@ protected override async void OnActivated(IActivatedEventArgs args)
 
                                         // Ensure the current window is active.
                                         Window.Current.Activate();
-                                        Window.Current.CoreWindow.PointerPressed += CoreWindow_PointerPressed;
                                         Window.Current.CoreWindow.Activated += CoreWindow_Activated;
-                                        currentView.BackRequested += Window_BackRequested;
 
                                         return;
                                     }
@@ -377,9 +255,8 @@ protected override async void OnActivated(IActivatedEventArgs args)
                                     rootFrame.Navigate(typeof(MainPage), null, new SuppressNavigationTransitionInfo());
                                     // Ensure the current window is active.
                                     Window.Current.Activate();
-                                    Window.Current.CoreWindow.PointerPressed += CoreWindow_PointerPressed;
                                     Window.Current.CoreWindow.Activated += CoreWindow_Activated;
-                                    currentView.BackRequested += Window_BackRequested;
+
                                     return;
                             }
                         }
@@ -401,7 +278,6 @@ protected override async void OnActivated(IActivatedEventArgs args)
 
             // Ensure the current window is active.
             Window.Current.Activate();
-            Window.Current.CoreWindow.PointerPressed += CoreWindow_PointerPressed;
             Window.Current.CoreWindow.Activated += CoreWindow_Activated;
         }
 
@@ -433,11 +309,7 @@ private void OnSuspending(object sender, SuspendingEventArgs e)
 
             var deferral = e.SuspendingOperation.GetDeferral();
             //TODO: Save application state and stop any background activity
-            if (Connection != null)
-            {
-                Connection.Dispose();
-                Connection = null;
-            }
+
             AppSettings?.Dispose();
             deferral.Complete();
         }