Release 1.8.9.7

Merge branch '1.8.x.x' into 1.8.9.x
Release 1.8.9.6
2023-10-01 22:59:52 +08:00 · 2023-10-01 22:59:17 +08:00 · 2023-09-20 19:49:48 +08:00 · 2023-09-20 19:49:25 +08:00 · 2023-09-10 21:20:49 +08:00 · 2023-09-10 21:20:31 +08:00
372 changed files with 1106 additions and 1910 deletions
@@ -1,4 +0,0 @@
-[*.{kt,kts}]
-ij_kotlin_imports_layout = *
-ktlint_code_style = intellij_idea
-ktlint_function_naming_ignore_when_annotated_with = Composable
@@ -14,7 +14,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
        with:
          submodules: 'recursive'

@@ -48,170 +48,45 @@ jobs:
      - name: Spotless Check
        run: ./gradlew spotlessCheck

-      - name: Lint Check
-        run: ./gradlew lintMarshmallowGmsRelease
-
      - name: CMake Cache
        uses: actions/cache@v3
        with:
          path: |
            app/.cxx
            app/src/main/cpp/nettle/nettle
-          key: ${{ runner.os }}-cmake-${{ hashFiles('gradle/libs.versions.toml', 'app/build.gradle.kts', 'app/src/main/cpp/CMakeLists.txt') }}
+          key: ${{ runner.os }}-cmake-${{ github.run_id }}
          restore-keys: ${{ runner.os }}-cmake-

-      - name: Build OSS
-        run: ./gradlew assembleDefaultOssRelease
+      - name: Gradle Build
+        run: ./gradlew assembleRelease

-      - name: Upload OSS ARM64
+      - name: Update ARM64
        uses: actions/upload-artifact@v3
        with:
-          name: default-oss-arm64-v8a-${{ github.sha }}
-          path: app/build/outputs/apk/defaultOss/release/app-default-oss-arm64-v8a-release.apk
+          name: arm64-v8a-${{ github.sha }}
+          path: app/build/outputs/apk/release/app-arm64-v8a-release.apk

-      - name: Upload OSS x86_64
+      - name: Update x86_64
        uses: actions/upload-artifact@v3
        with:
-          name: default-oss-x86_64-${{ github.sha }}
-          path: app/build/outputs/apk/defaultOss/release/app-default-oss-x86_64-release.apk
+          name: x86_64-${{ github.sha }}
+          path: app/build/outputs/apk/release/app-x86_64-release.apk

-      - name: Upload OSS ARM32
+      - name: Update ARM32
        uses: actions/upload-artifact@v3
        with:
-          name: default-oss-armeabi-v7a-${{ github.sha }}
-          path: app/build/outputs/apk/defaultOss/release/app-default-oss-armeabi-v7a-release.apk
+          name: armeabi-v7a-${{ github.sha }}
+          path: app/build/outputs/apk/release/app-armeabi-v7a-release.apk

-      - name: Upload OSS x86
+      - name: Update x86
        uses: actions/upload-artifact@v3
        with:
-          name: default-oss-x86-${{ github.sha }}
-          path: app/build/outputs/apk/defaultOss/release/app-default-oss-x86-release.apk
+          name: x86-${{ github.sha }}
+          path: app/build/outputs/apk/release/app-x86-release.apk

-      - name: Upload OSS mapping
+      - name: Update mapping
        uses: actions/upload-artifact@v3
        with:
-          name: default-oss-mapping-${{ github.sha }}
-          path: app/build/outputs/mapping/defaultOssRelease/mapping.txt
-
-      - name: Upload OSS native debug symbols
-        uses: actions/upload-artifact@v3
-        with:
-          name: default-oss-native-debug-symbols-${{ github.sha }}
-          path: app/build/outputs/native-debug-symbols/defaultOssRelease/native-debug-symbols.zip
-
-      - name: Build GMS
-        run: ./gradlew assembleDefaultGmsRelease
-
-      - name: Upload GMS ARM64
-        uses: actions/upload-artifact@v3
-        with:
-          name: default-gms-arm64-v8a-${{ github.sha }}
-          path: app/build/outputs/apk/defaultGms/release/app-default-gms-arm64-v8a-release.apk
-
-      - name: Upload GMS x86_64
-        uses: actions/upload-artifact@v3
-        with:
-          name: default-gms-x86_64-${{ github.sha }}
-          path: app/build/outputs/apk/defaultGms/release/app-default-gms-x86_64-release.apk
-
-      - name: Upload GMS ARM32
-        uses: actions/upload-artifact@v3
-        with:
-          name: default-gms-armeabi-v7a-${{ github.sha }}
-          path: app/build/outputs/apk/defaultGms/release/app-default-gms-armeabi-v7a-release.apk
-
-      - name: Upload GMS x86
-        uses: actions/upload-artifact@v3
-        with:
-          name: default-gms-x86-${{ github.sha }}
-          path: app/build/outputs/apk/defaultGms/release/app-default-gms-x86-release.apk
-
-      - name: Upload GMS mapping
-        uses: actions/upload-artifact@v3
-        with:
-          name: default-gms-mapping-${{ github.sha }}
-          path: app/build/outputs/mapping/defaultGmsRelease/mapping.txt
-
-      - name: Upload GMS native debug symbols
-        uses: actions/upload-artifact@v3
-        with:
-          name: default-gms-native-debug-symbols-${{ github.sha }}
-          path: app/build/outputs/native-debug-symbols/defaultGmsRelease/native-debug-symbols.zip
-
-      - name: Build Marshmallow OSS
-        run: ./gradlew assembleMarshmallowOssRelease
-
-      - name: Upload Marshmallow OSS ARM64
-        uses: actions/upload-artifact@v3
-        with:
-          name: marshmallow-oss-arm64-v8a-${{ github.sha }}
-          path: app/build/outputs/apk/marshmallowOss/release/app-marshmallow-oss-arm64-v8a-release.apk
-
-      - name: Upload Marshmallow OSS x86_64
-        uses: actions/upload-artifact@v3
-        with:
-          name: marshmallow-oss-x86_64-${{ github.sha }}
-          path: app/build/outputs/apk/marshmallowOss/release/app-marshmallow-oss-x86_64-release.apk
-
-      - name: Upload Marshmallow OSS ARM32
-        uses: actions/upload-artifact@v3
-        with:
-          name: marshmallow-oss-armeabi-v7a-${{ github.sha }}
-          path: app/build/outputs/apk/marshmallowOss/release/app-marshmallow-oss-armeabi-v7a-release.apk
-
-      - name: Upload Marshmallow OSS x86
-        uses: actions/upload-artifact@v3
-        with:
-          name: marshmallow-oss-x86-${{ github.sha }}
-          path: app/build/outputs/apk/marshmallowOss/release/app-marshmallow-oss-x86-release.apk
-
-      - name: Upload Marshmallow OSS mapping
-        uses: actions/upload-artifact@v3
-        with:
-          name: marshmallow-oss-mapping-${{ github.sha }}
-          path: app/build/outputs/mapping/marshmallowOssRelease/mapping.txt
-
-      - name: Upload Marshmallow OSS native debug symbols
-        uses: actions/upload-artifact@v3
-        with:
-          name: marshmallow-oss-native-debug-symbols-${{ github.sha }}
-          path: app/build/outputs/native-debug-symbols/marshmallowOssRelease/native-debug-symbols.zip
-
-      - name: Build Marshmallow GMS
-        run: ./gradlew assembleMarshmallowGmsRelease
-
-      - name: Upload Marshmallow GMS ARM64
-        uses: actions/upload-artifact@v3
-        with:
-          name: marshmallow-gms-arm64-v8a-${{ github.sha }}
-          path: app/build/outputs/apk/marshmallowGms/release/app-marshmallow-gms-arm64-v8a-release.apk
-
-      - name: Upload Marshmallow GMS x86_64
-        uses: actions/upload-artifact@v3
-        with:
-          name: marshmallow-gms-x86_64-${{ github.sha }}
-          path: app/build/outputs/apk/marshmallowGms/release/app-marshmallow-gms-x86_64-release.apk
-
-      - name: Upload Marshmallow GMS ARM32
-        uses: actions/upload-artifact@v3
-        with:
-          name: marshmallow-gms-armeabi-v7a-${{ github.sha }}
-          path: app/build/outputs/apk/marshmallowGms/release/app-marshmallow-gms-armeabi-v7a-release.apk
-
-      - name: Upload Marshmallow GMS x86
-        uses: actions/upload-artifact@v3
-        with:
-          name: marshmallow-gms-x86-${{ github.sha }}
-          path: app/build/outputs/apk/marshmallowGms/release/app-marshmallow-gms-x86-release.apk
-
-      - name: Upload Marshmallow GMS mapping
-        uses: actions/upload-artifact@v3
-        with:
-          name: marshmallow-gms-mapping-${{ github.sha }}
-          path: app/build/outputs/mapping/marshmallowGmsRelease/mapping.txt
-
-      - name: Upload Marshmallow GMS native debug symbols
-        uses: actions/upload-artifact@v3
-        with:
-          name: marshmallow-gms-native-debug-symbols-${{ github.sha }}
-          path: app/build/outputs/native-debug-symbols/marshmallowGmsRelease/native-debug-symbols.zip
+          name: mapping-${{ github.sha }}
+          path: app/build/outputs/mapping/release/mapping.txt
+          retention-days: 5
@@ -11,7 +11,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
        with:
          submodules: 'recursive'

@@ -35,7 +35,7 @@ jobs:
          path: |
            app/.cxx
            app/src/main/cpp/nettle/nettle
-          key: ${{ runner.os }}-cmake-${{ hashFiles('gradle/libs.versions.toml', 'app/build.gradle.kts', 'app/src/main/cpp/CMakeLists.txt') }}
+          key: ${{ runner.os }}-cmake-${{ github.run_id }}
          restore-keys: ${{ runner.os }}-cmake-

      - name: Gradle Build
@@ -45,71 +45,20 @@ jobs:

      - name: Rename Apks
        run: |
