Release 1.8.11.0

Always enable gestures if drawer is open
Fix #154 regression (#158 )
2023-10-31 12:49:53 +08:00 · 2023-10-31 11:58:13 +08:00 · 2023-10-31 03:45:25 +00:00 · 2023-10-31 11:34:14 +08:00 · 2023-10-30 23:02:14 +00:00 · 2023-10-31 03:25:25 +08:00
448 changed files with 3696 additions and 3984 deletions
@@ -0,0 +1,4 @@
+[*.{kt,kts}]
+ij_kotlin_imports_layout = *
+ktlint_code_style = intellij_idea
+ktlint_function_naming_ignore_when_annotated_with = Composable
@@ -6,10 +6,10 @@ body:
  - type: markdown
    attributes:
      value: |
-        感谢您愿意为 Ehviewer-Overhauled 做出贡献！
+        感谢您愿意为 EhViewer 做出贡献！
        提交问题报告前，还请首先完成文末的自查步骤

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

  - type: textarea
@@ -64,7 +64,7 @@ body:
      description: 您可以通过设置-高级-导出日志来获得日志文件 / You can get logs file in Settings - Advanced - Dump logcat
      placeholder: 06-15 17:44:53.704 23382 23382 E ...
    validations:
-      required: false
+      required: true

  - type: textarea
    id: more
@@ -79,6 +79,15 @@ body:
    validations:
      required: false

+  - type: input
+    id: site
+    attributes:
+      label: 浏览站点 / Browsing site
+      description: E-Hentai / ExHentai
+      placeholder: E-Hentai
+    validations:
+      required: true
+
  - type: input
    id: version
    attributes:
@@ -135,14 +144,11 @@ body:
      - label: 如果您有足够的时间和能力，并愿意为此提交 PR ，请勾上此复选框 / Pull request is welcome. Check this if you want to start a pull request
        required: false

