Fix behavior for recipients with only UUIDs

Fixes #359
This commit is contained in:
AsamK
2020-10-11 10:41:56 +02:00
parent ae39d6a085
commit a54fc92c05
7 changed files with 30 additions and 27 deletions

View File

@@ -20,7 +20,7 @@ public class JsonMessageEnvelope {
public JsonMessageEnvelope(SignalServiceEnvelope envelope, SignalServiceContent content) {
if (!envelope.isUnidentifiedSender() && envelope.hasSource()) {
SignalServiceAddress source = envelope.getSourceAddress();
this.source = source.getNumber().get();
this.source = source.getLegacyIdentifier();
this.relay = source.getRelay().isPresent() ? source.getRelay().get() : null;
}
this.sourceDevice = envelope.getSourceDevice();
@@ -28,7 +28,7 @@ public class JsonMessageEnvelope {
this.isReceipt = envelope.isReceipt();
if (content != null) {
if (envelope.isUnidentifiedSender()) {
this.source = content.getSender().getNumber().get();
this.source = content.getSender().getLegacyIdentifier();
this.sourceDevice = content.getSenderDevice();
}
if (content.getDataMessage().isPresent()) {