From: AsamK <asamk@gmx.de>
Date: Sun, 3 Oct 2021 11:12:48 +0000 (+0200)
Subject: Update libsignal-service-java
X-Git-Tag: v0.9.1~29
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/0709c0caf8d66b346eb82c8ecfb6f91049993f11

Update libsignal-service-java
---

diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index dc6c910e..6e528805 100644
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -14,7 +14,7 @@ repositories {
 }
 
 dependencies {
-    api("com.github.turasa:signal-service-java:2.15.3_unofficial_27")
+    api("com.github.turasa:signal-service-java:2.15.3_unofficial_28")
     implementation("com.google.protobuf:protobuf-javalite:3.10.0")
     implementation("org.bouncycastle:bcprov-jdk15on:1.69")
     implementation("org.slf4j:slf4j-api:1.7.30")
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
index 7762a4cb..177f6697 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
@@ -7,6 +7,7 @@ import org.whispersystems.libsignal.ecc.ECPublicKey;
 import org.whispersystems.libsignal.util.guava.Optional;
 import org.whispersystems.signalservice.api.push.TrustStore;
 import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl;
+import org.whispersystems.signalservice.internal.configuration.SignalCdshUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalContactDiscoveryUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalKeyBackupServiceUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalProxy;
@@ -38,6 +39,7 @@ class LiveConfig {
     private final static String SIGNAL_CONTACT_DISCOVERY_URL = "https://api.directory.signal.org";
     private final static String SIGNAL_KEY_BACKUP_URL = "https://api.backup.signal.org";
     private final static String STORAGE_URL = "https://storage.signal.org";
+    private final static String SIGNAL_CDSH_URL = "";
     private final static TrustStore TRUST_STORE = new WhisperTrustStore();
 
     private final static Optional<Dns> dns = Optional.absent();
@@ -58,6 +60,7 @@ class LiveConfig {
                         TRUST_STORE)},
                 new SignalKeyBackupServiceUrl[]{new SignalKeyBackupServiceUrl(SIGNAL_KEY_BACKUP_URL, TRUST_STORE)},
                 new SignalStorageUrl[]{new SignalStorageUrl(STORAGE_URL, TRUST_STORE)},
+                new SignalCdshUrl[]{new SignalCdshUrl(SIGNAL_CDSH_URL, TRUST_STORE)},
                 interceptors,
                 dns,
                 proxy,
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/SandboxConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/SandboxConfig.java
index bedec52c..d643f10a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/SandboxConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/SandboxConfig.java
@@ -7,6 +7,7 @@ import org.whispersystems.libsignal.ecc.ECPublicKey;
 import org.whispersystems.libsignal.util.guava.Optional;
 import org.whispersystems.signalservice.api.push.TrustStore;
 import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl;
+import org.whispersystems.signalservice.internal.configuration.SignalCdshUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalContactDiscoveryUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalKeyBackupServiceUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalProxy;
@@ -38,6 +39,7 @@ class SandboxConfig {
     private final static String SIGNAL_CONTACT_DISCOVERY_URL = "https://api-staging.directory.signal.org";
     private final static String SIGNAL_KEY_BACKUP_URL = "https://api-staging.backup.signal.org";
     private final static String STORAGE_URL = "https://storage-staging.signal.org";
+    private final static String SIGNAL_CDSH_URL = "https://cdsh.staging.signal.org";
     private final static TrustStore TRUST_STORE = new WhisperTrustStore();
 
     private final static Optional<Dns> dns = Optional.absent();
@@ -58,6 +60,7 @@ class SandboxConfig {
                         TRUST_STORE)},
                 new SignalKeyBackupServiceUrl[]{new SignalKeyBackupServiceUrl(SIGNAL_KEY_BACKUP_URL, TRUST_STORE)},
                 new SignalStorageUrl[]{new SignalStorageUrl(STORAGE_URL, TRUST_STORE)},
+                new SignalCdshUrl[]{new SignalCdshUrl(SIGNAL_CDSH_URL, TRUST_STORE)},
                 interceptors,
                 dns,
                 proxy,
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
index 3677bba1..a9a08d93 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -39,7 +39,13 @@ public class ServiceConfig {
             logger.warn("Failed to call libzkgroup: {}", e.getMessage());
             zkGroupAvailable = false;
         }
-        capabilities = new AccountAttributes.Capabilities(false, zkGroupAvailable, false, zkGroupAvailable, true, true);
+        capabilities = new AccountAttributes.Capabilities(false,
+                zkGroupAvailable,
+                false,
+                zkGroupAvailable,
+                true,
+                true,
+                false);
 
         try {
             TrustStore contactTrustStore = new IasTrustStore();
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
index d4f8ae5d..46c83e9d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
@@ -32,6 +32,7 @@ import java.nio.file.Files;
 import java.util.Base64;
 import java.util.Date;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import io.reactivex.rxjava3.core.Single;
@@ -136,7 +137,8 @@ public final class ProfileHelper {
                             newProfile.getAbout() == null ? "" : newProfile.getAbout(),
                             newProfile.getAboutEmoji() == null ? "" : newProfile.getAboutEmoji(),
                             Optional.absent(),
-                            streamDetails);
+                            streamDetails,
+                            List.of(/* TODO */));
         }
 
         if (avatar != null) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
index 63e6ca59..f76c95fb 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
@@ -188,6 +188,10 @@ public class StorageHelper {
             return;
         }
 
+        if (!accountRecord.getE164().equals(account.getUsername())) {
+            // TODO implement changed number handling
+        }
+
         account.getConfigurationStore().setReadReceipts(accountRecord.isReadReceiptsEnabled());
         account.getConfigurationStore().setTypingIndicators(accountRecord.isTypingIndicatorsEnabled());
         account.getConfigurationStore()