Update to libsignal 2.15.3 (#255)

diff --git a/build.gradle b/build.gradle
index c2b451f69cfae49f4b7d70fc431a526b403f0abb..a7312bb4122ed5aa50b26414be13c3e6aeb5e1f7 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
 }
 
 dependencies {

-    compile 'com.github.turasa:signal-service-java:2.13.9_unofficial_1'
+    compile 'com.github.turasa:signal-service-java:2.15.3_unofficial_1'

     compile 'org.bouncycastle:bcprov-jdk15on:1.64'
     compile 'net.sourceforge.argparse4j:argparse4j:0.8.1'
     compile 'org.freedesktop.dbus:dbus-java:2.7.0'
     compile 'org.bouncycastle:bcprov-jdk15on:1.64'
     compile 'net.sourceforge.argparse4j:argparse4j:0.8.1'
     compile 'org.freedesktop.dbus:dbus-java:2.7.0'

diff --git a/src/main/java/org/asamk/signal/GroupNotFoundException.java b/src/main/java/org/asamk/signal/GroupNotFoundException.java
index 5fee6233cb97289d1304d640ae5bd8dcbe8d27a8..f09014a0cfcc7cf8e749ecfad846153325a192ee 100644 (file)
--- a/src/main/java/org/asamk/signal/GroupNotFoundException.java
+++ b/src/main/java/org/asamk/signal/GroupNotFoundException.java
@@ -1,7 +1,7 @@
 package org.asamk.signal;
 
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 package org.asamk.signal;
 
 import org.freedesktop.dbus.exceptions.DBusExecutionException;

-import org.whispersystems.signalservice.internal.util.Base64;
+import org.whispersystems.util.Base64;

 
 public class GroupNotFoundException extends DBusExecutionException {
 
 
 public class GroupNotFoundException extends DBusExecutionException {
 

diff --git a/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java b/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java
index 0e53b45326305da315c2ef3c6cb5548028ba270a..06cd31accbe2d7b314a2312b41de120e67c56d91 100644 (file)
--- a/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java
@@ -31,7 +31,7 @@ public class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
                 conn.sendSignal(new Signal.ReceiptReceived(
                         objectPath,
                         envelope.getTimestamp(),
                 conn.sendSignal(new Signal.ReceiptReceived(
                         objectPath,
                         envelope.getTimestamp(),

-                        envelope.getSource()
+                        envelope.getSourceE164().get()

                 ));
             } catch (DBusException e) {
                 e.printStackTrace();
                 ));
             } catch (DBusException e) {
                 e.printStackTrace();


@@ -55,7 +55,7 @@ public class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
                     conn.sendSignal(new Signal.MessageReceived(
                             objectPath,
                             message.getTimestamp(),
                     conn.sendSignal(new Signal.MessageReceived(
                             objectPath,
                             message.getTimestamp(),

-                            envelope.isUnidentifiedSender() ? content.getSender() : envelope.getSource(),
+                            envelope.isUnidentifiedSender() ? content.getSender().getNumber().get() : envelope.getSourceE164().get(),

                             message.getGroupInfo().isPresent() ? message.getGroupInfo().get().getGroupId() : new byte[0],
                             message.getBody().isPresent() ? message.getBody().get() : "",
                             attachments));
                             message.getGroupInfo().isPresent() ? message.getGroupInfo().get().getGroupId() : new byte[0],
                             message.getBody().isPresent() ? message.getBody().get() : "",
                             attachments));

diff --git a/src/main/java/org/asamk/signal/JsonGroupInfo.java b/src/main/java/org/asamk/signal/JsonGroupInfo.java
index 073ad3ff7fbc0dbc85bf7564c25fe02dfb183594..5678b8961b7a19289857fcaa28eb55548212055d 100644 (file)
--- a/src/main/java/org/asamk/signal/JsonGroupInfo.java
+++ b/src/main/java/org/asamk/signal/JsonGroupInfo.java
@@ -1,8 +1,10 @@
 package org.asamk.signal;
 
 import org.whispersystems.signalservice.api.messages.SignalServiceGroup;
 package org.asamk.signal;
 
 import org.whispersystems.signalservice.api.messages.SignalServiceGroup;

-import org.whispersystems.signalservice.internal.util.Base64;
+import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.whispersystems.util.Base64;

 
 

+import java.util.ArrayList;

 import java.util.List;
 
 class JsonGroupInfo {
 import java.util.List;
 
 class JsonGroupInfo {


@@ -15,7 +17,10 @@ class JsonGroupInfo {
     JsonGroupInfo(SignalServiceGroup groupInfo) {
         this.groupId = Base64.encodeBytes(groupInfo.getGroupId());
         if (groupInfo.getMembers().isPresent()) {
     JsonGroupInfo(SignalServiceGroup groupInfo) {
         this.groupId = Base64.encodeBytes(groupInfo.getGroupId());
         if (groupInfo.getMembers().isPresent()) {

-            this.members = groupInfo.getMembers().get();
+            this.members = new ArrayList<>(groupInfo.getMembers().get().size());
+            for (SignalServiceAddress address : groupInfo.getMembers().get()) {
+                this.members.add(address.getNumber().get());
+            }

         }
         if (groupInfo.getName().isPresent()) {
             this.name = groupInfo.getName().get();
         }
         if (groupInfo.getName().isPresent()) {
             this.name = groupInfo.getName().get();

diff --git a/src/main/java/org/asamk/signal/JsonMessageEnvelope.java b/src/main/java/org/asamk/signal/JsonMessageEnvelope.java
index b0d49ca52d3b7b4734a22e2c77fc6d898fb00e12..97b3cf225619de9fdc44213c1ebba9fa0797342b 100644 (file)
--- a/src/main/java/org/asamk/signal/JsonMessageEnvelope.java
+++ b/src/main/java/org/asamk/signal/JsonMessageEnvelope.java
@@ -18,14 +18,14 @@ class JsonMessageEnvelope {
 
     public JsonMessageEnvelope(SignalServiceEnvelope envelope, SignalServiceContent content) {
         SignalServiceAddress source = envelope.getSourceAddress();
 
     public JsonMessageEnvelope(SignalServiceEnvelope envelope, SignalServiceContent content) {
         SignalServiceAddress source = envelope.getSourceAddress();

-        this.source = source.getNumber();
+        this.source = source.getNumber().get();

         this.sourceDevice = envelope.getSourceDevice();
         this.relay = source.getRelay().isPresent() ? source.getRelay().get() : null;
         this.timestamp = envelope.getTimestamp();
         this.isReceipt = envelope.isReceipt();
         if (content != null) {
             if (envelope.isUnidentifiedSender()) {
         this.sourceDevice = envelope.getSourceDevice();
         this.relay = source.getRelay().isPresent() ? source.getRelay().get() : null;
         this.timestamp = envelope.getTimestamp();
         this.isReceipt = envelope.isReceipt();
         if (content != null) {
             if (envelope.isUnidentifiedSender()) {

-                this.source = content.getSender();
+                this.source = content.getSender().getNumber().get();

                 this.sourceDevice = content.getSenderDevice();
             }
             if (content.getDataMessage().isPresent()) {
                 this.sourceDevice = content.getSenderDevice();
             }
             if (content.getDataMessage().isPresent()) {

diff --git a/src/main/java/org/asamk/signal/JsonSyncDataMessage.java b/src/main/java/org/asamk/signal/JsonSyncDataMessage.java
index aaf04348704df4495ef69f7e88798172c2f8b382..b72fb26d28fe07fe45f2a373356e66deb3a53fb0 100644 (file)
--- a/src/main/java/org/asamk/signal/JsonSyncDataMessage.java
+++ b/src/main/java/org/asamk/signal/JsonSyncDataMessage.java
@@ -9,7 +9,7 @@ class JsonSyncDataMessage extends JsonDataMessage {
     JsonSyncDataMessage(SentTranscriptMessage transcriptMessage) {
         super(transcriptMessage.getMessage());
         if (transcriptMessage.getDestination().isPresent()) {
     JsonSyncDataMessage(SentTranscriptMessage transcriptMessage) {
         super(transcriptMessage.getMessage());
         if (transcriptMessage.getDestination().isPresent()) {

-            this.destination = transcriptMessage.getDestination().get();
+            this.destination = transcriptMessage.getDestination().get().getNumber().get();

         }
     }
 }
         }
     }
 }

diff --git a/src/main/java/org/asamk/signal/JsonSyncMessage.java b/src/main/java/org/asamk/signal/JsonSyncMessage.java
index 623f2c07df1f20c0a595f8753fa065989cf4b7fa..a6ecb459fd7887c482d88423f6c65300af36916b 100644 (file)
--- a/src/main/java/org/asamk/signal/JsonSyncMessage.java
+++ b/src/main/java/org/asamk/signal/JsonSyncMessage.java
@@ -2,7 +2,10 @@ package org.asamk.signal;
 
 import org.whispersystems.signalservice.api.messages.multidevice.ReadMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
 
 import org.whispersystems.signalservice.api.messages.multidevice.ReadMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;

+import org.whispersystems.signalservice.api.push.SignalServiceAddress;

 
 

+
+import java.util.ArrayList;

 import java.util.List;
 
 enum JsonSyncMessageType {
 import java.util.List;
 
 enum JsonSyncMessageType {


@@ -23,7 +26,10 @@ class JsonSyncMessage {
            this.sentMessage = new JsonSyncDataMessage(syncMessage.getSent().get());
        }
        if (syncMessage.getBlockedList().isPresent()) {
            this.sentMessage = new JsonSyncDataMessage(syncMessage.getSent().get());
        }
        if (syncMessage.getBlockedList().isPresent()) {

-           this.blockedNumbers = syncMessage.getBlockedList().get().getNumbers();
+           this.blockedNumbers = new ArrayList<>(syncMessage.getBlockedList().get().getAddresses().size());
+           for (SignalServiceAddress address : syncMessage.getBlockedList().get().getAddresses()) {
+               this.blockedNumbers.add(address.getNumber().get());
+           }

        }
        if (syncMessage.getRead().isPresent()) {
            this.readMessages = syncMessage.getRead().get();
        }
        if (syncMessage.getRead().isPresent()) {
            this.readMessages = syncMessage.getRead().get();

diff --git a/src/main/java/org/asamk/signal/NotAGroupMemberException.java b/src/main/java/org/asamk/signal/NotAGroupMemberException.java
index 84e2f90f8a912bb2f4727db08de3862c75ba7ce3..cfdc7855e4ab59a701984c5fa7b7113870c082de 100644 (file)
--- a/src/main/java/org/asamk/signal/NotAGroupMemberException.java
+++ b/src/main/java/org/asamk/signal/NotAGroupMemberException.java
@@ -1,7 +1,7 @@
 package org.asamk.signal;
 
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 package org.asamk.signal;
 
 import org.freedesktop.dbus.exceptions.DBusExecutionException;

-import org.whispersystems.signalservice.internal.util.Base64;
+import org.whispersystems.util.Base64;

 
 public class NotAGroupMemberException extends DBusExecutionException {
 
 
 public class NotAGroupMemberException extends DBusExecutionException {
 

diff --git a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
index e2cb66369ebdf7dd5dc1c4a995038b2d3c3940db..fb4b3850328b47c8d7bd77efeebe22d2326b1142 100644 (file)
--- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
@@ -27,7 +27,7 @@ import org.whispersystems.signalservice.api.messages.multidevice.SentTranscriptM
 import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.VerifiedMessage;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.VerifiedMessage;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;

-import org.whispersystems.signalservice.internal.util.Base64;
+import org.whispersystems.util.Base64;

 
 import java.io.File;
 import java.util.List;
 
 import java.io.File;
 import java.util.List;


@@ -43,7 +43,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
     @Override
     public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) {
         SignalServiceAddress source = envelope.getSourceAddress();
     @Override
     public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) {
         SignalServiceAddress source = envelope.getSourceAddress();

-        ContactInfo sourceContact = m.getContact(source.getNumber());
+        ContactInfo sourceContact = m.getContact(source.getNumber().get());

         System.out.println(String.format("Envelope from: %s (device: %d)", (sourceContact == null ? "" : "“" + sourceContact.name + "” ") + source.getNumber(), envelope.getSourceDevice()));
         if (source.getRelay().isPresent()) {
             System.out.println("Relayed by: " + source.getRelay().get());
         System.out.println(String.format("Envelope from: %s (device: %d)", (sourceContact == null ? "" : "“" + sourceContact.name + "” ") + source.getNumber(), envelope.getSourceDevice()));
         if (source.getRelay().isPresent()) {
             System.out.println("Relayed by: " + source.getRelay().get());


@@ -94,7 +94,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
                     if (syncMessage.getRead().isPresent()) {
                         System.out.println("Received sync read messages list");
                         for (ReadMessage rm : syncMessage.getRead().get()) {
                     if (syncMessage.getRead().isPresent()) {
                         System.out.println("Received sync read messages list");
                         for (ReadMessage rm : syncMessage.getRead().get()) {

-                            ContactInfo fromContact = m.getContact(rm.getSender());
+                            ContactInfo fromContact = m.getContact(rm.getSender().getNumber().get());

                             System.out.println("From: " + (fromContact == null ? "" : "“" + fromContact.name + "” ") + rm.getSender() + " Message timestamp: " + DateUtils.formatTimestamp(rm.getTimestamp()));
                         }
                     }
                             System.out.println("From: " + (fromContact == null ? "" : "“" + fromContact.name + "” ") + rm.getSender() + " Message timestamp: " + DateUtils.formatTimestamp(rm.getTimestamp()));
                         }
                     }


@@ -112,7 +112,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
                         final SentTranscriptMessage sentTranscriptMessage = syncMessage.getSent().get();
                         String to;
                         if (sentTranscriptMessage.getDestination().isPresent()) {
                         final SentTranscriptMessage sentTranscriptMessage = syncMessage.getSent().get();
                         String to;
                         if (sentTranscriptMessage.getDestination().isPresent()) {

-                            String dest = sentTranscriptMessage.getDestination().get();
+                            String dest = sentTranscriptMessage.getDestination().get().getNumber().get();

                             ContactInfo destContact = m.getContact(dest);
                             to = (destContact == null ? "" : "“" + destContact.name + "” ") + dest;
                         } else {
                             ContactInfo destContact = m.getContact(dest);
                             to = (destContact == null ? "" : "“" + destContact.name + "” ") + dest;
                         } else {


@@ -129,15 +129,15 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
                         System.out.println("Received sync message with block list");
                         System.out.println("Blocked numbers:");
                         final BlockedListMessage blockedList = syncMessage.getBlockedList().get();
                         System.out.println("Received sync message with block list");
                         System.out.println("Blocked numbers:");
                         final BlockedListMessage blockedList = syncMessage.getBlockedList().get();

-                        for (String number : blockedList.getNumbers()) {
-                            System.out.println(" - " + number);
+                        for (SignalServiceAddress address : blockedList.getAddresses()) {
+                            System.out.println(" - " + address.getNumber());

                         }
                     }
                     if (syncMessage.getVerified().isPresent()) {
                         System.out.println("Received sync message with verified identities:");
                         final VerifiedMessage verifiedMessage = syncMessage.getVerified().get();
                         System.out.println(" - " + verifiedMessage.getDestination() + ": " + verifiedMessage.getVerified());
                         }
                     }
                     if (syncMessage.getVerified().isPresent()) {
                         System.out.println("Received sync message with verified identities:");
                         final VerifiedMessage verifiedMessage = syncMessage.getVerified().get();
                         System.out.println(" - " + verifiedMessage.getDestination() + ": " + verifiedMessage.getVerified());

-                        String safetyNumber = Util.formatSafetyNumber(m.computeSafetyNumber(verifiedMessage.getDestination(), verifiedMessage.getIdentityKey()));
+                        String safetyNumber = Util.formatSafetyNumber(m.computeSafetyNumber(verifiedMessage.getDestination().getNumber().get(), verifiedMessage.getIdentityKey()));

                         System.out.println("   " + safetyNumber);
                     }
                     if (syncMessage.getConfiguration().isPresent()) {
                         System.out.println("   " + safetyNumber);
                     }
                     if (syncMessage.getConfiguration().isPresent()) {


@@ -232,8 +232,8 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             }
             System.out.println("  Type: " + groupInfo.getType());
             if (groupInfo.getMembers().isPresent()) {
             }
             System.out.println("  Type: " + groupInfo.getType());
             if (groupInfo.getMembers().isPresent()) {

-                for (String member : groupInfo.getMembers().get()) {
-                    System.out.println("  Member: " + member);
+                for (SignalServiceAddress member : groupInfo.getMembers().get()) {
+                    System.out.println("  Member: " + member.getNumber().get());

                 }
             }
             if (groupInfo.getAvatar().isPresent()) {
                 }
             }
             if (groupInfo.getAvatar().isPresent()) {

diff --git a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
index 2f8bf41157ffa389215d6db681bfa154c73239ca..20e4590080141c3ef830143ab17307e282f4337c 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
@@ -6,7 +6,7 @@ import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.storage.groups.GroupInfo;
 
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.storage.groups.GroupInfo;

-import org.whispersystems.signalservice.internal.util.Base64;
+import org.whispersystems.util.Base64;

 
 import java.util.List;
 
 
 import java.util.List;
 

diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
index 9025aa554cde60267e1f4d3b319022665123a00c..876b68324f8dbcc9722d71b889f2be4ae04961e1 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
@@ -12,7 +12,7 @@ import org.asamk.signal.util.DateUtils;
 import org.freedesktop.dbus.DBusConnection;
 import org.freedesktop.dbus.DBusSigHandler;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.freedesktop.dbus.DBusConnection;
 import org.freedesktop.dbus.DBusSigHandler;
 import org.freedesktop.dbus.exceptions.DBusException;

-import org.whispersystems.signalservice.internal.util.Base64;
+import org.whispersystems.util.Base64;

 
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;

diff --git a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
index 5778b33379ce8454eec148ac30079132bf30f170..66071cb066fed4c9b21547747d3004f4405f5180 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
@@ -10,7 +10,7 @@ import org.asamk.signal.GroupNotFoundException;
 import org.asamk.signal.NotAGroupMemberException;
 import org.asamk.signal.util.Util;
 import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;
 import org.asamk.signal.NotAGroupMemberException;
 import org.asamk.signal.util.Util;
 import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;

-import org.whispersystems.signalservice.internal.util.Base64;
+import org.whispersystems.util.Base64;

 
 import java.io.IOException;
 import java.util.ArrayList;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/src/main/java/org/asamk/signal/manager/KeyUtils.java b/src/main/java/org/asamk/signal/manager/KeyUtils.java
index 617893fc727b7205f2eb86ff8135176a90d4bb61..6ffc3f36a5be499c55934f86c076aebf02f9c8ae 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/KeyUtils.java
+++ b/src/main/java/org/asamk/signal/manager/KeyUtils.java
@@ -1,7 +1,7 @@
 package org.asamk.signal.manager;
 
 import org.asamk.signal.util.RandomUtils;
 package org.asamk.signal.manager;
 
 import org.asamk.signal.util.RandomUtils;

-import org.whispersystems.signalservice.internal.util.Base64;
+import org.whispersystems.util.Base64;

 
 class KeyUtils {
 
 
 class KeyUtils {
 

diff --git a/src/main/java/org/asamk/signal/manager/Manager.java b/src/main/java/org/asamk/signal/manager/Manager.java
index c2b139feeb7818282209ef61d33a96ae95dee6fc..3ca4995874c494eced8741c5163e63a5615eae6a 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/src/main/java/org/asamk/signal/manager/Manager.java
@@ -17,11 +17,7 @@
 package org.asamk.signal.manager;
 
 import org.asamk.Signal;
 package org.asamk.signal.manager;
 
 import org.asamk.Signal;

-import org.asamk.signal.AttachmentInvalidException;
-import org.asamk.signal.GroupNotFoundException;
-import org.asamk.signal.NotAGroupMemberException;
-import org.asamk.signal.TrustLevel;
-import org.asamk.signal.UserAlreadyExists;
+import org.asamk.signal.*;

 import org.asamk.signal.storage.SignalAccount;
 import org.asamk.signal.storage.contacts.ContactInfo;
 import org.asamk.signal.storage.groups.GroupInfo;
 import org.asamk.signal.storage.SignalAccount;
 import org.asamk.signal.storage.contacts.ContactInfo;
 import org.asamk.signal.storage.groups.GroupInfo;


@@ -94,7 +90,7 @@ import org.whispersystems.signalservice.api.util.StreamDetails;
 import org.whispersystems.signalservice.api.util.UptimeSleepTimer;
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
 import org.whispersystems.signalservice.internal.push.UnsupportedDataMessageException;
 import org.whispersystems.signalservice.api.util.UptimeSleepTimer;
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
 import org.whispersystems.signalservice.internal.push.UnsupportedDataMessageException;

-import org.whispersystems.signalservice.internal.util.Base64;
+import org.whispersystems.util.Base64;

 
 import java.io.File;
 import java.io.FileInputStream;
 
 import java.io.File;
 import java.io.FileInputStream;


@@ -183,7 +179,7 @@ public class Manager implements Signal {
 
         migrateLegacyConfigs();
 
 
         migrateLegacyConfigs();
 

-        accountManager = new SignalServiceAccountManager(BaseConfig.serviceConfiguration, username, account.getPassword(), account.getDeviceId(), BaseConfig.USER_AGENT, timer);
+        accountManager = new SignalServiceAccountManager(BaseConfig.serviceConfiguration, null, username, account.getPassword(), account.getDeviceId(), BaseConfig.USER_AGENT, timer);

         try {
             if (account.isRegistered() && accountManager.getPreKeysCount() < BaseConfig.PREKEY_MINIMUM_COUNT) {
                 refreshPreKeys();
         try {
             if (account.isRegistered() && accountManager.getPreKeysCount() < BaseConfig.PREKEY_MINIMUM_COUNT) {
                 refreshPreKeys();


@@ -242,7 +238,7 @@ public class Manager implements Signal {
             createNewIdentity();
         }
         account.setPassword(KeyUtils.createPassword());
             createNewIdentity();
         }
         account.setPassword(KeyUtils.createPassword());

-        accountManager = new SignalServiceAccountManager(BaseConfig.serviceConfiguration, account.getUsername(), account.getPassword(), BaseConfig.USER_AGENT, timer);
+        accountManager = new SignalServiceAccountManager(BaseConfig.serviceConfiguration, null, account.getUsername(), account.getPassword(), BaseConfig.USER_AGENT, timer);

 
         if (voiceVerification) {
             accountManager.requestVoiceVerificationCode(Locale.getDefault(), Optional.<String>absent(), Optional.<String>absent());
 
         if (voiceVerification) {
             accountManager.requestVoiceVerificationCode(Locale.getDefault(), Optional.<String>absent(), Optional.<String>absent());


@@ -287,7 +283,7 @@ public class Manager implements Signal {
             createNewIdentity();
         }
         account.setPassword(KeyUtils.createPassword());
             createNewIdentity();
         }
         account.setPassword(KeyUtils.createPassword());

-        accountManager = new SignalServiceAccountManager(BaseConfig.serviceConfiguration, username, account.getPassword(), BaseConfig.USER_AGENT, timer);
+        accountManager = new SignalServiceAccountManager(BaseConfig.serviceConfiguration, null, username, account.getPassword(), BaseConfig.USER_AGENT, timer);

         String uuid = accountManager.getNewDeviceUuid();
 
         return Utils.createDeviceLinkUri(new Utils.DeviceLinkInfo(uuid, getIdentity().getPublicKey()));
         String uuid = accountManager.getNewDeviceUuid();
 
         return Utils.createDeviceLinkUri(new Utils.DeviceLinkInfo(uuid, getIdentity().getPublicKey()));


@@ -415,7 +411,7 @@ public class Manager implements Signal {
     }
 
     private SignalServiceMessageReceiver getMessageReceiver() {
     }
 
     private SignalServiceMessageReceiver getMessageReceiver() {

-        return new SignalServiceMessageReceiver(BaseConfig.serviceConfiguration, username, account.getPassword(), account.getDeviceId(), account.getSignalingKey(), BaseConfig.USER_AGENT, null, timer);
+        return new SignalServiceMessageReceiver(BaseConfig.serviceConfiguration, null, username, account.getPassword(), account.getDeviceId(), account.getSignalingKey(), BaseConfig.USER_AGENT, null, timer);

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


@@ -573,10 +569,15 @@ public class Manager implements Signal {
     }
 
     private SignalServiceDataMessage.Builder getGroupUpdateMessageBuilder(GroupInfo g) {
     }
 
     private SignalServiceDataMessage.Builder getGroupUpdateMessageBuilder(GroupInfo g) {

+        ArrayList<SignalServiceAddress> members = new ArrayList<>(g.members.size());
+        for (String member : g.members) {
+            members.add(new SignalServiceAddress(null, member));
+        }
+

         SignalServiceGroup.Builder group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.UPDATE)
                 .withId(g.groupId)
                 .withName(g.name)
         SignalServiceGroup.Builder group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.UPDATE)
                 .withId(g.groupId)
                 .withName(g.name)

-                .withMembers(new ArrayList<>(g.members));
+                .withMembers(members);

 
         File aFile = getGroupAvatarFile(g.groupId);
         if (aFile.exists()) {
 
         File aFile = getGroupAvatarFile(g.groupId);
         if (aFile.exists()) {


@@ -801,12 +802,12 @@ public class Manager implements Signal {
 
     private void sendSyncMessage(SignalServiceSyncMessage message)
             throws IOException, UntrustedIdentityException {
 
     private void sendSyncMessage(SignalServiceSyncMessage message)
             throws IOException, UntrustedIdentityException {

-        SignalServiceMessageSender messageSender = new SignalServiceMessageSender(BaseConfig.serviceConfiguration, username, account.getPassword(),
+        SignalServiceMessageSender messageSender = new SignalServiceMessageSender(BaseConfig.serviceConfiguration, null, username, account.getPassword(),

                 account.getDeviceId(), account.getSignalProtocolStore(), BaseConfig.USER_AGENT, account.isMultiDevice(), Optional.fromNullable(messagePipe), Optional.fromNullable(unidentifiedMessagePipe), Optional.<SignalServiceMessageSender.EventListener>absent());
         try {
             messageSender.sendMessage(message, getAccessForSync());
         } catch (UntrustedIdentityException e) {
                 account.getDeviceId(), account.getSignalProtocolStore(), BaseConfig.USER_AGENT, account.isMultiDevice(), Optional.fromNullable(messagePipe), Optional.fromNullable(unidentifiedMessagePipe), Optional.<SignalServiceMessageSender.EventListener>absent());
         try {
             messageSender.sendMessage(message, getAccessForSync());
         } catch (UntrustedIdentityException e) {

-            account.getSignalProtocolStore().saveIdentity(e.getE164Number(), e.getIdentityKey(), TrustLevel.UNTRUSTED);
+            account.getSignalProtocolStore().saveIdentity(e.getIdentifier(), e.getIdentityKey(), TrustLevel.UNTRUSTED);

             throw e;
         }
     }
             throw e;
         }
     }


@@ -824,11 +825,11 @@ public class Manager implements Signal {
 
         for (SendMessageResult result : results) {
             if (result.isUnregisteredFailure()) {
 
         for (SendMessageResult result : results) {
             if (result.isUnregisteredFailure()) {

-                unregisteredUsers.add(new UnregisteredUserException(result.getAddress().getNumber(), null));
+                unregisteredUsers.add(new UnregisteredUserException(result.getAddress().getNumber().get(), null));

             } else if (result.isNetworkFailure()) {
             } else if (result.isNetworkFailure()) {

-                networkExceptions.add(new NetworkFailureException(result.getAddress().getNumber(), null));
+                networkExceptions.add(new NetworkFailureException(result.getAddress().getNumber().get(), null));

             } else if (result.getIdentityFailure() != null) {
             } else if (result.getIdentityFailure() != null) {

-                untrustedIdentities.add(new UntrustedIdentityException("Untrusted", result.getAddress().getNumber(), result.getIdentityFailure().getIdentityKey()));
+                untrustedIdentities.add(new UntrustedIdentityException("Untrusted", result.getAddress().getNumber().get(), result.getIdentityFailure().getIdentityKey()));

             }
         }
         if (!untrustedIdentities.isEmpty() || !unregisteredUsers.isEmpty() || !networkExceptions.isEmpty()) {
             }
         }
         if (!untrustedIdentities.isEmpty() || !unregisteredUsers.isEmpty() || !networkExceptions.isEmpty()) {


@@ -846,7 +847,7 @@ public class Manager implements Signal {
 
         SignalServiceDataMessage message = null;
         try {
 
         SignalServiceDataMessage message = null;
         try {

-            SignalServiceMessageSender messageSender = new SignalServiceMessageSender(BaseConfig.serviceConfiguration, username, account.getPassword(),
+            SignalServiceMessageSender messageSender = new SignalServiceMessageSender(BaseConfig.serviceConfiguration, null, username, account.getPassword(),

                     account.getDeviceId(), account.getSignalProtocolStore(), BaseConfig.USER_AGENT, account.isMultiDevice(), Optional.fromNullable(messagePipe), Optional.fromNullable(unidentifiedMessagePipe), Optional.<SignalServiceMessageSender.EventListener>absent());
 
             message = messageBuilder.build();
                     account.getDeviceId(), account.getSignalProtocolStore(), BaseConfig.USER_AGENT, account.isMultiDevice(), Optional.fromNullable(messagePipe), Optional.fromNullable(unidentifiedMessagePipe), Optional.<SignalServiceMessageSender.EventListener>absent());
 
             message = messageBuilder.build();


@@ -856,22 +857,22 @@ public class Manager implements Signal {
                     List<SendMessageResult> result = messageSender.sendMessage(new ArrayList<>(recipientsTS), getAccessFor(recipientsTS), isRecipientUpdate, message);
                     for (SendMessageResult r : result) {
                         if (r.getIdentityFailure() != null) {
                     List<SendMessageResult> result = messageSender.sendMessage(new ArrayList<>(recipientsTS), getAccessFor(recipientsTS), isRecipientUpdate, message);
                     for (SendMessageResult r : result) {
                         if (r.getIdentityFailure() != null) {

-                            account.getSignalProtocolStore().saveIdentity(r.getAddress().getNumber(), r.getIdentityFailure().getIdentityKey(), TrustLevel.UNTRUSTED);
+                            account.getSignalProtocolStore().saveIdentity(r.getAddress().getNumber().get(), r.getIdentityFailure().getIdentityKey(), TrustLevel.UNTRUSTED);

                         }
                     }
                     return result;
                 } catch (UntrustedIdentityException e) {
                         }
                     }
                     return result;
                 } catch (UntrustedIdentityException e) {

-                    account.getSignalProtocolStore().saveIdentity(e.getE164Number(), e.getIdentityKey(), TrustLevel.UNTRUSTED);
+                    account.getSignalProtocolStore().saveIdentity(e.getIdentifier(), e.getIdentityKey(), TrustLevel.UNTRUSTED);

                     return Collections.emptyList();
                 }
                     return Collections.emptyList();
                 }

-            } else if (recipientsTS.size() == 1 && recipientsTS.contains(new SignalServiceAddress(username))) {
-                SignalServiceAddress recipient = new SignalServiceAddress(username);
+            } else if (recipientsTS.size() == 1 && recipientsTS.contains(new SignalServiceAddress(null, username))) {
+                SignalServiceAddress recipient = new SignalServiceAddress(null, username);

                 final Optional<UnidentifiedAccessPair> unidentifiedAccess = getAccessFor(recipient);
                 final Optional<UnidentifiedAccessPair> unidentifiedAccess = getAccessFor(recipient);

-                SentTranscriptMessage transcript = new SentTranscriptMessage(recipient.getNumber(),
+                SentTranscriptMessage transcript = new SentTranscriptMessage(Optional.of(new SignalServiceAddress(null, recipient.getNumber().get())),

                         message.getTimestamp(),
                         message,
                         message.getExpiresInSeconds(),
                         message.getTimestamp(),
                         message,
                         message.getExpiresInSeconds(),

-                        Collections.singletonMap(recipient.getNumber(), unidentifiedAccess.isPresent()),
+                        Collections.singletonMap(new SignalServiceAddress(null, recipient.getNumber()), unidentifiedAccess.isPresent()),

                         false);
                 SignalServiceSyncMessage syncMessage = SignalServiceSyncMessage.forSentTranscript(transcript);
 
                         false);
                 SignalServiceSyncMessage syncMessage = SignalServiceSyncMessage.forSentTranscript(transcript);
 


@@ -879,7 +880,7 @@ public class Manager implements Signal {
                 try {
                     messageSender.sendMessage(syncMessage, unidentifiedAccess);
                 } catch (UntrustedIdentityException e) {
                 try {
                     messageSender.sendMessage(syncMessage, unidentifiedAccess);
                 } catch (UntrustedIdentityException e) {

-                    account.getSignalProtocolStore().saveIdentity(e.getE164Number(), e.getIdentityKey(), TrustLevel.UNTRUSTED);
+                    account.getSignalProtocolStore().saveIdentity(e.getIdentifier(), e.getIdentityKey(), TrustLevel.UNTRUSTED);

                     results.add(SendMessageResult.identityFailure(recipient, e.getIdentityKey()));
                 }
                 return results;
                     results.add(SendMessageResult.identityFailure(recipient, e.getIdentityKey()));
                 }
                 return results;


@@ -887,7 +888,7 @@ public class Manager implements Signal {
                 // Send to all individually, so sync messages are sent correctly
                 List<SendMessageResult> results = new ArrayList<>(recipientsTS.size());
                 for (SignalServiceAddress address : recipientsTS) {
                 // Send to all individually, so sync messages are sent correctly
                 List<SendMessageResult> results = new ArrayList<>(recipientsTS.size());
                 for (SignalServiceAddress address : recipientsTS) {

-                    ThreadInfo thread = account.getThreadStore().getThread(address.getNumber());
+                    ThreadInfo thread = account.getThreadStore().getThread(address.getNumber().get());

                     if (thread != null) {
                         messageBuilder.withExpiration(thread.messageExpirationTime);
                     } else {
                     if (thread != null) {
                         messageBuilder.withExpiration(thread.messageExpirationTime);
                     } else {


@@ -898,7 +899,7 @@ public class Manager implements Signal {
                         SendMessageResult result = messageSender.sendMessage(address, getAccessFor(address), message);
                         results.add(result);
                     } catch (UntrustedIdentityException e) {
                         SendMessageResult result = messageSender.sendMessage(address, getAccessFor(address), message);
                         results.add(result);
                     } catch (UntrustedIdentityException e) {

-                        account.getSignalProtocolStore().saveIdentity(e.getE164Number(), e.getIdentityKey(), TrustLevel.UNTRUSTED);
+                        account.getSignalProtocolStore().saveIdentity(e.getIdentifier(), e.getIdentityKey(), TrustLevel.UNTRUSTED);

                         results.add(SendMessageResult.identityFailure(address, e.getIdentityKey()));
                     }
                 }
                         results.add(SendMessageResult.identityFailure(address, e.getIdentityKey()));
                     }
                 }


@@ -907,7 +908,7 @@ public class Manager implements Signal {
         } finally {
             if (message != null && message.isEndSession()) {
                 for (SignalServiceAddress recipient : recipientsTS) {
         } finally {
             if (message != null && message.isEndSession()) {
                 for (SignalServiceAddress recipient : recipientsTS) {

-                    handleEndSession(recipient.getNumber());
+                    handleEndSession(recipient.getNumber().get());

                 }
             }
             account.save();
                 }
             }
             account.save();


@@ -915,7 +916,7 @@ public class Manager implements Signal {
     }
 
     private SignalServiceContent decryptMessage(SignalServiceEnvelope envelope) throws InvalidMetadataMessageException, ProtocolInvalidMessageException, ProtocolDuplicateMessageException, ProtocolLegacyMessageException, ProtocolInvalidKeyIdException, InvalidMetadataVersionException, ProtocolInvalidVersionException, ProtocolNoSessionException, ProtocolInvalidKeyException, ProtocolUntrustedIdentityException, SelfSendException, UnsupportedDataMessageException {
     }
 
     private SignalServiceContent decryptMessage(SignalServiceEnvelope envelope) throws InvalidMetadataMessageException, ProtocolInvalidMessageException, ProtocolDuplicateMessageException, ProtocolLegacyMessageException, ProtocolInvalidKeyIdException, InvalidMetadataVersionException, ProtocolInvalidVersionException, ProtocolNoSessionException, ProtocolInvalidKeyException, ProtocolUntrustedIdentityException, SelfSendException, UnsupportedDataMessageException {

-        SignalServiceCipher cipher = new SignalServiceCipher(new SignalServiceAddress(username), account.getSignalProtocolStore(), Utils.getCertificateValidator());
+        SignalServiceCipher cipher = new SignalServiceCipher(new SignalServiceAddress(null, username), account.getSignalProtocolStore(), Utils.getCertificateValidator());

         try {
             return cipher.decrypt(envelope);
         } catch (ProtocolUntrustedIdentityException e) {
         try {
             return cipher.decrypt(envelope);
         } catch (ProtocolUntrustedIdentityException e) {


@@ -957,7 +958,11 @@ public class Manager implements Signal {
                     }
 
                     if (groupInfo.getMembers().isPresent()) {
                     }
 
                     if (groupInfo.getMembers().isPresent()) {

-                        group.members.addAll(groupInfo.getMembers().get());
+                        List<String> members = new ArrayList<>(groupInfo.getMembers().get().size());
+                        for (SignalServiceAddress address : groupInfo.getMembers().get()) {
+                            members.add(address.getNumber().get());
+                        }
+                        group.members.addAll(members);

                     }
 
                     account.getGroupStore().updateGroup(group);
                     }
 
                     account.getGroupStore().updateGroup(group);


@@ -1106,7 +1111,7 @@ public class Manager implements Signal {
                         public void onMessage(SignalServiceEnvelope envelope) {
                             // store message on disk, before acknowledging receipt to the server
                             try {
                         public void onMessage(SignalServiceEnvelope envelope) {
                             // store message on disk, before acknowledging receipt to the server
                             try {

-                                File cacheFile = getMessageCacheFile(envelope.getSource(), now, envelope.getTimestamp());
+                                File cacheFile = getMessageCacheFile(envelope.getSourceE164().get(), now, envelope.getTimestamp());

                                 Utils.storeEnvelope(envelope, cacheFile);
                             } catch (IOException e) {
                                 System.err.println("Failed to store encrypted message in disk cache, ignoring: " + e.getMessage());
                                 Utils.storeEnvelope(envelope, cacheFile);
                             } catch (IOException e) {
                                 System.err.println("Failed to store encrypted message in disk cache, ignoring: " + e.getMessage());


@@ -1134,7 +1139,7 @@ public class Manager implements Signal {
                 if (!(exception instanceof ProtocolUntrustedIdentityException)) {
                     File cacheFile = null;
                     try {
                 if (!(exception instanceof ProtocolUntrustedIdentityException)) {
                     File cacheFile = null;
                     try {

-                        cacheFile = getMessageCacheFile(envelope.getSource(), now, envelope.getTimestamp());
+                        cacheFile = getMessageCacheFile(envelope.getSourceE164().get(), now, envelope.getTimestamp());

                         Files.delete(cacheFile.toPath());
                         // Try to delete directory if empty
                         new File(getMessageCachePath()).delete();
                         Files.delete(cacheFile.toPath());
                         // Try to delete directory if empty
                         new File(getMessageCachePath()).delete();


@@ -1155,14 +1160,14 @@ public class Manager implements Signal {
         if (content != null) {
             if (content.getDataMessage().isPresent()) {
                 SignalServiceDataMessage message = content.getDataMessage().get();
         if (content != null) {
             if (content.getDataMessage().isPresent()) {
                 SignalServiceDataMessage message = content.getDataMessage().get();

-                handleSignalServiceDataMessage(message, false, envelope.getSource(), username, ignoreAttachments);
+                handleSignalServiceDataMessage(message, false, envelope.getSourceE164().get(), username, ignoreAttachments);

             }
             if (content.getSyncMessage().isPresent()) {
                 account.setMultiDevice(true);
                 SignalServiceSyncMessage syncMessage = content.getSyncMessage().get();
                 if (syncMessage.getSent().isPresent()) {
                     SignalServiceDataMessage message = syncMessage.getSent().get().getMessage();
             }
             if (content.getSyncMessage().isPresent()) {
                 account.setMultiDevice(true);
                 SignalServiceSyncMessage syncMessage = content.getSyncMessage().get();
                 if (syncMessage.getSent().isPresent()) {
                     SignalServiceDataMessage message = syncMessage.getSent().get().getMessage();

-                    handleSignalServiceDataMessage(message, true, envelope.getSource(), syncMessage.getSent().get().getDestination().get(), ignoreAttachments);
+                    handleSignalServiceDataMessage(message, true, envelope.getSourceE164().get(), syncMessage.getSent().get().getDestination().get().getNumber().get(), ignoreAttachments);

                 }
                 if (syncMessage.getRequest().isPresent()) {
                     RequestMessage rm = syncMessage.getRequest().get();
                 }
                 if (syncMessage.getRequest().isPresent()) {
                     RequestMessage rm = syncMessage.getRequest().get();


@@ -1197,7 +1202,11 @@ public class Manager implements Signal {
                                 if (g.getName().isPresent()) {
                                     syncGroup.name = g.getName().get();
                                 }
                                 if (g.getName().isPresent()) {
                                     syncGroup.name = g.getName().get();
                                 }

-                                syncGroup.members.addAll(g.getMembers());
+                                List<String> members = new ArrayList<>(g.getMembers().size());
+                                for (SignalServiceAddress member : g.getMembers()) {
+                                    members.add(member.getNumber().get());
+                                }
+                                syncGroup.members.addAll(members);

                                 syncGroup.active = g.isActive();
                                 if (g.getColor().isPresent()) {
                                     syncGroup.color = g.getColor().get();
                                 syncGroup.active = g.isActive();
                                 if (g.getColor().isPresent()) {
                                     syncGroup.color = g.getColor().get();


@@ -1236,13 +1245,13 @@ public class Manager implements Signal {
                             }
                             DeviceContact c;
                             while ((c = s.read()) != null) {
                             }
                             DeviceContact c;
                             while ((c = s.read()) != null) {

-                                if (c.getNumber().equals(account.getUsername()) && c.getProfileKey().isPresent()) {
+                                if (c.getAddress().getNumber().get().equals(account.getUsername()) && c.getProfileKey().isPresent()) {

                                     account.setProfileKey(c.getProfileKey().get());
                                 }
                                     account.setProfileKey(c.getProfileKey().get());
                                 }

-                                ContactInfo contact = account.getContactStore().getContact(c.getNumber());
+                                ContactInfo contact = account.getContactStore().getContact(c.getAddress().getNumber().get());

                                 if (contact == null) {
                                     contact = new ContactInfo();
                                 if (contact == null) {
                                     contact = new ContactInfo();

-                                    contact.number = c.getNumber();
+                                    contact.number = c.getAddress().getNumber().get();

                                 }
                                 if (c.getName().isPresent()) {
                                     contact.name = c.getName().get();
                                 }
                                 if (c.getName().isPresent()) {
                                     contact.name = c.getName().get();


@@ -1255,13 +1264,13 @@ public class Manager implements Signal {
                                 }
                                 if (c.getVerified().isPresent()) {
                                     final VerifiedMessage verifiedMessage = c.getVerified().get();
                                 }
                                 if (c.getVerified().isPresent()) {
                                     final VerifiedMessage verifiedMessage = c.getVerified().get();

-                                    account.getSignalProtocolStore().saveIdentity(verifiedMessage.getDestination(), verifiedMessage.getIdentityKey(), TrustLevel.fromVerifiedState(verifiedMessage.getVerified()));
+                                    account.getSignalProtocolStore().saveIdentity(verifiedMessage.getDestination().getNumber().get(), verifiedMessage.getIdentityKey(), TrustLevel.fromVerifiedState(verifiedMessage.getVerified()));

                                 }
                                 if (c.getExpirationTimer().isPresent()) {
                                 }
                                 if (c.getExpirationTimer().isPresent()) {

-                                    ThreadInfo thread = account.getThreadStore().getThread(c.getNumber());
+                                    ThreadInfo thread = account.getThreadStore().getThread(c.getAddress().getNumber().get());

                                     if (thread == null) {
                                         thread = new ThreadInfo();
                                     if (thread == null) {
                                         thread = new ThreadInfo();

-                                        thread.id = c.getNumber();
+                                        thread.id = c.getAddress().getNumber().get();

                                     }
                                     thread.messageExpirationTime = c.getExpirationTimer().get();
                                     account.getThreadStore().updateThread(thread);
                                     }
                                     thread.messageExpirationTime = c.getExpirationTimer().get();
                                     account.getThreadStore().updateThread(thread);


@@ -1290,7 +1299,7 @@ public class Manager implements Signal {
                 }
                 if (syncMessage.getVerified().isPresent()) {
                     final VerifiedMessage verifiedMessage = syncMessage.getVerified().get();
                 }
                 if (syncMessage.getVerified().isPresent()) {
                     final VerifiedMessage verifiedMessage = syncMessage.getVerified().get();

-                    account.getSignalProtocolStore().saveIdentity(verifiedMessage.getDestination(), verifiedMessage.getIdentityKey(), TrustLevel.fromVerifiedState(verifiedMessage.getVerified()));
+                    account.getSignalProtocolStore().saveIdentity(verifiedMessage.getDestination().getNumber().get(), verifiedMessage.getIdentityKey(), TrustLevel.fromVerifiedState(verifiedMessage.getVerified()));

                 }
                 if (syncMessage.getConfiguration().isPresent()) {
                     // TODO
                 }
                 if (syncMessage.getConfiguration().isPresent()) {
                     // TODO


@@ -1393,8 +1402,12 @@ public class Manager implements Signal {
                 DeviceGroupsOutputStream out = new DeviceGroupsOutputStream(fos);
                 for (GroupInfo record : account.getGroupStore().getGroups()) {
                     ThreadInfo info = account.getThreadStore().getThread(Base64.encodeBytes(record.groupId));
                 DeviceGroupsOutputStream out = new DeviceGroupsOutputStream(fos);
                 for (GroupInfo record : account.getGroupStore().getGroups()) {
                     ThreadInfo info = account.getThreadStore().getThread(Base64.encodeBytes(record.groupId));

+                    List<SignalServiceAddress> members = new ArrayList<>(record.members.size());
+                    for (String member : record.members) {
+                        members.add(new SignalServiceAddress(null, member));
+                    }

                     out.write(new DeviceGroup(record.groupId, Optional.fromNullable(record.name),
                     out.write(new DeviceGroup(record.groupId, Optional.fromNullable(record.name),

-                            new ArrayList<>(record.members), createGroupAvatarAttachment(record.groupId),
+                            members, createGroupAvatarAttachment(record.groupId),

                             record.active, Optional.fromNullable(info != null ? info.messageExpirationTime : null),
                             Optional.fromNullable(record.color), false));
                 }
                             record.active, Optional.fromNullable(info != null ? info.messageExpirationTime : null),
                             Optional.fromNullable(record.color), false));
                 }


@@ -1437,21 +1450,21 @@ public class Manager implements Signal {
                             }
                         }
                         if (currentIdentity != null) {
                             }
                         }
                         if (currentIdentity != null) {

-                            verifiedMessage = new VerifiedMessage(record.number, currentIdentity.getIdentityKey(), currentIdentity.getTrustLevel().toVerifiedState(), currentIdentity.getDateAdded().getTime());
+                            verifiedMessage = new VerifiedMessage(new SignalServiceAddress(null, record.number), currentIdentity.getIdentityKey(), currentIdentity.getTrustLevel().toVerifiedState(), currentIdentity.getDateAdded().getTime());

                         }
                     }
 
                     byte[] profileKey = record.profileKey == null ? null : Base64.decode(record.profileKey);
                     // TODO store list of blocked numbers
                     boolean blocked = false;
                         }
                     }
 
                     byte[] profileKey = record.profileKey == null ? null : Base64.decode(record.profileKey);
                     // TODO store list of blocked numbers
                     boolean blocked = false;

-                    out.write(new DeviceContact(record.number, Optional.fromNullable(record.name),
+                    out.write(new DeviceContact(new SignalServiceAddress(null, record.number), Optional.fromNullable(record.name),

                             createContactAvatarAttachment(record.number), Optional.fromNullable(record.color),
                             Optional.fromNullable(verifiedMessage), Optional.fromNullable(profileKey), blocked, Optional.fromNullable(info != null ? info.messageExpirationTime : null)));
                 }
 
                 if (account.getProfileKey() != null) {
                     // Send our own profile key as well
                             createContactAvatarAttachment(record.number), Optional.fromNullable(record.color),
                             Optional.fromNullable(verifiedMessage), Optional.fromNullable(profileKey), blocked, Optional.fromNullable(info != null ? info.messageExpirationTime : null)));
                 }
 
                 if (account.getProfileKey() != null) {
                     // Send our own profile key as well

-                    out.write(new DeviceContact(account.getUsername(),
+                    out.write(new DeviceContact(new SignalServiceAddress(null, account.getUsername()),

                             Optional.<String>absent(), Optional.<SignalServiceAttachmentStream>absent(),
                             Optional.<String>absent(), Optional.<VerifiedMessage>absent(),
                             Optional.of(account.getProfileKey()),
                             Optional.<String>absent(), Optional.<SignalServiceAttachmentStream>absent(),
                             Optional.<String>absent(), Optional.<VerifiedMessage>absent(),
                             Optional.of(account.getProfileKey()),


@@ -1480,7 +1493,7 @@ public class Manager implements Signal {
     }
 
     private void sendVerifiedMessage(String destination, IdentityKey identityKey, TrustLevel trustLevel) throws IOException, UntrustedIdentityException {
     }
 
     private void sendVerifiedMessage(String destination, IdentityKey identityKey, TrustLevel trustLevel) throws IOException, UntrustedIdentityException {

-        VerifiedMessage verifiedMessage = new VerifiedMessage(destination, identityKey, trustLevel.toVerifiedState(), System.currentTimeMillis());
+        VerifiedMessage verifiedMessage = new VerifiedMessage(new SignalServiceAddress(null, destination), identityKey, trustLevel.toVerifiedState(), System.currentTimeMillis());

         sendSyncMessage(SignalServiceSyncMessage.forVerified(verifiedMessage));
     }
 
         sendSyncMessage(SignalServiceSyncMessage.forVerified(verifiedMessage));
     }
 

diff --git a/src/main/java/org/asamk/signal/manager/Utils.java b/src/main/java/org/asamk/signal/manager/Utils.java
index 733c4a8752f558bae83ac9113030a522e43cac78..144e1a11304f6d7977f71b440d44928d3a96fc55 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/Utils.java
+++ b/src/main/java/org/asamk/signal/manager/Utils.java
@@ -16,7 +16,7 @@ import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 import org.whispersystems.signalservice.api.util.StreamDetails;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 import org.whispersystems.signalservice.api.util.StreamDetails;

-import org.whispersystems.signalservice.internal.util.Base64;
+import org.whispersystems.util.Base64;

 
 import java.io.BufferedInputStream;
 import java.io.DataInputStream;
 
 import java.io.BufferedInputStream;
 import java.io.DataInputStream;


@@ -169,7 +169,7 @@ class Utils {
 
     private static SignalServiceAddress getPushAddress(String number, String localNumber) throws InvalidNumberException {
         String e164number = canonicalizeNumber(number, localNumber);
 
     private static SignalServiceAddress getPushAddress(String number, String localNumber) throws InvalidNumberException {
         String e164number = canonicalizeNumber(number, localNumber);

-        return new SignalServiceAddress(e164number);
+        return new SignalServiceAddress(null, e164number);

     }
 
     static SignalServiceEnvelope loadEnvelope(File file) throws IOException {
     }
 
     static SignalServiceEnvelope loadEnvelope(File file) throws IOException {


@@ -208,7 +208,7 @@ class Utils {
                     uuid = null;
                 }
             }
                     uuid = null;
                 }
             }

-            return new SignalServiceEnvelope(type, source, sourceDevice, timestamp, legacyMessage, content, serverTimestamp, uuid);
+            return new SignalServiceEnvelope(type, Optional.of(new SignalServiceAddress(null, source)), sourceDevice, timestamp, legacyMessage, content, serverTimestamp, uuid);

         }
     }
 
         }
     }
 


@@ -217,7 +217,7 @@ class Utils {
             try (DataOutputStream out = new DataOutputStream(f)) {
                 out.writeInt(2); // version
                 out.writeInt(envelope.getType());
             try (DataOutputStream out = new DataOutputStream(f)) {
                 out.writeInt(2); // version
                 out.writeInt(envelope.getType());

-                out.writeUTF(envelope.getSource());
+                out.writeUTF(envelope.getSourceE164().get());

                 out.writeInt(envelope.getSourceDevice());
                 out.writeLong(envelope.getTimestamp());
                 if (envelope.hasContent()) {
                 out.writeInt(envelope.getSourceDevice());
                 out.writeLong(envelope.getTimestamp());
                 if (envelope.hasContent()) {


@@ -257,7 +257,7 @@ class Utils {
     }
 
     static String computeSafetyNumber(String ownUsername, IdentityKey ownIdentityKey, String theirUsername, IdentityKey theirIdentityKey) {
     }
 
     static String computeSafetyNumber(String ownUsername, IdentityKey ownIdentityKey, String theirUsername, IdentityKey theirIdentityKey) {

-        Fingerprint fingerprint = new NumericFingerprintGenerator(5200).createFor(ownUsername, ownIdentityKey, theirUsername, theirIdentityKey);
+        Fingerprint fingerprint = new NumericFingerprintGenerator(5200).createFor(1, ownUsername.getBytes(), ownIdentityKey, theirUsername.getBytes(), theirIdentityKey);

         return fingerprint.getDisplayableFingerprint().getDisplayText();
     }
 
         return fingerprint.getDisplayableFingerprint().getDisplayText();
     }
 

diff --git a/src/main/java/org/asamk/signal/storage/SignalAccount.java b/src/main/java/org/asamk/signal/storage/SignalAccount.java
index 1c6f320eacbac17455656ff63d2a569bf0d2d50c..8f3b8f8052b3c1208d83d66696cf59ab535e79f1 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/SignalAccount.java
+++ b/src/main/java/org/asamk/signal/storage/SignalAccount.java
@@ -21,7 +21,7 @@ import org.whispersystems.libsignal.state.PreKeyRecord;
 import org.whispersystems.libsignal.state.SignedPreKeyRecord;
 import org.whispersystems.libsignal.util.Medium;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.libsignal.state.SignedPreKeyRecord;
 import org.whispersystems.libsignal.util.Medium;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;

-import org.whispersystems.signalservice.internal.util.Base64;
+import org.whispersystems.util.Base64;

 
 import java.io.File;
 import java.io.IOException;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/src/main/java/org/asamk/signal/storage/groups/JsonGroupStore.java b/src/main/java/org/asamk/signal/storage/groups/JsonGroupStore.java
index 2eee4eda65f2420571a04b0de92e1cb3851a039d..b8186b8b4772f11272a3ee387c9267fd51df078b 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/groups/JsonGroupStore.java
+++ b/src/main/java/org/asamk/signal/storage/groups/JsonGroupStore.java
@@ -12,7 +12,7 @@ import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 

-import org.whispersystems.signalservice.internal.util.Base64;
+import org.whispersystems.util.Base64;

 
 import java.io.IOException;
 import java.util.ArrayList;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/src/main/java/org/asamk/signal/storage/protocol/JsonIdentityKeyStore.java b/src/main/java/org/asamk/signal/storage/protocol/JsonIdentityKeyStore.java
index ce9da228e2ede2efbed6731d172807ec8f41e9f1..e6f0194d3e62472918e6108bc2468f788ea6ea43 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/protocol/JsonIdentityKeyStore.java
+++ b/src/main/java/org/asamk/signal/storage/protocol/JsonIdentityKeyStore.java
@@ -14,7 +14,7 @@ import org.whispersystems.libsignal.IdentityKeyPair;
 import org.whispersystems.libsignal.InvalidKeyException;
 import org.whispersystems.libsignal.SignalProtocolAddress;
 import org.whispersystems.libsignal.state.IdentityKeyStore;
 import org.whispersystems.libsignal.InvalidKeyException;
 import org.whispersystems.libsignal.SignalProtocolAddress;
 import org.whispersystems.libsignal.state.IdentityKeyStore;

-import org.whispersystems.signalservice.internal.util.Base64;
+import org.whispersystems.util.Base64;

 
 import java.io.IOException;
 import java.util.ArrayList;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/src/main/java/org/asamk/signal/storage/protocol/JsonPreKeyStore.java b/src/main/java/org/asamk/signal/storage/protocol/JsonPreKeyStore.java
index e1ad4ddf5250dc13c434e15121530be615ed7551..16248c02c8fcf2a12f5f0e7debe96dfa6711c11b 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/protocol/JsonPreKeyStore.java
+++ b/src/main/java/org/asamk/signal/storage/protocol/JsonPreKeyStore.java
@@ -11,7 +11,7 @@ import com.fasterxml.jackson.databind.SerializerProvider;
 import org.whispersystems.libsignal.InvalidKeyIdException;
 import org.whispersystems.libsignal.state.PreKeyRecord;
 import org.whispersystems.libsignal.state.PreKeyStore;
 import org.whispersystems.libsignal.InvalidKeyIdException;
 import org.whispersystems.libsignal.state.PreKeyRecord;
 import org.whispersystems.libsignal.state.PreKeyStore;

-import org.whispersystems.signalservice.internal.util.Base64;
+import org.whispersystems.util.Base64;

 
 import java.io.IOException;
 import java.util.HashMap;
 
 import java.io.IOException;
 import java.util.HashMap;

diff --git a/src/main/java/org/asamk/signal/storage/protocol/JsonSessionStore.java b/src/main/java/org/asamk/signal/storage/protocol/JsonSessionStore.java
index 910fe44aafcb564e2ac75d128c3410d2e9cea03d..f7bbf204b91d92d27cfc0bed279b8ffd622a0b9f 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/protocol/JsonSessionStore.java
+++ b/src/main/java/org/asamk/signal/storage/protocol/JsonSessionStore.java
@@ -11,7 +11,7 @@ import com.fasterxml.jackson.databind.SerializerProvider;
 import org.whispersystems.libsignal.SignalProtocolAddress;
 import org.whispersystems.libsignal.state.SessionRecord;
 import org.whispersystems.libsignal.state.SessionStore;
 import org.whispersystems.libsignal.SignalProtocolAddress;
 import org.whispersystems.libsignal.state.SessionRecord;
 import org.whispersystems.libsignal.state.SessionStore;

-import org.whispersystems.signalservice.internal.util.Base64;
+import org.whispersystems.util.Base64;

 
 import java.io.IOException;
 import java.util.ArrayList;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/src/main/java/org/asamk/signal/storage/protocol/JsonSignedPreKeyStore.java b/src/main/java/org/asamk/signal/storage/protocol/JsonSignedPreKeyStore.java
index eb191eb888a4b8fd046574be7462e65308060cfd..edad8e7ec727974193b01f9b33fd5ba6e4e5848e 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/protocol/JsonSignedPreKeyStore.java
+++ b/src/main/java/org/asamk/signal/storage/protocol/JsonSignedPreKeyStore.java
@@ -11,7 +11,7 @@ import com.fasterxml.jackson.databind.SerializerProvider;
 import org.whispersystems.libsignal.InvalidKeyIdException;
 import org.whispersystems.libsignal.state.SignedPreKeyRecord;
 import org.whispersystems.libsignal.state.SignedPreKeyStore;
 import org.whispersystems.libsignal.InvalidKeyIdException;
 import org.whispersystems.libsignal.state.SignedPreKeyRecord;
 import org.whispersystems.libsignal.state.SignedPreKeyStore;

-import org.whispersystems.signalservice.internal.util.Base64;
+import org.whispersystems.util.Base64;

 
 import java.io.IOException;
 import java.util.HashMap;
 
 import java.io.IOException;
 import java.util.HashMap;

diff --git a/src/main/java/org/asamk/signal/util/ErrorUtils.java b/src/main/java/org/asamk/signal/util/ErrorUtils.java
index 99fc409ae9582a18711a158537477ab60ffe5981..38f1986e7d624477c7844c610a838591bdee93c4 100644 (file)
--- a/src/main/java/org/asamk/signal/util/ErrorUtils.java
+++ b/src/main/java/org/asamk/signal/util/ErrorUtils.java
@@ -31,7 +31,7 @@ public class ErrorUtils {
             System.err.println("Unregistered user \"" + n.getE164Number() + "\": " + n.getMessage());
         }
         for (UntrustedIdentityException n : e.getUntrustedIdentityExceptions()) {
             System.err.println("Unregistered user \"" + n.getE164Number() + "\": " + n.getMessage());
         }
         for (UntrustedIdentityException n : e.getUntrustedIdentityExceptions()) {

-            System.err.println("Untrusted Identity for \"" + n.getE164Number() + "\": " + n.getMessage());
+            System.err.println("Untrusted Identity for \"" + n.getIdentifier() + "\": " + n.getMessage());

         }
     }
 
         }
     }
 

diff --git a/src/main/java/org/asamk/signal/util/Util.java b/src/main/java/org/asamk/signal/util/Util.java
index f0d39601bf2298c709797672f6f6f82e42e8cef5..01d8b2b1871912991cc7d4c3d93169574e18ce3b 100644 (file)
--- a/src/main/java/org/asamk/signal/util/Util.java
+++ b/src/main/java/org/asamk/signal/util/Util.java
@@ -3,7 +3,7 @@ package org.asamk.signal.util;
 import com.fasterxml.jackson.databind.JsonNode;
 
 import org.asamk.signal.GroupIdFormatException;
 import com.fasterxml.jackson.databind.JsonNode;
 
 import org.asamk.signal.GroupIdFormatException;

-import org.whispersystems.signalservice.internal.util.Base64;
+import org.whispersystems.util.Base64;

 
 import java.io.IOException;
 import java.io.InvalidObjectException;
 
 import java.io.IOException;
 import java.io.InvalidObjectException;