Release 1.8.9.6-gms

Merge branch '1.8.x.x' into 1.8.9.x-gms
Refine AppUpdater for the gms variant
2023-09-20 19:51:04 +08:00 · 2023-09-20 19:50:40 +08:00 · 2023-09-15 12:40:02 +08:00 · 2023-09-10 21:22:18 +08:00 · 2023-09-10 21:21:59 +08:00 · 2023-08-30 16:43:42 +08:00
390 changed files with 1362 additions and 1999 deletions
@@ -1,3 +0,0 @@
-[*.{kt,kts}]
-ktlint_code_style = intellij_idea
-ktlint_function_naming_ignore_when_annotated_with = Composable
@@ -6,10 +6,10 @@ body:
  - type: markdown
    attributes:
      value: |
-        感谢您愿意为 EhViewer 做出贡献！
+        感谢您愿意为 Ehviewer-Overhauled 做出贡献！
        提交问题报告前，还请首先完成文末的自查步骤

-        Thanks for your contribution on EhViewer Project!
+        Thanks for your contribution on Ehviewer-Overhauled Project!
        Please finish verify steps which list in the end first before create bug report

  - type: textarea
@@ -141,5 +141,5 @@ body:
      - label: 您确保这个 Issue 只提及一个问题。如果您有多个问题报告，烦请发起多个 Issue / Ensure there is only one bug report in this issue. Please make mutiply issue for mutiply bugs
        required: true

