Merge pull request #251 from raisingthefloor/master

Morphic for Windows v1.2 (w/ bugfix)
raisingthefloor · May 12, 2021 · c853d1b · c853d1b
2 parents 2b070be + 0c3de97
commit c853d1b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/Morphic.Client/App.xaml.cs b/Morphic.Client/App.xaml.cs
@@ -946,7 +946,7 @@ private void RegisterGlobalHotKeys()
             EventHandler<NHotkey.HotkeyEventArgs> loginHotKeyPressed = async (sender, e) =>
             {
                 // NOTE: if we want the login menu item to apply cloud-saved preferences after login, we should set this flag to true
-                var applyPreferencesAfterLogin = true;
+                var applyPreferencesAfterLogin = ConfigurableFeatures.CloudSettingsTransferIsEnabled;
                 var args = new Dictionary<string, object?>() { { "applyPreferencesAfterLogin", applyPreferencesAfterLogin } };
                 await this.Dialogs.OpenDialogAsync<LoginWindow>(args);
             };

diff --git a/Morphic.Client/Dialogs/LoginWindow.xaml.cs b/Morphic.Client/Dialogs/LoginWindow.xaml.cs
@@ -46,6 +46,7 @@ public LoginWindow(ILogger<TravelWindow> logger, IServiceProvider serviceProvide
 
         private readonly IServiceProvider serviceProvider;
 
+        private LoginPanel? LoginPanel = null;
         private bool ApplyPreferencesAfterLogin = false;
 
         void MorphicWindowWithArgs.SetArguments(Dictionary<String, object?> args)
@@ -55,6 +56,10 @@ void MorphicWindowWithArgs.SetArguments(Dictionary<String, object?> args)
                 switch (key.ToLower()) {
                     case "applypreferencesafterlogin":
                         this.ApplyPreferencesAfterLogin = (value as bool?) ?? false;
+                        if (this.LoginPanel != null)
+                        {
+                            this.LoginPanel.ApplyPreferencesAfterLogin = this.ApplyPreferencesAfterLogin;
+                        }
                         break;
                     default:
                         Debug.Assert(false, "Unknown argument");
@@ -74,6 +79,7 @@ private void ShowLoginPanel(bool applyPreferencesAfterLogin)
             LoginPanel loginPanel = this.StepFrame.PushPanel<LoginPanel>();
             loginPanel.ApplyPreferencesAfterLogin = applyPreferencesAfterLogin;
             loginPanel.Completed += (sender, args) => this.Close();
+            this.LoginPanel = loginPanel;
         }
     }
 }

diff --git a/Morphic.Client/Menu/MorphicMenu.xaml.cs b/Morphic.Client/Menu/MorphicMenu.xaml.cs
@@ -270,12 +270,12 @@ private async void Logout(object sender, RoutedEventArgs e)
             await App.Current.MorphicSession.SignOut();
         }
 
-        private void Login(object sender, RoutedEventArgs e)
+        private async void Login(object sender, RoutedEventArgs e)
         {
             // NOTE: if we want the login menu item to apply cloud-saved preferences after login, we should set this flag to true
-            var applyPreferencesAfterLogin = false;
+            var applyPreferencesAfterLogin = ConfigurableFeatures.CloudSettingsTransferIsEnabled;
             var args = new Dictionary<string, object?>() { { "applyPreferencesAfterLogin", applyPreferencesAfterLogin } };
-            App.Current.Dialogs.OpenDialogAsync<LoginWindow>(args);
+            await App.Current.Dialogs.OpenDialogAsync<LoginWindow>(args);
         }
 
         private async void ExploreMorphicClicked(object sender, RoutedEventArgs e)

diff --git a/Morphic.Client/appsettings.Debug.json b/Morphic.Client/appsettings.Debug.json
@@ -4,7 +4,7 @@
     "FrontEndUrlAsString": "http://localhost:8080/"
   },
   "Update": {
-    "AppCastUrl":  ""
+    "AppCastUrl": ""
   },
   "Countly": {
     "ServerUrl": "https://countly.morphic.dev",