Add support for url overrides

PasswordChangeAssistant now respects URL overrides - https://keepass.info/help/base/autourl.html#override
Rookiestyle · Feb 16, 2022 · 7bf2f9b · 7bf2f9b
1 parent e8ae04e
commit 7bf2f9b
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 17 deletions.
diff --git a/Translations/PasswordChangeAssistant.de.language.xml b/Translations/PasswordChangeAssistant.de.language.xml
@@ -4,7 +4,7 @@
     Increment the TranslationVersion every time the translation file is updated
 	Also update the version.info file
   -->
-  <TranslationVersion>8</TranslationVersion>
+  <TranslationVersion>9</TranslationVersion>
   <item>
     <key>OldPW</key>
     <value>Altes Passwort:</value>
@@ -108,7 +108,7 @@
   </item>
   <item>
     <key>OpenUrlForPwChange</key>
-    <value>Öffne Seite zur Passwortänderung im Standardbrowser</value>
+    <value>Öffne Seite zur Passwortänderung im Browser</value>
   </item>
   <item>
     <key>OpenUrlForPwChangeShift</key>

diff --git a/Translations/PasswordChangeAssistant.pt.language.xml b/Translations/PasswordChangeAssistant.pt.language.xml
@@ -4,7 +4,7 @@
     Increment the TranslationVersion every time the translation file is updated
 	Also update the version.info file
   -->
-  <TranslationVersion>4</TranslationVersion>
+  <TranslationVersion>5</TranslationVersion>
   <item>
     <key>OldPW</key>
     <value>Senha antiga:</value>
@@ -108,7 +108,7 @@ Substituir?</value>
   </item>
   <item>
     <key>OpenUrlForPwChange</key>
-    <value>Abrir o site de alteração de senha no navegador padrão</value>
+    <value>Abrir o site de alteração de senha no navegador</value>
   </item>
   <item>
     <key>OpenUrlForPwChangeShift</key>

diff --git a/Translations/PasswordChangeAssistant.ru.language.xml b/Translations/PasswordChangeAssistant.ru.language.xml
@@ -4,7 +4,7 @@
     Increment the TranslationVersion every time the translation file is updated
 	Also update the version.info file
   -->
-  <TranslationVersion>5</TranslationVersion>
+  <TranslationVersion>6</TranslationVersion>
   <item>
     <key>OldPW</key>
     <value>Пароль:</value>
@@ -112,7 +112,7 @@
   </item>
   <item>
     <key>OpenUrlForPwChange</key>
-    <value>Открывать страницу изменения пароля в браузере по умолчанию</value>
+    <value>Открывать страницу изменения пароля в браузере</value>
   </item>
   <item>
     <key>OpenUrlForPwChangeShift</key>

diff --git a/Translations/PasswordChangeAssistant.template.language.xml b/Translations/PasswordChangeAssistant.template.language.xml
@@ -108,7 +108,7 @@ Overwrite?</value>
   </item>
   <item>
     <key>OpenUrlForPwChange</key>
-    <value>Open password change site in default browser</value>
+    <value>Open password change site in browser</value>
   </item>
   <item>
     <key>OpenUrlForPwChangeShift</key>

diff --git a/src/PCADialog.cs b/src/PCADialog.cs
@@ -341,7 +341,7 @@ private void OnOpenUrl(object sender, EventArgs e)
 							str = strApp.Replace(PlhTargetUri, (string)m_miEncodeForCommandLine.Invoke(null, new object[] { sURL }));
 						else
 							str = strApp.Replace(PlhTargetUri, sURL);
-						WinUtil.OpenUrl(str, m_pcadata.Entry, false);
+						WinUtil.OpenUrl(str, m_pcadata.Entry, true);
 					}
 				}
 				else

diff --git a/src/PluginTranslation.cs b/src/PluginTranslation.cs
@@ -136,9 +136,9 @@ public static class PluginTranslate
 		/// </summary>
 		public static readonly string PWFormShownCaption = @"Password Change Assistant form is shown";
 		/// <summary>
-		/// Open password change site in default browser
+		/// Open password change site in browser
 		/// </summary>
-		public static readonly string OpenUrlForPwChange = @"Open password change site in default browser";
+		public static readonly string OpenUrlForPwChange = @"Open password change site in browser";
 		/// <summary>
 		/// Hold down [Shift] to invert this behaviour.
 		/// </summary>

diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs
@@ -24,6 +24,6 @@
 //
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("2.13.1")]
-[assembly: AssemblyFileVersion("2.13.1")]
+[assembly: AssemblyVersion("2.14")]
+[assembly: AssemblyFileVersion("2.14")]
 [assembly: Guid ("5d5cc62b-d6f6-4e0b-a7ff-3d5ef21dd656")]
diff --git a/src/Util.cs b/src/Util.cs
@@ -61,7 +61,7 @@ public void OpenURL()
 			if (string.IsNullOrEmpty(URL)) URL = MainURL;
 			if (string.IsNullOrEmpty(URL)) return;
 
-			KeePass.Util.WinUtil.OpenUrl(URL, m_pe, false);
+			KeePass.Util.WinUtil.OpenUrl(URL, m_pe, true);
 		}
 	}
 

diff --git a/version.info b/version.info
@@ -1,7 +1,7 @@
 :
-PasswordChangeAssistant:2.13.1
-PasswordChangeAssistant!de:8
+PasswordChangeAssistant:2.14
+PasswordChangeAssistant!de:9
 PasswordChangeAssistant!it:3
-PasswordChangeAssistant!pt:4
-PasswordChangeAssistant!ru:5
+PasswordChangeAssistant!pt:5
+PasswordChangeAssistant!ru:6
 :