From 834f70b5853b819e1fe8998b7bdf238f5dc8124a Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Thu, 18 Aug 2022 16:03:35 +0300 Subject: [PATCH] fixes --- .../vtosters/lite/encryption/EncryptProvider.java | 13 +++++++++++-- .../dialogs_list/vc_impl/DialogsListAdapter.smali | 6 +++++- 2 files changed, 16 insertions(+), 3 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 6697cdf58..efc849291 100644 --- a/app/src/main/java/ru/vtosters/lite/encryption/EncryptProvider.java +++ b/app/src/main/java/ru/vtosters/lite/encryption/EncryptProvider.java @@ -71,8 +71,17 @@ public class EncryptProvider { return decryptMessage(msg.toString(), peerid); } - public static CharSequence decryptMessage(Msg msg) { - return decryptMessage(((MsgFromUser) msg).f(), msg.v1()); + public static CharSequence decryptMessage(Msg msg, CharSequence orig) { + if (msg instanceof MsgFromUser) { + var decrypted = decryptMessage(((MsgFromUser) msg).f(), msg.v1()); + + if (decrypted.contains("\uD83D\uDD12")) { + return decrypted; + } + + } + + return orig; } // For MentionsFormatter that requires CharSequence diff --git a/smali/smali_classes3/com/vk/im/ui/components/dialogs_list/vc_impl/DialogsListAdapter.smali b/smali/smali_classes3/com/vk/im/ui/components/dialogs_list/vc_impl/DialogsListAdapter.smali index 20b5028c0..8646c8f6c 100644 --- a/smali/smali_classes3/com/vk/im/ui/components/dialogs_list/vc_impl/DialogsListAdapter.smali +++ b/smali/smali_classes3/com/vk/im/ui/components/dialogs_list/vc_impl/DialogsListAdapter.smali @@ -273,7 +273,11 @@ move-result-object v2 - invoke-static {v2}, Lru/vtosters/lite/encryption/EncryptProvider;->decryptMessage(Lcom/vk/im/engine/models/messages/Msg;)Ljava/lang/CharSequence; + invoke-virtual {p2}, Lcom/vk/im/ui/components/dialogs_list/v/DialogsListModels3;->a()Ljava/lang/CharSequence; + + move-result-object v3 + + invoke-static {v2, v3}, Lru/vtosters/lite/encryption/EncryptProvider;->decryptMessage(Lcom/vk/im/engine/models/messages/Msg;Ljava/lang/CharSequence;)Ljava/lang/CharSequence; move-result-object v3