Improved options search

app/src/main/java/eu/faircode/email/FragmentOptions.java

@@ -348,18 +348,22 @@ public class FragmentOptions extends FragmentBase {
             }
 
             private void suggest(String query) {
-                if (data == null &&
+                Bundle args = new Bundle();
-                        query != null && query.length() > 0)
+                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");
+                        .execute(FragmentOptions.this, args, "option:suggest");
-                else
-                    _suggest(query);
             }
 
             private void _suggest(String query) {