Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-22 20:18:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disable sticker suggestions when editing message.

Browse Source
This commit is contained in:
Clark
2023-07-14 15:01:56 -04:00
committed by Clark Chen
parent 07702e69ad
commit e7e00bd428
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
View File

@@ -3829,7 +3829,11 @@ public class ConversationParentFragment extends Fragment
composeText.postDelayed(ConversationParentFragment.this::updateToggleButtonState, 50); composeText.postDelayed(ConversationParentFragment.this::updateToggleButtonState, 50);
} }
stickerViewModel.onInputTextUpdated(s.toString()); if (!inputPanel.inEditMessageMode()) {
stickerViewModel.onInputTextUpdated(s.toString());
} else {
stickerViewModel.onInputTextUpdated("");
}
} }
@Override @Override
@@ -4232,6 +4236,7 @@ public class ConversationParentFragment extends Fragment
previousPages = keyboardPagerViewModel.pages().getValue(); previousPages = keyboardPagerViewModel.pages().getValue();
keyboardPagerViewModel.setOnlyPage(KeyboardPage.EMOJI); keyboardPagerViewModel.setOnlyPage(KeyboardPage.EMOJI);
onKeyboardChanged(KeyboardPage.EMOJI); onKeyboardChanged(KeyboardPage.EMOJI);
stickerViewModel.onInputTextUpdated("");
} }
@Override @Override

7
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
View File

@@ -3291,7 +3291,11 @@ class ConversationFragment :
composeText.postDelayed({ updateToggleButtonState() }, 50) 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) { override fun onFocusChange(v: View, hasFocus: Boolean) {
@@ -3421,6 +3425,7 @@ class ConversationFragment :
previousPages = keyboardPagerViewModel.pages().value previousPages = keyboardPagerViewModel.pages().value
keyboardPagerViewModel.setOnlyPage(KeyboardPage.EMOJI) keyboardPagerViewModel.setOnlyPage(KeyboardPage.EMOJI)
onKeyboardChanged(KeyboardPage.EMOJI) onKeyboardChanged(KeyboardPage.EMOJI)
stickerViewModel.onInputTextUpdated("")
} }
override fun onExitEditMode() { override fun onExitEditMode() {