feat: Add password save option for Quick Connect, close #746

VShawn · VShawn · commit 7a94d47c9020 · 2024-11-01T14:49:01.000+08:00
fix: Resolve bugs in Quick Connect This commit addresses issue #746 by adding an option to save passwords in the "Quick Connect" feature. Additionally, it includes fixes for various bugs found in the Quick Connect.
diff --git a/Ui/Controls/PasswordInput.xaml.cs b/Ui/Controls/PasswordInput.xaml.cs
@@ -81,15 +81,29 @@ private void ToggleButton_Checked(object sender, RoutedEventArgs e)
                     });
                 });
         }
-        private void SetSelection(PasswordBox passwordBox, int start, int length)
+        private void SetSelection(PasswordBox passwordBox, int start, int length = 0)
         {
+            if (start < 0) start = 0;
+            if (length < 0) length = 0;
             passwordBox.GetType().GetMethod("Select", BindingFlags.Instance | BindingFlags.NonPublic)?.Invoke(passwordBox, new object[] { start, length });
         }
         private void ToggleButton_Unchecked(object sender, RoutedEventArgs e)
         {
             CipherTextBox.Focus();
-            SetSelection(CipherTextBox, CipherTextBox.Password.Length, 0);
+            SetSelection(CipherTextBox, CipherTextBox.Password.Length);
             PlainTextBox.Visibility = Visibility.Hidden;
         }
+
+
+
+
+        public int CaretIndex
+        {
+            set
+            {
+                PlainTextBox.CaretIndex = value;
+                SetSelection(CipherTextBox, value);
+            }
+        }
     }
 }
diff --git a/Ui/Resources/Languages/cs-cz.xaml b/Ui/Resources/Languages/cs-cz.xaml
@@ -314,4 +314,5 @@
     <s:String x:Key="Copy the port along with the address when copying">Při kopírování zkopírujte port spolu s adresou</s:String>
     <s:String x:Key="Place the close button on the left side to prevent accidental touches">Umístěte zavírací tlačítko na levou stranu, abyste zabránili náhodným dotykům</s:String>
     <s:String x:Key="Ask for password when open connect">Při otevření připojení požádat o heslo</s:String>
+    <s:String x:Key="Remember the information above">Pamatujte na výše uvedené informace</s:String>
 </ResourceDictionary>
diff --git a/Ui/Resources/Languages/de-de.xaml b/Ui/Resources/Languages/de-de.xaml
@@ -314,4 +314,5 @@
     <s:String x:Key="Copy the port along with the address when copying">Beim Kopieren Adresse mit Port verwenden</s:String>
     <s:String x:Key="Place the close button on the left side to prevent accidental touches">Platzieren Sie die Schließtaste auf der linken Seite, um versehentliche Berührungen zu verhindern</s:String>
     <s:String x:Key="Ask for password when open connect">Beim Öffnen der Verbindung nach dem Passwort fragen</s:String>
+    <s:String x:Key="Remember the information above">Denken Sie an die obigen Informationen</s:String>
 </ResourceDictionary>
diff --git a/Ui/Resources/Languages/en-us.xaml b/Ui/Resources/Languages/en-us.xaml
@@ -314,4 +314,5 @@
     <s:String x:Key="Copy the port along with the address when copying">Copy the port along with the address when copying</s:String>
     <s:String x:Key="Place the close button on the left side to prevent accidental touches">Place the close button on the left side to prevent accidental touches</s:String>
     <s:String x:Key="Ask for password when open connect">Ask for password when open connect</s:String>
+    <s:String x:Key="Remember the information above">Remember the information above</s:String>
 </ResourceDictionary>
diff --git a/Ui/Resources/Languages/fr-fr.xaml b/Ui/Resources/Languages/fr-fr.xaml
@@ -314,4 +314,5 @@
     <s:String x:Key="Copy the port along with the address when copying">Copiez le port avec l'adresse lors de la copie</s:String>
     <s:String x:Key="Place the close button on the left side to prevent accidental touches">Placez le bouton de fermeture sur le côté gauche pour éviter les contacts accidentels</s:String>
     <s:String x:Key="Ask for password when open connect">Demander un mot de passe lors de l'ouverture de la connexion</s:String>
