From 5f3f6c071bf85681045c87c95bcc7176a596e9b1 Mon Sep 17 00:00:00 2001 From: AsamK Date: Wed, 25 Feb 2026 00:45:44 +0100 Subject: [PATCH] Update libsignal-service-java Fixes #1931 --- gradle/libs.versions.toml | 2 +- .../signal/manager/helper/SyncHelper.java | 2 +- .../manager/internal/SignalDependencies.java | 2 +- .../syncStorage/StorageSyncModels.java | 2 +- .../java/org/asamk/signal/BaseConfig.java | 2 +- .../signal-cli/reachability-metadata.json | 37 ++++++++++++++++++- 6 files changed, 41 insertions(+), 6 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index aaafef38..1db28adf 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,7 +12,7 @@ slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" } slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" } logback = "ch.qos.logback:logback-classic:1.5.29" -signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_137" +signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_138" sqlite = "org.xerial:sqlite-jdbc:3.51.2.0" hikari = "com.zaxxer:HikariCP:7.0.2" junit-jupiter-bom = { module = "org.junit:junit-bom", version.ref = "junit" } diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java index f9dc20fb..fe369645 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java @@ -156,7 +156,7 @@ public class SyncHelper { try { try (OutputStream fos = new FileOutputStream(contactsFile)) { - var out = new DeviceContactsOutputStream(fos, false, true); + var out = new DeviceContactsOutputStream(fos, true, true); for (var contactPair : account.getContactStore().getContacts()) { final var recipientId = contactPair.first(); final var contact = contactPair.second(); diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java index fb1f7ffb..47eec0c0 100644 --- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java +++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java @@ -329,7 +329,7 @@ public class SignalDependencies { executor, ServiceConfig.MAX_ENVELOPE_SIZE, () -> true, - false, + true, true)); } diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java index 2b498fb5..8392e35d 100644 --- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java +++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java @@ -100,7 +100,7 @@ public final class StorageSyncModels { : ByteString.of(recipient.getProfileKey().serialize())); if (useBinaryId) { builder.aciBinary(address.aci().map(ACI::toByteString).orElse(ByteString.EMPTY)) - .pniBinary(address.pni().map(PNI::toByteString).orElse(ByteString.EMPTY)); + .pniBinary(address.pni().map(PNI::toByteStringWithoutPrefix).orElse(ByteString.EMPTY)); } if (useStringId) { builder.aci(address.aci().map(ACI::toString).orElse("")) diff --git a/src/main/java/org/asamk/signal/BaseConfig.java b/src/main/java/org/asamk/signal/BaseConfig.java index b6bdd25b..ea9b935b 100644 --- a/src/main/java/org/asamk/signal/BaseConfig.java +++ b/src/main/java/org/asamk/signal/BaseConfig.java @@ -8,7 +8,7 @@ public class BaseConfig { public static final String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion(); static final String USER_AGENT_SIGNAL_ANDROID = Optional.ofNullable(System.getenv("SIGNAL_CLI_USER_AGENT")) - .orElse("Signal-Android/7.73.0"); + .orElse("Signal-Android/8.0.3"); static final String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null ? "signal-cli" : PROJECT_NAME + "/" + PROJECT_VERSION; diff --git a/src/main/resources/META-INF/native-image/org.asamk/signal-cli/reachability-metadata.json b/src/main/resources/META-INF/native-image/org.asamk/signal-cli/reachability-metadata.json index 18f5dba1..5024add2 100644 --- a/src/main/resources/META-INF/native-image/org.asamk/signal-cli/reachability-metadata.json +++ b/src/main/resources/META-INF/native-image/org.asamk/signal-cli/reachability-metadata.json @@ -1533,7 +1533,42 @@ }, { "type": "kotlin.reflect.jvm.internal.impl.resolve.scopes.DescriptorKindFilter", - "allPublicFields": true + "allPublicFields": true, + "fields": [ + { + "name": "ALL" + }, + { + "name": "CALLABLES" + }, + { + "name": "CLASSIFIERS" + }, + { + "name": "Companion" + }, + { + "name": "FUNCTIONS" + }, + { + "name": "NON_SINGLETON_CLASSIFIERS" + }, + { + "name": "PACKAGES" + }, + { + "name": "SINGLETON_CLASSIFIERS" + }, + { + "name": "TYPE_ALIASES" + }, + { + "name": "VALUES" + }, + { + "name": "VARIABLES" + } + ] }, { "type": "kotlinx.coroutines.CancellableContinuationImpl",