Store storage key from keys sync message

[signal-cli] / src / main / java / org / asamk / signal / manager / storage / SignalAccount.java

diff --git a/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 9922ca57d05f0f3e54d91d77af1ae38281038b7e..c1aaa788a2f7466ebbdce001e9266fb8eb0be83d 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -41,6 +41,7 @@ import org.whispersystems.libsignal.util.Pair;
 import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.whispersystems.signalservice.api.storage.StorageKey;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -71,6 +72,7 @@ public class SignalAccount implements Closeable {
     private String password;
     private String registrationLockPin;
     private MasterKey pinMasterKey;
+    private StorageKey storageKey;
     private String signalingKey;
     private ProfileKey profileKey;
     private int preKeyIdOffset;
@@ -91,7 +93,7 @@ public class SignalAccount implements Closeable {
         this.fileChannel = fileChannel;
         this.lock = lock;
         jsonProcessor.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.NONE); // disable autodetect
-        jsonProcessor.enable(SerializationFeature.INDENT_OUTPUT); // for pretty print, you can disable it.
+        jsonProcessor.enable(SerializationFeature.INDENT_OUTPUT); // for pretty print
         jsonProcessor.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
         jsonProcessor.disable(JsonParser.Feature.AUTO_CLOSE_SOURCE);
         jsonProcessor.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
@@ -265,6 +267,10 @@ public class SignalAccount implements Closeable {
         pinMasterKey = pinMasterKeyNode == null || pinMasterKeyNode.isNull()
                 ? null
                 : new MasterKey(Base64.getDecoder().decode(pinMasterKeyNode.asText()));
+        JsonNode storageKeyNode = rootNode.get("storageKey");
+        storageKey = storageKeyNode == null || storageKeyNode.isNull()
+                ? null
+                : new StorageKey(Base64.getDecoder().decode(storageKeyNode.asText()));
         if (rootNode.has("signalingKey")) {
             signalingKey = Utils.getNotNullNode(rootNode, "signalingKey").asText();
         }
@@ -398,6 +404,8 @@ public class SignalAccount implements Closeable {
                 .put("registrationLockPin", registrationLockPin)
                 .put("pinMasterKey",
                         pinMasterKey == null ? null : Base64.getEncoder().encodeToString(pinMasterKey.serialize()))
+                .put("storageKey",
+                        storageKey == null ? null : Base64.getEncoder().encodeToString(storageKey.serialize()))
                 .put("signalingKey", signalingKey)
                 .put("preKeyIdOffset", preKeyIdOffset)
                 .put("nextSignedPreKeyId", nextSignedPreKeyId)
@@ -505,6 +513,10 @@ public class SignalAccount implements Closeable {
         this.deviceId = deviceId;
     }
 
+    public boolean isMasterDevice() {
+        return deviceId == SignalServiceAddress.DEFAULT_DEVICE_ID;
+    }
+
     public String getPassword() {
         return password;
     }
@@ -529,6 +541,17 @@ public class SignalAccount implements Closeable {
         this.pinMasterKey = pinMasterKey;
     }
 
+    public StorageKey getStorageKey() {
+        if (pinMasterKey != null) {
+            return pinMasterKey.deriveStorageServiceKey();
+        }
+        return storageKey;
+    }
+
+    public void setStorageKey(final StorageKey storageKey) {
+        this.storageKey = storageKey;
+    }
+
     public String getSignalingKey() {
         return signalingKey;
     }
@@ -585,7 +608,9 @@ public class SignalAccount implements Closeable {
 
     @Override
     public void close() throws IOException {
-        save();
+        if (fileChannel.isOpen()) {
+            save();
+        }
         synchronized (fileChannel) {
             try {
                 lock.close();