+    <s:String x:Key="Remember the information above">N'oubliez pas les informations ci-dessus</s:String>
 </ResourceDictionary>
diff --git a/Ui/Resources/Languages/gl-es.xaml b/Ui/Resources/Languages/gl-es.xaml
@@ -314,4 +314,5 @@
     <s:String x:Key="Copy the port along with the address when copying">Copia o porto xunto co enderezo ao copiar</s:String>
     <s:String x:Key="Place the close button on the left side to prevent accidental touches">Coloque o botón de peche no lado esquerdo para evitar toques accidentais</s:String>
     <s:String x:Key="Ask for password when open connect">Solicitar o contrasinal ao abrir a conexión</s:String>
+    <s:String x:Key="Remember the information above">Lembra a información anterior</s:String>
 </ResourceDictionary>
diff --git a/Ui/Resources/Languages/glossary.csv b/Ui/Resources/Languages/glossary.csv
@@ -348,3 +348,4 @@ Automatically focus on the content when selecting a tab;Automatically focus on t
 Copy the port along with the address when copying;Copy the port along with the address when copying;复制地址时同时复制端口;;Beim Kopieren Adresse mit Port verwenden;;;;;;;Копировать порт вместе с адресом при копировании
 Place the close button on the left side to prevent accidental touches;Place the close button on the left side to prevent accidental touches;将关闭按钮放在左侧以防止误触;;;;;;;;;
 Ask for password when open connect;Ask for password when open connect;打开连接时输入密码;;;;;;;;;
+Remember the information above;Remember the information above;记住上述信息;;;;;;;;;
diff --git a/Ui/Resources/Languages/glossary_translated_by_google.csv b/Ui/Resources/Languages/glossary_translated_by_google.csv
@@ -355,4 +355,5 @@ Use vertical lines to separate descriptions;Use vertical lines to separate descr
 Automatically focus on the content when selecting a tab;Automatically focus on the content when selecting a tab;选择 tab 后自动聚焦内容;Při výběru karty se automaticky zaměří na obsah;Automatisch Focus auf den Inhalten setzten, wenn ein Tab ausgwählt wird;Se concentrer automatiquement sur le contenu lors de la sélection d'un onglet;Concentre-se automaticamente no conteúdo ao selecionar uma guia;タブを選択すると自動的にコンテンツにフォーカスします;選擇選項卡時自動對焦內容;Concéntrase automaticamente no contido ao seleccionar unha pestana;Automatycznie skupiaj uwagę na treści podczas wybierania karty;Автоматически фокусироваться на содержимом при выборе вкладки
 Copy the port along with the address when copying;Copy the port along with the address when copying;复制地址时同时复制端口;Při kopírování zkopírujte port spolu s adresou;Beim Kopieren Adresse mit Port verwenden;Copiez le port avec l'adresse lors de la copie;Copie a porta junto com o endereço ao copiar;コピーするときはアドレスと一緒にポートもコピーします;複製的時候把連接埠和位址一起複製;Copia o porto xunto co enderezo ao copiar;Podczas kopiowania skopiuj port wraz z adresem;Копировать порт вместе с адресом при копировании
 Place the close button on the left side to prevent accidental touches;Place the close button on the left side to prevent accidental touches;将关闭按钮放在左侧以防止误触;Umístěte zavírací tlačítko na levou stranu, abyste zabránili náhodným dotykům;Platzieren Sie die Schließtaste auf der linken Seite, um versehentliche Berührungen zu verhindern;Placez le bouton de fermeture sur le côté gauche pour éviter les contacts accidentels;Coloque o botão fechar no lado esquerdo para evitar toques acidentais;誤操作を防ぐために閉じるボタンを左側に配置;將關閉按鈕置於左側，防止誤觸;Coloque o botón de peche no lado esquerdo para evitar toques accidentais;Umieść przycisk zamykania po lewej stronie, aby zapobiec przypadkowym dotknięciom;Разместите кнопку закрытия слева, чтобы предотвратить случайные нажатия.
