From e7e00bd4282bcc7e05404bf23ecf280d6416fe6e Mon Sep 17 00:00:00 2001
From: Clark <clark@signal.org>
Date: Fri, 14 Jul 2023 15:01:56 -0400
Subject: [PATCH] Disable sticker suggestions when editing message.

---
 .../securesms/conversation/ConversationParentFragment.java | 7 ++++++-
 .../securesms/conversation/v2/ConversationFragment.kt      | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
index eee5042826..5ece0fcdeb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
@@ -3829,7 +3829,11 @@ public class ConversationParentFragment extends Fragment
         composeText.postDelayed(ConversationParentFragment.this::updateToggleButtonState, 50);
       }
 
-      stickerViewModel.onInputTextUpdated(s.toString());
+      if (!inputPanel.inEditMessageMode()) {
+        stickerViewModel.onInputTextUpdated(s.toString());
+      } else {
+        stickerViewModel.onInputTextUpdated("");
+      }
     }
 
     @Override
@@ -4232,6 +4236,7 @@ public class ConversationParentFragment extends Fragment
     previousPages = keyboardPagerViewModel.pages().getValue();
     keyboardPagerViewModel.setOnlyPage(KeyboardPage.EMOJI);
     onKeyboardChanged(KeyboardPage.EMOJI);
+    stickerViewModel.onInputTextUpdated("");
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
index f72bff0d5d..4d72c89dd5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
@@ -3291,7 +3291,11 @@ class ConversationFragment :
         composeText.postDelayed({ updateToggleButtonState() }, 50)
       }
 
-      stickerViewModel.onInputTextUpdated(s.toString())
+      if (!inputPanel.inEditMessageMode()) {
+        stickerViewModel.onInputTextUpdated(s.toString())
+      } else {
+        stickerViewModel.onInputTextUpdated("")
+      }
     }
 
     override fun onFocusChange(v: View, hasFocus: Boolean) {
@@ -3421,6 +3425,7 @@ class ConversationFragment :
       previousPages = keyboardPagerViewModel.pages().value
       keyboardPagerViewModel.setOnlyPage(KeyboardPage.EMOJI)
       onKeyboardChanged(KeyboardPage.EMOJI)
+      stickerViewModel.onInputTextUpdated("")
     }
 
     override fun onExitEditMode() {