-          mv app/build/outputs/apk/defaultOss/release/app-default-oss-universal-release.apk EhViewer-${{ github.ref_name }}-default-oss-universal.apk
-          mv app/build/outputs/apk/defaultOss/release/app-default-oss-arm64-v8a-release.apk EhViewer-${{ github.ref_name }}-default-oss-arm64-v8a.apk
-          mv app/build/outputs/apk/defaultOss/release/app-default-oss-x86_64-release.apk EhViewer-${{ github.ref_name }}-default-oss-x86_64.apk
-          mv app/build/outputs/apk/defaultOss/release/app-default-oss-x86-release.apk EhViewer-${{ github.ref_name }}-default-oss-x86.apk
-          mv app/build/outputs/apk/defaultOss/release/app-default-oss-armeabi-v7a-release.apk EhViewer-${{ github.ref_name }}-default-oss-armeabi-v7a.apk
-          mv app/build/outputs/mapping/defaultOssRelease/mapping.txt EhViewer-${{ github.ref_name }}-default-oss-mapping.txt
-          mv app/build/outputs/native-debug-symbols/defaultOssRelease/native-debug-symbols.zip EhViewer-${{ github.ref_name }}-default-oss-native-debug-symbols.zip
-
-          mv app/build/outputs/apk/defaultGms/release/app-default-gms-universal-release.apk EhViewer-${{ github.ref_name }}-default-gms-universal.apk
-          mv app/build/outputs/apk/defaultGms/release/app-default-gms-arm64-v8a-release.apk EhViewer-${{ github.ref_name }}-default-gms-arm64-v8a.apk
-          mv app/build/outputs/apk/defaultGms/release/app-default-gms-x86_64-release.apk EhViewer-${{ github.ref_name }}-default-gms-x86_64.apk
-          mv app/build/outputs/apk/defaultGms/release/app-default-gms-x86-release.apk EhViewer-${{ github.ref_name }}-default-gms-x86.apk
-          mv app/build/outputs/apk/defaultGms/release/app-default-gms-armeabi-v7a-release.apk EhViewer-${{ github.ref_name }}-default-gms-armeabi-v7a.apk
-          mv app/build/outputs/mapping/defaultGmsRelease/mapping.txt EhViewer-${{ github.ref_name }}-default-gms-mapping.txt
-          mv app/build/outputs/native-debug-symbols/defaultGmsRelease/native-debug-symbols.zip EhViewer-${{ github.ref_name }}-default-gms-native-debug-symbols.zip
-
-          mv app/build/outputs/apk/marshmallowOss/release/app-marshmallow-oss-universal-release.apk EhViewer-${{ github.ref_name }}-marshmallow-oss-universal.apk
-          mv app/build/outputs/apk/marshmallowOss/release/app-marshmallow-oss-arm64-v8a-release.apk EhViewer-${{ github.ref_name }}-marshmallow-oss-arm64-v8a.apk
-          mv app/build/outputs/apk/marshmallowOss/release/app-marshmallow-oss-x86_64-release.apk EhViewer-${{ github.ref_name }}-marshmallow-oss-x86_64.apk
-          mv app/build/outputs/apk/marshmallowOss/release/app-marshmallow-oss-x86-release.apk EhViewer-${{ github.ref_name }}-marshmallow-oss-x86.apk
-          mv app/build/outputs/apk/marshmallowOss/release/app-marshmallow-oss-armeabi-v7a-release.apk EhViewer-${{ github.ref_name }}-marshmallow-oss-armeabi-v7a.apk
-          mv app/build/outputs/mapping/marshmallowOssRelease/mapping.txt EhViewer-${{ github.ref_name }}-marshmallow-oss-mapping.txt
-          mv app/build/outputs/native-debug-symbols/marshmallowOssRelease/native-debug-symbols.zip EhViewer-${{ github.ref_name }}-marshmallow-oss-native-debug-symbols.zip
-
-          mv app/build/outputs/apk/marshmallowGms/release/app-marshmallow-gms-universal-release.apk EhViewer-${{ github.ref_name }}-marshmallow-gms-universal.apk
-          mv app/build/outputs/apk/marshmallowGms/release/app-marshmallow-gms-arm64-v8a-release.apk EhViewer-${{ github.ref_name }}-marshmallow-gms-arm64-v8a.apk
-          mv app/build/outputs/apk/marshmallowGms/release/app-marshmallow-gms-x86_64-release.apk EhViewer-${{ github.ref_name }}-marshmallow-gms-x86_64.apk
-          mv app/build/outputs/apk/marshmallowGms/release/app-marshmallow-gms-x86-release.apk EhViewer-${{ github.ref_name }}-marshmallow-gms-x86.apk
-          mv app/build/outputs/apk/marshmallowGms/release/app-marshmallow-gms-armeabi-v7a-release.apk EhViewer-${{ github.ref_name }}-marshmallow-gms-armeabi-v7a.apk
-          mv app/build/outputs/mapping/marshmallowGmsRelease/mapping.txt EhViewer-${{ github.ref_name }}-marshmallow-gms-mapping.txt
-          mv app/build/outputs/native-debug-symbols/marshmallowGmsRelease/native-debug-symbols.zip EhViewer-${{ github.ref_name }}-marshmallow-gms-native-debug-symbols.zip
+          cp app/build/outputs/apk/release/app-universal-release.apk app/build/outputs/apk/release/EhViewer-universal.apk
+          cp app/build/outputs/apk/release/app-arm64-v8a-release.apk app/build/outputs/apk/release/EhViewer-arm64-v8a.apk
+          cp app/build/outputs/apk/release/app-x86_64-release.apk app/build/outputs/apk/release/EhViewer-x86_64.apk
+          cp app/build/outputs/apk/release/app-x86-release.apk app/build/outputs/apk/release/EhViewer-x86.apk
+          cp app/build/outputs/apk/release/app-armeabi-v7a-release.apk app/build/outputs/apk/release/EhViewer-armeabi-v7a.apk

      - name: Releases
        uses: softprops/action-gh-release@v1
        with:
          body: Bump Version
          files: |
-            EhViewer-${{ github.ref_name }}-default-oss-universal.apk
-            EhViewer-${{ github.ref_name }}-default-oss-arm64-v8a.apk
-            EhViewer-${{ github.ref_name }}-default-oss-x86_64.apk
-            EhViewer-${{ github.ref_name }}-default-oss-x86.apk
-            EhViewer-${{ github.ref_name }}-default-oss-armeabi-v7a.apk
-            EhViewer-${{ github.ref_name }}-default-oss-mapping.txt
-            EhViewer-${{ github.ref_name }}-default-oss-native-debug-symbols.zip
-
-            EhViewer-${{ github.ref_name }}-default-gms-universal.apk
-            EhViewer-${{ github.ref_name }}-default-gms-arm64-v8a.apk
-            EhViewer-${{ github.ref_name }}-default-gms-x86_64.apk
-            EhViewer-${{ github.ref_name }}-default-gms-x86.apk
-            EhViewer-${{ github.ref_name }}-default-gms-armeabi-v7a.apk
-            EhViewer-${{ github.ref_name }}-default-gms-mapping.txt
-            EhViewer-${{ github.ref_name }}-default-gms-native-debug-symbols.zip
-
-            EhViewer-${{ github.ref_name }}-marshmallow-oss-universal.apk
-            EhViewer-${{ github.ref_name }}-marshmallow-oss-arm64-v8a.apk
-            EhViewer-${{ github.ref_name }}-marshmallow-oss-x86_64.apk
-            EhViewer-${{ github.ref_name }}-marshmallow-oss-x86.apk
-            EhViewer-${{ github.ref_name }}-marshmallow-oss-armeabi-v7a.apk
-            EhViewer-${{ github.ref_name }}-marshmallow-oss-mapping.txt
-            EhViewer-${{ github.ref_name }}-marshmallow-oss-native-debug-symbols.zip
-
-            EhViewer-${{ github.ref_name }}-marshmallow-gms-universal.apk
-            EhViewer-${{ github.ref_name }}-marshmallow-gms-arm64-v8a.apk
-            EhViewer-${{ github.ref_name }}-marshmallow-gms-x86_64.apk
-            EhViewer-${{ github.ref_name }}-marshmallow-gms-x86.apk
-            EhViewer-${{ github.ref_name }}-marshmallow-gms-armeabi-v7a.apk
-            EhViewer-${{ github.ref_name }}-marshmallow-gms-mapping.txt
-            EhViewer-${{ github.ref_name }}-marshmallow-gms-native-debug-symbols.zip
+            app/build/outputs/apk/release/EhViewer-universal.apk
+            app/build/outputs/apk/release/EhViewer-arm64-v8a.apk
+            app/build/outputs/apk/release/EhViewer-x86_64.apk
+            app/build/outputs/apk/release/EhViewer-x86.apk
+            app/build/outputs/apk/release/EhViewer-armeabi-v7a.apk
+            app/build/outputs/mapping/release/mapping.txt
@@ -6,4 +6,5 @@
 *.iml
 .idea
 /captures
+release
 google-services.json
