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
zcmYL{T}YEr9LC@CS2iPM?-E7dDatC-SEkOe=9HWi7A|cvi!7}mR_kk$kr%=)BqA>g
zwTIC+k+<t2!9wVRZ1eSN%jvcYyQ&+@f^c1U-SM#UT>YNsInN&s|1%lPm<VQ!?B8Y^
zU2ScWB&l=M(W(2>m+E8Eh%)}BF_bAu%@Q_3^@dEz<<w`j2G_6U@{2||!mV31Anaz3
z@jYy1A5b`LqcsUBEf3ylm5P|aV@yFsM8*Z3oXrQM&j}q5i;=C>l3g#bM?1)#;Dy%C
z*08Rfp_Kwr&n_$#^@k<$_J3tb8p5lYQ&ern_>2i&vk|sgm5ME*;j$Po#HGGU$o4ut
zVzaems!Pipl+CHkkB+&cBs+!K)|La8vj8h|Dk*JgD;Jh|m0CK5^vxfpvMzy<`9q9g
zTsTe!4=kSDxVNA(A0`(X>6r&_J$qqD%BYVhRPN=n5NEx+gf+&k=v55*itr`UOy_+Z
zD@AfLs!*sG-+Ig8NXU4}<)fRpKDZOVqE@=yFHq}OaQd@KrU4<l2X^2cmj=I(F29MV
zGWIPh%#Du48<e^wg0;mKmW!I$CCVFy^+5%?hx2hDF5_oRp{)DDs$Q~Fen4PPz$nt!
zOA4>Wmd>#aSeGwT?5UXcak+u^JQr9RKSG`{j%M7A*Dx9H<8Jl?#zYtUjVp<Z^l1uT
kryBSJRTh9fSyi(6r~ZE=zRZHHg>qWOon)o1DZFX^1&JE}ZvX%Q

delta 808
zcmYk4Ur3Wt7{<TzDsx*?w`w}SW-CS5zM-XISuUpiq0v$Vt+t5lLNlbYguE~$qzkD;
z*B;6;Me?E>ArK}A1sdDbHrM<!yQ%Avyh)1aqKnRsnmbp|^ZwrVJ?FgV1jf=P$I^U9
zH0nlsS+yid7oJo#s8{pW+t=Hf<deq(j$pcL)ZoUi;8DZEA(HCc8R~mJ@0^h*?}8(A
zcDoe)p?dWYkGHkA9Dp-qhAN!JreO?Mur=IK<)A67&|U@>F`|aanBvx>N?QNSF>+*V
zC=D*noS<RNhEwD1%t2bq-E!L5D*9|nI%xCu!4}cunMJSTyKb&W76Gpos4!*OjW4qb
zl@@G<a`8N-hrKv8-%>1KZE-ewcr#;3D%6w+SW&V8ZRM#jzg)m`<(Z=Lu`3nccM15$
zr9;~Xg?75REkLc?B#vOM(eKzguq2uNk$Q49h=SJ08M1nXoQs^I^vgmPMxA76hP}B6
z52FgZjX>1FMz9{e!W7iaU#IvDyy`IH(|k2G-xBg~!h(jFOyM?Rdt-;`<y|fd@hw(L
zJsn&g$Hk8d<#%#vMPp|sCb>0qiKN=DJ>phnahc9{i;%y&2sfAXcpaD7PrQ$}lCf8S
zx`oq}+mF(ICt{p`U67d;Y_W+<PkGP=-(n>h2ZZzt=tSG}!PH^>c_CosU=H6vp`{_w
zHhb8>`zd4_5!SryqLxu~k6O{U%qKd5tOTFvgi190{VsK)-;tT{(vK-<ryb~<*CUXS
oSqSmOH5v$FJh&g86`dvdvH$;N{v4+5C*f)p4_54|lc8krAG^&FF#rGn

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()));
                 }
             }