From c96f1d8edf748b2f2e0723433a47c3148bc9fda8 Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Tue, 8 Mar 2022 16:12:41 -0500 Subject: [PATCH] Downloadable gets priority over emojis only --- src/main/java/eu/siacs/conversations/entities/Message.java | 2 +- .../eu/siacs/conversations/ui/adapter/MessageAdapter.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java index a179465b8bb88c0026ded5ece8479ca87fa5274b..5e9bc0247458c66cf57fee6fb50493020d9d6342 100644 --- a/src/main/java/eu/siacs/conversations/entities/Message.java +++ b/src/main/java/eu/siacs/conversations/entities/Message.java @@ -857,7 +857,7 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable public synchronized boolean bodyIsOnlyEmojis() { if (isEmojisOnly == null) { - isEmojisOnly = Emoticons.isOnlyEmoji(body.replaceAll("\\s", "")); + isEmojisOnly = Emoticons.isOnlyEmoji(getBody().replaceAll("\\s", "")); } return isEmojisOnly; } diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java index 2b51bd469587c52fd78fe9a63f0e8a333a5d1e6e..339bc01fefa15c8b5e44567569f943cf4f26bc35 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -818,8 +818,6 @@ public class MessageAdapter extends ArrayAdapter { } else { if (message.isGeoUri()) { displayLocationMessage(viewHolder, message, darkBackground, type); - } else if (message.bodyIsOnlyEmojis() && message.getType() != Message.TYPE_PRIVATE) { - displayEmojiMessage(viewHolder, message.getBody().trim(), darkBackground); } else if (message.treatAsDownloadable()) { try { final URI uri = message.getOob(); @@ -836,6 +834,8 @@ public class MessageAdapter extends ArrayAdapter { UIHelper.getFileDescriptionString(activity, message)), darkBackground, type); } + } else if (message.bodyIsOnlyEmojis() && message.getType() != Message.TYPE_PRIVATE) { + displayEmojiMessage(viewHolder, message.getBody().trim(), darkBackground); } else { displayTextMessage(viewHolder, message, darkBackground, type); }