From b02b51df01a4795e7f21342aeade21047757ddb6 Mon Sep 17 00:00:00 2001 From: dvrdnz Date: Wed, 19 Aug 2026 09:25:13 +0000 Subject: [PATCH 1/2] Support libsignal 0.101.0 Android JNI classifiers --- lib/build.gradle.kts | 21 ++++++++++++++----- .../storage/sessions/SessionStore.java | 4 ++-- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index b5e7f315..2bf2754f 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -15,14 +15,25 @@ java { } val libsignalClientPath = project.findProperty("libsignal_client_path")?.toString() +val libsignalClientVersion = "0.101.0" +val androidClassifier = project.findProperty("androidClassifier")?.toString() dependencies { + implementation(libs.signalnetwork) { + exclude(group = "org.signal", module = "libsignal-client") + } + if (libsignalClientPath == null) { - implementation(libs.signalnetwork) - } else { - implementation(libs.signalnetwork) { - exclude(group = "org.signal", module = "libsignal-client") + implementation("org.signal:libsignal-client:$libsignalClientVersion") + if (androidClassifier != null) { + implementation( + group = "org.signal", + name = "libsignal-client", + version = libsignalClientVersion, + classifier = androidClassifier, + ) } + } else { implementation(files(libsignalClientPath)) } implementation(libs.jackson.databind) @@ -60,4 +71,4 @@ tasks.jar { manifest { attributes("Automatic-Module-Name" to "org.asamk.signal.manager") } -} +} \ No newline at end of file diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java index 4f3251e0..8e3f13ec 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java @@ -410,8 +410,8 @@ public class SessionStore implements SignalServiceSessionStore { } private static boolean isActive(SessionRecord record) { - return record != null && record.hasSenderChain(0.0); + return record != null && record.hasSenderChain(); } record Key(String address, int deviceId) {} -} +} \ No newline at end of file