-Ask for password when open connect;Ask for password when open connect;打开连接时再输入密码;Při otevření připojení požádat o heslo;Beim Öffnen der Verbindung nach dem Passwort fragen;Demander un mot de passe lors de l'ouverture de la connexion;Pedir senha quando abrir conectar;接続を開くときにパスワードを要求する;開啟連線時詢問密碼;Solicitar o contrasinal ao abrir a conexión;Zapytaj o hasło przy otwieraniu połączenia;Запросить пароль при открытии подключения
+Ask for password when open connect;Ask for password when open connect;打开连接时输入密码;Při otevření připojení požádat o heslo;Beim Öffnen der Verbindung nach dem Passwort fragen;Demander un mot de passe lors de l'ouverture de la connexion;Pedir senha quando abrir conectar;接続を開くときにパスワードを要求する;開啟連線時詢問密碼;Solicitar o contrasinal ao abrir a conexión;Zapytaj o hasło przy otwieraniu połączenia;Запросить пароль при открытии подключения
+Remember the information above;Remember the information above;记住上述信息;Pamatujte na výše uvedené informace;Denken Sie an die obigen Informationen;N'oubliez pas les informations ci-dessus;Lembre-se das informações acima;上記の情報を覚えておいてください;記住上面的訊息;Lembra a información anterior;Zapamiętaj powyższe informacje;Помните информацию выше
diff --git a/Ui/Resources/Languages/ja-jp.xaml b/Ui/Resources/Languages/ja-jp.xaml
@@ -314,4 +314,5 @@
     <s:String x:Key="Copy the port along with the address when copying">コピーするときはアドレスと一緒にポートもコピーします</s:String>
     <s:String x:Key="Place the close button on the left side to prevent accidental touches">誤操作を防ぐために閉じるボタンを左側に配置</s:String>
     <s:String x:Key="Ask for password when open connect">接続を開くときにパスワードを要求する</s:String>
+    <s:String x:Key="Remember the information above">上記の情報を覚えておいてください</s:String>
 </ResourceDictionary>
diff --git a/Ui/Resources/Languages/pl-pl.xaml b/Ui/Resources/Languages/pl-pl.xaml
@@ -314,4 +314,5 @@
     <s:String x:Key="Copy the port along with the address when copying">Podczas kopiowania skopiuj port wraz z adresem</s:String>
     <s:String x:Key="Place the close button on the left side to prevent accidental touches">Umieść przycisk zamykania po lewej stronie, aby zapobiec przypadkowym dotknięciom</s:String>
     <s:String x:Key="Ask for password when open connect">Zapytaj o hasło przy otwieraniu połączenia</s:String>
+    <s:String x:Key="Remember the information above">Zapamiętaj powyższe informacje</s:String>
 </ResourceDictionary>
diff --git a/Ui/Resources/Languages/pt-br.xaml b/Ui/Resources/Languages/pt-br.xaml
@@ -314,4 +314,5 @@
     <s:String x:Key="Copy the port along with the address when copying">Copie a porta junto com o endereço ao copiar</s:String>
     <s:String x:Key="Place the close button on the left side to prevent accidental touches">Coloque o botão fechar no lado esquerdo para evitar toques acidentais</s:String>
     <s:String x:Key="Ask for password when open connect">Pedir senha quando abrir conectar</s:String>
+    <s:String x:Key="Remember the information above">Lembre-se das informações acima</s:String>
 </ResourceDictionary>
diff --git a/Ui/Resources/Languages/ru-ru.xaml b/Ui/Resources/Languages/ru-ru.xaml
@@ -314,4 +314,5 @@
     <s:String x:Key="Copy the port along with the address when copying">Копировать порт вместе с адресом при копировании</s:String>
     <s:String x:Key="Place the close button on the left side to prevent accidental touches">Разместите кнопку закрытия слева, чтобы предотвратить случайные нажатия.</s:String>
     <s:String x:Key="Ask for password when open connect">Запросить пароль при открытии подключения</s:String>
+    <s:String x:Key="Remember the information above">Помните информацию выше</s:String>
 </ResourceDictionary>
