mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Improved options search

This commit is contained in:
M66B 2022-02-13 13:24:41 +01:00
parent 5e30f206ec
commit 1b6af01131
1 changed files with 42 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/eu/faircode/email/FragmentOptions.java
View File

@ -348,18 +348,22 @@ public class FragmentOptions extends FragmentBase {
}
private void suggest(String query) {
if (data == null &&
query != null && query.length() > 0)
Bundle args = new Bundle();
args.putString("query", query);
new SimpleTask<SuggestData>() {
@Override
protected SuggestData onExecute(Context context, Bundle args) {
return getSuggestData(context);
if (TextUtils.isEmpty(args.getString("query")))
return data;
return (data == null ? getSuggestData(context) : data);
}
@Override
protected void onExecuted(Bundle args, SuggestData result) {
data = result;
_suggest(query);
_suggest(args.getString("query"));
}
@Override
@ -368,7 +372,7 @@ public class FragmentOptions extends FragmentBase {
try {
// Fallback to UI thread (Android 5.1.1)
data = getSuggestData(getContext());
_suggest(query);
_suggest(args.getString("query"));
} catch (Throwable exex) {
Log.unexpectedError(getParentFragmentManager(), exex);
}
@ -388,9 +392,7 @@ public class FragmentOptions extends FragmentBase {
return data;
}
}.setExecutor(executor)
.execute(FragmentOptions.this, new Bundle(), "option:suggest");
else
_suggest(query);
.execute(FragmentOptions.this, args, "option:suggest");
}
private void _suggest(String query) {