Release 1.8.9.2

.github/workflows/releases.yml

@@ -45,7 +45,6 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           body: Bump Version
-          discussion_category_name: Announcements
           files: |
             app/build/outputs/apk/release/EhViewer-universal.apk
             app/build/outputs/apk/release/EhViewer-arm64-v8a.apk
@@ -53,24 +52,3 @@ jobs:
             app/build/outputs/apk/release/EhViewer-x86.apk
             app/build/outputs/apk/release/EhViewer-armeabi-v7a.apk
             app/build/outputs/mapping/release/mapping.txt
-
-      - name: Collect Apks
-        run: |
-          mkdir app/build/outputs/apk/release/fdroid
-          cp app/build/outputs/apk/release/app-arm64-v8a-release.apk app/build/outputs/apk/release/fdroid/EhViewer-v$GITHUB_REF_NAME.apk
-          cp app/build/outputs/apk/release/app-armeabi-v7a-release.apk app/build/outputs/apk/release/fdroid/EhViewer-v$GITHUB_REF_NAME-armv7.apk
-
-      - name: Push Apks
-        uses: Ehviewer-Overhauled/github-action-push-to-another-repository@main
-        env:
-          SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
-        with:
-          source-directory: app/build/outputs/apk/release/fdroid
-          destination-github-username: Ehviewer-Overhauled
-          destination-repository-name: fdroid-repo
-          user-name: 'github-actions[bot]'
-          user-email: 'github-actions[bot]@users.noreply.github.com'
-          target-branch: deploy
-          create-target-branch: true
-          commit-message: Add apks from $GITHUB_REF
-          target-directory: fdroid/tmp-apks

app/build.gradle.kts

@@ -63,8 +63,8 @@ android {
         applicationId = "moe.tarsin.ehviewer"
         minSdk = 28
         targetSdk = 34
-        versionCode = 180042
-        versionName = "1.8.9.0-SNAPSHOT"
+        versionCode = 180043
+        versionName = "1.8.9.2"
         resourceConfigurations.addAll(
             listOf(
                 "zh",
@@ -216,7 +216,7 @@ dependencies {
     val accompanist_version = "0.31.6-rc"
     implementation("com.google.accompanist:accompanist-themeadapter-material3:$accompanist_version")
     implementation("com.google.accompanist:accompanist-webview:$accompanist_version")
-    implementation("com.google.android.material:material:1.11.0-alpha01")
+    implementation("com.google.android.material:material:1.11.0-alpha02")
 
     val splitties = "3.0.0"
     implementation("com.louiscad.splitties:splitties-appctx:$splitties")

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

@@ -1,9 +1,12 @@
 package com.hippo.ehviewer.client.parser
 
 import com.hippo.ehviewer.EhDB
+import com.hippo.ehviewer.R
 import com.hippo.ehviewer.client.data.BaseGalleryInfo
 import com.hippo.ehviewer.client.data.GalleryInfo.Companion.LOCAL_FAVORITED
 import com.hippo.ehviewer.client.data.GalleryInfo.Companion.NOT_FAVORITED
+import com.hippo.ehviewer.client.exception.EhException
+import com.hippo.ehviewer.client.exception.ParseException
 
 object GalleryListParser {
     suspend fun parse(body: String) = runCatching {
@@ -15,13 +18,21 @@ object GalleryListParser {
                 it.generateSLang()
             }
         }
-    }.getOrDefault(GalleryListResult())
+    }.getOrElse {
+        if (body.contains("<p>You do not have any watched tags")) {
+            throw EhException(R.string.gallery_list_empty_hit_subscription)
+        }
+        if (body.contains("No hits found</p>")) {
+            throw EhException(R.string.gallery_list_empty_hit)
+        }
+        throw ParseException("Can't parse gallery list", body, it)
+    }
 }
 
 class GalleryListResult(
-    val prev: String? = null,
-    val next: String? = null,
-    val galleryInfoList: ArrayList<BaseGalleryInfo> = arrayListOf(),
+    val prev: String?,
+    val next: String?,
+    val galleryInfoList: ArrayList<BaseGalleryInfo>,
 )
 
 private external fun parseGalleryInfoList(e: String): GalleryListResult

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

@@ -91,6 +91,7 @@ import eu.kanade.tachiyomi.util.lang.launchUI
 import eu.kanade.tachiyomi.util.lang.withIOContext
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.flow.collectLatest
 import moe.tarsin.coroutines.runSuspendCatching
 import rikka.core.res.resolveColor
@@ -337,7 +338,8 @@ class FavoritesScene : SearchBarScene() {
                 val transition = ViewTransition(binding.refreshLayout, binding.progress, binding.tip)
                 val empty = getString(R.string.gallery_list_empty_hit)
                 adapter.addLoadStateListener {
-                    lifecycleScope.launchUI {
+                    viewLifecycleOwner.lifecycleScope.launchUI {
+                        ensureActive()
                         when (val state = it.refresh) {
                             is LoadState.Loading -> {
                                 showSearchBar()

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

@@ -365,7 +365,6 @@ class GalleryListScene : SearchBarScene() {
                 binding.refreshLayout.setOnRefreshListener { mAdapter?.refresh() }
                 val transition = ViewTransition(binding.refreshLayout, binding.progress, binding.tip)
                 val empty = getString(R.string.gallery_list_empty_hit)
-                val noWatch = getString(R.string.gallery_list_empty_hit_subscription)
                 adapter.addLoadStateListener {
                     viewLifecycleOwner.lifecycleScope.launchUI {
                         ensureActive()
@@ -395,11 +394,7 @@ class GalleryListScene : SearchBarScene() {
                                 delay(500)
                                 binding.refreshLayout.isRefreshing = false
                                 if (mAdapter?.itemCount == 0) {
-                                    if (mUrlBuilder.mode == MODE_SUBSCRIPTION) {
-                                        binding.tip.text = noWatch
-                                    } else {
-                                        binding.tip.text = empty
-                                    }
+                                    binding.tip.text = empty
                                     transition.showView(2)
                                 } else {
                                     transition.showView(0)