From e36a2f862c996825944927c6e24bf8521edd6edb Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 7 Sep 2017 22:18:08 +0200
Subject: [PATCH] Update libsignal-service-java

---
 build.gradle                                |   2 +-
 gradle/wrapper/gradle-wrapper.jar           | Bin 54712 -> 54708 bytes
 gradle/wrapper/gradle-wrapper.properties    |   3 +-
 src/main/java/org/asamk/signal/Manager.java |  33 +++++++++++++-------
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/build.gradle b/build.gradle
index 5c1470ee..9b9e208a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    compile 'com.github.turasa:signal-service-java:2.5.17_unofficial_1'
+    compile 'com.github.turasa:signal-service-java:2.6.5_unofficial_1'
     compile 'org.bouncycastle:bcprov-jdk15on:1.55'
     compile 'net.sourceforge.argparse4j:argparse4j:0.7.0'
     compile 'org.freedesktop.dbus:dbus-java:2.7.0'
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 88a5f3eb505fa1aa2905305128984dc872f1c1f6..7a3265ee94c0ab25cf079ac8ccdf87f41d455d42 100644
GIT binary patch
delta 673
zcmdn7nt97=<_YGU789R&*)uROgiLe@Vf$3{v51jjg4D)sHiual7#tZUe>-f+&%zMk
z&CcPq`a`ZT0|SHLWQQYO2yK%m9|>lhHTn4wL&klRC68J#y=0jD@tEl3jH6miGK^rR
zKcm!S%`*a%)7S)f7~mj`ZSu!svXgm^88KP0gPF0%oEc|NUU<xp@#W+X$Ksf7N`STV
zNGgD}&yW}3hU;eNn7rY56qCNv<c-IrCub-LPPRCq#U!f>))An~Ke^+C78AQ3nCoZC
zKKa54BPMB6D3^D#+DR?O+R1?@eV7Ei!GgZNypsdGB_`iIsl_Da3l$Qctb0m}$t?uT
z%{%4Jq!tNgo;l^h$TV5-bSM*l>SWzi)yci5wHWgz?>KG4G&gnf?o{K+{8t4gTb_|(
z(#V*+J5_RWe1-~GXwexdrn5Pd8}no)-#X*Sl$<xYF;5#T6LD6G>2Ut!hxr<l9j*vW
zUUOE8X=dr<!bauEug@AXwU&XI$I7H8N1xMTlCA=CW2%HE?>VQ%#9s^M2GmMVjy@+a
z+3dU&WANm_^TkXbo52z<&$}@SPd2!a$t2o8*>Jk%<d}Z3$#$0oCcnBM#l$fQETn(Y
zib-rLm>D}&5G=d(q7<X><O>%Q7{5(6yp+XsVGh`|1DC9s)aQel3YR^YQWs4wY*d=u
zbJ>7VVDjF}!Hh2^3tow2d^b7!N;=b_gOeW|w4Tg=Rf}=zWUH%s@}M*YPe=?53=)V4
SWnf@<Ho5((Hk<tskRSkw8vkzq

delta 808
zcmdn8nt8`+<_YGU9P!#ljtmS8VG|ufI9^D8Ec#f)$S^@_;})C4EFOyly(fP;Y$<rb
zn2904o1LS2LgWci1_lP<$u>v45Lzeq9|`7|!@$6hUzDyt+5U*kWVWMxj0Yx*9<^Y6
zJ-LugY;wv`Ehag}$&9B&C;Ku=P2PW0iz$K)#GQ1^ipho@!s479b<BxrE+>S?F?shf
z1E$yFFdo-&2d3K+Al_syNrlOprvxTXlNaD&fP*f1uw;S~+vNT7B9reN*J3hMf(nUG
zo^e)SvbHX=dU;*2q@OPT<n~hnlSTEAB{}uLk`{UpNljB^Nm)~{q>m{tSZB8fvShsn
zSaO{Q&*c1*T1-OTlNnDbP4@Ga06Rg$SAZMtVg{K>r-GS0LckibPPsE_M1q+oPPs6#
z#DJN~r|p>pQzvVus!r}at;JX{dCO@V#`%*!o{nSGnjCN@gXw(E<b`E2ldqj|WJ=8g
zGyhzXpB!>lis@)RnA>yKjA?f1<b`F*lb@e8WNI&)ys*r6a`-tdCfTaV3(GVn$5-)A
z-f>QgNw5~I$gfr!>?@=5QcR(ZV4+Eks*`gs2~1vgUW)Pa<b&t4m_&QP5&;)nnZ)}i
z8}{2zK6^=E^0Nz4j9il$FQza_Or31luQ_?bMQbL}>0oBWbRMv=EVGaU>&Hy6r1dPZ
z$+?%bm@dr$8_PdeaPrwpT1=Yr!CaZk9!%+rCO0n9nA~?+i%DqfWWFm(ll```ferk&
z2RTGvP3FB4$@F3WWUd1?ll#sHOx|)uit)(g^H<WCrXQZX@v!3Lh^svEpo9%i%M1(*
V5{M{aU|@JLx%sL#oAVKnAOO3~5itM&

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 41d45baf..f16d2666 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Thu Aug 17 20:18:16 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip
diff --git a/src/main/java/org/asamk/signal/Manager.java b/src/main/java/org/asamk/signal/Manager.java
index f159e412..adc31f70 100644
--- a/src/main/java/org/asamk/signal/Manager.java
+++ b/src/main/java/org/asamk/signal/Manager.java
@@ -61,8 +61,10 @@ import org.whispersystems.signalservice.api.push.TrustStore;
 import org.whispersystems.signalservice.api.push.exceptions.*;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
+import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl;
+import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
+import org.whispersystems.signalservice.internal.configuration.SignalServiceUrl;
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
-import org.whispersystems.signalservice.internal.push.SignalServiceUrl;
 import org.whispersystems.signalservice.internal.util.Base64;
 
 import java.io.*;
@@ -87,8 +89,12 @@ import static java.nio.file.attribute.PosixFilePermission.*;
 
 class Manager implements Signal {
     private final static String URL = "https://textsecure-service.whispersystems.org";
+    private final static String CDN_URL = "https://cdn.signal.org";
     private final static TrustStore TRUST_STORE = new WhisperTrustStore();
-    private final static SignalServiceUrl[] serviceUrls = new SignalServiceUrl[]{new SignalServiceUrl(URL, TRUST_STORE)};
+    private final static SignalServiceConfiguration serviceConfiguration = new SignalServiceConfiguration(
+            new SignalServiceUrl[]{new SignalServiceUrl(URL, TRUST_STORE)},
+            new SignalCdnUrl[]{new SignalCdnUrl(CDN_URL, TRUST_STORE)}
+    );
 
     public final static String PROJECT_NAME = Manager.class.getPackage().getImplementationTitle();
     public final static String PROJECT_VERSION = Manager.class.getPackage().getImplementationVersion();
@@ -231,7 +237,7 @@ class Manager implements Signal {
 
         migrateLegacyConfigs();
 
-        accountManager = new SignalServiceAccountManager(serviceUrls, username, password, deviceId, USER_AGENT);
+        accountManager = new SignalServiceAccountManager(serviceConfiguration, username, password, deviceId, USER_AGENT);
         try {
             if (registered && accountManager.getPreKeysCount() < PREKEY_MINIMUM_COUNT) {
                 refreshPreKeys();
@@ -356,7 +362,7 @@ class Manager implements Signal {
     public void register(boolean voiceVerification) throws IOException {
         password = Util.getSecret(18);
 
-        accountManager = new SignalServiceAccountManager(serviceUrls, username, password, USER_AGENT);
+        accountManager = new SignalServiceAccountManager(serviceConfiguration, username, password, USER_AGENT);
 
         if (voiceVerification)
             accountManager.requestVoiceVerificationCode();
@@ -381,7 +387,7 @@ class Manager implements Signal {
     public URI getDeviceLinkUri() throws TimeoutException, IOException {
         password = Util.getSecret(18);
 
-        accountManager = new SignalServiceAccountManager(serviceUrls, username, password, USER_AGENT);
+        accountManager = new SignalServiceAccountManager(serviceConfiguration, username, password, USER_AGENT);
         String uuid = accountManager.getNewDeviceUuid();
 
         registered = false;
@@ -460,7 +466,8 @@ class Manager implements Signal {
         IdentityKeyPair identityKeyPair = signalProtocolStore.getIdentityKeyPair();
         String verificationCode = accountManager.getNewDeviceVerificationCode();
 
-        accountManager.addDevice(deviceIdentifier, deviceKey, identityKeyPair, verificationCode);
+        // TODO send profile key
+        accountManager.addDevice(deviceIdentifier, deviceKey, identityKeyPair, Optional.<byte[]>absent(), verificationCode);
     }
 
     private List<PreKeyRecord> generatePreKeys() {
@@ -856,7 +863,7 @@ class Manager implements Signal {
 
     private void sendSyncMessage(SignalServiceSyncMessage message)
             throws IOException, UntrustedIdentityException {
-        SignalServiceMessageSender messageSender = new SignalServiceMessageSender(serviceUrls, username, password,
+        SignalServiceMessageSender messageSender = new SignalServiceMessageSender(serviceConfiguration, username, password,
                 deviceId, signalProtocolStore, USER_AGENT, Optional.fromNullable(messagePipe), Optional.<SignalServiceMessageSender.EventListener>absent());
         try {
             messageSender.sendMessage(message);
@@ -873,7 +880,7 @@ class Manager implements Signal {
 
         SignalServiceDataMessage message = null;
         try {
-            SignalServiceMessageSender messageSender = new SignalServiceMessageSender(serviceUrls, username, password,
+            SignalServiceMessageSender messageSender = new SignalServiceMessageSender(serviceConfiguration, username, password,
                     deviceId, signalProtocolStore, USER_AGENT, Optional.fromNullable(messagePipe), Optional.<SignalServiceMessageSender.EventListener>absent());
 
             message = messageBuilder.build();
@@ -1104,7 +1111,7 @@ class Manager implements Signal {
 
     public void receiveMessages(long timeout, TimeUnit unit, boolean returnOnTimeout, boolean ignoreAttachments, ReceiveMessageHandler handler) throws IOException {
         retryFailedReceivedMessages(handler, ignoreAttachments);
-        final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(serviceUrls, username, password, deviceId, signalingKey, USER_AGENT);
+        final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(serviceConfiguration, username, password, deviceId, signalingKey, USER_AGENT);
 
         try {
             if (messagePipe == null) {
@@ -1406,7 +1413,7 @@ class Manager implements Signal {
             }
         }
 
-        final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(serviceUrls, username, password, deviceId, signalingKey, USER_AGENT);
+        final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(serviceConfiguration, username, password, deviceId, signalingKey, USER_AGENT);
 
         File tmpFile = Util.createTempFile();
         try (InputStream input = messageReceiver.retrieveAttachment(pointer, tmpFile, MAX_ATTACHMENT_SIZE)) {
@@ -1432,7 +1439,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);
+        final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(serviceConfiguration, username, password, deviceId, signalingKey, USER_AGENT);
         return messageReceiver.retrieveAttachment(pointer, tmpFile, MAX_ATTACHMENT_SIZE);
     }
 
@@ -1504,8 +1511,10 @@ class Manager implements Signal {
                         }
                     }
 
+                    // TODO include profile key
                     out.write(new DeviceContact(record.number, Optional.fromNullable(record.name),
-                            createContactAvatarAttachment(record.number), Optional.fromNullable(record.color), Optional.fromNullable(verifiedMessage)));
+                            createContactAvatarAttachment(record.number), Optional.fromNullable(record.color),
+                            Optional.fromNullable(verifiedMessage), Optional.<byte[]>absent()));
                 }
             }
 
-- 
2.50.1