Update libsignal-service-java

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index aef740aa890113ac3a73ac15640a82ba3d73bbf4..2db7538be859f5829c99e84033b28e4497d2dd24 100644 (file)
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -2272,7 +2272,6 @@
   "fields":[
     {"name":"bitField0_"}, 
     {"name":"e164_"}, 
   "fields":[
     {"name":"bitField0_"}, 
     {"name":"e164_"}, 

-    {"name":"relay_"}, 

     {"name":"uuid_"}
   ]
 },
     {"name":"uuid_"}
   ]
 },

diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index 316ce564e0093484e4cf17c40d1c02c32ab60a3b..dc6c910e6bc667283f4fce4a1a88a1143bbf9db2 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_26")
+    api("com.github.turasa:signal-service-java:2.15.3_unofficial_27")

     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/RegistrationManager.java b/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
index 95d43fd67a28b9d6b3c6ce2be58d67c0e31c937d..2be3f7193113b8612e59fca96ebfda7c93506cdd 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
@@ -35,7 +35,9 @@ import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.util.UuidUtil;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.util.UuidUtil;

+import org.whispersystems.signalservice.internal.ServiceResponse;

 import org.whispersystems.signalservice.internal.push.LockedException;
 import org.whispersystems.signalservice.internal.push.LockedException;

+import org.whispersystems.signalservice.internal.push.RequestVerificationCodeResponse;

 import org.whispersystems.signalservice.internal.push.VerifyAccountResponse;
 import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider;
 
 import org.whispersystems.signalservice.internal.push.VerifyAccountResponse;
 import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider;
 


@@ -115,13 +117,19 @@ public class RegistrationManager implements Closeable {
     }
 
     public void register(boolean voiceVerification, String captcha) throws IOException {
     }
 
     public void register(boolean voiceVerification, String captcha) throws IOException {

+        final ServiceResponse<RequestVerificationCodeResponse> response;

         if (voiceVerification) {
         if (voiceVerification) {

-            accountManager.requestVoiceVerificationCode(getDefaultLocale(),
+            response = accountManager.requestVoiceVerificationCode(getDefaultLocale(),

                     Optional.fromNullable(captcha),
                     Optional.fromNullable(captcha),

+                    Optional.absent(),

                     Optional.absent());
         } else {
                     Optional.absent());
         } else {

-            accountManager.requestSmsVerificationCode(false, Optional.fromNullable(captcha), Optional.absent());
+            response = accountManager.requestSmsVerificationCode(false,
+                    Optional.fromNullable(captcha),
+                    Optional.absent(),
+                    Optional.absent());

         }
         }

+        handleResponseException(response);

     }
 
     private Locale getDefaultLocale() {
     }
 
     private Locale getDefaultLocale() {


@@ -143,7 +151,7 @@ public class RegistrationManager implements Closeable {
         VerifyAccountResponse response;
         MasterKey masterKey;
         try {
         VerifyAccountResponse response;
         MasterKey masterKey;
         try {

-            response = verifyAccountWithCode(verificationCode, null, null);
+            response = verifyAccountWithCode(verificationCode, null);

 
             masterKey = null;
             pin = null;
 
             masterKey = null;
             pin = null;


@@ -154,17 +162,16 @@ public class RegistrationManager implements Closeable {
 
             var registrationLockData = pinHelper.getRegistrationLockData(pin, e);
             if (registrationLockData == null) {
 
             var registrationLockData = pinHelper.getRegistrationLockData(pin, e);
             if (registrationLockData == null) {

-                response = verifyAccountWithCode(verificationCode, pin, null);
-                masterKey = null;
-            } else {
-                var registrationLock = registrationLockData.getMasterKey().deriveRegistrationLock();
-                try {
-                    response = verifyAccountWithCode(verificationCode, null, registrationLock);
-                } catch (LockedException _e) {
-                    throw new AssertionError("KBS Pin appeared to matched but reg lock still failed!");
-                }
-                masterKey = registrationLockData.getMasterKey();
+                throw e;

             }
             }

+
+            var registrationLock = registrationLockData.getMasterKey().deriveRegistrationLock();
+            try {
+                response = verifyAccountWithCode(verificationCode, registrationLock);
+            } catch (LockedException _e) {
+                throw new AssertionError("KBS Pin appeared to matched but reg lock still failed!");
+            }
+            masterKey = registrationLockData.getMasterKey();

         }
 
         // TODO response.isStorageCapable()
         }
 
         // TODO response.isStorageCapable()


@@ -192,18 +199,29 @@ public class RegistrationManager implements Closeable {
     }
 
     private VerifyAccountResponse verifyAccountWithCode(
     }
 
     private VerifyAccountResponse verifyAccountWithCode(

-            final String verificationCode, final String legacyPin, final String registrationLock
+            final String verificationCode, final String registrationLock

     ) throws IOException {
     ) throws IOException {

-        return accountManager.verifyAccountWithCode(verificationCode,
-                null,
-                account.getLocalRegistrationId(),
-                true,
-                legacyPin,
-                registrationLock,
-                account.getSelfUnidentifiedAccessKey(),
-                account.isUnrestrictedUnidentifiedAccess(),
-                ServiceConfig.capabilities,
-                account.isDiscoverableByPhoneNumber());
+        final ServiceResponse<VerifyAccountResponse> response;
+        if (registrationLock == null) {
+            response = accountManager.verifyAccount(verificationCode,
+                    account.getLocalRegistrationId(),
+                    true,
+                    account.getSelfUnidentifiedAccessKey(),
+                    account.isUnrestrictedUnidentifiedAccess(),
+                    ServiceConfig.capabilities,
+                    account.isDiscoverableByPhoneNumber());
+        } else {
+            response = accountManager.verifyAccountWithRegistrationLockPin(verificationCode,
+                    account.getLocalRegistrationId(),
+                    true,
+                    registrationLock,
+                    account.getSelfUnidentifiedAccessKey(),
+                    account.isUnrestrictedUnidentifiedAccess(),
+                    ServiceConfig.capabilities,
+                    account.isDiscoverableByPhoneNumber());
+        }
+        handleResponseException(response);
+        return response.getResult().get();

     }
 
     @Override
     }
 
     @Override


@@ -213,4 +231,15 @@ public class RegistrationManager implements Closeable {
             account = null;
         }
     }
             account = null;
         }
     }

