Update dependency

[signal-cli] / src / main / java / org / asamk / signal / Manager.java

diff --git a/src/main/java/org/asamk/signal/Manager.java b/src/main/java/org/asamk/signal/Manager.java
index 4a5d46805c8901c8df668b2ec516bc449ad9f52a..a38d313f516e2fa93f52a7f5b11dea02ce855c46 100644 (file)
--- a/src/main/java/org/asamk/signal/Manager.java
+++ b/src/main/java/org/asamk/signal/Manager.java
@@ -27,6 +27,16 @@ import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.http.util.TextUtils;
 import org.asamk.Signal;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.http.util.TextUtils;
 import org.asamk.Signal;

+import org.asamk.signal.storage.contacts.ContactInfo;
+import org.asamk.signal.storage.contacts.JsonContactsStore;
+import org.asamk.signal.storage.groups.GroupInfo;
+import org.asamk.signal.storage.groups.JsonGroupStore;
+import org.asamk.signal.storage.protocol.JsonIdentityKeyStore;
+import org.asamk.signal.storage.protocol.JsonSignalProtocolStore;
+import org.asamk.signal.storage.threads.JsonThreadStore;
+import org.asamk.signal.storage.threads.ThreadInfo;
+import org.asamk.signal.util.Base64;
+import org.asamk.signal.util.Util;

 import org.whispersystems.libsignal.*;
 import org.whispersystems.libsignal.ecc.Curve;
 import org.whispersystems.libsignal.ecc.ECKeyPair;
 import org.whispersystems.libsignal.*;
 import org.whispersystems.libsignal.ecc.Curve;
 import org.whispersystems.libsignal.ecc.ECKeyPair;


