1 files changed, 10 insertions, 9 deletions
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/SearchFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/page/SearchFragment.java
index 6e0995c4..393ad7df 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/page/SearchFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/page/SearchFragment.java
@@ -42,10 +42,11 @@ import net.lacolaco.smileessence.R;
 import net.lacolaco.smileessence.command.Command;
 import net.lacolaco.smileessence.command.CommandOpenSearch;
 import net.lacolaco.smileessence.data.Account;
-import net.lacolaco.smileessence.data.SearchQuery;
+import net.lacolaco.smileessence.entity.SavedSearch;
 import net.lacolaco.smileessence.entity.Tweet;
 import net.lacolaco.smileessence.notification.Notificator;
 import net.lacolaco.smileessence.preference.InternalPreferenceHelper;
+import net.lacolaco.smileessence.twitter.task.SavedSearches;
 import net.lacolaco.smileessence.twitter.task.SearchTask;
 import net.lacolaco.smileessence.util.SystemServiceHelper;
 import net.lacolaco.smileessence.util.UIHandler;
@@ -256,16 +257,12 @@ public class SearchFragment extends CustomListFragment<SearchListAdapter> implem
     }
 
     private void openSearchQueryDialog() {
-        if (SearchQuery.getAll().size() == 0) {
-            Notificator.getInstance().alert(R.string.notice_no_query_exists);
-            return;
-        }
         DialogHelper.showDialog(getActivity(), new SelectSearchQueryDialogFragment() {
             @Override
             protected void executeCommand(Command command) {
                 super.executeCommand(command);
-                SearchQuery query = ((CommandOpenSearch) command).getQuery();
-                editText.setText(query.query);
+                SavedSearch ss = ((CommandOpenSearch) command).getQuery();
+                editText.setText(ss.getQuery());
                 SystemServiceHelper.hideIM(SearchFragment.this.getActivity(), editText);
             }
         });
@@ -276,8 +273,12 @@ public class SearchFragment extends CustomListFragment<SearchListAdapter> implem
         if (TextUtils.isEmpty(text)) {
             Notificator.getInstance().alert(R.string.notice_query_is_empty);
         } else {
-            SearchQuery.add(text);
-            Notificator.getInstance().publish(R.string.notice_query_saved);
+            new SavedSearches.Create(Application.getInstance().getCurrentAccount(), text).onDoneUI(cb -> {
+                Notificator.getInstance().publish(R.string.notice_query_saved);
+                Application.getInstance().getCurrentAccount().refreshSavedSearches();
+            }).onFailUI(ex -> {
+                Notificator.getInstance().publish("Query is not saved");
+            }).execute();
         }
     }