Update libsignal-service

diff --git a/graalvm-config-dir/jni-config.json b/graalvm-config-dir/jni-config.json
index 5fed7404c49fba84c65e56c188b997c2f6751976..4050838c44c9d686ecf99af96722c506bd3974a7 100644 (file)
--- a/graalvm-config-dir/jni-config.json
+++ b/graalvm-config-dir/jni-config.json
@@ -12,7 +12,7 @@
 },
 {
   "name":"java.lang.Class",
 },
 {
   "name":"java.lang.Class",

-  "methods":[{"name":"getCanonicalName","parameterTypes":[] }]
+  "methods":[{"name":"getCanonicalName","parameterTypes":[] }, {"name":"getClassLoader","parameterTypes":[] }]

 },
 {
   "name":"java.lang.ClassLoader",
 },
 {
   "name":"java.lang.ClassLoader",


@@ -62,6 +62,9 @@
   "name":"java.util.UUID",
   "methods":[{"name":"<init>","parameterTypes":["long","long"] }, {"name":"getLeastSignificantBits","parameterTypes":[] }, {"name":"getMostSignificantBits","parameterTypes":[] }]
 },
   "name":"java.util.UUID",
   "methods":[{"name":"<init>","parameterTypes":["long","long"] }, {"name":"getLeastSignificantBits","parameterTypes":[] }, {"name":"getMostSignificantBits","parameterTypes":[] }]
 },

+{
+  "name":"jdk.internal.loader.ClassLoaders$AppClassLoader"
+},

 {
   "name":"jdk.internal.loader.ClassLoaders$PlatformClassLoader"
 },
 {
   "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 b715611e12e06916c0d4c0878aed065fbd5a697b..b495466b8388b25efdda5b14e40e656310a4fc34 100644 (file)
--- 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.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;
 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 ClientZkOperations clientZkOperations;
 
     private PushServiceSocket pushServiceSocket;

-    private Network libSignalNetwork;
+    private LibSignalNetwork libSignalNetwork;

     private SignalWebSocket signalWebSocket;
     private SignalServiceMessageReceiver messageReceiver;
     private SignalServiceMessageSender messageSender;
     private SignalWebSocket signalWebSocket;
     private SignalServiceMessageReceiver messageReceiver;
     private SignalServiceMessageSender messageSender;


@@ -106,9 +108,10 @@ public class SignalDependencies {
                         ServiceConfig.AUTOMATIC_NETWORK_RETRY));
     }
 
                         ServiceConfig.AUTOMATIC_NETWORK_RETRY));
     }
 

-    public Network getLibSignalNetwork() {
+    public LibSignalNetwork getLibSignalNetwork() {

         return getOrCreate(() -> libSignalNetwork,
         return getOrCreate(() -> libSignalNetwork,

-                () -> libSignalNetwork = new Network(serviceEnvironmentConfig.netEnvironment()));
+                () -> libSignalNetwork = new LibSignalNetwork(new Network(serviceEnvironmentConfig.netEnvironment(),
+                        userAgent), serviceEnvironmentConfig.signalServiceConfiguration()));

     }
 
     public SignalServiceAccountManager getAccountManager() {
     }
 
     public SignalServiceAccountManager getAccountManager() {


@@ -159,7 +162,7 @@ public class SignalDependencies {
             final var webSocketFactory = new WebSocketFactory() {
                 @Override
                 public WebSocketConnection createWebSocket() {
             final var webSocketFactory = new WebSocketFactory() {
                 @Override
                 public WebSocketConnection createWebSocket() {

-                    return new WebSocketConnection("normal",
+                    return new OkHttpWebSocketConnection("normal",

                             serviceEnvironmentConfig.signalServiceConfiguration(),
                             Optional.of(credentialsProvider),
                             userAgent,
                             serviceEnvironmentConfig.signalServiceConfiguration(),
                             Optional.of(credentialsProvider),
                             userAgent,


@@ -169,7 +172,7 @@ public class SignalDependencies {
 
                 @Override
                 public WebSocketConnection createUnidentifiedWebSocket() {
 
                 @Override
                 public WebSocketConnection createUnidentifiedWebSocket() {

-                    return new WebSocketConnection("unidentified",
+                    return new OkHttpWebSocketConnection("unidentified",

                             serviceEnvironmentConfig.signalServiceConfiguration(),
                             Optional.empty(),
                             userAgent,
                             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 3ebbe4f3318774880361b2b81d421424cedca3b2..0fb1585a513af7f8e10ad5f08d46f68902250314 100644 (file)
--- 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.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;
 
 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 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;
     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 cf3245025cc7893c76ad5efe95acdd8a3c0f5256..7078f528bf97da2db67a9aec84e44ae9ecc4118d 100644 (file)
--- 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("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")
             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")