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

Make sure isSearchRequest is true when searchViewItem is expanded.

Browse Source 
fixes signalapp#12054
This commit is contained in:
clauz9
2022-03-11 13:44:07 +02:00
committed by Cody Henthorne
parent b0458f10a3
commit 749bbf428d
1 changed files with 7 additions and 0 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

@@ -1063,6 +1063,7 @@ public class ConversationParentFragment extends Fragment
@Override
public boolean onMenuItemActionExpand(MenuItem item) {
searchView.setOnQueryTextListener(queryListener);
isSearchRequested = true;
searchViewModel.onSearchOpened();
searchNav.setVisibility(View.VISIBLE);
searchNav.setData(0, 0);
@@ -1140,6 +1141,8 @@ public class ConversationParentFragment extends Fragment
reactionDelegate.hide();
} else if (container.isInputOpen()) {
container.hideCurrentInput(composeText);
} else if (isSearchRequested) {
searchViewItem.collapseActionView();
} else {
requireActivity().finish();
}
@@ -3820,6 +3823,10 @@ public class ConversationParentFragment extends Fragment
@Override
public void handleReplyMessage(ConversationMessage conversationMessage) {
if (isSearchRequested) {
searchViewItem.collapseActionView();
}
MessageRecord messageRecord = conversationMessage.getMessageRecord();
Recipient author;