Revert "Merge branch 'fix/filesystem-hides-error' into release/2.1.1"

This reverts commit a60ee65, reversing changes made to d26757f.
WalletConnect · Oct 16, 2023 · 25aa38a · 25aa38a
1 parent e14928f
commit 25aa38a
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/Core Modules/WalletConnectSharp.Storage/FileSystemStorage.cs b/Core Modules/WalletConnectSharp.Storage/FileSystemStorage.cs
@@ -110,8 +110,23 @@ private async Task Load()
             await _semaphoreSlim.WaitAsync();
             var json = await File.ReadAllTextAsync(FilePath, Encoding.UTF8);
             _semaphoreSlim.Release();
-            Entries = JsonConvert.DeserializeObject<Dictionary<string, object>>(json,
-                new JsonSerializerSettings() { TypeNameHandling = TypeNameHandling.Auto });
+
+            try
+            {
+                Entries = JsonConvert.DeserializeObject<Dictionary<string, object>>(json,
+                    new JsonSerializerSettings() {TypeNameHandling = TypeNameHandling.Auto});
+            }
+            catch (JsonSerializationException e)
+            {
+                // Move the file to a .unsupported file
+                // and start fresh
+                WCLogger.LogError(e);
+                WCLogger.LogError("Cannot load JSON file, moving data to .unsupported file to force continue");
+                if (File.Exists(FilePath + ".unsupported"))
+                    File.Move(FilePath + ".unsupported", FilePath + "." + Guid.NewGuid() + ".unsupported");
+                File.Move(FilePath, FilePath + ".unsupported");
+                Entries = new Dictionary<string, object>();
+            }
         }
     }
 }