diff --git a/Ui/Resources/Languages/zh-cn.xaml b/Ui/Resources/Languages/zh-cn.xaml
@@ -313,5 +313,6 @@
     <s:String x:Key="Automatically focus on the content when selecting a tab">选择 tab 后自动聚焦内容</s:String>
     <s:String x:Key="Copy the port along with the address when copying">复制地址时同时复制端口</s:String>
     <s:String x:Key="Place the close button on the left side to prevent accidental touches">将关闭按钮放在左侧以防止误触</s:String>
-    <s:String x:Key="Ask for password when open connect">打开连接时再输入密码</s:String>
+    <s:String x:Key="Ask for password when open connect">打开连接时输入密码</s:String>
+    <s:String x:Key="Remember the information above">记住上述信息</s:String>
 </ResourceDictionary>
diff --git a/Ui/Resources/Languages/zh-tw.xaml b/Ui/Resources/Languages/zh-tw.xaml
@@ -314,4 +314,5 @@
     <s:String x:Key="Copy the port along with the address when copying">複製的時候把連接埠和位址一起複製</s:String>
     <s:String x:Key="Place the close button on the left side to prevent accidental touches">將關閉按鈕置於左側，防止誤觸</s:String>
     <s:String x:Key="Ask for password when open connect">開啟連線時詢問密碼</s:String>
+    <s:String x:Key="Remember the information above">記住上面的訊息</s:String>
 </ResourceDictionary>
diff --git a/Ui/Service/Locality/LocalityConnectRecorder.cs b/Ui/Service/Locality/LocalityConnectRecorder.cs
@@ -5,6 +5,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using _1Remote.Security;
 using _1RM.Model;
 using _1RM.Model.Protocol;
 using _1RM.Model.Protocol.Base;
@@ -120,8 +121,14 @@ public static void Cleanup(IEnumerable<string>? existedIds = null)
         #region QuickConnectionHistory
 
         public static List<QuickConnectionItem> QuickConnectionHistoryGet() => new List<QuickConnectionItem>(_settings.QuickConnectionHistory);
-        public static void QuickConnectionHistoryAdd(QuickConnectionItem item)
+        public static void QuickConnectionHistoryAdd(string host, string protocol, string username, string password, string privateKeyPath)
         {
+            var item = new QuickConnectionItem()
+            {
+                Host = host,
+                Protocol = protocol,
+            };
+            item.SetUserPassword(username, password, privateKeyPath);
             Load();
             var old = _settings.QuickConnectionHistory.FirstOrDefault(x => x.Host == item.Host && x.Protocol == item.Protocol);
             if (old != null)
diff --git a/Ui/Service/Locality/LocalityService.cs b/Ui/Service/Locality/LocalityService.cs
@@ -46,6 +46,7 @@ internal class LocalitySettings
         public int FtpColumnFileTimeLength = -1;
         public int FtpColumnFileTypeLength = -1;
         public int FtpColumnFileSizeLength = -1;
+        public Dictionary<string, string> Misc = new Dictionary<string, string>();
     }
 
     public sealed class LocalityService
@@ -239,6 +240,50 @@ public int FtpColumnFileSizeLength
             }
         }
 
+        public void SetMisc(string key, string value)
+        {
+            if (_localitySettings.Misc.ContainsKey(key))
+            {
+                if (_localitySettings.Misc[key] == value) return;
+                _localitySettings.Misc[key] = value;
+            }
+            else
+            {
+                _localitySettings.Misc.Add(key, value);
+            }
+            Save();
+        }
 
+        
+        public T GetMisc<T>(string key, T defaultValue = default!)
+        {
+            var value = _localitySettings.Misc.ContainsKey(key) ? _localitySettings.Misc[key] : "";
+            // 如果 T 是 int
+            if (typeof(T) == typeof(int))
+            {
+                return int.TryParse(value, out var result) ? (T)(object)result : defaultValue;
+            }
+            // 如果 T 是 bool
+            if (typeof(T) == typeof(bool))
+            {
+                return bool.TryParse(value, out var result) ? (T)(object)result : defaultValue;
+            }
+            // 如果 T 是 float
+            if (typeof(T) == typeof(float))
+            {
+                return float.TryParse(value, out var result) ? (T)(object)result : defaultValue;
+            }
+            // 如果 T 是 float
+            if (typeof(T) == typeof(double))
+            {
+                return double.TryParse(value, out var result) ? (T)(object)result : defaultValue;
+            }
+            // 如果 T 是 string
+            if (typeof(T) == typeof(string))
+            {
+                return (T)(object)value;
+            }
+            throw new NotSupportedException($"Not support type {typeof(T)}");
+        }
     }
 }
