From: AsamK Date: Thu, 9 May 2024 19:07:17 +0000 (+0200) Subject: Update libsignal-service X-Git-Tag: v0.13.4~15 X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/8f756cd90c4579d89a8aa827a613cc78f9d3aee0 Update libsignal-service --- diff --git a/graalvm-config-dir/jni-config.json b/graalvm-config-dir/jni-config.json index 5fed7404..4050838c 100644 --- a/graalvm-config-dir/jni-config.json +++ b/graalvm-config-dir/jni-config.json @@ -12,7 +12,7 @@ }, { "name":"java.lang.Class", - "methods":[{"name":"getCanonicalName","parameterTypes":[] }] + "methods":[{"name":"getCanonicalName","parameterTypes":[] }, {"name":"getClassLoader","parameterTypes":[] }] }, { "name":"java.lang.ClassLoader", @@ -62,6 +62,9 @@ "name":"java.util.UUID", "methods":[{"name":"","parameterTypes":["long","long"] }, {"name":"getLeastSignificantBits","parameterTypes":[] }, {"name":"getMostSignificantBits","parameterTypes":[] }] }, +{ + "name":"jdk.internal.loader.ClassLoaders$AppClassLoader" +}, { "name":"jdk.internal.loader.ClassLoaders$PlatformClassLoader" }, 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 b715611e..b495466b 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 @@ -23,6 +23,8 @@ import org.whispersystems.signalservice.api.util.CredentialsProvider; import org.whispersystems.signalservice.api.util.UptimeSleepTimer; import org.whispersystems.signalservice.api.websocket.WebSocketFactory; import org.whispersystems.signalservice.internal.push.PushServiceSocket; +import org.whispersystems.signalservice.internal.websocket.LibSignalNetwork; +import org.whispersystems.signalservice.internal.websocket.OkHttpWebSocketConnection; import org.whispersystems.signalservice.internal.websocket.WebSocketConnection; import java.util.List; @@ -49,7 +51,7 @@ public class SignalDependencies { private ClientZkOperations clientZkOperations; private PushServiceSocket pushServiceSocket; - private Network libSignalNetwork; + private LibSignalNetwork libSignalNetwork; private SignalWebSocket signalWebSocket; private SignalServiceMessageReceiver messageReceiver; private SignalServiceMessageSender messageSender; @@ -106,9 +108,10 @@ public class SignalDependencies { ServiceConfig.AUTOMATIC_NETWORK_RETRY)); } - public Network getLibSignalNetwork() { + public LibSignalNetwork getLibSignalNetwork() { return getOrCreate(() -> libSignalNetwork, - () -> libSignalNetwork = new Network(serviceEnvironmentConfig.netEnvironment())); + () -> libSignalNetwork = new LibSignalNetwork(new Network(serviceEnvironmentConfig.netEnvironment(), + userAgent), serviceEnvironmentConfig.signalServiceConfiguration())); } public SignalServiceAccountManager getAccountManager() { @@ -159,7 +162,7 @@ public class SignalDependencies { final var webSocketFactory = new WebSocketFactory() { @Override public WebSocketConnection createWebSocket() { - return new WebSocketConnection("normal", + return new OkHttpWebSocketConnection("normal", serviceEnvironmentConfig.signalServiceConfiguration(), Optional.of(credentialsProvider), userAgent, @@ -169,7 +172,7 @@ public class SignalDependencies { @Override public WebSocketConnection createUnidentifiedWebSocket() { - return new WebSocketConnection("unidentified", + return new OkHttpWebSocketConnection("unidentified", serviceEnvironmentConfig.signalServiceConfiguration(), Optional.empty(), userAgent, diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java index 3ebbe4f3..0fb1585a 100644 --- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java +++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java @@ -7,7 +7,7 @@ import org.whispersystems.signalservice.api.util.Preconditions; import org.whispersystems.signalservice.api.util.SleepTimer; import org.whispersystems.signalservice.api.websocket.HealthMonitor; import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState; -import org.whispersystems.signalservice.internal.websocket.WebSocketConnection; +import org.whispersystems.signalservice.internal.websocket.OkHttpWebSocketConnection; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -25,7 +25,7 @@ final class SignalWebSocketHealthMonitor implements HealthMonitor { private static final Logger logger = LoggerFactory.getLogger(SignalWebSocketHealthMonitor.class); - private static final long KEEP_ALIVE_SEND_CADENCE = TimeUnit.SECONDS.toMillis(WebSocketConnection.KEEPALIVE_FREQUENCY_SECONDS); + private static final long KEEP_ALIVE_SEND_CADENCE = TimeUnit.SECONDS.toMillis(OkHttpWebSocketConnection.KEEPALIVE_FREQUENCY_SECONDS); private static final long MAX_TIME_SINCE_SUCCESSFUL_KEEP_ALIVE = KEEP_ALIVE_SEND_CADENCE * 3; private SignalWebSocket signalWebSocket; diff --git a/settings.gradle.kts b/settings.gradle.kts index cf324502..7078f528 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -15,7 +15,7 @@ dependencyResolutionManagement { library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j") library("logback", "ch.qos.logback", "logback-classic").version("1.5.6") - library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_101") + library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_102") library("sqlite", "org.xerial", "sqlite-jdbc").version("3.45.3.0") library("hikari", "com.zaxxer", "HikariCP").version("5.1.0") library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.2")