mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-23 22:51:02 +00:00
Code Issues Releases Wiki Activity

Cancel search on back

Browse source
This commit is contained in:
M66B 2021-07-02 08:52:56 +02:00
parent a275e930da
commit c599b323b7
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/eu/faircode/email/FragmentMessages.java
View file

@ -5933,6 +5933,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
etSearch.setActionEnabled(hasNext); etSearch.setActionEnabled(hasNext);
} }
private boolean isSearching() {
return (searchView != null);
}
private void clearSearch() { private void clearSearch() {
if (searchView != null) if (searchView != null)
searchView.clearComposingText(); searchView.clearComposingText();
@ -6013,6 +6017,11 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override @Override
public boolean onBackPressed() { public boolean onBackPressed() {
if (isSearching()) {
endSearch();
return true;
}
if (selectionTracker != null && selectionTracker.hasSelection()) { if (selectionTracker != null && selectionTracker.hasSelection()) {
selectionTracker.clearSelection(); selectionTracker.clearSelection();
return true; return true;