From ceb9619585d253898fcfbfa95f5ea91a2339b4c0 Mon Sep 17 00:00:00 2001
From: dic1911 <d69873@gmail.com>
Date: Sun, 17 Mar 2024 00:23:05 +0800
Subject: [PATCH] fix: hidden NPE when forward to saved msgs

---
 .../main/java/org/telegram/ui/ChatActivity.java    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
index b4c09275e8..90e8ec8a21 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
@@ -30305,11 +30305,15 @@ public boolean didSelectDialogs(DialogsActivity fragment, ArrayList<MessagesStor
             hideFieldPanel(false);
             for (int a = 0; a < dids.size(); a++) {
                 long did = dids.get(a).dialogId;
-                SendMessagesHelper.SendMessageParams params = SendMessagesHelper.SendMessageParams.of(message.toString(), did, null, null, null, true, null, null, null, true, 0, null, false);
-                params.quick_reply_shortcut = quickReplyShortcut;
-                params.quick_reply_shortcut_id = getQuickReplyId();
-                if (message != null && !NekoConfig.sendCommentAfterForward.Bool()) {
-                    getSendMessagesHelper().sendMessage(params);
+                SendMessagesHelper.SendMessageParams params = null;
+                if (message != null) {
+                    SendMessagesHelper.SendMessageParams.of(message.toString(), did, null, null, null, true, null, null, null, true, 0, null, false);
+                    params.quick_reply_shortcut = quickReplyShortcut;
+                    params.quick_reply_shortcut_id = getQuickReplyId();
+
+                    if (!NekoConfig.sendCommentAfterForward.Bool()) {
+                        getSendMessagesHelper().sendMessage(params);
+                    }
                 }
                 forwardMessages(fmessages, noForwardQuote, true, 0, did);
                 if (message != null && NekoConfig.sendCommentAfterForward.Bool()) {