From 478825e7087c9b02a0777eb288a0ed8f12083a8e Mon Sep 17 00:00:00 2001
From: Erik Kiznov <46452865+k1zn@users.noreply.github.com>
Date: Sat, 20 Aug 2022 15:19:11 +0500
Subject: [PATCH] =?UTF-8?q?reply=20=F0=9F=94=92=20decrypt=20fix=20[pt.=202?=
 =?UTF-8?q?]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ru/vtosters/lite/hooks/ReplyMsgHook.java  | 26 +++++++++++++++++++
 .../lite/hooks/WritebarReplyHook.java         | 14 ----------
 .../adapter/msgparts/MsgPartReplyHolder.smali |  6 ++---
 .../com/vtosters/lite/ui/WriteBar.smali       |  2 +-
 4 files changed, 29 insertions(+), 19 deletions(-)
 create mode 100644 app/src/main/java/ru/vtosters/lite/hooks/ReplyMsgHook.java
 delete mode 100644 app/src/main/java/ru/vtosters/lite/hooks/WritebarReplyHook.java

diff --git a/app/src/main/java/ru/vtosters/lite/hooks/ReplyMsgHook.java b/app/src/main/java/ru/vtosters/lite/hooks/ReplyMsgHook.java
new file mode 100644
index 000000000..0eb6ceaa1
--- /dev/null
+++ b/app/src/main/java/ru/vtosters/lite/hooks/ReplyMsgHook.java
@@ -0,0 +1,26 @@
+package ru.vtosters.lite.hooks;
+
+import static ru.vtosters.lite.encryption.EncryptProvider.decryptMessage;
+
+import com.vk.im.engine.models.ProfilesSimpleInfo;
+import com.vk.im.engine.models.messages.MsgFromUser;
+import com.vk.im.engine.models.messages.NestedMsg;
+import com.vk.im.engine.models.messages.WithUserContent;
+import com.vk.im.ui.views.ReplyView;
+
+public class ReplyMsgHook {
+    public static void injectWithDecrypt(ReplyView replyView, MsgFromUser msgFromUser, ProfilesSimpleInfo profilesSimpleInfo, boolean someBool) {
+        msgFromUser.d(decryptMessage(msgFromUser)); // set new value of text in MsgFromUser class
+        replyView.a((WithUserContent) msgFromUser, profilesSimpleInfo, someBool);
+    }
+
+    public static void injectWithDecrypt(ReplyView replyView, NestedMsg nestedMsg, ProfilesSimpleInfo profilesSimpleInfo, boolean someBool) {
+        nestedMsg.d(decryptMessage(nestedMsg.f(), nestedMsg.t1())); // set new value of text in NestedMsg class
+        replyView.a((WithUserContent) nestedMsg, profilesSimpleInfo, someBool);
+    }
+
+    public static void injectWithDecrypt(ReplyView replyView, NestedMsg nestedMsg, ProfilesSimpleInfo profilesSimpleInfo, boolean someBool, int i) {
+        if ((i & 4) != 0) someBool = false;
+        injectWithDecrypt(replyView, nestedMsg, profilesSimpleInfo, someBool);
+    }
+}
diff --git a/app/src/main/java/ru/vtosters/lite/hooks/WritebarReplyHook.java b/app/src/main/java/ru/vtosters/lite/hooks/WritebarReplyHook.java
deleted file mode 100644
index 2e96c0a40..000000000
--- a/app/src/main/java/ru/vtosters/lite/hooks/WritebarReplyHook.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package ru.vtosters.lite.hooks;
-
-import static ru.vtosters.lite.encryption.EncryptProvider.decryptMessage;
-
-import com.vk.im.engine.models.ProfilesSimpleInfo;
-import com.vk.im.engine.models.messages.MsgFromUser;
-import com.vk.im.ui.views.ReplyView;
-
-public class WritebarReplyHook {
-    public static void injectWithDecrypt(ReplyView replyView, MsgFromUser msgFromUser, ProfilesSimpleInfo profilesSimpleInfo, boolean someBool) {
-        msgFromUser.d(decryptMessage(msgFromUser)); // set new value of text in MsgFromUser class
-        replyView.a(msgFromUser, profilesSimpleInfo, someBool);
-    }
-}
diff --git a/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/adapter/msgparts/MsgPartReplyHolder.smali b/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/adapter/msgparts/MsgPartReplyHolder.smali
index 2fc51c504..b39b0856a 100644
--- a/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/adapter/msgparts/MsgPartReplyHolder.smali
+++ b/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/adapter/msgparts/MsgPartReplyHolder.smali
@@ -103,9 +103,7 @@
 
     const/4 v6, 0x4
 
