fixed decrypt in dialogs

This commit is contained in:
gdlbo
2022-08-18 15:07:18 +03:00
parent c482e82ebe
commit 03487678ac
2 changed files with 11 additions and 4 deletions
@@ -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 != injectOwnTextAll(getBody(msg))) decryptedMessage = decryptedMessage.replaceAll("^\uD83D\uDD12 ", "");
if (!showEmoji && !decryptedMessage.equals(injectOwnTextAll(getBody(msg)))) decryptedMessage = decryptedMessage.replaceAll("^\uD83D\uDD12 ", "");
return decryptedMessage;
}
@@ -67,10 +67,18 @@ public class EncryptProvider {
return decryptedMessage;
}
public static CharSequence decryptMessage(CharSequence msg, int peerid) {
return decryptMessage(msg.toString(), peerid);
}
public static CharSequence decryptMessage(Msg msg) {
return decryptMessage(((MsgFromUser) msg).f(), msg.v1());
}
// For MentionsFormatter that requires CharSequence
public static CharSequence decryptMessage(String msgBody, int peer, boolean showEmoji) {
var decryptedMessage = decryptMessage(msgBody, peer);
if (!showEmoji && decryptedMessage != injectOwnTextAll(msgBody)) decryptedMessage = decryptedMessage.replaceAll("^\uD83D\uDD12 ", "");
if (!showEmoji && !decryptedMessage.equals(injectOwnTextAll(msgBody))) decryptedMessage = decryptedMessage.replaceAll("^\uD83D\uDD12 ", "");
return decryptedMessage;
}
@@ -273,8 +273,7 @@
move-result-object v2
.line 15
invoke-virtual {p2}, Lcom/vk/im/ui/components/dialogs_list/v/DialogsListModels3;->a()Ljava/lang/CharSequence;
invoke-static {v2}, Lru/vtosters/lite/encryption/EncryptProvider;->decryptMessage(Lcom/vk/im/engine/models/messages/Msg;)Ljava/lang/CharSequence;
move-result-object v3