Update libsignal-service-java

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index ab5eff95d01822045a9df1bf5632ecac30e20b3d..7172a28da9b990997939bb43c236d05715d550e5 100644 (file)
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -2610,7 +2610,7 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$StoryContext",
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$StoryContext",

-  "fields":[{"name":"bitField0_"}, {"name":"sentTimestamp_"}]
+  "fields":[{"name":"authorAci_"}, {"name":"bitField0_"}, {"name":"sentTimestamp_"}]

 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$EditMessage",
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$EditMessage",

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index de7c6667a82ef2717a07efd1728cffcc0e91425e..1b1de9416e682915d433aa768cef7e4a9a7d2e56 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -29,7 +29,6 @@ import org.whispersystems.signalservice.api.push.exceptions.AlreadyVerifiedExcep
 import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
 import org.whispersystems.signalservice.api.push.exceptions.DeprecatedVersionException;
 import org.whispersystems.signalservice.api.util.DeviceNameUtil;
 import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
 import org.whispersystems.signalservice.api.push.exceptions.DeprecatedVersionException;
 import org.whispersystems.signalservice.api.util.DeviceNameUtil;

-import org.whispersystems.signalservice.api.util.UuidUtil;

 import org.whispersystems.signalservice.internal.push.KyberPreKeyEntity;
 import org.whispersystems.signalservice.internal.push.OutgoingPushMessage;
 import org.whispersystems.util.Base64UrlSafe;
 import org.whispersystems.signalservice.internal.push.KyberPreKeyEntity;
 import org.whispersystems.signalservice.internal.push.OutgoingPushMessage;
 import org.whispersystems.util.Base64UrlSafe;


@@ -103,7 +102,7 @@ public class AccountHelper {
         final var whoAmI = dependencies.getAccountManager().getWhoAmI();
         final var number = whoAmI.getNumber();
         final var aci = ACI.parseOrThrow(whoAmI.getAci());
         final var whoAmI = dependencies.getAccountManager().getWhoAmI();
         final var number = whoAmI.getNumber();
         final var aci = ACI.parseOrThrow(whoAmI.getAci());

-        final var pni = PNI.from(UuidUtil.parseOrThrow(whoAmI.getPni()));
+        final var pni = PNI.parseUnPrefixedOrThrow(whoAmI.getPni());

         if (number.equals(account.getNumber()) && aci.equals(account.getAci()) && pni.equals(account.getPni())) {
             return;
         }
         if (number.equals(account.getNumber()) && aci.equals(account.getAci()) && pni.equals(account.getPni())) {
             return;
         }

diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index 3ba708ead0ced6e200b0837473737c9d55c856c8..a216237c3a6feb997ea3dd304da3e8f1aec01877 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -45,7 +45,6 @@ import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.AlreadyVerifiedException;
 import org.whispersystems.signalservice.api.push.exceptions.DeprecatedVersionException;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.AlreadyVerifiedException;
 import org.whispersystems.signalservice.api.push.exceptions.DeprecatedVersionException;

-import org.whispersystems.signalservice.api.util.UuidUtil;

 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;
 


@@ -166,7 +165,7 @@ public class RegistrationManagerImpl implements RegistrationManager {
 
         //accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));
         final var aci = ACI.parseOrThrow(response.getUuid());
 
         //accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));
         final var aci = ACI.parseOrThrow(response.getUuid());

-        final var pni = PNI.from(UuidUtil.parseOrThrow(response.getPni()));
+        final var pni = PNI.parseUnPrefixedOrThrow(response.getPni());

         account.finishRegistration(aci, pni, masterKey, pin, aciPreKeys, pniPreKeys);
         accountFileUpdater.updateAccountIdentifiers(account.getNumber(), aci);
 
         account.finishRegistration(aci, pni, masterKey, pin, aciPreKeys, pniPreKeys);
         accountFileUpdater.updateAccountIdentifiers(account.getNumber(), aci);
 

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 647e9ee098424b22745a841fc4835a7dca41aa3d..6f1a00eee3be948923e3ad73345f707e6eedd5db 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -558,7 +558,7 @@ public class SignalAccount implements Closeable {
         }
         if (rootNode.hasNonNull("pni")) {
             try {
         }
         if (rootNode.hasNonNull("pni")) {
             try {

-                pni = PNI.from(UuidUtil.parseOrThrow(rootNode.get("pni").asText()));
+                pni = PNI.parseUnPrefixedOrThrow(rootNode.get("pni").asText());

             } catch (IllegalArgumentException e) {
                 throw new IOException("Config file contains an invalid pni, needs to be a valid UUID", e);
             }
             } catch (IllegalArgumentException e) {
                 throw new IOException("Config file contains an invalid pni, needs to be a valid UUID", e);
             }


@@ -967,7 +967,7 @@ public class SignalAccount implements Closeable {
                     .put("serviceEnvironment", serviceEnvironment == null ? null : serviceEnvironment.name())
                     .put("usernameIdentifier", username)
                     .put("uuid", aci == null ? null : aci.toString())
                     .put("serviceEnvironment", serviceEnvironment == null ? null : serviceEnvironment.name())
                     .put("usernameIdentifier", username)
                     .put("uuid", aci == null ? null : aci.toString())

-                    .put("pni", pni == null ? null : pni.getRawUuid().toString())
+                    .put("pni", pni == null ? null : pni.toStringWithoutPrefix())

                     .put("sessionId", sessionId)
                     .put("sessionNumber", sessionNumber)
                     .put("deviceName", encryptedDeviceName)
                     .put("sessionId", sessionId)
                     .put("sessionNumber", sessionNumber)
                     .put("deviceName", encryptedDeviceName)

diff --git a/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
index a535d82ba0750c8cb809d570ccfd54d6658e8476..3abcefbb74dab43258c857f13a78046fe50eaa3b 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
@@ -57,6 +57,7 @@ public class AttachmentUtils {
                 blurHash,
                 null,
                 null,
                 blurHash,
                 null,
                 null,

-                resumableUploadSpec);
+                resumableUploadSpec,
+                false);

     }
 }
     }
 }

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 14a476ce0f18b8caf24d82b47f47deefb033d33d..a0290589f036663959845d46e2f349b89fefbf20 100644 (file)
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.8")
 
 
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.8")
 
 

-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_77")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_78")

             library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.23.0")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.42.0.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")
             library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.23.0")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.42.0.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")