empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Prevent possible NPE when handling early message content.

Browse source
This commit is contained in:
Greyson Parrelli 2021-02-25 09:26:03 -05:00
parent fc617fb7a9
commit 5e106bf510
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java
View file

@ -170,6 +170,7 @@ public final class MessageContentProcessor {
if (messageState == MessageState.DECRYPTED_OK) {
handleMessage(content, timestamp, optionalSmsMessageId);
if (content != null) {
Optional<List<SignalServiceContent>> earlyContent = ApplicationDependencies.getEarlyMessageCache()
.retrieve(Recipient.externalPush(context, content.getSender()).getId(),
content.getTimestamp());
@ -180,6 +181,7 @@ public final class MessageContentProcessor {
handleMessage(earlyItem, timestamp, Optional.absent());
}
}
}
} else if (exceptionMetadata != null) {
handleExceptionMessage(messageState, exceptionMetadata, timestamp, optionalSmsMessageId);
} else if (messageState == MessageState.NOOP) {