mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-03-04 10:39:25 +00:00
Code Issues Releases Wiki Activity

Reuse search term

Browse source
This commit is contained in:
M66B 2025-01-14 12:54:53 +01:00
parent 65f68ec2a5
commit 912c2dc505
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/eu/faircode/email/AdapterMessage.java
View file

@ -4644,7 +4644,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
else else
context.startActivity(new Intent(context, ActivityBilling.class)); context.startActivity(new Intent(context, ActivityBilling.class));
} else if (id == R.id.ibSearchText) { } else if (id == R.id.ibSearchText) {
onSearchText(message); onSearchText(message, searched);
} else if (id == R.id.ibSearch) { } else if (id == R.id.ibSearch) {
onSearchContact(message, false); onSearchContact(message, false);
} else if (id == R.id.ibTranslate) { } else if (id == R.id.ibTranslate) {
@ -6572,7 +6572,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
onMenuManageKeywords(message); onMenuManageKeywords(message);
return true; return true;
} else if (itemId == R.id.menu_search_in_text) { } else if (itemId == R.id.menu_search_in_text) {
onSearchText(message); onSearchText(message, searched);
return true; return true;
} else if (itemId == R.id.menu_translate) { } else if (itemId == R.id.menu_translate) {
onActionTranslate(message); onActionTranslate(message);
@ -7527,8 +7527,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
} }
} }
private void onSearchText(TupleMessageEx message) { private void onSearchText(TupleMessageEx message, String term) {
properties.startSearch(tvBody); properties.startSearch(tvBody, term);
} }
private void onMenuCreateRule(TupleMessageEx message) { private void onMenuCreateRule(TupleMessageEx message) {
@ -9484,7 +9484,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
void reply(TupleMessageEx message, CharSequence selected, View anchor); void reply(TupleMessageEx message, CharSequence selected, View anchor);
void startSearch(TextView view); void startSearch(TextView view, String term);
void endSearch(); void endSearch();

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

@ -2903,8 +2903,8 @@ public class FragmentMessages extends FragmentBase
onReply(message, selected, anchor); onReply(message, selected, anchor);
} }
public void startSearch(TextView view) { public void startSearch(TextView view, String term) {
FragmentMessages.this.startSearch(view); FragmentMessages.this.startSearch(view, term);
} }
public void endSearch() { public void endSearch() {
@ -8882,7 +8882,7 @@ public class FragmentMessages extends FragmentBase
} }
} }
private void startSearch(TextView view) { private void startSearch(TextView view, String term) {
searchView = view; searchView = view;
searchView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() { searchView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
@ -8898,10 +8898,13 @@ public class FragmentMessages extends FragmentBase
} }
}); });
etSearch.setText(null); etSearch.setText(term);
etSearch.setVisibility(View.VISIBLE); etSearch.setVisibility(View.VISIBLE);
if (term == null) {
etSearch.requestFocus(); etSearch.requestFocus();
Helper.showKeyboard(etSearch); Helper.showKeyboard(etSearch);
} else
performSearch(false);
} }
private void endSearch() { private void endSearch() {