Block image search to quick search

app/src/main/java/com/hippo/ehviewer/client/data/ListUrlBuilder.java

@@ -19,6 +19,7 @@ package com.hippo.ehviewer.client.data;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.support.annotation.IntDef;
+import android.support.annotation.Nullable;
 import android.text.TextUtils;
 
 import com.hippo.ehviewer.client.EhConfig;
@@ -141,6 +142,7 @@ public class ListUrlBuilder implements Cloneable, Parcelable {
         mMinRating = minRating;
     }
 
+    @Nullable
     public String getImagePath() {
         return mImagePath;
     }
@@ -196,6 +198,10 @@ public class ListUrlBuilder implements Cloneable, Parcelable {
         mKeyword = q.keyword;
         mAdvanceSearch = q.advanceSearch;
         mMinRating = q.minRating;
+        mImagePath = null;
+        mUseSimilarityScan = false;
+        mOnlySearchCovers = false;
+        mShowExpunged = false;
     }
 
     public QuickSearch toQuickSearch() {

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java

@@ -90,6 +90,7 @@ import com.hippo.yorozuya.AnimationUtils;
 import com.hippo.yorozuya.AssertUtils;
 import com.hippo.yorozuya.MathUtils;
 import com.hippo.yorozuya.SimpleAnimatorListener;
+import com.hippo.yorozuya.StringUtils;
 import com.hippo.yorozuya.ViewUtils;
 
 import java.io.File;
@@ -562,6 +563,12 @@ public final class GalleryListScene extends BaseScene
             return;
         }
 
+        // Can't add image search as quick search
+        if (ListUrlBuilder.MODE_IMAGE_SEARCH == urlBuilder.getMode()) {
+            showTip(R.string.image_search_not_quick_search, LENGTH_SHORT);
+            return;
+        }
+
         // Check duplicate
         for (QuickSearch q: list) {
             if (urlBuilder.equalsQuickSearch(q)) {
@@ -1278,7 +1285,8 @@ public final class GalleryListScene extends BaseScene
                 request.setMethod(EhClient.METHOD_IMAGE_SEARCH);
                 request.setCallback(new GetGalleryListListener(getContext(),
                         activity.getStageId(), getTag(), taskId));
-                request.setArgs(new File(mUrlBuilder.getImagePath()), mUrlBuilder.isUseSimilarityScan(),
+                request.setArgs(new File(StringUtils.avoidNull(mUrlBuilder.getImagePath())),
+                        mUrlBuilder.isUseSimilarityScan(),
                         mUrlBuilder.isOnlySearchCovers(), mUrlBuilder.isShowExpunged());
                 mClient.execute(request);
             } else {