Skip to content

Commit 69a9b30

Browse files
committed
Update libsignal-service
1 parent 3dc8844 commit 69a9b30

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
1010
slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
1111
logback = "ch.qos.logback:logback-classic:1.5.18"
1212

13-
signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_119"
13+
signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_120"
1414
sqlite = "org.xerial:sqlite-jdbc:3.49.1.0"
1515
hikari = "com.zaxxer:HikariCP:6.3.0"
1616
junit-jupiter = "org.junit.jupiter:junit-jupiter:5.12.0"

lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,15 @@ public void receiveMessages(
100100
.distinctUntilChanged()
101101
.subscribe(this::onWebSocketStateChange);
102102
signalWebSocket.connect();
103+
signalWebSocket.registerKeepAliveToken("receive");
103104

104105
try {
105106
receiveMessagesInternal(signalWebSocket, timeout, returnOnTimeout, maxMessages, handler, queuedActions);
106107
} finally {
107108
hasCaughtUpWithOldMessages = false;
108109
handleQueuedActions(queuedActions.keySet());
109110
queuedActions.clear();
111+
signalWebSocket.removeKeepAliveToken("receive");
110112
signalWebSocket.disconnect();
111113
webSocketStateDisposable.dispose();
112114
shouldStop = false;

lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import java.util.List;
4242
import java.util.Optional;
4343
import java.util.concurrent.ExecutorService;
44+
import java.util.concurrent.TimeUnit;
4445
import java.util.function.Supplier;
4546

4647
public class SignalDependencies {
@@ -257,7 +258,7 @@ public SignalWebSocket.AuthenticatedWebSocket getAuthenticatedSignalWebSocket()
257258
Optional.of(credentialsProvider),
258259
userAgent,
259260
healthMonitor,
260-
allowStories));
261+
allowStories), timer, TimeUnit.SECONDS.toMillis(10));
261262
healthMonitor.monitor(authenticatedSignalWebSocket);
262263
});
263264
}
@@ -273,7 +274,7 @@ public SignalWebSocket.UnauthenticatedWebSocket getUnauthenticatedSignalWebSocke
273274
Optional.empty(),
274275
userAgent,
275276
healthMonitor,
276-
allowStories));
277+
allowStories), timer, TimeUnit.SECONDS.toMillis(10));
277278
healthMonitor.monitor(unauthenticatedSignalWebSocket);
278279
});
279280
}

lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ private Unit updateKeepAliveSenderStatus() {
9090
}
9191

9292
private boolean sendKeepAlives() {
93-
return needsKeepAlive && webSocket != null && webSocket.getShouldSendKeepAlives();
93+
return needsKeepAlive && webSocket != null && webSocket.shouldSendKeepAlives();
9494
}
9595

9696
/**

0 commit comments

Comments
 (0)