PeterCxy/cheogram
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Downloadable gets priority over emojis only

Browse source
This commit is contained in:
Stephen Paul Weber 2022-03-08 16:12:41 -05:00
parent ed9d16a66c
commit c96f1d8edf
No known key found for this signature in database
GPG key ID: D11C2911CE519CDE
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/entities/Message.java
View file

@ -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;
}

4
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
View file

@ -818,8 +818,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
} 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<Message> {
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);
}