Update libsignal-service-java

diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index dc6c910e6bc667283f4fce4a1a88a1143bbf9db2..6e528805446ba9e6bcb6cbc327efe46249d569ba 100644 (file)
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -14,7 +14,7 @@ repositories {
 }
 
 dependencies {
 }
 
 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")
     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 7762a4cb1bbe3ba0300abae6acc03a197e3f1630..177f6697cf5a6485fa63913e81e6cdb9742fe8a0 100644 (file)
--- 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.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;
 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_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();
     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)},
                         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,
                 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 bedec52cb291bd0d87dbbbbdc424b1c359ea1d29..d643f10a1f087252e6f5dc639b52bdca42226477 100644 (file)
--- 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.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;
 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_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();
     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)},
                         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,
                 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 3677bba1a3dab34f1a0ccaadae56a8ae214094b6..a9a08d93e8d91d353c89844a9f863d441d29866e 100644 (file)
--- 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;
         }
             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();
 
         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 d4f8ae5db739a81d37f44b502c50ca1e9eae95ae..46c83e9d47ff62515c53d425f4b450810dd0d9fc 100644 (file)
--- 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.Base64;
 import java.util.Date;
 import java.util.HashSet;

+import java.util.List;

 import java.util.Set;
 
 import io.reactivex.rxjava3.core.Single;
 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(),
                             newProfile.getAbout() == null ? "" : newProfile.getAbout(),
                             newProfile.getAboutEmoji() == null ? "" : newProfile.getAboutEmoji(),
                             Optional.absent(),

-                            streamDetails);
+                            streamDetails,
+                            List.of(/* TODO */));

         }
 
         if (avatar != null) {
         }
 
         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 63e6ca5980350c2a662712e24b6fe7f0cc8a1dae..f76c95fb0f4f673f71b784a4d8830d0cad733a00 100644 (file)
--- 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;
         }
 
             return;
         }
 

+        if (!accountRecord.getE164().equals(account.getUsername())) {
+            // TODO implement changed number handling
+        }
+

         account.getConfigurationStore().setReadReceipts(accountRecord.isReadReceiptsEnabled());
         account.getConfigurationStore().setTypingIndicators(accountRecord.isTypingIndicatorsEnabled());
         account.getConfigurationStore()
         account.getConfigurationStore().setReadReceipts(accountRecord.isReadReceiptsEnabled());
         account.getConfigurationStore().setTypingIndicators(accountRecord.isTypingIndicatorsEnabled());
         account.getConfigurationStore()