From 1b9c48dbad8ec534fabea3c5b75b2cddb9d00a46 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Mon, 4 Nov 2019 21:05:49 +0100 Subject: rework message deletion --- src/main/java/de/pixart/messenger/utils/UIHelper.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/main/java/de/pixart/messenger/utils/UIHelper.java') diff --git a/src/main/java/de/pixart/messenger/utils/UIHelper.java b/src/main/java/de/pixart/messenger/utils/UIHelper.java index e081ae6d6..f34952e1d 100644 --- a/src/main/java/de/pixart/messenger/utils/UIHelper.java +++ b/src/main/java/de/pixart/messenger/utils/UIHelper.java @@ -31,6 +31,8 @@ import de.pixart.messenger.entities.Transferable; import de.pixart.messenger.services.ExportBackupService; import rocks.xmpp.addr.Jid; +import static de.pixart.messenger.entities.Message.DELETED_MESSAGE_BODY; + public class UIHelper { private static int[] UNSAFE_COLORS = { @@ -297,7 +299,9 @@ public class UIHelper { return new Pair<>(getFileDescriptionString(context, message), true); } else { final String body = MessageUtils.filterLtrRtl(message.getBody()); - if (body.startsWith(Message.ME_COMMAND)) { + if (message.getBody().equals(DELETED_MESSAGE_BODY)) { + return new Pair<>(context.getString(R.string.message_deleted), false); + } else if (body.startsWith(Message.ME_COMMAND)) { return new Pair<>(body.replaceAll("^" + Message.ME_COMMAND, UIHelper.getMessageDisplayName(message)), false); } else if (message.isGeoUri()) { return new Pair<>(context.getString(R.string.location), true); -- cgit v1.2.3