-    const/4 v7, 0x0
-
-    invoke-static/range {v2 .. v7}, Lcom/vk/im/ui/views/ReplyView;->a(Lcom/vk/im/ui/views/ReplyView;Lcom/vk/im/engine/models/messages/WithUserContent;Lcom/vk/im/engine/models/ProfilesSimpleInfo;ZILjava/lang/Object;)V
+    invoke-static/range {v2 .. v6}, Lru/vtosters/lite/hooks/ReplyMsgHook;->injectWithDecrypt(Lcom/vk/im/ui/views/ReplyView;Lcom/vk/im/engine/models/messages/NestedMsg;Lcom/vk/im/engine/models/ProfilesSimpleInfo;ZI)V
 
     goto :goto_0
 
@@ -295,7 +293,7 @@
 
     invoke-static {p1, v6}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v2, v5, p1, v1}, Lru/vtosters/lite/hooks/WritebarReplyHook;->injectWithDecrypt(Lcom/vk/im/ui/views/ReplyView;Lcom/vk/im/engine/models/messages/MsgFromUser;Lcom/vk/im/engine/models/ProfilesSimpleInfo;Z)V
+    invoke-static {v2, v5, p1, v1}, Lru/vtosters/lite/hooks/ReplyMsgHook;->injectWithDecrypt(Lcom/vk/im/ui/views/ReplyView;Lcom/vk/im/engine/models/messages/NestedMsg;Lcom/vk/im/engine/models/ProfilesSimpleInfo;Z)V
 
     .line 11
     iget-object p1, p0, Lcom/vk/im/ui/components/viewcontrollers/msg_list/adapter/msgparts/MsgPartReplyHolder;->C:Lcom/vk/im/ui/views/ReplyView;
diff --git a/smali/smali_classes5/com/vtosters/lite/ui/WriteBar.smali b/smali/smali_classes5/com/vtosters/lite/ui/WriteBar.smali
index bb92d6b0a..b31ce55d4 100644
--- a/smali/smali_classes5/com/vtosters/lite/ui/WriteBar.smali
+++ b/smali/smali_classes5/com/vtosters/lite/ui/WriteBar.smali
@@ -4504,7 +4504,7 @@
 
     move-result v1
 
-    invoke-static {v0, p1, p2, v1}, Lru/vtosters/lite/hooks/WritebarReplyHook;->injectWithDecrypt(Lcom/vk/im/ui/views/ReplyView;Lcom/vk/im/engine/models/messages/MsgFromUser;Lcom/vk/im/engine/models/ProfilesSimpleInfo;Z)V
+    invoke-static {v0, p1, p2, v1}, Lru/vtosters/lite/hooks/ReplyMsgHook;->injectWithDecrypt(Lcom/vk/im/ui/views/ReplyView;Lcom/vk/im/engine/models/messages/MsgFromUser;Lcom/vk/im/engine/models/ProfilesSimpleInfo;Z)V
 
     .line 177
     iput-object p1, p0, Lcom/vtosters/lite/ui/WriteBar;->m0:Lcom/vk/im/engine/models/messages/MsgFromUser;