-      - label: 您已仔细查看并知情 [Q&A](https://github.com/Ehviewer-Overhauled/Ehviewer/issues/61) 中的内容 / You have checked [Q&A](https://github.com/Ehviewer-Overhauled/Ehviewer/issues/61) carefully
-        required: true
-
-      - label: 您已搜索过 [Issue Tracker](https://github.com/Ehviewer-Overhauled/Ehviewer/issues)，没有找到类似内容 / I have searched on [Issue Tracker](https://github.com/Ehviewer-Overhauled/Ehviewer/issues), No duplicate or related open issue has been found
+      - label: 您已搜索过 [Issue Tracker](https://github.com/FooIbar/EhViewer/issues)，没有找到类似内容 / I have searched on [Issue Tracker](https://github.com/FooIbar/EhViewer/issues), No duplicate or related open issue has been found
        required: true

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

-      - label: 您确保已使用最新 CI 版本测试，并且该问题在最新 CI 版本中并未解决 / This bug have not solved in latest CI version
+      - label: 您确保已使用最新 [CI 版本](https://github.com/FooIbar/EhViewer/actions)测试，并且该问题在最新 CI 版本中并未解决 / This bug have not solved in latest [CI version](https://github.com/FooIbar/EhViewer/actions)
        required: true
@@ -1,5 +1 @@
-blank_issues_enabled: false
-contact_links:
- - name: 所有其他问题 / All other questions
-   url: https://github.com/Ehviewer-Overhauled/Ehviewer/discussions
-   about: 转到 Discussions / Turn to discussions
+blank_issues_enabled: false
@@ -1,94 +0,0 @@
-name: 功能请求 / Feature request
-description: 提出一个功能建议 / Suggest an idea
-labels:
-  - "enhancement"
-body:
-  - type: markdown
-    attributes:
-      value: |
-        感谢您愿意为 Ehviewer-Overhauled 做出贡献！
-        提交功能建议前，还请首先完成文末的自查步骤
-
-        Thanks for your contribution on Ehviewer-Overhauled Project!
-        Please finish verify steps which list in the end first before suggest an idea
-
-  - type: textarea
-    id: request
-    attributes:
-      label: 需求 / Requirement
-      description: |
-        在此处描述您的需求。这通常会是一个您想要的功能
-        Ddescribe what you need here.
-      placeholder: |
-          我需要 XXX 功能 ...
-          I want ABC feature ...
-    validations:
-      required: true
-
-  - type: textarea
-    id: impl
-    attributes:
-      label: 建议实现 / Suggested implements
-      description: |
-        在此处表述您建议的实现方式。如有可能，UI 类功能请求还请尽量附上图示
-        Describe your suggested implements here, It's recommend to add a photo if you are making a UI feature request.
-      placeholder: |
-          建议在 XX 处添加 XX ...
-          I recommend add ABC feature to DEF...
-          图片（如果有）/ Photos (if exists)
-    validations:
-      required: true
-
-  - type: textarea
-    id: more
-    attributes:
-      label: 备注 / Addition details
-      description: |
-        在此处写下其他您想说的内容
-        Describe addition details here
-      placeholder: |
-        其他有用的信息与附件
-        Additional details and attachments
-    validations:
-      required: false
-
-  - type: input
-    id: version
-    attributes:
-      label: EhViewer 版本号 / EhViewer version code
-      description: 您可以在设置 - 关于处找到版本号 / You can get version code in Settings - About
-      placeholder: 1.6.9.13
-    validations:
-      required: true
-
-  - type: input
-    id: ci
-    attributes:
-      label: EhViewer CI 版本 / EhViewer CI Version
-      description: 位于设置 - 关于中的版本号后 / Next to the version code in Settings - About
-      placeholder: 26f05a0
-    validations:
-      required: true
-
-  - type: checkboxes
-    id: check
-    attributes:
-      label: 自查步骤 / Verify steps
-      description: |
-        请确认您已经遵守所有必选项
-        Please ensure you have obtained all needed options
-      options:
-      - label: 如果您有足够的时间和能力，并愿意为此提交 PR ，请勾上此复选框 / Pull request is welcome. Check this if you want to start a pull request
-        required: false
-
-      - label: 您已仔细查看并知情 [Q&A](https://github.com/Ehviewer-Overhauled/Ehviewer/issues/61) 中的内容 / You have checked [Q&A](https://github.com/Ehviewer-Overhauled/Ehviewer/issues/61) carefully
-        required: true
-
-      - label: 您已搜索过 [Issue Tracker](https://github.com/Ehviewer-Overhauled/Ehviewer/issues)，没有找到类似内容 / I have searched on [Issue Tracker](https://github.com/Ehviewer-Overhauled/Ehviewer/issues), No duplicate or related open issue has been found
-        required: true
-
-      - label: 您确保这个 Issue 只提及一个功能。如果您有多个功能请求，烦请发起多个 Issue / Ensure there is only one feature request in this issue. Please make mutiply issue for mutiply feature request
-        required: true
-
-      - label: 您确保已使用最新 CI 版本测试，并且该功能在最新 CI 版本中并未按照预期实现 / This feature don't implement correctly in latest CI version
-        required: true
@@ -4,8 +4,9 @@ on:
  push:
    branches:
      - '*'
-    tags-ignore:
-      - "*"
+      - 'renovate/**'
+  pull_request:
+  workflow_dispatch:

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

@@ -23,13 +24,14 @@ jobs:
          distribution: temurin
          java-version: 17

-      - name: Install NDK
-        run: |
-          echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;26.0.10404224" --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
@@ -38,42 +40,178 @@ jobs:
        working-directory: ./app/src/main/rust
        run: cargo clippy --all-targets --all-features -- -D warnings

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

-      - name: Update ARM64
+      - 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') }}
+          restore-keys: ${{ runner.os }}-cmake-
+
+      - name: Build OSS
+        run: ./gradlew assembleDefaultOssRelease
+
+      - name: Upload OSS ARM64
        uses: actions/upload-artifact@v3
        with:
-          name: arm64-v8a-${{ github.sha }}
-          path: app/build/outputs/apk/release/app-arm64-v8a-release.apk
+          name: default-oss-arm64-v8a-${{ github.sha }}
+          path: app/build/outputs/apk/defaultOss/release/app-default-oss-arm64-v8a-release.apk

-      - name: Update x86_64
+      - name: Upload OSS 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: default-oss-x86_64-${{ github.sha }}
+          path: app/build/outputs/apk/defaultOss/release/app-default-oss-x86_64-release.apk

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

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

-      - name: Update mapping
+      - name: Upload OSS mapping
        uses: actions/upload-artifact@v3
        with:
-          name: mapping-${{ github.sha }}
-          path: app/build/outputs/mapping/release/mapping.txt
-          retention-days: 5
+          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
@@ -1,66 +0,0 @@
-name: Pull Request Check
-
-on: [ pull_request ]
-
-jobs:
-  linux:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        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.10404224" --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,7 +11,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
        with:
          submodules: 'recursive'

@@ -21,13 +21,23 @@ jobs:
          distribution: temurin
          java-version: 17

-      - name: Install NDK
-        run: |
-          echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;26.0.10404224" --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-${{ hashFiles('gradle/libs.versions.toml', 'app/build.gradle.kts', 'app/src/main/cpp/CMakeLists.txt') }}
+          restore-keys: ${{ runner.os }}-cmake-
+
      - name: Gradle Build
        uses: gradle/gradle-build-action@v2
        with:
@@ -35,42 +45,71 @@ jobs:

      - name: Rename Apks
        run: |
-          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
+          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

      - name: Releases
        uses: softprops/action-gh-release@v1
        with:
          body: Bump Version
-          discussion_category_name: Announcements
          files: |
-            app/build/outputs/apk/release/EhViewer-universal.apk
-            app/build/outputs/apk/release/EhViewer-arm64-v8a.apk
-            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
+            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

-      - name: Collect Apks
-        run: |
-          mkdir app/build/outputs/apk/release/fdroid
-          cp app/build/outputs/apk/release/app-arm64-v8a-release.apk app/build/outputs/apk/release/fdroid/EhViewer-v$GITHUB_REF_NAME.apk
-          cp app/build/outputs/apk/release/app-armeabi-v7a-release.apk app/build/outputs/apk/release/fdroid/EhViewer-v$GITHUB_REF_NAME-armv7.apk
+            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

-      - name: Push Apks
-        uses: Ehviewer-Overhauled/github-action-push-to-another-repository@main
-        env:
-          SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
-        with:
-          source-directory: app/build/outputs/apk/release/fdroid
-          destination-github-username: Ehviewer-Overhauled
-          destination-repository-name: fdroid-repo
-          user-name: 'github-actions[bot]'
-          user-email: 'github-actions[bot]@users.noreply.github.com'
-          target-branch: deploy
-          create-target-branch: true
-          commit-message: Add apks from $GITHUB_REF
-          target-directory: fdroid/tmp-apks
+            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
@@ -6,5 +6,4 @@
 *.iml
 .idea
 /captures
-release
 google-services.json
@@ -1,3 +0,0 @@
-[submodule "app/src/main/cpp/nettle/nettle"]
-	path = app/src/main/cpp/nettle/nettle
-	url = https://github.com/Ehviewer-Overhauled/nettle
@@ -1,60 +1,64 @@
+# Maintenance Mode
+
+The project is in maintenance mode, will only receive bugfixes.
+
 <p align="right">
  <strong>English</strong>
  <span> | </span>
-  <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/blob/1.8.x.x/docs/README/zh-cn.md">
+  <a href="https://github.com/FooIbar/EhViewer/blob/1.8.x.x/docs/README/zh-cn.md">
  简体中文
  </a>
  <span> | </span>
-  <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/blob/1.8.x.x/docs/README/zh-tw.md">
+  <a href="https://github.com/FooIbar/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">
+  <img src="https://github.com/Ehviewer-Overhauled/Art/blob/master/launcher_icon-web.svg" width="200" alt="EhViewer">
  <br>EhViewer<br>
 </h1>

 <p align="center">
-  <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 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>
-  <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 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>
-  <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 href="https://www.codefactor.io/repository/github/FooIbar/EhViewer">
+    <img src="https://www.codefactor.io/repository/github/FooIbar/EhViewer/badge" alt="CodeFactor">
  </a>
-  <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 href="https://github.com/FooIbar/EhViewer/releases">
+    <img src="https://img.shields.io/github/downloads/FooIbar/EhViewer/total.svg" alt="Downloads">
  </a>
-  <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 href="https://github.com/FooIbar/EhViewer/releases">
+    <img src="https://img.shields.io/github/v/release/FooIbar/EhViewer" alt="Release">
  </a>
-  <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/issues">
-    <img src="https://img.shields.io/github/issues/Ehviewer-Overhauled/ehviewer" alt="Issues">
+  <a href="https://github.com/FooIbar/EhViewer/issues">
+    <img src="https://img.shields.io/github/issues/FooIbar/EhViewer" alt="Issues">
  </a>
 </p>

 <div align="center">
  <h3>
-    <a href="https://github.com/Ehviewer-Overhauled/Ehviewer#description">
+    <a href="https://github.com/FooIbar/EhViewer#description">
    Description
    </a>
    <span> | </span>
-    <a href="https://github.com/Ehviewer-Overhauled/Ehviewer#download">
+    <a href="https://github.com/FooIbar/EhViewer#download">
    Download
    </a>
    <span> | </span>
-    <a href="https://github.com/Ehviewer-Overhauled/Ehviewer#screenshot">
+    <a href="https://github.com/FooIbar/EhViewer#screenshot">
    Screenshot
    </a>
    <span> | </span>
-    <a href="https://github.com/Ehviewer-Overhauled/Ehviewer#thanks">
+    <a href="https://github.com/FooIbar/EhViewer#thanks">
    Thanks
    </a>
    <span> | </span>
-    <a href="https://github.com/Ehviewer-Overhauled/Ehviewer#license">
+    <a href="https://github.com/FooIbar/EhViewer#license">
    License
    </a>
  </h3>
@@ -69,7 +73,20 @@ and [Dynamic Color](https://m3.material.io/styles/color/dynamic-color/overview)

 # Download

-<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>
+| Flavor | Feature |
+|-|-|
+| Default | Android 9+, full support |
+| Marshmallow | Android 6.0-8.1, 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>

 # Screenshot

@@ -99,6 +116,7 @@ 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,20 +8,21 @@ val isRelease: Boolean
    get() = gradle.startParameter.taskNames.any { it.contains("Release") }

 plugins {
-    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")
+    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)
 }

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

    splits {
        abi {
@@ -31,7 +32,7 @@ android {
                include("arm64-v8a", "x86_64", "armeabi-v7a", "x86")
                isUniversalApk = true
            } else {
-                include("arm64-v8a")
+                include("arm64-v8a", "x86_64")
            }
        }
    }
@@ -63,8 +64,8 @@ android {
        applicationId = "moe.tarsin.ehviewer"
        minSdk = 28
        targetSdk = 34
-        versionCode = 180042
-        versionName = "1.8.9.0-SNAPSHOT"
+        versionCode = 180045
+        versionName = "1.8.11.0"
        resourceConfigurations.addAll(
            listOf(
                "zh",
@@ -82,8 +83,43 @@ android {
            ),
        )
        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 {
@@ -92,19 +128,12 @@ 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",
@@ -146,9 +175,11 @@ android {
            isShrinkResources = true
            proguardFiles("proguard-rules.pro")
            signingConfig = signConfig
+            buildConfigField("String", "BUILD_TIME", "\"$buildTime\"")
        }
        debug {
            applicationIdSuffix = ".debug"
+            buildConfigField("String", "BUILD_TIME", "\"\"")
        }
    }

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

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

    namespace = "com.hippo.ehviewer"
@@ -167,104 +198,83 @@ android {

 dependencies {
    // https://developer.android.com/jetpack/androidx/releases/activity
-    implementation("androidx.activity:activity-compose:1.8.0-alpha06")
-    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-beta01")
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.androidx.biometric)
+    implementation(libs.androidx.browser)
+    implementation(libs.androidx.collection)

    // https://developer.android.com/jetpack/androidx/releases/compose-material3
-    // 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")
+    api(platform(libs.compose.bom))
+    implementation(libs.bundles.compose)

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

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

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

    // https://developer.android.com/jetpack/androidx/releases/paging
-    val paging = "3.2.0"
-    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")
+    implementation(libs.bundles.androidx.paging)
+
+    implementation(libs.bundles.androidx.recyclerview)

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

-    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
+    implementation(libs.androidx.swiperefreshlayout)
+    implementation(libs.androidx.work.runtime)
+    implementation(libs.photoview) // Dead Dependency
+    implementation(libs.directionalviewpager) // Dead Dependency
    // https://github.com/google/accompanist/releases
-    val accompanist_version = "0.31.6-rc"
-    implementation("com.google.accompanist:accompanist-themeadapter-material3:$accompanist_version")
-    implementation("com.google.accompanist:accompanist-webview:$accompanist_version")
-    implementation("com.google.android.material:material:1.11.0-alpha02")
+    implementation(libs.bundles.accompanist)
+    implementation(libs.material)

-    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")
+    implementation(libs.bundles.splitties)

    // https://square.github.io/okhttp/changelogs/changelog/
-    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(platform(libs.okhttp.bom))
+    implementation(libs.bundles.okhttp)

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

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

-    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(libs.insetter) // Dead Dependency

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

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

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

-    implementation("org.chromium.net:cronet-embedded:113.5672.61")
+    implementation(libs.bundles.kotlinx.serialization)

-    val serialization = "1.5.1"
-    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)

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

 ksp {
@@ -275,29 +285,32 @@ 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")
+    targets = if (isRelease) listOf("arm", "x86", "arm64", "x86_64") else listOf("arm64", "x86_64")
    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 == "mergeDebugJniLibFolders" || name == "mergeReleaseJniLibFolders")) {
+    if (name.startsWith("merge") && name.endsWith("JniLibFolders")) {
        dependsOn("cargoBuild")
        // fix mergeDebugJniLibFolders  UP-TO-DATE
-        inputs.dir(buildDir.resolve("rustJniLibs/android"))
+        inputs.dir(layout.buildDirectory.dir("rustJniLibs/android"))
    }
 }
@@ -17,6 +17,7 @@
 -keep class com.hippo.ehviewer.client.parser.GalleryListResult { *; }
 -keep class com.hippo.ehviewer.client.parser.Limits { *; }
 -keep class com.hippo.ehviewer.client.data.BaseGalleryInfo { *; }
+-keep class com.hippo.ehviewer.ui.scene.SearchBarScene { getBinding(); }

 # Ktor logger
 -dontwarn org.slf4j.impl.StaticLoggerBinder
@@ -1,12 +1,15 @@
 package com.hippo.ehviewer.cronet

-import com.hippo.ehviewer.EhApplication
+import com.hippo.ehviewer.Settings
 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 eu.kanade.tachiyomi.util.system.logcat
-import io.ktor.utils.io.pool.DirectByteBufferPool
+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
@@ -17,30 +20,15 @@ import org.chromium.net.CronetException
 import org.chromium.net.UrlRequest
 import org.chromium.net.UrlResponseInfo
 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: 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)
-    addQuicHint("e-hentai.org", 443, 443)
-    addQuicHint("forums.e-hentai.org", 443, 443)
-    addQuicHint("exhentai.org", 443, 443)
+    setUserAgent(Settings.userAgent)
 }.build()

-val cronetHttpClientExecutor = EhApplication.baseOkHttpClient.dispatcher.executorService
-
-// TODO: Rewrite this to use android.net.http.HttpEngine and make it Android 14 only when released
 class CronetRequest {
    lateinit var consumer: (ByteBuffer) -> Unit
    lateinit var onResponse: CronetRequest.(UrlResponseInfo) -> Unit
@@ -49,7 +37,6 @@ 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()
        }

@@ -75,36 +62,12 @@ class CronetRequest {
 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("User-Agent", CHROME_USER_AGENT)
        addHeader("Accept", CHROME_ACCEPT)
        addHeader("Accept-Language", CHROME_ACCEPT_LANGUAGE)
        referer?.let { addHeader("Referer", it) }
    }.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)
@@ -118,3 +81,6 @@ 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
@@ -0,0 +1,13 @@
+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,6 +44,7 @@
            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" />
@@ -1,34 +0,0 @@
-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
-
@@ -1,29 +0,0 @@
-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
-
@@ -1,25 +0,0 @@
-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,15 +23,21 @@ set(FETCHCONTENT_BASE_DIR ${deps})
 set(BUILD_TESTING 0)

 FetchContent_Declare(liblzma
-        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 .
+        GIT_REPOSITORY https://github.com/FooIbar/xz.git
+        GIT_TAG v5.4.4
        )

 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
@@ -62,9 +68,8 @@ option(ENABLE_TEST OFF)
 SET(LIBARCHIVE_CUSTOM_LIBS "nettle" "liblzma")

 FetchContent_Declare(libarchive
-        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 .
+        GIT_REPOSITORY https://github.com/FooIbar/libarchive.git
+        GIT_TAG v3.7.2
        )

 FetchContent_MakeAvailable(libarchive)
@@ -73,3 +78,5 @@ 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_gallery_ArchivePageLoaderKt_openArchive(JNIEnv *env, jclass thiz, jint fd,
+Java_com_hippo_ehviewer_jni_ArchiveKt_openArchive(JNIEnv *env, jclass thiz, jint fd,
                                                                jlong size) {
    EH_UNUSED(env);
    EH_UNUSED(thiz);
@@ -359,7 +359,7 @@ Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_openArchive(JNIEnv *env, jcl
 #pragma ide diagnostic ignored "UnreachableCode"

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

 JNIEXPORT void JNICALL
-Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_closeArchive(JNIEnv *env, jclass thiz) {
+Java_com_hippo_ehviewer_jni_ArchiveKt_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_gallery_ArchivePageLoaderKt_closeArchive(JNIEnv *env, jc
 }

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

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

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

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

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

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

 static int FRAME_DELAY_START_MARKER = 0x0021F904;

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

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

 static void doRewrite(byte *addr, size_t size) {
@@ -42,20 +45,33 @@ 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_image_ImageKt_rewriteGifSource(JNIEnv *env, jclass clazz, jobject buffer) {
+Java_com_hippo_ehviewer_jni_GifUtilsKt_rewriteGifSource(JNIEnv *env, jclass clazz, jobject buffer) {
    byte *addr = (*env)->GetDirectBufferAddress(env, buffer);
    size_t size = (*env)->GetDirectBufferCapacity(env, buffer);
    doRewrite(addr, size);
 }

-JNIEXPORT void JNICALL
-Java_com_hippo_ehviewer_image_ImageKt_rewriteGifSource2(JNIEnv *env, jclass clazz, jint fd) {
+JNIEXPORT jobject JNICALL
+Java_com_hippo_ehviewer_jni_GifUtilsKt_mmap(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_SHARED, fd, 0);
-    if (addr == MAP_FAILED) return;
-    doRewrite(addr, 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);
    munmap(addr, size);
 }
@@ -0,0 +1 @@
+/nettle
@@ -32,7 +32,6 @@ 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
@@ -177,7 +176,7 @@ set(LIBNETTLE_SOURCES
        nettle/sha1-compress.c
        nettle/sha1-meta.c
        nettle/sha256.c
-        nettle/sha256-compress.c
+        nettle/sha256-compress-n.c
        nettle/sha224-meta.c
        nettle/sha256-meta.c
        nettle/sha512.c
@@ -4,13 +4,19 @@
 /* Define if building universal (internal helper macro) */
 /* #undef AC_APPLE_UNIVERSAL_BUILD */

-/* Define to 1 if using 'alloca.c'. */
+/* 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'. */
 /* #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 <alloca.h> works. */
+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
+   */
 #define HAVE_ALLOCA_H 1

 /* Define if __builtin_bswap64 is available */
@@ -46,6 +52,9 @@
 /* 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 */
@@ -71,7 +80,7 @@
 /* #undef HAVE_NATIVE_cbc_aes256_encrypt */
 /* #undef HAVE_NATIVE_chacha_core */
 /* #undef HAVE_NATIVE_chacha_2core */
-/* #undef HAVE_NATIVE_chacha_3core */
+#define HAVE_NATIVE_chacha_3core 1
 /* #undef HAVE_NATIVE_chacha_4core */
 /* #undef HAVE_NATIVE_fat_chacha_2core */
 /* #undef HAVE_NATIVE_fat_chacha_3core */
@@ -88,13 +97,18 @@
 /* #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 */
-/* #undef HAVE_NATIVE_salsa20_2core */
+#define HAVE_NATIVE_salsa20_2core 1
 /* #undef HAVE_NATIVE_fat_salsa20_2core */
 /* #undef HAVE_NATIVE_sha1_compress */
-/* #undef HAVE_NATIVE_sha256_compress */
+/* #undef HAVE_NATIVE_sha256_compress_n */
 /* #undef HAVE_NATIVE_sha512_compress */
 /* #undef HAVE_NATIVE_sha3_permute */
 /* #undef HAVE_NATIVE_umac_nh */
@@ -107,14 +121,11 @@
 /* #undef HAVE_OPENSSL_EVP_H */

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

 /* 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

@@ -130,9 +141,6 @@
 /* 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

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

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

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

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

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

-/* 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 to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1

-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. This
-   macro is obsolete. */
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #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 8
+#define NETTLE_VERSION_MINOR 9

 #define NETTLE_USE_MINI_GMP 0

@@ -1,105 +0,0 @@
-/*
- * Copyright 2022 Tarsin Norbin
- *
- * This file is part of EhViewer
- *
- * 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.
- *
- * EhViewer is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with EhViewer.
- * If not, see <https://www.gnu.org/licenses/>.
- */
-package com.hippo.ehviewer.image
-
-import android.graphics.ColorSpace
-import android.graphics.ImageDecoder
-import android.graphics.ImageDecoder.ImageInfo
-import android.graphics.ImageDecoder.Source
-import android.graphics.drawable.Animatable
-import android.graphics.drawable.BitmapDrawable
-import android.graphics.drawable.Drawable
-import android.os.Build
-import com.hippo.ehviewer.R
-import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences
-import splitties.init.appCtx
-import java.nio.ByteBuffer
-import kotlin.math.min
-
-class Image private constructor(private val src: CloseableSource) {
-    var mObtainedDrawable: Drawable? =
-        ImageDecoder.decodeDrawable(src.source) { decoder: ImageDecoder, info: ImageInfo, _: Source ->
-            if (Build.VERSION.SDK_INT == Build.VERSION_CODES.P) {
-                // Allocating hardware bitmap may cause a crash on framework versions prior to Android Q
-                decoder.allocator = ImageDecoder.ALLOCATOR_SOFTWARE
-            }
-            decoder.setTargetColorSpace(colorSpace)
-            decoder.setTargetSampleSize(
-                calculateSampleSize(info, 2 * screenHeight, 2 * screenWidth),
-            )
-        }.also {
-            if (it !is Animatable) src.close()
-        }
-        private set
-
-    val size: Int
-        get() = mObtainedDrawable!!.run { intrinsicHeight * intrinsicWidth * 4 * if (this is Animatable) 4 else 1 }
-
-    @Synchronized
-    fun recycle() {
-        (mObtainedDrawable as? Animatable)?.stop()
-        (mObtainedDrawable as? BitmapDrawable)?.bitmap?.recycle()
-        mObtainedDrawable?.callback = null
-        if (mObtainedDrawable is Animatable) src.close()
-        mObtainedDrawable = null
-    }
-
-    companion object {
-        fun calculateSampleSize(info: ImageInfo, targetHeight: Int, targetWeight: Int): Int {
-            return min(
-                info.size.width / targetWeight,
-                info.size.height / targetHeight,
-            ).coerceAtLeast(1)
-        }
-
-        private val imageSearchMaxSize = appCtx.resources.getDimensionPixelOffset(R.dimen.image_search_max_size)
-
-        val imageSearchDecoderSampleListener =
-            ImageDecoder.OnHeaderDecodedListener { decoder, info, _ ->
-                decoder.setTargetSampleSize(
-                    calculateSampleSize(info, imageSearchMaxSize, imageSearchMaxSize),
-                )
-            }
-        val screenWidth = appCtx.resources.displayMetrics.widthPixels
-        val screenHeight = appCtx.resources.displayMetrics.heightPixels
-        val isWideColorGamut = appCtx.resources.configuration.isScreenWideColorGamut
-        var colorSpace = ColorSpace.get(
-            if (isWideColorGamut && ReaderPreferences.wideColorGamut().get()) {
-                ColorSpace.Named.DISPLAY_P3
-            } else {
-                ColorSpace.Named.SRGB
-            },
-        )
-
-        fun decode(src: CloseableSource): Image? {
-            return runCatching {
-                Image(src)
-            }.onFailure {
-                src.close()
-                it.printStackTrace()
-            }.getOrNull()
-        }
-    }
-
-    interface CloseableSource : AutoCloseable {
-        val source: Source
-    }
-}
-
-external fun rewriteGifSource(buffer: ByteBuffer)
-external fun rewriteGifSource2(fd: Int)
@@ -1,217 +0,0 @@
-package com.hippo.ehviewer.ui.legacy
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.util.AttributeSet
-import android.view.Gravity
-import android.view.MotionEvent
-import android.view.View
-import android.widget.FrameLayout
-import androidx.coordinatorlayout.widget.CoordinatorLayout
-import androidx.coordinatorlayout.widget.CoordinatorLayout.AttachedBehavior
-import androidx.core.util.ObjectsCompat
-import androidx.core.view.GravityCompat
-import androidx.core.view.ViewCompat
-import androidx.drawerlayout.widget.DrawerLayout
-import androidx.drawerlayout.widget.DrawerLayout.DrawerListener
-import androidx.interpolator.view.animation.FastOutSlowInInterpolator
-import com.drakeet.drawer.FullDraggableHelper
-import com.google.android.material.snackbar.Snackbar.SnackbarLayout
-import com.hippo.ehviewer.util.dp2px
-
-class AboveSnackerLayout : FrameLayout, AttachedBehavior, FullDraggableHelper.Callback {
-    private val helper: FullDraggableHelper
-    private var drawerLayout: DrawerLayout? = null
-    private var mAboveSnackViewList: MutableList<View>? = null
-
-    constructor(context: Context?, attrs: AttributeSet?) : super(context!!, attrs) {
-        helper = FullDraggableHelper(context, this)
-    }
-
-    constructor(context: Context?, attrs: AttributeSet?, defStyle: Int) :
-        super(context!!, attrs, defStyle) {
-        helper = FullDraggableHelper(context, this)
-    }
-
-    override fun onAttachedToWindow() {
-        super.onAttachedToWindow()
-        ensureDrawerLayout()
-    }
-
-    private fun ensureDrawerLayout() {
-        val parent = parent.parent
-        check(parent is DrawerLayout) { "This $this must be added to a DrawerLayout" }
-        drawerLayout = parent
-    }
-
-    override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
-        return helper.onInterceptTouchEvent(event)
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    override fun onTouchEvent(event: MotionEvent): Boolean {
-        return helper.onTouchEvent(event)
-    }
-
-    override fun getDrawerMainContainer(): View {
-        return this
-    }
-
-    override fun isDrawerOpen(gravity: Int): Boolean {
-        return drawerLayout!!.isDrawerOpen(gravity)
-    }
-
-    override fun hasEnabledDrawer(gravity: Int): Boolean {
-        return drawerLayout!!.getDrawerLockMode(gravity) == DrawerLayout.LOCK_MODE_UNLOCKED &&
-            findDrawerWithGravity(gravity) != null
-    }
-
-    override fun offsetDrawer(gravity: Int, offset: Float) {
-        setDrawerToOffset(gravity, offset)
-        drawerLayout!!.invalidate()
-    }
-
-    override fun smoothOpenDrawer(gravity: Int) {
-        drawerLayout!!.openDrawer(gravity, true)
-    }
-
-    override fun smoothCloseDrawer(gravity: Int) {
-        drawerLayout!!.closeDrawer(gravity, true)
-    }
-
-    override fun onDrawerDragging() {
-        val drawerListeners = drawerListeners
-        if (drawerListeners != null) {
-            val listenerCount = drawerListeners.size
-            for (i in listenerCount - 1 downTo 0) {
-                drawerListeners[i].onDrawerStateChanged(DrawerLayout.STATE_DRAGGING)
-            }
-        }
-    }
-
-    private val drawerListeners: List<DrawerListener>?
-        get() = try {
-            val listeners = DrawerLayout::class.java.getDeclaredField("mListeners")
-            listeners.isAccessible = true
-            listeners[drawerLayout] as List<DrawerListener>
-        } catch (e: Exception) {
-            // throw to let developer know the api is changed
-            throw RuntimeException(e)
-        }
-
-    private fun setDrawerToOffset(gravity: Int, offset: Float) {
-        val drawerView = findDrawerWithGravity(gravity)
-        val slideOffsetPercent =
-            (offset / ObjectsCompat.requireNonNull(drawerView).width).coerceIn(0f, 1f)
-        try {
-            val method = DrawerLayout::class.java.getDeclaredMethod(
-                "moveDrawerToOffset",
-                View::class.java,
-                Float::class.javaPrimitiveType,
-            )
-            method.isAccessible = true
-            method.invoke(drawerLayout, drawerView, slideOffsetPercent)
-            drawerView!!.visibility = VISIBLE
-        } catch (e: Exception) {
-            // throw to let developer know the api is changed
-            throw RuntimeException(e)
-        }
-    }
-
-    // Copied from DrawerLayout
-    private fun findDrawerWithGravity(gravity: Int): View? {
-        val absHorizontalGravity = GravityCompat.getAbsoluteGravity(
-            gravity,
-            ViewCompat.getLayoutDirection(drawerLayout!!),
-        ) and Gravity.HORIZONTAL_GRAVITY_MASK
-        val childCount = drawerLayout!!.childCount
-        for (i in 0 until childCount) {
-            val child = drawerLayout!!.getChildAt(i)
-            val childAbsGravity = getDrawerViewAbsoluteGravity(child)
-            if (childAbsGravity and Gravity.HORIZONTAL_GRAVITY_MASK == absHorizontalGravity) {
-                return child
-            }
-        }
-        return null
-    }
-
-    // Copied from DrawerLayout
-    private fun getDrawerViewAbsoluteGravity(drawerView: View): Int {
-        val gravity = (drawerView.layoutParams as DrawerLayout.LayoutParams).gravity
-        return GravityCompat.getAbsoluteGravity(
-            gravity,
-            ViewCompat.getLayoutDirection(drawerLayout!!),
-        )
-    }
-
-    fun addAboveSnackView(view: View) {
-        if (null == mAboveSnackViewList) {
-            mAboveSnackViewList = ArrayList()
-        }
-        mAboveSnackViewList!!.add(view)
-    }
-
-    fun removeAboveSnackView(view: View) {
-        if (null == mAboveSnackViewList) {
-            return
-        }
-        mAboveSnackViewList!!.remove(view)
-    }
-
-    val aboveSnackViewCount: Int
-        get() = if (null == mAboveSnackViewList) 0 else mAboveSnackViewList!!.size
-
-    fun getAboveSnackViewAt(index: Int): View? {
-        return if (null == mAboveSnackViewList || index < 0 || index >= mAboveSnackViewList!!.size) {
-            null
-        } else {
-            mAboveSnackViewList!![index]
-        }
-    }
-
-    override fun getBehavior(): Behavior {
-        return Behavior()
-    }
-
-    class Behavior : CoordinatorLayout.Behavior<AboveSnackerLayout>() {
-        override fun layoutDependsOn(
-            parent: CoordinatorLayout,
-            child: AboveSnackerLayout,
-            dependency: View,
-        ): Boolean {
-            return dependency is SnackbarLayout
-        }
-
-        override fun onDependentViewChanged(
-            parent: CoordinatorLayout,
-            child: AboveSnackerLayout,
-            dependency: View,
-        ): Boolean {
-            for (i in 0 until child.aboveSnackViewCount) {
-                val view = child.getAboveSnackViewAt(i)
-                if (view != null) {
-                    val translationY =
-                        (dependency.translationY - dependency.height - dp2px(view.context, 8f))
-                            .coerceAtMost(0f)
-                    ViewCompat.animate(view).setInterpolator(FastOutSlowInInterpolator())
-                        .translationY(translationY).setDuration(150).start()
-                }
-            }
-            return false
-        }
-
-        override fun onDependentViewRemoved(
-            parent: CoordinatorLayout,
-            child: AboveSnackerLayout,
-            dependency: View,
-        ) {
-            for (i in 0 until child.aboveSnackViewCount) {
-                val view = child.getAboveSnackViewAt(i)
-                if (view != null) {
-                    ViewCompat.animate(view).setInterpolator(FastOutSlowInInterpolator())
-                        .translationY(0f).setDuration(75).start()
-                }
-            }
-        }
-    }
-}
@@ -1,6 +0,0 @@
-package com.hippo.ehviewer.util
-
-import com.hippo.ehviewer.Settings
-
-val isCronetSupported: Boolean
-    get() = Settings.enableQuic && isAtLeastQ
@@ -1,12 +0,0 @@
-package com.hippo.ehviewer.util
-
-import okhttp3.ResponseBody
-import java.io.File
-
-fun ResponseBody.copyToFile(file: File) {
-    file.outputStream().use { os ->
-        source().use {
-            os.channel.transferFrom(it, 0, Long.MAX_VALUE)
-        }
-    }
-}
@@ -1,5 +0,0 @@
-package com.hippo.ehviewer.util
-
-import android.os.Build
-
-val isAtLeastQ = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
@@ -1,42 +0,0 @@
-package eu.kanade.tachiyomi.ui.reader
-
-import androidx.compose.foundation.layout.Box
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.drawscope.Stroke
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.sp
-
-@Composable
-fun PageIndicatorText(
-    currentPage: Int,
-    totalPages: Int,
-) {
-    if (currentPage <= 0 || totalPages <= 0) return
-
-    val text = "$currentPage / $totalPages"
-
-    Box {
-        Text(
-            text = text,
-            color = Color(45, 45, 45),
-            fontSize = MaterialTheme.typography.bodySmall.fontSize,
-            fontWeight = FontWeight.Bold,
-            letterSpacing = 1.sp,
-            style = TextStyle.Default.copy(
-                drawStyle = Stroke(width = 4f),
-            ),
-        )
-
-        Text(
-            text = text,
-            color = Color(235, 235, 235),
-            fontSize = MaterialTheme.typography.bodySmall.fontSize,
-            fontWeight = FontWeight.Bold,
-            letterSpacing = 1.sp,
-        )
-    }
-}
@@ -1,12 +0,0 @@
-package eu.kanade.tachiyomi.util.system
-
-import android.app.Activity
-
-/**
- * Checks whether if the device has a display cutout (i.e. notch, camera cutout, etc.).
- *
- * Only works in Android 9+.
- */
-fun Activity.hasDisplayCutout(): Boolean {
-    return window.decorView.rootWindowInsets?.displayCutout != null
-}
@@ -1,7 +1,6 @@
 package androidx.navigation.ui

 import android.annotation.SuppressLint
-import android.view.MenuItem
 import androidx.annotation.IdRes
 import androidx.navigation.ActivityNavigator
 import androidx.navigation.NavController
@@ -10,12 +9,10 @@ import androidx.navigation.NavDestination.Companion.hierarchy
 import androidx.navigation.NavOptions

@SuppressLint("PrivateResource")
-fun onNavDestinationSelected2(item: MenuItem, navController: NavController): Boolean {
+fun onNavDestinationSelected2(@IdRes id: Int, navController: NavController): Boolean {
+    if (navController.currentDestination?.matchDestination(id) == true) return true
    val builder = NavOptions.Builder().setLaunchSingleTop(true)
-    if (
-        navController.currentDestination!!.parent!!.findNode(item.itemId)
-        is ActivityNavigator.Destination
-    ) {
+    if (navController.currentDestination!!.parent!!.findNode(id) 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)
@@ -29,9 +26,9 @@ fun onNavDestinationSelected2(item: MenuItem, navController: NavController): Boo
    val options = builder.build()
    return try {
        // TODO provide proper API instead of using Exceptions as Control-Flow.
-        navController.navigate(item.itemId, null, options)
+        navController.navigate(id, null, options)
        // Return true only if the destination we've navigated to matches the MenuItem
-        navController.currentDestination?.matchDestination(item.itemId) == true
+        navController.currentDestination?.matchDestination(id) == true
    } catch (e: IllegalArgumentException) {
        false
    }
@@ -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 kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.SupervisorJob
-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
@@ -39,6 +31,14 @@ 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
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext

 /**
 * Displays an image subsampled as necessary to avoid loading too much image data into memory. After zooming in,
@@ -104,7 +104,6 @@ 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
@@ -148,7 +147,6 @@ 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
@@ -192,7 +190,6 @@ 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

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

    private fun onTouchEventInternal(event: MotionEvent): Boolean {
        val touchCount = event.pointerCount
-        when (event.action) {
-            MotionEvent.ACTION_DOWN, MotionEvent.ACTION_POINTER_1_DOWN, MotionEvent.ACTION_POINTER_2_DOWN -> {
+        when (event.actionMasked) {
+            MotionEvent.ACTION_DOWN, MotionEvent.ACTION_POINTER_DOWN -> {
                anim = null
                requestDisallowInterceptTouchEvent(true)
                maxTouchCount = maxTouchCount.coerceAtLeast(touchCount)
@@ -776,7 +773,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
                    return true
                }
            }
-            MotionEvent.ACTION_UP, MotionEvent.ACTION_POINTER_UP, MotionEvent.ACTION_POINTER_2_UP -> {
+            MotionEvent.ACTION_UP, MotionEvent.ACTION_POINTER_UP -> {
                longClickJob?.cancel()
                if (isQuickScaling) {
                    isQuickScaling = false
@@ -47,11 +47,12 @@ 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.network.interceptor.UncaughtExceptionInterceptor
 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,6 +66,10 @@ 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 ->
@@ -77,21 +82,17 @@ class EhApplication : Application(), ImageLoaderFactory {
            handler?.uncaughtException(t, e)
        }
        super.onCreate()
-        System.loadLibrary("ehviewer")
+        if (isAtLeastP) {
+            System.loadLibrary("ehviewer")
+        }
        System.loadLibrary("ehviewer_rust")
        ReadableTime.initialize(this)
-        lifecycleScope.launchIO {
-            val theme = Settings.theme
-            withUIContext {
-                AppCompatDelegate.setDefaultNightMode(theme)
-            }
-        }
        lifecycleScope.launchIO {
            launchIO {
                migrateCookies()
            }
            launchIO {
-                EhTagDatabase.update()
+                EhTagDatabase
            }
            launchIO {
                EhDB
@@ -150,7 +151,9 @@ class EhApplication : Application(), ImageLoaderFactory {
            } else {
                callFactory(baseOkHttpClient)
            }
-            add { result, options, _ -> ImageDecoderDecoder(result.source, options, false) }
+            if (isAtLeastP) {
+                add { result, options, _ -> ImageDecoderDecoder(result.source, options, false) }
+            }
            add(MergeInterceptor)
        }
        diskCache(imageCache)
@@ -168,6 +171,7 @@ class EhApplication : Application(), ImageLoaderFactory {
                    dns(AsyncDns.toDns(AndroidAsyncDns.IPv4, AndroidAsyncDns.IPv6))
                }
                chunker { alwaysReadResponseBody(false) }
+                addInterceptor(UncaughtExceptionInterceptor())
                addInterceptor(CloudflareInterceptor(appCtx))
            }
        }
@@ -2,8 +2,11 @@

 package com.hippo.ehviewer

+import com.hippo.ehviewer.client.CHROME_USER_AGENT
 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
@@ -12,8 +15,6 @@ 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"
@@ -24,28 +25,31 @@ object Settings : DataStorePreferences(null) {
    var favCount by intArrayPref("fav_count", 10).emitTo(_favFlow)
    var favCloudCount by intPref("fav_cloud", 0).emitTo(_favFlow)

+    val needSignInFlow: Flow<Boolean>
    var downloadScheme by stringOrNullPref("image_scheme", null)
    var downloadAuthority by stringOrNullPref("image_authority", null)
    var downloadPath by stringOrNullPref("image_path", null)
    var downloadQuery by stringOrNullPref("image_query", null)
    var downloadFragment by stringOrNullPref("image_fragment", null)
    var archivePasswds by stringSetOrNullPref("archive_passwds")
-    var downloadDelay by intFromStrPref("download_delay", 0)
-    var gallerySite by intFromStrPref("gallery_site", 0).observed { updateWhenGallerySiteChanges() }
-    var multiThreadDownload by intFromStrPref("download_thread", 3)
-    var preloadImage by intFromStrPref("preload_image", 5)
-    var theme by intFromStrPref("theme", -1).observed { updateWhenThemeChanges() }
-    var listMode by intFromStrPref("list_mode", 0)
-    var detailSize by intFromStrPref("detail_size", 0)
-    var thumbResolution by intFromStrPref("thumb_resolution", 0)
-    var readCacheSize by intFromStrPref("read_cache_size", 640)
-    var launchPage by intFromStrPref("launch_page", 0)
+    var downloadDelay by intPref("download_delay_3", 1000)
+    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)
+    var thumbResolution by intPref("thumb_resolution_2", 0)
+    var readCacheSize by intPref("read_cache_size_2", 640)
+    var launchPage by intPref("launch_page_2", 0)
+    var commentThreshold by intPref("comment_threshold", -101)
    var forceEhThumb by boolPref("force_eh_thumb", false)
    var showComments by boolPref("show_gallery_comments", true)
    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", false)
+    var showGalleryPages by boolPref("show_gallery_pages", true)
    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)
@@ -58,11 +62,12 @@ object Settings : DataStorePreferences(null) {
    var saveCrashLog by boolPref("save_crash_log", true)
    var security by boolPref("require_unlock", false)
    var removeImageFiles by boolPref("include_pic", true)
-    var needSignIn by boolPref("need_sign_in", true)
+    var needSignIn by boolPref("need_sign_in", true).also { needSignInFlow = it.valueFlow() }
    var blackDarkTheme by boolPref("black_dark_theme", false).observed { updateWhenAmoledModeChanges() }
+    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 enableQuic by boolPref("enable_quic", true)
+    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)
@@ -73,6 +78,8 @@ object Settings : DataStorePreferences(null) {
    var requestNewsTimerHour by intPref("request_news_timer_hour", -1)
    var requestNewsTimerMinute by intPref("request_news_timer_minute", -1)
    var updateIntervalDays by intPref("update_interval_days", 0)
+    var recentToplist by stringPref("recent_toplist", "11")
+    var userAgent by stringPref("user_agent", CHROME_USER_AGENT)
    var recentDownloadLabel by stringOrNullPref("recent_download_label", null)
    var defaultDownloadLabel by stringOrNullPref("default_download_label", null)
    var displayName by stringOrNullPref("display_name", null)
@@ -95,15 +102,10 @@ object Settings : DataStorePreferences(null) {
        operator fun setValue(thisRef: Any?, prop: KProperty<*>?, value: R)
    }

-    private fun intFromStrPref(key: String, defValue: Int) = object : Delegate<Int> {
-        override val flowGetter: () -> Flow<Unit>
-        private var _value by stringPref(key, defValue.toString()).also { flowGetter = { it.changesFlow() } }
-        override fun getValue(thisRef: Any?, prop: KProperty<*>?) = _value.toIntOrNull() ?: defValue
-        override fun setValue(thisRef: Any?, prop: KProperty<*>?, value: Int) { _value = value.toString() }
-    }
-
    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) {
@@ -114,6 +116,8 @@ 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,6 +16,11 @@
 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
@@ -24,13 +29,15 @@ 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).any { it.name == name }
+    fun contains(url: HttpUrl, name: String) = get(url).fastAny { it.name == name }

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

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

    fun copyNecessaryCookies() {
-        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()
+        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())
+            }
+        }
    }

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

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

    fun flush() = manager.flush()

    fun getCookieHeader(url: HttpUrl): String {
-        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 loadForRequest(url).fastJoinToString("; ") {
+            "${it.name}=${it.value}"
        }
-        return cookieHeader.toString()
    }

    // See https://github.com/Ehviewer-Overhauled/Ehviewer/issues/873
-    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 saveFromResponse(url: HttpUrl, cookies: List<Cookie>) = cookies.fastForEach {
+        if (it.name != KEY_UTMP_NAME) {
+            manager.setCookie(url.toString(), it.toString())
+        }
+    }

    override fun loadForRequest(url: HttpUrl): List<Cookie> {
        val checkTips = EhUrl.DOMAIN_E in url.host
        return get(url).run {
            if (checkTips) {
-                filterNot { it.name == KEY_CONTENT_WARNING }.toMutableList().apply { add(sTipsCookie) }
+                fastFilter { it.name != KEY_CONTENT_WARNING }.toMutableList().apply { add(sTipsCookie) }
            } else {
                this
            }
@@ -54,6 +54,10 @@ 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
@@ -61,7 +65,6 @@ 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
@@ -69,36 +72,23 @@ 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, headers: Headers, body: String, e: Throwable): Nothing {
+private fun rethrowExactly(code: Int, 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 ("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())
+    if (body.isEmpty()) {
+        if (EhUtils.isExHentai) {
+            throw EhException("Sad Panda\n(without panda)")
+        } else {
+            throw EhException("IP banned")
+        }
    }

    // Check Gallery Not Available
@@ -115,13 +105,11 @@ private fun rethrowExactly(code: Int, headers: Headers, body: String, e: Throwab
    }

    if (e is ParseException) {
-        if (body.isEmpty()) {
-            throw EhException(appCtx.getString(R.string.error_empty_html))
-        } else if ("<" !in body) {
+        if ("<" !in body) {
            throw EhException(body)
        } else {
-            if (Settings.saveParseErrorBody) AppConfig.saveParseErrorBody(e)
-            throw EhException(appCtx.getString(R.string.error_parse_error))
+            if (Settings.saveParseErrorBody) AppConfig.saveParseErrorBody(e, body)
+            throw EhException(appCtx.getString(R.string.error_parse_error), e)
        }
    }

@@ -129,33 +117,27 @@ private fun rethrowExactly(code: Int, headers: Headers, body: String, e: Throwab
    throw e
 }

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

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

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

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

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

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

@@ -502,7 +485,7 @@ object EhEngine {
        var hasPages = false
        var hasRated = false
        for (gi in list) {
-            if (gi.simpleTags != null) {
+            if (!gi.simpleTags.isNullOrEmpty()) {
                hasTags = true
            }
            if (gi.pages != 0) {
@@ -17,17 +17,17 @@ object EhFilter : CoroutineScope {
    val filters = async { EhDB.getAllFilter() as MutableList }
    private suspend inline fun anyActive(mode: FilterMode, predicate: (Filter) -> Boolean) = filters.await().any { it.mode == mode && it.enable && predicate(it) }
    private fun <R> Filter.launchOps(
-        callback: ((R) -> Unit)? = null,
+        callback: (suspend (R) -> Unit)? = null,
        ops: suspend Filter.() -> R,
    ) = launch { ops().let { callback?.invoke(it) } }
-    fun Filter.remember(callback: ((Boolean) -> Unit)? = null) = launchOps(callback) {
+    fun Filter.remember(callback: (suspend (Boolean) -> Unit)? = null) = launchOps(callback) {
        EhDB.addFilter(this).also { if (it) filters.await().add(this) }
    }
-    fun Filter.trigger(callback: ((Unit) -> Unit)? = null) = launchOps(callback) {
+    fun Filter.trigger(callback: (suspend (Unit) -> Unit)? = null) = launchOps(callback) {
        enable = !enable
        EhDB.updateFilter(this)
    }
-    fun Filter.forget(callback: ((Unit) -> Unit)? = null) = launchOps(callback) {
+    fun Filter.forget(callback: (suspend (Unit) -> Unit)? = null) = launchOps(callback) {
        EhDB.deleteFilter(this)
        filters.await().remove(this)
    }
@@ -19,6 +19,11 @@ 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 com.hippo.ehviewer.Settings
+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
@@ -38,13 +43,9 @@ 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)
+    addHeader("User-Agent", Settings.userAgent)
    addHeader("Accept", CHROME_ACCEPT)
    addHeader("Accept-Language", CHROME_ACCEPT_LANGUAGE)
    referer?.let { addHeader("Referer", it) }
@@ -24,6 +24,8 @@ 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
@@ -42,8 +44,6 @@ 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"
@@ -55,7 +55,6 @@ object EhTagDatabase : CoroutineScope {
    )
    private lateinit var tagGroups: Map<String, Map<String, String>>
    private val updateLock = Mutex()
-    private val dbLock = Mutex()
    override val coroutineContext = Dispatchers.IO + Job()

    var initialized by mutableStateOf(false)
@@ -202,42 +201,42 @@ object EhTagDatabase : CoroutineScope {
        }
    }

-    private suspend fun issueUpdateInMemoryData() {
-        dbLock.withLock {
-            getMetadata(appCtx)?.let { urls ->
-                val dataName = urls[2]
-                val dir = AppConfig.getFilesDir("tag-translations")
-                val dataFile = File(dir, dataName).takeIf { it.exists() } ?: return
-                runSuspendCatching {
-                    tagGroups = dataFile.source().buffer().use(BufferedSource::parseAs)
-                    initialized = true
-                }.onFailure {
-                    it.printStackTrace()
-                }
-            }
-        }
+    private fun issueUpdateInMemoryData(file: File? = null) {
+        val dataFile = file ?: getMetadata(appCtx)?.let { metadata ->
+            val dataName = metadata[2]
+            val dir = AppConfig.getFilesDir("tag-translations")
+            File(dir, dataName).takeIf { it.exists() }
+        } ?: return
+        tagGroups = dataFile.source().buffer().use(BufferedSource::parseAs)
+        initialized = true
    }

    init {
        launch {
-            issueUpdateInMemoryData()
+            updateLock.withLock {
+                runSuspendCatching {
+                    issueUpdateInMemoryData()
+                }.onFailure {
+                    it.printStackTrace()
+                }
+                updateInternal()
+            }
        }
    }

    private suspend fun updateInternal() {
-        val urls = getMetadata(appCtx)
-        urls?.let {
-            val sha1Name = urls[0]
-            val sha1Url = urls[1]
-            val dataName = urls[2]
-            val dataUrl = urls[3]
+        getMetadata(appCtx)?.let { metadata ->
+            val sha1Name = metadata[0]
+            val sha1Url = metadata[1]
+            val dataName = metadata[2]
+            val dataUrl = metadata[3]

            val dir = AppConfig.getFilesDir("tag-translations")
            checkNotNull(dir)
            val sha1File = File(dir, sha1Name)
            val dataFile = File(dir, dataName)

-            runCatching {
+            runSuspendCatching {
                // Check current sha1 and current data
                val sha1 = getFileContent(sha1File)
                if (!checkData(sha1, dataFile)) {
@@ -254,7 +253,7 @@ object EhTagDatabase : CoroutineScope {
                if (tempSha1 == sha1) {
                    // The data is the same
                    FileUtils.delete(tempSha1File)
-                    return@runCatching
+                    return
                }

                // Save new data
@@ -265,7 +264,7 @@ object EhTagDatabase : CoroutineScope {
                if (!checkData(tempSha1, tempDataFile)) {
                    FileUtils.delete(tempSha1File)
                    FileUtils.delete(tempDataFile)
-                    return@runCatching
+                    return
                }

                // Replace current sha1 and current data with new sha1 and new data
@@ -275,7 +274,7 @@ object EhTagDatabase : CoroutineScope {
                tempDataFile.renameTo(dataFile)

                // Read new EhTagDatabase
-                issueUpdateInMemoryData()
+                issueUpdateInMemoryData(dataFile)
            }.onFailure {
                it.printStackTrace()
            }
@@ -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 = HOST_EX + "api.php"
+    const val API_EX = "https://s.exhentai.org/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 = HOST_E + "api.php"
+    const val API_E = "https://api.e-hentai.org/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,10 +64,14 @@ object EhUrl {
        }

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

    val referer: String
@@ -126,12 +126,18 @@ object EhUtils {
            MISC -> BG_COLOR_MISC
            else -> BG_COLOR_UNKNOWN
        }.toInt()
-        return harmonizeWithRole(context, primary)
+        return if (Settings.harmonizeCategoryColor) {
+            harmonizeWithRole(context, primary)
+        } else {
+            primary
+        }
    }

    @Composable
    fun getCategoryColor(category: Int) = Color(getCategoryColor(LocalContext.current, category))

+    val categoryTextColor = Color(0xffe6e0e9)
+
    fun signOut() {
        EhCookieStore.signOut()
        Settings.avatar = null
@@ -140,10 +146,6 @@ object EhUtils {
        Settings.needSignIn = true
    }

-    fun needSignedIn(): Boolean {
-        return Settings.needSignIn
-    }
-
    fun getSuitableTitle(gi: GalleryInfo): String {
        return if (Settings.showJpnTitle) {
            if (gi.titleJpn.isNullOrEmpty()) gi.title else gi.titleJpn
@@ -25,7 +25,7 @@ import kotlinx.parcelize.Parcelize

@Parcelize
@Entity(tableName = "GALLERIES")
-open class BaseGalleryInfo(
+data class BaseGalleryInfo(
    @PrimaryKey
    @ColumnInfo(name = "GID")
    override var gid: Long = 0,
@@ -43,67 +43,29 @@ interface GalleryInfo {
            ?: title?.let { generateSLangFromTitle(it) }
    }

-    private fun generateSLangFromTags(simpleTags: List<String>): String? {
-        for (tag in simpleTags) {
-            for (i in S_LANGS.indices) {
-                if (S_LANG_TAGS[i] == tag) {
-                    return S_LANGS[i]
-                }
-            }
-        }
-        return null
-    }
-
-    private fun generateSLangFromTitle(title: String): String? {
-        for (i in S_LANGS.indices) {
-            if (S_LANG_PATTERNS[i].matcher(title).find()) {
-                return S_LANGS[i]
-            }
-        }
-        return null
-    }
-
    companion object {
-        /**
-         * ISO 639-1
-         */
-        const val S_LANG_JA = "JA"
-        const val S_LANG_EN = "EN"
-        const val S_LANG_ZH = "ZH"
-        const val S_LANG_NL = "NL"
-        const val S_LANG_FR = "FR"
-        const val S_LANG_DE = "DE"
-        const val S_LANG_HU = "HU"
-        const val S_LANG_IT = "IT"
-        const val S_LANG_KO = "KO"
-        const val S_LANG_PL = "PL"
-        const val S_LANG_PT = "PT"
-        const val S_LANG_RU = "RU"
-        const val S_LANG_ES = "ES"
-        const val S_LANG_TH = "TH"
-        const val S_LANG_VI = "VI"
-
        val S_LANGS = arrayOf(
-            S_LANG_EN,
-            S_LANG_ZH,
-            S_LANG_ES,
-            S_LANG_KO,
-            S_LANG_RU,
-            S_LANG_FR,
-            S_LANG_PT,
-            S_LANG_TH,
-            S_LANG_DE,
-            S_LANG_IT,
-            S_LANG_VI,
-            S_LANG_PL,
-            S_LANG_HU,
-            S_LANG_NL,
+            "EN",
+            "ZH",
+            "ES",
+            "KO",
+            "RU",
+            "FR",
+            "PT",
+            "TH",
+            "DE",
+            "IT",
+            "VI",
+            "PL",
+            "HU",
+            "NL",
        )
-        val S_LANG_PATTERNS = arrayOf(
+        private val S_LANG_PATTERNS = arrayOf(
            Pattern.compile(
                "[(\\[]eng(?:lish)?[)\\]]|英訳",
                Pattern.CASE_INSENSITIVE,
-            ), // [(（\[]ch(?:inese)?[)）\]]|[汉漢]化|中[国國][语語]|中文|中国翻訳
+            ),
+            // [(（\[]ch(?:inese)?[)）\]]|[汉漢]化|中[国國][语語]|中文|中国翻訳
            Pattern.compile(
                "[(\uFF08\\[]ch(?:inese)?[)\uFF09\\]]|[汉漢]化|中[国國][语語]|中文|中国翻訳",
                Pattern.CASE_INSENSITIVE,
@@ -130,7 +92,7 @@ interface GalleryInfo {
            Pattern.compile("[(\\[]hun(?:garian)?[)\\]]|ハンガリー翻訳", Pattern.CASE_INSENSITIVE),
            Pattern.compile("[(\\[]dutch[)\\]]|オランダ翻訳", Pattern.CASE_INSENSITIVE),
        )
-        val S_LANG_TAGS = arrayOf(
+        private val S_LANG_TAGS = arrayOf(
            "language:english",
            "language:chinese",
            "language:spanish",
@@ -147,6 +109,26 @@ interface GalleryInfo {
            "language:dutch",
        )

+        private fun generateSLangFromTags(simpleTags: List<String>): String? {
+            for (tag in simpleTags) {
+                for (i in S_LANGS.indices) {
+                    if (S_LANG_TAGS[i] == tag) {
+                        return S_LANGS[i]
+                    }
+                }
+            }
+            return null
+        }
+
+        private fun generateSLangFromTitle(title: String): String? {
+            for (i in S_LANGS.indices) {
+                if (S_LANG_PATTERNS[i].matcher(title).find()) {
+                    return S_LANGS[i]
+                }
+            }
+            return null
+        }
+
        const val NOT_FAVORITED = -2
        const val LOCAL_FAVORITED = -1
    }
@@ -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,66 +320,67 @@ data class ListUrlBuilder(
                    // Pages
                    if (pageFrom != -1 || pageTo != -1) {
                        addQueryParameter("f_sp", "on")
-                        addQueryParameter(
+                        addQueryParameterIfNotBlank(
                            "f_spf",
-                            (if (pageFrom != -1) pageFrom.toString() else "").toString(),
+                            pageFrom.takeUnless { it == -1 }?.toString(),
                        )
-                        addQueryParameter(
+                        addQueryParameterIfNotBlank(
                            "f_spt",
-                            (if (pageTo != -1) pageTo.toString() else "").toString(),
+                            pageTo.takeUnless { it == -1 }?.toString(),
                        )
                    }
                }
            }.toString()

            MODE_UPLOADER -> {
-                val sb = StringBuilder(EhUrl.host)
-                mKeyword?.let {
-                    sb.append("uploader/")
-                    sb.append(encodeUTF8(it))
+                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)
+                    }
                }
-                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 -> {
-                val sb = StringBuilder(EhUrl.host)
-                mKeyword?.let {
-                    sb.append("tag/")
-                    sb.append(encodeUTF8(it))
+                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)
+                    }
                }
-                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 -> {
-                val sb = StringBuilder(EhUrl.HOST_E)
-                sb.append("toplist.php?tl=")
-                mKeyword.orEmpty().let {
-                    sb.append(encodeUTF8(it))
+                buildString {
+                    append(EhUrl.HOST_E)
+                    append("toplist.php?tl=")
+                    mKeyword.orEmpty().let {
+                        append(encodeUTF8(it))
+                    }
+                    mJumpTo?.let {
+                        append("&p=").append(it)
+                    }
                }
-                mJumpTo?.let {
-                    sb.append("&p=").append(it)
-                }
-                sb.toString()
            }

            else -> throw IllegalStateException("Unexpected value: $mode")
@@ -16,16 +16,7 @@
 package com.hippo.ehviewer.client.exception

 class ParseException : EhException {
-    val body: String
+    constructor(detailMessage: String?) : super(detailMessage)

-    constructor(detailMessage: String?, body: String) : super(detailMessage) {
-        this.body = body
-    }
-
-    constructor(detailMessage: String?, body: String, cause: Throwable?) : super(
-        detailMessage,
-        cause,
-    ) {
-        this.body = body
-    }
+    constructor(detailMessage: String?, cause: Throwable?) : super(detailMessage, cause)
 }
@@ -0,0 +1,5 @@
+package com.hippo.ehviewer.client.exception
+
+import com.hippo.ehviewer.R
+
+class QuotaExceededException : EhException(R.string.error_509)
@@ -1,18 +1,19 @@
 package com.hippo.ehviewer.client.parser

-import com.hippo.ehviewer.R
-import com.hippo.ehviewer.client.exception.EhException
+import com.hippo.ehviewer.client.exception.NotLoggedInException
 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 EhException(appCtx.getString(R.string.need_sign_in))
+            throw NotLoggedInException()
        }
        val catArray = arrayOfNulls<String>(10)
-        val countArray = parseFav(body, catArray)
-        if (countArray.isEmpty()) throw ParseException("Parse favorites error", body)
+        val countArray = runCatching {
+            parseFav(body, catArray).also { check(it.isNotEmpty()) }
+        }.getOrElse {
+            throw ParseException("Parse favorites error", it)
+        }
        val result = GalleryListParser.parse(body)
        return Result(catArray.requireNoNulls(), countArray, result)
    }
@@ -17,6 +17,7 @@ package com.hippo.ehviewer.client.parser

 import arrow.core.unzip
 import com.hippo.ehviewer.EhDB
+import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhFilter
 import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.client.EhUtils.getCategory
@@ -41,6 +42,10 @@ 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
@@ -48,10 +53,6 @@ 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>")
@@ -114,9 +115,9 @@ object GalleryDetailParser {
            gd.token = groupValues[2]
            gd.apiUid = groupValues[3].toLongOrNull() ?: -1L
            gd.apiKey = groupValues[4]
-        } ?: throw ParseException("Can't parse gallery detail", body)
+        } ?: throw ParseException("Can't parse gallery detail")
        if (gd.gid == -1L) {
-            throw ParseException("Can't parse gallery detail", body)
+            throw ParseException("Can't parse gallery detail")
        }
        PATTERN_TORRENT.find(body)?.run {
            gd.torrentUrl = groupValues[1].trim().unescapeXml()
@@ -214,7 +215,7 @@ object GalleryDetailParser {
            }
        } catch (e: Throwable) {
            ExceptionUtils.throwIfFatal(e)
-            throw ParseException("Can't parse gallery detail", body)
+            throw ParseException("Can't parse gallery detail")
        }

        // newer version
@@ -394,7 +395,7 @@ object GalleryDetailParser {
            // filter comment
            if (!comment.uploader) {
                val sEhFilter = EhFilter
-                if (sEhFilter.filterCommenter(comment.user!!) || sEhFilter.filterComment(comment.comment!!)) {
+                if (comment.score <= Settings.commentThreshold || sEhFilter.filterCommenter(comment.user!!) || sEhFilter.filterComment(comment.comment!!)) {
                    return null
                }
            }
@@ -450,7 +451,7 @@ object GalleryDetailParser {
     */
    fun parsePreviewPages(body: String): Int {
        return PATTERN_PREVIEW_PAGES.find(body)?.groupValues?.get(1)?.toIntOrNull()
-            ?: throw ParseException("Parse preview page count error", body)
+            ?: throw ParseException("Parse preview page count error")
    }

    /**
@@ -458,7 +459,7 @@ object GalleryDetailParser {
     */
    fun parsePages(body: String): Int {
        return PATTERN_PAGES.find(body)?.groupValues?.get(1)?.toIntOrNull()
-            ?: throw ParseException("Parse pages error", body)
+            ?: throw ParseException("Parse pages error")
    }

    fun parsePreviewList(body: String): Pair<List<GalleryPreview>, List<String>> {
@@ -25,8 +25,10 @@ object GalleryListParser {
        if (body.contains("No hits found</p>")) {
            throw EhException(R.string.gallery_list_empty_hit)
        }
-        throw ParseException("Can't parse gallery list", body, it)
+        throw ParseException("Can't parse gallery list", it)
    }
+
+    val emptyResult = GalleryListResult(null, null, arrayListOf())
 }

 class GalleryListResult(
@@ -33,7 +33,7 @@ object GalleryMultiPageViewerPTokenParser {
            imagelist.parseAs<List<Item>>().map(Item::token)
        }.getOrElse {
            ExceptionUtils.throwIfFatal(it)
-            throw ParseException("Parse pToken from MPV error", body, it)
+            throw ParseException("Parse pToken from MPV error", it)
        }
    }

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

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

    class Result(val imageUrl: String, val skipHathKey: String?, val originImageUrl: String?)
@@ -56,7 +56,7 @@ object GalleryPageParser {
        return if (!imageUrl.isNullOrEmpty() && !showKey.isNullOrEmpty()) {
            Result(imageUrl, skipHathKey, originImageUrl, showKey)
        } else {
-            throw ParseException("Parse image url and show error", body)
+            throw ParseException("Parse image url and show error")
        }
    }

@@ -3,14 +3,16 @@ 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 kotlinx.parcelize.Parcelize
 import java.nio.ByteBuffer
+import kotlinx.parcelize.Parcelize

 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) = parseLimit(body)
+    fun parse(body: ByteBuffer) = runCatching {
+        parseLimit(body)
+    }.getOrElse { throw ParseException("Parse image limits error", it) }

    fun parseResetLimits(body: String) {
        if (body.contains(INSUFFICIENT_FUNDS)) {
@@ -24,7 +26,7 @@ object HomeParser {
            val fundsGP = ParserUtils.parseInt(get(2), 0) * 1000
            return Funds(fundsGP, fundsC)
        }
-        throw ParseException("Parse funds error", body)
+        throw ParseException("Parse funds error")
    }

    @Parcelize
@@ -46,7 +46,7 @@ object ProfileParser {
            Result(displayName, avatar)
        }.getOrElse {
            ExceptionUtils.throwIfFatal(it)
-            throw ParseException("Parse forums error", body)
+            throw ParseException("Parse forums error")
        }
    }

@@ -35,7 +35,7 @@ object SignInParser {
            if (m.find()) {
                throw EhException(m.group(1) ?: m.group(2))
            } else {
-                throw ParseException("Can't parse sign in", body)
+                throw ParseException("Can't parse sign in")
            }
        }
    }
@@ -1,9 +1,12 @@
 package com.hippo.ehviewer.client.parser

+import com.hippo.ehviewer.client.exception.ParseException
 import java.nio.ByteBuffer

 object TorrentParser {
-    fun parse(body: ByteBuffer) = parseTorrent(body)
+    fun parse(body: ByteBuffer) = runCatching {
+        parseTorrent(body)
+    }.getOrElse { throw ParseException("Can't parse torrent list", it) }
 }

 class Torrent(
@@ -15,6 +15,7 @@ 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

 /**
@@ -27,7 +28,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) {
-                disableCache()
+                noCache()
            }.execute {
                diskCache.suspendEdit(diskCacheKey) {
                    RandomAccessFile(data.toFile(), "rw").use {