From: AsamK <asamk@gmx.de>
Date: Sun, 28 Aug 2022 13:40:23 +0000 (+0200)
Subject: Store account file version after migration
X-Git-Tag: v0.11.0~27
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/9d534dc7bb564a24fca488b93d7a159b1de49839?ds=sidebyside

Store account file version after migration
---

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index a246c3a7..21af35ed 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -509,6 +509,8 @@ public class SignalAccount implements Closeable {
             rootNode = jsonProcessor.readTree(Channels.newInputStream(fileChannel));
         }
 
+        var migratedLegacyConfig = false;
+
         if (rootNode.hasNonNull("version")) {
             var accountVersion = rootNode.get("version").asInt(1);
             if (accountVersion > CURRENT_STORAGE_VERSION) {
@@ -517,6 +519,9 @@ public class SignalAccount implements Closeable {
                 throw new IOException("Config file was created by a no longer supported older version!");
             }
             previousStorageVersion = accountVersion;
+            if (accountVersion < CURRENT_STORAGE_VERSION) {
+                migratedLegacyConfig = true;
+            }
         }
 
         number = Utils.getNotNullNode(rootNode, "username").asText();
@@ -616,7 +621,6 @@ public class SignalAccount implements Closeable {
             }
         }
 
-        var migratedLegacyConfig = false;
         final var legacySignalProtocolStore = rootNode.hasNonNull("axolotlStore")
                 ? jsonProcessor.convertValue(Utils.getNotNullNode(rootNode, "axolotlStore"),
                 LegacyJsonSignalProtocolStore.class)