mirror of
https://github.com/AsamK/signal-cli.git
synced 2026-09-01 06:28:11 +00:00
Support libsignal 0.101.0 Android JNI classifiers
This commit is contained in:
parent
7e802166a3
commit
b02b51df01
@ -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")
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -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) {}
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user