From 9d534dc7bb564a24fca488b93d7a159b1de49839 Mon Sep 17 00:00:00 2001 From: AsamK Date: Sun, 28 Aug 2022 15:40:23 +0200 Subject: [PATCH] Store account file version after migration --- .../org/asamk/signal/manager/storage/SignalAccount.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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) -- 2.50.1