From: AsamK <asamk@gmx.de>
Date: Tue, 8 Nov 2022 16:18:03 +0000 (+0100)
Subject: Fix SignalAccount initialization
X-Git-Tag: v0.11.5.1~1
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/5e1fc79c3382a66c4bfbb4847864b2356015861b

Fix SignalAccount initialization

Fixes #1092
---

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 dac8de94..9d44c297 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
@@ -506,6 +506,7 @@ public class SignalAccount implements Closeable {
     ) throws IOException {
         this.dataPath = dataPath;
         this.accountPath = accountPath;
+        this.settings = settings;
         final JsonNode rootNode;
         synchronized (fileChannel) {
             fileChannel.position(0);
@@ -685,7 +686,6 @@ public class SignalAccount implements Closeable {
 
         this.aciIdentityKeyPair = aciIdentityKeyPair;
         this.localRegistrationId = registrationId;
-        this.settings = settings;
 
         migratedLegacyConfig = loadLegacyStores(rootNode, legacySignalProtocolStore) || migratedLegacyConfig;