+
+    private void handleResponseException(final ServiceResponse<?> response) throws IOException {
+        final var throwableOptional = response.getExecutionError().or(response.getApplicationError());
+        if (throwableOptional.isPresent()) {
+            if (throwableOptional.get() instanceof IOException) {
+                throw (IOException) throwableOptional.get();
+            } else {
+                throw new IOException(throwableOptional.get());
+            }
+        }
+    }

 }
 }

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 12d87cf52e8562548ffd8e5bbf0507e8108ea89a..bedec52cb291bd0d87dbbbbdc424b1c359ea1d29 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
@@ -29,7 +29,7 @@ class SandboxConfig {
 
     private final static String KEY_BACKUP_ENCLAVE_NAME = "823a3b2c037ff0cbe305cc48928cfcc97c9ed4a8ca6d49af6f7d6981fb60a4e9";
     private final static byte[] KEY_BACKUP_SERVICE_ID = Hex.decode(
 
     private final static String KEY_BACKUP_ENCLAVE_NAME = "823a3b2c037ff0cbe305cc48928cfcc97c9ed4a8ca6d49af6f7d6981fb60a4e9";
     private final static byte[] KEY_BACKUP_SERVICE_ID = Hex.decode(

-            "51a56084c0b21c6b8f62b1bc792ec9bedac4c7c3964bb08ddcab868158c09982");
+            "16b94ac6d2b7f7b9d72928f36d798dbb35ed32e7bb14c42b4301ad0344b46f29");

     private final static String KEY_BACKUP_MRENCLAVE = "a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87";
 
     private final static String URL = "https://chat.staging.signal.org";
     private final static String KEY_BACKUP_MRENCLAVE = "a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87";
 
     private final static String URL = "https://chat.staging.signal.org";

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index da901a3d88428d0f8c28672093169e11b55ce7d4..dd07fc55a63c14223dd52f6b5dc4e82ae99c3a0e 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -58,6 +58,16 @@ public class SendHelper {
         }
     };
 
         }
     };
 

+    private final SignalServiceMessageSender.LegacyGroupEvents legacyGroupEvents = new SignalServiceMessageSender.LegacyGroupEvents() {
+        @Override
+        public void onMessageSent() {
+        }
+
+        @Override
+        public void onSyncMessageSent() {
+        }
+    };
+

     public SendHelper(
             final SignalAccount account,
             final SignalDependencies dependencies,
     public SendHelper(
             final SignalAccount account,
             final SignalDependencies dependencies,


@@ -267,6 +277,7 @@ public class SendHelper {
                     isRecipientUpdate,
                     ContentHint.DEFAULT,
                     message,
                     isRecipientUpdate,
                     ContentHint.DEFAULT,
                     message,

+                    legacyGroupEvents,

                     sendResult -> logger.trace("Partial message send result: {}", sendResult.isSuccess()),
                     () -> false);
         } catch (org.whispersystems.signalservice.api.crypto.UntrustedIdentityException e) {
                     sendResult -> logger.trace("Partial message send result: {}", sendResult.isSuccess()),
                     () -> false);
         } catch (org.whispersystems.signalservice.api.crypto.UntrustedIdentityException e) {