aljaz/signal-cli
1
0
Fork 0
mirror of https://github.com/aljazceru/signal-cli.git synced 2026-01-06 23:54:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Handle send failures as non fatal and return detailed results in json output

Browse Source 
Fixes #348
This commit is contained in:
AsamK
2021-12-11 12:44:11 +01:00
parent ceafe96e81
commit 06e93b84da
13 changed files with 191 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
View File

@@ -26,7 +26,7 @@ import org.asamk.signal.manager.groups.LastGroupAdminException;
import org.asamk.signal.manager.groups.NotAGroupMemberException;
import org.asamk.signal.manager.storage.recipients.Profile;
import org.asamk.signal.manager.storage.recipients.RecipientAddress;
import org.asamk.signal.util.ErrorUtils;
import org.asamk.signal.util.SendMessageResultUtils;
import org.freedesktop.dbus.DBusPath;
import org.freedesktop.dbus.connections.impl.DBusConnection;
import org.freedesktop.dbus.exceptions.DBusException;
@@ -781,7 +781,7 @@ public class DbusSignalImpl implements Signal {
}
private static void checkSendMessageResult(long timestamp, SendMessageResult result) throws DBusExecutionException {
var error = ErrorUtils.getErrorMessageFromSendMessageResult(result);
var error = SendMessageResultUtils.getErrorMessageFromSendMessageResult(result);
if (error == null) {
return;
@@ -805,7 +805,7 @@ public class DbusSignalImpl implements Signal {
return;
}
var errors = ErrorUtils.getErrorMessagesFromSendMessageResults(results);
var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results);
if (errors.size() == 0) {
return;
}
@@ -828,7 +828,7 @@ public class DbusSignalImpl implements Signal {
return;
}
var errors = ErrorUtils.getErrorMessagesFromSendMessageResults(results);
var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results);
if (errors.size() == 0) {
return;
}