@@ -86,6 +96,7 @@ class Manager implements Signal {
 
     private final static int PREKEY_MINIMUM_COUNT = 20;
     private static final int PREKEY_BATCH_SIZE = 100;
 
     private final static int PREKEY_MINIMUM_COUNT = 20;
     private static final int PREKEY_BATCH_SIZE = 100;

+    private static final int MAX_ATTACHMENT_SIZE = 150 * 1024  * 1024;

 
     private final String settingsPath;
     private final String dataPath;
 
     private final String settingsPath;
     private final String dataPath;


@@ -357,7 +368,7 @@ class Manager implements Signal {
     }
 
     public void updateAccountAttributes() throws IOException {
     }
 
     public void updateAccountAttributes() throws IOException {

-        accountManager.setAccountAttributes(signalingKey, signalProtocolStore.getLocalRegistrationId(), false, false,true);
+        accountManager.setAccountAttributes(signalingKey, signalProtocolStore.getLocalRegistrationId(), false, false, true);

     }
 
     public void unregister() throws IOException {
     }
 
     public void unregister() throws IOException {


@@ -507,7 +518,7 @@ class Manager implements Signal {
     public void verifyAccount(String verificationCode) throws IOException {
         verificationCode = verificationCode.replace("-", "");
         signalingKey = Util.getSecret(52);
     public void verifyAccount(String verificationCode) throws IOException {
         verificationCode = verificationCode.replace("-", "");
         signalingKey = Util.getSecret(52);

-        accountManager.verifyAccountWithCode(verificationCode, signalingKey, signalProtocolStore.getLocalRegistrationId(), false, false,true);
+        accountManager.verifyAccountWithCode(verificationCode, signalingKey, signalProtocolStore.getLocalRegistrationId(), false, false, true);

 
         //accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));
         registered = true;
 
         //accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));
         registered = true;


@@ -547,7 +558,8 @@ class Manager implements Signal {
         if (mime == null) {
             mime = "application/octet-stream";
         }
         if (mime == null) {
             mime = "application/octet-stream";
         }

-        return new SignalServiceAttachmentStream(attachmentStream, mime, attachmentSize, null);
+        // TODO mabybe add a parameter to set the voiceNote and preview option
+        return new SignalServiceAttachmentStream(attachmentStream, mime, attachmentSize, Optional.of(attachmentFile.getName()), false, Optional.<byte[]>absent(),null);

     }
 
     private Optional<SignalServiceAttachmentStream> createGroupAvatarAttachment(byte[] groupId) throws IOException {
     }
 
     private Optional<SignalServiceAttachmentStream> createGroupAvatarAttachment(byte[] groupId) throws IOException {


@@ -580,7 +592,7 @@ class Manager implements Signal {
         }
         throw new NotAGroupMemberException(groupId, g.name);
     }
         }
         throw new NotAGroupMemberException(groupId, g.name);
     }

-    
+

     public List<GroupInfo> getGroups() {
         return groupStore.getGroups();
     }
     public List<GroupInfo> getGroups() {
         return groupStore.getGroups();
     }


@@ -825,7 +837,10 @@ class Manager implements Signal {
     }
 
     @Override
     }
 
     @Override

-    public void updateGroup(byte[] groupId, String name, List<String> members, String avatar) throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException {
+    public byte[] updateGroup(byte[] groupId, String name, List<String> members, String avatar) throws IOException, EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException {
+        if (groupId.length == 0) {
+            groupId = null;
+        }

         if (name.isEmpty()) {
             name = null;
         }
         if (name.isEmpty()) {
             name = null;
         }


@@ -835,7 +850,7 @@ class Manager implements Signal {
         if (avatar.isEmpty()) {
             avatar = null;
         }
         if (avatar.isEmpty()) {
             avatar = null;
         }

-        sendUpdateGroupMessage(groupId, name, members, avatar);
+        return sendUpdateGroupMessage(groupId, name, members, avatar);

     }
 
     private void requestSyncGroups() throws IOException {
     }
 
     private void requestSyncGroups() throws IOException {


@@ -1237,7 +1252,11 @@ class Manager implements Signal {
                     File tmpFile = null;
                     try {
                         tmpFile = Util.createTempFile();
                     File tmpFile = null;
                     try {
                         tmpFile = Util.createTempFile();

-                        DeviceContactsInputStream s = new DeviceContactsInputStream(retrieveAttachmentAsStream(syncMessage.getContacts().get().asPointer(), tmpFile));
+                        final ContactsMessage contactsMessage = syncMessage.getContacts().get();
+                        DeviceContactsInputStream s = new DeviceContactsInputStream(retrieveAttachmentAsStream(contactsMessage.getContactsStream().asPointer(), tmpFile));
+                        if (contactsMessage.isComplete()) {
+                            contactStore.clear();
+                        }

                         DeviceContact c;
                         while ((c = s.read()) != null) {
                             ContactInfo contact = contactStore.getContact(c.getNumber());
                         DeviceContact c;
                         while ((c = s.read()) != null) {
                             ContactInfo contact = contactStore.getContact(c.getNumber());


@@ -1397,7 +1416,7 @@ class Manager implements Signal {
         final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(serviceUrls, username, password, deviceId, signalingKey, USER_AGENT);
 
         File tmpFile = Util.createTempFile();
         final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(serviceUrls, username, password, deviceId, signalingKey, USER_AGENT);
 
         File tmpFile = Util.createTempFile();

-        try (InputStream input = messageReceiver.retrieveAttachment(pointer, tmpFile)) {
+        try (InputStream input = messageReceiver.retrieveAttachment(pointer, tmpFile, MAX_ATTACHMENT_SIZE)) {

             try (OutputStream output = new FileOutputStream(outputFile)) {
                 byte[] buffer = new byte[4096];
                 int read;
             try (OutputStream output = new FileOutputStream(outputFile)) {
                 byte[] buffer = new byte[4096];
                 int read;


@@ -1421,7 +1440,7 @@ class Manager implements Signal {
 
     private InputStream retrieveAttachmentAsStream(SignalServiceAttachmentPointer pointer, File tmpFile) throws IOException, InvalidMessageException {
         final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(serviceUrls, username, password, deviceId, signalingKey, USER_AGENT);
 
     private InputStream retrieveAttachmentAsStream(SignalServiceAttachmentPointer pointer, File tmpFile) throws IOException, InvalidMessageException {
         final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(serviceUrls, username, password, deviceId, signalingKey, USER_AGENT);

-        return messageReceiver.retrieveAttachment(pointer, tmpFile);
+        return messageReceiver.retrieveAttachment(pointer, tmpFile, MAX_ATTACHMENT_SIZE);

     }
 
     private String canonicalizeNumber(String number) throws InvalidNumberException {
     }
 
     private String canonicalizeNumber(String number) throws InvalidNumberException {


@@ -1492,7 +1511,7 @@ class Manager implements Signal {
                             .withLength(contactsFile.length())
                             .build();
 
                             .withLength(contactsFile.length())
                             .build();
 

-                    sendSyncMessage(SignalServiceSyncMessage.forContacts(attachmentStream));
+                    sendSyncMessage(SignalServiceSyncMessage.forContacts(new ContactsMessage(attachmentStream, true)));

                 }
             }
         } finally {
                 }
             }
         } finally {


@@ -1532,11 +1551,11 @@ class Manager implements Signal {
             return false;
         }
         for (JsonIdentityKeyStore.Identity id : ids) {
             return false;
         }
         for (JsonIdentityKeyStore.Identity id : ids) {

-            if (!Arrays.equals(id.identityKey.serialize(), fingerprint)) {
+            if (!Arrays.equals(id.getIdentityKey().serialize(), fingerprint)) {

                 continue;
             }
 
                 continue;
             }
 

-            signalProtocolStore.saveIdentity(name, id.identityKey, TrustLevel.TRUSTED_VERIFIED);
+            signalProtocolStore.saveIdentity(name, id.getIdentityKey(), TrustLevel.TRUSTED_VERIFIED);

             save();
             return true;
         }
             save();
             return true;
         }


@@ -1555,11 +1574,11 @@ class Manager implements Signal {
             return false;
         }
         for (JsonIdentityKeyStore.Identity id : ids) {
             return false;
         }
         for (JsonIdentityKeyStore.Identity id : ids) {

-            if (!safetyNumber.equals(computeSafetyNumber(name, id.identityKey))) {
+            if (!safetyNumber.equals(computeSafetyNumber(name, id.getIdentityKey()))) {

                 continue;
             }
 
                 continue;
             }
 

-            signalProtocolStore.saveIdentity(name, id.identityKey, TrustLevel.TRUSTED_VERIFIED);
+            signalProtocolStore.saveIdentity(name, id.getIdentityKey(), TrustLevel.TRUSTED_VERIFIED);

             save();
             return true;
         }
             save();
             return true;
         }


@@ -1577,8 +1596,8 @@ class Manager implements Signal {
             return false;
         }
         for (JsonIdentityKeyStore.Identity id : ids) {
             return false;
         }
         for (JsonIdentityKeyStore.Identity id : ids) {

-            if (id.trustLevel == TrustLevel.UNTRUSTED) {
-                signalProtocolStore.saveIdentity(name, id.identityKey, TrustLevel.TRUSTED_UNVERIFIED);
+            if (id.getTrustLevel() == TrustLevel.UNTRUSTED) {
+                signalProtocolStore.saveIdentity(name, id.getIdentityKey(), TrustLevel.TRUSTED_UNVERIFIED);

             }
         }
         save();
             }
         }
         save();