signald/libsignal-service-java
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

modify websocket receive callback to allow indicating the message was not saved and should be re-delivered

Browse source
This commit is contained in:
finn 2022-08-22 15:04:33 -07:00
parent e1382092d3
commit bac1792745
2 changed files with 68 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -2,7 +2,7 @@ stages:
- build - build
variables: variables:
version: "v2.15.3_unofficial_50" version: "v2.15.3_unofficial_50_signald_1"
GRADLE_OPTS: -Dorg.gradle.daemon=false GRADLE_OPTS: -Dorg.gradle.daemon=false
build: build:

69
libsignal-service-java.patch
View file

@ -1,18 +1,22 @@
From dfcc82ab4b4f4d3c18e210ba724ce761deaa6e91 Mon Sep 17 00:00:00 2001 From ae19ed8b15251adae911868ffe570e5608bc2eef Mon Sep 17 00:00:00 2001
From: signald <nobody@signald.org> From: signald <nobody@signald.org>
Date: Thu, 16 Jun 2022 13:04:00 -0700 Date: Thu, 16 Jun 2022 13:04:00 -0700
Subject: [PATCH] update build files Subject: [PATCH] update build files and provide a way for the websocket
receive callback to indicate the message was not saved
--- ---
build.gradle | 15 ++------------- build.gradle | 17 +++--------------
dependencies.gradle | 3 +-- dependencies.gradle | 3 +--
gradle/verification-metadata.xml | 13 ++++++++----- gradle/verification-metadata.xml | 13 ++++++++-----
service/build.gradle | 19 +++++++++---------- service/build.gradle | 19 +++++++++----------
.../signalservice/api/NotSavedException.java | 4 ++++
.../signalservice/api/SignalWebSocket.java | 13 ++++++++++---
settings.gradle | 1 - settings.gradle | 1 -
5 files changed, 20 insertions(+), 31 deletions(-) 7 files changed, 35 insertions(+), 35 deletions(-)
create mode 100644 service/src/main/java/org/whispersystems/signalservice/api/NotSavedException.java
diff --git a/build.gradle b/build.gradle diff --git a/build.gradle b/build.gradle
index 2498bfcb..9a69ac82 100644 index 2498bfcb..965084e6 100644
--- a/build.gradle --- a/build.gradle
+++ b/build.gradle +++ b/build.gradle
@@ -9,11 +9,8 @@ buildscript { @@ -9,11 +9,8 @@ buildscript {
@ -42,8 +46,9 @@ index 2498bfcb..9a69ac82 100644
-} -}
subprojects { subprojects {
ext.lib_signal_service_version_number = "2.15.3_unofficial_50" - ext.lib_signal_service_version_number = "2.15.3_unofficial_50"
- ext.lib_signal_service_group_info = "com.github.turasa" - ext.lib_signal_service_group_info = "com.github.turasa"
+ ext.lib_signal_service_version_number = "2.15.3_unofficial_50_signald_1"
+ ext.lib_signal_service_group_info = "org.signald" + ext.lib_signal_service_group_info = "org.signald"
if (JavaVersion.current().isJava8Compatible()) { if (JavaVersion.current().isJava8Compatible()) {
@ -139,6 +144,58 @@ index ae4df43a..4b0240d8 100644
- required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") } - required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
- sign publishing.publications.mavenJava - sign publishing.publications.mavenJava
-} -}
diff --git a/service/src/main/java/org/whispersystems/signalservice/api/NotSavedException.java b/service/src/main/java/org/whispersystems/signalservice/api/NotSavedException.java
new file mode 100644
index 00000000..05d77d1f
--- /dev/null
+++ b/service/src/main/java/org/whispersystems/signalservice/api/NotSavedException.java
@@ -0,0 +1,4 @@
+package org.whispersystems.signalservice.api;
+
+public class NotSavedException extends Exception {
+}
diff --git a/service/src/main/java/org/whispersystems/signalservice/api/SignalWebSocket.java b/service/src/main/java/org/whispersystems/signalservice/api/SignalWebSocket.java
index 5a98f3c4..dff24940 100644
--- a/service/src/main/java/org/whispersystems/signalservice/api/SignalWebSocket.java
+++ b/service/src/main/java/org/whispersystems/signalservice/api/SignalWebSocket.java
@@ -243,6 +243,7 @@ public final class SignalWebSocket {
while (true) {
WebSocketRequestMessage request = getWebSocket().readRequest(timeout);
WebSocketResponseMessage response = createWebSocketResponse(request);
+ boolean sendResponse = true; // indicates the acknowledgement should be sent to the server
try {
if (isSignalServiceEnvelope(request)) {
Optional<String> timestampHeader = findHeader(request);
@@ -258,13 +259,19 @@ public final class SignalWebSocket {
SignalServiceEnvelope envelope = new SignalServiceEnvelope(request.getBody().toByteArray(), timestamp);
- callback.onMessage(envelope);
+ try {
+ callback.onMessage(envelope);
+ } catch (NotSavedException e) {
+ sendResponse = false;
+ }
return Optional.of(envelope);
} else if (isSocketEmptyRequest(request)) {
return Optional.empty();
}
} finally {
- getWebSocket().sendResponse(response);
+ if(sendResponse) {
+ getWebSocket().sendResponse(response);
+ }
}
}
}
@@ -315,6 +322,6 @@ public final class SignalWebSocket {
* received.
*/
public interface MessageReceivedCallback {
- void onMessage(SignalServiceEnvelope envelope);
+ void onMessage(SignalServiceEnvelope envelope) throws NotSavedException;
}
}
diff --git a/settings.gradle b/settings.gradle diff --git a/settings.gradle b/settings.gradle
index 8861c008..8dd03423 100644 index 8861c008..8dd03423 100644
--- a/settings.gradle --- a/settings.gradle