From 027c7a71515f96b1931004962ab9253852bf7284 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Wed, 26 Oct 2022 00:09:32 +0300
Subject: [PATCH] fix null crash

---
 .../java/ru/vtosters/lite/encryption/EncryptProvider.java | 8 ++++++++
 .../lite/fragments/messages/chat/vc/MsgSendVc.smali       | 7 +------
 2 files changed, 9 insertions(+), 6 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 cf4040964..cf5f0187d 100644
--- a/app/src/main/java/ru/vtosters/lite/encryption/EncryptProvider.java
+++ b/app/src/main/java/ru/vtosters/lite/encryption/EncryptProvider.java
@@ -90,6 +90,14 @@ public class EncryptProvider {
         return (String) decryptMessage(msgBody, peer, showEmoji);
     }
 
+    public static CharSequence decryptMessage(CharSequence msgBody, MsgFromUser msgFromUser, boolean showEmoji) {
+        try {
+            return decryptMessage((String) msgBody, msgFromUser.v1(), showEmoji);
+        } catch (Exception e){
+            return decryptMessage((String) msgBody, 0, showEmoji);
+        }
+    }
+
     // For MentionsFormatter that requires CharSequence
     public static CharSequence decryptMessage(String msgBody, int peer, boolean showEmoji) {
         var decryptedMessage = decryptMessage(msgBody, peer);
diff --git a/smali/smali_classes4/com/vtosters/lite/fragments/messages/chat/vc/MsgSendVc.smali b/smali/smali_classes4/com/vtosters/lite/fragments/messages/chat/vc/MsgSendVc.smali
index 2d025b1d7..58dba5b26 100644
--- a/smali/smali_classes4/com/vtosters/lite/fragments/messages/chat/vc/MsgSendVc.smali
+++ b/smali/smali_classes4/com/vtosters/lite/fragments/messages/chat/vc/MsgSendVc.smali
@@ -6346,14 +6346,9 @@
 
     move-object v4, v0
 
-    .line 15
-    invoke-virtual {v5}, Lcom/vk/im/engine/models/messages/Msg;->v1()I
-
-    move-result v7
-
     const/4 v8, 0x0
 
-    invoke-static {v2, v7, v8}, Lru/vtosters/lite/encryption/EncryptProvider;->decryptMessage(Ljava/lang/CharSequence;IZ)Ljava/lang/CharSequence;
+    invoke-static {v2, v5, v8}, Lru/vtosters/lite/encryption/EncryptProvider;->decryptMessage(Ljava/lang/CharSequence;Lcom/vk/im/engine/models/messages/MsgFromUser;Z)Ljava/lang/CharSequence;
 
     move-result-object v2