diff --git a/Ui/Ui.csproj b/Ui/Ui.csproj
@@ -75,7 +75,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<AssemblyVersion>1.0.1.41030</AssemblyVersion>
+		<AssemblyVersion>1.0.1.41101</AssemblyVersion>
 		<FileVersion>$(AssemblyVersion)</FileVersion>
 		<Version>$(AssemblyVersion)</Version>
 		<Authors>Shawn</Authors>
diff --git a/Ui/View/AboutPageViewModel.cs b/Ui/View/AboutPageViewModel.cs
@@ -53,7 +53,7 @@ private static VersionHelper.CheckUpdateResult CustomCheckMethod(string html, st
 			{
 				var mc = Regex.Matches(html, pattern, RegexOptions.IgnoreCase);
 				if (mc.Count <= 0) continue;
-				var versionString = mc[^1].Groups[1].Value;
+				var versionString = mc[0].Groups[1].Value;
 				var releasedVersion = VersionHelper.Version.FromString(versionString);
 				if (ignoreVersion is not null)
 				{
diff --git a/Ui/View/Editor/PasswordPopupDialogView.xaml b/Ui/View/Editor/PasswordPopupDialogView.xaml
diff --git a/Ui/View/Editor/PasswordPopupDialogViewModel.cs b/Ui/View/Editor/PasswordPopupDialogViewModel.cs
diff --git a/Ui/View/Launcher/QuickConnectionItem.cs b/Ui/View/Launcher/QuickConnectionItem.cs
diff --git a/Ui/View/Launcher/QuickConnectionViewModel.cs b/Ui/View/Launcher/QuickConnectionViewModel.cs
diff --git a/Ui/View/Launcher/ServerSelectionsView.xaml b/Ui/View/Launcher/ServerSelectionsView.xaml
diff --git a/Ui/View/Launcher/ServerSelectionsViewModel.cs b/Ui/View/Launcher/ServerSelectionsViewModel.cs
diff --git a/Ui/View/LauncherWindowViewModel.cs b/Ui/View/LauncherWindowViewModel.cs

Original file line number	Diff line number	Diff line change
`@@ -81,15 +81,29 @@ private void ToggleButton_Checked(object sender, RoutedEventArgs e)`
`81`	`81`	`});`
`82`	`82`	`});`
`83`	`83`	`}`
`84`		`- private void SetSelection(PasswordBox passwordBox, int start, int length)`
	`84`	`+ private void SetSelection(PasswordBox passwordBox, int start, int length = 0)`
`85`	`85`	`{`
	`86`	`+ if (start < 0) start = 0;`
	`87`	`+ if (length < 0) length = 0;`
`86`	`88`	`passwordBox.GetType().GetMethod("Select", BindingFlags.Instance \| BindingFlags.NonPublic)?.Invoke(passwordBox, new object[] { start, length });`
`87`	`89`	`}`
`88`	`90`	`private void ToggleButton_Unchecked(object sender, RoutedEventArgs e)`
`89`	`91`	`{`
`90`	`92`	`CipherTextBox.Focus();`
`91`		`- SetSelection(CipherTextBox, CipherTextBox.Password.Length, 0);`
	`93`	`+ SetSelection(CipherTextBox, CipherTextBox.Password.Length);`
`92`	`94`	`PlainTextBox.Visibility = Visibility.Hidden;`
`93`	`95`	`}`
	`96`	`+`
	`97`	`+`
	`98`	`+`
	`99`	`+`
	`100`	`+ public int CaretIndex`
	`101`	`+ {`
	`102`	`+ set`
	`103`	`+ {`
	`104`	`+ PlainTextBox.CaretIndex = value;`
	`105`	`+ SetSelection(CipherTextBox, value);`
	`106`	`+ }`
	`107`	`+ }`
`94`	`108`	`}`
`95`	`109`	`}`