Fixes #567 (Input string was not in a correct format)

Firefox addon/KeeFox/modules/kprpcClient.js

@@ -58,7 +58,7 @@ function kprpcClient() {
     this.requestId = 1;
     this.callbacks = {};
     this.callbacksData = {};
-    this.clientVersion = [1,5,3];
+    this.clientVersion = [1,5,4];
     this.authPromptAborted = false;
 
     // We manually create HMACs to protect the integrity of our AES encrypted messages

KeePassRPC/KeePassRPCExt.cs

@@ -61,7 +61,7 @@ public sealed class KeePassRPCExt : Plugin
         //private static LifetimeServices fakeHack = new LifetimeServices();
 
         // version information
-        public static readonly Version PluginVersion = new Version(1, 5, 3);
+        public static readonly Version PluginVersion = new Version(1, 5, 4);
 
         private BackgroundWorker _BackgroundWorker; // used to invoke main thread from other threads
         private AutoResetEvent _BackgroundWorkerAutoResetEvent;
@@ -945,8 +945,7 @@ private void OnKPDBOpen(object sender, FileOpenedEventArgs e)
             EnsureDBIconIsInKPRPCIconCache();
 
             // If we've not already upgraded the KPRPC data for this database...
-            if (!e.Database.CustomData.Exists("KeePassRPC.KeeFox.configVersion")
-                || int.Parse(e.Database.CustomData.Get("KeePassRPC.KeeFox.configVersion")) < 1)
+            if (GetConfigVersion(e.Database) < 1)
             {
                 RemoveKeeFoxTutorialDuplicateEntries(e.Database);
 
@@ -1025,8 +1024,7 @@ private void OnKPDBOpen(object sender, FileOpenedEventArgs e)
                 }
             }
 
-            if (!e.Database.CustomData.Exists("KeePassRPC.KeeFox.configVersion")
-                || int.Parse(e.Database.CustomData.Get("KeePassRPC.KeeFox.configVersion")) < 2)
+            if (GetConfigVersion(e.Database) < 2)
             {
                 // v2 entry config is backwards compatible but we need to upgrade any KeeFox tutorial
                 // entries. This means each entry's config version will remain at 1 but the overall
@@ -1042,6 +1040,18 @@ private void OnKPDBOpen(object sender, FileOpenedEventArgs e)
             SignalAllManagedRPCClients(KeePassRPC.DataExchangeModel.Signal.DATABASE_OPEN);
         }
 
+        private int GetConfigVersion(PwDatabase db)
+        {
+            if (db.CustomData.Exists("KeePassRPC.KeeFox.configVersion"))
+            {
+                int configVersion = 0;
+                string configVersionString = db.CustomData.Get("KeePassRPC.KeeFox.configVersion");
+                if (int.TryParse(configVersionString, out configVersion))
+                    return configVersion;
+            }
+            return 0;
+        }
+
         private void RemoveKeeFoxTutorialDuplicateEntries(PwDatabase db)
         {
             // We know that this upgrade path may contain duplicate KeeFox

KeePassRPC/Properties/AssemblyInfo.cs

@@ -41,4 +41,4 @@ You should have received a copy of the GNU General Public License
 
 // Assembly version information
 [assembly: AssemblyVersion("2.0.15.*")]
-[assembly: AssemblyFileVersion("1.5.3.0")] // also change PluginVersion in KeePassRPCExt.cs!
+[assembly: AssemblyFileVersion("1.5.4.0")] // also change PluginVersion in KeePassRPCExt.cs!