Release 1.8.9.6-gms

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

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

  - type: textarea
@@ -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: true
+      required: false

  - type: textarea
    id: more
@@ -79,15 +79,6 @@ 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:
@@ -141,11 +132,14 @@ body:
        请确认您已经遵守所有必选项
        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: 您已搜索过 [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 版本](https://github.com/FooIbar/EhViewer/actions)测试，并且该问题在最新 CI 版本中并未解决 / This bug have not solved in latest [CI version](https://github.com/FooIbar/EhViewer/actions)
+      - label: 您确保已使用最新 CI 版本测试，并且该问题在最新 CI 版本中并未解决 / This bug have not solved in latest CI version
        required: true
@@ -1,65 +0,0 @@
-name: Baseline profile generation
-
-on:
-  schedule:
-    - cron: '30 0 * * *'
-  workflow_dispatch:
-  push:
-    branches:
-      - '**'
-    paths:
-      - 'benchmark/**'
-      - '.github/workflows/baseline-profile.yml'
-
-jobs:
-  baseline-profile:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Free disk space
-        run: rm -rf $AGENT_TOOLSDIRECTORY
-
-      - name: Enable KVM group perms
-        run: |
-          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-          sudo udevadm control --reload-rules
-          sudo udevadm trigger --name-match=kvm
-
-      - name: Checkout
-        uses: actions/checkout@v5
-
-      - name: Setup Java
-        uses: actions/setup-java@v5
-        with:
-          distribution: temurin
-          java-version: 21
-
-      - name: Install Rust Toolchain
-        run: rustup target add armv7-linux-androideabi
-
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: "./app/src/main/rust"
-
-      - name: CMake Cache
-        uses: actions/cache/restore@v4
-        with:
-          path: app/.cxx
-          key: cmake-
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
-        with:
-          cache-encryption-key: ${{ secrets.GradleEncryptionKey }}
-          cache-read-only: true
-
-      - name: Generate Baseline Profile
-        run: ./gradlew generateBaselineProfile
-          -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect"
-
-      - name: Upload reports
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: reports
-          path: benchmark/build/reports
@@ -4,30 +4,31 @@ on:
  push:
    branches:
      - '*'
-  pull_request:
-  workflow_dispatch:
+    tags-ignore:
+      - "*"

 jobs:
-  check:
+  linux:
+    name: Build
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+        with:
+          submodules: 'recursive'

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

      - name: Install Rust Toolchain
-        run: rustup target add armv7-linux-androideabi
-
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: "./app/src/main/rust"
-          shared-key: ${{ runner.os }}
+        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
@@ -35,162 +36,44 @@ jobs:

      - name: Clippy Check
        working-directory: ./app/src/main/rust
-        run: cargo clippy --target aarch64-linux-android --all-features -- -D warnings
+        run: cargo clippy --all-targets --all-features -- -D warnings

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

-      - name: Check build-logic
-        run: ./gradlew :build-logic:convention:check
-
-      - name: Spotless Check
-        run: ./gradlew spotlessCheck
-
-      - name: Lint Check
-        run: ./gradlew lintMarshmallowRelease
-
-  default:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-
-      - name: Setup Java
-        uses: actions/setup-java@v5
+      - name: Update ARM64
+        uses: actions/upload-artifact@v3
        with:
-          distribution: temurin
-          java-version: 21
+          name: arm64-v8a-${{ github.sha }}
+          path: app/build/outputs/apk/release/app-arm64-v8a-release.apk

-      - name: Install Rust Toolchain
-        run: rustup target add armv7-linux-androideabi
-
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2
+      - name: Update x86_64
+        uses: actions/upload-artifact@v3
        with:
-          workspaces: "./app/src/main/rust"
-          shared-key: ${{ runner.os }}
-          save-if: "false"
+          name: x86_64-${{ github.sha }}
+          path: app/build/outputs/apk/release/app-x86_64-release.apk

-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
+      - name: Update ARM32
+        uses: actions/upload-artifact@v3
        with:
-          cache-encryption-key: ${{ secrets.GradleEncryptionKey }}
+          name: armeabi-v7a-${{ github.sha }}
+          path: app/build/outputs/apk/release/app-armeabi-v7a-release.apk

-      - name: CMake Cache
-        uses: actions/cache@v4
+      - name: Update x86
+        uses: actions/upload-artifact@v3
        with:
-          path: app/.cxx
-          key: cmake-default-${{ hashFiles('rust-toolchain.toml', 'settings.gradle.kts', 'app/src/main/cpp/CMakeLists.txt', 'app/src/main/rust/Cargo.lock') }}
-          restore-keys: cmake-default-
+          name: x86-${{ github.sha }}
+          path: app/build/outputs/apk/release/app-x86-release.apk

-      # https://github.com/mikepenz/AboutLibraries/issues/1225
-      - name: Generate aboutlibraries.json
-        run: ./gradlew :app:prepareLibraryDefinitionsDefaultRelease --rerun
-
-      - name: Build
-        run: ./gradlew assembleDefaultRelease
-
-      - name: Upload ARM64
-        uses: actions/upload-artifact@v4
+      - name: Update mapping
+        uses: actions/upload-artifact@v3
        with:
-          name: default-arm64-v8a-${{ github.sha }}
-          path: app/build/outputs/apk/default/release/app-default-arm64-v8a-release.apk
-
-      - name: Upload x86_64
-        uses: actions/upload-artifact@v4
-        with:
-          name: default-x86_64-${{ github.sha }}
-          path: app/build/outputs/apk/default/release/app-default-x86_64-release.apk
-
-      - name: Upload ARM32
-        uses: actions/upload-artifact@v4
-        with:
-          name: default-armeabi-v7a-${{ github.sha }}
-          path: app/build/outputs/apk/default/release/app-default-armeabi-v7a-release.apk
-
-      - name: Upload mapping
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: default-mapping-${{ github.sha }}
-          path: app/build/outputs/mapping/defaultRelease
-
-      - name: Upload native debug symbols
-        uses: actions/upload-artifact@v4
-        with:
-          name: default-native-debug-symbols-${{ github.sha }}
-          path: app/build/outputs/native-debug-symbols/defaultRelease/native-debug-symbols.zip
-
-  marshmallow:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-
-      - name: Setup Java
-        uses: actions/setup-java@v5
-        with:
-          distribution: temurin
-          java-version: 21
-
-      - name: Install Rust Toolchain
-        run: rustup target add armv7-linux-androideabi
-
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: "./app/src/main/rust"
-          shared-key: ${{ runner.os }}
-          save-if: "false"
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
-        with:
-          cache-encryption-key: ${{ secrets.GradleEncryptionKey }}
-
-      - name: CMake Cache
-        uses: actions/cache@v4
-        with:
-          path: app/.cxx
-          key: cmake-marshmallow-${{ hashFiles('rust-toolchain.toml', 'settings.gradle.kts', 'app/src/main/cpp/CMakeLists.txt', 'app/src/main/rust/Cargo.lock') }}
-          restore-keys: cmake-marshmallow-
-
-      # https://github.com/mikepenz/AboutLibraries/issues/1225
-      - name: Generate aboutlibraries.json
-        run: ./gradlew :app:prepareLibraryDefinitionsMarshmallowRelease --rerun
-
-      - name: Build
-        run: ./gradlew assembleMarshmallowRelease
-
-      - name: Upload ARM64
-        uses: actions/upload-artifact@v4
-        with:
-          name: marshmallow-arm64-v8a-${{ github.sha }}
-          path: app/build/outputs/apk/marshmallow/release/app-marshmallow-arm64-v8a-release.apk
-
-      - name: Upload x86_64
-        uses: actions/upload-artifact@v4
-        with:
-          name: marshmallow-x86_64-${{ github.sha }}
-          path: app/build/outputs/apk/marshmallow/release/app-marshmallow-x86_64-release.apk
-
-      - name: Upload ARM32
-        uses: actions/upload-artifact@v4
-        with:
-          name: marshmallow-armeabi-v7a-${{ github.sha }}
-          path: app/build/outputs/apk/marshmallow/release/app-marshmallow-armeabi-v7a-release.apk
-
-      - name: Upload mapping
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: marshmallow-mapping-${{ github.sha }}
-          path: app/build/outputs/mapping/marshmallowRelease
-
-      - name: Upload native debug symbols
-        uses: actions/upload-artifact@v4
-        with:
-          name: marshmallow-native-debug-symbols-${{ github.sha }}
-          path: app/build/outputs/native-debug-symbols/marshmallowRelease/native-debug-symbols.zip
+          name: mapping-${{ github.sha }}
+          path: app/build/outputs/mapping/release/mapping.txt
+          retention-days: 5
@@ -1,21 +0,0 @@
-name: 'Lock Threads'
-
-on:
-  schedule:
-    - cron: '0 8 * * *'
-  workflow_dispatch:
-
-permissions:
-  issues: write
-
-concurrency:
-  group: lock-threads
-
-jobs:
-  action:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dessant/lock-threads@v5
-        with:
-          issue-inactive-days: '1'
-          process-only: 'issues'
@@ -0,0 +1,66 @@
+name: Pull Request Check
+
+on: [ pull_request ]
+
+jobs:
+  linux:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+        with:
+          submodules: 'recursive'
+
+      - name: Setup Java 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 17
+
+      - name: Install NDK
+        run: |
+          echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;26.0.10636728" --channel=1 --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
+
+      - name: Install Rust Toolchain
+        run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android && rustup component add rustfmt clippy
+
+      - name: Rustfmt Check
+        working-directory: ./app/src/main/rust
+        run: cargo fmt --all -- --check
+
+      - name: Clippy Check
+        working-directory: ./app/src/main/rust
+        run: cargo clippy --all-targets --all-features -- -D warnings
+
+      - name: Ktlint Check
+        run: ./gradlew ktlintCheck
+
+      - name: Gradle Build
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: assembleRelease
+
+      - name: Update ARM64
+        uses: actions/upload-artifact@v3
+        with:
+          name: arm64-v8a-${{ github.sha }}
+          path: app/build/outputs/apk/release/app-arm64-v8a-release.apk
+
+      - name: Update x86_64
+        uses: actions/upload-artifact@v3
+        with:
+          name: x86_64-${{ github.sha }}
+          path: app/build/outputs/apk/release/app-x86_64-release.apk
+
+      - name: Update ARM32
+        uses: actions/upload-artifact@v3
+        with:
+          name: armeabi-v7a-${{ github.sha }}
+          path: app/build/outputs/apk/release/app-armeabi-v7a-release.apk
+
+      - name: Update x86
+        uses: actions/upload-artifact@v3
+        with:
+          name: x86-${{ github.sha }}
+          path: app/build/outputs/apk/release/app-x86-release.apk
@@ -6,91 +6,49 @@ on:
      - "*"

 jobs:
-  build:
+  linux:
+    name: Build
    runs-on: ubuntu-latest
    steps:
-      - name: Free disk space
-        run: rm -rf $AGENT_TOOLSDIRECTORY
-
-      - name: Enable KVM group perms
-        run: |
-          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-          sudo udevadm control --reload-rules
-          sudo udevadm trigger --name-match=kvm
-
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+        with:
+          submodules: 'recursive'

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

      - name: Install Rust Toolchain
-        run: rustup target add armv7-linux-androideabi
+        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
+      - name: Gradle Build
+        uses: gradle/gradle-build-action@v2
        with:
-          workspaces: "./app/src/main/rust"
-
-      - name: CMake Cache
-        uses: actions/cache/restore@v4
-        with:
-          path: app/.cxx
-          key: cmake-
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
-        with:
-          cache-encryption-key: ${{ secrets.GradleEncryptionKey }}
-          cache-read-only: true
-
-      - name: Generate Baseline Profile
-        run: ./gradlew generateBaselineProfile
-          -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect"
-
-      # https://github.com/mikepenz/AboutLibraries/issues/1225
-      - name: Generate aboutlibraries.json
-        run: ./gradlew
-          :app:prepareLibraryDefinitionsDefaultRelease --rerun
-          :app:prepareLibraryDefinitionsMarshmallowRelease --rerun
-
-      - name: Build
-        run: ./gradlew assembleRelease
+          arguments: assembleRelease

      - name: Rename Apks
        run: |
-          mv app/build/outputs/apk/default/release/app-default-universal-release.apk EhViewer-${{ github.ref_name }}-default-universal.apk
-          mv app/build/outputs/apk/default/release/app-default-arm64-v8a-release.apk EhViewer-${{ github.ref_name }}-default-arm64-v8a.apk
-          mv app/build/outputs/apk/default/release/app-default-x86_64-release.apk EhViewer-${{ github.ref_name }}-default-x86_64.apk
-          mv app/build/outputs/apk/default/release/app-default-armeabi-v7a-release.apk EhViewer-${{ github.ref_name }}-default-armeabi-v7a.apk
-          mv app/build/outputs/mapping/defaultRelease/mapping.txt EhViewer-${{ github.ref_name }}-default-mapping.txt
-          mv app/build/outputs/native-debug-symbols/defaultRelease/native-debug-symbols.zip EhViewer-${{ github.ref_name }}-default-native-debug-symbols.zip
-
-          mv app/build/outputs/apk/marshmallow/release/app-marshmallow-universal-release.apk EhViewer-${{ github.ref_name }}-marshmallow-universal.apk
-          mv app/build/outputs/apk/marshmallow/release/app-marshmallow-arm64-v8a-release.apk EhViewer-${{ github.ref_name }}-marshmallow-arm64-v8a.apk
-          mv app/build/outputs/apk/marshmallow/release/app-marshmallow-x86_64-release.apk EhViewer-${{ github.ref_name }}-marshmallow-x86_64.apk
-          mv app/build/outputs/apk/marshmallow/release/app-marshmallow-armeabi-v7a-release.apk EhViewer-${{ github.ref_name }}-marshmallow-armeabi-v7a.apk
-          mv app/build/outputs/mapping/marshmallowRelease/mapping.txt EhViewer-${{ github.ref_name }}-marshmallow-mapping.txt
-          mv app/build/outputs/native-debug-symbols/marshmallowRelease/native-debug-symbols.zip EhViewer-${{ github.ref_name }}-marshmallow-native-debug-symbols.zip
+          cp app/build/outputs/apk/release/app-universal-release.apk app/build/outputs/apk/release/EhViewer-universal.apk
+          cp app/build/outputs/apk/release/app-arm64-v8a-release.apk app/build/outputs/apk/release/EhViewer-arm64-v8a.apk
+          cp app/build/outputs/apk/release/app-x86_64-release.apk app/build/outputs/apk/release/EhViewer-x86_64.apk
+          cp app/build/outputs/apk/release/app-x86-release.apk app/build/outputs/apk/release/EhViewer-x86.apk
+          cp app/build/outputs/apk/release/app-armeabi-v7a-release.apk app/build/outputs/apk/release/EhViewer-armeabi-v7a.apk

      - name: Releases
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v1
        with:
          body: Bump Version
          files: |
-            EhViewer-${{ github.ref_name }}-default-universal.apk
-            EhViewer-${{ github.ref_name }}-default-arm64-v8a.apk
-            EhViewer-${{ github.ref_name }}-default-x86_64.apk
-            EhViewer-${{ github.ref_name }}-default-armeabi-v7a.apk
-            EhViewer-${{ github.ref_name }}-default-mapping.txt
-            EhViewer-${{ github.ref_name }}-default-native-debug-symbols.zip
-
-            EhViewer-${{ github.ref_name }}-marshmallow-universal.apk
-            EhViewer-${{ github.ref_name }}-marshmallow-arm64-v8a.apk
-            EhViewer-${{ github.ref_name }}-marshmallow-x86_64.apk
-            EhViewer-${{ github.ref_name }}-marshmallow-armeabi-v7a.apk
-            EhViewer-${{ github.ref_name }}-marshmallow-mapping.txt
-            EhViewer-${{ github.ref_name }}-marshmallow-native-debug-symbols.zip
+            app/build/outputs/apk/release/EhViewer-universal.apk
+            app/build/outputs/apk/release/EhViewer-arm64-v8a.apk
+            app/build/outputs/apk/release/EhViewer-x86_64.apk
+            app/build/outputs/apk/release/EhViewer-x86.apk
+            app/build/outputs/apk/release/EhViewer-armeabi-v7a.apk
+            app/build/outputs/mapping/release/mapping.txt
@@ -1,10 +1,10 @@
 .gradle
 /local.properties
 .DS_Store
-build
-.cxx
-.kotlin
+/build
+/src
 *.iml
 .idea
-.vscode
 /captures
+release
+google-services.json
@@ -0,0 +1,3 @@
+[submodule "app/src/main/cpp/nettle/nettle"]
+	path = app/src/main/cpp/nettle/nettle
+	url = https://github.com/Ehviewer-Overhauled/nettle
@@ -1,567 +0,0 @@
-# 变更日志
-
-## [1.14.5] - 2025-10-19
-
-### 改进
-
-* [阅读器] 显示画廊标题
-* [阅读器] 显示菜单时改变标题栏颜色
-
-### Bug 修复
-
-* 横屏模式下打开阅读器设置会闪退 [#2673](https://github.com/FooIbar/EhViewer/issues/2673)
-* 强制横屏时竖直拿取设备加载图片会横竖屏乱跳 [#2674](https://github.com/FooIbar/EhViewer/issues/2674)
-
-
-## [1.14.4] - 2025-10-12
-
-### 改进
-
-* [阅读器] 支持禁用使用音量键翻页 [#2593](https://github.com/FooIbar/EhViewer/issues/2593)
-* 视搜索警告为错误 [#2604](https://github.com/FooIbar/EhViewer/issues/2604)
-* 余额不足时停止下载并显示通知 [#2479](https://github.com/FooIbar/EhViewer/issues/2479)
-* [阅读器] 使用默认阅读模式时对带有 webtoon 标签的画廊自动使用条漫模式 [#2632](https://github.com/FooIbar/EhViewer/issues/2632)
-* 优化按页数排序下载项目的速度
-* 开启显示标签投票状态时为 power >= 100 的标签添加下划线
-* 杂项优化
-
-### Bug 修复
-
-* Android 16 QPR1 上画廊详情中的标签文本对比度不足
-* 初始化 DownloadManager 用时过长导致 ANR [#2588](https://github.com/FooIbar/EhViewer/issues/2588)
-* 某些设备上无法下载名称较长的画廊 [#2607](https://github.com/FooIbar/EhViewer/issues/2607)
-* 评论区链接实际可点击区域比画面显示上的略长 [#2615](https://github.com/FooIbar/EhViewer/issues/2615)
-* 主页快速搜索再次打开出现以前的画廊重复出现在最上层 [#2628](https://github.com/FooIbar/EhViewer/issues/2628)
-* 非条漫模式下原始大小较小的动图不播放 [#2652](https://github.com/FooIbar/EhViewer/issues/2652)
-* Android 9 以下打开评论区切屏后回来会闪退 [#2655](https://github.com/FooIbar/EhViewer/issues/2655)
-* 杂项修复
-
-
-## [1.14.3] - 2025-09-01
-
-### 新功能
-
-* 支持以 label: 语法搜索下载标签
-
-### Bug 修复
-
-* [阅读器] 关闭滤镜设置时崩溃 [#2573](https://github.com/FooIbar/EhViewer/issues/2573)
-* 编辑评论时上下文菜单缺少格式化选项
-* 某些情况下搜索相似画廊时出错
-
-
-## [1.14.2] - 2025-08-16
-
-### 改进
-
-* [下载] 支持将最低下载速度设为 0 [#2545](https://github.com/FooIbar/EhViewer/issues/2545)
-* [下载] 移除令人困惑的连接超时设置 [#2556](https://github.com/FooIbar/EhViewer/issues/2556)
-
-### Bug 修复
-
-* 下载速度计算不准确导致下载失败误报 [#2545](https://github.com/FooIbar/EhViewer/issues/2545)
-* 无法解析带有 location: 标签的画廊
-
-
-## [1.14.1] - 2025-07-31
-
-### 改进
-
-* 更新 GitHub 访问令牌
-
-
-## [1.14.0] - 2025-07-23
-
-### 重大变更
-
-* 默认隐藏分数为 -100 的评论
-* 迁移部分组件到 Material 3 Expressive
-
-### 新功能
-
-* [EH] 支持显示标签投票状态
-* 支持添加画廊标签时自动补全
-* [下载] 支持指定连接超时和最低响应速度 [#1915](https://github.com/FooIbar/EhViewer/issues/1915)
-* [阅读器] 支持反转物理按键控制 [#1962](https://github.com/FooIbar/EhViewer/issues/1962)
-* [高级] 支持禁用 QUIC 支持
-* [高级] 重新添加桌面版网站选项以绕过 Cloudflare [#2230](https://github.com/FooIbar/EhViewer/issues/2230)
-* 支持 Android 6.0 上的动画 WebP
-
-### 改进
-
-* 优化压缩包加载性能
-* 优化预加载策略
-* 更新日本语翻译
-* 为已选中的项目使用不同的颜色 [#2121](https://github.com/FooIbar/EhViewer/issues/2121)
-* 缩略图模式下显示已收藏图标 [#2128](https://github.com/FooIbar/EhViewer/issues/2128)
-* 迁移大部分解析器到 Rust 实现
-* 优化动画 WebP 解码性能 [#2415](https://github.com/FooIbar/EhViewer/issues/2415)
-* 优化标签自动补全命中率 [#2473](https://github.com/FooIbar/EhViewer/issues/2473)
-* 在状态栏后绘制半透明背景以提高对比度
-* 杂项优化
-
-### Bug 修复
-
-* 退出阅读器时崩溃
-* Android 8.0 以下的设备无法读取某些压缩包
-* 列表模式下点击画廊封面无法进入详情页
-* 点击某些评论时崩溃
-* 开启裁剪边缘时某些图片被不正确裁剪
-* 下载数较多时无网络时启动 app 时崩溃 [#2041](https://github.com/FooIbar/EhViewer/issues/2041)
-* 标签翻译数据无法更新 [#2075](https://github.com/FooIbar/EhViewer/issues/2075)
-* 画廊详情页面显示的收藏夹名称错误 [#2081](https://github.com/FooIbar/EhViewer/issues/2081)
-* 不使用 CI 频道时无法更新
-* 添加后移动快捷搜索闪退 [#2124](https://github.com/FooIbar/EhViewer/issues/2124)
-* 某些数据无法导入
-* App 位于后台时清除下载通知时崩溃
-* 杂项修复
-
-
-## [1.13.1] - 2024-11-11
-
-### 重大变更
-
-* 由于网站限制，移除搜索封面功能
-* 移除桌面版网站选项，默认使用 1280x 分辨率
-
-### 改进
-
-* 更新日本语翻译
-* 优化压缩包读取
-* 缓解某些小米系统上应用闪退 [#1826](https://github.com/FooIbar/EhViewer/issues/1826)
-* 杂项优化
-
-### Bug 修复
-
-* Android 9 上的下载失败误报 [#1914](https://github.com/FooIbar/EhViewer/issues/1914)
-
-
-## [1.13.0] - 2024-11-01
-
-### 重大变更
-
-* 不再捆绑 Cronet 库，在不支持 HttpEngine 的设备上回退到 OkHttp
-* 适配 E 站缩略图和 WebP 等相关变更
-
-### 改进
-
-* 使用磁力链接代替种子下载
-* 在搜索栏右侧显示论坛头像
-* 支持重置下载路径
-* 为 Android 10 以下且没有 DocumentsUI 的设备创建默认下载目录 [#1735](https://github.com/FooIbar/EhViewer/issues/1735)
-* 重新添加了强制使用 e-hentai 缩略图服务器的选项
-* 阅读器支持 PageUp/PageDown 和方向键上/下翻页 [#1801](https://github.com/FooIbar/EhViewer/issues/1801)
-* 未找到搜索结果时显示可能存在的警告 [#1787](https://github.com/FooIbar/EhViewer/issues/1787)
-* 更新了日本语翻译
-* 杂项优化
-
-### Bug 修复
-
-* 阅读器屏幕方向与手机屏幕方向不同时闪退 [#1779](https://github.com/FooIbar/EhViewer/issues/1779)
-* 下载文件哈希不匹配导致下载失败 [#1811](https://github.com/FooIbar/EhViewer/issues/1811)
-* 无法同时下载和查看 [#1822](https://github.com/FooIbar/EhViewer/issues/1822)
-* 杂项修复
-
-
-## [1.12.1] - 2024-09-28
-
-### 新功能
-
-* 屏蔽含有二维码的图片（位于高级设置）
-
-### 改进
-
-* 移除高级设置中的自定义 User Agent，改为桌面版网站选项
-* 画廊预览与画廊详情页面合并
-* 为快速搜索和下载标签列表添加了滚动条
-* 无网络条件下启动时自动转到下载页面
-* 杂项优化
-
-### Bug 修复
-
-* 从左到右或右到左模式观看使用鼠标滚轮无法翻页 [#1541](https://github.com/FooIbar/EhViewer/issues/1541)
-* 状态栏颜色未跟随阅读器主题变化 [#1542](https://github.com/FooIbar/EhViewer/issues/1542)
-* 打开 EH 设置时闪退 [#1563](https://github.com/FooIbar/EhViewer/issues/1563)
-* 画廊种子过多时显示没有种子 [#1561](https://github.com/FooIbar/EhViewer/issues/1561)
-* 加载大于 100 MB 的位图时崩溃
-* 阅读器加载小圆圈在黑色背景下不自动变色 [#1579](https://github.com/FooIbar/EhViewer/issues/1579)
-* 因闪退造成的无法挽回的下载失败 [#1602](https://github.com/FooIbar/EhViewer/issues/1602)
-* 某些情况下闪退 [#1548](https://github.com/FooIbar/EhViewer/issues/1548) [#1555](https://github.com/FooIbar/EhViewer/issues/1555) [#1568](https://github.com/FooIbar/EhViewer/issues/1568)
-* Android 7.0 及以下的设备无法加载图片 [#1633](https://github.com/FooIbar/EhViewer/issues/1633)
-* 某些情况下导入数据失败 [#1634](https://github.com/FooIbar/EhViewer/issues/1634)
-* 下载时创建重复文件夹 [#1619](https://github.com/FooIbar/EhViewer/issues/1619)
-* 滚动方向改变后预载图片不生效 [#1560](https://github.com/FooIbar/EhViewer/issues/1560)
-* 选择无效的下载位置后闪退
-* 杂项修复
-
-
-## [1.12.0] - 2024-08-19
-
-### 重大变更
-
-* Compose 阅读器已稳定，移除了旧阅读器实现 [#847](https://github.com/FooIbar/EhViewer/issues/847)
-* 由于 E 站缩略图服务器变更，移除了强制使用 e-hentai 缩略图服务器的选项
-
-### 改进
-
-* 更新高级搜索选项中页数过滤器的范围限制以遵循 E 站变更
-
-### Bug 修复
-
-* 评论页面刷新指示器边距不正确 [#1428](https://github.com/FooIbar/EhViewer/issues/1428)
-* 关闭打开失败的压缩包时崩溃
-* 无法打开带密码的压缩包 [#1454](https://github.com/FooIbar/EhViewer/issues/1454)
-* 使用音量键翻页时无法关闭过渡动画 [#1467](https://github.com/FooIbar/EhViewer/issues/1467)
-* 带有图片的评论显示错位 [#1468](https://github.com/FooIbar/EhViewer/issues/1468)
-* 在包含相同项目的页面间切换时崩溃 [#1490](https://github.com/FooIbar/EhViewer/issues/1490)
-* 无法检查更新 [#1512](https://github.com/FooIbar/EhViewer/issues/1512)
-* 画廊详情未加载完成时退出阅读器导致崩溃 [#1507](https://github.com/FooIbar/EhViewer/issues/1507)
-* 无法为带有临时标签的画廊生成 ComicInfo.xml [#1509](https://github.com/FooIbar/EhViewer/issues/1509)
-* 已下载的画廊翻页时出现加载动画 [#1510](https://github.com/FooIbar/EhViewer/issues/1510)
-* 画廊详情页面的缩略图无法加载 [#1529](https://github.com/FooIbar/EhViewer/issues/1529)
-* 图片未加载完成时无法通过点击翻页
-* 搜索结果为空时解析失败 [#1418](https://github.com/FooIbar/EhViewer/issues/1418)
-* 缩略图分辨率设置不起作用
-
-
-## [1.11.7] - 2024-07-10
-
-### Bug 修复
-
-* 无法下载标题包含 # 或 % 的画廊
-* 下载页数较多的画廊时应用无响应
-* 退出搜索栏时文本闪烁
-
-
-## [1.11.6] - 2024-07-09 [YANKED]
-
-### 改进
-
-* 某些设备上无法加载长图时可尝试减小 设置-高级 中的硬件位图阈值 [#1321](https://github.com/FooIbar/EhViewer/issues/1321)
-* 清理下载冗余时显示确认对话框 [#1369](https://github.com/FooIbar/EhViewer/issues/1369)
-* 修改收藏时显示收藏备注 [#1392](https://github.com/FooIbar/EhViewer/issues/1392)
-
-### Bug 修复
-
-* 图片完整性校验误报 [#1286](https://github.com/FooIbar/EhViewer/issues/1286)
-* 某些情况下应用崩溃 [#1290](https://github.com/FooIbar/EhViewer/issues/1290) [#1302](https://github.com/FooIbar/EhViewer/issues/1302)
-* 某些情况下渲染问题 [#1284](https://github.com/FooIbar/EhViewer/issues/1284)
-* 无法下载标题过长的画廊 [#1340](https://github.com/FooIbar/EhViewer/issues/1340)
-* 某些界面拖动滚动条时黑屏 [#1329](https://github.com/FooIbar/EhViewer/issues/1329)
-* 搜索栏多行文本遮挡其他内容 [#1365](https://github.com/FooIbar/EhViewer/issues/1365)
-* CIFS Documents Provider 兼容问题 [#1356](https://github.com/FooIbar/EhViewer/issues/1356)
-* 清理下载冗余未按预期运行 [#1369](https://github.com/FooIbar/EhViewer/issues/1369)
-* 读取压缩包失败时崩溃
-* 某些设备上崩溃 [#1276](https://github.com/FooIbar/EhViewer/issues/1276)
-* 检查更新失效
-
-
-## [1.11.6-RC2] - 2024-06-06
-
-### 改进
-
-* 下载图片时执行完整性校验以防止文件损坏/被篡改
-
-
-## [1.11.6-RC1] - 2024-06-02
-
-### 改进
-
-* 下载列表默认显示全部下载项目
-* 替换搜索文本中的换行符为空格 [#1258](https://github.com/FooIbar/EhViewer/issues/1258)
-
-### Bug 修复
-
-* 评价画廊时未使用输入的评分
-* 搜索时意外选择 Non-H 类别 [#1246](https://github.com/FooIbar/EhViewer/issues/1246)
-* 侧边栏与导航抽屉重叠 [#1262](https://github.com/FooIbar/EhViewer/issues/1262)
-* 快速搜索/下载标签排序失效 [#1267](https://github.com/FooIbar/EhViewer/issues/1267)
-* 加载压缩包/种子列表出错时 UI 冻结
-* 低版本 Android 上某些 UI 被遮挡
-
-
-## [1.11.5] - 2024-05-19
-
-### 重大变更
-
-* 不再支持 32 位 x86
-
-### 新功能
-
-* 支持按作者对下载分组
-* 由于 E 站不再强制要求人机验证，重新支持账号密码登录
-
-### 改进
-
-* 在登录时加载收藏名称 [#1077](https://github.com/FooIbar/EhViewer/issues/1077)
-* 优化归档和种子界面 UI
-* 禁止在 cookie 界面截图以防止泄露
-* 在缩略图模式下显示画廊页数
-* 记住最低评分和页数搜索参数
-* 更新 User-Agent 以缓解 IP 封禁 [#1182](https://github.com/FooIbar/EhViewer/issues/1182)
-* 账号密码登录支持自动填充
-* 更新中文（台灣）翻译
-
-### Bug 修复
-
-* 非触摸模式下无法退出搜索界面 [#1060](https://github.com/FooIbar/EhViewer/issues/1060)
-* 某些设备上无法安装更新 [#1067](https://github.com/FooIbar/EhViewer/issues/1067)
-* 某些设备上崩溃/卡顿 [#996](https://github.com/FooIbar/EhViewer/issues/996) [#1023](https://github.com/FooIbar/EhViewer/issues/1023)
-* 搜索记录中存在重复条目时崩溃 [#1130](https://github.com/FooIbar/EhViewer/issues/1130)
-* 条漫模式下缩小后点按区域偏移 [#127](https://github.com/FooIbar/EhViewer/issues/127)
-* 多窗口模式下点按区域偏移
-* 点击下载通知时未清除状态
-* 保存未完成加载的图片时崩溃 [#1154](https://github.com/FooIbar/EhViewer/issues/1154)
-* 历史记录界面无法在项目上滑动打开抽屉 [#464](https://github.com/FooIbar/EhViewer/issues/464)
-* 导入数据失败时显示导入成功 [#1174](https://github.com/FooIbar/EhViewer/issues/1174)
-* 某些条件下收藏界面崩溃 [#1190](https://github.com/FooIbar/EhViewer/issues/1190)
-* 反转点按区域功能失效 [#1217](https://github.com/FooIbar/EhViewer/issues/1217)
-
-### 已知问题
-
-* 某些设备上从后台返回时某些 UI 消失，可通过关闭列表项目动画部分缓解 [#1184](https://github.com/FooIbar/EhViewer/issues/1184)
-
-
-## [1.11.4] - 2024-04-21
-
-### 新功能
-
-* 更新前自动备份数据
-
-### 改进
-
-* 在 设置-高级 中加入了禁用列表项目动画的选项，该功能在部分设备上导致崩溃/卡顿 [#996](https://github.com/FooIbar/EhViewer/issues/996) [#1023](https://github.com/FooIbar/EhViewer/issues/1023)
-* 下载列表多选模式下避免误触 [#1016](https://github.com/FooIbar/EhViewer/issues/1016)
-* 杂项 UI 优化
-
-### Bug 修复
-
-* 重命名下载标签后删除该标签时崩溃 [#1008](https://github.com/FooIbar/EhViewer/issues/1008)
-* 搜索栏中某些输入法长按退格无法连续删除 [#606](https://github.com/FooIbar/EhViewer/issues/606)
-* 评论/屏蔽/搜索建议/下载标签/快速搜索列表卡顿 [#1041](https://github.com/FooIbar/EhViewer/issues/1041)
-
-
-## [1.11.3] - 2024-04-06
-
-### 改进
-
-* 优化预加载逻辑和图片加载顺序
-* 优化画廊详情和评论页面 UI
-
-### Bug 修复
-
-* 某些模式下搜索结果不显示画廊语言 [#923](https://github.com/FooIbar/EhViewer/issues/923)
-* 某些情况下在搜索结果中直接阅读画廊后崩溃 [#927](https://github.com/FooIbar/EhViewer/issues/927)
-* 更新至最新版本后仍提示有新版本 [#927](https://github.com/FooIbar/EhViewer/issues/927)
-* 从旧版本升级时包含不兼容数据导致崩溃/无法导出数据 [#940](https://github.com/FooIbar/EhViewer/issues/940) [#974](https://github.com/FooIbar/EhViewer/issues/974)
-* Android 10 以下的设备打开 设置-隐私 时崩溃 [#953](https://github.com/FooIbar/EhViewer/issues/953)
-* 下载标签无法拖动
-* 刷新 和 刷新（原图） 无法在已下载的图片上使用
-* 临时 IP 封禁错误显示为解析失败
-* 某些情况下下载时闪退 [#980](https://github.com/FooIbar/EhViewer/issues/980)
-* 某些设备上下载列表中的缩略图无法显示 [#977](https://github.com/FooIbar/EhViewer/issues/977)
-
-
-## [1.11.2] - 2024-03-17
-
-### 重大变更
-
-* Default 变种最低支持版本更改为 Android 8.0，重新添加了最低支持 Android 6.0 的 Marshmallow 变种
-
-### 改进
-
-* 重新添加了删除快速搜索/下载标签时的确认对话框
-
-### Bug 修复
-
-* 收藏页面 搜索栏中文标签转英文异常 [#902](https://github.com/FooIbar/EhViewer/issues/902)
-* 在收藏或者取消收藏之后，收藏按钮会无反应 [#908](https://github.com/FooIbar/EhViewer/issues/908)
-* 横屏页面下阅读设置UI重合 [#909](https://github.com/FooIbar/EhViewer/issues/909)
-* Search bar does not work properly in Japanese [#906](https://github.com/FooIbar/EhViewer/issues/906)
-* 搜索结果中的 Disowned 画廊不显示上传者
-* 使用 CI 频道更新时，有时会获取到错误的更新链接
-
-
-## [1.11.1] - 2024-03-12
-
-### 重大变更
-
-* 由于 E 站强制要求人机验证，仅支持通过网页登录
-* 默认支持 Android 6，不再提供 Marshmallow 变种
-* 集成 Cronet 库，不再提供 GMS 变种
-
-### 改进
-
-* 支持在排序下载列表前按下载标签分组
-
-### Bug 修复
-
-* 下载画廊时崩溃 [#893](https://github.com/FooIbar/EhViewer/issues/893)
-
-
-## [1.11.0] - 2024-03-09
-
-### 重大变更
-
-* 由于 E 站 Cookie 策略变更，不再支持 Cookie 登录
-* 登录时自动选择 exhentai （如果可用）
-* 不再提供默认下载路径
-* 手动排序更改为以添加时间/上传时间/标题/下载标签/页数对下载列表排序
-* 由于数据库结构变更，此版本导出的数据将无法被旧版本导入
-
-### 新功能
-
-* 下载画廊时生成 ComicInfo.xml 格式元数据
-* 归档下载时生成 ComicInfo.xml 格式元数据 [#711](https://github.com/FooIbar/EhViewer/issues/711)
-* 归档下载支持第三方下载管理器 [#79](https://github.com/FooIbar/EhViewer/issues/79)
-* 保存下载结果为 CBZ 压缩包 [#660](https://github.com/FooIbar/EhViewer/issues/660)
-* 清除 `igneous` Cookie （将于下次搜索时重新获取）
-* 随机打开本地收藏/下载中的画廊 [#695](https://github.com/FooIbar/EhViewer/issues/695)
-* 随机在搜索结果中跳转
-* 以网格模式查看下载列表
-* 本地收藏/历史/下载中的标签搜索 [#860](https://github.com/FooIbar/EhViewer/issues/860)
-
-### 改进
-
-* 搜索时优先显示已选择的类别卡片
-* 多处性能优化
-
-### Bug 修复
-
-* 显示模式为 Thumbnail 时无法点击上传者卡片 [#653](https://github.com/FooIbar/EhViewer/issues/653)
-* [Marshmallow] GIF 只显示第一帧
-* 无法在 `定时请求新闻页面` 关闭时开启 `隐藏 HV 事件通知`
-* 响应正文含有无效 UTF-8 字符导致解码失败 [#643](https://github.com/FooIbar/EhViewer/issues/643)
-* 某些情况下应用崩溃 [#710](https://github.com/FooIbar/EhViewer/issues/710)
-* 画廊名称包含非法路径字符时无法保存图片 [#815](https://github.com/FooIbar/EhViewer/issues/815)
-* 无法解码超长图片 [#732](https://github.com/FooIbar/EhViewer/issues/732)
-* E 站变更导致种子解析失败 [#880](https://github.com/FooIbar/EhViewer/issues/880)
-* E 站不再支持相似扫描导致图片搜索无法使用
-* 杂项修复
-
-### 已知问题
-
-* Android 14 上使用手势导航返回时过渡动画过早结束 [#775](https://github.com/FooIbar/EhViewer/issues/775)
-
-
-## [1.10.3] - 2024-01-15
-
-### 新功能
-
-* [Marshmallow] 支持裁剪边缘、打开压缩包和 GIF
-
-### 改进
-
-* 由于部分设备上的非预期行为 [#578](https://github.com/FooIbar/EhViewer/issues/578) [#596](https://github.com/FooIbar/EhViewer/issues/596)，默认禁用预见式返回导航动画，可于 设置-高级 中开启
-* 杂项优化
-
-### Bug 修复
-
-* 刷新后页面无响应 [#579](https://github.com/FooIbar/EhViewer/issues/579)
-* 浏览中保存图片后点击操作被阻挡 [#581](https://github.com/FooIbar/EhViewer/issues/581)
-* 在画廊详情页面切换至后台后点击评论闪退 [#580](https://github.com/FooIbar/EhViewer/issues/580)
-* 已下载的画廊中未阅读缓存过的图片解码失败 [#592](https://github.com/FooIbar/EhViewer/issues/592)
-* 在收藏页多选并下载会使得下载状态出现问题 [#603](https://github.com/FooIbar/EhViewer/issues/603)
-* 未能在不重启情况下切换 Http 引擎 [#610](https://github.com/FooIbar/EhViewer/issues/610)
-* 在有进度的画廊阅读界面无法直接回到第一页 [#614](https://github.com/FooIbar/EhViewer/issues/614)
-* 请求新闻界面失效 [#605](https://github.com/FooIbar/EhViewer/issues/605)
-* 收藏夹为空解析失败 [#630](https://github.com/FooIbar/EhViewer/issues/630)
-
-
-## [1.10.2] - 2023-12-31
-
-### 新功能
-
-* [阅读器] 支持裁剪图片黑色/白色边缘
-
-### 改进
-
-* 切换 HTTP 引擎无需重启
-* 优化过渡动画
-* 杂项性能优化
-
-### Bug 修复
-
-* 修复搜索建议中出现关键词相同的条目时崩溃 [#533](https://github.com/FooIbar/EhViewer/issues/533) [#555](https://github.com/FooIbar/EhViewer/issues/555)
-* 修复重命名下载标签时不显示原标签 [#534](https://github.com/FooIbar/EhViewer/issues/534)
-* 修复调整下载项目顺序时卡顿 [#552](https://github.com/FooIbar/EhViewer/issues/552)
-* 修复新增或修改评论后黑屏 [#554](https://github.com/FooIbar/EhViewer/issues/554)
-* 修复剪贴板读取bug [#566](https://github.com/FooIbar/EhViewer/issues/566)
-* 修复画廊信息对话框无法通过返回按钮/手势关闭 [#413](https://github.com/FooIbar/EhViewer/issues/413)
-
-
-## [1.10.1] - 2023-12-19
-
-### 重大变更
-
-* 由于 Apache HttpClient 5 在 Android 10 以下无法使用，后备 HTTP 引擎恢复为 OkHttp [#514](https://github.com/FooIbar/EhViewer/issues/514)
-
-### Bug 修复
-
-* 修复获取 pToken 失败导致无限加载 [#508](https://github.com/FooIbar/EhViewer/issues/508)
-* 修复阅读页快速滑动滑块导致下载延时过多累计 [#512](https://github.com/FooIbar/EhViewer/issues/512)
-* 修复 Android 9 以下的设备上无法退出搜索栏 [#513](https://github.com/FooIbar/EhViewer/issues/513)
-
-
-## [1.10.0] - 2023-12-14 [YANKED]
-
-### 重大变更
-
-* 后备 HTTP 引擎变更为 Apache HttpClient 5
-* 类别和高级搜索选项移至搜索栏下方
-
-### 新功能
-
-* 支持在搜索时指定画廊语言
-
-### 改进
-
-* 在下载中阅读画廊时会更新历史记录
-* 多处性能改进
-
-### Bug 修复
-
-* 修复无法由外部应用进入画廊页面 [#436](https://github.com/FooIbar/EhViewer/issues/436)
-* 修复点击精确到页的画廊链接闪退 [#430](https://github.com/FooIbar/EhViewer/issues/430)
-* 修复无法搜索本地收藏 [#491](https://github.com/FooIbar/EhViewer/issues/491)
-* 修复 CI 版本不显示变更日志
-
-
-## [1.9.0] - 2023-12-01
-
-### 重大变更
-
-* 除阅读器外全部迁移至 Compose
-
-### 新功能
-
-* 设置-高级 中增加实验性滑动手势敏感度设置
-* 支持通过滑动手势打开右侧抽屉
-* 支持预见式返回动画，相关设置位于 设置-高级
-
-### 改进
-
-* [阅读器] 画廊页数过多时隐藏进度条刻度并禁用触感反馈
-* 优化原图下载重试策略
-* 优化小屏设备上的搜索类别布局
-* 优化过渡动画
-* 优化历史记录删除动画
-* 设置-EH 中的缩略图大小设置改为缩略图列数
-
-### Bug 修复
-
-* 修复点击通知栏的下载通知闪退 [#175](https://github.com/FooIbar/EhViewer/issues/175)
-* 修复收藏状态显示错误 [#189](https://github.com/FooIbar/EhViewer/issues/189)
-* 修复双击导航按钮后无法打开导航抽屉
-* 修复某些情况下闪退 [#142](https://github.com/FooIbar/EhViewer/issues/142) [#208](https://github.com/FooIbar/EhViewer/issues/208)
-* 修复收藏界面点击重试崩溃 [#193](https://github.com/FooIbar/EhViewer/issues/193)
-* 修复本地收藏滚动位置丢失 [#192](https://github.com/FooIbar/EhViewer/issues/192)
-* 修复手速过快页面切换过快使加载圈圈不自动消失 [#209](https://github.com/FooIbar/EhViewer/issues/209)
-* 修复打开并关闭右侧抽屉后，状态栏一片白色 [#101](https://github.com/FooIbar/EhViewer/issues/101)
-* 修复使用深色主题时，切换界面会闪过亮色界面 [#121](https://github.com/FooIbar/EhViewer/issues/121)
-* [Marshmallow] 修复小内存设备上图片解码失败 [#229](https://github.com/FooIbar/EhViewer/issues/229) [#372](https://github.com/FooIbar/EhViewer/issues/372)
-* 修复已舍弃画廊上传者解析
-
-### 已知问题
-
-* 画廊信息对话框无法通过返回关闭 [#413](https://github.com/FooIbar/EhViewer/issues/413)
@@ -1,61 +1,64 @@
+# Maintenance Mode
+
+The project is in maintenance mode, will only receive bugfixes.
+
 <p align="right">
  <strong>English</strong>
  <span> | </span>
-  <a href="/docs/README/zh-cn.md">
+  <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/blob/1.8.x.x/docs/README/zh-cn.md">
  简体中文
  </a>
  <span> | </span>
-  <a href="/docs/README/zh-tw.md">
+  <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/blob/1.8.x.x/docs/README/zh-tw.md">
  正體中文
  </a>
-  <span> | </span>
-  <a href="/docs/README/ja.md">
-  日本語
-  </a>
 </p>

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

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

 <div align="center">
  <h3>
-    <a href="#description">
+    <a href="https://github.com/Ehviewer-Overhauled/Ehviewer#description">
    Description
    </a>
    <span> | </span>
-    <a href="#download">
+    <a href="https://github.com/Ehviewer-Overhauled/Ehviewer#download">
    Download
    </a>
    <span> | </span>
-    <a href="#screenshot">
+    <a href="https://github.com/Ehviewer-Overhauled/Ehviewer#screenshot">
    Screenshot
    </a>
    <span> | </span>
-    <a href="#thanks">
+    <a href="https://github.com/Ehviewer-Overhauled/Ehviewer#thanks">
    Thanks
    </a>
    <span> | </span>
-    <a href="#license">
+    <a href="https://github.com/Ehviewer-Overhauled/Ehviewer#license">
    License
    </a>
  </h3>
@@ -63,23 +66,14 @@

 # Description

-A modern EhViewer fork dedicated to high-performance
+EhViewer fork dedicated to lightweight and high-performance

 with [Material Design 3](https://m3.material.io/)
 and [Dynamic Color](https://m3.material.io/styles/color/dynamic-color/overview) Support

 # Download

-| Flavor      | Minimum Android Version | Notes                          |
-|-------------|-------------------------|--------------------------------|
-| Default     | 8.0                     | Full support                   |
-| Marshmallow | 6.0*                    | Limited support, no guarantees |
-
-*Devices running Android 6 need to have the [ISRG Root X1](https://letsencrypt.org/certs/isrgrootx1.pem) certificate installed
-
-<a href="https://github.com/FooIbar/EhViewer/releases">
-<img alt="Get it on GitHub" src="https://github.com/Ehviewer-Overhauled/Art/blob/master/get-it-on-github.svg" width="200px"/>
-</a>
+<a href="https://github.com/Ehviewer-Overhauled/Ehviewer/releases"><img alt="Get it on GitHub" src="https://github.com/Ehviewer-Overhauled/Art/blob/master/get-it-on-github.svg" width="200px"/></a> <a href="https://github.com/Ehviewer-Overhauled/fdroid-repo"><img alt="Get it on F-Droid" src="https://github.com/Ehviewer-Overhauled/Art/blob/master/get-it-on-fdroid.svg" width="200px"/></a>

 # Screenshot

@@ -91,20 +85,24 @@ and [Dynamic Color](https://m3.material.io/styles/color/dynamic-color/overview)
 Here is the libraries

 - [Arrow](https://arrow-kt.io/)
- [AOSP & AndroidX](https://source.android.com/)
+- [AOSP & AndroidX](http://source.android.com/)
 - [Kotlin & KotlinX](https://kotlinlang.org/)
- [Material Icons](https://github.com/google/material-design-icons)
- [Ktor](https://ktor.io/)
+- [FullDraggableDrawer](https://github.com/PureWriter/FullDraggableDrawer)
+- [MCA](https://github.com/material-components/material-components-android)
+- [material-design-icons](https://github.com/google/material-design-icons)
+- [Okhttp](https://square.github.io/okhttp/)
+- [RikkaX](https://github.com/RikkaApps/RikkaX)
+- [Libarchive](http://www.libarchive.org/)
 - [Coil](https://coil-kt.github.io/coil/)
- [Compose Destinations](https://composedestinations.rafaelcosta.xyz/)
- [libarchive](https://www.libarchive.org/)
+- [Jsoup](https://jsoup.org/)
+
+Specially thanks [Tachiyomi](https://tachiyomi.org/) for its reader implementation!

 # License

    Copyright 2014-2019 Hippo Seven
    Copyright 2020-2022 NekoInverter
    Copyright 2022-2023 Tarsin Norbin
-    Copyright 2023-2024 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.

@@ -0,0 +1,8 @@
+/build
+/src/main/java-gen
+manifest-merger-release-report.txt
+/src/main/libs
+/src/main/obj
+# Intellij
+*.iml
+/.cxx
@@ -1,31 +1,37 @@
-import com.mikepenz.aboutlibraries.plugin.DuplicateMode
-import com.mikepenz.aboutlibraries.plugin.DuplicateRule
-import java.util.regex.Pattern
+import com.mikepenz.aboutlibraries.plugin.DuplicateMode.MERGE
+import com.mikepenz.aboutlibraries.plugin.DuplicateRule.GROUP
+import java.time.Instant
+import java.time.ZoneOffset
+import java.time.format.DateTimeFormatter

 val isRelease: Boolean
    get() = gradle.startParameter.taskNames.any { it.contains("Release") }

 plugins {
-    alias(libs.plugins.ehviewer.android.application)
-    alias(libs.plugins.kotlin.serialization)
-    alias(libs.plugins.ksp)
-    alias(libs.plugins.aboutlibraries)
-    alias(libs.plugins.aboutlibrariesAndroid)
-    alias(libs.plugins.baselineprofile)
+    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")
 }

-val supportedAbis = arrayOf("arm64-v8a", "x86_64", "armeabi-v7a")
-
 android {
+    compileSdk = 34
+    buildToolsVersion = "34.0.0"
+    ndkVersion = "26.0.10636728"
+
    splits {
        abi {
            isEnable = true
            reset()
            if (isRelease) {
-                include(*supportedAbis)
+                include("arm64-v8a", "x86_64", "armeabi-v7a", "x86")
                isUniversalApk = true
            } else {
-                include("arm64-v8a", "x86_64")
+                include("arm64-v8a")
            }
        }
    }
@@ -39,49 +45,50 @@ android {
        enableV4Signing = true
    }

+    val branch = providers.exec {
+        commandLine = "git branch --show-current".split(' ')
+    }.standardOutput.asText.get().trim()
+
    val commitSha = providers.exec {
        commandLine = "git rev-parse --short=7 HEAD".split(' ')
    }.standardOutput.asText.get().trim()

-    val commitTime = providers.exec {
-        commandLine = "git log -1 --format=%ct".split(' ')
-    }.standardOutput.asText.get().trim()
+    val buildTime by lazy {
+        val formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm").withZone(ZoneOffset.UTC)
+        formatter.format(Instant.now())
+    }

    val repoName = providers.exec {
        commandLine = "git remote get-url origin".split(' ')
    }.standardOutput.asText.get().trim().removePrefix("https://github.com/").removePrefix("git@github.com:")
        .removeSuffix(".git")

-    val chromeVersion = rootProject.layout.projectDirectory.file("chrome.version").asFile.readText().trim()
-
    defaultConfig {
        applicationId = "moe.tarsin.ehviewer"
-        versionCode = 180063
-        versionName = "1.14.5"
-        // versionNameSuffix = "-SNAPSHOT"
-        buildConfigField("String", "RAW_VERSION_NAME", "\"$versionName${versionNameSuffix.orEmpty()}\"")
+        minSdk = 28
+        targetSdk = 34
+        versionCode = 180043
+        versionName = "1.8.9.6-gms"
+        resourceConfigurations.addAll(
+            listOf(
+                "zh",
+                "zh-rCN",
+                "zh-rHK",
+                "zh-rTW",
+                "es",
+                "ja",
+                "ko",
+                "fr",
+                "de",
+                "th",
+                "tr",
+                "nb-rNO",
+            ),
+        )
+        buildConfigField("String", "BRANCH", "\"$branch\"")
        buildConfigField("String", "COMMIT_SHA", "\"$commitSha\"")
-        buildConfigField("long", "COMMIT_TIME", commitTime)
+        buildConfigField("String", "BUILD_TIME", "\"$buildTime\"")
        buildConfigField("String", "REPO_NAME", "\"$repoName\"")
-        buildConfigField("String", "CHROME_VERSION", "\"$chromeVersion\"")
-        ndk {
-            if (isRelease) {
-                abiFilters.addAll(supportedAbis)
-            }
-            debugSymbolLevel = "FULL"
-        }
-    }
-
-    flavorDimensions += "api"
-
-    productFlavors {
-        create("default") {
-            minSdk = 26
-        }
-        create("marshmallow") {
-            applicationIdSuffix = ".m"
-            versionNameSuffix = "-M"
-        }
    }

    externalNativeBuild {
@@ -91,51 +98,51 @@ android {
    }

    compileOptions {
-        isCoreLibraryDesugaringEnabled = true
+        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",
+            "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api",
+            "-opt-in=androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi",
+            "-opt-in=androidx.compose.ui.ExperimentalComposeUiApi",
+            "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi",
+            "-opt-in=androidx.compose.animation.ExperimentalAnimationApi",
+            "-opt-in=androidx.paging.ExperimentalPagingApi",
+            "-opt-in=kotlin.contracts.ExperimentalContracts",
+            "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
+            "-opt-in=kotlinx.coroutines.FlowPreview",
+            "-opt-in=kotlinx.serialization.ExperimentalSerializationApi",
+            "-opt-in=splitties.experimental.ExperimentalSplittiesApi",
+            "-opt-in=splitties.preferences.DataStorePreferencesPreview",
+        )
+    }
+
+    lint {
+        abortOnError = true
+        checkReleaseBuilds = false
+        disable.add("MissingTranslation")
    }

    packaging {
-        dex {
-            useLegacyPackaging = false
-        }
-        jniLibs {
-            excludes += "**/libdatastore_shared_counter.so" // DataStore multi-process
-        }
        resources {
-            // Required by Layout Inspector
-            pickFirsts += "/META-INF/androidx.compose.ui_ui.version"
-
-            excludes += listOf(
-                "/META-INF/**",
-                "/kotlin/**",
-                "**.txt",
-                "**.bin",
-            )
+            excludes += "/META-INF/**"
+            excludes += "/kotlin/**"
+            excludes += "**.txt"
+            excludes += "**.bin"
        }
    }

-    androidResources {
-        ignoreAssetsPatterns += listOf(
-            "!PublicSuffixDatabase.list", // OkHttp
-            "!composepreference.preference.generated.resources",
-        )
-        generateLocaleConfig = true
-        localeFilters += listOf(
-            "zh",
-            "zh-rCN",
-            "zh-rHK",
-            "zh-rTW",
-            "es",
-            "ja",
-            "ko",
-            "fr",
-            "de",
-            "th",
-            "tr",
-            "nb-rNO",
-        )
-    }
-
    dependenciesInfo.includeInApk = false

    buildTypes {
@@ -148,130 +155,155 @@ android {
        debug {
            applicationIdSuffix = ".debug"
        }
-        create("benchmarkRelease") {
-            initWith(buildTypes.getByName("release"))
-            matchingFallbacks += listOf("release")
-            applicationIdSuffix = ".benchmark"
-            signingConfig = signingConfigs.getByName("debug")
-            isDebuggable = false
-        }
    }

    buildFeatures {
        buildConfig = true
        compose = true
+        viewBinding = true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.5.3"
    }

    namespace = "com.hippo.ehviewer"
 }

-baselineProfile {
-    mergeIntoMain = true
-}
-
 dependencies {
-    implementation(projects.core.data)
-    implementation(projects.core.i18n)
-    implementation(projects.core.ui)
-
    // https://developer.android.com/jetpack/androidx/releases/activity
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.appcompat)
-    implementation(libs.androidx.biometric)
-    implementation(libs.androidx.browser)
+    implementation("androidx.activity:activity-compose:1.8.0-beta01")
+    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("androidx.biometric:biometric-ktx:1.2.0-alpha05")
+    implementation("androidx.browser:browser:1.6.0")
+    implementation("androidx.collection:collection-ktx:1.3.0-rc01")

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

-    implementation(libs.compose.destinations.core)
-    ksp(libs.compose.destinations.compiler)
-
-    implementation(libs.compose.preference) {
-        // R8 won't remove it because it adds a content provider
-        exclude(group = "org.jetbrains.compose.components", module = "components-resources")
-    }
-
-    implementation(libs.androidx.core)
-    implementation(libs.androidx.core.splashscreen)
-
-    implementation(libs.androidx.datastore)
+    implementation("androidx.core:core-ktx:1.12.0")

+    implementation("androidx.constraintlayout:constraintlayout-compose:1.1.0-alpha12")
+    implementation("androidx.coordinatorlayout:coordinatorlayout:1.2.0")
+    implementation("androidx.fragment:fragment-ktx:1.7.0-alpha04")
    // https://developer.android.com/jetpack/androidx/releases/lifecycle
-    implementation(libs.androidx.lifecycle.process)
-    implementation(libs.androidx.lifecycle.compose)
+    implementation("androidx.lifecycle:lifecycle-process:2.6.2")
+
+    // https://developer.android.com/jetpack/androidx/releases/navigation
+    val nav_version = "2.7.2"
+    implementation("androidx.navigation:navigation-fragment-ktx:$nav_version")
+    implementation("androidx.navigation:navigation-ui-ktx:$nav_version")
+    implementation("androidx.navigation:navigation-compose:$nav_version")

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

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

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

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

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

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

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

-    implementation(libs.aboutlibraries.core)
-    implementation(libs.aboutlibraries.compose.m3)
-    implementation(libs.accompanist.drawable.painter)
+    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.reorderable)
-
-    implementation(platform(libs.arrow.stack))
-    implementation(libs.bundles.arrow)
+    implementation(platform("io.arrow-kt:arrow-stack:1.2.1"))
+    implementation("io.arrow-kt:arrow-fx-coroutines")

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

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

-    implementation(libs.ktor.client.okhttp)
+    implementation("org.chromium.net:cronet-api:113.5672.61")
+    implementation("com.google.android.gms:play-services-cronet:18.0.1")

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

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

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

-    implementation(libs.androidx.profileinstaller)
-    "baselineProfile"(project(":benchmark"))
-
-    debugImplementation(libs.compose.ui.tooling)
-    implementation(libs.compose.ui.tooling.preview)
-}
-
-kotlin {
-    compilerOptions {
-        optIn.addAll(
-            "coil3.annotation.ExperimentalCoilApi",
-            "androidx.paging.ExperimentalPagingApi",
-            "me.saket.telephoto.ExperimentalTelephotoApi",
-        )
-    }
+    debugImplementation("com.squareup.leakcanary:leakcanary-android:2.12")
 }

 ksp {
-    arg("compose-destinations.codeGenPackageName", "com.hippo.ehviewer.ui")
+    arg("room.schemaLocation", "$projectDir/schemas")
+    arg("room.generateKotlin", "true")
 }

 aboutLibraries {
-    collect {
-        includePlatform = false
-    }
-    library {
-        exclusionPatterns.add(Pattern.compile("org\\.jetbrains\\.(?:compose|androidx)\\..*"))
-        duplicationMode = DuplicateMode.MERGE
-        duplicationRule = DuplicateRule.GROUP
+    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")
+    if (isRelease) profile = "release"
+}
+
+tasks.configureEach {
+    if ((name == "mergeDebugJniLibFolders" || name == "mergeReleaseJniLibFolders")) {
+        dependsOn("cargoBuild")
+        // fix mergeDebugJniLibFolders  UP-TO-DATE
+        inputs.dir(layout.buildDirectory.dir("rustJniLibs/android"))
    }
 }
@@ -1,28 +1,30 @@
-keepclasseswithmembernames,includedescriptorclasses class * {
-    native <methods>;
-}
-
-keepclassmembers enum * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
-
 -keepclassmembers class * implements android.os.Parcelable {
    public static final ** CREATOR;
 }

-keepclassmembers,allowobfuscation class com.hippo.ehviewer.coil.AnimatedWebPDrawable {
-    java.nio.ByteBuffer source;
+-keepclasseswithmembernames,includedescriptorclasses class * {
+    native <methods>;
 }

+# https://issuetracker.google.com/issues/190382641
+-keepclassmembers class kotlin.SafePublicationLazyImpl {
+    java.lang.Object _value;
+}
+
+-keep class androidx.viewpager.widget.ViewPager$LayoutParams { int position; }
+
+-keep class com.hippo.ehviewer.client.parser.Torrent { *; }
+-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

-# https://issuetracker.google.com/222232895
-dontwarn androidx.window.extensions.**
-dontwarn androidx.window.sidecar.Sidecar*
+-keepattributes LineNumberTable,SourceFile
+-renamesourcefileattribute SourceFile

-keepattributes LineNumberTable
-
-allowaccessmodification
 -repackageclasses
+-allowaccessmodification
+-overloadaggressively
@@ -0,0 +1,88 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 1,
+    "identityHash": "c801ee62729ba20a203b150211234d5c",
+    "entities": [
+      {
+        "tableName": "OK_HTTP_3_COOKIE",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`NAME` TEXT, `VALUE` TEXT, `EXPIRES_AT` INTEGER NOT NULL, `DOMAIN` TEXT, `PATH` TEXT, `SECURE` INTEGER NOT NULL, `HTTP_ONLY` INTEGER NOT NULL, `PERSISTENT` INTEGER NOT NULL, `HOST_ONLY` INTEGER NOT NULL, `_id` INTEGER NOT NULL, PRIMARY KEY(`_id`))",
+        "fields": [
+          {
+            "fieldPath": "name",
+            "columnName": "NAME",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "VALUE",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "expiresAt",
+            "columnName": "EXPIRES_AT",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "domain",
+            "columnName": "DOMAIN",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "path",
+            "columnName": "PATH",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secure",
+            "columnName": "SECURE",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "httpOnly",
+            "columnName": "HTTP_ONLY",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "persistent",
+            "columnName": "PERSISTENT",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hostOnly",
+            "columnName": "HOST_ONLY",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'c801ee62729ba20a203b150211234d5c')"
+    ]
+  }
+}
@@ -0,0 +1,88 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 2,
+    "identityHash": "1b80cd29939b0f43934721f1289ba94d",
+    "entities": [
+      {
+        "tableName": "OK_HTTP_3_COOKIE",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`NAME` TEXT NOT NULL, `VALUE` TEXT NOT NULL, `EXPIRES_AT` INTEGER NOT NULL, `DOMAIN` TEXT NOT NULL, `PATH` TEXT NOT NULL, `SECURE` INTEGER NOT NULL, `HTTP_ONLY` INTEGER NOT NULL, `PERSISTENT` INTEGER NOT NULL, `HOST_ONLY` INTEGER NOT NULL, `_id` INTEGER, PRIMARY KEY(`_id`))",
+        "fields": [
+          {
+            "fieldPath": "name",
+            "columnName": "NAME",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "VALUE",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "expiresAt",
+            "columnName": "EXPIRES_AT",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "domain",
+            "columnName": "DOMAIN",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "path",
+            "columnName": "PATH",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "secure",
+            "columnName": "SECURE",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "httpOnly",
+            "columnName": "HTTP_ONLY",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "persistent",
+            "columnName": "PERSISTENT",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hostOnly",
+            "columnName": "HOST_ONLY",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '1b80cd29939b0f43934721f1289ba94d')"
+    ]
+  }
+}
@@ -23,26 +23,27 @@
        android:allowBackup="true"
        android:appCategory="image"
        android:dataExtractionRules="@xml/data_extraction_rules"
-        android:enableOnBackInvokedCallback="true"
        android:fullBackupContent="@xml/backup_scheme"
        android:hasFragileUserData="true"
        android:icon="@mipmap/ic_launcher"
        android:label="@string/app_name"
-        android:largeHeap="@bool/large_heap"
+        android:localeConfig="@xml/locale_config"
        android:networkSecurityConfig="@xml/network_security_config"
        android:roundIcon="@mipmap/ic_launcher_round"
        android:supportsRtl="true"
        android:theme="@style/AppTheme"
        tools:targetApi="tiramisu">
-        <profileable android:shell="true" />
-
+        <activity
+            android:name=".ui.ConfigureActivity"
+            android:exported="false"
+            android:launchMode="singleTask"
+            android:windowSoftInputMode="adjustResize" />
        <activity
            android:name=".ui.MainActivity"
            android:banner="@mipmap/ic_leanback_banner"
-            android:configChanges="orientation|screenLayout|screenSize|smallestScreenSize"
+            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" />
@@ -70,39 +71,6 @@
                <data android:host="exhentai.org" />
                <data android:host="e-hentai.org" />
            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="file" />
-                <data android:scheme="content" />
-                <data android:host="*" />
-                <data android:mimeType="application/octet-stream" />
-                <data android:mimeType="application/zip" />
-                <data android:mimeType="application/x-7z-compressed" />
-                <data android:mimeType="application/x-tar" />
-                <data android:mimeType="application/x-xz" />
-                <data android:mimeType="application/gzip" />
-                <data android:mimeType="application/vnd.rar" />
-                <data android:mimeType="application/vnd.comicbook+zip" />
-                <data android:mimeType="application/vnd.comicbook-rar" />
-
-                <!-- unofficial -->
-                <data android:mimeType="application/7z" />
-                <data android:mimeType="application/rar" />
-                <data android:mimeType="application/x-cbz" />
-                <data android:mimeType="application/x-cbr" />
-                <data android:mimeType="application/x-cbt" />
-                <data android:mimeType="application/x-cb7" />
-                <data android:mimeType="application/x-zip-compressed" />
-                <data android:mimeType="application/x-rar-compressed" />
-                <data android:mimeType="application/x-compressed-tar" />
-                <data android:mimeType="application/x-bzip-compressed-tar" />
-                <data android:mimeType="application/x-lzma-compressed-tar" />
-                <data android:mimeType="application/x-xz-compressed-tar" />
-            </intent-filter>
            <intent-filter android:label="@string/keyword_search">
                <action android:name="android.intent.action.SEND" />

@@ -118,6 +86,44 @@
                <data android:mimeType="image/*" />
            </intent-filter>
        </activity>
+        <activity
+            android:name="eu.kanade.tachiyomi.ui.reader.ReaderActivity"
+            android:configChanges="screenSize"
+            android:exported="true"
+            android:launchMode="singleTask">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="file" />
+                <data android:scheme="content" />
+                <data android:host="*" />
+                <data android:mimeType="application/octet-stream" />
+                <data android:mimeType="application/7z" />
+                <data android:mimeType="application/rar" />
+                <data android:mimeType="application/zip" />
+                <data android:mimeType="application/x-7z-compressed" />
+                <data android:mimeType="application/x-rar-compressed" />
+                <data android:mimeType="application/x-zip-compressed" />
+                <data android:mimeType="application/x-tar" />
+                <data android:mimeType="application/x-xz" />
+                <data android:mimeType="application/gzip" />
+                <data android:mimeType="application/x-cbz" />
+                <data android:mimeType="application/x-cbr" />
+                <data android:mimeType="application/x-cbt" />
+                <data android:mimeType="application/x-cb7" />
+
+                <!-- untested -->
+                <data android:mimeType="application/vnd.comicbook+zip" />
+                <data android:mimeType="application/vnd.comicbook-rar" />
+                <data android:mimeType="application/x-compressed-tar" />
+                <data android:mimeType="application/x-bzip-compressed-tar" />
+                <data android:mimeType="application/x-lzma-compressed-tar" />
+                <data android:mimeType="application/x-xz-compressed-tar" />
+            </intent-filter>
+        </activity>
        <activity
            android:name=".ui.SecurityActivity"
            android:configChanges="screenSize"
@@ -128,6 +134,8 @@
            android:launchMode="singleTask"
            android:taskAffinity=""
            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+        <activity
+            android:name=".ui.WebViewActivity" />

        <service
            android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
@@ -0,0 +1,34 @@
+From 2bda36800a5424c44378bbc0cc8bb5d26a0f34fa Mon Sep 17 00:00:00 2001
+From: tarsin <yuanqingxiang233@163.com>
+Date: Sat, 22 Jul 2023 08:30:20 +0800
+Subject: [PATCH] Don't build other binarys
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 55cd358..52b57aa 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -962,7 +962,7 @@ check_symbol_exists(getopt_long getopt.h HAVE_GETOPT_LONG)
+ # xzdec
+ #############################################################################
+ 
+-if(HAVE_GETOPT_LONG AND HAVE_DECODERS)
+if(0)
+     add_executable(xzdec
+         src/common/sysdefs.h
+         src/common/tuklib_common.h
+@@ -1008,7 +1008,7 @@ endif()
+ # xz
+ #############################################################################
+ 
+-if(NOT MSVC AND HAVE_GETOPT_LONG)
+if(0)
+     add_executable(xz
+         src/common/mythread.h
+         src/common/sysdefs.h
+-- 
+2.41.0
+
@@ -1,25 +0,0 @@
-From e971b9f23727833cc39b9e325db30f383e5bfc30 Mon Sep 17 00:00:00 2001
-From: Dude so hot <djohn@fbi.gov>
-Date: Thu, 14 Nov 2024 00:28:13 +0800
-Subject: [PATCH] Fix zip_time performance
-
-Signed-off-by: Dude so hot <djohn@fbi.gov>
---
- libarchive/archive_time.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libarchive/archive_time.c b/libarchive/archive_time.c
-index 3352c809..9289bf1e 100644
--- a/libarchive/archive_time.c
-+++ b/libarchive/archive_time.c
-@@ -53,6 +53,7 @@ FILETIME_to_ntfs(const FILETIME* filetime)
- int64_t
- dos_to_unix(uint32_t dos_time)
- {
-+	return 0;
- 	uint16_t msTime, msDate;
- 	struct tm ts;
- 	time_t t;
-- 
-2.47.0
-
@@ -0,0 +1,29 @@
+From 57da49f9b0ed8538573f6cfe289f835ee0078eec Mon Sep 17 00:00:00 2001
+From: tarsin <yuanqingxiang233@163.com>
+Date: Sat, 22 Jul 2023 17:50:08 +0800
+Subject: [PATCH] Hide symbols
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 646484b7..67a71272 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -2060,10 +2060,10 @@ SET(OLD_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
+ SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fvisibility=hidden -Werror")
+ CHECK_C_SOURCE_COMPILES("void __attribute__((visibility(\"default\"))) foo(void);
+ int main() { return 0; }" HAVE_VISIBILITY_ATTR)
+-IF (HAVE_VISIBILITY_ATTR)
+IF (0)
+   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
+   ADD_DEFINITIONS(-D__LIBARCHIVE_ENABLE_VISIBILITY)
+-ENDIF(HAVE_VISIBILITY_ATTR)
+ENDIF(0)
+ SET(CMAKE_REQUIRED_FLAGS "${OLD_CMAKE_REQUIRED_FLAGS}")
+ 
+ # Generate "config.h" from "build/cmake/config.h.in"
+-- 
+2.41.0
+
@@ -0,0 +1,25 @@
+From c9298fd6dc0a8b04dd4b2247118b9cb895c46e58 Mon Sep 17 00:00:00 2001
+From: tarsin <yuanqingxiang233@163.com>
+Date: Sat, 23 Jul 2022 16:05:36 +0800
+Subject: [PATCH 2/2] Insert link libs
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 713e3bc5..7247640d 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -415,7 +415,7 @@ IF(DEFINED __GNUWIN32PATH AND EXISTS "${__GNUWIN32PATH}")
+   # #  endif
+ ENDIF(DEFINED __GNUWIN32PATH AND EXISTS "${__GNUWIN32PATH}")
+ 
+-SET(ADDITIONAL_LIBS "")
+SET(ADDITIONAL_LIBS ${LIBARCHIVE_CUSTOM_LIBS})
+ #
+ # Find ZLIB
+ #
+-- 
+2.39.2
+
@@ -1,27 +0,0 @@
-From 86d199429b3fabc83f7dcc9afd72e7b4c7750b1a Mon Sep 17 00:00:00 2001
-From: FooIbar <118464521+FooIbar@users.noreply.github.com>
-Date: Thu, 14 Nov 2024 20:22:52 +0800
-Subject: [PATCH] Use UTF-8 as default charset on bionic
-
---
- libarchive/archive_string.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c
-index abf7ad66..63a73c58 100644
--- a/libarchive/archive_string.c
-+++ b/libarchive/archive_string.c
-@@ -423,7 +423,9 @@ static const char *
- default_iconv_charset(const char *charset) {
- 	if (charset != NULL && charset[0] != '\0')
- 		return charset;
-#if HAVE_LOCALE_CHARSET && !defined(__APPLE__)
-+#ifdef __BIONIC__
-+	return "UTF-8";
-+#elif HAVE_LOCALE_CHARSET && !defined(__APPLE__)
- 	/* locale_charset() is broken on Mac OS */
- 	return locale_charset();
- #elif HAVE_NL_LANGINFO
-- 
-2.43.0
-
@@ -1,72 +1,42 @@
 cmake_minimum_required(VERSION 3.14)
-project(ehviewer C)
-include(ExternalProject)
+project(ehviewer C ASM)
 include(FetchContent)

 if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-    string(CONCAT CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -ffast-math -fvisibility=hidden -fvisibility-inlines-hidden -funroll-loops -flto "
-           "-mllvm -polly "
-           "-mllvm -polly-run-dce "
-           "-mllvm -polly-run-inliner "
-           "-mllvm -polly-isl-arg=--no-schedule-serialize-sccs "
-           "-mllvm -polly-ast-use-context "
-           "-mllvm -polly-detect-keep-going "
-           "-mllvm -polly-position=before-vectorizer "
-           "-mllvm -polly-vectorizer=stripmine "
-           "-mllvm -polly-detect-profitability-min-per-loop-insts=40 "
-           "-mllvm -polly-invariant-load-hoisting")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Ofast -fvisibility=hidden -fvisibility-inlines-hidden -funroll-loops -flto \
+           -mllvm -polly \
+           -mllvm -polly-run-dce \
+           -mllvm -polly-run-inliner \
+           -mllvm -polly-isl-arg=--no-schedule-serialize-sccs \
+           -mllvm -polly-ast-use-context \
+           -mllvm -polly-detect-keep-going \
+           -mllvm -polly-position=before-vectorizer \
+           -mllvm -polly-vectorizer=stripmine \
+           -mllvm -polly-detect-profitability-min-per-loop-insts=40 \
+           -mllvm -polly-invariant-load-hoisting")
 endif (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")

-option(BUILD_TESTING OFF)
-option(XZ_DOC OFF)
-option(XZ_LZIP_DECODER OFF)
-option(XZ_MICROLZMA_DECODER OFF)
-option(XZ_MICROLZMA_ENCODER OFF)
-option(XZ_TOOL_LZMADEC OFF)
-option(XZ_TOOL_LZMAINFO OFF)
-option(XZ_TOOL_XZ OFF)
-option(XZ_TOOL_XZDEC OFF)
-FetchContent_Declare(
-        liblzma
-        GIT_REPOSITORY https://github.com/tukaani-project/xz.git
-        GIT_TAG v5.8.1
-        GIT_SHALLOW 1
-)
+# Change the default path of fetch content to avoid downloading the same dependencies per architecture
+get_filename_component(deps "../_deps" REALPATH BASE_DIR "${CMAKE_BINARY_DIR}")
+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 .
+        )

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

 # Build GNUTLS libnettle
-if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
-    execute_process(
-            COMMAND wsl wslpath ${CMAKE_CURRENT_LIST_DIR}
-            OUTPUT_VARIABLE CURRENT_DIR
-            OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-else ()
-    set(CURRENT_DIR ${CMAKE_CURRENT_LIST_DIR})
-endif ()
-set(NDK_VERSION "${ANDROID_NDK_MAJOR}.${ANDROID_NDK_MINOR}.${ANDROID_NDK_BUILD}")
-ExternalProject_Add(
-        nettle
-        GIT_REPOSITORY https://gitlab.com/gnutls/nettle.git
-        GIT_TAG nettle_3.10.2_release_20250626
-        GIT_SHALLOW 1
-        GIT_CONFIG core.autocrlf=input
-        CONFIGURE_COMMAND bash ${CURRENT_DIR}/configure_nettle.sh ${NDK_VERSION} ${CMAKE_C_COMPILER_TARGET}
-        BUILD_COMMAND bash -c "make -j4 libnettle.a CFLAGS='${CMAKE_C_FLAGS} -Qunused-arguments'"
-        INSTALL_COMMAND ""
-        BUILD_IN_SOURCE 1
-        BUILD_BYPRODUCTS <SOURCE_DIR>/libnettle.a
-)
-
-ExternalProject_Get_Property(nettle SOURCE_DIR)
-include_directories(${SOURCE_DIR}/..)
-add_library(libnettle STATIC IMPORTED)
-set_property(TARGET libnettle PROPERTY IMPORTED_LOCATION ${SOURCE_DIR}/libnettle.a)
-add_dependencies(libnettle nettle)
+add_subdirectory(nettle)

 # Configure libnettle support for libarchive
+include_directories(nettle)
+include_directories(.)
 set(HAVE_LIBNETTLE 1)
 set(HAVE_NETTLE_AES_H 1)
 set(HAVE_NETTLE_HMAC_H 1)
@@ -82,76 +52,24 @@ SET(HAVE_LZMA_STREAM_ENCODER_MT 1)
 SET(HAVE_LZMADEC_H 1)
 SET(HAVE_LIBLZMADEC 1)

-option(ENABLE_OPENSSL OFF)
 option(ENABLE_TAR OFF)
 option(ENABLE_CPIO OFF)
 option(ENABLE_CAT OFF)
 option(ENABLE_UNZIP OFF)
 option(ENABLE_TEST OFF)

-set(LIBARCHIVE_PATCH
-        ${CMAKE_CURRENT_LIST_DIR}/0001-Fix-zip_time-performance.patch
-        ${CMAKE_CURRENT_LIST_DIR}/0002-Use-UTF-8-as-default-charset-on-bionic.patch
-)
-FetchContent_Declare(
-        libarchive
-        GIT_REPOSITORY https://github.com/libarchive/libarchive.git
-        GIT_TAG v3.8.2
-        GIT_SHALLOW 1
-        PATCH_COMMAND git apply --check -R ${LIBARCHIVE_PATCH} || git apply ${LIBARCHIVE_PATCH}
-)
+# Configure libarchive link's static lib
+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 .
+        )

 FetchContent_MakeAvailable(libarchive)
-target_link_libraries(archive_static liblzma libnettle)
 include_directories(${libarchive_SOURCE_DIR}/libarchive)

-FetchContent_Declare(
-        libwebp
-        GIT_REPOSITORY https://github.com/webmproject/libwebp.git
-        GIT_TAG v1.6.0
-        GIT_SHALLOW 1
-)
-
-option(WEBP_BUILD_ANIM_UTILS OFF)
-option(WEBP_BUILD_CWEBP OFF)
-option(WEBP_BUILD_DWEBP OFF)
-option(WEBP_BUILD_VWEBP OFF)
-option(WEBP_BUILD_WEBPINFO OFF)
-option(WEBP_BUILD_LIBWEBPMUX OFF)
-option(WEBP_BUILD_EXTRAS OFF)
-option(WEBP_ENABLE_SWAP_16BIT_CSP ON)
-
-# Disable runtime detection of NEON support as NEON is required since API level 23
-# https://source.android.com/docs/compatibility/6.0/android-6.0-cdd#3_3_1_application_binary_interfaces
-unset(ANDROID)
-FetchContent_MakeAvailable(libwebp)
-if (CMAKE_SYSTEM_NAME STREQUAL "Android")
-    set(ANDROID 1)
-endif ()
-
-set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ../../../../rust-toolchain.toml)
-unset(Rust_TOOLCHAIN CACHE)
-FetchContent_Declare(
-        Corrosion
-        GIT_REPOSITORY https://github.com/corrosion-rs/corrosion.git
-        GIT_TAG v0.5.2
-        GIT_SHALLOW 1
-)
-
-FetchContent_MakeAvailable(Corrosion)
-corrosion_import_crate(
-        MANIFEST_PATH ../rust/Cargo.toml
-        LOCKED
-        FEATURES $<IF:$<VERSION_GREATER_EQUAL:${ANDROID_NATIVE_API_LEVEL},26>,android-26,android>
-        FLAGS $<$<NOT:$<CONFIG:Debug>>:-Z build-std -Z build-std-features=>
-)
-corrosion_add_target_rustflags(ehviewer_rust $<$<NOT:$<CONFIG:Debug>>:-Z unstable-options -C panic=immediate-abort>)
-corrosion_link_libraries(ehviewer_rust android jnigraphics log webp webpdemux)
-
 # Build and link our app's native lib
-add_library(${PROJECT_NAME} SHARED archive.c gifutils.c hash.c natsort/strnatcmp.c)
-target_link_libraries(
-        ${PROJECT_NAME} archive_static ehviewer_rust
-        -Wl,-u,JNI_OnLoad -Wl,--undefined-glob,Java_*
-        -Wl,--version-script,${CMAKE_SOURCE_DIR}/libehviewer.map.txt
-)
+add_library(${PROJECT_NAME} SHARED archive.c gifutils.c natsort/strnatcmp.c)
+target_link_libraries(${PROJECT_NAME} archive_static log)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 Tarsin Norbin
+ * Copyright 2022 Tarsin Norbin
 *
 * This file is part of EhViewer
 *
@@ -34,6 +34,7 @@

 #include "natsort/strnatcmp.h"
 #include "ehviewer.h"
+#include "spinlock.h"

 typedef struct {
    int using;
@@ -45,29 +46,33 @@ typedef struct {
 typedef struct {
    const char *filename;
    int index;
-    ssize_t size;
-    void *addr;
+    size_t size;
 } entry;

+_Atomic mcs_lock ctx_lock;
+static archive_ctx **ctx_pool;
 #define CTX_POOL_SIZE 20
-#define MAX_PARALLEL_DECOMP 4
-#define max(a, b) ((a) > (b) ? (a) : (b))

-static pthread_mutex_t ctx_pool_mutex = PTHREAD_MUTEX_INITIALIZER;
-static archive_ctx **ctx_pool = NULL;
-static pthread_mutex_t buffer_mutex = PTHREAD_MUTEX_INITIALIZER;
-static void *decode_buffer[MAX_PARALLEL_DECOMP];
+static void *mempool = NULL;
+static size_t *mempoolofs = NULL;
+
+#define PAGE_ALIGN(x) ((x + ~PAGE_MASK) & PAGE_MASK)
+
+#define MEMPOOL_ADDR_BY_SORTED_IDX(x) (mempool + (index ? mempoolofs[index - 1] : 0))
+#define MEMPOOL_SIZE (mempoolofs[entryCount - 1])
+#define MEMPOOL_ENTITY_SIZE(x) PAGE_ALIGN(entries[x].size)
+
+#define PROT_RW (PROT_WRITE | PROT_READ)
+#define MAP_ANON_POOL (MAP_ANONYMOUS | MAP_NORESERVE | MAP_PRIVATE | MAP_UNINITIALIZED)
+
 static bool need_encrypt = false;
 static char *passwd = NULL;
-static void *archiveAddr = MAP_FAILED;
+static void *archiveAddr = NULL;
 static size_t archiveSize = 0;
 static entry *entries = NULL;
 static size_t entryCount = 0;
-static ssize_t max_file_size = 0;

-#define SUPPORT_EXT_COUNT 11
-
-const char supportExt[SUPPORT_EXT_COUNT][5] = {
+const char supportExt[10][6] = {
        "jpeg",
        "jpg",
        "png",
@@ -76,104 +81,93 @@ const char supportExt[SUPPORT_EXT_COUNT][5] = {
        "bmp",
        "ico",
        "wbmp",
-        "heic",
        "heif",
        "avif"
 };

 static inline int filename_is_playable_file(const char *name) {
-    if (!name)
-        return false;
    const char *dotptr = strrchr(name, '.');
    if (!dotptr++)
        return false;
    int i;
-    for (i = 0; i < SUPPORT_EXT_COUNT; i++)
+    for (i = 0; i < 10; i++)
        if (strcmp(dotptr, supportExt[i]) == 0)
            return true;
    return false;
 }

-static inline bool archive_entry_is_file(struct archive_entry *entry) {
-    return archive_entry_filetype(entry) == AE_IFREG;
-}
-
-static inline bool archive_entry_is_playable(struct archive_entry *entry) {
-    return archive_entry_is_file(entry) &&
-           filename_is_playable_file(archive_entry_pathname(entry));
-}
-
 static inline int compare_entries(const void *a, const void *b) {
    const char *fa = ((entry *) a)->filename;
    const char *fb = ((entry *) b)->filename;
    return strnatcmp(fa, fb);
 }

-#define ADDR_IN_FILE_MAPPING(addr) (addr >= archiveAddr && addr < archiveAddr + archiveSize)
-
-static bool fill_entry_zero_copy(struct archive *arc, entry *entry) {
-    void *buffer = NULL;
-    size_t buffer_size = 0;
-    la_int64_t output_ofs = 0;
-    archive_read_data_block(arc, (const void **) &buffer, &buffer_size, &output_ofs);
-    bool zero_copy = ADDR_IN_FILE_MAPPING(buffer) && !output_ofs && buffer_size == entry->size;
-    entry->addr = zero_copy ? buffer : NULL;
-    return zero_copy;
-}
-
-static void archive_map_entries_index(archive_ctx *ctx, bool sort) {
-    int count = 0;
-    bool zero_copy = true;
+static long archive_map_entries_index(archive_ctx *ctx) {
+    long count = 0;
    while (archive_read_next_header(ctx->arc, &ctx->entry) == ARCHIVE_OK) {
        const char *name = archive_entry_pathname(ctx->entry);
-        if (archive_entry_is_file(ctx->entry) && filename_is_playable_file(name)) {
+        if (filename_is_playable_file(name)) {
            entries[count].filename = strdup(name);
            entries[count].index = count;
-            ssize_t size = archive_entry_size(ctx->entry);
-            max_file_size = max(size, max_file_size);
-            entries[count].size = size;
-            // We don't expect zero copy if first content can't do zero copy
-            if (zero_copy) zero_copy = fill_entry_zero_copy(ctx->arc, &entries[count]);
+            entries[count].size = archive_entry_size(ctx->entry);
            count++;
        }
    }
-    if (sort) qsort(entries, entryCount, sizeof(entry), compare_entries);
+    if (!count)
+        LOGE("%s", archive_error_string(ctx->arc));
+    qsort(entries, entryCount, sizeof(entry), compare_entries);
+    return count;
 }

-static void *acquire_decode_buffer() {
-    void *addr = NULL;
-    pthread_mutex_lock(&buffer_mutex);
-    for (int i = 0; i < MAX_PARALLEL_DECOMP; ++i) {
-        addr = decode_buffer[i];
-        if (addr) {
-            decode_buffer[i] = NULL;
-            break;
-        }
+static bool archive_prealloc_mempool() {
+    mempoolofs = calloc(entryCount, sizeof(size_t));
+    for (int i = 0; i < entryCount; ++i) {
+        if (!i)
+            mempoolofs[i] = PAGE_ALIGN(entries[i].size);
+        else
+            mempoolofs[i] = PAGE_ALIGN(entries[i].size) + mempoolofs[i - 1];
    }
-    pthread_mutex_unlock(&buffer_mutex);
-    if (!addr) addr = malloc(max_file_size);
-    return addr;
-}
-
-static void release_decode_buffer(void *buffer) {
-    pthread_mutex_lock(&buffer_mutex);
-    for (int i = 0; i < MAX_PARALLEL_DECOMP; ++i) {
-        void *addr = decode_buffer[i];
-        if (!addr) {
-            decode_buffer[i] = buffer;
-            pthread_mutex_unlock(&buffer_mutex);
-            return;
-        }
+    mempool = mmap(0, MEMPOOL_SIZE, PROT_RW, MAP_ANON_POOL, -1, 0);
+    if (mempool == MAP_FAILED) {
+        LOGE("%s%s", "mmap failed with error ", strerror(errno));
+        return false;
    }
-    pthread_mutex_unlock(&buffer_mutex);
-    free(buffer);
+    return true;
 }

-static int archive_list_all_entries(archive_ctx *ctx) {
-    int count = 0;
+
+// Mincore does not support anon mapping yet
+// Now that we use MADV_FREE, how can we detect whether pages is reclaimed?
+static bool is_mempool_pages_present_and_lock(int index) {
+    void *addr = MEMPOOL_ADDR_BY_SORTED_IDX(index);
+    size_t size = MEMPOOL_ENTITY_SIZE(index);
+    mlock(addr, size);
+#if 0
+    unsigned char vec[size / PAGE_SIZE];
+    unsigned char r = 1;
+    mincore(addr, size, vec);
+    for (int i = 0; i < size / PAGE_SIZE; ++i) r &= vec[i];
+    return r;
+#endif
+    return false;
+}
+
+#define MEMPOOL_IN_CORE_AND_LOCK(x) is_mempool_pages_present_and_lock(x)
+
+static void mempool_release_pages(void *addr, size_t size) {
+    size = PAGE_ALIGN(size);
+    munlock(addr, size);
+    int ret = madvise(addr, size, MADV_FREE);
+    if (ret == -EINVAL) madvise(addr, size, MADV_DONTNEED);
+}
+
+static long archive_list_all_entries(archive_ctx *ctx) {
+    long count = 0;
    while (archive_read_next_header(ctx->arc, &ctx->entry) == ARCHIVE_OK)
-        if (archive_entry_is_playable(ctx->entry))
+        if (filename_is_playable_file(archive_entry_pathname(ctx->entry)))
            count++;
+    if (!count)
+        LOGE("%s", archive_error_string(ctx->arc));
    return count;
 }

@@ -185,10 +179,18 @@ static void archive_release_ctx(archive_ctx *ctx) {
    }
 }

-static archive_ctx *archive_alloc_ctx() {
-    archive_ctx *ctx = calloc(1, sizeof(archive_ctx));
+static int archive_alloc_ctx(archive_ctx **ctxptr) {
+    archive_ctx *ctx;
+    int err;
+    ctx = calloc(1, sizeof(archive_ctx));
+    if (!ctx)
+        return -ENOMEM;
    ctx->arc = archive_read_new();
    ctx->using = 1;
+    if (!ctx->arc) {
+        free(ctx);
+        return -ENOMEM;
+    }
    archive_read_support_format_tar(ctx->arc);
    archive_read_support_format_7zip(ctx->arc);
    archive_read_support_format_rar5(ctx->arc);
@@ -198,19 +200,19 @@ static archive_ctx *archive_alloc_ctx() {
    archive_read_set_option(ctx->arc, "zip", "ignorecrc32", "1");
    if (passwd)
        archive_read_add_passphrase(ctx->arc, passwd);
-    int err = archive_read_open_memory(ctx->arc, archiveAddr, archiveSize);
-    if (err < ARCHIVE_OK) {
-        LOGE("%s%s", "Open archive failed: ", archive_error_string(ctx->arc));
+    err = archive_read_open_memory(ctx->arc, archiveAddr, archiveSize);
+    if (err) {
        archive_read_free(ctx->arc);
        free(ctx);
-        return NULL;
+        return err;
    }
-    return ctx;
+    *ctxptr = ctx;
+    return 0;
 }

 static int archive_skip_to_index(archive_ctx *ctx, int index) {
    while (archive_read_next_header(ctx->arc, &ctx->entry) == ARCHIVE_OK) {
-        if (!archive_entry_is_playable(ctx->entry))
+        if (!filename_is_playable_file(archive_entry_pathname(ctx->entry)))
            continue;
        if (ctx->next_index++ == index) {
            return ctx->next_index - 1;
@@ -222,7 +224,8 @@ static int archive_skip_to_index(archive_ctx *ctx, int index) {
 static int archive_get_ctx(archive_ctx **ctxptr, int idx) {
    int ret;
    archive_ctx *ctx = NULL;
-    pthread_mutex_lock(&ctx_pool_mutex);
+    mcs_lock_t local_lock;
+    lock_mcs(&ctx_lock, &local_lock);
    for (int i = 0; i < CTX_POOL_SIZE; i++) {
        if (!ctx_pool[i])
            continue;
@@ -237,14 +240,16 @@ static int archive_get_ctx(archive_ctx **ctxptr, int idx) {
    }
    if (ctx)
        ctx->using = 1;
-    pthread_mutex_unlock(&ctx_pool_mutex);
+    unlock_mcs(&ctx_lock, &local_lock);

    if (!ctx) {
        archive_ctx *victimCtx = NULL;
        int victimIdx = 0;
        int replace = 1;
-        ctx = archive_alloc_ctx();
-        pthread_mutex_lock(&ctx_pool_mutex);
+        ret = archive_alloc_ctx(&ctx);
+        if (ret)
+            return ret;
+        lock_mcs(&ctx_lock, &local_lock);
        for (int i = 0; i < CTX_POOL_SIZE; i++) {
            if (!ctx_pool[i]) {
                ctx_pool[i] = ctx;
@@ -259,13 +264,13 @@ static int archive_get_ctx(archive_ctx **ctxptr, int idx) {
            }
        }
        if (replace) ctx_pool[victimIdx] = ctx;
-        pthread_mutex_unlock(&ctx_pool_mutex);
+        unlock_mcs(&ctx_lock, &local_lock);
        if (replace) archive_release_ctx(victimCtx);
    }
    ret = archive_skip_to_index(ctx, idx);
    if (ret != idx) {
        ret = archive_errno(ctx->arc);
-        LOGE("Skip to index failed: %s", archive_error_string(ctx->arc));
+        LOGE("Skip to index failed:%s", archive_error_string(ctx->arc));
        archive_release_ctx(ctx);
        return ret;
    }
@@ -274,146 +279,164 @@ static int archive_get_ctx(archive_ctx **ctxptr, int idx) {
 }

 JNIEXPORT jint JNICALL
-Java_com_hippo_ehviewer_jni_ArchiveKt_openArchive(JNIEnv *env, jclass thiz, jint fd, jlong size, jboolean sort_entries) {
+Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_openArchive(JNIEnv *env, jclass thiz, jint fd,
+                                                                jlong size) {
    EH_UNUSED(env);
    EH_UNUSED(thiz);
    archive_ctx *ctx = NULL;
-    archiveAddr = mmap(0, size, PROT_READ, MAP_PRIVATE, fd, 0);
+    int mmap_flags = MAP_PRIVATE;
+    archiveAddr = mmap64(0, size, PROT_READ, mmap_flags, fd, 0);
    if (archiveAddr == MAP_FAILED) {
-        LOGE("%s%s", "mmap failed with error ", strerror(errno));
+        LOGE("%s%s", "mmap64 failed with error ", strerror(errno));
        return 0;
    }
    archiveSize = size;
+    madvise_log_if_error(archiveAddr, archiveSize, MADV_WILLNEED);
    ctx_pool = calloc(CTX_POOL_SIZE, sizeof(archive_ctx **));
-    ctx = archive_alloc_ctx();
-    if (!ctx) return 0;
-
-    entryCount = archive_list_all_entries(ctx);
-    LOGI("%s%zu%s", "Found ", entryCount, " images in archive");
-    if (!entryCount) {
-        LOGE("%s%s", "Archive read failed: ", archive_error_string(ctx->arc));
-        archive_release_ctx(ctx);
+    if (!ctx_pool) {
+        LOGE("Allocate archive ctx pool failed:ENOMEM");
        return 0;
    }
+    long r = archive_alloc_ctx(&ctx);
+    if (r) {
+        if (r == -ENOMEM)
+            LOGE("%s", "Mem alloc failed");
+        LOGE("%s%s", "Archive open failed:", archive_error_string(ctx->arc));
+    } else {
+        entryCount = archive_list_all_entries(ctx);
+        LOGI("%s%zu%s", "Found ", entryCount, " image entries in archive");

-    // We must read through the file|vm then we can know whether it is encrypted
-    int encryptRet = archive_read_has_encrypted_entries(ctx->arc);
-    switch (encryptRet) {
-        case 1: // At lease 1 encrypted entry
-            need_encrypt = true;
-            break;
-        case 0: // format supports but no encrypted entry found
-        default:
-            need_encrypt = false;
+        // We must read through the file|vm then we can know whether it is encrypted
+        int encryptRet = archive_read_has_encrypted_entries(ctx->arc);
+        switch (encryptRet) {
+            case 1: // At lease 1 encrypted entry
+                need_encrypt = true;
+                break;
+            case 0: // format supports but no encrypted entry found
+            default:
+                need_encrypt = false;
+        }
+
+        int format = archive_format(ctx->arc);
+        switch (format) {
+            case ARCHIVE_FORMAT_ZIP:
+            case ARCHIVE_FORMAT_RAR_V5:
+                madvise_log_if_error(archiveAddr, archiveSize, MADV_SEQUENTIAL);
+                break;
+            case ARCHIVE_FORMAT_7ZIP: // Seek is bad
+                madvise_log_if_error(archiveAddr, archiveSize, MADV_RANDOM);
+                break;
+            default:;
+        }
    }

-    int format = archive_format(ctx->arc);
-    switch (format) {
-        case ARCHIVE_FORMAT_ZIP:
-        case ARCHIVE_FORMAT_RAR_V5:
-            madvise_log_if_error(archiveAddr, archiveSize, MADV_SEQUENTIAL);
-            break;
-        case ARCHIVE_FORMAT_7ZIP: // Seek is bad
-            madvise_log_if_error(archiveAddr, archiveSize, MADV_RANDOM);
-            break;
-        default:;
-    }
    archive_release_ctx(ctx);

-    ctx = archive_alloc_ctx();
-    if (!ctx) return 0;
-    entries = calloc(entryCount, sizeof(entry));
-    archive_map_entries_index(ctx, sort_entries);
+    r = archive_alloc_ctx(&ctx);
+    if (r) {
+        if (r == -ENOMEM)
+            LOGE("%s", "Mem alloc failed");
+        r = 0;
+        LOGE("%s%s", "Archive open failed:", archive_error_string(ctx->arc));
+    } else {
+        entries = calloc(entryCount, sizeof(entry));
+        r = archive_map_entries_index(ctx);
+        if (!archive_prealloc_mempool()) {
+            r = 0;
+            for (int i = 0; i < entryCount; ++i) {
+                free((void *) entries[i].filename);
+            }
+            free(entries);
+        }
+    }
+
    archive_release_ctx(ctx);
-    return (int) entryCount;
+    return r;
 }

+#pragma clang diagnostic push
+#pragma ide diagnostic ignored "ConstantConditionsOC"
+#pragma ide diagnostic ignored "UnreachableCode"
+
 JNIEXPORT jobject JNICALL
-Java_com_hippo_ehviewer_jni_ArchiveKt_extractToByteBuffer(JNIEnv *env, jclass thiz, jint index) {
+Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_extractToByteBuffer(JNIEnv *env, jclass thiz,
+                                                                        jint index) {
    EH_UNUSED(env);
    EH_UNUSED(thiz);
-    entry *entry = &entries[index];
-    ssize_t size = entry->size;
-    if (entry->addr) {
-        return (*env)->NewDirectByteBuffer(env, entry->addr, size);
-    } else {
+    void *addr = MEMPOOL_ADDR_BY_SORTED_IDX(index);
+    size_t size = entries[index].size;
+    if (!MEMPOOL_IN_CORE_AND_LOCK(index)) {
+        index = entries[index].index;
        archive_ctx *ctx = NULL;
-        if (!archive_get_ctx(&ctx, entry->index)) {
-            void *addr = acquire_decode_buffer();
-            ssize_t bytes = archive_read_data(ctx->arc, addr, size);
-            ctx->using = 0;
-            if (bytes == size) {
-                return (*env)->NewDirectByteBuffer(env, addr, size);
-            } else {
-                if (bytes < 0) {
-                    LOGE("%s%s", "Archive read failed: ", archive_error_string(ctx->arc));
-                } else {
-                    LOGE("%s", "No enough data read, WTF?");
-                }
-            }
-            release_decode_buffer(addr);
-        }
+        int ret;
+        ret = archive_get_ctx(&ctx, index);
+        if (ret) return 0;
+        ret = archive_read_data(ctx->arc, addr, size);
+        ctx->using = 0;
+        if (ret == size)
+            return (*env)->NewDirectByteBuffer(env, addr, size);
+        if (ret != size)
+            LOGE("%s", "No enough data read, WTF?");
+        if (ret < 0)
+            LOGE("%s%s", "Archive read failed:", archive_error_string(ctx->arc));
+        mempool_release_pages(addr, size);
+    } else {
+        return (*env)->NewDirectByteBuffer(env, addr, size);
    }
    return 0;
 }

+#pragma clang diagnostic pop
+
 JNIEXPORT void JNICALL
-Java_com_hippo_ehviewer_jni_ArchiveKt_closeArchive(JNIEnv *env, jclass thiz) {
+Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_closeArchive(JNIEnv *env, jclass thiz) {
    EH_UNUSED(env);
    EH_UNUSED(thiz);
-    if (ctx_pool) {
-        for (int i = 0; i < CTX_POOL_SIZE; i++)
-            archive_release_ctx(ctx_pool[i]);
-        free(ctx_pool);
-        ctx_pool = NULL;
-    }
+    for (int i = 0; i < CTX_POOL_SIZE; i++)
+        archive_release_ctx(ctx_pool[i]);
    free(passwd);
+    free(ctx_pool);
    passwd = NULL;
    need_encrypt = false;
-    if (archiveAddr != MAP_FAILED) {
-        munmap(archiveAddr, archiveSize);
-        archiveAddr = MAP_FAILED;
-    }
-    for (int i = 0; i < MAX_PARALLEL_DECOMP; ++i) {
-        free(decode_buffer[i]);
-        decode_buffer[i] = NULL;
-    }
-    max_file_size = 0;
-    if (entries) {
-        for (int i = 0; i < entryCount; ++i) {
-            free((void *) entries[i].filename);
-        }
-        free(entries);
-        entries = NULL;
+    munmap(archiveAddr, archiveSize);
+    munmap(mempool, MEMPOOL_SIZE);
+    free(mempoolofs);
+    for (int i = 0; i < entryCount; ++i) {
+        free((void *) entries[i].filename);
    }
+    free(entries);
 }

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

 JNIEXPORT jboolean JNICALL
-Java_com_hippo_ehviewer_jni_ArchiveKt_providePassword(JNIEnv *env, jclass thiz, jstring str) {
+Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_providePassword(JNIEnv *env, jclass thiz,
+                                                                    jstring str) {
    EH_UNUSED(thiz);
    struct archive_entry *entry;
    archive_ctx *ctx;
    jboolean ret = true;
    int len = (*env)->GetStringUTFLength(env, str);
-    passwd = realloc(passwd, len + 1);
-    (*env)->GetStringUTFRegion(env, str, 0, len, passwd);
-    passwd[len] = 0;
-    ctx = archive_alloc_ctx();
-    char tmpBuf[4096];
+    passwd = realloc(passwd, len * sizeof(char));
+    if (!passwd) {
+        LOGE("Allocate passwd buffer failed");
+        return false;
+    }
+    strcpy(passwd, (*env)->GetStringUTFChars(env, str, NULL));
+    archive_alloc_ctx(&ctx);
+    void *tmpBuf = alloca(4096);
    while (archive_read_next_header(ctx->arc, &entry) == ARCHIVE_OK) {
-        if (!archive_entry_is_playable(entry))
+        if (!filename_is_playable_file(archive_entry_pathname(entry)))
            continue;
        if (!archive_entry_is_encrypted(entry))
            continue;
        if (archive_read_data(ctx->arc, tmpBuf, 4096) < ARCHIVE_OK) {
-            LOGE("%s%s", "Archive read failed: ", archive_error_string(ctx->arc));
+            LOGE("%s%s", "Archive read failed:", archive_error_string(ctx->arc));
            ret = false;
        }
        break;
@@ -423,15 +446,24 @@ Java_com_hippo_ehviewer_jni_ArchiveKt_providePassword(JNIEnv *env, jclass thiz,
 }

 JNIEXPORT jstring JNICALL
-Java_com_hippo_ehviewer_jni_ArchiveKt_getExtension(JNIEnv *env, jclass thiz, jint index) {
+Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_getFilename(JNIEnv *env, jclass thiz,
+                                                                jint index) {
    EH_UNUSED(env);
    EH_UNUSED(thiz);
-    const char *ext = strrchr(entries[index].filename, '.') + 1;
-    return (*env)->NewStringUTF(env, ext);
+    index = entries[index].index;
+    archive_ctx *ctx = NULL;
+    int ret;
+    ret = archive_get_ctx(&ctx, index);
+    if (ret)
+        return NULL;
+    jstring str = (*env)->NewStringUTF(env, archive_entry_pathname(ctx->entry));
+    ctx->using = 0;
+    return str;
 }

-JNIEXPORT jboolean JNICALL
-Java_com_hippo_ehviewer_jni_ArchiveKt_extractToFd(JNIEnv *env, jclass thiz, jint index, jint fd) {
+JNIEXPORT void JNICALL
+Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_extractToFd(JNIEnv *env, jclass thiz,
+                                                                jint index, jint fd) {
    EH_UNUSED(env);
    EH_UNUSED(thiz);
    index = entries[index].index;
@@ -439,52 +471,16 @@ Java_com_hippo_ehviewer_jni_ArchiveKt_extractToFd(JNIEnv *env, jclass thiz, jint
    int ret;
    ret = archive_get_ctx(&ctx, index);
    if (!ret) {
-        ret = archive_read_data_into_fd(ctx->arc, fd);
+        archive_read_data_into_fd(ctx->arc, fd);
        ctx->using = 0;
    }
-    return ret == ARCHIVE_OK;
 }

 JNIEXPORT void JNICALL
-Java_com_hippo_ehviewer_jni_ArchiveKt_releaseByteBuffer(JNIEnv *env, jclass thiz, jobject buffer) {
+Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_releaseByteBuffer(JNIEnv *env, jclass thiz,
+                                                                      jobject buffer) {
    EH_UNUSED(thiz);
    void *addr = (*env)->GetDirectBufferAddress(env, buffer);
-    if (!ADDR_IN_FILE_MAPPING(addr)) {
-        release_decode_buffer(addr);
-    }
-}
-
-JNIEXPORT void JNICALL
-Java_com_hippo_ehviewer_jni_ArchiveKt_archiveFdBatch(JNIEnv *env, jclass clazz, jintArray fd_batch, jobjectArray names, jint arc_fd, jint size) {
-    EH_UNUSED(clazz);
-    struct archive *arc = archive_write_new();
-    struct stat st;
-    char buff[8192];
-    jint fdBatch[size];
-    (*env)->GetIntArrayRegion(env, fd_batch, 0, size, fdBatch);
-    archive_write_set_format_zip(arc);
-    archive_write_zip_set_compression_store(arc);
-    archive_write_open_fd(arc, arc_fd);
-    struct archive_entry *entry = archive_entry_new();
-    for (int i = 0; i < size; i++) {
-        int fd = fdBatch[i];
-        jobject name = (*env)->GetObjectArrayElement(env, names, i);
-        const char *cname = (*env)->GetStringUTFChars(env, name, false);
-        archive_entry_set_pathname(entry, cname);
-        (*env)->ReleaseStringUTFChars(env, name, cname);
-        fstat(fd, &st);
-        archive_entry_copy_stat(entry, &st);
-        archive_entry_set_perm(entry, 0644);
-        archive_write_header(arc, entry);
-        size_t len;
-        do {
-            len = read(fd, buff, sizeof(buff));
-            archive_write_data(arc, buff, len);
-        } while (len > 0);
-        archive_write_finish_entry(arc);
-        archive_entry_clear(entry);
-    }
-    archive_entry_free(entry);
-    archive_write_close(arc);
-    archive_write_free(arc);
+    size_t size = (*env)->GetDirectBufferCapacity(env, buffer);
+    mempool_release_pages(addr, size);
 }
@@ -1,13 +0,0 @@
-SUFFIX=toolchains/llvm/prebuilt/$(uname -s | tr '[:upper:]' '[:lower:]')-x86_64/bin
-CI_NDK_LOCATION=$ANDROID_HOME/ndk/$1/$SUFFIX
-ARCH_NDK_LOCATION=$ANDROID_HOME/ndk-bundle/$SUFFIX
-if test -e $CI_NDK_LOCATION ;then
-    TOOLCHAIN=$CI_NDK_LOCATION
-else
-    TOOLCHAIN=$ARCH_NDK_LOCATION
-fi
-TARGET=$2
-./.bootstrap && ./configure --host=$TARGET --disable-public-key --disable-dependency-tracking \
-  AR=$TOOLCHAIN/llvm-ar \
-  CC="$TOOLCHAIN/clang -target $TARGET" \
-  RANLIB=$TOOLCHAIN/llvm-ranlib
@@ -1,7 +1,6 @@
 #include <jni.h>
 #include <string.h>
 #include <stdbool.h>
-#include <unistd.h>
 #include <android/log.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
@@ -12,7 +11,6 @@

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

 static int FRAME_DELAY_START_MARKER = 0x0021F904;

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

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

 static void doRewrite(byte *addr, size_t size) {
@@ -37,7 +34,7 @@ static void doRewrite(byte *addr, size_t size) {
            byte *end = addr + i + 4;
            if (end[4] != 0) continue;
            int frameDelay = end[2] << 8 | end[1];
-            if (frameDelay >= MINIMUM_FRAME_DELAY)
+            if (frameDelay > MINIMUM_FRAME_DELAY)
                break; // Quit if the first block looks normal, for performance
            end[1] = DEFAULT_FRAME_DELAY;
            end[2] = 0;
@@ -45,33 +42,20 @@ static void doRewrite(byte *addr, size_t size) {
    }
 }

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

-JNIEXPORT jobject JNICALL
-Java_com_hippo_ehviewer_jni_GifUtilsKt_mmap(JNIEnv *env, jclass clazz, jint fd) {
+JNIEXPORT void JNICALL
+Java_com_hippo_ehviewer_image_ImageKt_rewriteGifSource2(JNIEnv *env, jclass clazz, jint fd) {
    struct stat64 st;
    fstat64(fd, &st);
    size_t size = st.st_size;
-    byte *addr = mmap64(0, size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
-    if (addr == MAP_FAILED) return NULL;
-    return (*env)->NewDirectByteBuffer(env, addr, size);
-}
-
-JNIEXPORT void JNICALL
-Java_com_hippo_ehviewer_jni_GifUtilsKt_munmap(JNIEnv *env, jclass clazz, jobject buffer) {
-    byte *addr = (*env)->GetDirectBufferAddress(env, buffer);
-    size_t size = (*env)->GetDirectBufferCapacity(env, buffer);
+    byte *addr = mmap64(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
+    if (addr == MAP_FAILED) return;
+    doRewrite(addr, size);
    munmap(addr, size);
 }
@@ -1,39 +0,0 @@
-#include <unistd.h>
-
-#include <jni.h>
-#include <nettle/sha1.h>
-
-#include "ehviewer.h"
-
-#define BUFFER_SIZE 8192
-
-typedef uint8_t byte;
-
-const char hex_digits[] = "0123456789abcdef";
-
-JNIEXPORT jstring JNICALL
-Java_com_hippo_ehviewer_jni_HashKt_sha1(JNIEnv *env, jclass clazz, jint fd) {
-    EH_UNUSED(clazz);
-    struct sha1_ctx ctx;
-    sha1_init(&ctx);
-
-    size_t bytes_read;
-    byte buffer[BUFFER_SIZE];
-    while ((bytes_read = read(fd, buffer, BUFFER_SIZE)) > 0) {
-        sha1_update(&ctx, bytes_read, buffer);
-    }
-
-    byte digest[SHA1_DIGEST_SIZE];
-    sha1_digest(&ctx, SHA1_DIGEST_SIZE, digest);
-
-    byte byte;
-    char hex_digest[2 * SHA1_DIGEST_SIZE + 1];
-    for (int i = 0; i < SHA1_DIGEST_SIZE; i++) {
-        byte = digest[i];
-        hex_digest[2 * i] = hex_digits[byte >> 4 & 0xF];
-        hex_digest[2 * i + 1] = hex_digits[byte & 0xF];
-    }
-    hex_digest[2 * SHA1_DIGEST_SIZE] = '\0';
-
-    return (*env)->NewStringUTF(env, hex_digest);
-}
@@ -1,7 +0,0 @@
-{
-  global:
-    JNI_OnLoad;
-    Java_*;
-  local:
-    *;
-};
@@ -30,6 +30,7 @@
 * negative chars in their default char type.
 */

+#include <stddef.h>     /* size_t */
 #include <ctype.h>

 #include "strnatcmp.h"
@@ -38,21 +39,28 @@
 /* These are defined as macros to make it easier to adapt this code to
 * different characters types or comparison functions. */
 static inline int
-nat_isdigit(const char *a)
+nat_isdigit(nat_char a)
 {
-     return isdigit((unsigned char) *a);
+     return isdigit((unsigned char) a);
 }


 static inline int
-nat_isspace(const char *a)
+nat_isspace(nat_char a)
 {
-     return isspace((unsigned char) *a) || *a == '0' && nat_isdigit(a + 1);
+     return isspace((unsigned char) a);
+}
+
+
+static inline nat_char
+nat_toupper(nat_char a)
+{
+     return toupper((unsigned char) a);
 }


 static int
-compare_right(const char *a, const char *b)
+compare_right(nat_char const *a, nat_char const *b)
 {
     int bias = 0;

@@ -61,11 +69,11 @@ compare_right(const char *a, const char *b)
        both numbers to know that they have the same magnitude, so we
        remember it in BIAS. */
     for (;; a++, b++) {
-          if (!nat_isdigit(a)  &&  !nat_isdigit(b))
+          if (!nat_isdigit(*a)  &&  !nat_isdigit(*b))
               return bias;
-          if (!nat_isdigit(a))
+          if (!nat_isdigit(*a))
               return -1;
-          if (!nat_isdigit(b))
+          if (!nat_isdigit(*b))
               return +1;
          if (*a < *b) {
               if (!bias)
@@ -76,41 +84,94 @@ compare_right(const char *a, const char *b)
          } else if (!*a  &&  !*b)
               return bias;
     }
+
+     return 0;
 }


-int
-strnatcmp(const char *a, const char *b)
+static int
+compare_left(nat_char const *a, nat_char const *b)
 {
-    int result;
+     /* Compare two left-aligned numbers: the first to have a
+        different value wins. */
+     for (;; a++, b++) {
+          if (!nat_isdigit(*a)  &&  !nat_isdigit(*b))
+               return 0;
+          if (!nat_isdigit(*a))
+               return -1;
+          if (!nat_isdigit(*b))
+               return +1;
+          if (*a < *b)
+               return -1;
+          if (*a > *b)
+               return +1;
+     }

-    while (1) {
-         /* skip over leading spaces or zeros */
-          while (nat_isspace(a))
-               a++;
+     return 0;
+}

-          while (nat_isspace(b))
-               b++;
+
+static int
+strnatcmp0(nat_char const *a, nat_char const *b, int fold_case)
+{
+     int ai, bi;
+     nat_char ca, cb;
+     int fractional, result;
+
+     ai = bi = 0;
+     while (1) {
+          ca = a[ai]; cb = b[bi];
+
+          /* skip over leading spaces or zeros */
+          while (nat_isspace(ca))
+               ca = a[++ai];
+
+          while (nat_isspace(cb))
+               cb = b[++bi];

          /* process run of digits */
-          if (nat_isdigit(a)  &&  nat_isdigit(b)) {
-               if ((result = compare_right(a, b)) != 0)
-                    return result;
+          if (nat_isdigit(ca)  &&  nat_isdigit(cb)) {
+               fractional = (ca == '0' || cb == '0');
+
+               if (fractional) {
+                    if ((result = compare_left(a+ai, b+bi)) != 0)
+                         return result;
+               } else {
+                    if ((result = compare_right(a+ai, b+bi)) != 0)
+                         return result;
+               }
          }

-          if (!*a && !*b) {
+          if (!ca && !cb) {
               /* The strings compare the same.  Perhaps the caller
                  will want to call strcmp to break the tie. */
               return 0;
          }

-          if (*a < *b)
+          if (fold_case) {
+               ca = nat_toupper(ca);
+               cb = nat_toupper(cb);
+          }
+
+          if (ca < cb)
               return -1;

-          if (*a > *b)
+          if (ca > cb)
               return +1;

-          a++; b++;
+          ++ai; ++bi;
     }
 }

+
+int
+strnatcmp(nat_char const *a, nat_char const *b) {
+     return strnatcmp0(a, b, 0);
+}
+
+
+/* Compare, recognizing numeric string and ignoring case. */
+int
+strnatcasecmp(nat_char const *a, nat_char const *b) {
+     return strnatcmp0(a, b, 1);
+}
@@ -24,7 +24,14 @@
 extern "C" {
 #endif

-int strnatcmp(const char *a, const char *b);
+/* CUSTOMIZATION SECTION
+ *
+ * You can change this typedef, but must then also change the inline
+ * functions in strnatcmp.c */
+typedef char nat_char;
+
+int strnatcmp(nat_char const *a, nat_char const *b);
+int strnatcasecmp(nat_char const *a, nat_char const *b);

 #ifdef __cplusplus
 }
@@ -0,0 +1,239 @@
+cmake_minimum_required(VERSION 3.4.1)
+project(nettle C)
+
+set(LIBNETTLE_DEFINITIONS
+        -DHAVE_CONFIG_H)
+
+set(LIBNETTLE_SOURCES
+        nettle/aes-decrypt-internal.c
+        nettle/aes-decrypt.c
+        nettle/aes-decrypt-table.c
+        nettle/aes128-decrypt.c
+        nettle/aes192-decrypt.c
+        nettle/aes256-decrypt.c
+        nettle/aes-encrypt-internal.c
+        nettle/aes-encrypt.c
+        nettle/aes-encrypt-table.c
+        nettle/aes128-encrypt.c
+        nettle/aes192-encrypt.c
+        nettle/aes256-encrypt.c
+        nettle/aes-invert-internal.c
+        nettle/aes-set-key-internal.c
+        nettle/aes-set-encrypt-key.c
+        nettle/aes-set-decrypt-key.c
+        nettle/aes128-set-encrypt-key.c
+        nettle/aes128-set-decrypt-key.c
+        nettle/aes128-meta.c
+        nettle/aes192-set-encrypt-key.c
+        nettle/aes192-set-decrypt-key.c
+        nettle/aes192-meta.c
+        nettle/aes256-set-encrypt-key.c
+        nettle/aes256-set-decrypt-key.c
+        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
+        nettle/blowfish-bcrypt.c
+        nettle/base16-encode.c
+        nettle/base16-decode.c
+        nettle/base16-meta.c
+        nettle/base64-encode.c
+        nettle/base64-decode.c
+        nettle/base64-meta.c
+        nettle/base64url-encode.c
+        nettle/base64url-decode.c
+        nettle/base64url-meta.c
+        nettle/buffer.c
+        nettle/buffer-init.c
+        nettle/camellia-crypt-internal.c
+        nettle/camellia-table.c
+        nettle/camellia-absorb.c
+        nettle/camellia-invert-key.c
+        nettle/camellia128-set-encrypt-key.c
+        nettle/camellia128-crypt.c
+        nettle/camellia128-set-decrypt-key.c
+        nettle/camellia128-meta.c
+        nettle/camellia192-meta.c
+        nettle/camellia256-set-encrypt-key.c
+        nettle/camellia256-crypt.c
+        nettle/camellia256-set-decrypt-key.c
+        nettle/camellia256-meta.c
+        nettle/cast128.c
+        nettle/cast128-meta.c
+        nettle/cbc.c
+        nettle/cbc-aes128-encrypt.c
+        nettle/cbc-aes192-encrypt.c
+        nettle/cbc-aes256-encrypt.c
+        nettle/ccm.c
+        nettle/ccm-aes128.c
+        nettle/ccm-aes192.c
+        nettle/ccm-aes256.c
+        nettle/cfb.c
+        nettle/siv-cmac.c
+        nettle/siv-cmac-aes128.c
+        nettle/siv-cmac-aes256.c
+        nettle/cnd-memcpy.c
+        nettle/chacha-crypt.c
+        nettle/chacha-core-internal.c
+        nettle/chacha-poly1305.c
+        nettle/chacha-poly1305-meta.c
+        nettle/chacha-set-key.c
+        nettle/chacha-set-nonce.c
+        nettle/ctr.c
+        nettle/ctr16.c
+        nettle/des.c
+        nettle/des3.c
+        nettle/eax.c
+        nettle/eax-aes128.c
+        nettle/eax-aes128-meta.c
+        nettle/ghash-set-key.c
+        nettle/ghash-update.c
+        nettle/gcm.c
+        nettle/gcm-aes.c
+        nettle/gcm-aes128.c
+        nettle/gcm-aes128-meta.c
+        nettle/gcm-aes192.c
+        nettle/gcm-aes192-meta.c
+        nettle/gcm-aes256.c
+        nettle/gcm-aes256-meta.c
+        nettle/gcm-camellia128.c
+        nettle/gcm-camellia128-meta.c
+        nettle/gcm-camellia256.c
+        nettle/gcm-camellia256-meta.c
+        nettle/cmac.c
+        nettle/cmac64.c
+        nettle/cmac-aes128.c
+        nettle/cmac-aes256.c
+        nettle/cmac-des3.c
+        nettle/cmac-aes128-meta.c
+        nettle/cmac-aes256-meta.c
+        nettle/cmac-des3-meta.c
+        nettle/gost28147.c
+        nettle/gosthash94.c
+        nettle/gosthash94-meta.c
+        nettle/hmac.c
+        nettle/hmac-gosthash94.c
+        nettle/hmac-md5.c
+        nettle/hmac-ripemd160.c
+        nettle/hmac-sha1.c
+        nettle/hmac-sha224.c
+        nettle/hmac-sha256.c
+        nettle/hmac-sha384.c
+        nettle/hmac-sha512.c
+        nettle/hmac-streebog.c
+        nettle/hmac-sm3.c
+        nettle/hmac-md5-meta.c
+        nettle/hmac-ripemd160-meta.c
+        nettle/hmac-sha1-meta.c
+        nettle/hmac-sha224-meta.c
+        nettle/hmac-sha256-meta.c
+        nettle/hmac-sha384-meta.c
+        nettle/hmac-sha512-meta.c
+        nettle/hmac-streebog-meta.c
+        nettle/hmac-sm3-meta.c
+        nettle/knuth-lfib.c
+        nettle/hkdf.c
+        nettle/md2.c
+        nettle/md2-meta.c
+        nettle/md4.c
+        nettle/md4-meta.c
+        nettle/md5.c
+        nettle/md5-compress.c
+        nettle/md5-compat.c
+        nettle/md5-meta.c
+        nettle/memeql-sec.c
+        nettle/memxor.c
+        nettle/memxor3.c
+        nettle/nettle-lookup-hash.c
+        nettle/nettle-meta-aeads.c
+        nettle/nettle-meta-armors.c
+        nettle/nettle-meta-ciphers.c
+        nettle/nettle-meta-hashes.c
+        nettle/nettle-meta-macs.c
+        nettle/pbkdf2.c
+        nettle/pbkdf2-hmac-gosthash94.c
+        nettle/pbkdf2-hmac-sha1.c
+        nettle/pbkdf2-hmac-sha256.c
+        nettle/pbkdf2-hmac-sha384.c
+        nettle/pbkdf2-hmac-sha512.c
+        nettle/poly1305-aes.c
+        nettle/poly1305-internal.c
+        nettle/realloc.c
+        nettle/ripemd160.c
+        nettle/ripemd160-compress.c
+        nettle/ripemd160-meta.c
+        nettle/salsa20-core-internal.c
+        nettle/salsa20-crypt-internal.c
+        nettle/salsa20-crypt.c
+        nettle/salsa20r12-crypt.c
+        nettle/salsa20-set-key.c
+        nettle/salsa20-set-nonce.c
+        nettle/salsa20-128-set-key.c
+        nettle/salsa20-256-set-key.c
+        nettle/sha1.c
+        nettle/sha1-compress.c
+        nettle/sha1-meta.c
+        nettle/sha256.c
+        nettle/sha256-compress.c
+        nettle/sha224-meta.c
+        nettle/sha256-meta.c
+        nettle/sha512.c
+        nettle/sha512-compress.c
+        nettle/sha384-meta.c
+        nettle/sha512-meta.c
+        nettle/sha512-224-meta.c
+        nettle/sha512-256-meta.c
+        nettle/sha3.c
+        nettle/sha3-permute.c
+        nettle/sha3-224.c
+        nettle/sha3-224-meta.c
+        nettle/sha3-256.c
+        nettle/sha3-256-meta.c
+        nettle/sha3-384.c
+        nettle/sha3-384-meta.c
+        nettle/sha3-512.c
+        nettle/sha3-512-meta.c
+        nettle/shake256.c
+        nettle/sm3.c
+        nettle/sm3-meta.c
+        nettle/serpent-set-key.c
+        nettle/serpent-encrypt.c
+        nettle/serpent-decrypt.c
+        nettle/serpent-meta.c
+        nettle/streebog.c
+        nettle/streebog-meta.c
+        nettle/twofish.c
+        nettle/twofish-meta.c
+        nettle/umac-nh.c
+        nettle/umac-nh-n.c
+        nettle/umac-l2.c
+        nettle/umac-l3.c
+        nettle/umac-poly64.c
+        nettle/umac-poly128.c
+        nettle/umac-set-key.c
+        nettle/umac32.c
+        nettle/umac64.c
+        nettle/umac96.c
+        nettle/umac128.c
+        nettle/version.c
+        nettle/write-be32.c
+        nettle/write-le32.c
+        nettle/write-le64.c
+        nettle/yarrow256.c
+        nettle/yarrow_key_event.c
+        nettle/xts.c
+        nettle/xts-aes128.c
+        nettle/xts-aes256.c
+        )
+
+set(LIBNETTLE_INCLUDES
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_CURRENT_SOURCE_DIR}/nettle
+        )
+
+add_library(nettle STATIC ${LIBNETTLE_SOURCES})
+target_include_directories(nettle PUBLIC ${LIBNETTLE_INCLUDES})
+target_compile_definitions(nettle PRIVATE ${LIBNETTLE_DEFINITIONS})
@@ -0,0 +1,275 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define if building universal (internal helper macro) */
+/* #undef AC_APPLE_UNIVERSAL_BUILD */
+
+/* Define to 1 if using 'alloca.c'. */
+/* #undef C_ALLOCA */
+
+/* Define to 1 if you have 'alloca', as a function or macro. */
+#define HAVE_ALLOCA 1
+
+/* Define to 1 if <alloca.h> works. */
+#define HAVE_ALLOCA_H 1
+
+/* Define if __builtin_bswap64 is available */
+#define HAVE_BUILTIN_BSWAP64 1
+
+/* Define if clock_gettime is available */
+#define HAVE_CLOCK_GETTIME 1
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define if fcntl file locking is available */
+#define HAVE_FCNTL_LOCKING 1
+
+/* Define if the compiler understands __attribute__ */
+#define HAVE_GCC_ATTRIBUTE 1
+
+/* Define to 1 if you have the `getline' function. */
+#define HAVE_GETLINE 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have dlopen (with -ldl). */
+#define HAVE_LIBDL 1
+
+/* Define to 1 if you have the `gmp' library (-lgmp). */
+/* #undef HAVE_LIBGMP */
+
+/* Define if compiler and linker supports __attribute__ ifunc */
+#define HAVE_LINK_IFUNC 1
+
+/* Define to 1 if you have the <malloc.h> header file. */
+#define HAVE_MALLOC_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 */
+/* #undef HAVE_NATIVE_aes_decrypt */
+/* #undef HAVE_NATIVE_aes_encrypt */
+/* #undef HAVE_NATIVE_aes128_decrypt */
+/* #undef HAVE_NATIVE_aes128_encrypt */
+/* #undef HAVE_NATIVE_aes128_invert_key */
+/* #undef HAVE_NATIVE_aes128_set_decrypt_key */
+/* #undef HAVE_NATIVE_aes128_set_encrypt_key */
+/* #undef HAVE_NATIVE_aes192_decrypt */
+/* #undef HAVE_NATIVE_aes192_encrypt */
+/* #undef HAVE_NATIVE_aes192_invert_key */
+/* #undef HAVE_NATIVE_aes192_set_decrypt_key */
+/* #undef HAVE_NATIVE_aes192_set_encrypt_key */
+/* #undef HAVE_NATIVE_aes256_decrypt */
+/* #undef HAVE_NATIVE_aes256_encrypt */
+/* #undef HAVE_NATIVE_aes256_invert_key */
+/* #undef HAVE_NATIVE_aes256_set_decrypt_key */
+/* #undef HAVE_NATIVE_aes256_set_encrypt_key */
+/* #undef HAVE_NATIVE_cbc_aes128_encrypt */
+/* #undef HAVE_NATIVE_cbc_aes192_encrypt */
+/* #undef HAVE_NATIVE_cbc_aes256_encrypt */
+/* #undef HAVE_NATIVE_chacha_core */
+/* #undef HAVE_NATIVE_chacha_2core */
+/* #undef HAVE_NATIVE_chacha_3core */
+/* #undef HAVE_NATIVE_chacha_4core */
+/* #undef HAVE_NATIVE_fat_chacha_2core */
+/* #undef HAVE_NATIVE_fat_chacha_3core */
+/* #undef HAVE_NATIVE_fat_chacha_4core */
+/* #undef HAVE_NATIVE_ecc_curve25519_modp */
+/* #undef HAVE_NATIVE_ecc_curve448_modp */
+/* #undef HAVE_NATIVE_ecc_secp192r1_modp */
+/* #undef HAVE_NATIVE_ecc_secp192r1_redc */
+/* #undef HAVE_NATIVE_ecc_secp224r1_modp */
+/* #undef HAVE_NATIVE_ecc_secp224r1_redc */
+/* #undef HAVE_NATIVE_ecc_secp256r1_modp */
+/* #undef HAVE_NATIVE_ecc_secp256r1_redc */
+/* #undef HAVE_NATIVE_ecc_secp384r1_modp */
+/* #undef HAVE_NATIVE_ecc_secp384r1_redc */
+/* #undef HAVE_NATIVE_ecc_secp521r1_modp */
+/* #undef HAVE_NATIVE_ecc_secp521r1_redc */
+/* #undef HAVE_NATIVE_ghash_set_key */
+/* #undef HAVE_NATIVE_ghash_update */
+/* #undef HAVE_NATIVE_salsa20_core */
+/* #undef HAVE_NATIVE_salsa20_2core */
+/* #undef HAVE_NATIVE_fat_salsa20_2core */
+/* #undef HAVE_NATIVE_sha1_compress */
+/* #undef HAVE_NATIVE_sha256_compress */
+/* #undef HAVE_NATIVE_sha512_compress */
+/* #undef HAVE_NATIVE_sha3_permute */
+/* #undef HAVE_NATIVE_umac_nh */
+/* #undef HAVE_NATIVE_umac_nh_n */
+
+/* Define to 1 if you have the <openssl/ecdsa.h> header file. */
+/* #undef HAVE_OPENSSL_ECDSA_H */
+
+/* Define to 1 if you have the <openssl/evp.h> header file. */
+/* #undef HAVE_OPENSSL_EVP_H */
+
+/* Define to 1 if you have the `secure_getenv' function. */
+/* #undef HAVE_SECURE_GETENV */
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdio.h> header file. */
+#define HAVE_STDIO_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `strerror' function. */
+#define HAVE_STRERROR 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* 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
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the <valgrind/memcheck.h> header file. */
+/* #undef HAVE_VALGRIND_MEMCHECK_H */
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "nettle-bugs@lists.lysator.liu.se"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "nettle"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "nettle 3.8.1"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "nettle"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "3.8.1"
+
+/* The size of `long', as computed by sizeof. */
+#define SIZEOF_LONG __SIZEOF_LONG__
+
+/* The size of `size_t', as computed by sizeof. */
+#define SIZEOF_SIZE_T __SIZEOF_SIZE_T__
+
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at runtime.
+	STACK_DIRECTION > 0 => grows toward higher addresses
+	STACK_DIRECTION < 0 => grows toward lower addresses
+	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 STDC_HEADERS 1
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. This
+   macro is obsolete. */
+#define TIME_WITH_SYS_TIME 1
+
+/* Defined if public key features are enabled */
+/* #undef WITH_HOGWEED */
+
+/* Define if you have openssl's libcrypto (used for benchmarking) */
+/* #undef WITH_OPENSSL */
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+/* #  undef WORDS_BIGENDIAN */
+# endif
+#endif
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+/* #undef gid_t */
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+/* #undef inline */
+#endif
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* #undef size_t */
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+/* #undef uid_t */
+
+/* AIX requires this to be the first thing in the file.  */
+#ifndef __GNUC__
+# if HAVE_ALLOCA_H
+#  include <alloca.h>
+# else
+#  ifdef _AIX
+ #pragma alloca
+#  else
+#   ifndef alloca /* predefined by HP cc +Olibcalls */
+char *alloca ();
+#   endif
+#  endif
+/* Needed for alloca on windows */
+#  if HAVE_MALLOC_H
+#   include <malloc.h>
+#  endif
+# endif
+#else /* defined __GNUC__ */
+# if HAVE_ALLOCA_H
+#  include <alloca.h>
+# else
+/* Needed for alloca on windows, also with gcc */
+#  if HAVE_MALLOC_H
+#   include <malloc.h>
+#  endif
+# endif
+#endif
+
+
+#if HAVE_STRERROR
+#define STRERROR strerror
+#else
+#define STRERROR(x) (sys_errlist[x])
+#endif
+
+
+#if __GNUC__ && HAVE_GCC_ATTRIBUTE
+# define NORETURN __attribute__ ((__noreturn__))
+# define PRINTF_STYLE(f, a) __attribute__ ((__format__ (__printf__, f, a)))
+# define UNUSED __attribute__ ((__unused__))
+#else
+# define NORETURN
+# define PRINTF_STYLE(f, a)
+# define UNUSED
+#endif
+
+
+#if defined(__x86_64__) || defined(__arch64__)
+# define HAVE_NATIVE_64_BIT 1
+#else
+/* Needs include of <limits.h> before use. */
+# define HAVE_NATIVE_64_BIT (SIZEOF_LONG * CHAR_BIT >= 64)
+#endif
+
@@ -0,0 +1 @@
+ 
@@ -0,0 +1 @@
+ 
@@ -0,0 +1,64 @@
+/* version.h
+
+   Information about library version.
+
+   Copyright (C) 2015 Red Hat, Inc.
+   Copyright (C) 2015 Niels Möller
+
+   This file is part of GNU Nettle.
+
+   GNU Nettle is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Nettle 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 copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see http://www.gnu.org/licenses/.
+*/
+
+#ifndef NETTLE_VERSION_H_INCLUDED
+#define NETTLE_VERSION_H_INCLUDED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Individual version numbers in decimal */
+#define NETTLE_VERSION_MAJOR 3
+#define NETTLE_VERSION_MINOR 8
+
+#define NETTLE_USE_MINI_GMP 0
+
+/* We need a preprocessor constant for GMP_NUMB_BITS, simply using
+   sizeof(mp_limb_t) * CHAR_BIT is not good enough. */
+#if NETTLE_USE_MINI_GMP
+# define GMP_NUMB_BITS n/a
+#endif
+
+int
+nettle_version_major (void);
+
+int
+nettle_version_minor (void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* NETTLE_VERSION_H_INCLUDED */
@@ -0,0 +1,44 @@
+#ifndef EHVIEWER_SPINLOCK_H
+#define EHVIEWER_SPINLOCK_H
+
+#include <stddef.h>
+#include <stdatomic.h>
+
+#define cmpxchg(P, O, N) __sync_val_compare_and_swap((P), (O), (N))
+
+#define barrier() __asm__ __volatile__("":::"memory")
+
+#if defined(__aarch64__) || defined(__arm__)
+#define cpu_relax() __asm__ volatile ("wfe");
+#else
+#define cpu_relax() __asm__ volatile ("pause" ::: "memory");
+#endif
+
+typedef struct mcs_lock_t mcs_lock_t;
+struct mcs_lock_t {
+    mcs_lock_t *next;
+    int spin;
+};
+typedef struct mcs_lock_t *mcs_lock;
+
+static inline void lock_mcs(_Atomic mcs_lock *m, mcs_lock_t *me) {
+    mcs_lock_t *tail;
+    me->next = NULL;
+    me->spin = 0;
+    tail = atomic_exchange(m, me);
+    if (!tail) return;
+    tail->next = me;
+    barrier();
+    while (!me->spin) cpu_relax();
+    return;
+}
+
+static inline void unlock_mcs(mcs_lock *m, mcs_lock_t *me) {
+    if (!me->next) {
+        if (cmpxchg(m, me, NULL) == me) return;
+        while (!me->next) cpu_relax();
+    }
+    me->next->spin = 1;
+}
+
+#endif //EHVIEWER_SPINLOCK_H
@@ -0,0 +1,41 @@
+package androidx.navigation.ui
+
+import android.annotation.SuppressLint
+import android.view.MenuItem
+import androidx.annotation.IdRes
+import androidx.navigation.ActivityNavigator
+import androidx.navigation.NavController
+import androidx.navigation.NavDestination
+import androidx.navigation.NavDestination.Companion.hierarchy
+import androidx.navigation.NavOptions
+
+@SuppressLint("PrivateResource")
+fun onNavDestinationSelected2(item: MenuItem, navController: NavController): Boolean {
+    val builder = NavOptions.Builder().setLaunchSingleTop(true)
+    if (
+        navController.currentDestination!!.parent!!.findNode(item.itemId)
+        is ActivityNavigator.Destination
+    ) {
+        builder.setEnterAnim(R.anim.nav_default_enter_anim)
+            .setExitAnim(R.anim.nav_default_exit_anim)
+            .setPopEnterAnim(R.anim.nav_default_pop_enter_anim)
+            .setPopExitAnim(R.anim.nav_default_pop_exit_anim)
+    } else {
+        builder.setEnterAnim(androidx.fragment.R.animator.fragment_open_enter)
+            .setExitAnim(androidx.fragment.R.animator.fragment_open_exit)
+            .setPopEnterAnim(androidx.fragment.R.animator.fragment_close_enter)
+            .setPopExitAnim(androidx.fragment.R.animator.fragment_close_exit)
+    }
+    val options = builder.build()
+    return try {
+        // TODO provide proper API instead of using Exceptions as Control-Flow.
+        navController.navigate(item.itemId, null, options)
+        // Return true only if the destination we've navigated to matches the MenuItem
+        navController.currentDestination?.matchDestination(item.itemId) == true
+    } catch (e: IllegalArgumentException) {
+        false
+    }
+}
+
+fun NavDestination.matchDestination(@IdRes destId: Int): Boolean =
+    hierarchy.any { it.id == destId }
@@ -0,0 +1,25 @@
+package androidx.swiperefreshlayout.widget
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.graphics.drawable.ShapeDrawable
+import android.util.AttributeSet
+import androidx.core.graphics.ColorUtils
+import rikka.core.res.resolveColor
+
+@SuppressLint("PrivateResource")
+class ThemedSwipeRefreshLayout @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+) : SwipeRefreshLayout(context, attrs) {
+
+    init {
+        val surfaceColor =
+            context.theme.resolveColor(com.google.android.material.R.attr.colorSurface)
+        val overlayColor =
+            context.getColor(com.google.android.material.R.color.m3_popupmenu_overlay_color)
+        val backgroundColor = ColorUtils.compositeColors(overlayColor, surfaceColor)
+        (mCircleView.background as ShapeDrawable).paint.color = backgroundColor
+        setColorSchemeColors(context.theme.resolveColor(com.google.android.material.R.attr.colorAccent))
+    }
+}
@@ -0,0 +1,111 @@
+package com.davemorrissey.labs.subscaleview
+
+import android.graphics.Bitmap
+import android.graphics.Rect
+import com.davemorrissey.labs.subscaleview.provider.InputProvider
+
+/**
+ * Helper class used to set the source and additional attributes from a variety of sources. Supports
+ * use of a bitmap, asset, resource, external file or any other URI.
+ *
+ *
+ * When you are using a preview image, you must set the dimensions of the full size image on the
+ * ImageSource object for the full size image using the [.dimensions] method.
+ */
+class ImageSource {
+    val bitmap: Bitmap?
+    val provider: InputProvider?
+
+    private var sWidth = 0
+    private var sHeight = 0
+
+    var sRegion = Rect(0, 0, 0, 0)
+        private set
+    var isCached = false
+        private set
+
+    private constructor(bitmap: Bitmap, cached: Boolean) {
+        this.bitmap = bitmap
+        provider = null
+        sWidth = bitmap.width
+        sHeight = bitmap.height
+        isCached = cached
+    }
+
+    private constructor(provider: InputProvider) {
+        bitmap = null
+        this.provider = provider
+    }
+
+    /**
+     * Use a region of the source image. Region must be set independently for the full size image and the preview if
+     * you are using one.
+     *
+     * @param sRegion the region of the source image to be displayed.
+     * @return this instance for chaining.
+     */
+    fun region(sRegion: Rect): ImageSource {
+        this.sRegion = sRegion
+        setInvariants()
+        return this
+    }
+
+    /**
+     * Declare the dimensions of the image. This is only required for a full size image, when you are specifying a URI
+     * and also a preview image. When displaying a bitmap object, or not using a preview, you do not need to declare
+     * the image dimensions. Note if the declared dimensions are found to be incorrect, the view will reset.
+     *
+     * @param sWidth  width of the source image.
+     * @param sHeight height of the source image.
+     * @return this instance for chaining.
+     */
+    fun dimensions(sWidth: Int, sHeight: Int): ImageSource {
+        if (bitmap == null) {
+            this.sWidth = sWidth
+            this.sHeight = sHeight
+        }
+        setInvariants()
+        return this
+    }
+
+    private fun setInvariants() {
+        if (!sRegion.isEmpty) {
+            sWidth = sRegion.width()
+            sHeight = sRegion.height()
+        }
+    }
+
+    companion object {
+        /**
+         * Create an instance from an input provider.
+         *
+         * @param provider input stream provider.
+         * @return an [ImageSource] instance.
+         */
+        fun provider(provider: InputProvider): ImageSource {
+            return ImageSource(provider)
+        }
+
+        /**
+         * Provide a loaded bitmap for display.
+         *
+         * @param bitmap bitmap to be displayed.
+         * @return an [ImageSource] instance.
+         */
+        fun bitmap(bitmap: Bitmap): ImageSource {
+            return ImageSource(bitmap, false)
+        }
+
+        /**
+         * Provide a loaded and cached bitmap for display. This bitmap will not be recycled when it is no
+         * longer needed. Use this method if you loaded the bitmap with an image loader such as Picasso
+         * or Volley.
+         *
+         * @param bitmap bitmap to be displayed.
+         * @return an [ImageSource] instance.
+         */
+        fun cachedBitmap(bitmap: Bitmap): ImageSource {
+            return ImageSource(bitmap, true)
+        }
+    }
+}
@@ -0,0 +1,15 @@
+package com.davemorrissey.labs.subscaleview
+
+import android.graphics.PointF
+import java.io.Serializable
+
+/**
+ * Wraps the scale, center and orientation of a displayed image for easy restoration on screen rotate.
+ */
+class ImageViewState(val scale: Float, center: PointF) : Serializable {
+    private val centerX: Float = center.x
+    private val centerY: Float = center.y
+
+    val center: PointF
+        get() = PointF(centerX, centerY)
+}
@@ -0,0 +1,50 @@
+package com.davemorrissey.labs.subscaleview.decoder
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.Point
+import android.graphics.Rect
+import com.davemorrissey.labs.subscaleview.provider.InputProvider
+
+/**
+ * Interface for image decoding classes.
+ */
+interface Decoder {
+    /**
+     * Initialise the decoder. When possible, perform initial setup work once in this method. The
+     * dimensions of the image must be returned.
+     *
+     * @param context  Application context. A reference may be held, but must be cleared on recycle.
+     * @param provider Provider of the image.
+     * @return Dimensions of the image.
+     * @throws Exception if initialisation fails.
+     */
+    fun init(context: Context, provider: InputProvider): Point
+
+    /**
+     * Decode a region of the image with the given sample size. This method is called off the UI
+     * thread so it can safely load the image on the current thread. It is called from
+     * [android.os.AsyncTask]s running in an executor that may have multiple threads, so
+     * implementations must be thread safe. Adding `synchronized` to the method signature
+     * is the simplest way to achieve this, but bear in mind the [.recycle] method can be
+     * called concurrently.
+     *
+     * @param sRect      Source image rectangle to decode.
+     * @param sampleSize Sample size.
+     * @return The decoded region. It is safe to return null if decoding fails.
+     */
+    fun decodeRegion(sRect: Rect, sampleSize: Int): Bitmap
+
+    /**
+     * Status check. Should return false before initialisation and after recycle.
+     *
+     * @return true if the decoder is ready to be used.
+     */
+    val isReady: Boolean
+
+    /**
+     * This method will be called when the decoder is no longer required. It should clean up any
+     * resources still in use.
+     */
+    fun recycle()
+}
@@ -0,0 +1,58 @@
+package com.davemorrissey.labs.subscaleview.decoder
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.Point
+import android.graphics.Rect
+import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
+import com.davemorrissey.labs.subscaleview.provider.InputProvider
+
+class ImageDecoder(private val cropBorders: Boolean, bitmapConfig: Bitmap.Config? = null) : Decoder {
+    init {
+        val globalBitmapConfig = SubsamplingScaleImageView.preferredBitmapConfig
+    }
+
+    /**
+     * Initialise the decoder. When possible, perform initial setup work once in this method. The
+     * dimensions of the image must be returned.
+     *
+     * @param context  Application context. A reference may be held, but must be cleared on recycle.
+     * @param provider Provider of the image.
+     * @return Dimensions of the image.
+     * @throws Exception if initialisation fails.
+     */
+    override fun init(context: Context, provider: InputProvider): Point {
+        TODO()
+    }
+
+    /**
+     * Decode a region of the image with the given sample size. This method is called off the UI
+     * thread so it can safely load the image on the current thread. It is called from
+     * [android.os.AsyncTask]s running in an executor that may have multiple threads, so
+     * implementations must be thread safe. Adding `synchronized` to the method signature
+     * is the simplest way to achieve this, but bear in mind the [.recycle] method can be
+     * called concurrently.
+     *
+     * @param sRect      Source image rectangle to decode.
+     * @param sampleSize Sample size.
+     * @return The decoded region. It is safe to return null if decoding fails.
+     */
+    override fun decodeRegion(sRect: Rect, sampleSize: Int): Bitmap {
+        TODO()
+    }
+
+    /**
+     * Status check. Should return false before initialisation and after recycle.
+     *
+     * @return true if the decoder is ready to be used.
+     */
+    override val isReady: Boolean = TODO()
+
+    /**
+     * This method will be called when the decoder is no longer required. It should clean up any
+     * resources still in use.
+     */
+    override fun recycle() {
+        TODO()
+    }
+}
@@ -0,0 +1,3 @@
+package com.davemorrissey.labs.subscaleview.provider
+
+interface InputProvider
@@ -0,0 +1,210 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hippo.ehviewer
+
+import android.app.Application
+import android.content.ComponentCallbacks2
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.collection.LruCache
+import androidx.lifecycle.ProcessLifecycleOwner
+import androidx.lifecycle.coroutineScope
+import coil.ImageLoaderFactory
+import coil.decode.ImageDecoderDecoder
+import coil.util.DebugLogger
+import com.google.android.gms.net.CronetProviderInstaller
+import com.hippo.ehviewer.client.EhCookieStore
+import com.hippo.ehviewer.client.EhTagDatabase
+import com.hippo.ehviewer.client.data.GalleryDetail
+import com.hippo.ehviewer.coil.MergeInterceptor
+import com.hippo.ehviewer.coil.installCronetHttpUriFetcher
+import com.hippo.ehviewer.dailycheck.checkDawn
+import com.hippo.ehviewer.dao.SearchDatabase
+import com.hippo.ehviewer.download.DownloadManager
+import com.hippo.ehviewer.ktbuilder.cache
+import com.hippo.ehviewer.ktbuilder.chunker
+import com.hippo.ehviewer.ktbuilder.diskCache
+import com.hippo.ehviewer.ktbuilder.httpClient
+import com.hippo.ehviewer.ktbuilder.imageLoader
+import com.hippo.ehviewer.legacy.cleanObsoleteCache
+import com.hippo.ehviewer.legacy.migrateCookies
+import com.hippo.ehviewer.ui.keepNoMediaFileStatus
+import com.hippo.ehviewer.ui.lockObserver
+import com.hippo.ehviewer.util.AppConfig
+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.isAtLeastQ
+import com.hippo.ehviewer.util.isCronetSupported
+import eu.kanade.tachiyomi.network.interceptor.CloudflareInterceptor
+import eu.kanade.tachiyomi.util.lang.launchIO
+import eu.kanade.tachiyomi.util.lang.withUIContext
+import kotlinx.coroutines.launch
+import moe.tarsin.kt.unreachable
+import okhttp3.AsyncDns
+import okhttp3.android.AndroidAsyncDns
+import okio.Path.Companion.toOkioPath
+import splitties.arch.room.roomDb
+import splitties.init.appCtx
+
+private val lifecycle = ProcessLifecycleOwner.get().lifecycle
+private val lifecycleScope = lifecycle.coroutineScope
+
+class EhApplication : Application(), ImageLoaderFactory {
+    override fun onCreate() {
+        lifecycle.addObserver(lockObserver)
+        val handler = Thread.getDefaultUncaughtExceptionHandler()
+        Thread.setDefaultUncaughtExceptionHandler { t, e ->
+            try {
+                if (Settings.saveCrashLog) {
+                    Crash.saveCrashLog(e)
+                }
+            } catch (ignored: Throwable) {
+            }
+            handler?.uncaughtException(t, e)
+        }
+        super.onCreate()
+        CronetProviderInstaller.installProvider(appCtx)
+        System.loadLibrary("ehviewer")
+        System.loadLibrary("ehviewer_rust")
+        ReadableTime.initialize(this)
+        lifecycleScope.launchIO {
+            val theme = Settings.theme
+            withUIContext {
+                AppCompatDelegate.setDefaultNightMode(theme)
+            }
+        }
+        lifecycleScope.launchIO {
+            launchIO {
+                migrateCookies()
+            }
+            launchIO {
+                EhTagDatabase.update()
+            }
+            launchIO {
+                EhDB
+            }
+            launchIO {
+                DownloadManager.isIdle
+            }
+            launchIO {
+                cleanupDownload()
+            }
+            if (Settings.requestNews) {
+                launchIO {
+                    checkDawn()
+                }
+            }
+        }
+        cleanObsoleteCache(this)
+    }
+
+    private suspend fun cleanupDownload() {
+        runCatching {
+            keepNoMediaFileStatus()
+        }.onFailure {
+            it.printStackTrace()
+        }
+        runCatching {
+            clearTempDir()
+        }.onFailure {
+            it.printStackTrace()
+        }
+    }
+
+    private fun clearTempDir() {
+        var dir = AppConfig.tempDir
+        if (null != dir) {
+            FileUtils.deleteContent(dir)
+        }
+        dir = AppConfig.externalTempDir
+        if (null != dir) {
+            FileUtils.deleteContent(dir)
+        }
+    }
+
+    override fun onTrimMemory(level: Int) {
+        super.onTrimMemory(level)
+        if (level >= ComponentCallbacks2.TRIM_MEMORY_RUNNING_LOW) {
+            galleryDetailCache.evictAll()
+        }
+    }
+
+    override fun newImageLoader() = imageLoader {
+        components {
+            if (isCronetSupported) {
+                callFactory { unreachable() }
+                installCronetHttpUriFetcher()
+            } else {
+                callFactory(baseOkHttpClient)
+            }
+            add { result, options, _ -> ImageDecoderDecoder(result.source, options, false) }
+            add(MergeInterceptor)
+        }
+        diskCache(imageCache)
+        crossfade(300)
+        error(R.drawable.image_failed)
+        if (BuildConfig.DEBUG) logger(DebugLogger())
+        respectCacheHeaders(false)
+    }
+
+    companion object {
+        val baseOkHttpClient by lazy {
+            httpClient {
+                cookieJar(EhCookieStore)
+                if (isAtLeastQ) {
+                    dns(AsyncDns.toDns(AndroidAsyncDns.IPv4, AndroidAsyncDns.IPv6))
+                }
+                chunker { alwaysReadResponseBody(false) }
+                addInterceptor(CloudflareInterceptor(appCtx))
+            }
+        }
+
+        val noRedirectOkHttpClient by lazy {
+            httpClient(baseOkHttpClient) {
+                followRedirects(false)
+            }
+        }
+
+        // Never use this okhttp client to download large blobs!!!
+        val okHttpClient by lazy {
+            httpClient(baseOkHttpClient) {
+                cache(
+                    appCtx.cacheDir.toOkioPath() / "http_cache",
+                    20L * 1024L * 1024L,
+                )
+            }
+        }
+
+        val galleryDetailCache by lazy {
+            LruCache<Long, GalleryDetail>(25).also {
+                lifecycleScope.launch {
+                    FavouriteStatusRouter.globalFlow.collect { (gid, slot) -> it[gid]?.favoriteSlot = slot }
+                }
+            }
+        }
+
+        val imageCache by lazy {
+            diskCache {
+                directory(appCtx.cacheDir.toOkioPath() / "image_cache")
+                maxSizeBytes(Settings.readCacheSize.coerceIn(320, 5120).toLong() * 1024 * 1024)
+            }
+        }
+
+        val searchDatabase by lazy { roomDb<SearchDatabase>("search_database.db") }
+    }
+}
@@ -17,59 +17,42 @@ package com.hippo.ehviewer

 import android.content.Context
 import android.net.Uri
+import android.os.ParcelFileDescriptor
+import android.os.ParcelFileDescriptor.MODE_READ_ONLY
+import arrow.fx.coroutines.release
 import arrow.fx.coroutines.resource
-import arrow.fx.coroutines.resourceScope
-import com.ehviewer.core.data.model.asEntity
-import com.ehviewer.core.database.EhDatabase
-import com.ehviewer.core.database.Schema17to18
-import com.ehviewer.core.database.model.DownloadArtist
-import com.ehviewer.core.database.model.DownloadDirname
-import com.ehviewer.core.database.model.DownloadInfo
-import com.ehviewer.core.database.model.DownloadLabel
-import com.ehviewer.core.database.model.Filter
-import com.ehviewer.core.database.model.GalleryEntity
-import com.ehviewer.core.database.model.HistoryInfo
-import com.ehviewer.core.database.model.LocalFavoriteInfo
-import com.ehviewer.core.database.model.ProgressInfo
-import com.ehviewer.core.database.model.QuickSearch
-import com.ehviewer.core.files.sendTo
-import com.ehviewer.core.model.GalleryInfo
+import com.hippo.ehviewer.client.data.BaseGalleryInfo
+import com.hippo.ehviewer.dao.DownloadDirname
+import com.hippo.ehviewer.dao.DownloadInfo
+import com.hippo.ehviewer.dao.DownloadLabel
+import com.hippo.ehviewer.dao.EhDatabase
+import com.hippo.ehviewer.dao.Filter
+import com.hippo.ehviewer.dao.HistoryInfo
+import com.hippo.ehviewer.dao.LocalFavoriteInfo
+import com.hippo.ehviewer.dao.QuickSearch
 import com.hippo.ehviewer.download.DownloadManager
+import com.hippo.ehviewer.util.sendTo
 import kotlinx.coroutines.flow.Flow
-import okio.Path
-import okio.Path.Companion.toOkioPath
 import splitties.arch.room.roomDb

 object EhDB {
-    private const val DB_NAME = "eh.db"
-    private val db = roomDb<EhDatabase>(DB_NAME) {
-        addMigrations(Schema17to18())
-    }
+    private val db = roomDb<EhDatabase>("eh.db")

-    suspend fun putGalleryInfo(galleryInfo: GalleryEntity) {
+    private suspend fun putGalleryInfo(galleryInfo: BaseGalleryInfo) {
        db.galleryDao().upsert(galleryInfo)
    }

-    private suspend fun deleteGalleryInfo(galleryInfo: GalleryEntity) {
+    private suspend fun deleteGalleryInfo(galleryInfo: BaseGalleryInfo) {
        runCatching { db.galleryDao().delete(galleryInfo) }
    }

-    suspend fun updateGalleryInfo(galleryInfoList: List<GalleryEntity>) {
-        db.galleryDao().update(galleryInfoList)
-    }
-
-    fun getReadProgressFlow(gid: Long) = db.progressDao().getPageFlow(gid)
-    suspend fun getReadProgress(gid: Long) = db.progressDao().getPage(gid)
-    suspend fun putReadProgress(gid: Long, page: Int) = db.progressDao().upsert(ProgressInfo(gid, page))
-    suspend fun clearProgressInfo() = db.progressDao().deleteAll()
-
    suspend fun getAllDownloadInfo() = db.downloadsDao().joinList().onEach {
        if (it.state == DownloadInfo.STATE_WAIT || it.state == DownloadInfo.STATE_DOWNLOAD) {
            it.state = DownloadInfo.STATE_NONE
        }
    }

-    suspend fun updateDownloadInfo(downloadInfo: Collection<DownloadInfo>) {
+    suspend fun updateDownloadInfo(downloadInfo: List<DownloadInfo>) {
        val dao = db.downloadsDao()
        dao.update(downloadInfo.map(DownloadInfo::downloadInfo))
    }
@@ -82,17 +65,17 @@ object EhDB {
    suspend fun removeDownloadInfo(downloadInfo: DownloadInfo) {
        val dao = db.downloadsDao()
        dao.delete(downloadInfo.downloadInfo)
+        dao.fill(downloadInfo.position)
        deleteGalleryInfo(downloadInfo.galleryInfo)
    }

-    suspend fun randomLocalFav() = db.localFavoritesDao().random()
-
    suspend fun removeDownloadInfo(downloadInfo: List<DownloadInfo>) {
        val dao = db.downloadsDao()
        downloadInfo.forEach {
            dao.delete(it.downloadInfo)
            deleteGalleryInfo(it.galleryInfo)
        }
+        dao.fill(downloadInfo.first().position, downloadInfo.size)
    }

    suspend fun getDownloadDirname(gid: Long): String? {
@@ -116,12 +99,6 @@ object EhDB {
        dao.insertOrIgnore(downloadDirnameList)
    }

-    val downloadsCountByLabel
-        get() = db.downloadsDao().countByLabel()
-
-    val downloadsCountByArtist
-        get() = db.downloadsDao().countByArtist()
-
    suspend fun getAllDownloadLabelList() = db.downloadLabelDao().list()

    suspend fun addDownloadLabel(raw: DownloadLabel): DownloadLabel {
@@ -148,22 +125,12 @@ object EhDB {
        dao.fill(raw.position)
    }

-    suspend fun searchDownloadLabel(keyword: String, limit: Int) = db.downloadLabelDao().search("%$keyword%", limit)
-
-    suspend fun putDownloadArtist(gid: Long, artists: List<DownloadArtist>) {
-        if (artists.isNotEmpty()) {
-            val dao = db.downloadArtistDao()
-            dao.deleteByGid(gid)
-            dao.insertOrIgnore(artists)
-        }
-    }
-
-    suspend fun removeLocalFavorites(galleryInfo: GalleryInfo) {
+    suspend fun removeLocalFavorites(galleryInfo: BaseGalleryInfo) {
        db.localFavoritesDao().deleteByKey(galleryInfo.gid)
-        deleteGalleryInfo(galleryInfo.asEntity())
+        deleteGalleryInfo(galleryInfo)
    }

-    suspend fun removeLocalFavorites(galleryInfoList: Collection<GalleryInfo>) {
+    suspend fun removeLocalFavorites(galleryInfoList: List<BaseGalleryInfo>) {
        galleryInfoList.forEach {
            removeLocalFavorites(it)
        }
@@ -174,12 +141,12 @@ object EhDB {
        return dao.contains(gid)
    }

-    suspend fun putLocalFavorites(galleryInfo: GalleryInfo) {
-        putGalleryInfo(galleryInfo.asEntity())
+    suspend fun putLocalFavorites(galleryInfo: BaseGalleryInfo) {
+        putGalleryInfo(galleryInfo)
        db.localFavoritesDao().upsert(LocalFavoriteInfo(galleryInfo.gid))
    }

-    suspend fun putLocalFavorites(galleryInfoList: Collection<GalleryInfo>) {
+    suspend fun putLocalFavorites(galleryInfoList: List<BaseGalleryInfo>) {
        galleryInfoList.forEach {
            putLocalFavorites(it)
        }
@@ -215,22 +182,20 @@ object EhDB {
    val historyLazyList
        get() = db.historyDao().joinListLazy()

-    fun searchHistory(keyword: String) = db.historyDao().joinListLazy("*$keyword*")
-
    val localFavLazyList
        get() = db.localFavoritesDao().joinListLazy()

    val localFavCount: Flow<Int>
        get() = db.localFavoritesDao().count()

-    fun searchLocalFav(keyword: String) = db.localFavoritesDao().joinListLazy("*$keyword*")
+    fun searchLocalFav(keyword: String) = db.localFavoritesDao().joinListLazy("%$keyword%")

-    suspend fun putHistoryInfo(galleryInfo: GalleryInfo) {
-        putGalleryInfo(galleryInfo.asEntity())
+    suspend fun putHistoryInfo(galleryInfo: BaseGalleryInfo) {
+        putGalleryInfo(galleryInfo)
        db.historyDao().upsert(HistoryInfo(galleryInfo.gid))
    }

-    suspend fun updateFavoriteSlot(gid: Long, slot: Int) {
+    suspend fun modifyHistoryInfoFavslotNonRefresh(gid: Long, slot: Int) {
        val dao = db.galleryDao()
        dao.load(gid)?.let {
            it.favoriteSlot = slot
@@ -243,7 +208,7 @@ object EhDB {
        dao.insertOrIgnore(historyInfoList)
    }

-    suspend fun deleteHistoryInfo(galleryInfo: GalleryEntity) {
+    suspend fun deleteHistoryInfo(galleryInfo: BaseGalleryInfo) {
        val dao = db.historyDao()
        dao.deleteByKey(galleryInfo.gid)
        deleteGalleryInfo(galleryInfo)
@@ -277,58 +242,83 @@ object EhDB {
        db.filterDao().update(filter)
    }

-    fun exportDB(context: Context, file: Path) {
-        db.query("PRAGMA wal_checkpoint(FULL)", null).use { it.moveToNext() }
-        val dbFile = context.getDatabasePath(DB_NAME)
-        dbFile.toOkioPath() sendTo file
+    suspend fun exportDB(context: Context, uri: Uri) {
+        val ehExportName = "eh.export.db"
+        resource {
+            context.deleteDatabase(ehExportName)
+            roomDb<EhDatabase>(ehExportName)
+        } release {
+            it.close()
+            context.deleteDatabase(ehExportName)
+        } use { newDb ->
+            db.galleryDao().list().let { newDb.galleryDao().insertOrIgnore(it) }
+            db.downloadLabelDao().list().let { newDb.downloadLabelDao().insert(it) }
+            db.downloadDirnameDao().list().let { newDb.downloadDirnameDao().insertOrIgnore(it) }
+            db.downloadsDao().list().let { newDb.downloadsDao().insert(it) }
+            db.historyDao().list().let { newDb.historyDao().insertOrIgnore(it) }
+            db.quickSearchDao().list().let { newDb.quickSearchDao().insert(it) }
+            db.localFavoritesDao().list().let { newDb.localFavoritesDao().insertOrIgnore(it) }
+            db.filterDao().list().let { newDb.filterDao().insert(it) }
+            newDb.close()
+            val dbFile = context.getDatabasePath(ehExportName)
+            context.contentResolver.openFileDescriptor(uri, "rw")!!.use { toFd ->
+                ParcelFileDescriptor.open(dbFile, MODE_READ_ONLY).use { fromFd ->
+                    fromFd sendTo toFd
+                }
+            }
+        }
    }

-    suspend fun importDB(context: Context, uri: Uri) = resourceScope {
+    suspend fun importDB(context: Context, uri: Uri) {
        val tempDBName = "tmp.db"
-        val oldDB = resource {
+        resource {
            context.deleteDatabase(tempDBName)
-            roomDb<EhDatabase>(tempDBName) {
-                createFromInputStream { context.contentResolver.openInputStream(uri) }
-                addMigrations(Schema17to18())
+            roomDb<EhDatabase>(tempDBName) { createFromInputStream { context.contentResolver.openInputStream(uri) } }
+        } release {
+            it.close()
+            context.deleteDatabase(tempDBName)
+        } use { oldDB ->
+            runCatching {
+                db.galleryDao().insertOrIgnore(oldDB.galleryDao().list())
+            }
+            runCatching {
+                val downloadLabelList = oldDB.downloadLabelDao().list()
+                DownloadManager.addDownloadLabel(downloadLabelList)
+            }
+            runCatching {
+                oldDB.downloadDirnameDao().list().let {
+                    importDownloadDirname(it)
+                }
+            }
+            runCatching {
+                val downloadInfoList = oldDB.downloadsDao().joinList().asReversed()
+                DownloadManager.addDownload(downloadInfoList, false)
+            }
+            runCatching {
+                val historyInfoList = oldDB.historyDao().list()
+                importHistoryInfo(historyInfoList)
+            }
+            runCatching {
+                val quickSearchList = oldDB.quickSearchDao().list()
+                val currentQuickSearchList = db.quickSearchDao().list()
+                val offset = currentQuickSearchList.size
+                val importList = quickSearchList.filter { newQS ->
+                    currentQuickSearchList.none { it.name == newQS.name }
+                }.onEachIndexed { index, q -> q.position = index + offset }
+                importQuickSearch(importList)
+            }
+            runCatching {
+                oldDB.localFavoritesDao().list().let {
+                    importLocalFavorites(it)
+                }
+            }
+            runCatching {
+                val filterList = oldDB.filterDao().list()
+                val currentFilterList = db.filterDao().list()
+                filterList.forEach {
+                    if (it !in currentFilterList) addFilter(it)
+                }
            }
-        } release { db ->
-            db.close()
-            context.deleteDatabase(tempDBName)
-        }
-
-        db.galleryDao().insertOrIgnore(oldDB.galleryDao().list())
-        db.progressDao().insertOrIgnore(oldDB.progressDao().list())
-
-        val downloadLabelList = oldDB.downloadLabelDao().list()
-        DownloadManager.addDownloadLabel(downloadLabelList)
-
-        oldDB.downloadDirnameDao().list().let {
-            importDownloadDirname(it)
-        }
-
-        val downloadInfoList = oldDB.downloadsDao().joinList().asReversed()
-        DownloadManager.addDownload(downloadInfoList)
-
-        val historyInfoList = oldDB.historyDao().list()
-        importHistoryInfo(historyInfoList)
-
-        val quickSearchList = oldDB.quickSearchDao().list()
-        val currentQuickSearchList = db.quickSearchDao().list()
-        val offset = currentQuickSearchList.size
-        val importList = quickSearchList.filter { newQS ->
-            currentQuickSearchList.none { it.name == newQS.name }
-        }.onEachIndexed { index, q ->
-            q.id = null
-            q.position = index + offset
-        }
-        importQuickSearch(importList)
-
-        oldDB.localFavoritesDao().list().let {
-            importLocalFavorites(it)
-        }
-
-        oldDB.filterDao().list().forEach {
-            addFilter(it)
        }
    }
 }
@@ -0,0 +1,117 @@
+@file:Suppress("SameParameterValue")
+
+package com.hippo.ehviewer
+
+import com.hippo.ehviewer.client.EhUtils
+import com.hippo.ehviewer.client.data.FavListUrlBuilder
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asFlow
+import kotlinx.coroutines.flow.conflate
+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"
+
+    private val _favFlow = MutableSharedFlow<Unit>()
+    val favChangesFlow = _favFlow.debounce(1000)
+    var favCat by stringArrayPref("fav_cat", 10, "Favorites").emitTo(_favFlow)
+    var favCount by intArrayPref("fav_count", 10).emitTo(_favFlow)
+    var favCloudCount by intPref("fav_cloud", 0).emitTo(_favFlow)
+
+    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 intPref("download_delay_2", 0)
+    var gallerySite by intPref("gallery_site_2", 0).observed { updateWhenGallerySiteChanges() }
+    var multiThreadDownload by intPref("download_thread_2", 3)
+    var preloadImage by intPref("preload_image_2", 5)
+    var 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 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 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)
+    var enabledSecurity by boolPref("enable_secure", false)
+    var useCIUpdateChannel by boolPref("ci_update_channel", false)
+    var mediaScan by boolPref("media_scan", false).observed { updateWhenKeepMediaStatusChanges() }
+    var hasDefaultDownloadLabel by boolPref("has_default_download_label", false)
+    var qSSaveProgress by boolPref("qs_save_progress", true)
+    var saveParseErrorBody by boolPref("save_parse_error_body", true)
+    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 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 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)
+    var securityDelay by intPref("require_unlock_delay", 0)
+    var clipboardTextHashCode by intPref("clipboard_text_hash_code", 0)
+    var listThumbSize by intPref("list_tile_size", 40)
+    var searchCategory by intPref("search_pref", EhUtils.ALL_CATEGORY)
+    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 recentDownloadLabel by stringOrNullPref("recent_download_label", null)
+    var defaultDownloadLabel by stringOrNullPref("default_download_label", null)
+    var displayName by stringOrNullPref("display_name", null)
+    var avatar by stringOrNullPref("avatar", null)
+    var language by stringPref("app_language", "system").observed { updateWhenLocaleChanges() }
+    var lastDawnDay by longPref("last_dawn_day", 0)
+    var lastUpdateDay by longPref("last_update_day", 0)
+
+    init {
+        if ("CN" == Locale.getDefault().country) {
+            edit {
+                if (KEY_SHOW_TAG_TRANSLATIONS !in prefs) showTagTranslations = true
+            }
+        }
+    }
+
+    interface Delegate<R> {
+        val flowGetter: () -> Flow<Unit>
+        operator fun getValue(thisRef: Any?, prop: KProperty<*>?): R
+        operator fun setValue(thisRef: Any?, prop: KProperty<*>?, value: R)
+    }
+
+    private fun intArrayPref(key: String, count: Int) = object : Delegate<IntArray> {
+        override val flowGetter: () -> Flow<Unit> = { _value.asFlow().flatMapMerge { it.changesFlow() }.conflate() }
+        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) {
+            check(value.size == count)
+            edit { value.zip(_value) { v, d -> d.value = v } }
+        }
+    }
+
+    private fun stringArrayPref(key: String, count: Int, defMetaValue: String) = object : Delegate<Array<String>> {
+        override val flowGetter: () -> Flow<Unit> = { _value.asFlow().flatMapMerge { it.changesFlow() }.conflate() }
+        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>) {
+            check(value.size == count)
+            edit { value.zip(_value) { v, d -> d.value = v } }
+        }
+    }
+}
@@ -0,0 +1,83 @@
+package com.hippo.ehviewer
+
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY
+import androidx.core.os.LocaleListCompat
+import com.hippo.ehviewer.client.EhCookieStore
+import com.hippo.ehviewer.client.EhEngine
+import com.hippo.ehviewer.client.EhTagDatabase
+import com.hippo.ehviewer.dailycheck.updateDailyCheckWork
+import com.hippo.ehviewer.ui.keepNoMediaFileStatus
+import eu.kanade.tachiyomi.util.lang.launchIO
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.launch
+import splitties.init.appCtx
+import splitties.preferences.PrefDelegate
+
+private val collectScope = CoroutineScope(Dispatchers.Main + SupervisorJob())
+fun <T, R : PrefDelegate<T>> R.observed(func: (Unit) -> Unit) = apply { collectScope.launch { changesFlow().collect(func) } }
+fun <T, R : Settings.Delegate<T>> R.observed(func: (Unit) -> Unit) = apply { collectScope.launch { flowGetter().collect(func) } }
+fun <T, R : Settings.Delegate<T>> R.emitTo(flow: MutableSharedFlow<Unit>) = apply { collectScope.launch { flowGetter().collect { flow.emit(Unit) } } }
+fun <T, R : PrefDelegate<T>> R.emitTo(flow: MutableSharedFlow<Unit>) = apply { collectScope.launch { changesFlow().collect { flow.emit(Unit) } } }
+
+fun updateWhenLocaleChanges() {
+    val newValue = Settings.language
+    if ("system" == newValue) {
+        AppCompatDelegate.setApplicationLocales(LocaleListCompat.getEmptyLocaleList())
+    } else {
+        AppCompatDelegate.setApplicationLocales(LocaleListCompat.forLanguageTags(newValue))
+    }
+}
+
+fun updateWhenKeepMediaStatusChanges() {
+    collectScope.launchIO {
+        runCatching {
+            keepNoMediaFileStatus()
+        }
+    }
+}
+
+fun updateWhenThemeChanges() {
+    collectScope.launch {
+        delay(100) // Avoid recompose being cancelled
+        AppCompatDelegate.setDefaultNightMode(Settings.theme)
+    }
+}
+
+fun updateWhenAmoledModeChanges() {
+    collectScope.launch {
+        delay(100) // Avoid recompose being cancelled
+        AppCompatDelegate.setDefaultNightMode(MODE_NIGHT_AUTO_BATTERY)
+        AppCompatDelegate.setDefaultNightMode(Settings.theme)
+    }
+}
+
+fun updateWhenRequestNewsChanges() {
+    updateDailyCheckWork(appCtx)
+}
+
+fun updateWhenGallerySiteChanges() {
+    if (!Settings.needSignIn && EhCookieStore.hasSignedIn()) {
+        collectScope.launchIO {
+            runCatching {
+                EhEngine.getUConfig()
+            }.onFailure {
+                it.printStackTrace()
+            }
+        }
+    }
+}
+
+fun updateWhenTagTranslationChanges() {
+    collectScope.launchIO {
+        runCatching {
+            EhTagDatabase.update()
+        }.onFailure {
+            it.printStackTrace()
+        }
+    }
+}
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.client
+
+import com.hippo.ehviewer.Settings
+import com.hippo.ehviewer.client.data.GalleryInfo
+import com.hippo.ehviewer.client.data.GalleryPreview
+import com.hippo.ehviewer.client.data.NormalGalleryPreview
+
+// ExHentai Large Preview: https://s.exhentai.org/t/***
+// ExHentai Normal Preview: https://s.exhentai.org/m/***
+// EHentai Normal Preview: https://ehgt.org/m/***
+// EHentai Large Preview: https://ehgt.org/***
+
+private const val URL_PREFIX_THUMB_E = "https://ehgt.org/"
+private const val URL_PREFIX_THUMB_EX = "https://s.exhentai.org/"
+private const val URL_PREFIX_LARGE_THUMB_EX = URL_PREFIX_THUMB_EX + "t/"
+
+fun getImageKey(gid: Long, index: Int): String {
+    return "image:$gid:$index"
+}
+
+fun getThumbKey(url: String): String {
+    return url.removePrefix(URL_PREFIX_THUMB_E).removePrefix(URL_PREFIX_LARGE_THUMB_EX).removePrefix(URL_PREFIX_THUMB_EX)
+}
+
+val GalleryPreview.url
+    get() = if (exThumb) {
+        if (this is NormalGalleryPreview) URL_PREFIX_THUMB_EX else URL_PREFIX_LARGE_THUMB_EX
+    } else {
+        URL_PREFIX_THUMB_E
+    } + imageKey
+
+val GalleryInfo.thumbUrl
+    get() = (if (exThumb) URL_PREFIX_LARGE_THUMB_EX else URL_PREFIX_THUMB_E) + thumbKey!!
+
+val exThumb get() = EhUtils.isExHentai && !Settings.forceEhThumb
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.client
+
+import android.webkit.CookieManager
+import okhttp3.Cookie
+import okhttp3.CookieJar
+import okhttp3.HttpUrl
+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 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 }
+        } else {
+            emptyList()
+        }
+    }
+
+    fun hasSignedIn(): Boolean {
+        val url = EhUrl.HOST_E.toHttpUrl()
+        return contains(url, KEY_IPB_MEMBER_ID) && contains(url, KEY_IPB_PASS_HASH)
+    }
+
+    const val KEY_IPB_MEMBER_ID = "ipb_member_id"
+    const val KEY_IPB_PASS_HASH = "ipb_pass_hash"
+    const val KEY_IGNEOUS = "igneous"
+    private const val KEY_STAR = "star"
+    private const val KEY_CONTENT_WARNING = "nw"
+    private const val CONTENT_WARNING_NOT_SHOW = "1"
+    private const val KEY_UTMP_NAME = "__utmp"
+    private val sTipsCookie = Cookie.Builder().apply {
+        name(KEY_CONTENT_WARNING)
+        value(CONTENT_WARNING_NOT_SHOW)
+        domain(EhUrl.DOMAIN_E)
+        path("/")
+        expiresAt(Long.MAX_VALUE)
+    }.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()
+    }
+
+    fun deleteCookie(url: HttpUrl, name: String) {
+        manager.setCookie(url.toString(), "$name=;Max-Age=0")
+    }
+
+    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())
+    }
+
+    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 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 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) }
+            } else {
+                this
+            }
+        }
+    }
+}
@@ -0,0 +1,525 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.client
+
+import android.util.Log
+import arrow.fx.coroutines.parMap
+import arrow.fx.coroutines.parZip
+import com.hippo.ehviewer.R
+import com.hippo.ehviewer.Settings
+import com.hippo.ehviewer.client.data.BaseGalleryInfo
+import com.hippo.ehviewer.client.data.GalleryInfo
+import com.hippo.ehviewer.client.exception.EhException
+import com.hippo.ehviewer.client.exception.InsufficientFundsException
+import com.hippo.ehviewer.client.exception.NotLoggedInException
+import com.hippo.ehviewer.client.exception.ParseException
+import com.hippo.ehviewer.client.parser.ArchiveParser
+import com.hippo.ehviewer.client.parser.EventPaneParser
+import com.hippo.ehviewer.client.parser.FavoritesParser
+import com.hippo.ehviewer.client.parser.ForumsParser
+import com.hippo.ehviewer.client.parser.GalleryApiParser
+import com.hippo.ehviewer.client.parser.GalleryDetailParser
+import com.hippo.ehviewer.client.parser.GalleryListParser
+import com.hippo.ehviewer.client.parser.GalleryNotAvailableParser
+import com.hippo.ehviewer.client.parser.GalleryPageApiParser
+import com.hippo.ehviewer.client.parser.GalleryPageParser
+import com.hippo.ehviewer.client.parser.GalleryTokenApiParser
+import com.hippo.ehviewer.client.parser.HomeParser
+import com.hippo.ehviewer.client.parser.ProfileParser
+import com.hippo.ehviewer.client.parser.RateGalleryResult
+import com.hippo.ehviewer.client.parser.SignInParser
+import com.hippo.ehviewer.client.parser.TorrentParser
+import com.hippo.ehviewer.client.parser.TorrentResult
+import com.hippo.ehviewer.client.parser.VoteCommentResult
+import com.hippo.ehviewer.client.parser.VoteTagParser
+import com.hippo.ehviewer.cronet.awaitBodyFully
+import com.hippo.ehviewer.cronet.cronetRequest
+import com.hippo.ehviewer.cronet.execute
+import com.hippo.ehviewer.dailycheck.showEventNotification
+import com.hippo.ehviewer.dailycheck.today
+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 kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.delay
+import kotlinx.serialization.json.add
+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
+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 {
+    // 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())
+    }
+
+    // Check Gallery Not Available
+    if (body.contains("Gallery Not Available - ")) {
+        val error = GalleryNotAvailableParser.parse(body)
+        if (!error.isNullOrBlank()) {
+            throw EhException(error)
+        }
+    }
+
+    // Check bad response code
+    if (code >= 400) {
+        throw StatusCodeException(code)
+    }
+
+    if (e is ParseException) {
+        if (body.isEmpty()) {
+            throw EhException(appCtx.getString(R.string.error_empty_html))
+        } else if ("<" !in body) {
+            throw EhException(body)
+        } else {
+            if (Settings.saveParseErrorBody) AppConfig.saveParseErrorBody(e, body)
+            throw EhException(appCtx.getString(R.string.error_parse_error), e)
+        }
+    }
+
+    // We can't translate it, rethrow it anyway
+    throw e
+}
+
+val httpContentPool = DirectByteBufferPool(16, 16384)
+
+suspend inline fun <T> fetchCompat(url: String, referer: String? = null, crossinline parser: (ByteBuffer) -> T): T {
+    return if (isCronetSupported) {
+        cronetRequest(url, referer).execute {
+            val buffer = httpContentPool.borrow()
+            try {
+                awaitBodyFully {
+                    buffer.put(it)
+                }
+                buffer.flip()
+                parser(buffer)
+            } finally {
+                httpContentPool.recycle(buffer)
+            }
+        }
+    } else {
+        ehRequest(url, referer).execute {
+            val buffer = httpContentPool.borrow()
+            try {
+                while (true) {
+                    if (body.source().read(buffer) == -1) break
+                }
+                buffer.flip()
+                parser(buffer)
+            } finally {
+                httpContentPool.recycle(buffer)
+            }
+        }
+    }
+}
+
+@Suppress("REDUNDANT_INLINE_SUSPEND_FUNCTION_TYPE")
+private suspend inline fun <T> Request.executeAndParsingWith(block: suspend String.() -> T): T {
+    Log.d(TAG, url.toString())
+    return execute {
+        val body = body.string()
+        try {
+            block(body)
+        } catch (e: Exception) {
+            rethrowExactly(code, headers, body, e)
+        }
+    }
+}
+
+object EhEngine {
+    suspend fun getOriginalImageUrl(url: String, referer: String?): String {
+        Log.d(TAG, url)
+        return ehRequest(url, referer).executeNoRedirect {
+            header("Location")?.apply {
+                if (contains("bounce_login")) {
+                    throw NotLoggedInException()
+                }
+            } ?: throw InsufficientFundsException()
+        }
+    }
+
+    suspend fun getTorrentList(url: String, gid: Long, token: String?): TorrentResult {
+        val referer = EhUrl.getGalleryDetailUrl(gid, token)
+        return fetchCompat(url, referer, TorrentParser::parse)
+    }
+
+    suspend fun getArchiveList(url: String, gid: Long, token: String?) = ehRequest(url, EhUrl.getGalleryDetailUrl(gid, token))
+        .executeAndParsingWith(ArchiveParser::parse)
+        .apply { funds = funds ?: ehRequest(EhUrl.URL_FUNDS).executeAndParsingWith(HomeParser::parseFunds) }
+
+    suspend fun getImageLimits() = parZip(
+        { fetchCompat(EhUrl.URL_HOME, parser = HomeParser::parse) },
+        { ehRequest(EhUrl.URL_FUNDS).executeAndParsingWith(HomeParser::parseFunds) },
+        { limits, funds -> HomeParser.Result(limits, funds) },
+    )
+
+    suspend fun getNews(parse: Boolean) = ehRequest(EhUrl.URL_NEWS, EhUrl.REFERER_E)
+        .executeAndParsingWith { if (parse) EventPaneParser.parse(this) else null }
+
+    suspend fun getProfile(): ProfileParser.Result {
+        val url = ehRequest(EhUrl.URL_FORUMS).executeAndParsingWith(ForumsParser::parse)
+        return ehRequest(url, EhUrl.URL_FORUMS).executeAndParsingWith(ProfileParser::parse)
+    }
+
+    suspend fun getUConfig(url: String = EhUrl.uConfigUrl) {
+        runSuspendCatching {
+            ehRequest(url).executeAndParsingWith { check(contains(U_CONFIG_TEXT)) { "Unable to load config from $url!" } }
+        }.onFailure {
+            // It may get redirected when accessing ex for the first time
+            if (url == EhUrl.URL_UCONFIG_EX) {
+                it.printStackTrace()
+                ehRequest(url).executeAndParsingWith { check(contains(U_CONFIG_TEXT)) { "Unable to load config from $url!" } }
+            } else {
+                throw it
+            }
+        }
+    }
+
+    suspend fun getGalleryPage(
+        url: String,
+        gid: Long,
+        token: String?,
+    ): GalleryPageParser.Result {
+        val referer = EhUrl.getGalleryDetailUrl(gid, token)
+        return ehRequest(url, referer).executeAndParsingWith(GalleryPageParser::parse)
+    }
+
+    suspend fun getGalleryList(url: String) = ehRequest(url, EhUrl.referer)
+        .executeAndParsingWith(GalleryListParser::parse)
+        .apply { fillGalleryList(galleryInfoList, url, true) }
+
+    suspend fun getGalleryDetail(url: String) = ehRequest(url, EhUrl.referer).executeAndParsingWith {
+        EventPaneParser.parse(this)?.let {
+            Settings.lastDawnDay = today
+            showEventNotification(it)
+        }
+        GalleryDetailParser.parse(this)
+    }
+
+    suspend fun getPreviewList(url: String) = ehRequest(url, EhUrl.referer).executeAndParsingWith {
+        GalleryDetailParser.parsePreviewList(this) to GalleryDetailParser.parsePreviewPages(this)
+    }
+
+    suspend fun getFavorites(url: String) = ehRequest(url, EhUrl.referer)
+        .executeAndParsingWith(FavoritesParser::parse)
+        .apply { fillGalleryList(galleryInfoList, url, false) }
+
+    suspend fun signIn(username: String, password: String): String {
+        val referer = "https://forums.e-hentai.org/index.php?act=Login&CODE=00"
+        val url = EhUrl.API_SIGN_IN
+        val origin = "https://forums.e-hentai.org"
+        return ehRequest(url, referer, origin) {
+            formBody {
+                add("referer", referer)
+                add("b", "")
+                add("bt", "")
+                add("UserName", username)
+                add("PassWord", password)
+                add("CookieDate", "1")
+            }
+        }.executeAndParsingWith(SignInParser::parse)
+    }
+
+    suspend fun commentGallery(url: String, comment: String, id: String?) = ehRequest(url, url, EhUrl.origin) {
+        formBody {
+            if (id == null) {
+                add("commenttext_new", comment)
+            } else {
+                add("commenttext_edit", comment)
+                add("edit_comment", id)
+            }
+        }
+    }.executeAndParsingWith {
+        val document = Jsoup.parse(this)
+        val elements = document.select("#chd + p")
+        if (elements.size > 0) {
+            throw EhException(elements[0].text())
+        }
+        GalleryDetailParser.parseComments(document)
+    }
+
+    /**
+     * @param dstCat -1 for delete, 0 - 9 for cloud favorite, others throw Exception
+     * @param note   max 250 characters
+     */
+    suspend fun modifyFavorites(
+        gid: Long,
+        token: String?,
+        dstCat: Int = -1,
+        note: String = "",
+    ) {
+        val catStr: String = when (dstCat) {
+            -1 -> "favdel"
+            in 0..9 -> dstCat.toString()
+            else -> throw EhException("Invalid dstCat: $dstCat")
+        }
+        val url = EhUrl.getAddFavorites(gid, token)
+        return ehRequest(url, url, EhUrl.origin) {
+            formBody {
+                add("favcat", catStr)
+                add("favnote", note)
+                // apply=Add+to+Favorites is not necessary, just use apply=Apply+Changes all the time
+                add("apply", "Apply Changes")
+                add("update", "1")
+            }
+        }.executeAndParsingWith { }
+    }
+
+    suspend fun downloadArchive(
+        gid: Long,
+        token: String?,
+        or: String?,
+        res: String?,
+        isHAtH: Boolean,
+    ): String? {
+        if (or.isNullOrEmpty()) {
+            throw EhException("Invalid form param or: $or")
+        }
+        if (res.isNullOrEmpty()) {
+            throw EhException("Invalid res: $res")
+        }
+        val url = EhUrl.getDownloadArchive(gid, token, or)
+        val referer = EhUrl.getGalleryDetailUrl(gid, token)
+        val request = ehRequest(url, referer, EhUrl.origin) {
+            formBody {
+                if (isHAtH) {
+                    add("hathdl_xres", res)
+                } else {
+                    add("dltype", res)
+                    if (res == "org") {
+                        add("dlcheck", "Download Original Archive")
+                    } else {
+                        add("dlcheck", "Download Resample Archive")
+                    }
+                }
+            }
+        }
+        var result = request.executeAndParsingWith(ArchiveParser::parseArchiveUrl)
+        if (!isHAtH) {
+            if (result == null) {
+                // Wait for the server to prepare archives
+                delay(1000)
+                result = request.executeAndParsingWith(ArchiveParser::parseArchiveUrl)
+                if (result == null) {
+                    throw EhException("Archive unavailable")
+                }
+            }
+            return result
+        }
+        return null
+    }
+
+    suspend fun resetImageLimits() = ehRequest(EhUrl.URL_HOME) {
+        formBody {
+            add("reset_imagelimit", "Reset Limit")
+        }
+    }.executeAndParsingWith(HomeParser::parseResetLimits)
+
+    suspend fun modifyFavorites(url: String, gidArray: LongArray, dstCat: Int): FavoritesParser.Result {
+        val catStr: String = when (dstCat) {
+            -1 -> "delete"
+            in 0..9 -> "fav$dstCat"
+            else -> throw EhException("Invalid dstCat: $dstCat")
+        }
+        return ehRequest(url, url, EhUrl.origin) {
+            formBody {
+                add("ddact", catStr)
+                gidArray.forEach { add("modifygids[]", it.toString()) }
+            }
+        }.executeAndParsingWith(FavoritesParser::parse).apply { fillGalleryList(galleryInfoList, url, false) }
+    }
+
+    suspend fun getGalleryPageApi(
+        gid: Long,
+        index: Int,
+        pToken: String,
+        showKey: String?,
+        previousPToken: String?,
+    ): GalleryPageApiParser.Result {
+        val referer = if (index > 0 && previousPToken != null) EhUrl.getPageUrl(gid, index - 1, previousPToken) else null
+        return ehRequest(EhUrl.apiUrl, referer, EhUrl.origin) {
+            jsonBody {
+                put("method", "showpage")
+                put("gid", gid)
+                put("page", index + 1)
+                put("imgkey", pToken)
+                put("showkey", showKey)
+            }
+        }.executeAndParsingWith(GalleryPageApiParser::parse)
+    }
+
+    suspend fun rateGallery(
+        apiUid: Long,
+        apiKey: String?,
+        gid: Long,
+        token: String?,
+        rating: Float,
+    ): RateGalleryResult = ehRequest(EhUrl.apiUrl, EhUrl.getGalleryDetailUrl(gid, token), EhUrl.origin) {
+        jsonBody {
+            put("method", "rategallery")
+            put("apiuid", apiUid)
+            put("apikey", apiKey)
+            put("gid", gid)
+            put("token", token)
+            put("rating", ceil((rating * 2).toDouble()).toInt())
+        }
+    }.executeAndParsingWith(String::parseAs)
+
+    suspend fun fillGalleryListByApi(galleryInfoList: List<GalleryInfo>, referer: String) = galleryInfoList.chunked(MAX_REQUEST_SIZE).parMap {
+        ehRequest(EhUrl.apiUrl, referer, EhUrl.origin) {
+            jsonBody {
+                put("method", "gdata")
+                array("gidlist") {
+                    it.forEach {
+                        addJsonArray {
+                            add(it.gid)
+                            add(it.token)
+                        }
+                    }
+                }
+                put("namespace", 1)
+            }
+        }.executeAndParsingWith { GalleryApiParser.parse(this, it) }
+    }
+
+    suspend fun voteComment(
+        apiUid: Long,
+        apiKey: String?,
+        gid: Long,
+        token: String?,
+        commentId: Long,
+        commentVote: Int,
+    ): VoteCommentResult = ehRequest(EhUrl.apiUrl, EhUrl.referer, EhUrl.origin) {
+        jsonBody {
+            put("method", "votecomment")
+            put("apiuid", apiUid)
+            put("apikey", apiKey)
+            put("gid", gid)
+            put("token", token)
+            put("comment_id", commentId)
+            put("comment_vote", commentVote)
+        }
+    }.executeAndParsingWith(String::parseAs)
+
+    suspend fun voteTag(
+        apiUid: Long,
+        apiKey: String?,
+        gid: Long,
+        token: String?,
+        tags: String?,
+        vote: Int,
+    ) = ehRequest(EhUrl.apiUrl, EhUrl.referer, EhUrl.origin) {
+        jsonBody {
+            put("method", "taggallery")
+            put("apiuid", apiUid)
+            put("apikey", apiKey)
+            put("gid", gid)
+            put("token", token)
+            put("tags", tags)
+            put("vote", vote)
+        }
+    }.executeAndParsingWith(VoteTagParser::parse)
+
+    suspend fun getGalleryToken(gid: Long, gtoken: String?, page: Int) = ehRequest(EhUrl.apiUrl, EhUrl.referer, EhUrl.origin) {
+        jsonBody {
+            put("method", "gtoken")
+            array("pagelist") {
+                addJsonArray {
+                    add(gid)
+                    add(gtoken)
+                    add(page + 1)
+                }
+            }
+        }
+    }.executeAndParsingWith(GalleryTokenApiParser::parse)
+
+    /**
+     * @param image Must be jpeg
+     */
+    suspend fun imageSearch(image: File, uss: Boolean, osc: Boolean) = ehRequest(EhUrl.imageSearchUrl, EhUrl.referer, EhUrl.origin) {
+        multipartBody {
+            setType(MultipartBody.FORM)
+            addFormDataPart("sfile", "a.jpg", image.asRequestBody(MEDIA_TYPE_JPEG))
+            if (uss) addFormDataPart("fs_similar", "on")
+            if (osc) addFormDataPart("fs_covers", "on")
+            addFormDataPart("f_sfile", "File Search")
+        }
+    }.executeAndParsingWith(GalleryListParser::parse).apply { fillGalleryList(galleryInfoList, EhUrl.imageSearchUrl, true) }
+
+    private suspend fun fillGalleryList(list: MutableList<BaseGalleryInfo>, url: String, filter: Boolean) {
+        // Filter title and uploader
+        if (filter) list.removeAllSuspend { EhFilter.filterTitle(it) || EhFilter.filterUploader(it) }
+
+        var hasTags = false
+        var hasPages = false
+        var hasRated = false
+        for (gi in list) {
+            if (gi.simpleTags != null) {
+                hasTags = true
+            }
+            if (gi.pages != 0) {
+                hasPages = true
+            }
+            if (gi.rated) {
+                hasRated = true
+            }
+        }
+        val needApi = filter && EhFilter.needTags() && !hasTags || Settings.showGalleryPages && !hasPages || hasRated
+        if (needApi) fillGalleryListByApi(list, url)
+
+        // Filter tag, thumbnail mode need filter uploader again
+        if (filter) list.removeAllSuspend { EhFilter.filterUploader(it) || EhFilter.filterTag(it) || EhFilter.filterTagNamespace(it) }
+    }
+
+    suspend fun modifyFavoritesRange(galleryList: List<Pair<Long, String>>, dstCat: Int) {
+        galleryList.forEach { (gid, token) -> modifyFavorites(gid, token, dstCat) }
+    }
+}
@@ -1,10 +1,10 @@
 package com.hippo.ehviewer.client

 import arrow.core.memoize
-import com.ehviewer.core.database.model.Filter
-import com.ehviewer.core.database.model.FilterMode
-import com.ehviewer.core.model.GalleryInfo
 import com.hippo.ehviewer.EhDB
+import com.hippo.ehviewer.client.data.GalleryInfo
+import com.hippo.ehviewer.dao.Filter
+import com.hippo.ehviewer.dao.FilterMode
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
@@ -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: (suspend (R) -> Unit)? = null,
+        callback: ((R) -> Unit)? = null,
        ops: suspend Filter.() -> R,
    ) = launch { ops().let { callback?.invoke(it) } }
-    fun Filter.remember(callback: (suspend (Boolean) -> Unit)? = null) = launchOps(callback) {
+    fun Filter.remember(callback: ((Boolean) -> Unit)? = null) = launchOps(callback) {
        EhDB.addFilter(this).also { if (it) filters.await().add(this) }
    }
-    fun Filter.trigger(callback: (suspend (Unit) -> Unit)? = null) = launchOps(callback) {
+    fun Filter.trigger(callback: ((Unit) -> Unit)? = null) = launchOps(callback) {
        enable = !enable
        EhDB.updateFilter(this)
    }
-    fun Filter.forget(callback: (suspend (Unit) -> Unit)? = null) = launchOps(callback) {
+    fun Filter.forget(callback: ((Unit) -> Unit)? = null) = launchOps(callback) {
        EhDB.deleteFilter(this)
        filters.await().remove(this)
    }
@@ -55,8 +55,8 @@ object EhFilter : CoroutineScope {
    suspend fun needTags() = filters.await().any { it.enable && (it.mode == FilterMode.TAG || it.mode == FilterMode.TAG_NAMESPACE) }
    suspend fun filterTitle(info: GalleryInfo) = anyActive(FilterMode.TITLE) { info.title.orEmpty().contains(it.text, true) }
    suspend fun filterUploader(info: GalleryInfo) = anyActive(FilterMode.UPLOADER) { it.text == info.uploader }
-    suspend fun filterTag(info: GalleryInfo) = info.simpleTags?.any { tag -> anyActive(FilterMode.TAG) { matchTag(tag, it.text.lowercase()) } } == true
-    suspend fun filterTagNamespace(info: GalleryInfo) = info.simpleTags?.any { tag -> anyActive(FilterMode.TAG_NAMESPACE) { matchTagNamespace(tag, it.text.lowercase()) } } == true
+    suspend fun filterTag(info: GalleryInfo) = info.simpleTags?.any { tag -> anyActive(FilterMode.TAG) { matchTag(tag, it.text.lowercase()) } } ?: false
+    suspend fun filterTagNamespace(info: GalleryInfo) = info.simpleTags?.any { tag -> anyActive(FilterMode.TAG_NAMESPACE) { matchTagNamespace(tag, it.text.lowercase()) } } ?: false
    suspend fun filterCommenter(commenter: String) = anyActive(FilterMode.COMMENTER) { it.text == commenter }
    suspend fun filterComment(comment: String) = anyActive(FilterMode.COMMENT) { regex(it).containsMatchIn(comment) }
 }
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.client
+
+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 kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonArrayBuilder
+import kotlinx.serialization.json.JsonObjectBuilder
+import kotlinx.serialization.json.buildJsonArray
+import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.okio.decodeFromBufferedSource
+import okhttp3.Call
+import okhttp3.FormBody
+import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.MultipartBody
+import okhttp3.Request
+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("Accept", CHROME_ACCEPT)
+    addHeader("Accept-Language", CHROME_ACCEPT_LANGUAGE)
+    referer?.let { addHeader("Referer", it) }
+    origin?.let { addHeader("Origin", it) }
+}.apply(builder).build()
+
+inline fun Request.Builder.formBody(builder: FormBody.Builder.() -> Unit) = post(FormBody.Builder().apply(builder).build())
+
+inline fun Request.Builder.multipartBody(builder: MultipartBody.Builder.() -> Unit) = post(MultipartBody.Builder().apply(builder).build())
+
+val MEDIA_TYPE_JSON: MediaType = "application/json; charset=utf-8".toMediaType()
+
+inline fun JsonObjectBuilder.array(name: String, builder: JsonArrayBuilder.() -> Unit) = put(name, buildJsonArray(builder))
+
+inline fun Request.Builder.jsonBody(builder: JsonObjectBuilder.() -> Unit) = post(buildJsonObject(builder).toString().toRequestBody(MEDIA_TYPE_JSON))
+
+const val TAG_CALL = "CancellableCallReadingScope"
+
+// This scoped response reading scope suspend function aimed at cancelling the call immediately once coroutine is cancelled.
+// i.e., bind a call with a suspended coroutine, and launch another coroutine to execute reading
+// Once origin coroutine is cancelled, then call cancelled, socket is closed, the reading coroutine will encounter [IOException]
+// Since Okio is not suspendable/cancellable, also okhttp, [executeAsync] only make [Request -> Response] cancellable, reading a Response is still not cancellable
+// Considering interrupting is not safe and performant, See https://github.com/Kotlin/kotlinx.coroutines/issues/3551#issuecomment-1353245978, we have such [usingCancellable]
+// TODO: Remove logging after this function stable
+suspend inline fun <R> Call.usingCancellable(crossinline block: suspend Response.() -> R): R = executeAsync().use {
+    val call = this
+    Log.d(TAG_CALL, "Got response of call$call")
+    coroutineScope {
+        suspendCancellableCoroutine<R> { cont ->
+            launch {
+                val r = runCatching {
+                    Log.d(TAG_CALL, "Reading response of call$call")
+                    block(it)
+                }
+                if (!isCanceled() && cont.isActive) {
+                    r.exceptionOrNull()?.let {
+                        Log.e(TAG_CALL, "Reading response of call$call failed!")
+                        cont.resumeWithException(it)
+                    }
+                    r.getOrNull()?.let {
+                        Log.d(TAG_CALL, "Reading response of call$call succeed!")
+                        cont.resume(it)
+                    }
+                } else if (isCanceled() && cont.isActive) {
+                    Log.e(TAG_CALL, "call$call cancelled but coroutine is Active!")
+                } else if (!isCanceled() && !cont.isActive) {
+                    Log.e(TAG_CALL, "call$call not cancelled but coroutine is Dead!")
+                } else {
+                    Log.d(TAG_CALL, "Reading response of call$call cancelled")
+                }
+            }
+            cont.invokeOnCancellation {
+                Log.d(TAG_CALL, "Cancelling call$call")
+                cancel()
+            }
+        }
+    }.apply {
+        Log.d(TAG_CALL, "Reading response of call$call finished!")
+    }
+}
+
+suspend inline fun <R> Request.execute(block: Response.() -> R): R {
+    contract {
+        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
+    }
+    return okHttpClient.newCall(this).executeAsync().use(block)
+}
+suspend inline fun <R> Request.executeNonCache(crossinline block: suspend Response.() -> R) = baseOkHttpClient.newCall(this).usingCancellable(block)
+suspend inline fun <R> Request.executeNoRedirect(block: Response.() -> R) = noRedirectOkHttpClient.newCall(this).executeAsync().use(block)
+
+suspend inline fun <reified T> Request.executeAndParseAs() = execute { parseAs<T>() }
+
+inline fun <reified T> Response.parseAs(): T = body.source().parseAs()
+inline fun <reified T> BufferedSource.parseAs(): T = json.decodeFromBufferedSource(this)
+inline fun <reified T> String.parseAs(): T = json.decodeFromString(this)
+
+val json = Json { ignoreUnknownKeys = true }
+
+const val CHROME_USER_AGENT = "Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/115.0.0.0 Mobile Safari/537.36"
+const val CHROME_ACCEPT = "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9"
+const val CHROME_ACCEPT_LANGUAGE = "en-US,en;q=0.5"
@@ -0,0 +1,284 @@
+/*
+ * Copyright 2019 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.client
+
+import android.content.Context
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import com.hippo.ehviewer.EhApplication.Companion.baseOkHttpClient
+import com.hippo.ehviewer.R
+import com.hippo.ehviewer.util.AppConfig
+import com.hippo.ehviewer.util.FileUtils
+import com.hippo.ehviewer.util.copyToFile
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import moe.tarsin.coroutines.runSuspendCatching
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.executeAsync
+import okio.BufferedSource
+import okio.HashingSink.Companion.sha1
+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"
+    private val PREFIXES = arrayOf(
+        "-",
+        "~",
+        "tag:",
+        "weak:",
+    )
+    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)
+
+    fun getTranslation(prefix: String? = NAMESPACE_PREFIX, tag: String?): String? {
+        return tagGroups[prefix]?.get(tag)?.trim()?.takeIf { it.isNotEmpty() }
+    }
+
+    private fun internalSuggestFlow(
+        tags: Map<String, String>,
+        keyword: String,
+        translate: Boolean,
+        exactly: Boolean,
+    ): Flow<Pair<String?, String>> = flow {
+        if (exactly) {
+            tags[keyword]?.let {
+                emit(Pair(it.takeIf { translate }, keyword))
+            }
+        } else {
+            if (translate) {
+                tags.forEach { (tag, hint) ->
+                    if (tag != keyword &&
+                        (tag.containsIgnoreSpace(keyword) || hint.containsIgnoreSpace(keyword))
+                    ) {
+                        emit(Pair(hint, tag))
+                    }
+                }
+            } else {
+                tags.keys.forEach { tag ->
+                    if (tag != keyword && tag.containsIgnoreSpace(keyword)) {
+                        emit(Pair(null, tag))
+                    }
+                }
+            }
+        }
+    }
+
+    // Construct a cold flow for tag database suggestions
+    fun suggestFlow(
+        keyword: String,
+        translate: Boolean,
+        exactly: Boolean = false,
+    ): Flow<Pair<String?, String>> = flow {
+        var mKeyword = keyword
+        PREFIXES.forEach { mKeyword = mKeyword.removePrefix(it) }
+        val prefix = keyword.dropLast(mKeyword.length)
+        val namespace = mKeyword.substringBefore(':')
+        val tagKeyword = mKeyword.drop(namespace.length + 1)
+        val namespacePrefix = namespaceToPrefix(namespace) ?: namespace
+        val tags = tagGroups[namespacePrefix.takeIf { tagKeyword.isNotEmpty() && it != NAMESPACE_PREFIX }]
+        tags?.let {
+            internalSuggestFlow(it, tagKeyword, translate, exactly).collect { (hint, tag) ->
+                emit(Pair(hint, "$prefix$namespacePrefix:$tag"))
+            }
+        } ?: tagGroups.forEach { (namespacePrefix, tags) ->
+            if (namespacePrefix != NAMESPACE_PREFIX) {
+                internalSuggestFlow(tags, mKeyword, translate, exactly).collect { (hint, tag) ->
+                    emit(Pair(hint, "$prefix$namespacePrefix:$tag"))
+                }
+            } else {
+                internalSuggestFlow(tags, mKeyword, translate, exactly).collect { (hint, namespacePrefix) ->
+                    emit(Pair(hint, "$prefix$namespacePrefix:"))
+                }
+            }
+        }
+    }
+
+    private fun String.removeSpace(): String = replace(" ", "")
+
+    private fun String.containsIgnoreSpace(other: String, ignoreCase: Boolean = true): Boolean =
+        removeSpace().contains(other.removeSpace(), ignoreCase)
+
+    private val NAMESPACE_TO_PREFIX = HashMap<String, String>().also {
+        it["artist"] = "a"
+        it["cosplayer"] = "cos"
+        it["character"] = "c"
+        it["female"] = "f"
+        it["group"] = "g"
+        it["language"] = "l"
+        it["male"] = "m"
+        it["mixed"] = "x"
+        it["other"] = "o"
+        it["parody"] = "p"
+        it["reclass"] = "r"
+    }
+
+    fun namespaceToPrefix(namespace: String): String? {
+        return NAMESPACE_TO_PREFIX[namespace]
+    }
+
+    private fun getMetadata(context: Context): Array<String>? {
+        return context.resources.getStringArray(R.array.tag_translation_metadata)
+            .takeIf { it.size == 4 }
+    }
+
+    fun isTranslatable(context: Context): Boolean {
+        return context.resources.getBoolean(R.bool.tag_translatable)
+    }
+
+    private fun getFileContent(file: File): String? {
+        return runCatching {
+            file.source().buffer().use { it.readString(StandardCharsets.UTF_8) }
+        }.getOrNull()
+    }
+
+    private fun getFileSha1(file: File): String? {
+        return runCatching {
+            file.source().buffer().use { source ->
+                sha1(blackholeSink()).use {
+                    source.readAll(it)
+                    it.hash.hex()
+                }
+            }
+        }.getOrNull()
+    }
+
+    private fun checkData(sha1: String?, data: File): Boolean {
+        return sha1 != null && sha1 == getFileSha1(data)
+    }
+
+    private suspend fun save(client: OkHttpClient, url: String, file: File): Boolean {
+        val request: Request = Request.Builder().url(url).build()
+        val call = client.newCall(request)
+        runCatching {
+            call.executeAsync().use { response ->
+                if (!response.isSuccessful) {
+                    return false
+                }
+                response.body.use {
+                    it.copyToFile(file)
+                }
+                return true
+            }
+        }.onFailure {
+            file.delete()
+            it.printStackTrace()
+        }
+        return false
+    }
+
+    suspend fun update() {
+        updateLock.withLock {
+            updateInternal()
+        }
+    }
+
+    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()
+                }
+            }
+        }
+    }
+
+    init {
+        launch {
+            issueUpdateInMemoryData()
+        }
+    }
+
+    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]
+
+            val dir = AppConfig.getFilesDir("tag-translations")
+            checkNotNull(dir)
+            val sha1File = File(dir, sha1Name)
+            val dataFile = File(dir, dataName)
+
+            runCatching {
+                // Check current sha1 and current data
+                val sha1 = getFileContent(sha1File)
+                if (!checkData(sha1, dataFile)) {
+                    FileUtils.delete(sha1File)
+                    FileUtils.delete(dataFile)
+                }
+
+                // Save new sha1
+                val tempSha1File = File(dir, "$sha1Name.tmp")
+                check(save(baseOkHttpClient, sha1Url, tempSha1File))
+                val tempSha1 = getFileContent(tempSha1File)
+
+                // Check new sha1 and current sha1
+                if (tempSha1 == sha1) {
+                    // The data is the same
+                    FileUtils.delete(tempSha1File)
+                    return@runCatching
+                }
+
+                // Save new data
+                val tempDataFile = File(dir, "$dataName.tmp")
+                check(save(baseOkHttpClient, dataUrl, tempDataFile))
+
+                // Check new sha1 and new data
+                if (!checkData(tempSha1, tempDataFile)) {
+                    FileUtils.delete(tempSha1File)
+                    FileUtils.delete(tempDataFile)
+                    return@runCatching
+                }
+
+                // Replace current sha1 and current data with new sha1 and new data
+                FileUtils.delete(sha1File)
+                FileUtils.delete(dataFile)
+                tempSha1File.renameTo(sha1File)
+                tempDataFile.renameTo(dataFile)
+
+                // Read new EhTagDatabase
+                issueUpdateInMemoryData()
+            }.onFailure {
+                it.printStackTrace()
+            }
+        }
+    }
+}
@@ -16,10 +16,7 @@
 package com.hippo.ehviewer.client

 import com.hippo.ehviewer.Settings
-import io.ktor.http.Parameters
-import io.ktor.http.ParametersBuilder
-import io.ktor.http.URLBuilder
-import io.ktor.http.URLProtocol
+import okhttp3.HttpUrl

 object EhUrl {
    const val SITE_E = 0
@@ -27,13 +24,13 @@ object EhUrl {
    const val DOMAIN_EX = "exhentai.org"
    const val DOMAIN_E = "e-hentai.org"
    const val HOST_EX = "https://$DOMAIN_EX/"
-    const val API_EX = "https://s.exhentai.org/api.php"
+    const val API_EX = HOST_EX + "api.php"
    const val FAV_PATH = "favorites.php"
    const val WATCHED_PATH = "watched"
    const val URL_UCONFIG_EX = HOST_EX + "uconfig.php"
    const val URL_MY_TAGS_EX = HOST_EX + "mytags"
    const val HOST_E = "https://$DOMAIN_E/"
-    const val API_E = "https://api.e-hentai.org/api.php"
+    const val API_E = HOST_E + "api.php"
    const val URL_UCONFIG_E = HOST_E + "uconfig.php"
    const val URL_MY_TAGS_E = HOST_E + "mytags"
    const val API_SIGN_IN = "https://forums.e-hentai.org/index.php?act=Login&CODE=01"
@@ -52,117 +49,102 @@ object EhUrl {
    const val REFERER_E = "https://$DOMAIN_E"
    const val ORIGIN_E = REFERER_E

+    val host: String
+        get() = when (Settings.gallerySite) {
+            SITE_E -> HOST_E
+            SITE_EX -> HOST_EX
+            else -> HOST_E
+        }
+
    val domain: String
-        get() = when (Settings.gallerySite.value) {
+        get() = when (Settings.gallerySite) {
            SITE_E -> DOMAIN_E
            SITE_EX -> DOMAIN_EX
-            else -> DOMAIN_E
+            else -> HOST_E
        }

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

    val referer: String
-        get() = when (Settings.gallerySite.value) {
+        get() = when (Settings.gallerySite) {
            SITE_E -> REFERER_E
            SITE_EX -> REFERER_EX
            else -> REFERER_E
        }

    val origin: String
-        get() = when (Settings.gallerySite.value) {
+        get() = when (Settings.gallerySite) {
            SITE_E -> ORIGIN_E
            SITE_EX -> ORIGIN_EX
            else -> ORIGIN_E
        }

-    fun getUConfigUrl(gallerySite: Int = Settings.gallerySite.value) = when (gallerySite) {
-        SITE_E -> URL_UCONFIG_E
-        SITE_EX -> URL_UCONFIG_EX
-        else -> URL_UCONFIG_E
-    }
+    val uConfigUrl: String
+        get() = when (Settings.gallerySite) {
+            SITE_E -> URL_UCONFIG_E
+            SITE_EX -> URL_UCONFIG_EX
+            else -> URL_UCONFIG_E
+        }

    val myTagsUrl: String
-        get() = when (Settings.gallerySite.value) {
+        get() = when (Settings.gallerySite) {
            SITE_E -> URL_MY_TAGS_E
            SITE_EX -> URL_MY_TAGS_EX
            else -> URL_MY_TAGS_E
        }

    val popularUrl: String
-        get() = when (Settings.gallerySite.value) {
+        get() = when (Settings.gallerySite) {
            SITE_E -> URL_POPULAR_E
            SITE_EX -> URL_POPULAR_EX
            else -> URL_POPULAR_E
        }

    val imageSearchUrl: String
-        get() = when (Settings.gallerySite.value) {
+        get() = when (Settings.gallerySite) {
            SITE_E -> URL_IMAGE_SEARCH_E
            SITE_EX -> URL_IMAGE_SEARCH_EX
            else -> URL_IMAGE_SEARCH_E
        }

-    fun getGalleryDetailUrl(gid: Long, token: String, index: Int = 0, allComment: Boolean = false) = ehUrl(listOf("g", "$gid", token)) {
+    fun getGalleryDetailUrl(gid: Long, token: String?): String {
+        return getGalleryDetailUrl(gid, token, 0, false)
+    }
+
+    fun getGalleryDetailUrl(gid: Long, token: String?, index: Int, allComment: Boolean) = ehUrl {
+        addPathSegments("g/$gid/$token/")
        if (index != 0) addQueryParameter("p", "$index")
        if (allComment) addQueryParameter("hc", "1")
-    }.buildString()
+    }.toString()

-    fun getGalleryMultiPageViewerUrl(gid: Long, token: String) = ehUrl(listOf("mpv", "$gid", token)).buildString()
+    fun getGalleryMultiPageViewerUrl(gid: Long, token: String) = ehUrl {
+        addPathSegments("mpv/$gid/$token/")
+    }.toString()

-    fun getPageUrl(gid: Long, index: Int, pToken: String, nl: String? = null) = ehUrl(listOf("s", pToken, "$gid-${index + 1}")) {
-        addQueryParameterIfNotBlank("nl", nl)
-    }.buildString()
+    fun getPageUrl(gid: Long, index: Int, pToken: String): String {
+        return host + "s/" + pToken + '/' + gid + '-' + (index + 1)
+    }

-    fun getAddFavorites(gid: Long, token: String) = ehUrl("gallerypopups.php") {
-        addQueryParameter("gid", "$gid")
-        addQueryParameter("t", token)
-        addQueryParameter("act", "addfav")
-    }.buildString()
+    fun getAddFavorites(gid: Long, token: String?): String {
+        return host + "gallerypopups.php?gid=" + gid + "&t=" + token + "&act=addfav"
+    }

-    fun getArchiveUrl(gid: Long, token: String) = ehUrl("archiver.php") {
-        addQueryParameter("gid", "$gid")
-        addQueryParameter("token", token)
-    }.buildString()
+    fun getDownloadArchive(gid: Long, token: String?, or: String): String {
+        return host + "archiver.php?gid=" + gid + "&token=" + token + "&or=" + or
+    }

-    fun getTorrentUrl(gid: Long, token: String) = ehUrl("gallerytorrents.php") {
-        addQueryParameter("gid", "$gid")
-        addQueryParameter("t", token)
-    }.buildString()
-
-    fun getTagDefinitionUrl(tag: String) = "https://ehwiki.org/wiki/" + tag.replace(' ', '_')
-
-    fun getTrackerUrl(gid: Long, key: String?) = ehUrl(
-        path = listOfNotNull("$gid", key, "announce"),
-        host = "ehtracker.org",
-    ).buildString()
+    fun getTagDefinitionUrl(tag: String): String {
+        return "https://ehwiki.org/wiki/" + tag.replace(' ', '_')
+    }
 }

-inline fun ehUrl(path: String? = null, host: String = EhUrl.domain, builder: ParametersBuilder.() -> Unit) = ehUrl(
-    path = if (path.isNullOrBlank()) emptyList() else listOf(path),
-    host = host,
-    parameters = Parameters.build(builder),
-)
-
-inline fun ehUrl(path: List<String>, host: String = EhUrl.domain, builder: ParametersBuilder.() -> Unit) = ehUrl(
-    path = path,
-    host = host,
-    parameters = Parameters.build(builder),
-)
-
-fun ehUrl(path: List<String>, host: String = EhUrl.domain, parameters: Parameters = Parameters.Empty) = URLBuilder(
-    protocol = URLProtocol.HTTPS,
-    host = host,
-    pathSegments = path,
-    parameters = parameters,
-)
-
-fun ParametersBuilder.addQueryParameterIfNotBlank(name: String, value: String?) = apply {
-    if (!value.isNullOrBlank()) append(name, value)
+inline fun httpsUrl(builder: HttpUrl.Builder.() -> Unit) = HttpUrl.Builder().apply(builder).scheme("https").build()
+inline fun ehUrl(builder: HttpUrl.Builder.() -> Unit) = httpsUrl { apply(builder).host(EhUrl.domain) }
+fun HttpUrl.Builder.addQueryParameterIfNotBlank(name: String, value: String?) = apply {
+    if (!value.isNullOrBlank()) addQueryParameter(name, value)
 }
-
-fun ParametersBuilder.addQueryParameter(name: String, value: String) = append(name, value)
@@ -0,0 +1,193 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.client
+
+import android.annotation.SuppressLint
+import android.content.Context
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import com.google.android.material.R
+import com.google.android.material.color.MaterialColors
+import com.google.android.material.color.utilities.Hct
+import com.google.android.material.color.utilities.MathUtils
+import com.hippo.ehviewer.Settings
+import com.hippo.ehviewer.client.data.GalleryInfo
+import java.util.regex.Pattern
+
+object EhUtils {
+    const val NONE = -1 // Use it for homepage
+    const val MISC = 0x1
+    const val DOUJINSHI = 0x2
+    const val MANGA = 0x4
+    const val ARTIST_CG = 0x8
+    const val GAME_CG = 0x10
+    const val IMAGE_SET = 0x20
+    const val COSPLAY = 0x40
+    const val ASIAN_PORN = 0x80
+    const val NON_H = 0x100
+    const val WESTERN = 0x200
+    const val ALL_CATEGORY = 0x3ff
+    const val PRIVATE = 0x400
+    const val UNKNOWN = 0x800
+
+    // https://youtrack.jetbrains.com/issue/KT-4749
+    private const val BG_COLOR_DOUJINSHI = 0xfff44336u
+    private const val BG_COLOR_MANGA = 0xffff9800u
+    private const val BG_COLOR_ARTIST_CG = 0xfffbc02du
+    private const val BG_COLOR_GAME_CG = 0xff4caf50u
+    private const val BG_COLOR_WESTERN = 0xff8bc34au
+    private const val BG_COLOR_NON_H = 0xff2196f3u
+    private const val BG_COLOR_IMAGE_SET = 0xff3f51b5u
+    private const val BG_COLOR_COSPLAY = 0xff9c27b0u
+    private const val BG_COLOR_ASIAN_PORN = 0xff9575cdu
+    private const val BG_COLOR_MISC = 0xfff06292u
+    private const val BG_COLOR_UNKNOWN = 0xff000000u
+
+    // Remove [XXX], (XXX), {XXX}, ~XXX~ stuff
+    private val PATTERN_TITLE_PREFIX = Pattern.compile(
+        "^(?:\\([^)]*\\)|\\[[^]]*]|\\{[^}]*\\}|~[^~]*~|\\s+)*",
+    )
+
+    // Remove [XXX], (XXX), {XXX}, ~XXX~ stuff and something like ch. 1-23
+    private val PATTERN_TITLE_SUFFIX = Pattern.compile(
+        "(?:\\s+ch.[\\s\\d-]+)?(?:\\([^)]*\\)|\\[[^]]*]|\\{[^}]*\\}|~[^~]*~|\\s+)*$",
+        Pattern.CASE_INSENSITIVE,
+    )
+
+    private val CATEGORY_VALUES = hashMapOf(
+        MISC to arrayOf("misc"),
+        DOUJINSHI to arrayOf("doujinshi"),
+        MANGA to arrayOf("manga"),
+        ARTIST_CG to arrayOf("artistcg", "Artist CG Sets", "Artist CG"),
+        GAME_CG to arrayOf("gamecg", "Game CG Sets", "Game CG"),
+        IMAGE_SET to arrayOf("imageset", "Image Sets", "Image Set"),
+        COSPLAY to arrayOf("cosplay"),
+        ASIAN_PORN to arrayOf("asianporn", "Asian Porn"),
+        NON_H to arrayOf("non-h"),
+        WESTERN to arrayOf("western"),
+        PRIVATE to arrayOf("private"),
+        UNKNOWN to arrayOf("unknown"),
+    )
+    private val CATEGORY_STRINGS = CATEGORY_VALUES.entries.map { (k, v) -> v to k }
+
+    val isExHentai: Boolean
+        get() = Settings.gallerySite == EhUrl.SITE_EX
+
+    fun getCategory(type: String?): Int {
+        for (entry in CATEGORY_STRINGS) {
+            for (str in entry.first)
+                if (str.equals(type, ignoreCase = true)) {
+                    return entry.second
+                }
+        }
+        return UNKNOWN
+    }
+
+    fun getCategory(type: Int): String {
+        return CATEGORY_VALUES.getOrDefault(type, CATEGORY_VALUES[UNKNOWN])!![0]
+    }
+
+    @SuppressLint("RestrictedApi")
+    fun harmonizeWithRole(context: Context, src: Int): Int {
+        val primary = MaterialColors.getColor(context, R.attr.colorPrimaryContainer, "EhUtils")
+        val fromHct = Hct.fromInt(src)
+        val toHct = Hct.fromInt(primary)
+        val differenceDegrees = MathUtils.differenceDegrees(fromHct.hue, toHct.hue)
+        val rotationDegrees = minOf(differenceDegrees * 0.5, 15.0)
+        val outputHue = MathUtils.sanitizeDegreesDouble(fromHct.hue + rotationDegrees * MathUtils.rotationDirection(fromHct.hue, toHct.hue))
+        return Hct.from(outputHue, toHct.chroma, toHct.tone).toInt()
+    }
+
+    private fun getCategoryColor(context: Context, category: Int): Int {
+        val primary = when (category) {
+            DOUJINSHI -> BG_COLOR_DOUJINSHI
+            MANGA -> BG_COLOR_MANGA
+            ARTIST_CG -> BG_COLOR_ARTIST_CG
+            GAME_CG -> BG_COLOR_GAME_CG
+            WESTERN -> BG_COLOR_WESTERN
+            NON_H -> BG_COLOR_NON_H
+            IMAGE_SET -> BG_COLOR_IMAGE_SET
+            COSPLAY -> BG_COLOR_COSPLAY
+            ASIAN_PORN -> BG_COLOR_ASIAN_PORN
+            MISC -> BG_COLOR_MISC
+            else -> BG_COLOR_UNKNOWN
+        }.toInt()
+        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
+        Settings.displayName = null
+        Settings.gallerySite = EhUrl.SITE_E
+        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
+        } else {
+            if (gi.title.isNullOrEmpty()) gi.titleJpn else gi.title
+        }.orEmpty()
+    }
+
+    fun extractTitle(fullTitle: String?): String? {
+        var title: String = fullTitle ?: return null
+        title = PATTERN_TITLE_PREFIX.matcher(title).replaceFirst("")
+        title = PATTERN_TITLE_SUFFIX.matcher(title).replaceFirst("")
+        // Sometimes title is combined by romaji and english translation.
+        // Only need romaji.
+        // TODO But not sure every '|' means that
+        val index = title.indexOf('|')
+        if (index >= 0) {
+            title = title.substring(0, index)
+        }
+        return title.ifEmpty { null }
+    }
+
+    fun handleThumbUrlResolution(url: String?): String? {
+        if (null == url) {
+            return null
+        }
+        val resolution = when (Settings.thumbResolution) {
+            0 -> return url
+            1 -> "250"
+            2 -> "300"
+            else -> return url
+        }
+        val index1 = url.lastIndexOf('_')
+        val index2 = url.lastIndexOf('.')
+        return if (index1 >= 0 && index2 >= 0 && index1 < index2) {
+            url.substring(0, index1 + 1) + resolution + url.substring(index2)
+        } else {
+            url
+        }
+    }
+}
@@ -0,0 +1,14 @@
+package com.hippo.ehviewer.client.data
+
+interface AbstractDownloadInfo {
+    var state: Int
+    var legacy: Int
+    var time: Long
+    var label: String?
+    var position: Int
+    var speed: Long
+    var remaining: Long
+    var finished: Int
+    var downloaded: Int
+    var total: Int
+}
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.client.data
+
+import android.os.Parcelable
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.Ignore
+import androidx.room.PrimaryKey
+import com.hippo.ehviewer.client.data.GalleryInfo.Companion.NOT_FAVORITED
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+@Entity(tableName = "GALLERIES")
+open class BaseGalleryInfo(
+    @PrimaryKey
+    @ColumnInfo(name = "GID")
+    override var gid: Long = 0,
+
+    @ColumnInfo(name = "TOKEN")
+    override var token: String? = null,
+
+    @ColumnInfo(name = "TITLE")
+    override var title: String? = null,
+
+    @ColumnInfo(name = "TITLE_JPN")
+    override var titleJpn: String? = null,
+
+    @ColumnInfo(name = "THUMB")
+    override var thumbKey: String? = null,
+
+    @ColumnInfo(name = "CATEGORY")
+    override var category: Int = 0,
+
+    @ColumnInfo(name = "POSTED")
+    override var posted: String? = null,
+
+    @ColumnInfo(name = "UPLOADER")
+    override var uploader: String? = null,
+
+    @Ignore
+    override var disowned: Boolean = false,
+
+    @ColumnInfo(name = "RATING")
+    override var rating: Float = 0f,
+
+    @Ignore
+    override var rated: Boolean = false,
+
+    @Ignore
+    override var simpleTags: ArrayList<String>? = null,
+
+    @Ignore
+    override var pages: Int = 0,
+
+    @Ignore
+    override var thumbWidth: Int = 0,
+
+    @Ignore
+    override var thumbHeight: Int = 0,
+
+    @ColumnInfo(name = "SIMPLE_LANGUAGE")
+    override var simpleLanguage: String? = null,
+
+    @ColumnInfo(name = "FAVORITE_SLOT")
+    override var favoriteSlot: Int = NOT_FAVORITED,
+
+    @Ignore
+    override var favoriteName: String? = null,
+
+    @Ignore
+    override var favoriteNote: String? = null,
+) : GalleryInfo, Parcelable {
+    constructor() : this(0)
+}
@@ -15,43 +15,43 @@
 */
 package com.hippo.ehviewer.client.data

+import android.os.Parcelable
 import com.hippo.ehviewer.client.EhUrl
-import com.hippo.ehviewer.client.addQueryParameter
 import com.hippo.ehviewer.client.addQueryParameterIfNotBlank
 import com.hippo.ehviewer.client.ehUrl
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class FavListUrlBuilder(
-    val favCat: Int = FAV_CAT_ALL,
-    val keyword: String? = null,
-    private var jumpTo: String? = null,
-    private var prev: String? = null,
-    private var next: String? = null,
-) {
-    val isLocal
-        get() = favCat == FAV_CAT_LOCAL
+import kotlinx.parcelize.Parcelize

+@Parcelize
+class FavListUrlBuilder(
+    var mPrev: String? = null,
+    var mNext: String? = null,
+    var jumpTo: String? = null,
+    var keyword: String? = null,
+    var favCat: Int = FAV_CAT_ALL,
+) : Parcelable {
    fun setIndex(index: String?, isNext: Boolean) {
-        next = index.takeIf { isNext }
-        prev = index.takeUnless { isNext }
-        jumpTo = null
+        mNext = index.takeIf { isNext }
+        mPrev = index.takeUnless { isNext }
    }

-    fun build() = ehUrl(EhUrl.FAV_PATH) {
-        when {
-            isValidFavCat(favCat) -> addQueryParameter("favcat", "$favCat")
-            favCat == FAV_CAT_ALL -> addQueryParameter("favcat", "all")
+    fun build() = ehUrl {
+        addPathSegment(EhUrl.FAV_PATH)
+        if (isValidFavCat(favCat)) {
+            addQueryParameter("favcat", "$favCat")
+        } else if (favCat == FAV_CAT_ALL) {
+            addQueryParameter("favcat", "all")
        }
        addQueryParameterIfNotBlank("f_search", keyword)
-        addQueryParameterIfNotBlank("prev", prev)
-        addQueryParameterIfNotBlank("next", next)
+        addQueryParameterIfNotBlank("prev", mPrev)
+        addQueryParameterIfNotBlank("next", mNext)
        addQueryParameterIfNotBlank("seek", jumpTo)
-    }.buildString()
+    }.toString()

    companion object {
        const val FAV_CAT_ALL = -1
        const val FAV_CAT_LOCAL = -2
-        fun isValidFavCat(favCat: Int) = favCat in 0..9
+        fun isValidFavCat(favCat: Int): Boolean {
+            return favCat in 0..9
+        }
    }
 }
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.client.data
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+class GalleryApiInfo(
+    var gid: Long = 0,
+    var token: String? = null,
+    var archiverKey: String? = null,
+    var title: String? = null,
+    var titleJpn: String? = null,
+    var category: Int = 0,
+    var thumb: String? = null,
+    var uploader: String? = null,
+    var posted: Long = 0,
+    var filecount: Int = 0,
+    var filesize: Long = 0,
+    var expunged: Boolean = false,
+    var rating: Float = 0f,
+    var torrentcount: Int = 0,
+    var tags: Array<String>?,
+) : Parcelable
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.client.data
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+class GalleryComment(
+    // 0 for uploader comment. can't vote
+    var id: Long = 0,
+    var score: Int = 0,
+    var editable: Boolean = false,
+    var voteUpAble: Boolean = false,
+    var voteUpEd: Boolean = false,
+    var voteDownAble: Boolean = false,
+    var voteDownEd: Boolean = false,
+    var uploader: Boolean = false,
+    var voteState: String? = null,
+    var time: Long = 0,
+    var user: String? = null,
+    var comment: String? = null,
+    var lastEdited: Long = 0,
+) : Parcelable
@@ -13,12 +13,13 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.ehviewer.core.model
+package com.hippo.ehviewer.client.data

-import kotlinx.serialization.Serializable
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize

-@Serializable
-data class GalleryCommentList(
-    val comments: List<GalleryComment>,
+@Parcelize
+class GalleryCommentList(
+    var comments: Array<GalleryComment>,
    val hasMore: Boolean,
-)
+) : Parcelable
@@ -13,24 +13,51 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.ehviewer.core.model
+package com.hippo.ehviewer.client.data

-import kotlinx.serialization.Serializable
+import android.os.Parcelable
+import com.hippo.ehviewer.client.data.GalleryInfo.Companion.S_LANGS
+import kotlinx.parcelize.Parcelize

-@Serializable
-data class GalleryDetail(
+private val LANGUAGES = arrayOf(
+    "English",
+    "Chinese",
+    "Spanish",
+    "Korean",
+    "Russian",
+    "French",
+    "Portuguese",
+    "Thai",
+    "German",
+    "Italian",
+    "Vietnamese",
+    "Polish",
+    "Hungarian",
+    "Dutch",
+)
+
+@Parcelize
+class GalleryDetail(
    val galleryInfo: BaseGalleryInfo = BaseGalleryInfo(),
    var apiUid: Long = -1L,
    var apiKey: String? = null,
    var torrentCount: Int = 0,
+    var torrentUrl: String? = null,
+    var archiveUrl: String? = null,
    var parent: String? = null,
-    var newerVersions: List<BaseGalleryInfo> = emptyList(),
+    var newerVersions: ArrayList<BaseGalleryInfo> = ArrayList(),
    var visible: String? = null,
    var language: String? = null,
    var size: String? = null,
    var favoriteCount: Int = 0,
    var ratingCount: Int = 0,
-    val tagGroups: List<GalleryTagGroup>,
+    val tags: Array<GalleryTagGroup>,
    var comments: GalleryCommentList,
+    val previewPages: Int,
    val previewList: List<GalleryPreview>,
-) : GalleryInfo by galleryInfo
+) : GalleryInfo by galleryInfo, Parcelable {
+    override fun generateSLang() {
+        val index = LANGUAGES.indexOf(language)
+        if (index != -1) simpleLanguage = S_LANGS[index]
+    }
+}
@@ -0,0 +1,153 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.client.data
+
+import java.util.regex.Pattern
+
+interface GalleryInfo {
+    var gid: Long
+    var token: String?
+    var title: String?
+    var titleJpn: String?
+    var thumbKey: String?
+    var category: Int
+    var posted: String?
+    var uploader: String?
+    var disowned: Boolean
+    var rating: Float
+    var rated: Boolean
+    var simpleTags: ArrayList<String>?
+    var pages: Int
+    var thumbWidth: Int
+    var thumbHeight: Int
+    var simpleLanguage: String?
+    var favoriteSlot: Int
+    var favoriteName: String?
+    var favoriteNote: String?
+
+    fun generateSLang() {
+        simpleLanguage = simpleTags?.let { generateSLangFromTags(it) }
+            ?: 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,
+        )
+        val S_LANG_PATTERNS = arrayOf(
+            Pattern.compile(
+                "[(\\[]eng(?:lish)?[)\\]]|英訳",
+                Pattern.CASE_INSENSITIVE,
+            ), // [(（\[]ch(?:inese)?[)）\]]|[汉漢]化|中[国國][语語]|中文|中国翻訳
+            Pattern.compile(
+                "[(\uFF08\\[]ch(?:inese)?[)\uFF09\\]]|[汉漢]化|中[国國][语語]|中文|中国翻訳",
+                Pattern.CASE_INSENSITIVE,
+            ),
+            Pattern.compile(
+                "[(\\[]spanish[)\\]]|[(\\[]Español[)\\]]|スペイン翻訳",
+                Pattern.CASE_INSENSITIVE,
+            ),
+            Pattern.compile("[(\\[]korean?[)\\]]|韓国翻訳", Pattern.CASE_INSENSITIVE),
+            Pattern.compile("[(\\[]rus(?:sian)?[)\\]]|ロシア翻訳", Pattern.CASE_INSENSITIVE),
+            Pattern.compile("[(\\[]fr(?:ench)?[)\\]]|フランス翻訳", Pattern.CASE_INSENSITIVE),
+            Pattern.compile("[(\\[]portuguese|ポルトガル翻訳", Pattern.CASE_INSENSITIVE),
+            Pattern.compile(
+                "[(\\[]thai(?: ภาษาไทย)?[)\\]]|แปลไทย|タイ翻訳",
+                Pattern.CASE_INSENSITIVE,
+            ),
+            Pattern.compile("[(\\[]german[)\\]]|ドイツ翻訳", Pattern.CASE_INSENSITIVE),
+            Pattern.compile("[(\\[]italiano?[)\\]]|イタリア翻訳", Pattern.CASE_INSENSITIVE),
+            Pattern.compile(
+                "[(\\[]vietnamese(?: Tiếng Việt)?[)\\]]|ベトナム翻訳",
+                Pattern.CASE_INSENSITIVE,
+            ),
+            Pattern.compile("[(\\[]polish[)\\]]|ポーランド翻訳", Pattern.CASE_INSENSITIVE),
+            Pattern.compile("[(\\[]hun(?:garian)?[)\\]]|ハンガリー翻訳", Pattern.CASE_INSENSITIVE),
+            Pattern.compile("[(\\[]dutch[)\\]]|オランダ翻訳", Pattern.CASE_INSENSITIVE),
+        )
+        val S_LANG_TAGS = arrayOf(
+            "language:english",
+            "language:chinese",
+            "language:spanish",
+            "language:korean",
+            "language:russian",
+            "language:french",
+            "language:portuguese",
+            "language:thai",
+            "language:german",
+            "language:italian",
+            "language:vietnamese",
+            "language:polish",
+            "language:hungarian",
+            "language:dutch",
+        )
+
+        const val NOT_FAVORITED = -2
+        const val LOCAL_FAVORITED = -1
+    }
+}
@@ -13,41 +13,27 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.ehviewer.core.model
+package com.hippo.ehviewer.client.data

-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.cbor.CborArray
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize

-@Serializable
-sealed interface GalleryPreview {
-    val url: String
+interface GalleryPreview : Parcelable {
+    val imageKey: String
    val position: Int
-    val pToken: String
 }

-@Serializable
-@SerialName("V1")
-data class V1GalleryPreview(
-    override val url: String,
+@Parcelize
+data class LargeGalleryPreview(
+    override val imageKey: String,
    override val position: Int,
-    override val pToken: String,
 ) : GalleryPreview

-@Serializable
-@SerialName("V2")
-data class V2GalleryPreview(
-    override val url: String,
+@Parcelize
+data class NormalGalleryPreview(
+    override val imageKey: String,
    override val position: Int,
-    override val pToken: String,
    val offsetX: Int,
    val clipWidth: Int,
    val clipHeight: Int,
 ) : GalleryPreview
-
-@Serializable
-@CborArray
-class GalleryPreviewList(
-    val previews: List<GalleryPreview>,
-    val total: Int,
-)
@@ -13,12 +13,13 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.ehviewer.core.model
+package com.hippo.ehviewer.client.data

-import kotlinx.serialization.Serializable
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize

-@Serializable
-data class GalleryTagGroup(
-    val namespace: TagNamespace,
-    val tags: List<GalleryTag>,
-)
+@Parcelize
+class GalleryTagGroup(
+    val groupName: String,
+    private val mTagList: MutableList<String> = mutableListOf(),
+) : Parcelable, MutableList<String> by mTagList
@@ -0,0 +1,409 @@
+/*
+ * Copyright (C) 2015 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.client.data
+
+import android.os.Parcelable
+import androidx.annotation.IntDef
+import com.hippo.ehviewer.client.EhUrl
+import com.hippo.ehviewer.client.EhUtils
+import com.hippo.ehviewer.client.addQueryParameterIfNotBlank
+import com.hippo.ehviewer.client.ehUrl
+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
+
+@Parcelize
+data class ListUrlBuilder(
+    @get:Mode @Mode
+    var mode: Int = MODE_NORMAL,
+    private var mPrev: String? = null,
+    var mNext: String? = null,
+    var mJumpTo: String? = null,
+    var category: Int = EhUtils.NONE,
+    private var mKeyword: String? = null,
+    var hash: String? = null,
+    var advanceSearch: Int = -1,
+    var minRating: Int = -1,
+    var pageFrom: Int = -1,
+    var pageTo: Int = -1,
+    var imagePath: String? = null,
+    var isUseSimilarityScan: Boolean = false,
+    var isOnlySearchCovers: Boolean = false,
+) : Parcelable {
+
+    fun reset() {
+        mode = MODE_NORMAL
+        mPrev = null
+        mNext = null
+        mJumpTo = null
+        this.category = EhUtils.NONE
+        mKeyword = null
+        advanceSearch = -1
+        minRating = -1
+        pageFrom = -1
+        pageTo = -1
+        imagePath = null
+        isUseSimilarityScan = false
+        isOnlySearchCovers = false
+        hash = null
+    }
+
+    fun setIndex(index: String?, isNext: Boolean = true) {
+        mNext = index?.takeIf { isNext }
+        mPrev = index?.takeUnless { isNext }
+    }
+
+    fun setJumpTo(jumpTo: Int) {
+        mJumpTo = jumpTo.takeUnless { it == 0 }?.toString()
+    }
+
+    var keyword: String?
+        get() = if (MODE_UPLOADER == mode) "uploader:$mKeyword" else mKeyword
+        set(keyword) {
+            mKeyword = keyword
+        }
+
+    fun set(q: QuickSearch) {
+        reset()
+        mode = q.mode
+        this.category = q.category
+        mKeyword = q.keyword
+        advanceSearch = q.advanceSearch
+        minRating = q.minRating
+        pageFrom = q.pageFrom
+        pageTo = q.pageTo
+        mNext = q.name.substringAfterLast('@', "").takeIf { it.isNotEmpty() }
+    }
+
+    fun toQuickSearch(name: String): QuickSearch {
+        return QuickSearch(
+            name = name,
+            mode = mode,
+            category = category,
+            keyword = mKeyword,
+            advanceSearch = advanceSearch,
+            minRating = minRating,
+            pageFrom = pageFrom,
+            pageTo = pageTo,
+        )
+    }
+
+    fun equalsQuickSearch(q: QuickSearch?): Boolean {
+        if (null == q) {
+            return false
+        }
+        if (q.mode != mode) {
+            return false
+        }
+        if (q.category != this.category) {
+            return false
+        }
+        if (q.keyword != mKeyword) {
+            return false
+        }
+        if (q.advanceSearch != advanceSearch) {
+            return false
+        }
+        if (q.minRating != minRating) {
+            return false
+        }
+        return if (q.pageFrom != pageFrom) {
+            false
+        } else {
+            q.pageTo == pageTo
+        }
+    }
+
+    /**
+     * @param query xxx=yyy&mmm=nnn
+     */
+    // TODO page
+    fun setQuery(query: String?) {
+        reset()
+        if (query.isNullOrEmpty()) {
+            return
+        }
+        val queries = query.split('&')
+        var category = 0
+        var keyword: String? = null
+        var enableAdvanceSearch = false
+        var advanceSearch = 0
+        var enableMinRating = false
+        var minRating = -1
+        var enablePage = false
+        var pageFrom = -1
+        var pageTo = -1
+        for (str in queries) {
+            val index = str.indexOf('=')
+            if (index < 0) {
+                continue
+            }
+            val key = str.substring(0, index)
+            val value = str.substring(index + 1)
+            when (key) {
+                "f_cats" -> {
+                    val cats = value.toIntOrDefault(EhUtils.ALL_CATEGORY)
+                    category = category or (cats.inv() and EhUtils.ALL_CATEGORY)
+                }
+
+                "f_doujinshi" -> if ("1" == value) {
+                    category = category or EhUtils.DOUJINSHI
+                }
+
+                "f_manga" -> if ("1" == value) {
+                    category = category or EhUtils.MANGA
+                }
+
+                "f_artistcg" -> if ("1" == value) {
+                    category = category or EhUtils.ARTIST_CG
+                }
+
+                "f_gamecg" -> if ("1" == value) {
+                    category = category or EhUtils.GAME_CG
+                }
+
+                "f_western" -> if ("1" == value) {
+                    category = category or EhUtils.WESTERN
+                }
+
+                "f_non-h" -> if ("1" == value) {
+                    category = category or EhUtils.NON_H
+                }
+
+                "f_imageset" -> if ("1" == value) {
+                    category = category or EhUtils.IMAGE_SET
+                }
+
+                "f_cosplay" -> if ("1" == value) {
+                    category = category or EhUtils.COSPLAY
+                }
+
+                "f_asianporn" -> if ("1" == value) {
+                    category = category or EhUtils.ASIAN_PORN
+                }
+
+                "f_misc" -> if ("1" == value) {
+                    category = category or EhUtils.MISC
+                }
+
+                "f_search" -> try {
+                    keyword = URLDecoder.decode(value, "utf-8")
+                } catch (e: UnsupportedEncodingException) {
+                    // Ignore
+                } catch (_: IllegalArgumentException) {
+                }
+
+                "advsearch" -> if ("1" == value) {
+                    enableAdvanceSearch = true
+                }
+
+                "f_sh" -> if ("on" == value) {
+                    advanceSearch = advanceSearch or AdvanceTable.SH
+                }
+
+                "f_sto" -> if ("on" == value) {
+                    advanceSearch = advanceSearch or AdvanceTable.STO
+                }
+
+                "f_sfl" -> if ("on" == value) {
+                    advanceSearch = advanceSearch or AdvanceTable.SFL
+                }
+
+                "f_sfu" -> if ("on" == value) {
+                    advanceSearch = advanceSearch or AdvanceTable.SFU
+                }
+
+                "f_sft" -> if ("on" == value) {
+                    advanceSearch = advanceSearch or AdvanceTable.SFT
+                }
+
+                "f_sr" -> if ("on" == value) {
+                    enableMinRating = true
+                }
+
+                "f_srdd" -> minRating = value.toIntOrDefault(-1)
+                "f_sp" -> if ("on" == value) {
+                    enablePage = true
+                }
+
+                "f_spf" -> pageFrom = value.toIntOrDefault(-1)
+                "f_spt" -> pageTo = value.toIntOrDefault(-1)
+                "f_shash" -> hash = value
+            }
+        }
+        this.category = category
+        mKeyword = keyword
+        if (enableAdvanceSearch) {
+            this.advanceSearch = advanceSearch
+            if (enableMinRating) {
+                this.minRating = minRating
+            } else {
+                this.minRating = -1
+            }
+            if (enablePage) {
+                this.pageFrom = pageFrom
+                this.pageTo = pageTo
+            } else {
+                this.pageFrom = -1
+                this.pageTo = -1
+            }
+        } else {
+            this.advanceSearch = -1
+        }
+    }
+
+    fun build(): String {
+        return when (mode) {
+            MODE_NORMAL, MODE_SUBSCRIPTION -> ehUrl {
+                if (mode == MODE_SUBSCRIPTION) addPathSegment(EhUrl.WATCHED_PATH)
+                if (category != EhUtils.NONE) {
+                    addEncodedQueryParameter("f_cats", (category.inv() and EhUtils.ALL_CATEGORY).toString())
+                }
+                addQueryParameterIfNotBlank("f_shash", hash)
+                addQueryParameterIfNotBlank("prev", mPrev)
+                addQueryParameterIfNotBlank("next", mNext)
+                addQueryParameterIfNotBlank("seek", mJumpTo)
+                // Search key
+                // the settings of ub:UrlBuilder may be overwritten by following Advance search
+                mKeyword?.split('|')?.forEachIndexed { idx, kwd ->
+                    val keyword = kwd.trim { it <= ' ' }
+                    when (idx) {
+                        0 -> addQueryParameterIfNotBlank("f_search", keyword)
+
+                        else -> keyword.indexOf(':').takeIf { it >= 0 }?.run {
+                            val key = keyword.substring(0, this).trim { it <= ' ' }
+                            val value = keyword.substring(this + 1).trim { it <= ' ' }
+                            addQueryParameterIfNotBlank(key, value)
+                        }
+                    }
+                }
+                // Advance search
+                if (advanceSearch != -1) {
+                    addQueryParameter("advsearch", "1")
+                    if (advanceSearch and AdvanceTable.SH != 0) {
+                        addQueryParameter("f_sh", "on")
+                    }
+                    if (advanceSearch and AdvanceTable.STO != 0) {
+                        addQueryParameter("f_sto", "on")
+                    }
+                    if (advanceSearch and AdvanceTable.SFL != 0) {
+                        addQueryParameter("f_sfl", "on")
+                    }
+                    if (advanceSearch and AdvanceTable.SFU != 0) {
+                        addQueryParameter("f_sfu", "on")
+                    }
+                    if (advanceSearch and AdvanceTable.SFT != 0) {
+                        addQueryParameter("f_sft", "on")
+                    }
+                    // Set min star
+                    if (minRating != -1) {
+                        addQueryParameter("f_sr", "on")
+                        addQueryParameter("f_srdd", "$minRating")
+                    }
+                    // Pages
+                    if (pageFrom != -1 || pageTo != -1) {
+                        addQueryParameter("f_sp", "on")
+                        addQueryParameter(
+                            "f_spf",
+                            (if (pageFrom != -1) pageFrom.toString() else "").toString(),
+                        )
+                        addQueryParameter(
+                            "f_spt",
+                            (if (pageTo != -1) pageTo.toString() else "").toString(),
+                        )
+                    }
+                }
+            }.toString()
+
+            MODE_UPLOADER -> {
+                val sb = StringBuilder(EhUrl.host)
+                mKeyword?.let {
+                    sb.append("uploader/")
+                    sb.append(encodeUTF8(it))
+                }
+                mPrev?.let {
+                    sb.append("?prev=").append(it)
+                }
+                mNext?.let {
+                    sb.append("?next=").append(it)
+                }
+                mJumpTo?.let {
+                    sb.append("&seek=").append(it)
+                }
+                sb.toString()
+            }
+
+            MODE_TAG -> {
+                val sb = StringBuilder(EhUrl.host)
+                mKeyword?.let {
+                    sb.append("tag/")
+                    sb.append(encodeUTF8(it))
+                }
+                mPrev?.let {
+                    sb.append("?prev=").append(it)
+                }
+                mNext?.let {
+                    sb.append("?next=").append(it)
+                }
+                mJumpTo?.let {
+                    sb.append("&seek=").append(it)
+                }
+                sb.toString()
+            }
+
+            MODE_WHATS_HOT -> EhUrl.popularUrl
+            MODE_IMAGE_SEARCH -> EhUrl.imageSearchUrl
+            MODE_TOPLIST -> {
+                val sb = StringBuilder(EhUrl.HOST_E)
+                sb.append("toplist.php?tl=")
+                mKeyword.orEmpty().let {
+                    sb.append(encodeUTF8(it))
+                }
+                mJumpTo?.let {
+                    sb.append("&p=").append(it)
+                }
+                sb.toString()
+            }
+
+            else -> throw IllegalStateException("Unexpected value: $mode")
+        }
+    }
+
+    @IntDef(
+        MODE_NORMAL,
+        MODE_UPLOADER,
+        MODE_TAG,
+        MODE_WHATS_HOT,
+        MODE_IMAGE_SEARCH,
+        MODE_SUBSCRIPTION,
+        MODE_TOPLIST,
+    )
+    @Retention(AnnotationRetention.SOURCE)
+    private annotation class Mode
+    companion object {
+        const val MODE_NORMAL = 0x0
+        const val MODE_UPLOADER = 0x1
+        const val MODE_TAG = 0x2
+        const val MODE_WHATS_HOT = 0x3
+        const val MODE_IMAGE_SEARCH = 0x4
+        const val MODE_SUBSCRIPTION = 0x5
+        const val MODE_TOPLIST = 0x6
+    }
+}
@@ -1,5 +1,5 @@
 package com.hippo.ehviewer.client.exception

-import com.ehviewer.core.i18n.R
+import com.hippo.ehviewer.R

 class CloudflareBypassException : EhException(R.string.cloudflare_bypass_failed)
@@ -1,5 +1,5 @@
 package com.hippo.ehviewer.client.exception

-import com.ehviewer.core.i18n.R
+import com.hippo.ehviewer.R

 class InsufficientFundsException : EhException(R.string.insufficient_funds)
@@ -15,6 +15,4 @@
 */
 package com.hippo.ehviewer.client.exception

-import com.ehviewer.core.i18n.R
-
-class NoHathClientException() : EhException(R.string.download_archive_failure_no_hath)
+class NoHAtHClientException(detailMessage: String?) : EhException(detailMessage)
@@ -1,5 +1,5 @@
 package com.hippo.ehviewer.client.exception

-import com.ehviewer.core.i18n.R
+import com.hippo.ehviewer.R

 class NotLoggedInException : EhException(R.string.sign_in_first)
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.client.parser
+
+import com.hippo.ehviewer.client.exception.InsufficientFundsException
+import com.hippo.ehviewer.client.exception.NoHAtHClientException
+import org.jsoup.Jsoup
+
+object ArchiveParser {
+    private val PATTERN_ARCHIVE_URL =
+        Regex("<strong>(.*)</strong>.*<a href=\"([^\"]*)\">Click Here To Start Downloading</a>")
+    private val PATTERN_CURRENT_FUNDS =
+        Regex("<p>([\\d,]+) GP \\[[^]]*] &nbsp; ([\\d,]+) Credits \\[[^]]*]</p>")
+    private val PATTERN_HATH_FORM =
+        Regex("<form id=\"hathdl_form\" action=\"[^\"]*?or=([^=\"]*?)\" method=\"post\">")
+    private val PATTERN_HATH_ARCHIVE =
+        Regex("<p><a href=\"[^\"]*\" onclick=\"return do_hathdl\\('([0-9]+|org)'\\)\">([^<]+)</a></p>\\s*<p>([\\w. ]+)</p>\\s*<p>([\\w. ]+)</p>")
+    private const val ERROR_NEED_HATH_CLIENT =
+        "You must have a H@H client assigned to your account to use this feature."
+    private const val ERROR_INSUFFICIENT_FUNDS =
+        "You do not have enough funds to download this archive."
+
+    fun parse(body: String): Result {
+        val m = PATTERN_HATH_FORM.find(body)!!
+        val paramOr = m.groupValues[1]
+        val archiveList = ArrayList<Archive>()
+        Jsoup.parse(body).select("#db>div>div").forEach { element ->
+            if (element.childrenSize() > 0 && !element.attr("style").contains("color:#CCCCCC")) {
+                runCatching {
+                    val res = element.selectFirst("form>input")!!.attr("value")
+                    val name = element.selectFirst("form>div>input")!!.attr("value")
+                    val size = element.selectFirst("p>strong")!!.text()
+                    val cost = element.selectFirst("div>strong")!!.text().replace(",", "")
+                    Archive(res, name, size, cost, false)
+                }.onSuccess {
+                    archiveList.add(it)
+                }.onFailure {
+                    it.printStackTrace()
+                }
+            }
+        }
+        PATTERN_HATH_ARCHIVE.findAll(body).forEach { matchResult ->
+            val (res, name, size, cost) = matchResult.groupValues.slice(1..4)
+                .map { ParserUtils.trim(it) }
+            val item = Archive(res, name, size, cost, true)
+            archiveList.add(item)
+        }
+        val result = Result(paramOr, archiveList, null)
+        PATTERN_CURRENT_FUNDS.find(body)?.groupValues?.run {
+            val fundsGP = ParserUtils.parseInt(get(1), 0)
+            val fundsC = ParserUtils.parseInt(get(2), 0)
+            val funds = HomeParser.Funds(fundsGP, fundsC)
+            result.funds = funds
+        }
+        return result
+    }
+
+    fun parseArchiveUrl(body: String): String? {
+        if (body.contains(ERROR_NEED_HATH_CLIENT)) {
+            throw NoHAtHClientException("No H@H client")
+        } else if (body.contains(ERROR_INSUFFICIENT_FUNDS)) {
+            throw InsufficientFundsException()
+        }
+        return Jsoup.parse(body).selectFirst("#continue>a[href]")
+            ?.let { it.attr("href") + "?start=1" }
+        // TODO: Check more errors
+    }
+
+    class Archive(
+        val res: String,
+        val name: String,
+        val size: String,
+        val cost: String,
+        val isHAtH: Boolean,
+    )
+
+    class Result(val paramOr: String?, val archiveList: List<Archive>, var funds: HomeParser.Funds?)
+}
@@ -3,7 +3,4 @@ package com.hippo.ehviewer.client.parser
 import kotlinx.serialization.Serializable

@Serializable
-data class VoteTagResult(
-    val error: String?,
-    val tagpane: String?,
-)
+data class Error(val error: String)
@@ -17,10 +17,10 @@
 */
 package com.hippo.ehviewer.client.parser

-import java.nio.ByteBuffer
+import org.jsoup.Jsoup

 object EventPaneParser {
-    private external fun parseEventPane(body: ByteBuffer, size: Int = body.limit()): Int
-
-    fun parse(body: ByteBuffer): String? = unmarshalParsingAs(body, ::parseEventPane)
+    fun parse(body: String): String? {
+        return Jsoup.parse(body).getElementById("eventpane")?.html()
+    }
 }
@@ -0,0 +1,31 @@
+package com.hippo.ehviewer.client.parser
+
+import com.hippo.ehviewer.R
+import com.hippo.ehviewer.client.exception.EhException
+import com.hippo.ehviewer.client.exception.ParseException
+import splitties.init.appCtx
+
+object FavoritesParser {
+    suspend fun parse(body: String): Result {
+        if (body.contains("This page requires you to log on.</p>")) {
+            throw EhException(appCtx.getString(R.string.need_sign_in))
+        }
+        val catArray = arrayOfNulls<String>(10)
+        val countArray = parseFav(body, catArray)
+        if (countArray.isEmpty()) throw ParseException("Parse favorites error")
+        val result = GalleryListParser.parse(body)
+        return Result(catArray.requireNoNulls(), countArray, result)
+    }
+
+    class Result(
+        val catArray: Array<String>,
+        val countArray: IntArray,
+        galleryListResult: GalleryListResult,
+    ) {
+        val prev = galleryListResult.prev
+        val next = galleryListResult.next
+        val galleryInfoList = galleryListResult.galleryInfoList
+    }
+}
+
+private external fun parseFav(body: String, favCat: Array<String?>): IntArray
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.client.parser
+
+import com.hippo.ehviewer.client.EhUrl
+import com.hippo.ehviewer.client.exception.NotLoggedInException
+import com.hippo.ehviewer.util.ExceptionUtils
+import org.jsoup.Jsoup
+
+object ForumsParser {
+    fun parse(body: String): String {
+        return runCatching {
+            val d = Jsoup.parse(body, EhUrl.URL_FORUMS)
+            val userlinks = d.getElementById("userlinks")
+            val child = userlinks!!.child(0).child(0).child(0)
+            child.attr("href")
+        }.getOrElse {
+            ExceptionUtils.throwIfFatal(it)
+            throw NotLoggedInException()
+        }
+    }
+}
@@ -15,11 +15,12 @@
 */
 package com.hippo.ehviewer.client.parser

-import com.ehviewer.core.model.GalleryInfo
-import com.ehviewer.core.util.unescapeXml
 import com.hippo.ehviewer.client.EhUtils.getCategory
+import com.hippo.ehviewer.client.EhUtils.handleThumbUrlResolution
+import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.client.getThumbKey
 import com.hippo.ehviewer.client.parseAs
+import com.hippo.ehviewer.util.unescapeXml
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

@@ -31,8 +32,8 @@ object GalleryApiParser {
                title = item.title.unescapeXml()
                titleJpn = item.titleJpn.unescapeXml()
                category = getCategory(item.category)
-                thumbKey = getThumbKey(item.thumb)
-                uploader = item.uploader?.unescapeXml()
+                thumbKey = getThumbKey(handleThumbUrlResolution(item.thumb)!!)
+                uploader = item.uploader.unescapeXml()
                posted = ParserUtils.formatDate(item.posted * 1000)
                rating = item.rating
                simpleTags = item.tags
@@ -53,12 +54,11 @@ object GalleryApiParser {
        val titleJpn: String,
        val category: String,
        val thumb: String,
-        // Null in some old galleries
-        val uploader: String?,
+        val uploader: String,
        val posted: Long,
        @SerialName("filecount")
        val pages: Int,
        val rating: Float,
-        val tags: List<String>,
+        val tags: ArrayList<String>,
    )
 }
@@ -0,0 +1,494 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.client.parser
+
+import arrow.core.unzip
+import com.hippo.ehviewer.EhDB
+import com.hippo.ehviewer.client.EhFilter
+import com.hippo.ehviewer.client.EhUtils
+import com.hippo.ehviewer.client.EhUtils.getCategory
+import com.hippo.ehviewer.client.EhUtils.handleThumbUrlResolution
+import com.hippo.ehviewer.client.data.BaseGalleryInfo
+import com.hippo.ehviewer.client.data.GalleryComment
+import com.hippo.ehviewer.client.data.GalleryCommentList
+import com.hippo.ehviewer.client.data.GalleryDetail
+import com.hippo.ehviewer.client.data.GalleryInfo.Companion.LOCAL_FAVORITED
+import com.hippo.ehviewer.client.data.GalleryInfo.Companion.NOT_FAVORITED
+import com.hippo.ehviewer.client.data.GalleryPreview
+import com.hippo.ehviewer.client.data.GalleryTagGroup
+import com.hippo.ehviewer.client.data.LargeGalleryPreview
+import com.hippo.ehviewer.client.data.NormalGalleryPreview
+import com.hippo.ehviewer.client.exception.EhException
+import com.hippo.ehviewer.client.exception.OffensiveException
+import com.hippo.ehviewer.client.exception.ParseException
+import com.hippo.ehviewer.client.exception.PiningException
+import com.hippo.ehviewer.client.getThumbKey
+import com.hippo.ehviewer.util.ExceptionUtils
+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 org.jsoup.Jsoup
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+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>")
+    private val PATTERN_DETAIL = Regex(
+        "var gid = (\\d+);.+?var token = \"([a-f0-9]+)\";.+?var apiuid = ([\\-\\d]+);.+?var apikey = \"([a-f0-9]+)\";",
+        RegexOption.DOT_MATCHES_ALL,
+    )
+    private val PATTERN_TORRENT =
+        Regex("<a[^<>]*onclick=\"return popUp\\('([^']+)'[^)]+\\)\">Torrent Download[^<]+(\\d+)[^<]+</a")
+    private val PATTERN_ARCHIVE =
+        Regex("<a[^<>]*onclick=\"return popUp\\('([^']+)'[^)]+\\)\">Archive Download</a>")
+    private val PATTERN_COVER = Regex("width:(\\d+)px; height:(\\d+)px.+?url\\((.+?)\\)")
+    private val PATTERN_PAGES =
+        Regex("<tr><td[^<>]*>Length:</td><td[^<>]*>([\\d,]+) pages</td></tr>")
+    private val PATTERN_PREVIEW_PAGES =
+        Regex("<td[^>]+><a[^>]+>([\\d,]+)</a></td><td[^>]+>(?:<a[^>]+>)?&gt;(?:</a>)?</td>")
+    private val PATTERN_NORMAL_PREVIEW =
+        Regex("<div class=\"gdtm\"[^<>]*><div[^<>]*width:(\\d+)[^<>]*height:(\\d+)[^<>]*\\((.+?)\\)[^<>]*-(\\d+)px[^<>]*><a[^<>]*href=\"(.+?)\"[^<>]*><img alt=\"([\\d,]+)\"")
+    private val PATTERN_LARGE_PREVIEW =
+        Regex("<div class=\"gdtl\".+?<a href=\"(.+?)\"><img alt=\"([\\d,]+)\".+?src=\"(.+?)\"")
+    private val PATTERN_NEWER_DATE = Regex(", added (.+?)<br />")
+    private val PATTERN_FAVORITE_SLOT =
+        Regex("/fav.png\\); background-position:0px -(\\d+)px")
+    private val EMPTY_GALLERY_TAG_GROUP_ARRAY = arrayOf<GalleryTagGroup>()
+    private val EMPTY_GALLERY_COMMENT_ARRAY = GalleryCommentList(arrayOf(), false)
+    private val WEB_COMMENT_DATE_FORMAT = DateTimeFormatter
+        .ofPattern("dd MMMM yyyy, HH:mm", Locale.US).withZone(ZoneOffset.UTC)
+    private const val OFFENSIVE_STRING =
+        "<p>(And if you choose to ignore this warning, you lose all rights to complain about it in the future.)</p>"
+    private const val PINING_STRING = "<p>This gallery is pining for the fjords.</p>"
+
+    suspend fun parse(body: String): GalleryDetail {
+        if (body.contains(OFFENSIVE_STRING)) {
+            throw OffensiveException()
+        }
+        if (body.contains(PINING_STRING)) {
+            throw PiningException()
+        }
+
+        // Error info
+        PATTERN_ERROR.find(body)?.run { throw EhException(groupValues[1]) }
+        // Temporary workaround, see https://github.com/jhy/jsoup/issues/1850
+        val document = Jsoup.parse(body.replace("del>", "s>"))
+        val galleryDetail = GalleryDetail(
+            tags = parseTagGroups(document),
+            comments = parseComments(document),
+            previewPages = parsePreviewPages(body),
+            previewList = parsePreviewList(body).first,
+        )
+        parseDetail(galleryDetail, document, body)
+
+        // Generate simpleLanguage for local favorites
+        galleryDetail.generateSLang()
+        return galleryDetail
+    }
+
+    private suspend fun parseDetail(gd: GalleryDetail, d: Document, body: String) {
+        PATTERN_DETAIL.find(body)?.apply {
+            gd.gid = groupValues[1].toLongOrNull() ?: -1L
+            gd.token = groupValues[2]
+            gd.apiUid = groupValues[3].toLongOrNull() ?: -1L
+            gd.apiKey = groupValues[4]
+        } ?: throw ParseException("Can't parse gallery detail")
+        if (gd.gid == -1L) {
+            throw ParseException("Can't parse gallery detail")
+        }
+        PATTERN_TORRENT.find(body)?.run {
+            gd.torrentUrl = groupValues[1].trim().unescapeXml()
+            gd.torrentCount = groupValues[2].toIntOrNull() ?: 0
+        }
+        PATTERN_ARCHIVE.find(body)?.run {
+            gd.archiveUrl = groupValues[1].trim().unescapeXml()
+        }
+        try {
+            val gm = d.getElementsByClass("gm")[0]
+            // Thumb url
+            gm.getElementById("gd1")?.child(0)?.attr("style")?.trim()?.let {
+                gd.thumbKey = getThumbKey(
+                    PATTERN_COVER.find(it)?.run {
+                        handleThumbUrlResolution(groupValues[3])
+                    }!!,
+                )
+            }
+
+            gd.title = gm.getElementById("gn")?.text()?.trim()
+            gd.titleJpn = gm.getElementById("gj")?.text()?.trim()
+
+            // Category
+            try {
+                val gdc = gm.getElementById("gdc")!!
+                var ce = gdc.getElementsByClass("cn").first()
+                if (ce == null) {
+                    ce = gdc.getElementsByClass("cs").first()
+                }
+                gd.category = getCategory(ce!!.text())
+            } catch (e: Throwable) {
+                ExceptionUtils.throwIfFatal(e)
+                gd.category = EhUtils.UNKNOWN
+            }
+
+            // Uploader
+            val gdn = gm.getElementById("gdn")
+            if (null != gdn) {
+                gd.disowned = gdn.attr("style").contains("opacity:0.5")
+                gd.uploader = gdn.text().trim()
+            } else {
+                gd.uploader = ""
+            }
+            val gdd = gm.getElementById("gdd")
+            gd.posted = ""
+            gd.parent = ""
+            gd.visible = ""
+            gd.size = ""
+            gd.pages = 0
+            gd.favoriteCount = 0
+            val es = gdd!!.child(0).child(0).children()
+            es.forEach {
+                parseDetailInfo(gd, it)
+            }
+
+            // Rating count
+            val ratingCount = gm.getElementById("rating_count")
+            if (null != ratingCount) {
+                gd.ratingCount = ratingCount.text().trim().toIntOrDefault(0)
+            } else {
+                gd.ratingCount = 0
+            }
+
+            // Rating
+            val ratingLabel = gm.getElementById("rating_label")
+            if (null != ratingLabel) {
+                val ratingStr = ratingLabel.text().trim()
+                if ("Not Yet Rated" == ratingStr) {
+                    gd.rating = -1.0f
+                } else {
+                    val index = ratingStr.indexOf(' ')
+                    if (index == -1 || index >= ratingStr.length) {
+                        gd.rating = 0f
+                    } else {
+                        gd.rating = ratingStr.substring(index + 1).toFloatOrDefault(0f)
+                    }
+                }
+            } else {
+                gd.rating = -1.0f
+            }
+
+            // isFavorited
+            val gdf = gm.getElementById("gdf")
+            if (gdf != null) {
+                val favoriteName = gdf.text().trim()
+                if (favoriteName != "Add to Favorites") {
+                    gd.favoriteName = gdf.text().trim()
+                    PATTERN_FAVORITE_SLOT.find(body)?.run {
+                        gd.favoriteSlot = ((groupValues[1].toIntOrNull() ?: 2) - 2) / 19
+                    }
+                }
+            }
+            if (gd.favoriteSlot == NOT_FAVORITED && EhDB.containLocalFavorites(gd.gid)) {
+                gd.favoriteSlot = LOCAL_FAVORITED
+            }
+        } catch (e: Throwable) {
+            ExceptionUtils.throwIfFatal(e)
+            throw ParseException("Can't parse gallery detail")
+        }
+
+        // newer version
+        d.getElementById("gnd")?.run {
+            val dates = PATTERN_NEWER_DATE.findAll(body).map { it.groupValues[1] }.toList()
+            select("a").forEachIndexed { index, element ->
+                val gi = BaseGalleryInfo()
+                val result = GalleryDetailUrlParser.parse(element.attr("href"))
+                if (result != null) {
+                    gi.gid = result.gid
+                    gi.token = result.token
+                    gi.title = element.text().trim()
+                    gi.posted = dates[index]
+                    gd.newerVersions.add(gi)
+                }
+            }
+        }
+    }
+
+    private fun parseDetailInfo(gd: GalleryDetail, e: Element) {
+        val es = e.children()
+        if (es.size < 2) {
+            return
+        }
+        val key = es[0].text().trim()
+        val value = es[1].ownText().trim()
+        if (key.startsWith("Posted")) {
+            gd.posted = value
+        } else if (key.startsWith("Parent")) {
+            val a = es[1].children().first()
+            if (a != null) {
+                gd.parent = a.attr("href")
+            }
+        } else if (key.startsWith("Visible")) {
+            gd.visible = value
+        } else if (key.startsWith("Language")) {
+            gd.language = value
+        } else if (key.startsWith("File Size")) {
+            gd.size = value
+        } else if (key.startsWith("Length")) {
+            val index = value.indexOf(' ')
+            if (index >= 0) {
+                gd.pages = value.substring(0, index).toIntOrDefault(1)
+            } else {
+                gd.pages = 1
+            }
+        } else if (key.startsWith("Favorited")) {
+            when (value) {
+                "Never" -> gd.favoriteCount = 0
+                "Once" -> gd.favoriteCount = 1
+                else -> {
+                    val index = value.indexOf(' ')
+                    if (index == -1) {
+                        gd.favoriteCount = 0
+                    } else {
+                        gd.favoriteCount = value.substring(0, index).toIntOrDefault(0)
+                    }
+                }
+            }
+        }
+    }
+
+    private fun parseTagGroup(element: Element): GalleryTagGroup? {
+        return try {
+            var nameSpace = element.child(0).text()
+            // Remove last ':'
+            nameSpace = nameSpace.substring(0, nameSpace.length - 1)
+            val group = GalleryTagGroup(nameSpace)
+            val tags = element.child(1).children()
+            tags.forEach {
+                var tag = it.text()
+                // Sometimes parody tag is followed with '|' and english translate, just remove them
+                val index = tag.indexOf('|')
+                if (index >= 0) {
+                    tag = tag.substring(0, index).trim()
+                }
+                if (it.className() == "gtw") {
+                    tag = "_$tag" // weak tag
+                }
+                group.add(tag)
+            }
+            if (group.size > 0) group else null
+        } catch (e: Throwable) {
+            ExceptionUtils.throwIfFatal(e)
+            e.printStackTrace()
+            null
+        }
+    }
+
+    /**
+     * Parse tag groups with html parser
+     */
+    private fun parseTagGroups(document: Document): Array<GalleryTagGroup> {
+        return try {
+            val taglist = document.getElementById("taglist")!!
+            val tagGroups = taglist.child(0).child(0).children()
+            parseTagGroups(tagGroups)
+        } catch (e: Throwable) {
+            ExceptionUtils.throwIfFatal(e)
+            e.printStackTrace()
+            EMPTY_GALLERY_TAG_GROUP_ARRAY
+        }
+    }
+
+    private fun parseTagGroups(trs: Elements): Array<GalleryTagGroup> {
+        return try {
+            trs.mapNotNull { parseTagGroup(it) }.toTypedArray()
+        } catch (e: Throwable) {
+            ExceptionUtils.throwIfFatal(e)
+            e.printStackTrace()
+            EMPTY_GALLERY_TAG_GROUP_ARRAY
+        }
+    }
+
+    private suspend fun parseComment(element: Element): GalleryComment? {
+        return try {
+            val comment = GalleryComment()
+            // Id
+            val a = element.previousElementSibling()
+            val name = a!!.attr("name")
+            comment.id = name trimAnd { substring(1).toInt().toLong() }
+            // Editable, vote up and vote down
+            val c4 = element.getElementsByClass("c4").first()
+            if (null != c4) {
+                if ("Uploader Comment" == c4.text()) {
+                    comment.uploader = true
+                }
+                for (e in c4.children()) {
+                    when (e.text()) {
+                        "Vote+" -> {
+                            comment.voteUpAble = true
+                            comment.voteUpEd = e.attr("style").trim().isNotEmpty()
+                        }
+
+                        "Vote-" -> {
+                            comment.voteDownAble = true
+                            comment.voteDownEd = e.attr("style").trim().isNotEmpty()
+                        }
+
+                        "Edit" -> comment.editable = true
+                    }
+                }
+            }
+            // Vote state
+            val c7 = element.getElementsByClass("c7").first()
+            if (null != c7) {
+                comment.voteState = c7.text().trim()
+            }
+            // Score
+            val c5 = element.getElementsByClass("c5").first()
+            if (null != c5) {
+                val es = c5.children()
+                if (!es.isEmpty()) {
+                    comment.score = es[0].text().trim().toIntOrDefault(0)
+                }
+            }
+            // time
+            val c3 = element.getElementsByClass("c3").first()
+            val temp = c3!!.ownText()
+            val time = if (temp.endsWith(':')) {
+                // user
+                comment.user = c3.child(0).text()
+                temp.substring("Posted on ".length, temp.length - " by:".length)
+            } else {
+                temp.substring("Posted on ".length)
+            }
+            comment.time = Instant.from(WEB_COMMENT_DATE_FORMAT.parse(time)).toEpochMilli()
+            // comment
+            val c6 = element.getElementsByClass("c6").first()
+            // fix underline support
+            for (e in c6!!.children()) {
+                if ("span" == e.tagName() && "text-decoration:underline;" == e.attr("style")) {
+                    e.tagName("u")
+                }
+            }
+            comment.comment = c6.html()
+            // filter comment
+            if (!comment.uploader) {
+                val sEhFilter = EhFilter
+                if (sEhFilter.filterCommenter(comment.user!!) || sEhFilter.filterComment(comment.comment!!)) {
+                    return null
+                }
+            }
+            // last edited
+            val c8 = element.getElementsByClass("c8").first()
+            if (c8 != null) {
+                val e = c8.children().first()
+                if (e != null) {
+                    comment.lastEdited =
+                        Instant.from(WEB_COMMENT_DATE_FORMAT.parse(e.text())).toEpochMilli()
+                }
+            }
+            comment
+        } catch (e: Throwable) {
+            ExceptionUtils.throwIfFatal(e)
+            e.printStackTrace()
+            null
+        }
+    }
+
+    /**
+     * Parse comments with html parser
+     */
+    suspend fun parseComments(document: Document): GalleryCommentList {
+        return try {
+            val cdiv = document.getElementById("cdiv")!!
+            val c1s = cdiv.getElementsByClass("c1")
+            val list = c1s.mapNotNull { parseComment(it) }
+            val chd = cdiv.getElementById("chd")
+            var hasMore = false
+            NodeTraversor.traverse(
+                object : NodeVisitor {
+                    override fun head(node: Node, depth: Int) {
+                        if (node is Element && node.text() == "click to show all") {
+                            hasMore = true
+                        }
+                    }
+
+                    override fun tail(node: Node, depth: Int) {}
+                },
+                chd!!,
+            )
+            GalleryCommentList(list.toTypedArray(), hasMore)
+        } catch (e: Throwable) {
+            ExceptionUtils.throwIfFatal(e)
+            e.printStackTrace()
+            EMPTY_GALLERY_COMMENT_ARRAY
+        }
+    }
+
+    /**
+     * Parse preview pages with regular expressions
+     */
+    fun parsePreviewPages(body: String): Int {
+        return PATTERN_PREVIEW_PAGES.find(body)?.groupValues?.get(1)?.toIntOrNull()
+            ?: throw ParseException("Parse preview page count error")
+    }
+
+    /**
+     * Parse pages with regular expressions
+     */
+    fun parsePages(body: String): Int {
+        return PATTERN_PAGES.find(body)?.groupValues?.get(1)?.toIntOrNull()
+            ?: throw ParseException("Parse pages error")
+    }
+
+    fun parsePreviewList(body: String): Pair<List<GalleryPreview>, List<String>> {
+        return runCatching { parseNormalPreview(body) }.getOrElse { parseLargePreview(body) }
+    }
+
+    private fun parseLargePreview(body: String): Pair<List<GalleryPreview>, List<String>> {
+        check(PATTERN_LARGE_PREVIEW.containsMatchIn(body))
+        return PATTERN_LARGE_PREVIEW.findAll(body).unzip {
+            val position = it.groupValues[2].toInt() - 1
+            val imageKey = getThumbKey(it.groupValues[3].trim())
+            val pageUrl = it.groupValues[1].trim()
+            LargeGalleryPreview(imageKey, position) to pageUrl
+        }.run {
+            first.toList() to second.toList()
+        }
+    }
+
+    private fun parseNormalPreview(body: String): Pair<List<GalleryPreview>, List<String>> {
+        check(PATTERN_NORMAL_PREVIEW.containsMatchIn(body))
+        return PATTERN_NORMAL_PREVIEW.findAll(body).unzip {
+            val position = it.groupValues[6].toInt() - 1
+            val imageKey = getThumbKey(it.groupValues[3].trim())
+            val xOffset = it.groupValues[4].toIntOrNull() ?: 0
+            val width = it.groupValues[1].toInt()
+            val height = it.groupValues[2].toInt()
+            val pageUrl = it.groupValues[5].trim()
+            NormalGalleryPreview(imageKey, position, xOffset, width, height) to pageUrl
+        }.run {
+            first.toList() to second.toList()
+        }
+    }
+}
@@ -16,23 +16,29 @@
 package com.hippo.ehviewer.client.parser

 import com.hippo.ehviewer.client.EhUrl
+import com.hippo.ehviewer.util.toLongOrDefault
+import java.util.regex.Pattern

 /**
 * Like http://exhentai.org/g/1234567/a1b2c3d4e5<br></br>
 */
 object GalleryDetailUrlParser {
-    private val URL_STRICT_PATTERN = Regex(
+    private val URL_STRICT_PATTERN = Pattern.compile(
        "https?://(?:${EhUrl.DOMAIN_EX}|${EhUrl.DOMAIN_E}(?:/lofi)?)/(?:g|mpv)/(\\d+)/([0-9a-f]{10})",
    )
-    private val URL_PATTERN = Regex("(\\d+)/([0-9a-f]{10})(?:[^0-9a-f]|$)")
+    private val URL_PATTERN = Pattern.compile("(\\d+)/([0-9a-f]{10})(?:[^0-9a-f]|$)")

    fun parse(url: String?, strict: Boolean = true): Result? {
        url ?: return null
        val pattern = if (strict) URL_STRICT_PATTERN else URL_PATTERN
-        return pattern.find(url)?.destructured?.let { (gid, token) ->
-            Result(gid.toLong(), token)
+        val m = pattern.matcher(url)
+        return if (m.find()) {
+            val gid = m.group(1)!!.toLongOrDefault(0).takeIf { it > 0 }
+            gid?.let { Result(it, m.group(2)!!) }
+        } else {
+            null
        }
    }

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