webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 10:30:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent NullPointerException when destination is null for some reason

Browse source
This commit is contained in:
AsamK 2020-12-15 18:58:49 +01:00
parent 1098b64711
commit 49c4b762b6
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/org/asamk/signal/manager/Manager.java
View file

@ -1868,7 +1868,7 @@ public class Manager implements Closeable {
) { ) {
List<HandleAction> actions = new ArrayList<>(); List<HandleAction> actions = new ArrayList<>();
if (content != null) { if (content != null) {
SignalServiceAddress sender; final SignalServiceAddress sender;
if (!envelope.isUnidentifiedSender() && envelope.hasSource()) { if (!envelope.isUnidentifiedSender() && envelope.hasSource()) {
sender = envelope.getSourceAddress(); sender = envelope.getSourceAddress();
} else { } else {
@ -1895,11 +1895,14 @@ public class Manager implements Closeable {
SignalServiceSyncMessage syncMessage = content.getSyncMessage().get(); SignalServiceSyncMessage syncMessage = content.getSyncMessage().get();
if (syncMessage.getSent().isPresent()) { if (syncMessage.getSent().isPresent()) {
SentTranscriptMessage message = syncMessage.getSent().get(); SentTranscriptMessage message = syncMessage.getSent().get();
actions.addAll(handleSignalServiceDataMessage(message.getMessage(), final SignalServiceAddress destination = message.getDestination().orNull();
true, if (destination != null) {
sender, actions.addAll(handleSignalServiceDataMessage(message.getMessage(),
message.getDestination().orNull(), true,
ignoreAttachments)); sender,
destination,
ignoreAttachments));
}
} }
if (syncMessage.getRequest().isPresent()) { if (syncMessage.getRequest().isPresent()) {
RequestMessage rm = syncMessage.getRequest().get(); RequestMessage rm = syncMessage.getRequest().get();