Rel 1.7.31.0-alpha04

fix: preview count limit

app/build.gradle

@@ -35,8 +35,8 @@ android {
         applicationId "moe.tarsin.ehviewer"
         minSdkVersion 26
         targetSdkVersion 33
-        versionCode 114537
-        versionName "1.7.31.0-alpha02"
+        versionCode 114539
+        versionName "1.7.31.0-alpha04"
         resConfigs 'zh', 'zh-rCN', 'zh-rHK', 'zh-rTW', 'es', 'ja', 'ko', 'fr', 'de', 'th'
     }
 

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

@@ -34,7 +34,7 @@ import java.util.List;
 import java.util.regex.Pattern;
 
 public class FavoritesParser {
-    private static final Pattern PATTERN_NEXT_PAGE = Pattern.compile("next=(\\d+-\\d+)");
+    private static final Pattern PATTERN_NEXT_PAGE = Pattern.compile("next=(\\d+(-\\d+)?)");
 
     public static Result parse(String body) throws Exception {
         if (body.contains("This page requires you to log on.</p>")) {
@@ -65,9 +65,9 @@ public class FavoritesParser {
 
         try {
             var d = Jsoup.parse(body);
-            var snv = d.getElementsByClass("searchnav").first();
-            assert snv != null;
-            var href = snv.child(3).child(0).attr("href");
+            var next = d.getElementById("unext");
+            assert next != null;
+            var href = next.attr("href");
             var matcher = PATTERN_NEXT_PAGE.matcher(href);
             if (matcher.find()) {
                 re.nextPage = matcher.group(1);

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

@@ -333,7 +333,7 @@ public class GalleryListParser {
             }
             if (list.isEmpty()) {
                 if (es.size() < 2 || !NO_UNFILTERED_TEXT.equals(es.get(1).text())) {
-                    throw new ParseException("No gallery", body);
+                    Log.d(TAG, "No gallery found");
                 }
             }
             result.galleryInfoList = list;

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

@@ -1067,7 +1067,7 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
         if (gd.previewPages <= 0 || previewSet == null || previewSet.size() == 0) {
             mPreviewText.setText(R.string.no_previews);
             return;
-        } else if (gd.previewPages == 1 && previewSet.size() <= 60) {
+        } else if (gd.previewPages == 1) {
             mPreviewText.setText(R.string.no_more_previews);
         } else {
             mPreviewText.setText(R.string.more_previews);
@@ -1076,8 +1076,7 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
         int columnWidth = resources.getDimensionPixelOffset(Settings.getThumbSizeResId());
         mGridLayout.setColumnSize(columnWidth);
         mGridLayout.setStrategy(SimpleGridAutoSpanLayout.STRATEGY_SUITABLE_SIZE);
-        int size = Math.min(60, previewSet.size());
-        for (int i = 0; i < size; i++) {
+        for (int i = 0, size = previewSet.size(); i < size; i++) {
             View view = inflater.inflate(R.layout.item_gallery_preview, mGridLayout, false);
             mGridLayout.addView(view);
 

app/src/main/res/layout/item_download.xml

@@ -40,7 +40,7 @@
                 android:layout_width="0dp"
                 android:layout_height="0dp"
                 app:alwaysCutAndScale="true"
-                app:retryType="click"/>
+                app:retryType="longClick"/>
 
         </com.google.android.material.card.MaterialCardView>