blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bug in manual conversation search query submission. 

Fixes #9115
master
Greyson Parrelli 2019-10-21 00:49:06 -04:00
parent 53e0dc5dee
commit 09f0c5b63f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View File

@ -726,7 +726,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
SearchView.OnQueryTextListener queryListener = new SearchView.OnQueryTextListener() {
@Override
public boolean onQueryTextSubmit(String query) {
searchViewModel.onQueryUpdated(query, threadId);
searchViewModel.onQueryUpdated(query, threadId, true);
searchNav.showLoading();
fragment.onSearchQueryUpdated(query);
return true;
@ -734,7 +734,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
@Override
public boolean onQueryTextChange(String query) {
searchViewModel.onQueryUpdated(query, threadId);
searchViewModel.onQueryUpdated(query, threadId, false);
searchNav.showLoading();
fragment.onSearchQueryUpdated(query);
return true;

4
src/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java
View File

@ -48,13 +48,13 @@ public class ConversationSearchViewModel extends AndroidViewModel {
return result;
}
void onQueryUpdated(@NonNull String query, long threadId) {
void onQueryUpdated(@NonNull String query, long threadId, boolean forced) {
if (firstSearch && query.length() < 2) {
result.postValue(new SearchResult(CursorList.emptyList(), 0));
return;
}
if (query.equals(activeQuery)) {
if (query.equals(activeQuery) && !forced) {
return;
}