-      - label: 您确保已使用最新 [CI 版本](https://github.com/FooIbar/EhViewer/actions)测试，并且该问题在最新 CI 版本中并未解决 / This bug have not solved in latest [CI version](https://github.com/FooIbar/EhViewer/actions)
+      - label: 您确保已使用最新 CI 版本测试，并且该问题在最新 CI 版本中并未解决 / This bug have not solved in latest CI version
        required: true
@@ -4,9 +4,8 @@ on:
  push:
    branches:
      - '*'
-      - 'renovate/**'
-  pull_request:
-  workflow_dispatch:
+    tags-ignore:
+      - "*"

 jobs:
  linux:
@@ -14,24 +13,23 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
        with:
          submodules: 'recursive'

-      - name: Setup Java 21
+      - name: Setup Java 17
        uses: actions/setup-java@v3
        with:
          distribution: temurin
-          java-version: 21
+          java-version: 17
+
+      - name: Install NDK
+        run: |
+          echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;26.0.10636728" --channel=1 --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null

      - name: Install Rust Toolchain
        run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android && rustup component add rustfmt clippy

-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: "./app/src/main/rust"
-
      - name: Rustfmt Check
        working-directory: ./app/src/main/rust
        run: cargo fmt --all -- --check
@@ -40,178 +38,42 @@ jobs:
        working-directory: ./app/src/main/rust
        run: cargo clippy --all-targets --all-features -- -D warnings

-      - name: Setup Gradle
+      - name: Ktlint Check
+        run: ./gradlew ktlintCheck
+
+      - name: Gradle Build
        uses: gradle/gradle-build-action@v2
        with:
          gradle-home-cache-cleanup: true
+          arguments: assembleRelease

-      - 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-${{ github.run_id }}
-          restore-keys: ${{ runner.os }}-cmake-
-
-      - name: Build OSS
-        run: ./gradlew assembleDefaultOssRelease
-
-      - 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
@@ -0,0 +1,66 @@
+name: Pull Request Check
+
+on: [ pull_request ]
+
+jobs:
+  linux:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+        with:
+          submodules: 'recursive'
+
+      - name: Setup Java 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 17
+
+      - name: Install NDK
+        run: |
+          echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;26.0.10636728" --channel=1 --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
+
+      - name: Install Rust Toolchain
+        run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android && rustup component add rustfmt clippy
+
+      - name: Rustfmt Check
+        working-directory: ./app/src/main/rust
+        run: cargo fmt --all -- --check
+
+      - name: Clippy Check
+        working-directory: ./app/src/main/rust
+        run: cargo clippy --all-targets --all-features -- -D warnings
+
+      - name: Ktlint Check
+        run: ./gradlew ktlintCheck
+
+      - name: Gradle Build
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: assembleRelease
+
+      - name: Update ARM64
+        uses: actions/upload-artifact@v3
+        with:
+          name: arm64-v8a-${{ github.sha }}
+          path: app/build/outputs/apk/release/app-arm64-v8a-release.apk
+
+      - name: Update x86_64
+        uses: actions/upload-artifact@v3
+        with:
+          name: x86_64-${{ github.sha }}
+          path: app/build/outputs/apk/release/app-x86_64-release.apk
+
+      - name: Update ARM32
+        uses: actions/upload-artifact@v3
+        with:
+          name: armeabi-v7a-${{ github.sha }}
+          path: app/build/outputs/apk/release/app-armeabi-v7a-release.apk
+
+      - name: Update x86
+        uses: actions/upload-artifact@v3
+        with:
+          name: x86-${{ github.sha }}
+          path: app/build/outputs/apk/release/app-x86-release.apk
@@ -11,33 +11,23 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
        with:
          submodules: 'recursive'

-      - name: Setup Java 21
+      - name: Setup Java 17
        uses: actions/setup-java@v3
        with:
          distribution: temurin
-          java-version: 21
+          java-version: 17
+
+      - name: Install NDK
+        run: |
+          echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;26.0.10636728" --channel=1 --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null

      - name: Install Rust Toolchain
        run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android

-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: "./app/src/main/rust"
-
-      - name: CMake Cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            app/.cxx
-            app/src/main/cpp/nettle/nettle
-          key: ${{ runner.os }}-cmake-${{ github.run_id }}
-          restore-keys: ${{ runner.os }}-cmake-
-
      - name: Gradle Build
        uses: gradle/gradle-build-action@v2
        with:
@@ -45,71 +35,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
@@ -0,0 +1,3 @@
+[submodule "app/src/main/cpp/nettle/nettle"]
+	path = app/src/main/cpp/nettle/nettle
+	url = https://github.com/Ehviewer-Overhauled/nettle
@@ -5,60 +5,60 @@ The project is in maintenance mode, will only receive bugfixes.
 <p align="right">
  <strong>English</strong>
  <span> | </span>
-  <a href="https://github.com/FooIbar/EhViewer/blob/1.8.x.x/docs/README/zh-cn.md">
+  <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/blob/1.8.x.x/docs/README/zh-cn.md">
  简体中文
  </a>
  <span> | </span>
-  <a href="https://github.com/FooIbar/EhViewer/blob/1.8.x.x/docs/README/zh-tw.md">
+  <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/blob/1.8.x.x/docs/README/zh-tw.md">
  正體中文
  </a>
 </p>

 <h1 align="center">
-  <img src="https://github.com/Ehviewer-Overhauled/Art/blob/master/launcher_icon-web.svg" width="200" alt="EhViewer">
+  <img src="https://github.com/Ehviewer-Overhauled/Art/blob/master/launcher_icon-web.svg" width="200">
  <br>EhViewer<br>
 </h1>

 <p align="center">
-  <a href="https://github.com/FooIbar/EhViewer/actions/workflows/ci.yml">
-    <img src="https://github.com/FooIbar/EhViewer/actions/workflows/ci.yml/badge.svg" alt="Github Actions">
+  <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/actions/workflows/ci.yml">
+    <img src="https://github.com/Ehviewer-Overhauled/Ehviewer/actions/workflows/ci.yml/badge.svg" alt="Github Actions">
  </a>
-  <a href="https://github.com/FooIbar/EhViewer/blob/1.8.x.x/LICENSE">
-    <img src="https://img.shields.io/github/license/FooIbar/EhViewer" alt="LICENSE">
+  <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/blob/1.8.x.x/LICENSE">
+    <img src="https://img.shields.io/github/license/Ehviewer-Overhauled/Ehviewer" alt="LICENSE">
  </a>
-  <a href="https://www.codefactor.io/repository/github/FooIbar/EhViewer">
-    <img src="https://www.codefactor.io/repository/github/FooIbar/EhViewer/badge" alt="CodeFactor">
+  <a href="https://www.codefactor.io/repository/github/Ehviewer-Overhauled/ehviewer">
+    <img src="https://www.codefactor.io/repository/github/Ehviewer-Overhauled/ehviewer/badge" alt="CodeFactor">
  </a>
-  <a href="https://github.com/FooIbar/EhViewer/releases">
-    <img src="https://img.shields.io/github/downloads/FooIbar/EhViewer/total.svg" alt="Downloads">
+  <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/releases">
+    <img src="https://img.shields.io/github/downloads/Ehviewer-Overhauled/EhViewer/total.svg" alt="Downloads">
  </a>
-  <a href="https://github.com/FooIbar/EhViewer/releases">
-    <img src="https://img.shields.io/github/v/release/FooIbar/EhViewer" alt="Release">
+  <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/releases">
+    <img src="https://img.shields.io/github/v/release/Ehviewer-Overhauled/ehviewer?include_prereleases" alt="Release">
  </a>
-  <a href="https://github.com/FooIbar/EhViewer/issues">
-    <img src="https://img.shields.io/github/issues/FooIbar/EhViewer" alt="Issues">
+  <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/issues">
+    <img src="https://img.shields.io/github/issues/Ehviewer-Overhauled/ehviewer" alt="Issues">
  </a>
 </p>

 <div align="center">
  <h3>
-    <a href="https://github.com/FooIbar/EhViewer#description">
+    <a href="https://github.com/Ehviewer-Overhauled/Ehviewer#description">
    Description
    </a>
    <span> | </span>
-    <a href="https://github.com/FooIbar/EhViewer#download">
+    <a href="https://github.com/Ehviewer-Overhauled/Ehviewer#download">
    Download
    </a>
    <span> | </span>
-    <a href="https://github.com/FooIbar/EhViewer#screenshot">
+    <a href="https://github.com/Ehviewer-Overhauled/Ehviewer#screenshot">
    Screenshot
    </a>
    <span> | </span>
-    <a href="https://github.com/FooIbar/EhViewer#thanks">
+    <a href="https://github.com/Ehviewer-Overhauled/Ehviewer#thanks">
    Thanks
    </a>
    <span> | </span>
-    <a href="https://github.com/FooIbar/EhViewer#license">
+    <a href="https://github.com/Ehviewer-Overhauled/Ehviewer#license">
    License
    </a>
  </h3>
@@ -73,20 +73,7 @@ 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>
+<a href="https://github.com/Ehviewer-Overhauled/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> <a href="https://github.com/Ehviewer-Overhauled/fdroid-repo"><img alt="Get it on F-Droid" src="https://github.com/Ehviewer-Overhauled/Art/blob/master/get-it-on-fdroid.svg" width="200px"/></a>

 # Screenshot

@@ -116,7 +103,6 @@ Specially thanks [Tachiyomi](https://tachiyomi.org/) for its reader implementati
    Copyright 2014-2019 Hippo Seven
    Copyright 2020-2022 NekoInverter
    Copyright 2022-2023 Tarsin Norbin
-    Copyright 2023 Foolbar

    EhViewer is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.

@@ -8,21 +8,20 @@ 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.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.10636728"

    splits {
        abi {
@@ -32,7 +31,7 @@ android {
                include("arm64-v8a", "x86_64", "armeabi-v7a", "x86")
                isUniversalApk = true
            } else {
-                include("arm64-v8a", "x86_64")
+                include("arm64-v8a")
            }
        }
    }
@@ -46,6 +45,10 @@ android {
        enableV4Signing = true
    }

+    val branch = providers.exec {
+        commandLine = "git branch --show-current".split(' ')
+    }.standardOutput.asText.get().trim()
+
    val commitSha = providers.exec {
        commandLine = "git rev-parse --short=7 HEAD".split(' ')
    }.standardOutput.asText.get().trim()
@@ -64,8 +67,8 @@ android {
        applicationId = "moe.tarsin.ehviewer"
        minSdk = 28
        targetSdk = 34
-        versionCode = 180044
-        versionName = "1.8.10.1"
+        versionCode = 180043
+        versionName = "1.8.9.6-gms"
        resourceConfigurations.addAll(
            listOf(
                "zh",
@@ -82,44 +85,10 @@ android {
                "nb-rNO",
            ),
        )
+        buildConfigField("String", "BRANCH", "\"$branch\"")
        buildConfigField("String", "COMMIT_SHA", "\"$commitSha\"")
+        buildConfigField("String", "BUILD_TIME", "\"$buildTime\"")
        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 +97,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",
@@ -175,11 +151,9 @@ android {
            isShrinkResources = true
            proguardFiles("proguard-rules.pro")
            signingConfig = signConfig
-            buildConfigField("String", "BUILD_TIME", "\"$buildTime\"")
        }
        debug {
            applicationIdSuffix = ".debug"
-            buildConfigField("String", "BUILD_TIME", "\"\"")
        }
    }

@@ -190,7 +164,7 @@ android {
    }

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

    namespace = "com.hippo.ehviewer"
@@ -198,85 +172,105 @@ 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-beta01")
+    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-alpha04")
    // 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 nav_version = "2.7.2"
+    implementation("androidx.navigation:navigation-fragment-ktx:$nav_version")
+    implementation("androidx.navigation:navigation-ui-ktx:$nav_version")
+    implementation("androidx.navigation:navigation-compose:$nav_version")

    // 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_version = "2.6.0-beta01"
+    ksp("androidx.room:room-compiler:$room_version")
+    implementation("androidx.room:room-paging:$room_version")

-    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_version = "0.32.0"
+    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-alpha02")

-    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.8.3")

-    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)
+    implementation("org.chromium.net:cronet-api:113.5672.61")
+    implementation("com.google.android.gms:play-services-cronet:18.0.1")

-    implementation(libs.kotlinx.coroutines.android)
-    implementation(libs.jsoup)
+    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")

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

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

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

 ksp {
@@ -302,25 +296,12 @@ aboutLibraries {
 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)
-    }
-    kotlinGradle {
-        ktlint(ktlintVersion)
-    }
-}
-
 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,12 +0,0 @@
-package com.hippo.ehviewer.util
-
-import com.google.android.gms.net.CronetProviderInstaller
-import com.hippo.ehviewer.Settings
-import splitties.init.appCtx
-
-val isCronetSupported: Boolean
-    get() = Settings.enableCronet && CronetProviderInstaller.isInstalled().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" />
@@ -0,0 +1,34 @@
+From 2bda36800a5424c44378bbc0cc8bb5d26a0f34fa Mon Sep 17 00:00:00 2001
+From: tarsin <yuanqingxiang233@163.com>
+Date: Sat, 22 Jul 2023 08:30:20 +0800
+Subject: [PATCH] Don't build other binarys
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 55cd358..52b57aa 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -962,7 +962,7 @@ check_symbol_exists(getopt_long getopt.h HAVE_GETOPT_LONG)
+ # xzdec
+ #############################################################################
+ 
+-if(HAVE_GETOPT_LONG AND HAVE_DECODERS)
+if(0)
+     add_executable(xzdec
+         src/common/sysdefs.h
+         src/common/tuklib_common.h
+@@ -1008,7 +1008,7 @@ endif()
+ # xz
+ #############################################################################
+ 
+-if(NOT MSVC AND HAVE_GETOPT_LONG)
+if(0)
+     add_executable(xz
+         src/common/mythread.h
+         src/common/sysdefs.h
+-- 
+2.41.0
+
@@ -0,0 +1,29 @@
+From 57da49f9b0ed8538573f6cfe289f835ee0078eec Mon Sep 17 00:00:00 2001
+From: tarsin <yuanqingxiang233@163.com>
+Date: Sat, 22 Jul 2023 17:50:08 +0800
+Subject: [PATCH] Hide symbols
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 646484b7..67a71272 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -2060,10 +2060,10 @@ SET(OLD_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
+ SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fvisibility=hidden -Werror")
+ CHECK_C_SOURCE_COMPILES("void __attribute__((visibility(\"default\"))) foo(void);
+ int main() { return 0; }" HAVE_VISIBILITY_ATTR)
+-IF (HAVE_VISIBILITY_ATTR)
+IF (0)
+   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
+   ADD_DEFINITIONS(-D__LIBARCHIVE_ENABLE_VISIBILITY)
+-ENDIF(HAVE_VISIBILITY_ATTR)
+ENDIF(0)
+ SET(CMAKE_REQUIRED_FLAGS "${OLD_CMAKE_REQUIRED_FLAGS}")
+ 
+ # Generate "config.h" from "build/cmake/config.h.in"
+-- 
+2.41.0
+
@@ -0,0 +1,25 @@
+From c9298fd6dc0a8b04dd4b2247118b9cb895c46e58 Mon Sep 17 00:00:00 2001
+From: tarsin <yuanqingxiang233@163.com>
+Date: Sat, 23 Jul 2022 16:05:36 +0800
+Subject: [PATCH 2/2] Insert link libs
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 713e3bc5..7247640d 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -415,7 +415,7 @@ IF(DEFINED __GNUWIN32PATH AND EXISTS "${__GNUWIN32PATH}")
+   # #  endif
+ ENDIF(DEFINED __GNUWIN32PATH AND EXISTS "${__GNUWIN32PATH}")
+ 
+-SET(ADDITIONAL_LIBS "")
+SET(ADDITIONAL_LIBS ${LIBARCHIVE_CUSTOM_LIBS})
+ #
+ # Find ZLIB
+ #
+-- 
+2.39.2
+
@@ -23,21 +23,15 @@ set(FETCHCONTENT_BASE_DIR ${deps})
 set(BUILD_TESTING 0)

 FetchContent_Declare(liblzma
-        GIT_REPOSITORY https://github.com/FooIbar/xz.git
-        GIT_TAG v5.4.4
+        GIT_REPOSITORY https://git.tukaani.org/xz.git
+        GIT_TAG v5.4.3
+        PATCH_COMMAND git apply ${CMAKE_CURRENT_LIST_DIR}/0001-Don-t-build-other-binarys.patch || cd .
        )

 FetchContent_MakeAvailable(liblzma)
 include_directories(${liblzma_SOURCE_DIR}/src/liblzma/api)

 # Build GNUTLS libnettle
-FetchContent_Declare(nettle
-        URL https://ftp.gnu.org/gnu/nettle/nettle-3.9.1.tar.gz
-        URL_MD5 29fcd2dec6bf5b48e5e3ffb3cbc4779e
-        SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/nettle/nettle
-        )
-
-FetchContent_MakeAvailable(nettle)
 add_subdirectory(nettle)

 # Configure libnettle support for libarchive
@@ -68,8 +62,9 @@ option(ENABLE_TEST OFF)
 SET(LIBARCHIVE_CUSTOM_LIBS "nettle" "liblzma")

 FetchContent_Declare(libarchive
-        GIT_REPOSITORY https://github.com/FooIbar/libarchive.git
-        GIT_TAG v3.7.2
+        GIT_REPOSITORY https://github.com/libarchive/libarchive
+        GIT_TAG v3.7.0
+        PATCH_COMMAND git apply ${CMAKE_CURRENT_LIST_DIR}/0001-Hide-symbols.patch ${CMAKE_CURRENT_LIST_DIR}/0002-Insert-link-libs.patch || cd .
        )

 FetchContent_MakeAvailable(libarchive)
@@ -78,5 +73,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);
 }
@@ -1 +0,0 @@
-/nettle
@@ -32,6 +32,7 @@ set(LIBNETTLE_SOURCES
        nettle/aes256-meta.c
        nettle/nist-keywrap.c
        nettle/arcfour.c
+        nettle/arcfour-crypt.c
        nettle/arctwo.c
        nettle/arctwo-meta.c
        nettle/blowfish.c
@@ -176,7 +177,7 @@ set(LIBNETTLE_SOURCES
        nettle/sha1-compress.c
        nettle/sha1-meta.c
        nettle/sha256.c
-        nettle/sha256-compress-n.c
+        nettle/sha256-compress.c
        nettle/sha224-meta.c
        nettle/sha256-meta.c
        nettle/sha512.c
@@ -4,19 +4,13 @@
 /* Define if building universal (internal helper macro) */
 /* #undef AC_APPLE_UNIVERSAL_BUILD */

-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-/* #undef CRAY_STACKSEG_END */
-
-/* Define to 1 if using `alloca.c'. */
+/* Define to 1 if using 'alloca.c'. */
 /* #undef C_ALLOCA */

-/* Define to 1 if you have `alloca', as a function or macro. */
+/* Define to 1 if you have 'alloca', as a function or macro. */
 #define HAVE_ALLOCA 1

-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
+/* Define to 1 if <alloca.h> works. */
 #define HAVE_ALLOCA_H 1

 /* Define if __builtin_bswap64 is available */
@@ -52,9 +46,6 @@
 /* Define to 1 if you have the <malloc.h> header file. */
 #define HAVE_MALLOC_H 1

-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
 /* Define to 1 each of the following for which a native (ie. CPU specific)
    implementation of the corresponding routine exists.  */
 /* #undef HAVE_NATIVE_memxor3 */
@@ -80,7 +71,7 @@
 /* #undef HAVE_NATIVE_cbc_aes256_encrypt */
 /* #undef HAVE_NATIVE_chacha_core */
 /* #undef HAVE_NATIVE_chacha_2core */
-#define HAVE_NATIVE_chacha_3core 1
+/* #undef HAVE_NATIVE_chacha_3core */
 /* #undef HAVE_NATIVE_chacha_4core */
 /* #undef HAVE_NATIVE_fat_chacha_2core */
 /* #undef HAVE_NATIVE_fat_chacha_3core */
@@ -97,18 +88,13 @@
 /* #undef HAVE_NATIVE_ecc_secp384r1_redc */
 /* #undef HAVE_NATIVE_ecc_secp521r1_modp */
 /* #undef HAVE_NATIVE_ecc_secp521r1_redc */
-/* #undef HAVE_NATIVE_poly1305_set_key */
-/* #undef HAVE_NATIVE_poly1305_block */
-/* #undef HAVE_NATIVE_poly1305_digest */
-/* #undef HAVE_NATIVE_poly1305_blocks */
-/* #undef HAVE_NATIVE_fat_poly1305_blocks */
 /* #undef HAVE_NATIVE_ghash_set_key */
 /* #undef HAVE_NATIVE_ghash_update */
 /* #undef HAVE_NATIVE_salsa20_core */
-#define HAVE_NATIVE_salsa20_2core 1
+/* #undef HAVE_NATIVE_salsa20_2core */
 /* #undef HAVE_NATIVE_fat_salsa20_2core */
 /* #undef HAVE_NATIVE_sha1_compress */
-/* #undef HAVE_NATIVE_sha256_compress_n */
+/* #undef HAVE_NATIVE_sha256_compress */
 /* #undef HAVE_NATIVE_sha512_compress */
 /* #undef HAVE_NATIVE_sha3_permute */
 /* #undef HAVE_NATIVE_umac_nh */
@@ -121,11 +107,14 @@
 /* #undef HAVE_OPENSSL_EVP_H */

 /* Define to 1 if you have the `secure_getenv' function. */
-#define HAVE_SECURE_GETENV 1
+/* #undef HAVE_SECURE_GETENV */

 /* Define to 1 if you have the <stdint.h> header file. */
 #define HAVE_STDINT_H 1

+/* Define to 1 if you have the <stdio.h> header file. */
+#define HAVE_STDIO_H 1
+
 /* Define to 1 if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H 1

@@ -141,6 +130,9 @@
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1

+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
 /* Define to 1 if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H 1

@@ -157,7 +149,7 @@
 #define PACKAGE_NAME "nettle"

 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "nettle 3.9.1"
+#define PACKAGE_STRING "nettle 3.8.1"

 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "nettle"
@@ -166,7 +158,7 @@
 #define PACKAGE_URL ""

 /* Define to the version of this package. */
-#define PACKAGE_VERSION "3.9.1"
+#define PACKAGE_VERSION "3.8.1"

 /* The size of `long', as computed by sizeof. */
 #define SIZEOF_LONG __SIZEOF_LONG__
@@ -182,10 +174,13 @@
 	STACK_DIRECTION = 0 => direction of growth unknown */
 /* #undef STACK_DIRECTION */

-/* Define to 1 if you have the ANSI C header files. */
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
 #define STDC_HEADERS 1

-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. This
+   macro is obsolete. */
 #define TIME_WITH_SYS_TIME 1

 /* Defined if public key features are enabled */
@@ -41,7 +41,7 @@ extern "C" {

 /* Individual version numbers in decimal */
 #define NETTLE_VERSION_MAJOR 3
-#define NETTLE_VERSION_MINOR 9
+#define NETTLE_VERSION_MINOR 8

 #define NETTLE_USE_MINI_GMP 0

@@ -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)
@@ -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

@@ -25,6 +25,7 @@ import androidx.lifecycle.coroutineScope
 import coil.ImageLoaderFactory
 import coil.decode.ImageDecoderDecoder
 import coil.util.DebugLogger
+import com.google.android.gms.net.CronetProviderInstaller
 import com.hippo.ehviewer.client.EhCookieStore
 import com.hippo.ehviewer.client.EhTagDatabase
 import com.hippo.ehviewer.client.data.GalleryDetail
@@ -47,11 +48,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 +66,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 +78,16 @@ class EhApplication : Application(), ImageLoaderFactory {
            handler?.uncaughtException(t, e)
        }
        super.onCreate()
-        if (isAtLeastP) {
-            System.loadLibrary("ehviewer")
-        }
+        CronetProviderInstaller.installProvider(appCtx)
+        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 +152,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)
@@ -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>) {
@@ -61,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
@@ -74,20 +75,30 @@ 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
@@ -104,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)
@@ -156,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)
        }
    }
 }
