TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-08 05:28:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent NPE when setting sticker emoji.

Browse Source
This commit is contained in:
Greyson Parrelli 2020-09-14 09:57:43 -04:00
parent d7ff635445
commit 97eb9154b2
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
View File

@ -656,7 +656,10 @@ public class SignalServiceMessageSender {
stickerBuilder.setPackId(ByteString.copyFrom(message.getSticker().get().getPackId())); stickerBuilder.setPackId(ByteString.copyFrom(message.getSticker().get().getPackId()));
stickerBuilder.setPackKey(ByteString.copyFrom(message.getSticker().get().getPackKey())); stickerBuilder.setPackKey(ByteString.copyFrom(message.getSticker().get().getPackKey()));
stickerBuilder.setStickerId(message.getSticker().get().getStickerId()); stickerBuilder.setStickerId(message.getSticker().get().getStickerId());
if (message.getSticker().get().getEmoji() != null) {
stickerBuilder.setEmoji(message.getSticker().get().getEmoji()); stickerBuilder.setEmoji(message.getSticker().get().getEmoji());
}
if (message.getSticker().get().getAttachment().isStream()) { if (message.getSticker().get().getAttachment().isStream()) {
stickerBuilder.setData(createAttachmentPointer(message.getSticker().get().getAttachment().asStream())); stickerBuilder.setData(createAttachmentPointer(message.getSticker().get().getAttachment().asStream()));