Merge branch 'hotfix/v8.22.1'

Author: love-linger

VERSION

@@ -1 +1 @@
-8.22
+8.22.1

src/App.axaml.cs

@@ -520,7 +520,7 @@ private void TryLaunchedAsNormal(IClassicDesktopStyleApplicationLifetime desktop
             desktop.MainWindow = new Views.Launcher() { DataContext = _launcher };
 
             var pref = ViewModels.Preference.Instance;
-            if (pref.ShouldCheck4UpdateOnStartup)
+            if (pref.ShouldCheck4UpdateOnStartup())
             {
                 pref.Save();
                 Check4Update();

src/Commands/Command.cs

@@ -58,7 +58,7 @@ public bool Exec()
 
             // If an SSH private key was provided, sets the environment.
             if (!string.IsNullOrEmpty(SSHKey))
-                start.Environment.Add("GIT_SSH_COMMAND", $"ssh -i '{SSHKey}'");
+                start.Environment.Add("GIT_SSH_COMMAND", $"ssh -o StrictHostKeyChecking=accept-new -i '{SSHKey}'");
             else
                 start.Arguments += "-c credential.helper=manager ";
 

src/Commands/QueryBranches.cs

@@ -73,7 +73,7 @@ protected override void OnReadline(string line)
             branch.IsCurrent = parts[2] == "*";
             branch.Upstream = parts[3];
 
-            if (branch.IsLocal && !parts[4].Equals("=", StringComparison.Ordinal))
+            if (branch.IsLocal && !string.IsNullOrEmpty(parts[4]) && !parts[4].Equals("=", StringComparison.Ordinal))
                 _needQueryTrackStatus.Add(branch);
             else
                 branch.TrackStatus = new Models.BranchTrackStatus();

src/ViewModels/Clone.cs

@@ -130,7 +130,7 @@ public override Task<bool> Sure()
                 CallUIThread(() =>
                 {
                     var normalizedPath = path.Replace("\\", "/");
-                    var node = Preference.FindOrAddNodeByRepositoryPath(normalizedPath, null, true);
+                    var node = Preference.Instance.FindOrAddNodeByRepositoryPath(normalizedPath, null, true);
                     _launcher.OpenRepositoryInTab(node, _page);
                 });
 

src/ViewModels/CreateGroup.cs

@@ -21,7 +21,7 @@ public CreateGroup(RepositoryNode parent)
 
         public override Task<bool> Sure()
         {
-            Preference.AddNode(new RepositoryNode()
+            Preference.Instance.AddNode(new RepositoryNode()
             {
                 Id = Guid.NewGuid().ToString(),
                 Name = _name,

src/ViewModels/DeleteRepositoryNode.cs

@@ -18,7 +18,7 @@ public DeleteRepositoryNode(RepositoryNode node)
 
         public override Task<bool> Sure()
         {
-            Preference.RemoveNode(_node);
+            Preference.Instance.RemoveNode(_node);
             return null;
         }
 

src/ViewModels/EditRepositoryNode.cs

@@ -48,7 +48,7 @@ public override Task<bool> Sure()
             _node.Bookmark = _bookmark;
 
             if (needSort)
-                Preference.SortByRenamedNode(_node);
+                Preference.Instance.SortByRenamedNode(_node);
 
             return null;
         }

src/ViewModels/Init.cs

@@ -31,7 +31,7 @@ public override Task<bool> Sure()
                 CallUIThread(() =>
                 {
                     var normalizedPath = _targetPath.Replace("\\", "/");
-                    Preference.FindOrAddNodeByRepositoryPath(normalizedPath, _parentNode, true);
+                    Preference.Instance.FindOrAddNodeByRepositoryPath(normalizedPath, _parentNode, true);
                 });
 
                 return true;

src/ViewModels/Launcher.cs

@@ -1,11 +1,9 @@
 using System;
 using System.IO;
 
-using Avalonia;
 using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Input;
-using Avalonia.Media;
 
 using CommunityToolkit.Mvvm.ComponentModel;
 
@@ -34,6 +32,7 @@ public Launcher(string startupRepo)
             Pages = new AvaloniaList<LauncherPage>();
             AddNewTab();
 
+            var pref = Preference.Instance;
             if (!string.IsNullOrEmpty(startupRepo))
             {
                 var root = new Commands.QueryRepositoryRootPath(startupRepo).Result();
@@ -48,14 +47,14 @@ public Launcher(string startupRepo)
                 }
 
                 var normalized = root.Replace("\\", "/");
-                var node = Preference.FindOrAddNodeByRepositoryPath(normalized, null, false);
+                var node = pref.FindOrAddNodeByRepositoryPath(normalized, null, false);
                 OpenRepositoryInTab(node, null);
             }
-            else if (Preference.Instance.RestoreTabs)
+            else if (pref.RestoreTabs)
             {
-                foreach (var id in Preference.Instance.OpenedTabs)
+                foreach (var id in pref.OpenedTabs)
                 {
-                    var node = Preference.FindNode(id);
+                    var node = pref.FindNode(id);
                     if (node == null)
                     {
                         node = new RepositoryNode()
@@ -70,7 +69,7 @@ public Launcher(string startupRepo)
                     OpenRepositoryInTab(node, null);
                 }
 
-                var lastActiveIdx = Preference.Instance.LastActiveTabIdx;
+                var lastActiveIdx = pref.LastActiveTabIdx;
                 if (lastActiveIdx >= 0 && lastActiveIdx < Pages.Count)
                     ActivePage = Pages[lastActiveIdx];
             }