From: AsamK Date: Wed, 9 Aug 2023 18:47:26 +0000 (+0200) Subject: Update libsignal-service-java X-Git-Tag: v0.12.0~10 X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/934697af2855ddf34dd378ab05293466d150948e?ds=sidebyside;hp=ca088bcc336ce83cd7c409e4a2eec95472c70bbd Update libsignal-service-java --- diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json index ab5eff95..7172a28d 100644 --- 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", - "fields":[{"name":"bitField0_"}, {"name":"sentTimestamp_"}] + "fields":[{"name":"authorAci_"}, {"name":"bitField0_"}, {"name":"sentTimestamp_"}] }, { "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 de7c6667..1b1de941 100644 --- 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.util.UuidUtil; 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 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; } 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 3ba708ea..a216237c 100644 --- 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.util.UuidUtil; 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()); - 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); 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 647e9ee0..6f1a00ee 100644 --- 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 { - 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); } @@ -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("pni", pni == null ? null : pni.getRawUuid().toString()) + .put("pni", pni == null ? null : pni.toStringWithoutPrefix()) .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 a535d82b..3abcefbb 100644 --- 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, - resumableUploadSpec); + resumableUploadSpec, + false); } } diff --git a/settings.gradle.kts b/settings.gradle.kts index 14a476ce..a0290589 100644 --- 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("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")