Update libsignal-service

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5d6332713bf1be1ab3a39acb69e3381f9c79e073..49f54ff8a07d5aa170dfef4824e0f15b7baba342 100644 (file)
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,7 +10,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.18"
 
 slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
 logback = "ch.qos.logback:logback-classic:1.5.18"
 

-signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_119"
+signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_120"

 sqlite = "org.xerial:sqlite-jdbc:3.49.1.0"
 hikari = "com.zaxxer:HikariCP:6.3.0"
 junit-jupiter = "org.junit.jupiter:junit-jupiter:5.12.0"
 sqlite = "org.xerial:sqlite-jdbc:3.49.1.0"
 hikari = "com.zaxxer:HikariCP:6.3.0"
 junit-jupiter = "org.junit.jupiter:junit-jupiter:5.12.0"

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
index eb935188501f1a41c47bbd47869add81d9490543..71f690816f52b15efe19d0982442d21145d4cdcb 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
@@ -100,6 +100,7 @@ public class ReceiveHelper {
                 .distinctUntilChanged()
                 .subscribe(this::onWebSocketStateChange);
         signalWebSocket.connect();
                 .distinctUntilChanged()
                 .subscribe(this::onWebSocketStateChange);
         signalWebSocket.connect();

+        signalWebSocket.registerKeepAliveToken("receive");

 
         try {
             receiveMessagesInternal(signalWebSocket, timeout, returnOnTimeout, maxMessages, handler, queuedActions);
 
         try {
             receiveMessagesInternal(signalWebSocket, timeout, returnOnTimeout, maxMessages, handler, queuedActions);


@@ -107,6 +108,7 @@ public class ReceiveHelper {
             hasCaughtUpWithOldMessages = false;
             handleQueuedActions(queuedActions.keySet());
             queuedActions.clear();
             hasCaughtUpWithOldMessages = false;
             handleQueuedActions(queuedActions.keySet());
             queuedActions.clear();

+            signalWebSocket.removeKeepAliveToken("receive");

             signalWebSocket.disconnect();
             webSocketStateDisposable.dispose();
             shouldStop = false;
             signalWebSocket.disconnect();
             webSocketStateDisposable.dispose();
             shouldStop = false;

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 972b422f1339ec9f5a1995f180dccda8c915f57b..c19e6b6601874dc41405c8777def92162b2256e2 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
@@ -41,6 +41,7 @@ import java.net.Proxy;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;

+import java.util.concurrent.TimeUnit;

 import java.util.function.Supplier;
 
 public class SignalDependencies {
 import java.util.function.Supplier;
 
 public class SignalDependencies {


@@ -257,7 +258,7 @@ public class SignalDependencies {
                     Optional.of(credentialsProvider),
                     userAgent,
                     healthMonitor,
                     Optional.of(credentialsProvider),
                     userAgent,
                     healthMonitor,

-                    allowStories));
+                    allowStories), timer, TimeUnit.SECONDS.toMillis(10));

             healthMonitor.monitor(authenticatedSignalWebSocket);
         });
     }
             healthMonitor.monitor(authenticatedSignalWebSocket);
         });
     }


@@ -273,7 +274,7 @@ public class SignalDependencies {
                     Optional.empty(),
                     userAgent,
                     healthMonitor,
                     Optional.empty(),
                     userAgent,
                     healthMonitor,

-                    allowStories));
+                    allowStories), timer, TimeUnit.SECONDS.toMillis(10));

             healthMonitor.monitor(unauthenticatedSignalWebSocket);
         });
     }
             healthMonitor.monitor(unauthenticatedSignalWebSocket);
         });
     }

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 b5b855acd83099419711aa27fa361f6730be572a..dfae5985f98df198d64e13ac5c40d5424d2b31a0 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
@@ -90,7 +90,7 @@ final class SignalWebSocketHealthMonitor implements HealthMonitor {
     }
 
     private boolean sendKeepAlives() {
     }
 
     private boolean sendKeepAlives() {

-        return needsKeepAlive && webSocket != null && webSocket.getShouldSendKeepAlives();
+        return needsKeepAlive && webSocket != null && webSocket.shouldSendKeepAlives();

     }
 
     /**
     }
 
     /**