From 14ecc21937da2fb2bdb6c51d87017d7cbee67e78 Mon Sep 17 00:00:00 2001 From: Erik Kiznov <46452865+k1zn@users.noreply.github.com> Date: Thu, 18 Aug 2022 15:56:03 +0500 Subject: [PATCH] =?UTF-8?q?fix=20remove=20"=F0=9F=94=92"=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/ru/vtosters/lite/encryption/EncryptProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/encryption/EncryptProvider.java b/app/src/main/java/ru/vtosters/lite/encryption/EncryptProvider.java index a13234fc6..f468966a7 100644 --- a/app/src/main/java/ru/vtosters/lite/encryption/EncryptProvider.java +++ b/app/src/main/java/ru/vtosters/lite/encryption/EncryptProvider.java @@ -56,7 +56,7 @@ public class EncryptProvider { // For message editing public static String decryptMessage(MsgFromUser msg, boolean showEmoji) { var decryptedMessage = decryptMessage(getBody(msg), getPeerId(msg)); - if (!showEmoji) decryptedMessage = decryptedMessage.replaceAll("^\uD83D\uDD12 ", ""); + if (!showEmoji && decryptedMessage != injectOwnTextAll(getBody(msg))) decryptedMessage = decryptedMessage.replaceAll("^\uD83D\uDD12 ", ""); return decryptedMessage; } @@ -69,7 +69,7 @@ public class EncryptProvider { // For MentionsFormatter that requires CharSequence public static CharSequence decryptMessage(String msgBody, int peer, boolean showEmoji) { var decryptedMessage = decryptMessage(msgBody, peer); - if (!showEmoji) decryptedMessage = decryptedMessage.replaceAll("^\uD83D\uDD12 ", ""); + if (!showEmoji && decryptedMessage != injectOwnTextAll(msgBody)) decryptedMessage = decryptedMessage.replaceAll("^\uD83D\uDD12 ", ""); return decryptedMessage; }