@@ -222,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 {
@@ -238,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"
@@ -362,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(
@@ -480,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) }

@@ -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"
@@ -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,
@@ -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
@@ -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)
    }
@@ -27,8 +27,6 @@ object GalleryListParser {
        }
        throw ParseException("Can't parse gallery list", it)
    }
-
-    val emptyResult = GalleryListResult(null, null, arrayListOf())
 }

 class GalleryListResult(
@@ -26,7 +26,8 @@ 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()
@@ -37,11 +38,11 @@ object GalleryPageApiParser {
        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
@@ -10,9 +10,7 @@ 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)) {
@@ -15,7 +15,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 +27,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()
+                disableCache()
            }.execute {
                diskCache.suspendEdit(diskCacheKey) {
                    RandomAccessFile(data.toFile(), "rw").use {
@@ -115,6 +115,3 @@ suspend inline fun <R> CronetRequest.execute(crossinline callback: suspend Crone
        }
    }
 }
-
-fun UrlRequest.Builder.noCache(): UrlRequest.Builder = disableCache()
-fun UrlResponseInfo.getHeadersMap(): Map<String, List<String>> = allHeaders
@@ -29,7 +29,6 @@ import java.time.Duration
 import java.time.Instant
 import java.time.LocalDateTime
 import java.time.temporal.ChronoUnit
-import java.util.concurrent.TimeUnit

 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	13f255529b	Release 1.8.9.6-gms Releases / Build (push) Has been cancelled Details	2023-09-20 19:51:04 +08:00
FooIbar	16e912c9ae	Merge branch '1.8.x.x' into 1.8.9.x-gms	2023-09-20 19:50:40 +08:00
FooIbar	01742ac6b9	Refine AppUpdater for the gms variant	2023-09-15 12:40:02 +08:00
FooIbar	e94424a83e	Release 1.8.9.5-gms Releases / Build (push) Has been cancelled Details	2023-09-10 21:22:18 +08:00
FooIbar	56d30aa413	Merge branch '1.8.x.x' into 1.8.9.x-gms # Conflicts: # app/build.gradle.kts	2023-09-10 21:21:59 +08:00
FooIbar	a6d215a0bf	Release 1.8.9.4-gms Releases / Build (push) Has been cancelled Details	2023-08-30 16:43:42 +08:00
FooIbar	cf9441adb5	Merge branch '1.8.x.x' into 1.8.9.x-gms # Conflicts: # app/build.gradle.kts	2023-08-30 16:43:28 +08:00
FooIbar	36b16d7be8	Release 1.8.9.3-gms Releases / Build (push) Has been cancelled Details	2023-08-17 23:00:54 +08:00
FooIbar	fab5532407	Revert "Remove embedded Cronet library" This reverts commit `9c5eddb9`	2023-08-17 23:00:08 +08:00
FooIbar	8ad4e8640f	Merge branch '1.8.x.x' into 1.8.9.x-gms # Conflicts: # app/build.gradle.kts # app/src/main/java/com/hippo/ehviewer/util/CronetUtils.kt	2023-08-17 22:59:37 +08:00
FooIbar	5b5a2a9a33	Release 1.8.9.2-gms Releases / Build (push) Has been cancelled Details	2023-08-15 17:49:53 +08:00
FooIbar	7719312355	Merge branch '1.8.x.x' into 1.8.9.x-gms	2023-08-15 17:49:46 +08:00
FooIbar	48f1b0a958	Release 1.8.9.1-gms Releases / Build (push) Has been cancelled Details	2023-08-14 23:18:57 +08:00
FooIbar	9abeba6b15	Merge branch '1.8.x.x' into 1.8.9.x-gms	2023-08-14 23:18:34 +08:00
FooIbar	75bec4314e	Release 1.8.9.0-gms Releases / Build (push) Has been cancelled Details	2023-08-11 16:03:44 +08:00
FooIbar	b767c041b9	Load Cronet from Google Play services	2023-08-11 15:56:21 +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