@@ -73,17 +73,6 @@ and [Dynamic Color](https://m3.material.io/styles/color/dynamic-color/overview)

 # Download

-| Flavor | Feature |
-|-|-|
-| Default | Android 9+, full support |
-| Marshmallow | Android 6.0+, limited support* |
-| OSS | FOSS dependencies**  |
-| GMS | Proprietary GMS component |
-
-\* Archives and GIFs are not supported
-
-** Fall back to OkHttp on devices that don't support [HttpEngine](https://developer.android.com/reference/android/net/http/HttpEngine)
-
 <a href="https://github.com/FooIbar/EhViewer/releases">
 <img alt="Get it on GitHub" src="https://github.com/Ehviewer-Overhauled/Art/blob/master/get-it-on-github.svg" width="200px"/>
 </a>
@@ -8,21 +8,21 @@ val isRelease: Boolean
    get() = gradle.startParameter.taskNames.any { it.contains("Release") }

 plugins {
-    alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.kotlin.parcelize)
-    alias(libs.plugins.kotlin.serialization)
-    alias(libs.plugins.ksp)
-    alias(libs.plugins.spotless)
-    alias(libs.plugins.aboutlibrariesPlugin)
-    alias(libs.plugins.rustAndroidPlugin)
-    alias(libs.plugins.composeCompilerReportGenerator)
+    id("com.android.application")
+    kotlin("android")
+    id("kotlin-parcelize")
+    kotlin("plugin.serialization")
+    id("com.google.devtools.ksp")
+    id("com.diffplug.spotless")
+    id("com.mikepenz.aboutlibraries.plugin")
+    id("org.mozilla.rust-android-gradle.rust-android")
+    id("dev.shreyaspatil.compose-compiler-report-generator")
 }

 android {
    compileSdk = 34
    buildToolsVersion = "34.0.0"
-    ndkVersion = "26.1.10909125"
+    ndkVersion = "26.0.10792818"

    splits {
        abi {
@@ -32,7 +32,7 @@ android {
                include("arm64-v8a", "x86_64", "armeabi-v7a", "x86")
                isUniversalApk = true
            } else {
-                include("arm64-v8a", "x86_64")
+                include("arm64-v8a")
            }
        }
    }
@@ -64,8 +64,8 @@ android {
        applicationId = "moe.tarsin.ehviewer"
        minSdk = 28
        targetSdk = 34
-        versionCode = 180044
-        versionName = "1.8.10.2"
+        versionCode = 180043
+        versionName = "1.8.9.7"
        resourceConfigurations.addAll(
            listOf(
                "zh",
@@ -84,42 +84,6 @@ android {
        )
        buildConfigField("String", "COMMIT_SHA", "\"$commitSha\"")
        buildConfigField("String", "REPO_NAME", "\"$repoName\"")
-        ndk {
-            debugSymbolLevel = "FULL"
-        }
-    }
-
-    flavorDimensions += listOf("api", "oss")
-
-    productFlavors {
-        create("default") {
-            dimension = "api"
-        }
-        create("marshmallow") {
-            dimension = "api"
-            minSdk = 23
-            applicationIdSuffix = ".m"
-            versionNameSuffix = "-M"
-            externalNativeBuild {
-                cmake {
-                    targets += "noop"
-                }
-            }
-            compileOptions {
-                isCoreLibraryDesugaringEnabled = true
-            }
-            lint {
-                checkOnly += setOf("InlinedApi", "NewApi", "UnusedAttribute")
-                error += setOf("InlinedApi", "UnusedAttribute")
-            }
-        }
-        create("oss") {
-            dimension = "oss"
-        }
-        create("gms") {
-            dimension = "oss"
-            versionNameSuffix = "-gms"
-        }
    }

    externalNativeBuild {
@@ -128,12 +92,19 @@ android {
        }
    }

+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
    kotlinOptions {
+        jvmTarget = "17"
        freeCompilerArgs = listOf(
            // https://kotlinlang.org/docs/compiler-reference.html#progressive
            "-progressive",
            "-Xjvm-default=all",
            "-Xlambdas=indy",
+            "-XXLanguage:+BreakContinueInInlineLambdas",

            "-opt-in=coil.annotation.ExperimentalCoilApi",
            "-opt-in=androidx.compose.foundation.layout.ExperimentalLayoutApi",
@@ -190,7 +161,7 @@ android {
    }

    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
+        kotlinCompilerExtensionVersion = "1.5.3"
    }

    namespace = "com.hippo.ehviewer"
@@ -198,85 +169,102 @@ android {

 dependencies {
    // https://developer.android.com/jetpack/androidx/releases/activity
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.appcompat)
-    implementation(libs.androidx.biometric)
-    implementation(libs.androidx.browser)
-    implementation(libs.androidx.collection)
+    implementation("androidx.activity:activity-compose:1.8.0-rc01")
+    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("androidx.biometric:biometric-ktx:1.2.0-alpha05")
+    implementation("androidx.browser:browser:1.6.0")
+    implementation("androidx.collection:collection-ktx:1.3.0-rc01")

    // https://developer.android.com/jetpack/androidx/releases/compose-material3
-    api(platform(libs.compose.bom))
-    implementation(libs.bundles.compose)
+    // api(platform("androidx.compose:compose-bom:2023.05.00"))
+    api(platform("dev.chrisbanes.compose:compose-bom:2023.07.00-alpha02"))
+    implementation("androidx.compose.material:material-icons-extended")
+    implementation("androidx.compose.material3:material3")
+    implementation("androidx.compose.material3:material3-window-size-class")
+    implementation("androidx.compose.ui:ui-util")

-    implementation(libs.androidx.core)
-    implementation(libs.androidx.core.splashscreen)
+    implementation("androidx.core:core-ktx:1.12.0")

-    implementation(libs.androidx.constraintlayout.compose)
-    implementation(libs.androidx.coordinatorlayout)
-    implementation(libs.androidx.fragment)
+    implementation("androidx.constraintlayout:constraintlayout-compose:1.1.0-alpha12")
+    implementation("androidx.coordinatorlayout:coordinatorlayout:1.2.0")
+    implementation("androidx.fragment:fragment-ktx:1.7.0-alpha05")
    // https://developer.android.com/jetpack/androidx/releases/lifecycle
-    implementation(libs.androidx.lifecycle.process)
+    implementation("androidx.lifecycle:lifecycle-process:2.6.2")

    // https://developer.android.com/jetpack/androidx/releases/navigation
-    implementation(libs.bundles.androidx.navigation)
+    val navigation = "2.7.3"
+    implementation("androidx.navigation:navigation-fragment-ktx:$navigation")
+    implementation("androidx.navigation:navigation-ui-ktx:$navigation")
+    implementation("androidx.navigation:navigation-compose:$navigation")

    // https://developer.android.com/jetpack/androidx/releases/paging
-    implementation(libs.bundles.androidx.paging)
-
-    implementation(libs.bundles.androidx.recyclerview)
+    val paging = "3.2.1"
+    implementation("androidx.paging:paging-compose:$paging")
+    implementation("androidx.paging:paging-runtime-ktx:$paging")
+    implementation("androidx.recyclerview:recyclerview:1.3.1")
+    implementation("androidx.recyclerview:recyclerview-selection:1.2.0-alpha01")

    // https://developer.android.com/jetpack/androidx/releases/room
-    ksp(libs.androidx.room.compiler)
-    implementation(libs.androidx.room.paging)
+    val room = "2.6.0-rc01"
+    ksp("androidx.room:room-compiler:$room")
+    implementation("androidx.room:room-paging:$room")

-    implementation(libs.androidx.swiperefreshlayout)
-    implementation(libs.androidx.work.runtime)
-    implementation(libs.drawer)
-    implementation(libs.photoview) // Dead Dependency
-    implementation(libs.directionalviewpager) // Dead Dependency
+    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01")
+    implementation("androidx.work:work-runtime-ktx:2.8.1")
+    implementation("com.drakeet.drawer:drawer:1.0.3")
+    implementation("com.github.chrisbanes:PhotoView:2.3.0") // Dead Dependency
+    implementation("com.github.tachiyomiorg:DirectionalViewPager:1.0.0") // Dead Dependency
    // https://github.com/google/accompanist/releases
-    implementation(libs.bundles.accompanist)
-    implementation(libs.material)
+    val accompanist = "0.32.0"
+    implementation("com.google.accompanist:accompanist-themeadapter-material3:$accompanist")
+    implementation("com.google.accompanist:accompanist-webview:$accompanist")
+    implementation("com.google.android.material:material:1.11.0-alpha03")

-    implementation(libs.bundles.splitties)
+    val splitties = "3.0.0"
+    implementation("com.louiscad.splitties:splitties-appctx:$splitties")
+    implementation("com.louiscad.splitties:splitties-systemservices:$splitties")
+    implementation("com.louiscad.splitties:splitties-preferences:$splitties")
+    implementation("com.louiscad.splitties:splitties-arch-room:$splitties")

    // https://square.github.io/okhttp/changelogs/changelog/
-    implementation(platform(libs.okhttp.bom))
-    implementation(libs.bundles.okhttp)
+    implementation(platform("com.squareup.okhttp3:okhttp-bom:5.0.0-alpha.11"))
+    implementation("com.squareup.okhttp3:okhttp-android")
+    implementation("com.squareup.okhttp3:okhttp-coroutines")

-    implementation(libs.okio.jvm)
+    implementation("com.squareup.okio:okio-jvm:3.5.0")

-    implementation(libs.aboutlibraries.core)
+    implementation("com.mikepenz:aboutlibraries-core:10.9.1")

-    implementation(libs.insetter) // Dead Dependency
-    implementation(libs.bundles.rikkax)
+    implementation("dev.chrisbanes.insetter:insetter:0.6.1") // Dead Dependency
+    implementation("dev.rikka.rikkax.core:core-ktx:1.4.1")
+    implementation("dev.rikka.rikkax.insets:insets:1.3.0")
+    implementation("dev.rikka.rikkax.layoutinflater:layoutinflater:1.3.0")

-    implementation(platform(libs.arrow.stack))
-    implementation(libs.arrow.fx.coroutines)
+    implementation(platform("io.arrow-kt:arrow-stack:1.2.1"))
+    implementation("io.arrow-kt:arrow-fx-coroutines")

    // https://coil-kt.github.io/coil/changelog/
-    implementation(platform(libs.coil.bom))
-    implementation(libs.bundles.coil)
+    implementation(platform("io.coil-kt:coil-bom:2.4.0"))
+    implementation("io.coil-kt:coil-compose")
+    implementation("io.coil-kt:coil-gif")

-    implementation(libs.bundles.ktor)
+    val ktor = "2.3.4"
+    implementation("io.ktor:ktor-io-jvm:$ktor")
+    implementation("io.ktor:ktor-utils-jvm:$ktor")

-    implementation(libs.bundles.kotlinx.serialization)
+    val serialization = "1.6.0"
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-cbor:$serialization")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json-okio:$serialization")

-    implementation(libs.kotlinx.coroutines.android)
-    implementation(libs.jsoup)
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
+    implementation("org.jsoup:jsoup:1.16.1")

-    debugImplementation(libs.chucker)
-    releaseImplementation(libs.chucker.nop)
+    val chunker = "4.0.0"
+    debugImplementation("com.github.chuckerteam.chucker:library:$chunker")
+    releaseImplementation("com.github.chuckerteam.chucker:library-no-op:$chunker")

-    debugImplementation(libs.leakcanary.android)
-
-    coreLibraryDesugaring(libs.desugar)
-
-    "gmsImplementation"(libs.bundles.cronet)
-}
-
-kotlin {
-    jvmToolchain(17)
+    debugImplementation("com.squareup.leakcanary:leakcanary-android:2.12")
 }

 ksp {
@@ -287,30 +275,40 @@ ksp {
 aboutLibraries {
    duplicationMode = MERGE
    duplicationRule = GROUP
+    exclusionPatterns = listOf(
+        "androidx\\..*".toPattern(),
+        ".*annotations".toPattern(),
+        "com\\.google\\.code\\..*".toPattern(),
+        "com\\.google\\.guava:listenablefuture".toPattern(),
+        "com\\.google\\.protobuf:protobuf-javalite".toPattern(),
+        "org\\.checkerframework:checker-qual".toPattern(),
+        "org\\.chromium\\.net:cronet-embedded".toPattern(),
+        "org\\.slf4j:slf4j-api".toPattern(),
+    )
 }

 cargo {
    module = "src/main/rust"
    libname = "ehviewer_rust"
-    targets = if (isRelease) listOf("arm", "x86", "arm64", "x86_64") else listOf("arm64", "x86_64")
+    targets = if (isRelease) listOf("arm", "x86", "arm64", "x86_64") else listOf("arm64")
    if (isRelease) profile = "release"
 }

-val ktlintVersion = libs.versions.ktlint.get()
-
 spotless {
    kotlin {
-        // https://github.com/diffplug/spotless/issues/111
-        target("src/**/*.kt")
-        ktlint(ktlintVersion)
+        ktlint()
    }
    kotlinGradle {
-        ktlint(ktlintVersion)
+        ktlint().editorConfigOverride(
+            mapOf(
+                "ktlint_standard_multiline-expression-wrapping" to "disabled",
+            ),
+        )
    }
 }

 tasks.configureEach {
-    if (name.startsWith("merge") && name.endsWith("JniLibFolders")) {
+    if ((name == "mergeDebugJniLibFolders" || name == "mergeReleaseJniLibFolders")) {
        dependsOn("cargoBuild")
        // fix mergeDebugJniLibFolders  UP-TO-DATE
        inputs.dir(layout.buildDirectory.dir("rustJniLibs/android"))
@@ -1,86 +0,0 @@
-package com.hippo.ehviewer.cronet
-
-import com.hippo.ehviewer.client.CHROME_ACCEPT
-import com.hippo.ehviewer.client.CHROME_ACCEPT_LANGUAGE
-import com.hippo.ehviewer.client.CHROME_USER_AGENT
-import com.hippo.ehviewer.client.EhCookieStore
-import java.nio.ByteBuffer
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-import kotlin.coroutines.Continuation
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
-import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.suspendCancellableCoroutine
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import okio.Path.Companion.toOkioPath
-import org.chromium.net.CronetEngine
-import org.chromium.net.CronetException
-import org.chromium.net.UrlRequest
-import org.chromium.net.UrlResponseInfo
-import splitties.init.appCtx
-
-val cronetHttpClient: CronetEngine = CronetEngine.Builder(appCtx).apply {
-    enableBrotli(true)
-    val cache = (appCtx.cacheDir.toOkioPath() / "http_cache").toFile().apply { mkdirs() }
-    setStoragePath(cache.absolutePath)
-    enableHttpCache(CronetEngine.Builder.HTTP_CACHE_DISK_NO_HTTP, 100 * 1024)
-    setUserAgent(CHROME_USER_AGENT)
-}.build()
-
-class CronetRequest {
-    lateinit var consumer: (ByteBuffer) -> Unit
-    lateinit var onResponse: CronetRequest.(UrlResponseInfo) -> Unit
-    lateinit var request: UrlRequest
-    lateinit var onError: (Throwable) -> Unit
-    lateinit var readerCont: Continuation<Unit>
-    val callback = object : UrlRequest.Callback() {
-        override fun onRedirectReceived(req: UrlRequest, info: UrlResponseInfo, url: String) {
-            req.followRedirect()
-        }
-
-        override fun onResponseStarted(req: UrlRequest, info: UrlResponseInfo) {
-            onResponse(info)
-        }
-
-        override fun onReadCompleted(req: UrlRequest, info: UrlResponseInfo, data: ByteBuffer) {
-            data.flip()
-            consumer(data)
-        }
-
-        override fun onSucceeded(req: UrlRequest, info: UrlResponseInfo) {
-            readerCont.resume(Unit)
-        }
-
-        override fun onFailed(req: UrlRequest, info: UrlResponseInfo?, e: CronetException) {
-            onError(e)
-        }
-    }
-}
-
-inline fun cronetRequest(url: String, referer: String? = null, conf: UrlRequest.Builder.() -> Unit = {}) = CronetRequest().apply {
-    request = cronetHttpClient.newUrlRequestBuilder(url, callback, cronetHttpClientExecutor).apply {
-        addHeader("Cookie", EhCookieStore.getCookieHeader(url.toHttpUrl()))
-        addHeader("Accept", CHROME_ACCEPT)
-        addHeader("Accept-Language", CHROME_ACCEPT_LANGUAGE)
-        referer?.let { addHeader("Referer", it) }
-    }.apply(conf).build()
-}
-
-suspend inline fun <R> CronetRequest.execute(crossinline callback: suspend CronetRequest.(UrlResponseInfo) -> R): R {
-    contract {
-        callsInPlace(callback, InvocationKind.EXACTLY_ONCE)
-    }
-    return coroutineScope {
-        suspendCancellableCoroutine { cont ->
-            onResponse = { launch { cont.resume(callback(it)) } }
-            cont.invokeOnCancellation { request.cancel() }
-            onError = { cont.resumeWithException(it) }
-            request.start()
-        }
-    }
-}
-
-fun UrlRequest.Builder.noCache(): UrlRequest.Builder = disableCache()
-fun UrlResponseInfo.getHeadersMap(): Map<String, List<String>> = allHeaders
@@ -1,13 +0,0 @@
-package com.hippo.ehviewer.util
-
-import com.google.android.gms.net.CronetProviderInstaller
-import com.hippo.ehviewer.Settings
-import org.chromium.net.CronetProvider
-import splitties.init.appCtx
-
-val isCronetSupported: Boolean
-    get() = Settings.enableCronet && CronetProvider.getAllProviders(appCtx).any { it.isEnabled }.also {
-        if (!it) {
-            CronetProviderInstaller.installProvider(appCtx)
-        }
-    }
@@ -44,7 +44,6 @@
            android:configChanges="screenSize"
            android:exported="true"
            android:launchMode="singleTask"
-            android:theme="@style/AppTheme.Splash"
            android:windowSoftInputMode="adjustResize|stateAlwaysHidden">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
@@ -78,5 +78,3 @@ include_directories(${libarchive_SOURCE_DIR}/libarchive)
 # Build and link our app's native lib
 add_library(${PROJECT_NAME} SHARED archive.c gifutils.c natsort/strnatcmp.c)
 target_link_libraries(${PROJECT_NAME} archive_static log)
-
-add_custom_target("noop")
@@ -279,7 +279,7 @@ static int archive_get_ctx(archive_ctx **ctxptr, int idx) {
 }

 JNIEXPORT jint JNICALL
-Java_com_hippo_ehviewer_jni_ArchiveKt_openArchive(JNIEnv *env, jclass thiz, jint fd,
+Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_openArchive(JNIEnv *env, jclass thiz, jint fd,
                                                                jlong size) {
    EH_UNUSED(env);
    EH_UNUSED(thiz);
@@ -359,7 +359,7 @@ Java_com_hippo_ehviewer_jni_ArchiveKt_openArchive(JNIEnv *env, jclass thiz, jint
 #pragma ide diagnostic ignored "UnreachableCode"

 JNIEXPORT jobject JNICALL
-Java_com_hippo_ehviewer_jni_ArchiveKt_extractToByteBuffer(JNIEnv *env, jclass thiz,
+Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_extractToByteBuffer(JNIEnv *env, jclass thiz,
                                                                        jint index) {
    EH_UNUSED(env);
    EH_UNUSED(thiz);
@@ -389,7 +389,7 @@ Java_com_hippo_ehviewer_jni_ArchiveKt_extractToByteBuffer(JNIEnv *env, jclass th
 #pragma clang diagnostic pop

 JNIEXPORT void JNICALL
-Java_com_hippo_ehviewer_jni_ArchiveKt_closeArchive(JNIEnv *env, jclass thiz) {
+Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_closeArchive(JNIEnv *env, jclass thiz) {
    EH_UNUSED(env);
    EH_UNUSED(thiz);
    for (int i = 0; i < CTX_POOL_SIZE; i++)
@@ -408,14 +408,14 @@ Java_com_hippo_ehviewer_jni_ArchiveKt_closeArchive(JNIEnv *env, jclass thiz) {
 }

 JNIEXPORT jboolean JNICALL
-Java_com_hippo_ehviewer_jni_ArchiveKt_needPassword(JNIEnv *env, jclass thiz) {
+Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_needPassword(JNIEnv *env, jclass thiz) {
    EH_UNUSED(env);
    EH_UNUSED(thiz);
    return need_encrypt;
 }

 JNIEXPORT jboolean JNICALL
-Java_com_hippo_ehviewer_jni_ArchiveKt_providePassword(JNIEnv *env, jclass thiz,
+Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_providePassword(JNIEnv *env, jclass thiz,
                                                                    jstring str) {
    EH_UNUSED(thiz);
    struct archive_entry *entry;
@@ -446,7 +446,7 @@ Java_com_hippo_ehviewer_jni_ArchiveKt_providePassword(JNIEnv *env, jclass thiz,
 }

 JNIEXPORT jstring JNICALL
-Java_com_hippo_ehviewer_jni_ArchiveKt_getFilename(JNIEnv *env, jclass thiz,
+Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_getFilename(JNIEnv *env, jclass thiz,
                                                                jint index) {
    EH_UNUSED(env);
    EH_UNUSED(thiz);
@@ -462,7 +462,7 @@ Java_com_hippo_ehviewer_jni_ArchiveKt_getFilename(JNIEnv *env, jclass thiz,
 }

 JNIEXPORT void JNICALL
-Java_com_hippo_ehviewer_jni_ArchiveKt_extractToFd(JNIEnv *env, jclass thiz,
+Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_extractToFd(JNIEnv *env, jclass thiz,
                                                                jint index, jint fd) {
    EH_UNUSED(env);
    EH_UNUSED(thiz);
@@ -477,7 +477,7 @@ Java_com_hippo_ehviewer_jni_ArchiveKt_extractToFd(JNIEnv *env, jclass thiz,
 }

 JNIEXPORT void JNICALL
-Java_com_hippo_ehviewer_jni_ArchiveKt_releaseByteBuffer(JNIEnv *env, jclass thiz,
+Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_releaseByteBuffer(JNIEnv *env, jclass thiz,
                                                                      jobject buffer) {
    EH_UNUSED(thiz);
    void *addr = (*env)->GetDirectBufferAddress(env, buffer);
@@ -1,7 +1,6 @@
 #include <jni.h>
 #include <string.h>
 #include <stdbool.h>
-#include <unistd.h>
 #include <android/log.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
@@ -12,7 +11,6 @@

 #define GIF_HEADER_87A "GIF87a"
 #define GIF_HEADER_89A "GIF89a"
-#define GIF_HEADER_LENGTH 6

 static int FRAME_DELAY_START_MARKER = 0x0021F904;

@@ -23,8 +21,7 @@ typedef signed char byte;
 #define DEFAULT_FRAME_DELAY 10

 static inline bool isGif(void *addr) {
-    return !memcmp(addr, GIF_HEADER_87A, GIF_HEADER_LENGTH) ||
-           !memcmp(addr, GIF_HEADER_89A, GIF_HEADER_LENGTH);
+    return !memcmp(addr, GIF_HEADER_87A, 6) || !memcmp(addr, GIF_HEADER_89A, 6);
 }

 static void doRewrite(byte *addr, size_t size) {
@@ -45,33 +42,20 @@ static void doRewrite(byte *addr, size_t size) {
    }
 }

-JNIEXPORT jboolean JNICALL
-Java_com_hippo_ehviewer_jni_GifUtilsKt_isGif(JNIEnv *env, jclass clazz, jint fd) {
-    byte buffer[GIF_HEADER_LENGTH];
-    return read(fd, buffer, GIF_HEADER_LENGTH) == GIF_HEADER_LENGTH &&
-           isGif(buffer);
-}
-
 JNIEXPORT void JNICALL
-Java_com_hippo_ehviewer_jni_GifUtilsKt_rewriteGifSource(JNIEnv *env, jclass clazz, jobject buffer) {
+Java_com_hippo_ehviewer_image_ImageKt_rewriteGifSource(JNIEnv *env, jclass clazz, jobject buffer) {
    byte *addr = (*env)->GetDirectBufferAddress(env, buffer);
    size_t size = (*env)->GetDirectBufferCapacity(env, buffer);
    doRewrite(addr, size);
 }

-JNIEXPORT jobject JNICALL
-Java_com_hippo_ehviewer_jni_GifUtilsKt_mmap(JNIEnv *env, jclass clazz, jint fd) {
+JNIEXPORT void JNICALL
+Java_com_hippo_ehviewer_image_ImageKt_rewriteGifSource2(JNIEnv *env, jclass clazz, jint fd) {
    struct stat64 st;
    fstat64(fd, &st);
    size_t size = st.st_size;
-    byte *addr = mmap64(0, size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
-    if (addr == MAP_FAILED) return NULL;
-    return (*env)->NewDirectByteBuffer(env, addr, size);
-}
-
-JNIEXPORT void JNICALL
-Java_com_hippo_ehviewer_jni_GifUtilsKt_munmap(JNIEnv *env, jclass clazz, jobject buffer) {
-    byte *addr = (*env)->GetDirectBufferAddress(env, buffer);
-    size_t size = (*env)->GetDirectBufferCapacity(env, buffer);
+    byte *addr = mmap64(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
+    if (addr == MAP_FAILED) return;
+    doRewrite(addr, size);
    munmap(addr, size);
 }
@@ -12,7 +12,10 @@ import androidx.navigation.NavOptions
@SuppressLint("PrivateResource")
 fun onNavDestinationSelected2(item: MenuItem, navController: NavController): Boolean {
    val builder = NavOptions.Builder().setLaunchSingleTop(true)
-    if (navController.currentDestination!!.parent!!.findNode(item.itemId) is ActivityNavigator.Destination) {
+    if (
+        navController.currentDestination!!.parent!!.findNode(item.itemId)
+        is ActivityNavigator.Destination
+    ) {
        builder.setEnterAnim(R.anim.nav_default_enter_anim)
            .setExitAnim(R.anim.nav_default_exit_anim)
            .setPopEnterAnim(R.anim.nav_default_pop_enter_anim)
@@ -23,14 +23,6 @@ import com.davemorrissey.labs.subscaleview.decoder.Decoder
 import com.davemorrissey.labs.subscaleview.decoder.ImageDecoder
 import com.davemorrissey.labs.subscaleview.provider.InputProvider
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences
-import java.util.Locale
-import java.util.concurrent.locks.ReadWriteLock
-import java.util.concurrent.locks.ReentrantReadWriteLock
-import kotlin.math.abs
-import kotlin.math.max
-import kotlin.math.min
-import kotlin.math.roundToInt
-import kotlin.math.sqrt
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -39,6 +31,14 @@ import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import java.util.Locale
+import java.util.concurrent.locks.ReadWriteLock
+import java.util.concurrent.locks.ReentrantReadWriteLock
+import kotlin.math.abs
+import kotlin.math.max
+import kotlin.math.min
+import kotlin.math.roundToInt
+import kotlin.math.sqrt

 /**
 * Displays an image subsampled as necessary to avoid loading too much image data into memory. After zooming in,
@@ -104,6 +104,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
     * to screen density - on a retina screen, 1:1 may still be too small. Consider using [setMinimumDpi],
     * which is density aware.
     */
+    // Max scale allowed (prevent infinite zoom)
    var maxScale = 2F

    // Density to reach before loading higher resolution tiles
@@ -147,6 +148,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
     *
     * @return the current scale as a source/view pixels ratio.
     */
+    // Current scale and scale at start of zoom
    var scale = 0F
        private set
    private var scaleStart = 0F
@@ -190,6 +192,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
     *
     * @return the source image width in pixels.
     */
+    // Source image dimensions and orientation - dimensions relate to the unrotated image
    var sWidth = 0
        private set

@@ -601,8 +604,8 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(

    private fun onTouchEventInternal(event: MotionEvent): Boolean {
        val touchCount = event.pointerCount
-        when (event.actionMasked) {
-            MotionEvent.ACTION_DOWN, MotionEvent.ACTION_POINTER_DOWN -> {
+        when (event.action) {
+            MotionEvent.ACTION_DOWN, MotionEvent.ACTION_POINTER_1_DOWN, MotionEvent.ACTION_POINTER_2_DOWN -> {
                anim = null
                requestDisallowInterceptTouchEvent(true)
                maxTouchCount = maxTouchCount.coerceAtLeast(touchCount)
@@ -773,7 +776,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
                    return true
                }
            }
-            MotionEvent.ACTION_UP, MotionEvent.ACTION_POINTER_UP -> {
+            MotionEvent.ACTION_UP, MotionEvent.ACTION_POINTER_UP, MotionEvent.ACTION_POINTER_2_UP -> {
                longClickJob?.cancel()
                if (isQuickScaling) {
                    isQuickScaling = false
@@ -47,11 +47,11 @@ import com.hippo.ehviewer.util.Crash
 import com.hippo.ehviewer.util.FavouriteStatusRouter
 import com.hippo.ehviewer.util.FileUtils
 import com.hippo.ehviewer.util.ReadableTime
-import com.hippo.ehviewer.util.isAtLeastP
 import com.hippo.ehviewer.util.isAtLeastQ
 import com.hippo.ehviewer.util.isCronetSupported
 import eu.kanade.tachiyomi.network.interceptor.CloudflareInterceptor
 import eu.kanade.tachiyomi.util.lang.launchIO
+import eu.kanade.tachiyomi.util.lang.withUIContext
 import kotlinx.coroutines.launch
 import moe.tarsin.kt.unreachable
 import okhttp3.AsyncDns
@@ -65,10 +65,6 @@ private val lifecycleScope = lifecycle.coroutineScope

 class EhApplication : Application(), ImageLoaderFactory {
    override fun onCreate() {
-        // Initialize Settings on first access
-        lifecycleScope.launchIO {
-            AppCompatDelegate.setDefaultNightMode(Settings.theme)
-        }
        lifecycle.addObserver(lockObserver)
        val handler = Thread.getDefaultUncaughtExceptionHandler()
        Thread.setDefaultUncaughtExceptionHandler { t, e ->
@@ -81,11 +77,15 @@ class EhApplication : Application(), ImageLoaderFactory {
            handler?.uncaughtException(t, e)
        }
        super.onCreate()
-        if (isAtLeastP) {
-            System.loadLibrary("ehviewer")
-        }
+        System.loadLibrary("ehviewer")
        System.loadLibrary("ehviewer_rust")
        ReadableTime.initialize(this)
+        lifecycleScope.launchIO {
+            val theme = Settings.theme
+            withUIContext {
+                AppCompatDelegate.setDefaultNightMode(theme)
+            }
+        }
        lifecycleScope.launchIO {
            launchIO {
                migrateCookies()
@@ -150,9 +150,7 @@ class EhApplication : Application(), ImageLoaderFactory {
            } else {
                callFactory(baseOkHttpClient)
            }
-            if (isAtLeastP) {
-                add { result, options, _ -> ImageDecoderDecoder(result.source, options, false) }
-            }
+            add { result, options, _ -> ImageDecoderDecoder(result.source, options, false) }
            add(MergeInterceptor)
        }
        diskCache(imageCache)
@@ -4,8 +4,6 @@ package com.hippo.ehviewer

 import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.client.data.FavListUrlBuilder
-import java.util.Locale
-import kotlin.reflect.KProperty
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asFlow
@@ -14,6 +12,8 @@ import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.flatMapMerge
 import splitties.preferences.DataStorePreferences
 import splitties.preferences.edit
+import java.util.Locale
+import kotlin.reflect.KProperty

 object Settings : DataStorePreferences(null) {
    private const val KEY_SHOW_TAG_TRANSLATIONS = "show_tag_translations"
@@ -30,11 +30,10 @@ object Settings : DataStorePreferences(null) {
    var downloadQuery by stringOrNullPref("image_query", null)
    var downloadFragment by stringOrNullPref("image_fragment", null)
    var archivePasswds by stringSetOrNullPref("archive_passwds")
-    var downloadDelay by intPref("download_delay_3", 1000)
+    var downloadDelay by intPref("download_delay_2", 0)
    var gallerySite by intPref("gallery_site_2", 0).observed { updateWhenGallerySiteChanges() }
    var multiThreadDownload by intPref("download_thread_2", 3)
    var preloadImage by intPref("preload_image_2", 5)
-    var downloadTimeout by intPref("download_timeout", 60)
    var theme by intPref("theme_2", -1).observed { updateWhenThemeChanges() }
    var listMode by intPref("list_mode_2", 0)
    var detailSize by intPref("detail_size_2", 0)
@@ -46,7 +45,7 @@ object Settings : DataStorePreferences(null) {
    var requestNews by boolPref("request_news", false).observed { updateWhenRequestNewsChanges() }
    var hideHvEvents by boolPref("hide_hv_events", false)
    var showJpnTitle by boolPref("show_jpn_title", false)
-    var showGalleryPages by boolPref("show_gallery_pages", true)
+    var showGalleryPages by boolPref("show_gallery_pages", false)
    var showTagTranslations by boolPref(KEY_SHOW_TAG_TRANSLATIONS, false).observed { updateWhenTagTranslationChanges() }
    var meteredNetworkWarning by boolPref("cellular_network_warning", false)
    var appLinkVerifyTip by boolPref("app_link_verify_tip", false)
@@ -64,7 +63,6 @@ object Settings : DataStorePreferences(null) {
    var harmonizeCategoryColor by boolPref("harmonize_category_color", true)
    var preloadThumbAggressively by boolPref("preload_thumb_aggressively", false)
    var downloadOriginImage by boolPref("download_origin_image", false)
-    var enableCronet by boolPref("enable_cronet", true)
    var thumbSizeDp by intPref("thumb_size_", 120)
    var recentFavCat by intPref("recent_fav_cat", FavListUrlBuilder.FAV_CAT_LOCAL)
    var defaultFavSlot by intPref("default_favorite_slot", -2)
@@ -99,8 +97,6 @@ object Settings : DataStorePreferences(null) {

    private fun intArrayPref(key: String, count: Int) = object : Delegate<IntArray> {
        override val flowGetter: () -> Flow<Unit> = { _value.asFlow().flatMapMerge { it.changesFlow() }.conflate() }
-
-        @Suppress("ktlint:standard:property-naming")
        private var _value = (0 until count).map { intPref("${key}_$it", 0) }.toTypedArray()
        override fun getValue(thisRef: Any?, prop: KProperty<*>?): IntArray = _value.map { it.value }.toIntArray()
        override fun setValue(thisRef: Any?, prop: KProperty<*>?, value: IntArray) {
@@ -111,8 +107,6 @@ object Settings : DataStorePreferences(null) {

    private fun stringArrayPref(key: String, count: Int, defMetaValue: String) = object : Delegate<Array<String>> {
        override val flowGetter: () -> Flow<Unit> = { _value.asFlow().flatMapMerge { it.changesFlow() }.conflate() }
-
-        @Suppress("ktlint:standard:property-naming")
        private var _value = (0 until count).map { stringPref("${key}_$it", "$defMetaValue $it") }.toTypedArray()
        override fun getValue(thisRef: Any?, prop: KProperty<*>?): Array<String> = _value.map { it.value }.toTypedArray()
        override fun setValue(thisRef: Any?, prop: KProperty<*>?, value: Array<String>) {
@@ -16,11 +16,6 @@
 package com.hippo.ehviewer.client

 import android.webkit.CookieManager
-import androidx.compose.ui.util.fastAny
-import androidx.compose.ui.util.fastFilter
-import androidx.compose.ui.util.fastForEach
-import androidx.compose.ui.util.fastJoinToString
-import androidx.compose.ui.util.fastMapNotNull
 import okhttp3.Cookie
 import okhttp3.CookieJar
 import okhttp3.HttpUrl
@@ -29,15 +24,13 @@ import okhttp3.HttpUrl.Companion.toHttpUrl
 object EhCookieStore : CookieJar {
    private val manager = CookieManager.getInstance()
    fun signOut() = manager.removeAllCookies(null)
-    fun contains(url: HttpUrl, name: String) = get(url).fastAny { it.name == name }
+    fun contains(url: HttpUrl, name: String) = get(url).any { it.name == name }

    fun get(url: HttpUrl): List<Cookie> {
        val cookies = manager.getCookie(url.toString())

-        return if (!cookies.isNullOrEmpty()) {
-            cookies.split(";").fastMapNotNull { setCookie ->
-                Cookie.parse(url, setCookie)?.takeUnless { it.name == KEY_UTMP_NAME }
-            }
+        return if (cookies != null && cookies.isNotEmpty()) {
+            cookies.split(";").mapNotNull { Cookie.parse(url, it) }.filterNot { it.name == KEY_UTMP_NAME }
        } else {
            emptyList()
        }
@@ -64,12 +57,9 @@ object EhCookieStore : CookieJar {
    }.build()

    fun copyNecessaryCookies() {
-        val cookies = get(EhUrl.HOST_E.toHttpUrl())
-        cookies.fastForEach {
-            if (it.name == KEY_STAR || it.name == KEY_IPB_MEMBER_ID || it.name == KEY_IPB_PASS_HASH) {
-                manager.setCookie(EhUrl.HOST_EX, it.toString())
-            }
-        }
+        val cookie = get(EhUrl.HOST_E.toHttpUrl()).filter { it.name == KEY_STAR || it.name == KEY_IPB_MEMBER_ID || it.name == KEY_IPB_PASS_HASH || it.name == KEY_IGNEOUS }
+        cookie.forEach { manager.setCookie(EhUrl.HOST_EX, it.toString()) }
+        flush()
    }

    fun deleteCookie(url: HttpUrl, name: String) {
@@ -77,29 +67,35 @@ object EhCookieStore : CookieJar {
    }

    fun addCookie(cookie: Cookie) {
-        manager.setCookie(if (EhUrl.DOMAIN_E == cookie.domain) EhUrl.HOST_E else EhUrl.HOST_EX, cookie.toString())
+        if (EhUrl.DOMAIN_E in cookie.domain) manager.setCookie(EhUrl.HOST_E, cookie.toString()) else manager.setCookie(EhUrl.DOMAIN_EX, cookie.toString())
    }

    fun flush() = manager.flush()

    fun getCookieHeader(url: HttpUrl): String {
-        return loadForRequest(url).fastJoinToString("; ") {
-            "${it.name}=${it.value}"
+        val cookies = loadForRequest(url)
+        val cookieHeader = StringBuilder()
+        var i = 0
+        val size = cookies.size
+        while (i < size) {
+            if (i > 0) {
+                cookieHeader.append("; ")
+            }
+            val cookie = cookies[i]
+            cookieHeader.append(cookie.name).append('=').append(cookie.value)
+            i++
        }
+        return cookieHeader.toString()
    }

    // See https://github.com/Ehviewer-Overhauled/Ehviewer/issues/873
-    override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>) = cookies.fastForEach {
-        if (it.name != KEY_UTMP_NAME) {
-            manager.setCookie(url.toString(), it.toString())
-        }
-    }
+    override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>) = cookies.filterNot { it.name == KEY_UTMP_NAME }.forEach { manager.setCookie(url.toString(), it.toString()) }.also { flush() }

    override fun loadForRequest(url: HttpUrl): List<Cookie> {
        val checkTips = EhUrl.DOMAIN_E in url.host
        return get(url).run {
            if (checkTips) {
-                fastFilter { it.name != KEY_CONTENT_WARNING }.toMutableList().apply { add(sTipsCookie) }
+                filterNot { it.name == KEY_CONTENT_WARNING }.toMutableList().apply { add(sTipsCookie) }
            } else {
                this
            }
@@ -54,10 +54,6 @@ import com.hippo.ehviewer.util.AppConfig
 import com.hippo.ehviewer.util.StatusCodeException
 import com.hippo.ehviewer.util.isCronetSupported
 import io.ktor.utils.io.pool.DirectByteBufferPool
-import io.ktor.utils.io.pool.useInstance
-import java.io.File
-import java.nio.ByteBuffer
-import kotlin.math.ceil
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.delay
 import kotlinx.serialization.json.add
@@ -65,6 +61,7 @@ import kotlinx.serialization.json.addJsonArray
 import kotlinx.serialization.json.put
 import moe.tarsin.coroutines.removeAllSuspend
 import moe.tarsin.coroutines.runSuspendCatching
+import okhttp3.Headers
 import okhttp3.MediaType
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.MultipartBody
@@ -72,23 +69,36 @@ import okhttp3.Request
 import okhttp3.RequestBody.Companion.asRequestBody
 import org.jsoup.Jsoup
 import splitties.init.appCtx
+import java.io.File
+import java.nio.ByteBuffer
+import kotlin.math.ceil

 private const val TAG = "EhEngine"
 private const val MAX_REQUEST_SIZE = 25
+private const val SAD_PANDA_DISPOSITION = "inline; filename=\"sadpanda.jpg\""
+private const val SAD_PANDA_TYPE = "image/gif"
+private const val SAD_PANDA_LENGTH = "9615"
+private const val KOKOMADE_URL = "https://exhentai.org/img/kokomade.jpg"
 private const val U_CONFIG_TEXT = "Selected Profile"
 private val MEDIA_TYPE_JPEG: MediaType = "image/jpeg".toMediaType()

-private fun rethrowExactly(code: Int, body: String, e: Throwable): Nothing {
+private fun rethrowExactly(code: Int, headers: Headers, body: String, e: Throwable): Nothing {
    // Don't translate coroutine cancellation
    if (e is CancellationException) throw e

+    // Check sad panda
+    if (SAD_PANDA_DISPOSITION == headers["Content-Disposition"] && SAD_PANDA_TYPE == headers["Content-Type"] && SAD_PANDA_LENGTH == headers["Content-Length"]) {
+        throw EhException("Sad Panda")
+    }
+
    // Check sad panda(without panda)
-    if (body.isEmpty()) {
-        if (EhUtils.isExHentai) {
-            throw EhException("Sad Panda\n(without panda)")
-        } else {
-            throw EhException("IP banned")
-        }
+    if ("text/html; charset=UTF-8" == headers["Content-Type"] && "0" == headers["Content-Length"] && EhUtils.isExHentai) {
+        throw EhException("Sad Panda\n(without panda)")
+    }
+
+    // Check kokomade
+    if (body.contains(KOKOMADE_URL)) {
+        throw EhException("今回はここまで ${appCtx.getString(R.string.kokomade_tip)}".trimIndent())
    }

    // Check Gallery Not Available
@@ -105,7 +115,9 @@ private fun rethrowExactly(code: Int, body: String, e: Throwable): Nothing {
    }

    if (e is ParseException) {
-        if ("<" !in body) {
+        if (body.isEmpty()) {
+            throw EhException(appCtx.getString(R.string.error_empty_html))
+        } else if ("<" !in body) {
            throw EhException(body)
        } else {
            if (Settings.saveParseErrorBody) AppConfig.saveParseErrorBody(e, body)
@@ -117,27 +129,33 @@ private fun rethrowExactly(code: Int, body: String, e: Throwable): Nothing {
    throw e
 }

-val httpContentPool = DirectByteBufferPool(16, 0x20000)
+val httpContentPool = DirectByteBufferPool(16, 16384)

 suspend inline fun <T> fetchCompat(url: String, referer: String? = null, crossinline parser: (ByteBuffer) -> T): T {
    return if (isCronetSupported) {
        cronetRequest(url, referer).execute {
-            httpContentPool.useInstance { buffer ->
+            val buffer = httpContentPool.borrow()
+            try {
                awaitBodyFully {
                    buffer.put(it)
                }
                buffer.flip()
                parser(buffer)
+            } finally {
+                httpContentPool.recycle(buffer)
            }
        }
    } else {
        ehRequest(url, referer).execute {
-            httpContentPool.useInstance { buffer ->
+            val buffer = httpContentPool.borrow()
+            try {
                while (true) {
                    if (body.source().read(buffer) == -1) break
                }
                buffer.flip()
                parser(buffer)
+            } finally {
+                httpContentPool.recycle(buffer)
            }
        }
    }
@@ -151,7 +169,7 @@ private suspend inline fun <T> Request.executeAndParsingWith(block: suspend Stri
        try {
            block(body)
        } catch (e: Exception) {
-            rethrowExactly(code, body, e)
+            rethrowExactly(code, headers, body, e)
        }
    }
 }
@@ -217,7 +235,6 @@ object EhEngine {
    suspend fun getGalleryList(url: String) = ehRequest(url, EhUrl.referer)
        .executeAndParsingWith(GalleryListParser::parse)
        .apply { fillGalleryList(galleryInfoList, url, true) }
-        .takeUnless { it.galleryInfoList.isEmpty() } ?: GalleryListParser.emptyResult

    suspend fun getGalleryDetail(url: String) = ehRequest(url, EhUrl.referer).executeAndParsingWith {
        EventPaneParser.parse(this)?.let {
@@ -233,7 +250,7 @@ object EhEngine {

    suspend fun getFavorites(url: String) = ehRequest(url, EhUrl.referer)
        .executeAndParsingWith(FavoritesParser::parse)
-        .apply { fillGalleryList(galleryInfoList, url) }
+        .apply { fillGalleryList(galleryInfoList, url, false) }

    suspend fun signIn(username: String, password: String): String {
        val referer = "https://forums.e-hentai.org/index.php?act=Login&CODE=00"
@@ -357,7 +374,7 @@ object EhEngine {
                add("ddact", catStr)
                gidArray.forEach { add("modifygids[]", it.toString()) }
            }
-        }.executeAndParsingWith(FavoritesParser::parse).apply { fillGalleryList(galleryInfoList, url) }
+        }.executeAndParsingWith(FavoritesParser::parse).apply { fillGalleryList(galleryInfoList, url, false) }
    }

    suspend fun getGalleryPageApi(
@@ -475,9 +492,9 @@ object EhEngine {
            if (osc) addFormDataPart("fs_covers", "on")
            addFormDataPart("f_sfile", "File Search")
        }
-    }.executeAndParsingWith(GalleryListParser::parse).apply { fillGalleryList(galleryInfoList, EhUrl.imageSearchUrl) }
+    }.executeAndParsingWith(GalleryListParser::parse).apply { fillGalleryList(galleryInfoList, EhUrl.imageSearchUrl, true) }

-    private suspend fun fillGalleryList(list: MutableList<BaseGalleryInfo>, url: String, filter: Boolean = false) {
+    private suspend fun fillGalleryList(list: MutableList<BaseGalleryInfo>, url: String, filter: Boolean) {
        // Filter title and uploader
        if (filter) list.removeAllSuspend { EhFilter.filterTitle(it) || EhFilter.filterUploader(it) }

@@ -19,10 +19,6 @@ import android.util.Log
 import com.hippo.ehviewer.EhApplication.Companion.baseOkHttpClient
 import com.hippo.ehviewer.EhApplication.Companion.noRedirectOkHttpClient
 import com.hippo.ehviewer.EhApplication.Companion.okHttpClient
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
@@ -42,6 +38,10 @@ import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import okhttp3.executeAsync
 import okio.BufferedSource
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException

 inline fun ehRequest(url: String, referer: String? = null, origin: String? = null, builder: Request.Builder.() -> Unit = {}) = Request.Builder().url(url).apply {
    addHeader("User-Agent", CHROME_USER_AGENT)
@@ -24,8 +24,6 @@ import com.hippo.ehviewer.R
 import com.hippo.ehviewer.util.AppConfig
 import com.hippo.ehviewer.util.FileUtils
 import com.hippo.ehviewer.util.copyToFile
-import java.io.File
-import java.nio.charset.StandardCharsets
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -44,6 +42,8 @@ import okio.blackholeSink
 import okio.buffer
 import okio.source
 import splitties.init.appCtx
+import java.io.File
+import java.nio.charset.StandardCharsets

 object EhTagDatabase : CoroutineScope {
    private const val NAMESPACE_PREFIX = "n"
@@ -24,13 +24,13 @@ object EhUrl {
    const val DOMAIN_EX = "exhentai.org"
    const val DOMAIN_E = "e-hentai.org"
    const val HOST_EX = "https://$DOMAIN_EX/"
-    const val API_EX = "https://s.exhentai.org/api.php"
+    const val API_EX = HOST_EX + "api.php"
    const val FAV_PATH = "favorites.php"
    const val WATCHED_PATH = "watched"
    const val URL_UCONFIG_EX = HOST_EX + "uconfig.php"
    const val URL_MY_TAGS_EX = HOST_EX + "mytags"
    const val HOST_E = "https://$DOMAIN_E/"
-    const val API_E = "https://api.e-hentai.org/api.php"
+    const val API_E = HOST_E + "api.php"
    const val URL_UCONFIG_E = HOST_E + "uconfig.php"
    const val URL_MY_TAGS_E = HOST_E + "mytags"
    const val API_SIGN_IN = "https://forums.e-hentai.org/index.php?act=Login&CODE=01"
@@ -64,14 +64,10 @@ object EhUrl {
        }

    val apiUrl: String
-        get() = if (Settings.forceEhThumb) {
-            API_E
-        } else {
-            when (Settings.gallerySite) {
-                SITE_E -> API_E
-                SITE_EX -> API_EX
-                else -> API_E
-            }
+        get() = when (Settings.gallerySite) {
+            SITE_E -> API_E
+            SITE_EX -> API_EX
+            else -> API_E
        }

    val referer: String
@@ -25,7 +25,7 @@ import kotlinx.parcelize.Parcelize

@Parcelize
@Entity(tableName = "GALLERIES")
-data class BaseGalleryInfo(
+open class BaseGalleryInfo(
    @PrimaryKey
    @ColumnInfo(name = "GID")
    override var gid: Long = 0,
@@ -103,8 +103,7 @@ interface GalleryInfo {
            Pattern.compile(
                "[(\\[]eng(?:lish)?[)\\]]|英訳",
                Pattern.CASE_INSENSITIVE,
-            ),
-            // [(（\[]ch(?:inese)?[)）\]]|[汉漢]化|中[国國][语語]|中文|中国翻訳
+            ), // [(（\[]ch(?:inese)?[)）\]]|[汉漢]化|中[国國][语語]|中文|中国翻訳
            Pattern.compile(
                "[(\uFF08\\[]ch(?:inese)?[)\uFF09\\]]|[汉漢]化|中[国國][语語]|中文|中国翻訳",
                Pattern.CASE_INSENSITIVE,
@@ -25,9 +25,9 @@ import com.hippo.ehviewer.dao.QuickSearch
 import com.hippo.ehviewer.ui.main.AdvanceTable
 import com.hippo.ehviewer.util.encodeUTF8
 import com.hippo.ehviewer.util.toIntOrDefault
+import kotlinx.parcelize.Parcelize
 import java.io.UnsupportedEncodingException
 import java.net.URLDecoder
-import kotlinx.parcelize.Parcelize

@Parcelize
 data class ListUrlBuilder(
@@ -134,8 +134,8 @@ data class ListUrlBuilder(
    /**
     * @param query xxx=yyy&mmm=nnn
     */
+    // TODO page
    fun setQuery(query: String?) {
-        // TODO page
        reset()
        if (query.isNullOrEmpty()) {
            return
@@ -320,67 +320,66 @@ data class ListUrlBuilder(
                    // Pages
                    if (pageFrom != -1 || pageTo != -1) {
                        addQueryParameter("f_sp", "on")
-                        addQueryParameterIfNotBlank(
+                        addQueryParameter(
                            "f_spf",
-                            pageFrom.takeUnless { it == -1 }?.toString(),
+                            (if (pageFrom != -1) pageFrom.toString() else "").toString(),
                        )
-                        addQueryParameterIfNotBlank(
+                        addQueryParameter(
                            "f_spt",
-                            pageTo.takeUnless { it == -1 }?.toString(),
+                            (if (pageTo != -1) pageTo.toString() else "").toString(),
                        )
                    }
                }
            }.toString()

            MODE_UPLOADER -> {
-                buildString {
-                    append(EhUrl.host)
-                    mKeyword?.let {
-                        append("uploader/").append(encodeUTF8(it))
-                    }
-                    mPrev?.let {
-                        append("?prev=").append(it)
-                    }
-                    mNext?.let {
-                        append("?next=").append(it)
-                    }
-                    mJumpTo?.let {
-                        append("&seek=").append(it)
-                    }
+                val sb = StringBuilder(EhUrl.host)
+                mKeyword?.let {
+                    sb.append("uploader/")
+                    sb.append(encodeUTF8(it))
                }
+                mPrev?.let {
+                    sb.append("?prev=").append(it)
+                }
+                mNext?.let {
+                    sb.append("?next=").append(it)
+                }
+                mJumpTo?.let {
+                    sb.append("&seek=").append(it)
+                }
+                sb.toString()
            }

            MODE_TAG -> {
-                buildString {
-                    append(EhUrl.host)
-                    mKeyword?.let {
-                        append("tag/").append(encodeUTF8(it))
-                    }
-                    mPrev?.let {
-                        append("?prev=").append(it)
-                    }
-                    mNext?.let {
-                        append("?next=").append(it)
-                    }
-                    mJumpTo?.let {
-                        append("&seek=").append(it)
-                    }
+                val sb = StringBuilder(EhUrl.host)
+                mKeyword?.let {
+                    sb.append("tag/")
+                    sb.append(encodeUTF8(it))
                }
+                mPrev?.let {
+                    sb.append("?prev=").append(it)
+                }
+                mNext?.let {
+                    sb.append("?next=").append(it)
+                }
+                mJumpTo?.let {
+                    sb.append("&seek=").append(it)
+                }
+                sb.toString()
            }

            MODE_WHATS_HOT -> EhUrl.popularUrl
            MODE_IMAGE_SEARCH -> EhUrl.imageSearchUrl
            MODE_TOPLIST -> {
-                buildString {
-                    append(EhUrl.HOST_E)
-                    append("toplist.php?tl=")
-                    mKeyword.orEmpty().let {
-                        append(encodeUTF8(it))
-                    }
-                    mJumpTo?.let {
-                        append("&p=").append(it)
-                    }
+                val sb = StringBuilder(EhUrl.HOST_E)
+                sb.append("toplist.php?tl=")
+                mKeyword.orEmpty().let {
+                    sb.append(encodeUTF8(it))
                }
+                mJumpTo?.let {
+                    sb.append("&p=").append(it)
+                }
+                sb.toString()
            }

            else -> throw IllegalStateException("Unexpected value: $mode")
@@ -1,19 +1,18 @@
 package com.hippo.ehviewer.client.parser

-import com.hippo.ehviewer.client.exception.NotLoggedInException
+import com.hippo.ehviewer.R
+import com.hippo.ehviewer.client.exception.EhException
 import com.hippo.ehviewer.client.exception.ParseException
+import splitties.init.appCtx

 object FavoritesParser {
    suspend fun parse(body: String): Result {
        if (body.contains("This page requires you to log on.</p>")) {
-            throw NotLoggedInException()
+            throw EhException(appCtx.getString(R.string.need_sign_in))
        }
        val catArray = arrayOfNulls<String>(10)
-        val countArray = runCatching {
-            parseFav(body, catArray).also { check(it.isNotEmpty()) }
-        }.getOrElse {
-            throw ParseException("Parse favorites error", it)
-        }
+        val countArray = parseFav(body, catArray)
+        if (countArray.isEmpty()) throw ParseException("Parse favorites error")
        val result = GalleryListParser.parse(body)
        return Result(catArray.requireNoNulls(), countArray, result)
    }
@@ -41,10 +41,6 @@ import com.hippo.ehviewer.util.toFloatOrDefault
 import com.hippo.ehviewer.util.toIntOrDefault
 import com.hippo.ehviewer.util.trimAnd
 import com.hippo.ehviewer.util.unescapeXml
-import java.time.Instant
-import java.time.ZoneOffset
-import java.time.format.DateTimeFormatter
-import java.util.Locale
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
@@ -52,6 +48,10 @@ import org.jsoup.nodes.Node
 import org.jsoup.select.Elements
 import org.jsoup.select.NodeTraversor
 import org.jsoup.select.NodeVisitor
+import java.time.Instant
+import java.time.ZoneOffset
+import java.time.format.DateTimeFormatter
+import java.util.Locale

 object GalleryDetailParser {
    private val PATTERN_ERROR = Regex("<div class=\"d\">\n<p>([^<]+)</p>")
@@ -27,8 +27,6 @@ object GalleryListParser {
        }
        throw ParseException("Can't parse gallery list", it)
    }
-
-    val emptyResult = GalleryListResult(null, null, arrayListOf())
 }

 class GalleryListResult(
@@ -26,22 +26,23 @@ object GalleryPageApiParser {
    private val PATTERN_SKIP_HATH_KEY = Regex("onclick=\"return nl\\('([^)]+)'\\)")
    private val PATTERN_ORIGIN_IMAGE_URL = Regex("<a href=\"([^\"]+)fullimg.php([^\"]+)\">")

-    fun parse(body: String) = runCatching {
+    fun parse(body: String): Result {
+        runCatching { body.parseAs<Error>() }.onSuccess { throw ParseException(it.error) }
        val res = body.parseAs<JsonResult>()
        val imageUrl = PATTERN_IMAGE_URL.find(res.imageUrl)?.run {
            groupValues[1].trim().unescapeXml()
        }
-        val skipHathKey = PATTERN_SKIP_HATH_KEY.find(res.skipHathKeyAndOriginImageUrl)?.run {
+        val skipHathKey = PATTERN_SKIP_HATH_KEY.find(res.skipHathKey)?.run {
            groupValues[1].trim().unescapeXml()
        }
-        val originImageUrl = PATTERN_ORIGIN_IMAGE_URL.find(res.skipHathKeyAndOriginImageUrl)?.run {
+        val originImageUrl = PATTERN_ORIGIN_IMAGE_URL.find(res.originImageUrl)?.run {
            groupValues[1].unescapeXml() + "fullimg.php" + groupValues[2].unescapeXml()
        }
-        check(!imageUrl.isNullOrEmpty())
-        Result(imageUrl, skipHathKey, originImageUrl)
-    }.getOrElse { e ->
-        runCatching { body.parseAs<Error>() }.onSuccess { throw ParseException(it.error) }
-        throw ParseException("Parse image url and skip hath key error", e)
+        if (!imageUrl.isNullOrEmpty()) {
+            return Result(imageUrl, skipHathKey, originImageUrl)
+        } else {
+            throw ParseException("Parse image url and skip hath key error")
+        }
    }

    @Serializable
@@ -49,7 +50,9 @@ object GalleryPageApiParser {
        @SerialName("i3")
        val imageUrl: String,
        @SerialName("i6")
-        val skipHathKeyAndOriginImageUrl: String,
+        val skipHathKey: String,
+        @SerialName("i7")
+        val originImageUrl: String,
    )

    class Result(val imageUrl: String, val skipHathKey: String?, val originImageUrl: String?)
@@ -3,16 +3,14 @@ package com.hippo.ehviewer.client.parser
 import android.os.Parcelable
 import com.hippo.ehviewer.client.exception.InsufficientFundsException
 import com.hippo.ehviewer.client.exception.ParseException
-import java.nio.ByteBuffer
 import kotlinx.parcelize.Parcelize
+import java.nio.ByteBuffer

 object HomeParser {
    private val PATTERN_FUNDS = Regex("Available: ([\\d,]+) Credits.*Available: ([\\d,]+) kGP", RegexOption.DOT_MATCHES_ALL)
    private const val INSUFFICIENT_FUNDS = "Insufficient funds."

-    fun parse(body: ByteBuffer) = runCatching {
-        parseLimit(body)
-    }.getOrElse { throw ParseException("Parse image limits error", it) }
+    fun parse(body: ByteBuffer) = parseLimit(body)

    fun parseResetLimits(body: String) {
        if (body.contains(INSUFFICIENT_FUNDS)) {
@@ -1,9 +1,12 @@
@file:Suppress("BlockingMethodInNonBlockingContext")
+@file:RequiresExtension(extension = Build.VERSION_CODES.S, version = 7)

 package com.hippo.ehviewer.coil

 import android.net.Uri
+import android.os.Build
 import android.webkit.MimeTypeMap
+import androidx.annotation.RequiresExtension
 import coil.ComponentRegistry
 import coil.ImageLoader
 import coil.decode.DataSource
@@ -15,7 +18,6 @@ import coil.request.Options
 import com.hippo.ehviewer.cronet.copyToChannel
 import com.hippo.ehviewer.cronet.cronetRequest
 import com.hippo.ehviewer.cronet.execute
-import com.hippo.ehviewer.cronet.noCache
 import java.io.RandomAccessFile

 /**
@@ -28,7 +30,7 @@ class CronetHttpUriFetcher(private val data: String, private val options: Option
        val diskCache = requireNotNull(imageLoader.diskCache)
        val snapshot = diskCache.openSnapshot(diskCacheKey) ?: run {
            val success = cronetRequest(data) {
-                noCache()
+                setCacheDisabled(true)
            }.execute {
                diskCache.suspendEdit(diskCacheKey) {
                    RandomAccessFile(data.toFile(), "rw").use {
@@ -3,8 +3,6 @@ package com.hippo.ehviewer.coil
 import coil.intercept.Interceptor
 import coil.request.ImageResult
 import com.hippo.ehviewer.Settings
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
 import kotlinx.coroutines.CancellableContinuation
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
@@ -13,6 +11,8 @@ import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withContext
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException

 object MergeInterceptor : Interceptor {
    private val pendingContinuationMap: HashMap<String, MutableList<CancellableContinuation<Unit>>> = hashMapOf()
@@ -8,22 +8,29 @@ import android.net.http.UrlRequest
 import android.net.http.UrlResponseInfo
 import android.os.Build
 import androidx.annotation.RequiresExtension
+import com.hippo.ehviewer.EhApplication
 import com.hippo.ehviewer.client.CHROME_ACCEPT
 import com.hippo.ehviewer.client.CHROME_ACCEPT_LANGUAGE
 import com.hippo.ehviewer.client.CHROME_USER_AGENT
 import com.hippo.ehviewer.client.EhCookieStore
-import java.nio.ByteBuffer
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-import kotlin.coroutines.Continuation
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
+import eu.kanade.tachiyomi.util.system.logcat
+import io.ktor.utils.io.pool.DirectByteBufferPool
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okio.Path.Companion.toOkioPath
 import splitties.init.appCtx
+import java.nio.ByteBuffer
+import java.nio.channels.FileChannel
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
+import kotlin.coroutines.Continuation
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
+
+private const val TAG = "CronetRequest"
+val pool = DirectByteBufferPool(32)

 val cronetHttpClient: HttpEngine = HttpEngine.Builder(appCtx).apply {
    setEnableBrotli(true)
@@ -33,6 +40,8 @@ val cronetHttpClient: HttpEngine = HttpEngine.Builder(appCtx).apply {
    setUserAgent(CHROME_USER_AGENT)
 }.build()

+val cronetHttpClientExecutor = EhApplication.baseOkHttpClient.dispatcher.executorService
+
 class CronetRequest {
    lateinit var consumer: (ByteBuffer) -> Unit
    lateinit var onResponse: CronetRequest.(UrlResponseInfo) -> Unit
@@ -41,6 +50,7 @@ class CronetRequest {
    lateinit var readerCont: Continuation<Unit>
    val callback = object : UrlRequest.Callback {
        override fun onRedirectReceived(req: UrlRequest, info: UrlResponseInfo, url: String) {
+            logcat(tag = TAG) { "Redirected to $url" }
            req.followRedirect()
        }

@@ -76,6 +86,29 @@ inline fun cronetRequest(url: String, referer: String? = null, conf: UrlRequest.
    }.apply(conf).build()
 }

+suspend inline fun CronetRequest.awaitBodyFully(crossinline callback: (ByteBuffer) -> Unit) {
+    val buffer = pool.borrow()
+    return try {
+        suspendCancellableCoroutine { cont ->
+            consumer = {
+                callback(it)
+                buffer.clear()
+                request.read(buffer)
+            }
+            onError = { readerCont.resumeWithException(it) }
+            readerCont = cont
+            request.read(buffer)
+        }
+    } finally {
+        pool.recycle(buffer)
+    }
+}
+
+suspend inline fun CronetRequest.copyToChannel(chan: FileChannel, crossinline listener: ((Int) -> Unit) = {}) = awaitBodyFully {
+    val bytes = chan.write(it)
+    listener(bytes)
+}
+
 suspend inline fun <R> CronetRequest.execute(crossinline callback: suspend CronetRequest.(UrlResponseInfo) -> R): R {
    contract {
        callsInPlace(callback, InvocationKind.EXACTLY_ONCE)
@@ -89,6 +122,3 @@ suspend inline fun <R> CronetRequest.execute(crossinline callback: suspend Crone
        }
    }
 }
-
-fun UrlRequest.Builder.noCache(): UrlRequest.Builder = setCacheDisabled(true)
-fun UrlResponseInfo.getHeadersMap(): Map<String, List<String>> = headers.asMap
@@ -24,12 +24,11 @@ import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhCookieStore
 import com.hippo.ehviewer.client.EhEngine
 import eu.kanade.tachiyomi.util.lang.withIOContext
+import splitties.init.appCtx
 import java.time.Duration
 import java.time.Instant
 import java.time.LocalDateTime
 import java.time.temporal.ChronoUnit
-import java.util.concurrent.TimeUnit
-import splitties.init.appCtx

 private val signedIn
    get() = EhCookieStore.hasSignedIn()
@@ -67,21 +66,21 @@ private fun getDailyCheckWorkRequest(): PeriodicWorkRequest {
        .build()
    return PeriodicWorkRequestBuilder<DailyCheckWork>(Duration.ofDays(1))
        .setConstraints(constraints)
-        .setInitialDelay(initialDelay.seconds, TimeUnit.SECONDS)
+        .setInitialDelay(initialDelay)
        .build()
 }

-private const val WORK_NAME = "DailyCheckWork"
+private const val workName = "DailyCheckWork"

 fun updateDailyCheckWork(context: Context) {
    if (Settings.requestNews) {
        WorkManager.getInstance(context).enqueueUniquePeriodicWork(
-            WORK_NAME,
+            workName,
            ExistingPeriodicWorkPolicy.UPDATE,
            getDailyCheckWorkRequest(),
        )
    } else {
-        WorkManager.getInstance(context).cancelUniqueWork(WORK_NAME)
+        WorkManager.getInstance(context).cancelUniqueWork(workName)
    }
 }
Author	SHA1	Message	Date
FooIbar	97f988991e	Release 1.8.9.7 Releases / Build (push) Has been cancelled Details	2023-10-01 22:59:52 +08:00
FooIbar	0dbc3b7ea7	Merge branch '1.8.x.x' into 1.8.9.x	2023-10-01 22:59:17 +08:00
FooIbar	d58e08e24c	Release 1.8.9.6 Releases / Build (push) Has been cancelled Details	2023-09-20 19:49:48 +08:00
FooIbar	e111ec74be	Merge branch '1.8.x.x' into 1.8.9.x	2023-09-20 19:49:25 +08:00
FooIbar	2c01acb4a6	Release 1.8.9.5 Releases / Build (push) Has been cancelled Details	2023-09-10 21:20:49 +08:00
FooIbar	c0f6d0ab04	Merge branch '1.8.x.x' into 1.8.9.x # Conflicts: # app/build.gradle.kts	2023-09-10 21:20:31 +08:00
FooIbar	9746f20b60	Release 1.8.9.4 Releases / Build (push) Has been cancelled Details	2023-08-30 16:41:26 +08:00
FooIbar	501148179b	Merge branch '1.8.x.x' into 1.8.9.x	2023-08-30 16:40:48 +08:00
FooIbar	d08491bf7e	Release 1.8.9.3 Releases / Build (push) Has been cancelled Details	2023-08-17 22:54:38 +08:00
FooIbar	12f6f08d81	Merge branch '1.8.x.x' into 1.8.9.x	2023-08-17 22:53:52 +08:00
FooIbar	e2345cc756	Release 1.8.9.2 Releases / Build (push) Has been cancelled Details	2023-08-15 17:48:26 +08:00
FooIbar	8d0b8534b2	Merge branch '1.8.x.x' into 1.8.9.x	2023-08-15 17:48:11 +08:00
FooIbar	63f9c8de79	Release 1.8.9.1 Releases / Build (push) Has been cancelled Details	2023-08-14 23:17:22 +08:00
FooIbar	f792f2c968	Merge branch '1.8.x.x' into 1.8.9.x	2023-08-14 23:16:13 +08:00
FooIbar	4e916731b3	Release 1.8.9.0 Releases / Build (push) Has been cancelled Details	2023-08-11 14:29:52 +08:00
FooIbar	6c24407fb7	Update releases.yml	2023-08-11 14:29:52 +08:00