Rel 1.8.3.0-alpha02

app/build.gradle

@@ -31,8 +31,8 @@ android {
         applicationId "moe.tarsin.ehviewer"
         minSdkVersion 31
         targetSdkVersion 33
-        versionCode 180015
-        versionName "1.8.3.0-alpha01"
+        versionCode 180016
+        versionName "1.8.3.0-alpha02"
         resConfigs 'zh', 'zh-rCN', 'zh-rHK', 'zh-rTW', 'es', 'ja', 'ko', 'fr', 'de', 'th'
     }
 

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

@@ -577,7 +577,7 @@ public class ListUrlBuilder implements Cloneable, Parcelable {
                     // Empty
                 }
                 if (mNextGid != 0) {
-                    sb.append('/').append(mNextGid);
+                    sb.append("?next=").append(mNextGid);
                 }
                 return sb.toString();
             }
@@ -590,7 +590,7 @@ public class ListUrlBuilder implements Cloneable, Parcelable {
                     // Empty
                 }
                 if (mNextGid != 0) {
-                    sb.append('/').append(mNextGid);
+                    sb.append("?next=").append(mNextGid);
                 }
                 return sb.toString();
             }

app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListParser.java

@@ -307,21 +307,12 @@ public class GalleryListParser {
         Result result = new Result();
         Document d = Jsoup.parse(body);
 
-        try {
-            Element stt = d.getElementsByClass("searchtext").first();
-            result.founds = getInt(stt.text());
-
-        } catch (Throwable e) {
-            ExceptionUtils.throwIfFatal(e);
-            result.noWatchedTags = body.contains("<p>You do not have any watched tags");
-            if (body.contains("No hits found</p>")) {
-                result.founds = 0;
-                //noinspection unchecked
-                result.galleryInfoList = Collections.EMPTY_LIST;
-                return result;
-            } else {
-                result.founds = Integer.MAX_VALUE;
-            }
+        result.founds = Integer.MAX_VALUE;
+        result.noWatchedTags = body.contains("<p>You do not have any watched tags");
+        if (body.contains("No hits found</p>")) {
+            result.founds = 0;
+            result.galleryInfoList = Collections.EMPTY_LIST;
+            return result;
         }
 
         try {

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

@@ -22,6 +22,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.os.Parcelable;
 import android.text.InputType;
 import android.text.TextUtils;
 import android.util.SparseBooleanArray;
@@ -1307,5 +1308,19 @@ public class FavoritesScene extends BaseScene implements
             super.onClearData();
             nextPg = null;
         }
+
+        @Override
+        protected Parcelable saveInstanceState(Parcelable superState) {
+            Bundle bundle = (Bundle) super.saveInstanceState(superState);
+            bundle.putString(KEY_NEXT_PAGE, nextPg);
+            return bundle;
+        }
+
+        @Override
+        protected Parcelable restoreInstanceState(Parcelable state) {
+            Bundle bundle = (Bundle) state;
+            nextPg = bundle.getString(KEY_NEXT_PAGE);
+            return super.restoreInstanceState(state);
+        }
     }
 }

app/src/main/java/com/hippo/ehviewer/widget/GalleryInfoContentHelper.java

@@ -37,6 +37,8 @@ public abstract class GalleryInfoContentHelper extends ContentLayout.ContentHelp
     private static final String KEY_DATA_MAP = "data_map";
     private static final String KEY_MAX_GID = "max_gid";
     private static final String KEY_MIN_GID = "min_gid";
+
+    public static final String KEY_NEXT_PAGE = "next_page";
     private final FavouriteStatusRouter.Listener listener;
     @SuppressLint("UseSparseArrays")
     private Map<Long, GalleryInfo> map = new HashMap<>();