Prepare for release 1.14.5

Opt out activity recreation for size-based config changes as they are
handled by Compose.

.editorconfig

@@ -2,3 +2,4 @@
 ij_kotlin_imports_layout = *
 ktlint_code_style = intellij_idea
 ktlint_function_naming_ignore_when_annotated_with = Composable
+ktlint_standard_class-signature = disabled

.gitattributes

@@ -0,0 +1 @@
+*.sh eol=lf

.github/workflows/baseline-profile.yml

@@ -0,0 +1,65 @@
+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

.github/workflows/ci.yml

@@ -12,16 +12,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 21
 
       - name: Install Rust Toolchain
-        run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android x86_64-linux-android && rustup component add rustfmt clippy
+        run: rustup target add armv7-linux-androideabi
 
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
@@ -35,36 +35,36 @@ jobs:
 
       - name: Clippy Check
         working-directory: ./app/src/main/rust
-        run: cargo clippy --all-targets --all-features -- -D warnings
+        run: cargo clippy --target aarch64-linux-android --all-features -- -D warnings
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v5
         with:
           cache-read-only: true
 
-      - name: Install NDK
-        run: echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;27.0.11718014"
+      - 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@v4
+        uses: actions/checkout@v5
 
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 21
 
-      - name: Install NDK
-        run: echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;27.0.11718014"
-
       - name: Install Rust Toolchain
-        run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android x86_64-linux-android && rustup component add rustfmt clippy
+        run: rustup target add armv7-linux-androideabi
 
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
@@ -74,18 +74,21 @@ jobs:
           save-if: "false"
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v5
         with:
           cache-encryption-key: ${{ secrets.GradleEncryptionKey }}
-          gradle-home-cache-cleanup: true
 
       - name: CMake Cache
         uses: actions/cache@v4
         with:
           path: app/.cxx
-          key: cmake-default-${{ hashFiles('gradle/libs.versions.toml', 'app/build.gradle.kts', 'app/src/main/cpp/CMakeLists.txt') }}
+          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-
 
+      # https://github.com/mikepenz/AboutLibraries/issues/1225
+      - name: Generate aboutlibraries.json
+        run: ./gradlew :app:prepareLibraryDefinitionsDefaultRelease --rerun
+
       - name: Build
         run: ./gradlew assembleDefaultRelease
 
@@ -108,10 +111,11 @@ jobs:
           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/mapping.txt
+          path: app/build/outputs/mapping/defaultRelease
 
       - name: Upload native debug symbols
         uses: actions/upload-artifact@v4
@@ -123,19 +127,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 21
 
-      - name: Install NDK
-        run: echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;27.0.11718014"
-
       - name: Install Rust Toolchain
-        run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android x86_64-linux-android && rustup component add rustfmt clippy
+        run: rustup target add armv7-linux-androideabi
 
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
@@ -145,18 +146,21 @@ jobs:
           save-if: "false"
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v5
         with:
           cache-encryption-key: ${{ secrets.GradleEncryptionKey }}
-          gradle-home-cache-cleanup: true
 
       - name: CMake Cache
         uses: actions/cache@v4
         with:
           path: app/.cxx
-          key: cmake-marshmallow-${{ hashFiles('gradle/libs.versions.toml', 'app/build.gradle.kts', 'app/src/main/cpp/CMakeLists.txt') }}
+          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
 
@@ -179,10 +183,11 @@ jobs:
           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/mapping.txt
+          path: app/build/outputs/mapping/marshmallowRelease
 
       - name: Upload native debug symbols
         uses: actions/upload-artifact@v4

.github/workflows/lock-threads.yml

@@ -2,7 +2,7 @@ name: 'Lock Threads'
 
 on:
   schedule:
-    - cron: '0 0 * * *'
+    - cron: '0 8 * * *'
   workflow_dispatch:
 
 permissions:

.github/workflows/releases.yml

@@ -9,20 +9,26 @@ jobs:
   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@v4
+        uses: actions/checkout@v5
 
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 21
 
-      - name: Install NDK
-        run: echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;27.0.11718014"
-
       - name: Install Rust Toolchain
-        run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android x86_64-linux-android
+        run: rustup target add armv7-linux-androideabi
 
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
@@ -30,16 +36,29 @@ jobs:
           workspaces: "./app/src/main/rust"
 
       - name: CMake Cache
-        uses: actions/cache@v4
+        uses: actions/cache/restore@v4
         with:
           path: app/.cxx
-          key: cmake-${{ hashFiles('gradle/libs.versions.toml', 'app/build.gradle.kts', 'app/src/main/cpp/CMakeLists.txt') }}
-          restore-keys: cmake-
+          key: cmake-
 
-      - name: Gradle Build
-        uses: gradle/actions/setup-gradle@v3
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v5
         with:
-          arguments: assembleRelease
+          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
 
       - name: Rename Apks
         run: |

.github/workflows/update-chrome-version.yml

@@ -1,29 +0,0 @@
-name: 'Update Chrome Version'
-
-on:
-  schedule:
-    - cron: '0 0 1 * *'
-  workflow_dispatch:
-
-jobs:
-  action:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Update Chrome Version
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          cd chrome-for-testing
-          curl -OLf https://googlechromelabs.github.io/chrome-for-testing/LATEST_RELEASE_STABLE
-          git config user.name "github-actions[bot]"
-          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git config push.autoSetupRemote true
-          git switch -c chore/chrome
-          if git commit -am "Update Chrome version for default User-Agent"; then
-            git push
-            gh pr create -f
-            gh pr merge chore/chrome --auto -dr
-          fi

.gitignore

@@ -1,8 +1,10 @@
 .gradle
 /local.properties
 .DS_Store
-/build
-/.kotlin
+build
+.cxx
+.kotlin
 *.iml
 .idea
+.vscode
 /captures

CHANGELOG.zh-CN.MD

@@ -1,5 +1,261 @@
 # 变更日志
 
+## [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
 
 ### 改进

README.md

@@ -8,6 +8,10 @@
   <a href="/docs/README/zh-tw.md">
   正體中文
   </a>
+  <span> | </span>
+  <a href="/docs/README/ja.md">
+  日本語
+  </a>
 </p>
 
 <h1 align="center">
@@ -59,17 +63,19 @@
 
 # Description
 
-EhViewer fork dedicated to lightweight and high-performance
+A modern EhViewer fork dedicated to 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      | Feature                          |
-|-------------|----------------------------------|
-| Default     | Android 8.0+, full support       |
-| Marshmallow | Android 6.0-7.1, limited support |
+| 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"/>
@@ -92,9 +98,6 @@ Here is the libraries
 - [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
 

app/.gitignore

@@ -1,2 +0,0 @@
-/build
-/.cxx

app/build.gradle.kts

@@ -1,28 +1,22 @@
-import com.mikepenz.aboutlibraries.plugin.DuplicateMode.MERGE
-import com.mikepenz.aboutlibraries.plugin.DuplicateRule.GROUP
+import com.mikepenz.aboutlibraries.plugin.DuplicateMode
+import com.mikepenz.aboutlibraries.plugin.DuplicateRule
+import java.util.regex.Pattern
 
 val isRelease: Boolean
     get() = gradle.startParameter.taskNames.any { it.contains("Release") }
 
 plugins {
-    alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.kotlin.compose)
-    alias(libs.plugins.kotlin.parcelize)
+    alias(libs.plugins.ehviewer.android.application)
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.ksp)
-    alias(libs.plugins.spotless)
-    alias(libs.plugins.aboutlibrariesPlugin)
-    alias(libs.plugins.composeCompilerReportGenerator)
+    alias(libs.plugins.aboutlibraries)
+    alias(libs.plugins.aboutlibrariesAndroid)
+    alias(libs.plugins.baselineprofile)
 }
 
 val supportedAbis = arrayOf("arm64-v8a", "x86_64", "armeabi-v7a")
 
 android {
-    compileSdk = 34
-    ndkVersion = "27.0.11718014-beta1"
-    androidResources.generateLocaleConfig = true
-
     splits {
         abi {
             isEnable = true
@@ -58,32 +52,13 @@ android {
     }.standardOutput.asText.get().trim().removePrefix("https://github.com/").removePrefix("git@github.com:")
         .removeSuffix(".git")
 
-    val chromeVersion = rootProject.layout.projectDirectory.file("chrome-for-testing/LATEST_RELEASE_STABLE").asFile
-        .readText().substringBefore('.')
+    val chromeVersion = rootProject.layout.projectDirectory.file("chrome.version").asFile.readText().trim()
 
     defaultConfig {
         applicationId = "moe.tarsin.ehviewer"
-        minSdk = 26
-        targetSdk = 34
-        versionCode = 180056
-        versionName = "1.11.6"
-        versionNameSuffix = "-RC2"
-        resourceConfigurations.addAll(
-            listOf(
-                "zh",
-                "zh-rCN",
-                "zh-rHK",
-                "zh-rTW",
-                "es",
-                "ja",
-                "ko",
-                "fr",
-                "de",
-                "th",
-                "tr",
-                "nb-rNO",
-            ),
-        )
+        versionCode = 180063
+        versionName = "1.14.5"
+        // versionNameSuffix = "-SNAPSHOT"
         buildConfigField("String", "RAW_VERSION_NAME", "\"$versionName${versionNameSuffix.orEmpty()}\"")
         buildConfigField("String", "COMMIT_SHA", "\"$commitSha\"")
         buildConfigField("long", "COMMIT_TIME", commitTime)
@@ -95,19 +70,15 @@ android {
             }
             debugSymbolLevel = "FULL"
         }
-        externalNativeBuild {
-            cmake {
-                arguments += "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
-            }
-        }
     }
 
     flavorDimensions += "api"
 
     productFlavors {
-        create("default")
+        create("default") {
+            minSdk = 26
+        }
         create("marshmallow") {
-            minSdk = 23
             applicationIdSuffix = ".m"
             versionNameSuffix = "-M"
         }
@@ -123,15 +94,46 @@ android {
         isCoreLibraryDesugaringEnabled = true
     }
 
-    lint {
-        disable += setOf("MissingTranslation", "MissingQuantity")
-        fatal += setOf("NewApi", "InlinedApi")
-    }
-
     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",
+            )
+        }
+    }
+
+    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
@@ -145,38 +147,33 @@ android {
         }
         debug {
             applicationIdSuffix = ".debug"
-            lint {
-                abortOnError = false
-            }
+        }
+        create("benchmarkRelease") {
+            initWith(buildTypes.getByName("release"))
+            matchingFallbacks += listOf("release")
+            applicationIdSuffix = ".benchmark"
+            signingConfig = signingConfigs.getByName("debug")
+            isDebuggable = false
         }
     }
 
     buildFeatures {
         buildConfig = true
         compose = true
-        viewBinding = true
     }
 
     namespace = "com.hippo.ehviewer"
 }
 
-composeCompiler {
-    enableNonSkippingGroupOptimization = true
-    enableStrongSkippingMode = true
-}
-
-androidComponents {
-    onVariants(selector().withBuildType("release")) {
-        it.packaging.resources.excludes.addAll(
-            "/META-INF/**",
-            "/kotlin/**",
-            "**.txt",
-            "**.bin",
-        )
-    }
+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)
@@ -190,12 +187,15 @@ dependencies {
     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.constraintlayout.compose)
     implementation(libs.androidx.datastore)
-    implementation(libs.androidx.graphics.path)
 
     // https://developer.android.com/jetpack/androidx/releases/lifecycle
     implementation(libs.androidx.lifecycle.process)
@@ -204,20 +204,17 @@ dependencies {
     // https://developer.android.com/jetpack/androidx/releases/paging
     implementation(libs.androidx.paging.compose)
 
-    implementation(libs.androidx.recyclerview)
-
     // https://developer.android.com/jetpack/androidx/releases/room
-    ksp(libs.androidx.room.compiler)
     implementation(libs.androidx.room.paging)
 
     implementation(libs.androidx.work.runtime)
-    implementation(libs.photoview) // Dead Dependency
-    implementation(libs.directionalviewpager) // Dead Dependency
     implementation(libs.material.motion.core)
+    implementation(libs.material.kolor)
 
     implementation(libs.bundles.splitties)
 
-    implementation(libs.okio.jvm)
+    // https://square.github.io/okhttp/changelogs/changelog/
+    implementation(platform(libs.okhttp.bom))
 
     implementation(libs.logcat)
 
@@ -227,12 +224,10 @@ dependencies {
     implementation(libs.aboutlibraries.compose.m3)
     implementation(libs.accompanist.drawable.painter)
 
-    implementation(libs.insetter) // Dead Dependency
-
     implementation(libs.reorderable)
 
     implementation(platform(libs.arrow.stack))
-    implementation(libs.arrow.fx.coroutines)
+    implementation(libs.bundles.arrow)
 
     // https://coil-kt.github.io/coil/changelog/
     implementation(platform(libs.coil.bom))
@@ -240,66 +235,43 @@ dependencies {
 
     implementation(libs.telephoto.zoomable)
 
-    implementation(libs.ktor.client.core)
+    implementation(libs.ktor.client.okhttp)
 
     implementation(libs.bundles.kotlinx.serialization)
 
     implementation(libs.kotlinx.coroutines.android)
     implementation(libs.kotlinx.datetime)
-    implementation(libs.jsoup)
 
     coreLibraryDesugaring(libs.desugar)
 
-    implementation(libs.cronet.embedded)
+    implementation(libs.androidx.profileinstaller)
+    "baselineProfile"(project(":benchmark"))
 
     debugImplementation(libs.compose.ui.tooling)
     implementation(libs.compose.ui.tooling.preview)
 }
 
 kotlin {
-    jvmToolchain(21)
     compilerOptions {
-        freeCompilerArgs = listOf(
-            // https://kotlinlang.org/docs/compiler-reference.html#progressive
-            "-progressive",
-            "-Xjvm-default=all",
-            "-Xcontext-receivers",
-
-            "-opt-in=coil3.annotation.ExperimentalCoilApi",
-            "-opt-in=androidx.compose.foundation.layout.ExperimentalLayoutApi",
-            "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api",
-            "-opt-in=androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi",
-            "-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",
+        optIn.addAll(
+            "coil3.annotation.ExperimentalCoilApi",
+            "androidx.paging.ExperimentalPagingApi",
+            "me.saket.telephoto.ExperimentalTelephotoApi",
         )
     }
 }
 
 ksp {
-    arg("room.schemaLocation", "$projectDir/schemas")
     arg("compose-destinations.codeGenPackageName", "com.hippo.ehviewer.ui")
 }
 
 aboutLibraries {
-    duplicationMode = MERGE
-    duplicationRule = GROUP
-}
-
-spotless {
-    kotlin {
-        // https://github.com/diffplug/spotless/issues/111
-        target("src/**/*.kt")
-        ktlint()
+    collect {
+        includePlatform = false
     }
-    kotlinGradle {
-        ktlint()
+    library {
+        exclusionPatterns.add(Pattern.compile("org\\.jetbrains\\.(?:compose|androidx)\\..*"))
+        duplicationMode = DuplicateMode.MERGE
+        duplicationRule = DuplicateRule.GROUP
     }
 }

app/proguard-rules.pro

@@ -11,11 +11,13 @@
     public static final ** CREATOR;
 }
 
+-keepclassmembers,allowobfuscation class com.hippo.ehviewer.coil.AnimatedWebPDrawable {
+    java.nio.ByteBuffer source;
+}
+
 # Ktor logger
 -dontwarn org.slf4j.impl.StaticLoggerBinder
 
--dontwarn org.conscrypt.Conscrypt
-
 # https://issuetracker.google.com/222232895
 -dontwarn androidx.window.extensions.**
 -dontwarn androidx.window.sidecar.Sidecar*

app/src/main/AndroidManifest.xml

@@ -39,7 +39,7 @@
         <activity
             android:name=".ui.MainActivity"
             android:banner="@mipmap/ic_leanback_banner"
-            android:configChanges="screenSize"
+            android:configChanges="orientation|screenLayout|screenSize|smallestScreenSize"
             android:exported="true"
             android:launchMode="singleTask"
             android:theme="@style/AppTheme.Splash"
@@ -70,26 +70,6 @@
                 <data android:host="exhentai.org" />
                 <data android:host="e-hentai.org" />
             </intent-filter>
-            <intent-filter android:label="@string/keyword_search">
-                <action android:name="android.intent.action.SEND" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:mimeType="text/plain" />
-            </intent-filter>
-            <intent-filter android:label="@string/image_search">
-                <action android:name="android.intent.action.SEND" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <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" />
 
@@ -123,6 +103,20 @@
                 <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" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:mimeType="text/plain" />
+            </intent-filter>
+            <intent-filter android:label="@string/image_search">
+                <action android:name="android.intent.action.SEND" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:mimeType="image/*" />
+            </intent-filter>
         </activity>
         <activity
             android:name=".ui.SecurityActivity"

app/src/main/cpp/0001-Don-t-build-other-binaries.patch

@@ -1,52 +0,0 @@
-From d1db03ebd9989d10a5a905b792b712c6487a0057 Mon Sep 17 00:00:00 2001
-From: FooIbar <118464521+FooIbar@users.noreply.github.com>
-Date: Sat, 24 Feb 2024 12:03:15 +0000
-Subject: [PATCH] Don't build other binaries
-
----
- CMakeLists.txt | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a346dd02..52b5d0d8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1567,7 +1567,7 @@ endif()
- # xzdec and lzmadec
- #############################################################################
- 
--if(HAVE_DECODERS AND (NOT MSVC OR MSVC_VERSION GREATER_EQUAL 1900))
-+if(0)
-     foreach(XZDEC xzdec lzmadec)
-         add_executable("${XZDEC}"
-             src/common/sysdefs.h
-@@ -1624,7 +1624,7 @@ endif()
- # lzmainfo
- #############################################################################
- 
--if(HAVE_DECODERS AND (NOT MSVC OR MSVC_VERSION GREATER_EQUAL 1900))
-+if(0)
-     add_executable(lzmainfo
-         src/common/sysdefs.h
-         src/common/tuklib_common.h
-@@ -1680,7 +1680,7 @@ endif()
- # xz
- #############################################################################
- 
--if(NOT MSVC OR MSVC_VERSION GREATER_EQUAL 1900)
-+if(0)
-     add_executable(xz
-         src/common/mythread.h
-         src/common/sysdefs.h
-@@ -1914,7 +1914,7 @@ endif()
- # Scripts
- #############################################################################
- 
--if(UNIX)
-+if(0)
-     # NOTE: This isn't as sophisticated as in the Autotools build which
-     # uses posix-shell.m4 but hopefully this doesn't need to be either.
-     # CMake likely won't be used on as many (old) obscure systems as the
--- 
-2.34.1
-

app/src/main/cpp/0001-Fix-zip_time-performance.patch

@@ -0,0 +1,25 @@
+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
+

app/src/main/cpp/0001-Hide-symbols.patch

@@ -1,29 +0,0 @@
-From 2fa97f75b64c05da506968fa9a1711716f2d45a0 Mon Sep 17 00:00:00 2001
-From: FooIbar <118464521+FooIbar@users.noreply.github.com>
-Date: Tue, 26 Sep 2023 00:08:03 +0800
-Subject: [PATCH 1/2] Hide symbols
-
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ec97e4c7..4d859341 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2129,10 +2129,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.34.1
-

app/src/main/cpp/0002-Insert-link-libs.patch

@@ -1,25 +0,0 @@
-From 2dcc8be937499022c37678eb6bf4bd026b6fcbb0 Mon Sep 17 00:00:00 2001
-From: FooIbar <118464521+FooIbar@users.noreply.github.com>
-Date: Tue, 26 Sep 2023 00:09:25 +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 4d859341..1cd1cd47 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -438,7 +438,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.34.1
-

app/src/main/cpp/0002-Use-UTF-8-as-default-charset-on-bionic.patch

@@ -0,0 +1,27 @@
+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
+

app/src/main/cpp/CMakeLists.txt

@@ -1,48 +1,72 @@
 cmake_minimum_required(VERSION 3.14)
 project(ehviewer C)
+include(ExternalProject)
 include(FetchContent)
 
 if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-    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")
+    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")
 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.6.2
-        PATCH_COMMAND git apply ${CMAKE_CURRENT_LIST_DIR}/0001-Don-t-build-other-binaries.patch || cd .
+        GIT_TAG v5.8.1
+        GIT_SHALLOW 1
 )
 
 FetchContent_MakeAvailable(liblzma)
 include_directories(${liblzma_SOURCE_DIR}/src/liblzma/api)
 
 # Build GNUTLS libnettle
-FetchContent_Declare(
+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
-        URL https://ftp.gnu.org/gnu/nettle/nettle-3.9.1.tar.gz
-        URL_MD5 29fcd2dec6bf5b48e5e3ffb3cbc4779e
-        SOURCE_DIR nettle-src/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
 )
 
-FetchContent_MakeAvailable(nettle)
-set(NETTLE_DIR ${nettle_SOURCE_DIR})
-add_subdirectory(nettle)
+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)
 
 # Configure libnettle support for libarchive
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/nettle-src)
-include_directories(.)
 set(HAVE_LIBNETTLE 1)
 set(HAVE_NETTLE_AES_H 1)
 set(HAVE_NETTLE_HMAC_H 1)
@@ -58,35 +82,76 @@ 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)
 
-# Configure libarchive link's static lib
-SET(LIBARCHIVE_CUSTOM_LIBS "nettle" "liblzma")
-
+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.7.4
-        PATCH_COMMAND git apply ${CMAKE_CURRENT_LIST_DIR}/0001-Hide-symbols.patch ${CMAKE_CURRENT_LIST_DIR}/0002-Insert-link-libs.patch || cd .
+        GIT_TAG v3.8.2
+        GIT_SHALLOW 1
+        PATCH_COMMAND git apply --check -R ${LIBARCHIVE_PATCH} || git apply ${LIBARCHIVE_PATCH}
 )
 
 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
+        GIT_TAG v0.5.2
+        GIT_SHALLOW 1
 )
 
 FetchContent_MakeAvailable(Corrosion)
-corrosion_import_crate(MANIFEST_PATH ../rust/Cargo.toml)
-corrosion_add_target_local_rustflags(ehviewer_rust "-Clink-args=-Wl,-z,max-page-size=16384")
+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 border.c gifutils.c natsort/strnatcmp.c)
-target_link_libraries(${PROJECT_NAME} ehviewer_rust archive_static log jnigraphics)
+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
+)

app/src/main/cpp/archive.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Tarsin Norbin
+ * Copyright 2022-2024 Tarsin Norbin
  *
  * This file is part of EhViewer
  *
@@ -45,33 +45,29 @@ typedef struct {
 typedef struct {
     const char *filename;
     int index;
-    size_t size;
+    ssize_t size;
+    void *addr;
 } entry;
 
-pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-static archive_ctx **ctx_pool;
 #define CTX_POOL_SIZE 20
+#define MAX_PARALLEL_DECOMP 4
+#define max(a, b) ((a) > (b) ? (a) : (b))
 
-static void *mempool = NULL;
-static size_t *mempoolofs = NULL;
-static int page_size = 0;
-
-#define PAGE_ALIGN(x) ((x + page_size - 1) & ~(page_size - 1))
-
-#define MEMPOOL_ADDR_BY_SORTED_IDX(x) (mempool + (index ? mempoolofs[index - 1] : 0))
-#define MEMPOOL_SIZE (mempoolofs[entryCount - 1])
-
-#define PROT_RW (PROT_WRITE | PROT_READ)
-#define MAP_ANON_POOL (MAP_ANONYMOUS | MAP_NORESERVE | MAP_PRIVATE | MAP_UNINITIALIZED)
-
+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 bool need_encrypt = false;
 static char *passwd = NULL;
-static void *archiveAddr = NULL;
+static void *archiveAddr = MAP_FAILED;
 static size_t archiveSize = 0;
 static entry *entries = NULL;
 static size_t entryCount = 0;
+static ssize_t max_file_size = 0;
 
-const char supportExt[10][6] = {
+#define SUPPORT_EXT_COUNT 11
+
+const char supportExt[SUPPORT_EXT_COUNT][5] = {
         "jpeg",
         "jpg",
         "png",
@@ -80,6 +76,7 @@ const char supportExt[10][6] = {
         "bmp",
         "ico",
         "wbmp",
+        "heic",
         "heif",
         "avif"
 };
@@ -91,24 +88,19 @@ static inline int filename_is_playable_file(const char *name) {
     if (!dotptr++)
         return false;
     int i;
-    for (i = 0; i < 10; i++)
+    for (i = 0; i < SUPPORT_EXT_COUNT; i++)
         if (strcmp(dotptr, supportExt[i]) == 0)
             return true;
     return false;
 }
 
-static inline const char *archive_entry_pathname2(struct archive_entry *entry) {
-    const char *name = archive_entry_pathname_utf8(entry);
-    return name ? name : archive_entry_pathname(entry);
-}
-
 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_pathname2(entry));
+           filename_is_playable_file(archive_entry_pathname(entry));
 }
 
 static inline int compare_entries(const void *a, const void *b) {
@@ -117,56 +109,68 @@ static inline int compare_entries(const void *a, const void *b) {
     return strnatcmp(fa, fb);
 }
 
-static long archive_map_entries_index(archive_ctx *ctx, bool sort) {
-    long count = 0;
+#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;
     while (archive_read_next_header(ctx->arc, &ctx->entry) == ARCHIVE_OK) {
-        const char *name = archive_entry_pathname2(ctx->entry);
+        const char *name = archive_entry_pathname(ctx->entry);
         if (archive_entry_is_file(ctx->entry) && filename_is_playable_file(name)) {
             entries[count].filename = strdup(name);
             entries[count].index = count;
-            entries[count].size = archive_entry_size(ctx->entry);
+            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]);
             count++;
         }
     }
-    if (sort)
-        qsort(entries, entryCount, sizeof(entry), compare_entries);
-    return count;
+    if (sort) qsort(entries, entryCount, sizeof(entry), compare_entries);
 }
 
-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];
+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;
+        }
     }
-    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);
+    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;
+        }
     }
-    return true;
+    pthread_mutex_unlock(&buffer_mutex);
+    free(buffer);
 }
 
-#define ADDR_IN_FILE_MAPPING(addr) (addr >= archiveAddr && addr < archiveAddr + archiveSize)
-
-static void mempool_release_pages(void *addr, size_t size) {
-    size = PAGE_ALIGN(size);
-    madvise_log_if_error(addr, size, MADV_DONTNEED);
-}
-
-static bool kernel_can_prefault = true;
-
-static void mempool_prefault_pages(void *addr, size_t size) {
-    size = PAGE_ALIGN(size);
-    if (kernel_can_prefault) {
-        if (madvise(addr, size, MADV_POPULATE_WRITE)) kernel_can_prefault = false;
-    }
-}
-
-static long archive_list_all_entries(archive_ctx *ctx) {
-    long count = 0;
+static int archive_list_all_entries(archive_ctx *ctx) {
+    int count = 0;
     while (archive_read_next_header(ctx->arc, &ctx->entry) == ARCHIVE_OK)
         if (archive_entry_is_playable(ctx->entry))
             count++;
@@ -181,18 +185,10 @@ static void archive_release_ctx(archive_ctx *ctx) {
     }
 }
 
-static int archive_alloc_ctx(archive_ctx **ctxptr) {
-    archive_ctx *ctx;
-    int err;
-    ctx = calloc(1, sizeof(archive_ctx));
-    if (!ctx)
-        return -ENOMEM;
+static archive_ctx *archive_alloc_ctx() {
+    archive_ctx *ctx = calloc(1, sizeof(archive_ctx));
     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);
@@ -202,14 +198,14 @@ static int archive_alloc_ctx(archive_ctx **ctxptr) {
     archive_read_set_option(ctx->arc, "zip", "ignorecrc32", "1");
     if (passwd)
         archive_read_add_passphrase(ctx->arc, passwd);
-    err = archive_read_open_memory(ctx->arc, archiveAddr, archiveSize);
-    if (err) {
+    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));
         archive_read_free(ctx->arc);
         free(ctx);
-        return err;
+        return NULL;
     }
-    *ctxptr = ctx;
-    return 0;
+    return ctx;
 }
 
 static int archive_skip_to_index(archive_ctx *ctx, int index) {
@@ -226,7 +222,7 @@ 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(&mutex);
+    pthread_mutex_lock(&ctx_pool_mutex);
     for (int i = 0; i < CTX_POOL_SIZE; i++) {
         if (!ctx_pool[i])
             continue;
@@ -241,16 +237,14 @@ static int archive_get_ctx(archive_ctx **ctxptr, int idx) {
     }
     if (ctx)
         ctx->using = 1;
-    pthread_mutex_unlock(&mutex);
+    pthread_mutex_unlock(&ctx_pool_mutex);
 
     if (!ctx) {
         archive_ctx *victimCtx = NULL;
         int victimIdx = 0;
         int replace = 1;
-        ret = archive_alloc_ctx(&ctx);
-        if (ret)
-            return ret;
-        pthread_mutex_lock(&mutex);
+        ctx = archive_alloc_ctx();
+        pthread_mutex_lock(&ctx_pool_mutex);
         for (int i = 0; i < CTX_POOL_SIZE; i++) {
             if (!ctx_pool[i]) {
                 ctx_pool[i] = ctx;
@@ -265,13 +259,13 @@ static int archive_get_ctx(archive_ctx **ctxptr, int idx) {
             }
         }
         if (replace) ctx_pool[victimIdx] = ctx;
-        pthread_mutex_unlock(&mutex);
+        pthread_mutex_unlock(&ctx_pool_mutex);
         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;
     }
@@ -283,7 +277,6 @@ JNIEXPORT jint JNICALL
 Java_com_hippo_ehviewer_jni_ArchiveKt_openArchive(JNIEnv *env, jclass thiz, jint fd, jlong size, jboolean sort_entries) {
     EH_UNUSED(env);
     EH_UNUSED(thiz);
-    page_size = getpagesize();
     archive_ctx *ctx = NULL;
     archiveAddr = mmap(0, size, PROT_READ, MAP_PRIVATE, fd, 0);
     if (archiveAddr == MAP_FAILED) {
@@ -292,109 +285,74 @@ Java_com_hippo_ehviewer_jni_ArchiveKt_openArchive(JNIEnv *env, jclass thiz, jint
     }
     archiveSize = size;
     ctx_pool = calloc(CTX_POOL_SIZE, sizeof(archive_ctx **));
-    if (!ctx_pool) {
-        LOGE("Allocate archive ctx pool failed:ENOMEM");
+    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);
         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");
-        if (!entryCount) {
-            LOGE("%s%s", "Archive open failed:", archive_error_string(ctx->arc));
-            archive_release_ctx(ctx);
-            return 0;
-        }
 
-        // 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:;
-        }
+    // 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;
     }
 
-    archive_release_ctx(ctx);
-
-    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, sort_entries);
-        if (!archive_prealloc_mempool()) {
-            r = 0;
-            for (int i = 0; i < entryCount; ++i) {
-                free((void *) entries[i].filename);
-            }
-            free(entries);
-        }
+    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);
-    return r;
+
+    ctx = archive_alloc_ctx();
+    if (!ctx) return 0;
+    entries = calloc(entryCount, sizeof(entry));
+    archive_map_entries_index(ctx, sort_entries);
+    archive_release_ctx(ctx);
+    return (int) entryCount;
 }
 
 JNIEXPORT jobject JNICALL
 Java_com_hippo_ehviewer_jni_ArchiveKt_extractToByteBuffer(JNIEnv *env, jclass thiz, jint index) {
     EH_UNUSED(env);
     EH_UNUSED(thiz);
-    void *addr = MEMPOOL_ADDR_BY_SORTED_IDX(index);
-    size_t size = entries[index].size;
-    index = entries[index].index;
-    archive_ctx *ctx = NULL;
-    int ret = archive_get_ctx(&ctx, index);
-    if (ret) return 0;
-    void *buffer = NULL;
-    size_t buffer_size = 0;
-    la_int64_t output_ofs = 0;
-    archive_read_data_block(ctx->arc, (const void **) &buffer, &buffer_size, &output_ofs);
-    bool zero_copy = ADDR_IN_FILE_MAPPING(buffer) && !output_ofs && buffer_size == size;
-    if (zero_copy) {
-        ctx->using = 0;
-        return (*env)->NewDirectByteBuffer(env, buffer, buffer_size);
+    entry *entry = &entries[index];
+    ssize_t size = entry->size;
+    if (entry->addr) {
+        return (*env)->NewDirectByteBuffer(env, entry->addr, size);
     } else {
-        size_t bytes = 0;
-        mempool_prefault_pages(addr, size);
-        do {
-            memcpy(addr + output_ofs, buffer, buffer_size);
-            bytes += buffer_size;
-            ret = archive_read_data_block(ctx->arc, (const void **) &buffer, &buffer_size, &output_ofs);
-        } while (bytes != size && !ret);
-        ctx->using = 0;
-        if (bytes == size) {
-            return (*env)->NewDirectByteBuffer(env, addr, size);
-        } else {
-            if (ret < 0) {
-                LOGE("%s%s", "Archive read failed:", archive_error_string(ctx->arc));
+        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 {
-                LOGE("%s", "No enough data read, WTF?");
+                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);
         }
-        mempool_release_pages(addr, size);
     }
     return 0;
 }
@@ -403,19 +361,31 @@ JNIEXPORT void JNICALL
 Java_com_hippo_ehviewer_jni_ArchiveKt_closeArchive(JNIEnv *env, jclass thiz) {
     EH_UNUSED(env);
     EH_UNUSED(thiz);
-    for (int i = 0; i < CTX_POOL_SIZE; i++)
-        archive_release_ctx(ctx_pool[i]);
+    if (ctx_pool) {
+        for (int i = 0; i < CTX_POOL_SIZE; i++)
+            archive_release_ctx(ctx_pool[i]);
+        free(ctx_pool);
+        ctx_pool = NULL;
+    }
     free(passwd);
-    free(ctx_pool);
     passwd = NULL;
     need_encrypt = false;
-    munmap(archiveAddr, archiveSize);
-    munmap(mempool, MEMPOOL_SIZE);
-    free(mempoolofs);
-    for (int i = 0; i < entryCount; ++i) {
-        free((void *) entries[i].filename);
+    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;
     }
-    free(entries);
 }
 
 JNIEXPORT jboolean JNICALL
@@ -432,21 +402,18 @@ Java_com_hippo_ehviewer_jni_ArchiveKt_providePassword(JNIEnv *env, jclass thiz,
     archive_ctx *ctx;
     jboolean ret = true;
     int len = (*env)->GetStringUTFLength(env, str);
-    passwd = realloc(passwd, len * sizeof(char));
-    if (!passwd) {
-        LOGE("Allocate passwd buffer failed");
-        return false;
-    }
+    passwd = realloc(passwd, len + 1);
     (*env)->GetStringUTFRegion(env, str, 0, len, passwd);
-    archive_alloc_ctx(&ctx);
-    void *tmpBuf = alloca(4096);
+    passwd[len] = 0;
+    ctx = archive_alloc_ctx();
+    char tmpBuf[4096];
     while (archive_read_next_header(ctx->arc, &entry) == ARCHIVE_OK) {
         if (!archive_entry_is_playable(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;
@@ -482,11 +449,12 @@ JNIEXPORT void JNICALL
 Java_com_hippo_ehviewer_jni_ArchiveKt_releaseByteBuffer(JNIEnv *env, jclass thiz, jobject buffer) {
     EH_UNUSED(thiz);
     void *addr = (*env)->GetDirectBufferAddress(env, buffer);
-    size_t size = (*env)->GetDirectBufferCapacity(env, buffer);
-    if (!ADDR_IN_FILE_MAPPING(addr)) mempool_release_pages(addr, size);
+    if (!ADDR_IN_FILE_MAPPING(addr)) {
+        release_decode_buffer(addr);
+    }
 }
 
-JNIEXPORT jboolean JNICALL
+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();
@@ -508,15 +476,15 @@ Java_com_hippo_ehviewer_jni_ArchiveKt_archiveFdBatch(JNIEnv *env, jclass clazz,
         archive_entry_copy_stat(entry, &st);
         archive_entry_set_perm(entry, 0644);
         archive_write_header(arc, entry);
-        int len = read(fd, buff, sizeof(buff));
-        while (len > 0) {
-            archive_write_data(arc, buff, len);
+        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);
-    return true;
 }

app/src/main/cpp/border.c

@@ -1,241 +0,0 @@
-#include <jni.h>
-#include <math.h>
-#include <stdbool.h>
-#include <android/bitmap.h>
-#include <stdlib.h>
-#include <string.h>
-
-/** A line will be considered as having content if 0.25% of it is filled. */
-const float filledRatioLimit = 0.0025;
-
-/** When the threshold is closer to 1, less content will be cropped. **/
-#define THRESHOLD 0.75
-
-const uint8_t thresholdForBlack = (uint8_t) (255.0 * THRESHOLD);
-
-const uint8_t thresholdForWhite = (uint8_t) (255.0 - 255.0 * THRESHOLD);
-
-static uint8_t inline grey(uint32_t pixel) {
-    const uint8_t r = ((uint8_t *) &pixel)[0];
-    const uint8_t g = ((uint8_t *) &pixel)[1];
-    const uint8_t b = ((uint8_t *) &pixel)[2];
-    return (r * 77 + g * 151 + b * 28) >> 8;
-}
-
-static bool inline isBlackPixel(const uint32_t *pixels, uint32_t width, uint32_t x, uint32_t y) {
-    const uint32_t pixel = *((uint32_t *) pixels + (y * width + x));
-    return grey(pixel) < thresholdForBlack;
-}
-
-static bool inline isWhitePixel(const uint32_t *pixels, uint32_t width, uint32_t x, uint32_t y) {
-    const uint32_t pixel = *((uint32_t *) pixels + (y * width + x));
-    return grey(pixel) > thresholdForWhite;
-}
-
-/** Return the first x position where there is a substantial amount of fill,
- * starting the search from the left. */
-uint32_t findBorderLeft(uint32_t *pixels, uint32_t width, uint32_t height,
-                        uint32_t top, uint32_t bottom) {
-    int x, y;
-    const uint32_t filledLimit = round(height * filledRatioLimit / 2);
-
-    // Scan first line to detect dominant color
-    uint32_t whitePixels = 0;
-    uint32_t blackPixels = 0;
-
-    for (y = top; y < bottom; y += 2) {
-        if (isBlackPixel(pixels, width, 0, y)) {
-            blackPixels++;
-        } else if (isWhitePixel(pixels, width, 0, y)) {
-            whitePixels++;
-        }
-    }
-
-    bool (*detectFunc)(const uint32_t *, uint32_t, uint32_t, uint32_t) = isBlackPixel;
-    if (whitePixels > filledLimit && blackPixels > filledLimit) {
-        // Mixed fill found... don't crop anything
-        return 0;
-    } else if (blackPixels > filledLimit) {
-        detectFunc = isWhitePixel;
-    }
-
-    // Scan vertical lines in search of filled lines
-    for (x = 1; x < width; x++) {
-        uint32_t filledCount = 0;
-
-        for (y = top; y < bottom; y += 2) {
-            if (detectFunc(pixels, width, x, y)) {
-                filledCount++;
-            }
-        }
-
-        if (filledCount > filledLimit) {
-            // This line contains enough fill
-            return x;
-        }
-    }
-
-    // No fill found... don't crop anything
-    return 0;
-}
-
-/** Return the first x position where there is a substantial amount of fill,
- * starting the search from the right. */
-uint32_t findBorderRight(uint32_t *pixels, uint32_t width, uint32_t height,
-                         uint32_t top, uint32_t bottom) {
-    int x, y;
-    const uint32_t filledLimit = round(height * filledRatioLimit / 2);
-
-    // Scan first line to detect dominant color
-    uint32_t whitePixels = 0;
-    uint32_t blackPixels = 0;
-
-    uint32_t lastX = width - 1;
-    for (y = top; y < bottom; y += 2) {
-        if (isBlackPixel(pixels, width, lastX, y)) {
-            blackPixels++;
-        } else if (isWhitePixel(pixels, width, lastX, y)) {
-            whitePixels++;
-        }
-    }
-
-    bool (*detectFunc)(const uint32_t *, uint32_t, uint32_t, uint32_t) = isBlackPixel;
-    if (whitePixels > filledLimit && blackPixels > filledLimit) {
-        // Mixed fill found... don't crop anything
-        return width;
-    } else if (blackPixels > filledLimit) {
-        detectFunc = isWhitePixel;
-    }
-
-    // Scan vertical lines in search of filled lines
-    for (x = width - 2; x > 0; x--) {
-        uint32_t filledCount = 0;
-
-        for (y = top; y < bottom; y += 2) {
-            if (detectFunc(pixels, width, x, y)) {
-                filledCount++;
-            }
-        }
-
-        if (filledCount > filledLimit) {
-            // This line contains enough fill
-            return x + 1;
-        }
-    }
-
-    // No fill found... don't crop anything
-    return width;
-}
-
-/** Return the first y position where there is a substantial amount of fill,
- * starting the search from the top. */
-uint32_t findBorderTop(uint32_t *pixels, uint32_t width, uint32_t height) {
-    int x, y;
-    const uint32_t filledLimit = round(width * filledRatioLimit / 2);
-
-    // Scan first line to detect dominant color
-    uint32_t whitePixels = 0;
-    uint32_t blackPixels = 0;
-
-    for (x = 0; x < width; x += 2) {
-        if (isBlackPixel(pixels, width, x, 0)) {
-            blackPixels++;
-        } else if (isWhitePixel(pixels, width, x, 0)) {
-            whitePixels++;
-        }
-    }
-
-    bool (*detectFunc)(const uint32_t *, uint32_t, uint32_t, uint32_t) = isBlackPixel;
-    if (whitePixels > filledLimit && blackPixels > filledLimit) {
-        // Mixed fill found... don't crop anything
-        return 0;
-    } else if (blackPixels > filledLimit) {
-        detectFunc = isWhitePixel;
-    }
-
-    // Scan horizontal lines in search of filled lines
-    for (y = 1; y < height; y++) {
-        uint32_t filledCount = 0;
-
-        for (x = 0; x < width; x += 2) {
-            if (detectFunc(pixels, width, x, y)) {
-                filledCount++;
-            }
-        }
-
-        if (filledCount > filledLimit) {
-            // This line contains enough fill
-            return y;
-        }
-    }
-
-    // No fill found... don't crop anything
-    return 0;
-}
-
-/** Return the first y position where there is a substantial amount of fill,
- * starting the search from the bottom. */
-uint32_t findBorderBottom(uint32_t *pixels, uint32_t width, uint32_t height) {
-    int x, y;
-    const uint32_t filledLimit = round(width * filledRatioLimit / 2);
-
-    // Scan first line to detect dominant color
-    uint32_t whitePixels = 0;
-    uint32_t blackPixels = 0;
-    uint32_t lastY = height - 1;
-
-    for (x = 0; x < width; x += 2) {
-        if (isBlackPixel(pixels, width, x, lastY)) {
-            blackPixels++;
-        } else if (isWhitePixel(pixels, width, x, lastY)) {
-            whitePixels++;
-        }
-    }
-
-    bool (*detectFunc)(const uint32_t *, uint32_t, uint32_t, uint32_t) = isBlackPixel;
-    if (whitePixels > filledLimit && blackPixels > filledLimit) {
-        // Mixed fill found... don't crop anything
-        return height;
-    } else if (blackPixels > filledLimit) {
-        detectFunc = isWhitePixel;
-    }
-
-    // Scan horizontal lines in search of filled lines
-    for (y = height - 2; y > 0; y--) {
-        uint32_t filledCount = 0;
-
-        for (x = 0; x < width; x += 2) {
-            if (detectFunc(pixels, width, x, y)) {
-                filledCount++;
-            }
-        }
-
-        if (filledCount > filledLimit) {
-            // This line contains enough fill
-            return y + 1;
-        }
-    }
-
-    // No fill found... don't crop anything
-    return height;
-}
-
-JNIEXPORT jintArray JNICALL
-Java_com_hippo_ehviewer_image_ImageKt_detectBorder(JNIEnv *env, jclass clazz, jobject bitmap) {
-    void *pixels = NULL;
-    AndroidBitmapInfo info;
-    memset(&info, 0, sizeof(info));
-    AndroidBitmap_getInfo(env, bitmap, &info);
-    AndroidBitmap_lockPixels(env, bitmap, &pixels);
-    uint32_t width = info.width;
-    uint32_t height = info.height;
-    uint32_t top = findBorderTop(pixels, width, height);
-    uint32_t bottom = findBorderBottom(pixels, width, height);
-    uint32_t left = findBorderLeft(pixels, width, height, top, bottom);
-    uint32_t right = findBorderRight(pixels, width, height, top, bottom);
-    int array[4] = {left, top, right, bottom};
-    AndroidBitmap_unlockPixels(env, bitmap);
-    jintArray ret = (*env)->NewIntArray(env, 4);
-    (*env)->SetIntArrayRegion(env, ret, 0, 4, array);
-    return ret;
-}

app/src/main/cpp/configure_nettle.sh

@@ -0,0 +1,13 @@
+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

app/src/main/cpp/gifutils.c

@@ -37,7 +37,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;

app/src/main/cpp/hash.c

@@ -0,0 +1,39 @@
+#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);
+}

app/src/main/cpp/libehviewer.map.txt

@@ -0,0 +1,7 @@
+{
+  global:
+    JNI_OnLoad;
+    Java_*;
+  local:
+    *;
+};

app/src/main/cpp/natsort/strnatcmp.c

@@ -30,7 +30,6 @@
  * negative chars in their default char type.
  */
 
-#include <stddef.h>     /* size_t */
 #include <ctype.h>
 
 #include "strnatcmp.h"
@@ -39,28 +38,21 @@
 /* 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(nat_char a)
+nat_isdigit(const char *a)
 {
-     return isdigit((unsigned char) a);
+     return isdigit((unsigned char) *a);
 }
 
 
 static inline int
-nat_isspace(nat_char a)
+nat_isspace(const char *a)
 {
-     return isspace((unsigned char) a);
-}
-
-
-static inline nat_char
-nat_toupper(nat_char a)
-{
-     return toupper((unsigned char) a);
+     return isspace((unsigned char) *a) || *a == '0' && nat_isdigit(a + 1);
 }
 
 
 static int
-compare_right(nat_char const *a, nat_char const *b)
+compare_right(const char *a, const char *b)
 {
      int bias = 0;
 
@@ -69,11 +61,11 @@ compare_right(nat_char const *a, nat_char const *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)
@@ -87,60 +79,38 @@ compare_right(nat_char const *a, nat_char const *b)
 }
 
 
-static int
-strnatcmp0(nat_char const *a, nat_char const *b, int fold_case)
+int
+strnatcmp(const char *a, const char *b)
 {
-     int ai, bi;
-     nat_char ca, cb;
-     int result;
+    int result;
 
-     ai = bi = 0;
-     while (1) {
-          ca = a[ai]; cb = b[bi];
+    while (1) {
+         /* skip over leading spaces or zeros */
+          while (nat_isspace(a))
+               a++;
 
-          /* skip over leading spaces or zeros */
-          while (nat_isspace(ca) || ca == '0')
-               ca = a[++ai];
-
-          while (nat_isspace(cb) || cb == '0')
-               cb = b[++bi];
+          while (nat_isspace(b))
+               b++;
 
           /* process run of digits */
-          if (nat_isdigit(ca)  &&  nat_isdigit(cb)) {
-               if ((result = compare_right(a+ai, b+bi)) != 0)
+          if (nat_isdigit(a)  &&  nat_isdigit(b)) {
+               if ((result = compare_right(a, b)) != 0)
                     return result;
           }
 
-          if (!ca && !cb) {
+          if (!*a && !*b) {
                /* The strings compare the same.  Perhaps the caller
                   will want to call strcmp to break the tie. */
                return 0;
           }
 
-          if (fold_case) {
-               ca = nat_toupper(ca);
-               cb = nat_toupper(cb);
-          }
-
-          if (ca < cb)
+          if (*a < *b)
                return -1;
 
-          if (ca > cb)
+          if (*a > *b)
                return +1;
 
-          ++ai; ++bi;
+          a++; b++;
      }
 }
 
-
-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);
-}

app/src/main/cpp/natsort/strnatcmp.h

@@ -24,14 +24,7 @@
 extern "C" {
 #endif
 
-/* 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);
+int strnatcmp(const char *a, const char *b);
 
 #ifdef __cplusplus
 }

app/src/main/cpp/nettle/CMakeLists.txt

@@ -1,238 +0,0 @@
-cmake_minimum_required(VERSION 3.4.1)
-project(nettle C)
-
-set(LIBNETTLE_DEFINITIONS
-        -DHAVE_CONFIG_H)
-
-set(LIBNETTLE_SOURCES
-        ${NETTLE_DIR}/aes-decrypt-internal.c
-        ${NETTLE_DIR}/aes-decrypt.c
-        ${NETTLE_DIR}/aes-decrypt-table.c
-        ${NETTLE_DIR}/aes128-decrypt.c
-        ${NETTLE_DIR}/aes192-decrypt.c
-        ${NETTLE_DIR}/aes256-decrypt.c
-        ${NETTLE_DIR}/aes-encrypt-internal.c
-        ${NETTLE_DIR}/aes-encrypt.c
-        ${NETTLE_DIR}/aes-encrypt-table.c
-        ${NETTLE_DIR}/aes128-encrypt.c
-        ${NETTLE_DIR}/aes192-encrypt.c
-        ${NETTLE_DIR}/aes256-encrypt.c
-        ${NETTLE_DIR}/aes-invert-internal.c
-        ${NETTLE_DIR}/aes-set-key-internal.c
-        ${NETTLE_DIR}/aes-set-encrypt-key.c
-        ${NETTLE_DIR}/aes-set-decrypt-key.c
-        ${NETTLE_DIR}/aes128-set-encrypt-key.c
-        ${NETTLE_DIR}/aes128-set-decrypt-key.c
-        ${NETTLE_DIR}/aes128-meta.c
-        ${NETTLE_DIR}/aes192-set-encrypt-key.c
-        ${NETTLE_DIR}/aes192-set-decrypt-key.c
-        ${NETTLE_DIR}/aes192-meta.c
-        ${NETTLE_DIR}/aes256-set-encrypt-key.c
-        ${NETTLE_DIR}/aes256-set-decrypt-key.c
-        ${NETTLE_DIR}/aes256-meta.c
-        ${NETTLE_DIR}/nist-keywrap.c
-        ${NETTLE_DIR}/arcfour.c
-        ${NETTLE_DIR}/arctwo.c
-        ${NETTLE_DIR}/arctwo-meta.c
-        ${NETTLE_DIR}/blowfish.c
-        ${NETTLE_DIR}/blowfish-bcrypt.c
-        ${NETTLE_DIR}/base16-encode.c
-        ${NETTLE_DIR}/base16-decode.c
-        ${NETTLE_DIR}/base16-meta.c
-        ${NETTLE_DIR}/base64-encode.c
-        ${NETTLE_DIR}/base64-decode.c
-        ${NETTLE_DIR}/base64-meta.c
-        ${NETTLE_DIR}/base64url-encode.c
-        ${NETTLE_DIR}/base64url-decode.c
-        ${NETTLE_DIR}/base64url-meta.c
-        ${NETTLE_DIR}/buffer.c
-        ${NETTLE_DIR}/buffer-init.c
-        ${NETTLE_DIR}/camellia-crypt-internal.c
-        ${NETTLE_DIR}/camellia-table.c
-        ${NETTLE_DIR}/camellia-absorb.c
-        ${NETTLE_DIR}/camellia-invert-key.c
-        ${NETTLE_DIR}/camellia128-set-encrypt-key.c
-        ${NETTLE_DIR}/camellia128-crypt.c
-        ${NETTLE_DIR}/camellia128-set-decrypt-key.c
-        ${NETTLE_DIR}/camellia128-meta.c
-        ${NETTLE_DIR}/camellia192-meta.c
-        ${NETTLE_DIR}/camellia256-set-encrypt-key.c
-        ${NETTLE_DIR}/camellia256-crypt.c
-        ${NETTLE_DIR}/camellia256-set-decrypt-key.c
-        ${NETTLE_DIR}/camellia256-meta.c
-        ${NETTLE_DIR}/cast128.c
-        ${NETTLE_DIR}/cast128-meta.c
-        ${NETTLE_DIR}/cbc.c
-        ${NETTLE_DIR}/cbc-aes128-encrypt.c
-        ${NETTLE_DIR}/cbc-aes192-encrypt.c
-        ${NETTLE_DIR}/cbc-aes256-encrypt.c
-        ${NETTLE_DIR}/ccm.c
-        ${NETTLE_DIR}/ccm-aes128.c
-        ${NETTLE_DIR}/ccm-aes192.c
-        ${NETTLE_DIR}/ccm-aes256.c
-        ${NETTLE_DIR}/cfb.c
-        ${NETTLE_DIR}/siv-cmac.c
-        ${NETTLE_DIR}/siv-cmac-aes128.c
-        ${NETTLE_DIR}/siv-cmac-aes256.c
-        ${NETTLE_DIR}/cnd-memcpy.c
-        ${NETTLE_DIR}/chacha-crypt.c
-        ${NETTLE_DIR}/chacha-core-internal.c
-        ${NETTLE_DIR}/chacha-poly1305.c
-        ${NETTLE_DIR}/chacha-poly1305-meta.c
-        ${NETTLE_DIR}/chacha-set-key.c
-        ${NETTLE_DIR}/chacha-set-nonce.c
-        ${NETTLE_DIR}/ctr.c
-        ${NETTLE_DIR}/ctr16.c
-        ${NETTLE_DIR}/des.c
-        ${NETTLE_DIR}/des3.c
-        ${NETTLE_DIR}/eax.c
-        ${NETTLE_DIR}/eax-aes128.c
-        ${NETTLE_DIR}/eax-aes128-meta.c
-        ${NETTLE_DIR}/ghash-set-key.c
-        ${NETTLE_DIR}/ghash-update.c
-        ${NETTLE_DIR}/gcm.c
-        ${NETTLE_DIR}/gcm-aes.c
-        ${NETTLE_DIR}/gcm-aes128.c
-        ${NETTLE_DIR}/gcm-aes128-meta.c
-        ${NETTLE_DIR}/gcm-aes192.c
-        ${NETTLE_DIR}/gcm-aes192-meta.c
-        ${NETTLE_DIR}/gcm-aes256.c
-        ${NETTLE_DIR}/gcm-aes256-meta.c
-        ${NETTLE_DIR}/gcm-camellia128.c
-        ${NETTLE_DIR}/gcm-camellia128-meta.c
-        ${NETTLE_DIR}/gcm-camellia256.c
-        ${NETTLE_DIR}/gcm-camellia256-meta.c
-        ${NETTLE_DIR}/cmac.c
-        ${NETTLE_DIR}/cmac64.c
-        ${NETTLE_DIR}/cmac-aes128.c
-        ${NETTLE_DIR}/cmac-aes256.c
-        ${NETTLE_DIR}/cmac-des3.c
-        ${NETTLE_DIR}/cmac-aes128-meta.c
-        ${NETTLE_DIR}/cmac-aes256-meta.c
-        ${NETTLE_DIR}/cmac-des3-meta.c
-        ${NETTLE_DIR}/gost28147.c
-        ${NETTLE_DIR}/gosthash94.c
-        ${NETTLE_DIR}/gosthash94-meta.c
-        ${NETTLE_DIR}/hmac.c
-        ${NETTLE_DIR}/hmac-gosthash94.c
-        ${NETTLE_DIR}/hmac-md5.c
-        ${NETTLE_DIR}/hmac-ripemd160.c
-        ${NETTLE_DIR}/hmac-sha1.c
-        ${NETTLE_DIR}/hmac-sha224.c
-        ${NETTLE_DIR}/hmac-sha256.c
-        ${NETTLE_DIR}/hmac-sha384.c
-        ${NETTLE_DIR}/hmac-sha512.c
-        ${NETTLE_DIR}/hmac-streebog.c
-        ${NETTLE_DIR}/hmac-sm3.c
-        ${NETTLE_DIR}/hmac-md5-meta.c
-        ${NETTLE_DIR}/hmac-ripemd160-meta.c
-        ${NETTLE_DIR}/hmac-sha1-meta.c
-        ${NETTLE_DIR}/hmac-sha224-meta.c
-        ${NETTLE_DIR}/hmac-sha256-meta.c
-        ${NETTLE_DIR}/hmac-sha384-meta.c
-        ${NETTLE_DIR}/hmac-sha512-meta.c
-        ${NETTLE_DIR}/hmac-streebog-meta.c
-        ${NETTLE_DIR}/hmac-sm3-meta.c
-        ${NETTLE_DIR}/knuth-lfib.c
-        ${NETTLE_DIR}/hkdf.c
-        ${NETTLE_DIR}/md2.c
-        ${NETTLE_DIR}/md2-meta.c
-        ${NETTLE_DIR}/md4.c
-        ${NETTLE_DIR}/md4-meta.c
-        ${NETTLE_DIR}/md5.c
-        ${NETTLE_DIR}/md5-compress.c
-        ${NETTLE_DIR}/md5-compat.c
-        ${NETTLE_DIR}/md5-meta.c
-        ${NETTLE_DIR}/memeql-sec.c
-        ${NETTLE_DIR}/memxor.c
-        ${NETTLE_DIR}/memxor3.c
-        ${NETTLE_DIR}/nettle-lookup-hash.c
-        ${NETTLE_DIR}/nettle-meta-aeads.c
-        ${NETTLE_DIR}/nettle-meta-armors.c
-        ${NETTLE_DIR}/nettle-meta-ciphers.c
-        ${NETTLE_DIR}/nettle-meta-hashes.c
-        ${NETTLE_DIR}/nettle-meta-macs.c
-        ${NETTLE_DIR}/pbkdf2.c
-        ${NETTLE_DIR}/pbkdf2-hmac-gosthash94.c
-        ${NETTLE_DIR}/pbkdf2-hmac-sha1.c
-        ${NETTLE_DIR}/pbkdf2-hmac-sha256.c
-        ${NETTLE_DIR}/pbkdf2-hmac-sha384.c
-        ${NETTLE_DIR}/pbkdf2-hmac-sha512.c
-        ${NETTLE_DIR}/poly1305-aes.c
-        ${NETTLE_DIR}/poly1305-internal.c
-        ${NETTLE_DIR}/realloc.c
-        ${NETTLE_DIR}/ripemd160.c
-        ${NETTLE_DIR}/ripemd160-compress.c
-        ${NETTLE_DIR}/ripemd160-meta.c
-        ${NETTLE_DIR}/salsa20-core-internal.c
-        ${NETTLE_DIR}/salsa20-crypt-internal.c
-        ${NETTLE_DIR}/salsa20-crypt.c
-        ${NETTLE_DIR}/salsa20r12-crypt.c
-        ${NETTLE_DIR}/salsa20-set-key.c
-        ${NETTLE_DIR}/salsa20-set-nonce.c
-        ${NETTLE_DIR}/salsa20-128-set-key.c
-        ${NETTLE_DIR}/salsa20-256-set-key.c
-        ${NETTLE_DIR}/sha1.c
-        ${NETTLE_DIR}/sha1-compress.c
-        ${NETTLE_DIR}/sha1-meta.c
-        ${NETTLE_DIR}/sha256.c
-        ${NETTLE_DIR}/sha256-compress-n.c
-        ${NETTLE_DIR}/sha224-meta.c
-        ${NETTLE_DIR}/sha256-meta.c
-        ${NETTLE_DIR}/sha512.c
-        ${NETTLE_DIR}/sha512-compress.c
-        ${NETTLE_DIR}/sha384-meta.c
-        ${NETTLE_DIR}/sha512-meta.c
-        ${NETTLE_DIR}/sha512-224-meta.c
-        ${NETTLE_DIR}/sha512-256-meta.c
-        ${NETTLE_DIR}/sha3.c
-        ${NETTLE_DIR}/sha3-permute.c
-        ${NETTLE_DIR}/sha3-224.c
-        ${NETTLE_DIR}/sha3-224-meta.c
-        ${NETTLE_DIR}/sha3-256.c
-        ${NETTLE_DIR}/sha3-256-meta.c
-        ${NETTLE_DIR}/sha3-384.c
-        ${NETTLE_DIR}/sha3-384-meta.c
-        ${NETTLE_DIR}/sha3-512.c
-        ${NETTLE_DIR}/sha3-512-meta.c
-        ${NETTLE_DIR}/shake256.c
-        ${NETTLE_DIR}/sm3.c
-        ${NETTLE_DIR}/sm3-meta.c
-        ${NETTLE_DIR}/serpent-set-key.c
-        ${NETTLE_DIR}/serpent-encrypt.c
-        ${NETTLE_DIR}/serpent-decrypt.c
-        ${NETTLE_DIR}/serpent-meta.c
-        ${NETTLE_DIR}/streebog.c
-        ${NETTLE_DIR}/streebog-meta.c
-        ${NETTLE_DIR}/twofish.c
-        ${NETTLE_DIR}/twofish-meta.c
-        ${NETTLE_DIR}/umac-nh.c
-        ${NETTLE_DIR}/umac-nh-n.c
-        ${NETTLE_DIR}/umac-l2.c
-        ${NETTLE_DIR}/umac-l3.c
-        ${NETTLE_DIR}/umac-poly64.c
-        ${NETTLE_DIR}/umac-poly128.c
-        ${NETTLE_DIR}/umac-set-key.c
-        ${NETTLE_DIR}/umac32.c
-        ${NETTLE_DIR}/umac64.c
-        ${NETTLE_DIR}/umac96.c
-        ${NETTLE_DIR}/umac128.c
-        ${NETTLE_DIR}/version.c
-        ${NETTLE_DIR}/write-be32.c
-        ${NETTLE_DIR}/write-le32.c
-        ${NETTLE_DIR}/write-le64.c
-        ${NETTLE_DIR}/yarrow256.c
-        ${NETTLE_DIR}/yarrow_key_event.c
-        ${NETTLE_DIR}/xts.c
-        ${NETTLE_DIR}/xts-aes128.c
-        ${NETTLE_DIR}/xts-aes256.c
-        )
-
-set(LIBNETTLE_INCLUDES
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${NETTLE_DIR}
-        )
-
-add_library(nettle STATIC ${LIBNETTLE_SOURCES})
-target_include_directories(nettle PUBLIC ${LIBNETTLE_INCLUDES})
-target_compile_definitions(nettle PRIVATE ${LIBNETTLE_DEFINITIONS})

app/src/main/cpp/nettle/config.h

@@ -1,280 +0,0 @@
-/* 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 one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-/* #undef CRAY_STACKSEG_END */
-
-/* Define to 1 if using `alloca.c'. */
-/* #undef C_ALLOCA */
-
-/* Define to 1 if you have `alloca', as a function or macro. */
-#define HAVE_ALLOCA 1
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
-#define HAVE_ALLOCA_H 1
-
-/* Define if __builtin_bswap64 is available */
-#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 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 each of the following for which a native (ie. CPU specific)
-    implementation of the corresponding routine exists.  */
-/* #undef HAVE_NATIVE_memxor3 */
-/* #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 */
-#define HAVE_NATIVE_chacha_3core 1
-/* #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_poly1305_set_key */
-/* #undef HAVE_NATIVE_poly1305_block */
-/* #undef HAVE_NATIVE_poly1305_digest */
-/* #undef HAVE_NATIVE_poly1305_blocks */
-/* #undef HAVE_NATIVE_fat_poly1305_blocks */
-/* #undef HAVE_NATIVE_ghash_set_key */
-/* #undef HAVE_NATIVE_ghash_update */
-/* #undef HAVE_NATIVE_salsa20_core */
-#define HAVE_NATIVE_salsa20_2core 1
-/* #undef HAVE_NATIVE_fat_salsa20_2core */
-/* #undef HAVE_NATIVE_sha1_compress */
-/* #undef HAVE_NATIVE_sha256_compress_n */
-/* #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. */
-#define HAVE_SECURE_GETENV 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <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/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.9.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.9.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 you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#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
-

app/src/main/cpp/nettle/keymap.h

@@ -1 +0,0 @@
- 

app/src/main/cpp/nettle/rotors.h

@@ -1 +0,0 @@
- 

app/src/main/cpp/nettle/version.h

@@ -1,64 +0,0 @@
-/* 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 9
-
-#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 */

app/src/main/kotlin/androidx/compose/material3/SearchBar.kt

@@ -1,106 +0,0 @@
-@file:Suppress("ktlint:standard:property-naming")
-
-package androidx.compose.material3
-
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.interaction.collectIsFocusedAsState
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.layout.sizeIn
-import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.foundation.text.input.TextFieldLineLimits
-import androidx.compose.foundation.text.input.TextFieldState
-import androidx.compose.material3.SearchBarDefaults.InputFieldHeight
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.focus.onFocusChanged
-import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.graphics.takeOrElse
-import androidx.compose.ui.platform.LocalFocusManager
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.input.ImeAction
-import androidx.compose.ui.text.input.VisualTransformation
-import androidx.compose.ui.unit.dp
-import kotlinx.coroutines.delay
-
-@Composable
-fun SearchBarInputField(
-    state: TextFieldState,
-    onSearch: () -> Unit,
-    expanded: Boolean,
-    onExpandedChange: (Boolean) -> Unit,
-    modifier: Modifier = Modifier,
-    enabled: Boolean = true,
-    label: @Composable (() -> Unit)? = null,
-    placeholder: @Composable (() -> Unit)? = null,
-    leadingIcon: @Composable (() -> Unit)? = null,
-    trailingIcon: @Composable (() -> Unit)? = null,
-    colors: TextFieldColors = SearchBarDefaults.inputFieldColors(),
-    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
-) {
-    val focusRequester = remember { FocusRequester() }
-    val focusManager = LocalFocusManager.current
-    val focused by interactionSource.collectIsFocusedAsState()
-    val textColor = LocalTextStyle.current.color.takeOrElse {
-        if (focused) colors.focusedTextColor else colors.unfocusedTextColor
-    }
-
-    BasicTextField(
-        state = state,
-        modifier = modifier.sizeIn(
-            minWidth = SearchBarMinWidth,
-            maxWidth = SearchBarMaxWidth,
-            minHeight = InputFieldHeight,
-        ).focusRequester(focusRequester).onFocusChanged {
-            if (it.isFocused) onExpandedChange(true)
-        }.fillMaxWidth(),
-        enabled = enabled,
-        lineLimits = TextFieldLineLimits.SingleLine,
-        textStyle = LocalTextStyle.current.merge(TextStyle(color = textColor)),
-        cursorBrush = SolidColor(colors.cursorColor),
-        keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
-        onKeyboardAction = { onSearch() },
-        interactionSource = interactionSource,
-        decorator = @Composable { innerTextField ->
-            TextFieldDefaults.DecorationBox(
-                value = state.text.toString(),
-                innerTextField = innerTextField,
-                enabled = enabled,
-                singleLine = true,
-                visualTransformation = VisualTransformation.None,
-                interactionSource = interactionSource,
-                label = label,
-                placeholder = placeholder,
-                leadingIcon = leadingIcon?.let { leading -> { Box(Modifier.offset(x = SearchBarIconOffsetX)) { leading() } } },
-                trailingIcon = trailingIcon?.let { trailing -> { Box(Modifier.offset(x = -SearchBarIconOffsetX)) { trailing() } } },
-                shape = SearchBarDefaults.inputFieldShape,
-                colors = colors,
-                contentPadding = TextFieldDefaults.contentPaddingWithoutLabel(),
-                container = {},
-            )
-        },
-    )
-
-    val shouldClearFocus = !expanded && focused
-    LaunchedEffect(expanded) {
-        if (shouldClearFocus) {
-            // Not strictly needed according to the motion spec, but since the animation
-            // already has a delay, this works around b/261632544.
-            delay(AnimationDelayMillis.toLong())
-            focusManager.clearFocus()
-        }
-    }
-}
-
-val SearchBarIconOffsetX = 4.dp
-val SearchBarMinWidth = 360.dp
-val SearchBarMaxWidth = 720.dp
-val SearchBarHorizontalPadding = 16.dp
-const val AnimationDelayMillis = 100

app/src/main/kotlin/com/google/accompanist/systemuicontroller/SystemUiController.kt

@@ -1,152 +0,0 @@
-/*
- * Copyright 2022 The Android Open Source Project
- *
- * 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
- *
- *      https://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.google.accompanist.systemuicontroller
-
-import android.app.Activity
-import android.content.Context
-import android.content.ContextWrapper
-import android.view.View
-import android.view.Window
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.Stable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.platform.LocalView
-import androidx.compose.ui.window.DialogWindowProvider
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.WindowInsetsControllerCompat
-
-/**
- * A class which provides easy-to-use utilities for updating the System UI bar
- * colors within Jetpack Compose.
- */
-@Stable
-interface SystemUiController {
-
-    /**
-     * Control for the behavior of the system bars. This value should be one of the
-     * [WindowInsetsControllerCompat] behavior constants:
-     * [WindowInsetsControllerCompat.BEHAVIOR_SHOW_BARS_BY_TOUCH] (Deprecated),
-     * [WindowInsetsControllerCompat.BEHAVIOR_DEFAULT] and
-     * [WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE].
-     */
-    var systemBarsBehavior: Int
-
-    /**
-     * Property which holds the status bar visibility. If set to true, show the status bar,
-     * otherwise hide the status bar.
-     */
-    var isStatusBarVisible: Boolean
-
-    /**
-     * Property which holds the navigation bar visibility. If set to true, show the navigation bar,
-     * otherwise hide the navigation bar.
-     */
-    var isNavigationBarVisible: Boolean
-
-    /**
-     * Property which holds the status & navigation bar visibility. If set to true, show both bars,
-     * otherwise hide both bars.
-     */
-    var isSystemBarsVisible: Boolean
-        get() = isNavigationBarVisible && isStatusBarVisible
-        set(value) {
-            isStatusBarVisible = value
-            isNavigationBarVisible = value
-        }
-}
-
-/**
- * Remembers a [SystemUiController] for the given [window].
- *
- * If no [window] is provided, an attempt to find the correct [Window] is made.
- *
- * First, if the [LocalView]'s parent is a [DialogWindowProvider], then that dialog's [Window] will
- * be used.
- *
- * Second, we attempt to find [Window] for the [Activity] containing the [LocalView].
- *
- * If none of these are found (such as may happen in a preview), then the functionality of the
- * returned [SystemUiController] will be degraded, but won't throw an exception.
- */
-@Composable
-fun rememberSystemUiController(
-    window: Window? = findWindow(),
-): SystemUiController {
-    val view = LocalView.current
-    return remember(view, window) { AndroidSystemUiController(view, window) }
-}
-
-@Composable
-private fun findWindow(): Window? =
-    (LocalView.current.parent as? DialogWindowProvider)?.window
-        ?: LocalView.current.context.findWindow()
-
-private tailrec fun Context.findWindow(): Window? =
-    when (this) {
-        is Activity -> window
-        is ContextWrapper -> baseContext.findWindow()
-        else -> null
-    }
-
-/**
- * A helper class for setting the navigation and status bar colors for a [View], gracefully
- * degrading behavior based upon API level.
- *
- * Typically you would use [rememberSystemUiController] to remember an instance of this.
- */
-internal class AndroidSystemUiController(
-    private val view: View,
-    window: Window?,
-) : SystemUiController {
-    private val windowInsetsController = window?.let {
-        WindowCompat.getInsetsController(it, view)
-    }
-
-    override var systemBarsBehavior: Int
-        get() = windowInsetsController?.systemBarsBehavior ?: 0
-        set(value) {
-            windowInsetsController?.systemBarsBehavior = value
-        }
-
-    override var isStatusBarVisible: Boolean
-        get() {
-            return ViewCompat.getRootWindowInsets(view)
-                ?.isVisible(WindowInsetsCompat.Type.statusBars()) == true
-        }
-        set(value) {
-            if (value) {
-                windowInsetsController?.show(WindowInsetsCompat.Type.statusBars())
-            } else {
-                windowInsetsController?.hide(WindowInsetsCompat.Type.statusBars())
-            }
-        }
-
-    override var isNavigationBarVisible: Boolean
-        get() {
-            return ViewCompat.getRootWindowInsets(view)
-                ?.isVisible(WindowInsetsCompat.Type.navigationBars()) == true
-        }
-        set(value) {
-            if (value) {
-                windowInsetsController?.show(WindowInsetsCompat.Type.navigationBars())
-            } else {
-                windowInsetsController?.hide(WindowInsetsCompat.Type.navigationBars())
-            }
-        }
-}

app/src/main/kotlin/com/google/accompanist/web/WebView.kt

@@ -635,8 +635,7 @@ data class WebViewError(
 fun rememberWebViewState(
     url: String,
     additionalHttpHeaders: Map<String, String> = emptyMap(),
-): WebViewState =
-// Rather than using .apply {} here we will recreate the state, this prevents
+): WebViewState = // Rather than using .apply {} here we will recreate the state, this prevents
     // a recomposition loop when the webview updates the url itself.
     remember {
         WebViewState(

app/src/main/kotlin/com/hippo/ehviewer/EhApplication.kt

@@ -21,50 +21,62 @@ import android.content.Context
 import android.os.StrictMode
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.content.res.AppCompatResources
-import androidx.collection.LruCache
-import androidx.compose.runtime.snapshots.Snapshot
+import androidx.compose.runtime.Composer
+import androidx.compose.runtime.tooling.ComposeStackTraceMode
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.lifecycle.coroutineScope
 import coil3.EventListener
 import coil3.SingletonImageLoader
-import coil3.asCoilImage
+import coil3.asImage
 import coil3.gif.AnimatedImageDecoder
 import coil3.gif.GifDecoder
-import coil3.network.ktor.KtorNetworkFetcherFactory
+import coil3.network.ConnectivityChecker
+import coil3.network.ktor3.KtorNetworkFetcherFactory
 import coil3.request.ErrorResult
 import coil3.request.ImageRequest
+import coil3.request.allowRgb565
 import coil3.request.crossfade
 import coil3.serviceLoaderEnabled
 import coil3.util.DebugLogger
-import com.hippo.ehviewer.client.EhCookieStore
+import com.ehviewer.core.database.SearchDatabase
+import com.ehviewer.core.files.deleteContent
+import com.ehviewer.core.ui.util.initSETConnection
+import com.ehviewer.core.util.isAtLeastO
+import com.ehviewer.core.util.isAtLeastP
+import com.ehviewer.core.util.isAtLeastS
+import com.ehviewer.core.util.isAtLeastSExtension7
+import com.ehviewer.core.util.launchIO
+import com.ehviewer.core.util.logcat
+import com.ehviewer.core.util.withUIContext
 import com.hippo.ehviewer.client.EhTagDatabase
-import com.hippo.ehviewer.client.data.GalleryDetail
+import com.hippo.ehviewer.coil.AnimatedWebPDecoder
 import com.hippo.ehviewer.coil.CropBorderInterceptor
+import com.hippo.ehviewer.coil.DetectBorderInterceptor
 import com.hippo.ehviewer.coil.DownloadThumbInterceptor
 import com.hippo.ehviewer.coil.HardwareBitmapInterceptor
+import com.hippo.ehviewer.coil.MapExtraInfoInterceptor
 import com.hippo.ehviewer.coil.MergeInterceptor
+import com.hippo.ehviewer.coil.QrCodeInterceptor
 import com.hippo.ehviewer.dailycheck.checkDawn
-import com.hippo.ehviewer.dao.SearchDatabase
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.download.DownloadsFilterMode
 import com.hippo.ehviewer.ktbuilder.diskCache
 import com.hippo.ehviewer.ktbuilder.imageLoader
-import com.hippo.ehviewer.ktor.CronetEngine
-import com.hippo.ehviewer.legacy.cleanObsoleteCache
+import com.hippo.ehviewer.ktor.Cronet
+import com.hippo.ehviewer.ktor.configureClient
+import com.hippo.ehviewer.ktor.configureCommon
 import com.hippo.ehviewer.ui.keepNoMediaFileStatus
 import com.hippo.ehviewer.ui.lockObserver
+import com.hippo.ehviewer.ui.screen.detailCache
 import com.hippo.ehviewer.ui.tools.dataStateFlow
 import com.hippo.ehviewer.util.AppConfig
-import com.hippo.ehviewer.util.Crash
+import com.hippo.ehviewer.util.CrashHandler
 import com.hippo.ehviewer.util.FavouriteStatusRouter
 import com.hippo.ehviewer.util.FileUtils
-import com.hippo.ehviewer.util.isAtLeastP
-import com.hippo.ehviewer.util.isAtLeastS
-import eu.kanade.tachiyomi.util.lang.launchIO
-import eu.kanade.tachiyomi.util.lang.withUIContext
-import eu.kanade.tachiyomi.util.system.logcat
+import com.hippo.ehviewer.util.OSUtils
 import io.ktor.client.HttpClient
-import io.ktor.client.plugins.cookies.HttpCookies
+import io.ktor.client.engine.okhttp.OkHttp
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import logcat.AndroidLogcatLogger
 import logcat.LogPriority
@@ -78,63 +90,62 @@ private val lifecycle = ProcessLifecycleOwner.get().lifecycle
 private val lifecycleScope = lifecycle.coroutineScope
 
 class EhApplication : Application(), SingletonImageLoader.Factory {
-    override fun onCreate() {
+    override fun onCreate() = with(lifecycleScope) {
+        initSETConnection()
         // Initialize Settings on first access
-        lifecycleScope.launchIO {
-            val mode = Settings.theme
+        launchIO {
+            val mode = Settings.theme.value
             if (!isAtLeastS) {
                 withUIContext {
                     AppCompatDelegate.setDefaultNightMode(mode)
                 }
             }
-            if (!LogcatLogger.isInstalled && Settings.saveCrashLog) {
-                LogcatLogger.install(AndroidLogcatLogger(LogPriority.VERBOSE))
+            LogcatLogger.loggers += AndroidLogcatLogger(LogPriority.VERBOSE)
+            Settings.saveCrashLog.valueFlow().collect {
+                if (it) {
+                    LogcatLogger.install()
+                } else {
+                    LogcatLogger.uninstall()
+                }
             }
         }
         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)
-        }
+        CrashHandler.install()
         super.onCreate()
         System.loadLibrary("ehviewer")
-        lifecycleScope.launchIO {
-            launch { EhTagDatabase }
+        launch {
+            FavouriteStatusRouter.collect { info ->
+                detailCache[info.gid]?.apply {
+                    favoriteSlot = info.favoriteSlot
+                    favoriteName = info.favoriteName
+                    favoriteNote = info.favoriteNote
+                }
+            }
+        }
+        launchIO {
+            EhTagDatabase.launchUpdate()
             launch { EhDB }
-            dataStateFlow.value
+            launch { dataStateFlow.value }
+            launch { OSUtils.totalMemory }
             launch {
-                if (DownloadManager.labelList.isNotEmpty() && Settings.downloadFilterMode.key !in Settings.prefs) {
+                if (DownloadManager.labelList.isNotEmpty() && Settings.downloadFilterMode !in Settings.snapshot()) {
                     Settings.downloadFilterMode.value = DownloadsFilterMode.CUSTOM.flag
                 }
+                initialized = true
                 DownloadManager.readMetadataFromLocal()
             }
             launch {
                 FileUtils.cleanupDirectory(AppConfig.externalCrashDir)
                 FileUtils.cleanupDirectory(AppConfig.externalParseErrorDir)
             }
-            launch {
-                cleanupDownload()
-            }
-            if (Settings.requestNews) {
-                launch {
-                    checkDawn()
-                }
-            }
-            launch {
-                cleanObsoleteCache()
+            launch { cleanupDownload() }
+            if (Settings.requestNews.value) {
+                launch { checkDawn() }
             }
         }
         if (BuildConfig.DEBUG) {
             StrictMode.enableDefaults()
-            Snapshot.registerApplyObserver { anies, _ ->
-                logcat(LogPriority.VERBOSE) { anies.toString() }
-            }
+            Composer.setDiagnosticStackTraceMode(ComposeStackTraceMode.SourceInformation)
         }
     }
 
@@ -152,24 +163,32 @@ class EhApplication : Application(), SingletonImageLoader.Factory {
     }
 
     private fun clearTempDir() {
-        var dir = AppConfig.tempDir
-        if (null != dir) {
-            FileUtils.deleteContent(dir)
-        }
-        dir = AppConfig.externalTempDir
-        if (null != dir) {
-            FileUtils.deleteContent(dir)
-        }
+        AppConfig.tempDir.deleteContent()
+        AppConfig.externalTempDir?.deleteContent()
     }
 
     override fun newImageLoader(context: Context) = context.imageLoader {
+        interceptorCoroutineContext(Dispatchers.Default)
         components {
             serviceLoaderEnabled(false)
-            add(KtorNetworkFetcherFactory { ktorClient })
+            add(
+                KtorNetworkFetcherFactory(
+                    httpClient = { ktorClient },
+                    connectivityChecker = { ConnectivityChecker.ONLINE },
+                ),
+            )
             add(MergeInterceptor)
             add(DownloadThumbInterceptor)
+            if (isAtLeastO) {
+                add(HardwareBitmapInterceptor)
+            } else {
+                allowRgb565(true)
+            }
             add(CropBorderInterceptor)
-            add(HardwareBitmapInterceptor)
+            add(DetectBorderInterceptor)
+            add(QrCodeInterceptor)
+            add(MapExtraInfoInterceptor)
+            add(AnimatedWebPDecoder.Factory)
             if (isAtLeastP) {
                 add(AnimatedImageDecoder.Factory(false))
             } else {
@@ -179,7 +198,7 @@ class EhApplication : Application(), SingletonImageLoader.Factory {
         diskCache { imageCache }
         crossfade(300)
         val drawable = AppCompatResources.getDrawable(appCtx, R.drawable.image_failed)
-        if (drawable != null) error(drawable.asCoilImage(true))
+        if (drawable != null) error(drawable.asImage(true))
         if (BuildConfig.DEBUG) {
             logger(DebugLogger())
         } else {
@@ -194,35 +213,34 @@ class EhApplication : Application(), SingletonImageLoader.Factory {
     }
 
     companion object {
+        @Volatile
+        var initialized = false
+            private set
+
         val ktorClient by lazy {
-            HttpClient(CronetEngine) {
-                install(HttpCookies) {
-                    storage = EhCookieStore
+            if (isAtLeastSExtension7 && Settings.enableCronet.value) {
+                HttpClient(Cronet) {
+                    engine { configureClient(Settings.enableQuic.value) }
+                    configureCommon()
+                }
+            } else {
+                HttpClient(OkHttp) {
+                    engine { configureClient() }
+                    configureCommon()
                 }
             }
         }
 
         val noRedirectKtorClient by lazy {
-            HttpClient(CronetEngine) {
-                followRedirects = false
-                install(HttpCookies) {
-                    storage = EhCookieStore
-                }
-            }
-        }
-
-        val galleryDetailCache by lazy {
-            LruCache<Long, GalleryDetail>(25).also {
-                lifecycleScope.launch {
-                    FavouriteStatusRouter.globalFlow.collect { (gid, slot) -> it[gid]?.favoriteSlot = slot }
-                }
+            HttpClient(ktorClient.engine) {
+                configureCommon(redirect = false)
             }
         }
 
         val imageCache by lazy {
             diskCache {
                 directory(appCtx.cacheDir.toOkioPath() / "image_cache")
-                maxSizeBytes(Settings.readCacheSize.coerceIn(320, 5120).toLong() * 1024 * 1024)
+                maxSizeBytes(Settings.readCacheSize.value.coerceIn(320, 5120).toLong() * 1024 * 1024)
             }
         }
 

app/src/main/kotlin/com/hippo/ehviewer/EhDB.kt

@@ -17,25 +17,27 @@ package com.hippo.ehviewer
 
 import android.content.Context
 import android.net.Uri
-import arrow.fx.coroutines.release
 import arrow.fx.coroutines.resource
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
-import com.hippo.ehviewer.dao.DownloadArtist
-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.ProgressInfo
-import com.hippo.ehviewer.dao.QuickSearch
-import com.hippo.ehviewer.dao.Schema17to18
+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.download.DownloadManager
-import com.hippo.ehviewer.util.sendTo
-import com.hippo.unifile.UniFile
-import com.hippo.unifile.asUniFile
 import kotlinx.coroutines.flow.Flow
+import okio.Path
+import okio.Path.Companion.toOkioPath
 import splitties.arch.room.roomDb
 
 object EhDB {
@@ -44,15 +46,15 @@ object EhDB {
         addMigrations(Schema17to18())
     }
 
-    private suspend fun putGalleryInfo(galleryInfo: BaseGalleryInfo) {
+    suspend fun putGalleryInfo(galleryInfo: GalleryEntity) {
         db.galleryDao().upsert(galleryInfo)
     }
 
-    private suspend fun deleteGalleryInfo(galleryInfo: BaseGalleryInfo) {
+    private suspend fun deleteGalleryInfo(galleryInfo: GalleryEntity) {
         runCatching { db.galleryDao().delete(galleryInfo) }
     }
 
-    suspend fun updateGalleryInfo(galleryInfoList: List<BaseGalleryInfo>) {
+    suspend fun updateGalleryInfo(galleryInfoList: List<GalleryEntity>) {
         db.galleryDao().update(galleryInfoList)
     }
 
@@ -146,20 +148,22 @@ 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.insert(artists)
+            dao.insertOrIgnore(artists)
         }
     }
 
-    suspend fun removeLocalFavorites(galleryInfo: BaseGalleryInfo) {
+    suspend fun removeLocalFavorites(galleryInfo: GalleryInfo) {
         db.localFavoritesDao().deleteByKey(galleryInfo.gid)
-        deleteGalleryInfo(galleryInfo)
+        deleteGalleryInfo(galleryInfo.asEntity())
     }
 
-    suspend fun removeLocalFavorites(galleryInfoList: Collection<BaseGalleryInfo>) {
+    suspend fun removeLocalFavorites(galleryInfoList: Collection<GalleryInfo>) {
         galleryInfoList.forEach {
             removeLocalFavorites(it)
         }
@@ -170,12 +174,12 @@ object EhDB {
         return dao.contains(gid)
     }
 
-    suspend fun putLocalFavorites(galleryInfo: BaseGalleryInfo) {
-        putGalleryInfo(galleryInfo)
+    suspend fun putLocalFavorites(galleryInfo: GalleryInfo) {
+        putGalleryInfo(galleryInfo.asEntity())
         db.localFavoritesDao().upsert(LocalFavoriteInfo(galleryInfo.gid))
     }
 
-    suspend fun putLocalFavorites(galleryInfoList: Collection<BaseGalleryInfo>) {
+    suspend fun putLocalFavorites(galleryInfoList: Collection<GalleryInfo>) {
         galleryInfoList.forEach {
             putLocalFavorites(it)
         }
@@ -221,8 +225,8 @@ object EhDB {
 
     fun searchLocalFav(keyword: String) = db.localFavoritesDao().joinListLazy("*$keyword*")
 
-    suspend fun putHistoryInfo(galleryInfo: BaseGalleryInfo) {
-        putGalleryInfo(galleryInfo)
+    suspend fun putHistoryInfo(galleryInfo: GalleryInfo) {
+        putGalleryInfo(galleryInfo.asEntity())
         db.historyDao().upsert(HistoryInfo(galleryInfo.gid))
     }
 
@@ -239,7 +243,7 @@ object EhDB {
         dao.insertOrIgnore(historyInfoList)
     }
 
-    suspend fun deleteHistoryInfo(galleryInfo: BaseGalleryInfo) {
+    suspend fun deleteHistoryInfo(galleryInfo: GalleryEntity) {
         val dao = db.historyDao()
         dao.deleteByKey(galleryInfo.gid)
         deleteGalleryInfo(galleryInfo)
@@ -273,58 +277,58 @@ object EhDB {
         db.filterDao().update(filter)
     }
 
-    fun exportDB(context: Context, file: UniFile) {
+    fun exportDB(context: Context, file: Path) {
         db.query("PRAGMA wal_checkpoint(FULL)", null).use { it.moveToNext() }
         val dbFile = context.getDatabasePath(DB_NAME)
-        dbFile.asUniFile() sendTo file
+        dbFile.toOkioPath() sendTo file
     }
 
-    suspend fun importDB(context: Context, uri: Uri) {
+    suspend fun importDB(context: Context, uri: Uri) = resourceScope {
         val tempDBName = "tmp.db"
-        resource {
+        val oldDB = resource {
             context.deleteDatabase(tempDBName)
             roomDb<EhDatabase>(tempDBName) {
                 createFromInputStream { context.contentResolver.openInputStream(uri) }
                 addMigrations(Schema17to18())
             }
-        } release {
-            it.close()
+        } release { db ->
+            db.close()
             context.deleteDatabase(tempDBName)
-        } use { oldDB ->
-            db.galleryDao().insertOrIgnore(oldDB.galleryDao().list())
+        }
 
-            db.progressDao().insertOrIgnore(oldDB.progressDao().list())
+        db.galleryDao().insertOrIgnore(oldDB.galleryDao().list())
+        db.progressDao().insertOrIgnore(oldDB.progressDao().list())
 
-            val downloadLabelList = oldDB.downloadLabelDao().list()
-            DownloadManager.addDownloadLabel(downloadLabelList)
+        val downloadLabelList = oldDB.downloadLabelDao().list()
+        DownloadManager.addDownloadLabel(downloadLabelList)
 
-            oldDB.downloadDirnameDao().list().let {
-                importDownloadDirname(it)
-            }
+        oldDB.downloadDirnameDao().list().let {
+            importDownloadDirname(it)
+        }
 
-            val downloadInfoList = oldDB.downloadsDao().joinList().asReversed()
-            DownloadManager.addDownload(downloadInfoList)
+        val downloadInfoList = oldDB.downloadsDao().joinList().asReversed()
+        DownloadManager.addDownload(downloadInfoList)
 
-            val historyInfoList = oldDB.historyDao().list()
-            importHistoryInfo(historyInfoList)
+        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.position = index + offset }
-            importQuickSearch(importList)
+        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.localFavoritesDao().list().let {
+            importLocalFavorites(it)
+        }
 
-            val filterList = oldDB.filterDao().list()
-            val currentFilterList = db.filterDao().list()
-            filterList.forEach {
-                if (it !in currentFilterList) addFilter(it)
-            }
+        oldDB.filterDao().list().forEach {
+            addFilter(it)
         }
     }
 }

app/src/main/kotlin/com/hippo/ehviewer/Settings.kt

@@ -9,7 +9,9 @@ import androidx.compose.runtime.Stable
 import androidx.compose.runtime.State
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.remember
-import com.hippo.ehviewer.client.CHROME_USER_AGENT
+import com.ehviewer.core.preferences.DataStorePreferences
+import com.ehviewer.core.preferences.PrefDelegate
+import com.ehviewer.core.preferences.edit
 import com.hippo.ehviewer.client.EhCookieStore
 import com.hippo.ehviewer.client.data.FavListUrlBuilder
 import com.hippo.ehviewer.download.DownloadsFilterMode
@@ -26,47 +28,12 @@ import kotlinx.coroutines.flow.conflate
 import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.flatMapMerge
 import kotlinx.coroutines.flow.map
-import splitties.preferences.BoolPref
-import splitties.preferences.DataStorePreferences
-import splitties.preferences.FloatPref
-import splitties.preferences.IntPref
-import splitties.preferences.LongPref
-import splitties.preferences.PrefDelegate
-import splitties.preferences.StringOrNullPref
-import splitties.preferences.StringPref
-import splitties.preferences.StringSetOrNullPref
-import splitties.preferences.StringSetPref
-import splitties.preferences.edit
-
-@Suppress("IMPLICIT_CAST_TO_ANY", "UNCHECKED_CAST")
-fun <T> PrefDelegate<T>.getValue(): T = when (this) {
-    is BoolPref -> value
-    is IntPref -> value
-    is FloatPref -> value
-    is LongPref -> value
-    is StringPref -> value
-    is StringOrNullPref -> value
-    is StringSetPref -> value
-    is StringSetOrNullPref -> value
-} as T
-
-@Suppress("UNCHECKED_CAST")
-fun <T> PrefDelegate<T>.setValue(newValue: T) = when (this) {
-    is BoolPref -> value = newValue as Boolean
-    is IntPref -> value = newValue as Int
-    is FloatPref -> value = newValue as Float
-    is LongPref -> value = newValue as Long
-    is StringPref -> value = newValue as String
-    is StringOrNullPref -> value = newValue as? String
-    is StringSetPref -> value = newValue as Set<String?>
-    is StringSetOrNullPref -> value = newValue as? Set<String?>
-}
 
 @Stable
 @Composable
 inline fun <R, T> PrefDelegate<T>.collectAsState(crossinline transform: @DisallowComposableCalls (T) -> R): State<R> {
     val flow = remember { valueFlow().map { transform(it) } }
-    val init = getValue()
+    val init = value
     return flow.collectAsState(transform(init))
 }
 
@@ -74,116 +41,125 @@ inline fun <R, T> PrefDelegate<T>.collectAsState(crossinline transform: @Disallo
 @Composable
 fun <T> PrefDelegate<T>.collectAsState(): State<T> {
     val flow = remember { valueFlow() }
-    val init = getValue()
+    val init = value
     return flow.collectAsState(init)
 }
 
 @Stable
 @Composable
 fun <T> PrefDelegate<T>.asMutableState(): MutableState<T> {
-    val flow = remember { valueFlow() }
-    val init = getValue()
-    val readOnly = flow.collectAsState(init)
+    val readOnly = collectAsState()
     return remember {
         object : MutableState<T> {
             override var value: T
                 get() = readOnly.value
                 set(value) {
-                    setValue(value)
+                    this@asMutableState.value = value
                 }
-            override fun component1() = TODO()
-            override fun component2() = TODO()
+            override fun component1() = readOnly.value
+            override fun component2() = this@asMutableState::value::set
         }
     }
 }
 
 object Settings : DataStorePreferences(null) {
-    private const val KEY_SHOW_TAG_TRANSLATIONS = "show_tag_translations"
-
+    @Suppress("ktlint:standard:backing-property-naming")
     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)
 
+    // Eh
+    val gallerySite = intPref("gallery_site_2", 0).observed(::updateWhenGallerySiteChanges)
+    val defaultFavSlot = intPref("default_favorite_slot", -2)
+    val theme = intPref("theme_2", -1).observed(::updateWhenThemeChanges)
+    val blackDarkTheme = boolPref("black_dark_theme", false)
+    val harmonizeCategoryColor = boolPref("harmonize_category_color", true)
+    val launchPage = intPref("launch_page_2", 0)
     val listMode = intPref("list_mode_2", 0)
+    val listThumbSize = intPref("list_tile_size", 40)
     val detailSize = intPref("detail_size_2", 0)
     val thumbColumns = intPref("thumb_columns", 3)
-    val listThumbSize = intPref("list_tile_size", 40)
+    val showGalleryPages = boolPref("show_gallery_pages", true)
+    val showVoteStatus = boolPref("show_vote_status", false)
+    val showComments = boolPref("show_gallery_comments", true)
+    val commentThreshold = intPref("comment_threshold", -100)
+    val showTagTranslations = boolPref("show_tag_translations", false).observed(::updateWhenTagTranslationChanges)
+    val meteredNetworkWarning = boolPref("cellular_network_warning", false)
+    val showJpnTitle = boolPref("show_jpn_title", false)
+    val requestNews = boolPref("request_news", false).observed { updateWhenRequestNewsChanges() }
+    val hideHvEvents = boolPref("hide_hv_events", false)
+
+    // Download
+    val mediaScan = boolPref("media_scan", false).observed(::updateWhenKeepMediaStatusChanges)
+    val multiThreadDownload = intPref("download_thread_2", 3)
+    val downloadDelay = intPref("download_delay_3", 1000)
+    val timeoutSpeed = intPref("timeout_speed_level", 6)
+    val preloadImage = intPref("preload_image_2", 5)
+    val downloadOriginImage = boolPref("download_origin_image", false)
+    val saveAsCbz = boolPref("save_as_cbz", false)
+    val archiveMetadata = boolPref("archive_metadata", true)
+
+    // Privacy
+    val security = boolPref("require_unlock", false)
+    val securityDelay = intPref("require_unlock_delay", 0)
+    val enabledSecurity = boolPref("enable_secure", false)
+
+    // Advanced
+    val saveParseErrorBody = boolPref("save_parse_error_body", true)
+    val saveCrashLog = boolPref("save_crash_log", true)
+    val readCacheSize = intPref("read_cache_size_2", 640)
+    val enableCronet = boolPref("enable_cronet", true)
+    val enableQuic = boolPref("enable_quic", true)
+    val hardwareBitmapThreshold = intPref("hardware_bitmap_threshold", 16384)
+    val preloadThumbAggressively = boolPref("preload_thumb_aggressively", false)
+    val animateItems = boolPref("animate_items", true)
+    val desktopSite = boolPref("desktop_site", true)
+
+    // About
+    val backupBeforeUpdate = boolPref("backup_before_update", false)
+    val useCIUpdateChannel = boolPref("ci_update_channel", AppConfig.isSnapshot)
+    val updateIntervalDays = intPref("update_interval_days", 7)
+
+    // Misc
     val languageFilter = intPref("language_filter", -1)
     val downloadSortMode = intPref("download_sort_mode", SortMode.Default.flag)
     val downloadFilterMode = intPref("download_filter_mode", DownloadsFilterMode.Default.flag)
     val hasSignedIn = boolPref("has_signed_in", EhCookieStore.hasSignedIn())
-    val meteredNetworkWarning = boolPref("cellular_network_warning", false)
-    val blackDarkTheme = boolPref("black_dark_theme", false)
+    val needSignIn = boolPref("need_sign_in", true)
     val gridView = boolPref("grid_view", false)
-    val showGalleryPages = boolPref("show_gallery_pages", true)
     val qSSaveProgress = boolPref("qs_save_progress", true)
-    val security = boolPref("require_unlock", false)
-    val animateItems = boolPref("animate_items", true)
-    val displayName = stringOrNullPref("display_name", null)
-    val recentDownloadLabel = stringOrNullPref("recent_download_label", "")
+    val displayName = stringOrNullPref("display_name")
+    val avatar = stringOrNullPref("avatar")
+    val recentDownloadLabel = stringOrNullPref("recent_download_label")
 
-    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_3", 1000)
-    var gallerySite by intPref("gallery_site_2", 0).observed { updateWhenGallerySiteChanges() }
-    var multiThreadDownload by intPref("download_thread_2", 3)
-    var preloadImage by intPref("preload_image_2", 5)
-    var downloadTimeout by intPref("download_timeout", 60)
-    var theme by intPref("theme_2", -1).observed { updateWhenThemeChanges() }
-    var thumbResolution by intPref("thumb_resolution_2", 0)
-    var readCacheSize by intPref("read_cache_size_2", 640)
-    var launchPage by intPref("launch_page_2", 0)
-    var commentThreshold by intPref("comment_threshold", -101)
-    var forceEhThumb by boolPref("force_eh_thumb", false)
-    var showComments by boolPref("show_gallery_comments", true)
-    var requestNews by boolPref("request_news", false).observed { updateWhenRequestNewsChanges() }
-    var hideHvEvents by boolPref("hide_hv_events", false)
-    var showJpnTitle by boolPref("show_jpn_title", false)
-    var showTagTranslations by boolPref(KEY_SHOW_TAG_TRANSLATIONS, false).observed { updateWhenTagTranslationChanges() }
+    var downloadScheme by stringOrNullPref("image_scheme")
+    var downloadAuthority by stringOrNullPref("image_authority")
+    var downloadPath by stringOrNullPref("image_path")
+    var downloadQuery by stringOrNullPref("image_query")
+    var downloadFragment by stringOrNullPref("image_fragment")
+    var archivePasswds by stringSetPref("archive_passwds")
     var appLinkVerifyTip by boolPref("app_link_verify_tip", false)
-    var enabledSecurity by boolPref("enable_secure", false)
-    var backupBeforeUpdate by boolPref("backup_before_update", true)
-    var useCIUpdateChannel by boolPref("ci_update_channel", AppConfig.isSnapshot)
-    var mediaScan by boolPref("media_scan", false).observed { updateWhenKeepMediaStatusChanges() }
     var hasDefaultDownloadLabel by boolPref("has_default_download_label", false)
-    var saveParseErrorBody by boolPref("save_parse_error_body", true)
-    var saveCrashLog by boolPref("save_crash_log", true)
     var removeImageFiles by boolPref("include_pic", true)
-    var needSignIn by boolPref("need_sign_in", true)
-    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 saveAsCbz by boolPref("save_as_cbz", false)
-    var archiveMetadata by boolPref("archive_metadata", true)
     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 requestNewsTime by intPref("request_news_time", 0).observed { updateWhenRequestNewsChanges() }
-    var updateIntervalDays by intPref("update_interval_days", 7)
     var lastDawnDays by intPref("last_dawn_days", 0)
     var recentToplist by stringPref("recent_toplist", "11")
-    var userAgent by stringPref("user_agent", CHROME_USER_AGENT)
-    var defaultDownloadLabel by stringOrNullPref("default_download_label", null)
+    var defaultDownloadLabel by stringOrNullPref("default_download_label")
     var lastUpdateTime by longPref("last_update_time", BuildConfig.COMMIT_TIME)
 
-    // Tachiyomi Reader
-    var newReader by boolPref("new_compose_reader", false)
-
+    // Reader
     val cropBorder = boolPref("crop_borders", false)
     val colorFilter = boolPref("pref_color_filter_key", false)
     val colorFilterValue = intPref("color_filter_value", 0)
     val colorFilterMode = intPref("color_filter_mode", 0)
     val customBrightness = boolPref("pref_custom_brightness_key", false)
     val customBrightnessValue = intPref("custom_brightness_value", 0)
-    val readingMode = intPref("pref_default_reading_mode_key", ReadingModeType.LEFT_TO_RIGHT.flagValue)
-    val orientationMode = intPref("pref_default_orientation_type_key", OrientationType.FREE.flagValue)
+    val readingMode = intPref("pref_default_reading_mode_key", ReadingModeType.DEFAULT.prefValue)
+    val orientationMode = intPref("pref_default_orientation_type_key", OrientationType.DEFAULT.prefValue)
     val showReaderSeekbar = boolPref("pref_show_reader_seekbar", true)
     val showPageNumber = boolPref("pref_show_page_number_key", true)
     val readerTheme = intPref("pref_reader_theme_key", 1)
@@ -194,7 +170,6 @@ object Settings : DataStorePreferences(null) {
     val readerLongTapAction = boolPref("reader_long_tap", true)
     val pageTransitions = boolPref("pref_enable_transitions_key", true)
     val readWithVolumeKeys = boolPref("reader_volume_keys", false)
-    val readWithVolumeKeysInterval = intPref("reader_volume_keys_interval", 0)
     val readWithVolumeKeysInverted = boolPref("reader_volume_keys_inverted", false)
     val grayScale = boolPref("pref_grayscale", false)
     val invertedColors = boolPref("pref_inverted_colors", false)
@@ -207,42 +182,48 @@ object Settings : DataStorePreferences(null) {
     val imageScaleType = intPref("pref_image_scale_type_key", 1)
     val landscapeZoom = boolPref("landscape_zoom", false)
     val zoomStart = intPref("pref_zoom_start_key", 1)
+    val showNavigationOverlayNewUser = boolPref("reader_navigation_overlay_new_user", true)
+    val showNavigationOverlayOnStart = boolPref("reader_navigation_overlay_on_start", false)
+    val stripExtraneousAds = boolPref("strip_extraneous_ads", false)
 
     init {
-        if ("CN" == Locale.getDefault().country) {
-            edit {
-                if (KEY_SHOW_TAG_TRANSLATIONS !in prefs) showTagTranslations = true
+        edit { pref ->
+            if ("CN" == Locale.getDefault().country) {
+                if (showTagTranslations !in pref) pref[showTagTranslations] = true
+            }
+            if (pref[downloadFilterMode] == DownloadsFilterMode.ARTIST.flag && pref[recentDownloadLabel] == null) {
+                pref[recentDownloadLabel] = ""
+            }
+            val orientation = pref[orientationMode]
+            if (OrientationType.entries.none { it.prefValue == orientation }) {
+                pref.remove(orientationMode)
             }
         }
     }
 
     interface Delegate<R> {
-        val flowGetter: () -> Flow<Unit>
+        fun changesFlow(): 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() }
-
-        @Suppress("ktlint:standard:property-naming")
-        private var _value = (0 until count).map { intPref("${key}_$it", 0) }.toTypedArray()
-        override fun getValue(thisRef: Any?, prop: KProperty<*>?): IntArray = _value.map { it.value }.toIntArray()
+        private val delegates = Array(count) { intPref("${key}_$it", 0) }
+        override fun changesFlow(): Flow<Unit> = delegates.asFlow().flatMapMerge { it.changesFlow() }.conflate()
+        override fun getValue(thisRef: Any?, prop: KProperty<*>?) = IntArray(delegates.size) { delegates[it].value }
         override fun setValue(thisRef: Any?, prop: KProperty<*>?, value: IntArray) {
             check(value.size == count)
-            edit { value.zip(_value) { v, d -> d.value = v } }
+            edit { pref -> value.zip(delegates) { v, d -> pref[d] = 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() }
-
-        @Suppress("ktlint:standard:property-naming")
-        private var _value = (0 until count).map { stringPref("${key}_$it", "$defMetaValue $it") }.toTypedArray()
-        override fun getValue(thisRef: Any?, prop: KProperty<*>?): Array<String> = _value.map { it.value }.toTypedArray()
+        private val delegates = Array(count) { stringPref("${key}_$it", "$defMetaValue $it") }
+        override fun changesFlow(): Flow<Unit> = delegates.asFlow().flatMapMerge { it.changesFlow() }.conflate()
+        override fun getValue(thisRef: Any?, prop: KProperty<*>?) = Array(delegates.size) { delegates[it].value }
         override fun setValue(thisRef: Any?, prop: KProperty<*>?, value: Array<String>) {
             check(value.size == count)
-            edit { value.zip(_value) { v, d -> d.value = v } }
+            edit { pref -> value.zip(delegates) { v, d -> pref[d] = v } }
         }
     }
 }

app/src/main/kotlin/com/hippo/ehviewer/SettingsCollector.kt

@@ -2,74 +2,73 @@ package com.hippo.ehviewer
 
 import android.app.UiModeManager
 import androidx.appcompat.app.AppCompatDelegate
+import arrow.core.Either.Companion.catch
+import com.ehviewer.core.preferences.PrefDelegate
+import com.ehviewer.core.util.isAtLeastS
+import com.ehviewer.core.util.logcat
+import com.ehviewer.core.util.withIOContext
 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 com.hippo.ehviewer.util.isAtLeastS
-import eu.kanade.tachiyomi.util.lang.launchIO
-import eu.kanade.tachiyomi.util.system.logcat
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.drop
+import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.launch
 import splitties.init.appCtx
-import splitties.preferences.PrefDelegate
 import splitties.systemservices.uiModeManager
 
-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) } } }
+private const val TAG = "SettingsCollector"
 
-fun updateWhenKeepMediaStatusChanges() {
-    collectScope.launchIO {
-        runCatching {
-            keepNoMediaFileStatus()
+private val collectScope = CoroutineScope(Dispatchers.Main + SupervisorJob())
+fun <T, R : PrefDelegate<T>> R.observed(func: suspend (T) -> Unit) = apply { collectScope.launch { valueFlow().drop(1).collectLatest(func) } }
+fun <T, R : Settings.Delegate<T>> R.emitTo(flow: MutableSharedFlow<Unit>) = apply { collectScope.launch { flow.emitAll(changesFlow()) } }
+fun <T, R : PrefDelegate<T>> R.emitTo(flow: MutableSharedFlow<Unit>) = apply { collectScope.launch { flow.emitAll(changesFlow()) } }
+
+suspend fun updateWhenKeepMediaStatusChanges(mediaScan: Boolean) {
+    withIOContext {
+        catch {
+            keepNoMediaFileStatus(mediaScan = mediaScan)
+        }.onLeft {
+            logcat(TAG, it)
         }
     }
 }
 
-fun updateWhenThemeChanges() {
-    collectScope.launch {
-        delay(100) // Avoid recompose being cancelled
-        if (isAtLeastS) {
-            val mode = when (Settings.theme) {
-                AppCompatDelegate.MODE_NIGHT_NO -> UiModeManager.MODE_NIGHT_NO
-                AppCompatDelegate.MODE_NIGHT_YES -> UiModeManager.MODE_NIGHT_YES
-                else -> UiModeManager.MODE_NIGHT_AUTO
-            }
-            uiModeManager.setApplicationNightMode(mode)
+suspend fun updateWhenThemeChanges(theme: Int) {
+    delay(100) // Avoid recompose being cancelled
+    if (isAtLeastS) {
+        val mode = when (theme) {
+            AppCompatDelegate.MODE_NIGHT_NO -> UiModeManager.MODE_NIGHT_NO
+            AppCompatDelegate.MODE_NIGHT_YES -> UiModeManager.MODE_NIGHT_YES
+            else -> UiModeManager.MODE_NIGHT_AUTO
         }
-        AppCompatDelegate.setDefaultNightMode(Settings.theme)
+        uiModeManager.setApplicationNightMode(mode)
     }
+    AppCompatDelegate.setDefaultNightMode(theme)
 }
 
 fun updateWhenRequestNewsChanges() {
     updateDailyCheckWork(appCtx)
 }
 
-fun updateWhenGallerySiteChanges() {
+suspend fun updateWhenGallerySiteChanges(gallerySite: Int) {
     if (Settings.hasSignedIn.value) {
-        collectScope.launchIO {
-            runCatching {
-                EhEngine.getUConfig()
-            }.onFailure {
-                logcat(it)
-            }
+        catch {
+            EhEngine.getUConfig(gallerySite)
+        }.onLeft {
+            logcat(TAG, it)
         }
     }
 }
 
-fun updateWhenTagTranslationChanges() {
-    collectScope.launchIO {
-        runCatching {
-            EhTagDatabase.update()
-        }.onFailure {
-            logcat(it)
-        }
+fun updateWhenTagTranslationChanges(enabled: Boolean) {
+    if (enabled) {
+        EhTagDatabase.launchUpdate()
     }
 }

app/src/main/kotlin/com/hippo/ehviewer/client/EhCacheKeyFactory.kt

@@ -15,36 +15,38 @@
  */
 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
+import com.ehviewer.core.model.GalleryInfo
 
-// 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/***
+// Normal Preview (v2): https://*.hath.network/c(m|1|2)/[timed token]/[gid]-[index].(jpg|webp)
+// ExHentai Large Preview (v1 Cover): https://s.exhentai.org/t/***
+// E-Hentai Large Preview (v1 Cover): https://ehgt.org/***
+// ExHentai v2 Cover: https://s.exhentai.org/**.webp
+// E-Hentai v2 Cover: https://ehgt.org/**.webp
 
-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/"
+const val URL_PREFIX_THUMB_E = "https://ehgt.org/"
+const val URL_PREFIX_THUMB_EX = "https://s.exhentai.org/"
+private const val URL_PREFIX_V1_THUMB_EX = URL_PREFIX_THUMB_EX + "t/"
+private val V2PreviewKeyRegex = Regex("/c([m12]/)[^/]+/(\\d+-\\d+)")
 
-fun getImageKey(gid: Long, index: Int): String {
-    return "image:$gid:$index"
-}
+fun getImageKey(gid: Long, index: Int): String = "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)
-}
+fun getThumbKey(url: String): String = url.removePrefix(URL_PREFIX_THUMB_E).removePrefix(URL_PREFIX_V1_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
+fun getV2PreviewKey(url: String) = "$".plus(
+    V2PreviewKeyRegex.find(url)?.let {
+        it.groupValues[1] + it.groupValues[2]
+    } ?: url,
+)
 
 val GalleryInfo.thumbUrl
-    get() = (if (exThumb) URL_PREFIX_LARGE_THUMB_EX else URL_PREFIX_THUMB_E) + thumbKey!!
+    get() = keyToUrl(thumbKey!!)
 
-val exThumb get() = EhUtils.isExHentai && !Settings.forceEhThumb
+fun keyToUrl(key: String) = if (key.startsWith("https:")) {
+    key
+} else {
+    if (key.endsWith("webp")) {
+        if (EhUtils.isExHentai) URL_PREFIX_THUMB_EX else URL_PREFIX_THUMB_E
+    } else {
+        if (EhUtils.isExHentai) URL_PREFIX_V1_THUMB_EX else URL_PREFIX_THUMB_E
+    } + key
+}

app/src/main/kotlin/com/hippo/ehviewer/client/EhCookieStore.kt

@@ -1,28 +1,24 @@
 package com.hippo.ehviewer.client
 
 import android.webkit.CookieManager
-import androidx.compose.ui.util.fastAny
-import androidx.compose.ui.util.fastJoinToString
 import io.ktor.client.plugins.cookies.CookiesStorage
 import io.ktor.http.Cookie
 import io.ktor.http.Url
 import io.ktor.http.parseClientCookiesHeader
-import io.ktor.http.renderCookieHeader
 import io.ktor.http.renderSetCookieHeader
 
 object EhCookieStore : CookiesStorage {
     private val manager = CookieManager.getInstance()
     fun removeAllCookies() = manager.removeAllCookies(null)
-    fun contains(url: String, name: String) = load(Url(url)).fastAny { it.name == name }
 
-    fun hasSignedIn(): Boolean {
-        val url = EhUrl.HOST_E
-        return contains(url, KEY_IPB_MEMBER_ID) && contains(url, KEY_IPB_PASS_HASH)
-    }
+    fun hasSignedIn(): Boolean = getCookies(EhUrl.HOST_E)?.run {
+        containsKey(KEY_IPB_MEMBER_ID) && containsKey(KEY_IPB_PASS_HASH)
+    } == true
 
     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_HATH_PERKS = "hath_perks"
     private const val KEY_CONTENT_WARNING = "nw"
     private const val CONTENT_WARNING_NOT_SHOW = "1"
     private const val KEY_UTMP_NAME = "__utmp"
@@ -38,6 +34,10 @@ object EhCookieStore : CookiesStorage {
         )
     }
 
+    fun getUserId() = getCookies(EhUrl.HOST_E)?.get(KEY_IPB_MEMBER_ID)
+
+    fun getHathPerks() = getCookies(EhUrl.HOST_E)?.get(KEY_HATH_PERKS)?.substringBefore('-')
+
     fun getIdentityCookies(): List<Pair<String, String?>> {
         val eCookies = getCookies(EhUrl.HOST_E)
         val exCookies = getCookies(EhUrl.HOST_EX)
@@ -51,13 +51,9 @@ object EhCookieStore : CookiesStorage {
         )
     }
 
-    fun flush() = manager.flush()
+    fun isCloudflareBypassed() = getCookies(EhUrl.HOST_E)?.containsKey("cf_clearance") == true
 
-    fun getCookieHeader(url: String): String {
-        return load(Url(url)).fastJoinToString("; ") {
-            renderCookieHeader(it)
-        }
-    }
+    fun flush() = manager.flush()
 
     // See https://github.com/Ehviewer-Overhauled/Ehviewer/issues/873
     override suspend fun addCookie(requestUrl: Url, cookie: Cookie) {

app/src/main/kotlin/com/hippo/ehviewer/client/EhEngine.kt

@@ -21,25 +21,32 @@ import arrow.core.partially2
 import arrow.core.right
 import arrow.fx.coroutines.parMap
 import arrow.fx.coroutines.parZip
+import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.BaseGalleryInfo
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.util.logcat
 import com.hippo.ehviewer.EhDB
-import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
 import com.hippo.ehviewer.client.data.FavListUrlBuilder
-import com.hippo.ehviewer.client.data.GalleryInfo
+import com.hippo.ehviewer.client.data.fillInfo
+import com.hippo.ehviewer.client.data.filterComments
+import com.hippo.ehviewer.client.exception.CloudflareBypassException
 import com.hippo.ehviewer.client.exception.EhException
 import com.hippo.ehviewer.client.exception.InsufficientFundsException
+import com.hippo.ehviewer.client.exception.InsufficientGpException
+import com.hippo.ehviewer.client.exception.IpBannedException
+import com.hippo.ehviewer.client.exception.NoHathClientException
+import com.hippo.ehviewer.client.exception.NoHitsFoundException
 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.FavParserResult
 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.GalleryMultiPageViewerPTokenParser
 import com.hippo.ehviewer.client.parser.GalleryPageParser
 import com.hippo.ehviewer.client.parser.GalleryTokenApiParser
 import com.hippo.ehviewer.client.parser.HomeParser
@@ -55,13 +62,16 @@ import com.hippo.ehviewer.dailycheck.showEventNotification
 import com.hippo.ehviewer.dailycheck.today
 import com.hippo.ehviewer.util.AppConfig
 import com.hippo.ehviewer.util.ReadableTime
-import com.hippo.ehviewer.util.StatusCodeException
 import com.hippo.ehviewer.util.bodyAsUtf8Text
-import eu.kanade.tachiyomi.util.system.logcat
+import com.hippo.ehviewer.util.ensureSuccess
+import io.ktor.client.statement.HttpResponse
 import io.ktor.client.statement.HttpStatement
 import io.ktor.client.statement.bodyAsChannel
+import io.ktor.client.statement.request
+import io.ktor.http.Url
 import io.ktor.utils.io.pool.DirectByteBufferPool
 import io.ktor.utils.io.pool.useInstance
+import io.ktor.utils.io.readAvailable
 import java.io.File
 import java.nio.ByteBuffer
 import kotlin.math.ceil
@@ -76,7 +86,6 @@ import moe.tarsin.coroutines.removeAllSuspend
 import moe.tarsin.coroutines.runSuspendCatching
 import okio.buffer
 import okio.sink
-import org.jsoup.Jsoup
 import splitties.init.appCtx
 
 // https://ehwiki.org/wiki/API#Basics
@@ -84,7 +93,9 @@ private const val MAX_REQUEST_SIZE = 25
 private const val MAX_SEQUENTIAL_REQUESTS = 5
 private const val REQUEST_INTERVAL = 5000L
 
-fun Either<String, ByteBuffer>.saveParseError(e: Throwable) {
+private val Url.isLogin get() = segments.firstOrNull() == "bounce_login.php"
+
+private fun Either<String, ByteBuffer>.saveParseError(e: Throwable) {
     val dir = AppConfig.externalParseErrorDir ?: return
     val file = File(dir, ReadableTime.getFilenamableTime() + ".txt")
     file.sink().buffer().use { sink ->
@@ -96,47 +107,50 @@ fun Either<String, ByteBuffer>.saveParseError(e: Throwable) {
     }
 }
 
-fun rethrowExactly(code: Int, body: Either<String, ByteBuffer>, e: Throwable): Nothing {
+private fun rethrowExactly(response: HttpResponse, body: Either<String, ByteBuffer>, e: Throwable): Nothing {
     // Don't translate coroutine cancellation
     if (e is CancellationException) throw e
 
+    if (response.headers["cf-mitigated"] == "challenge") throw CloudflareBypassException()
+
     // Check sad panda (without panda)
     val empty = body.fold(
         { it.isEmpty() },
         { !it.hasRemaining() },
     )
     if (empty) {
-        if (EhUtils.isExHentai) {
-            throw EhException("Sad Panda\n(without panda)")
+        val message = if (EhUtils.isExHentai) {
+            "Sad Panda\n(without panda)"
         } else {
-            throw EhException("IP banned")
+            appCtx.getString(R.string.error_ip_banned)
         }
+        throw IpBannedException(message)
     }
 
-    // Check Gallery Not Available
-    body.onLeft {
-        if ("Gallery Not Available - " in it) {
-            val error = GalleryNotAvailableParser.parse(it)
-            if (!error.isNullOrBlank()) {
-                throw EhException(error)
+    // Check parse error thrown by rust
+    val cause = e.cause
+    if (e is ParseException && cause is RuntimeException) {
+        when (val message = cause.message) {
+            "0" -> throw NoHitsFoundException()
+            "1" -> throw EhException(R.string.gallery_list_empty_hit_subscription)
+            "2" -> throw NotLoggedInException()
+            "3" -> throw NoHathClientException()
+            "4" -> throw InsufficientFundsException()
+            is String if message.isNotEmpty() -> {
+                when (message[0]) {
+                    '5' -> throw IpBannedException(message.substring(1))
+                    '6' -> throw EhException(message.substring(1))
+                }
             }
         }
     }
 
     // Check bad response code
-    if (code >= 400) {
-        throw StatusCodeException(code)
-    }
+    response.status.ensureSuccess()
 
     if (e is ParseException || e is SerializationException) {
-        body.onLeft { if ("<" !in it) throw EhException(it) }
-        when (val message = e.cause?.message) {
-            "No hits found!" -> throw EhException(R.string.gallery_list_empty_hit)
-            "No watched tags!" -> throw EhException(R.string.gallery_list_empty_hit_subscription)
-            "Not logged in!" -> throw NotLoggedInException()
-            is String -> if (message.startsWith("Your IP address")) throw EhException(message)
-        }
-        if (Settings.saveParseErrorBody) body.saveParseError(e)
+        body.onLeft { if ("<" !in it) throw IpBannedException(it) }
+        if (Settings.saveParseErrorBody.value) body.saveParseError(e)
         throw EhException(appCtx.getString(R.string.error_parse_error), e)
     }
 
@@ -144,18 +158,20 @@ fun rethrowExactly(code: Int, body: Either<String, ByteBuffer>, e: Throwable): N
     throw e
 }
 
-val httpContentPool = DirectByteBufferPool(8, 0x80000)
+private val httpContentPool = DirectByteBufferPool(8, 0x80000)
 
-suspend inline fun <T> HttpStatement.fetchUsingAsText(crossinline block: suspend String.() -> T) = executeSafely { response ->
+private suspend inline fun <T> HttpStatement.fetchUsingAsText(crossinline block: suspend String.() -> T) = executeSafely { response ->
+    if (response.request.url.isLogin) throw NotLoggedInException()
     val body = response.bodyAsUtf8Text()
     runSuspendCatching {
         block(body)
     }.onFailure {
-        rethrowExactly(response.status.value, body.left(), it)
+        rethrowExactly(response, body.left(), it)
     }.getOrThrow()
 }
 
-suspend inline fun <T> HttpStatement.fetchUsingAsByteBuffer(crossinline block: suspend ByteBuffer.() -> T) = executeSafely { response ->
+private suspend inline fun <T> HttpStatement.fetchUsingAsByteBuffer(crossinline block: suspend ByteBuffer.() -> T) = executeSafely { response ->
+    if (response.request.url.isLogin) throw NotLoggedInException()
     httpContentPool.useInstance { buffer ->
         with(response.bodyAsChannel()) { while (!isClosedForRead) readAvailable(buffer) }
         buffer.flip()
@@ -163,26 +179,35 @@ suspend inline fun <T> HttpStatement.fetchUsingAsByteBuffer(crossinline block: s
             block(buffer)
         }.onFailure {
             buffer.rewind()
-            rethrowExactly(response.status.value, buffer.right(), it)
+            rethrowExactly(response, buffer.right(), it)
         }.getOrThrow()
     }
 }
 
 object EhEngine {
     suspend fun getOriginalImageUrl(url: String, referer: String?) = noRedirectEhRequest(url, referer).executeSafely { response ->
-        val location = response.headers["Location"] ?: throw InsufficientFundsException()
-        location.takeIf { "bounce_login" !in it } ?: throw NotLoggedInException()
+        response.headers["Location"]?.takeUnless { Url(it).isLogin } ?: throw InsufficientGpException()
     }
 
-    suspend fun getTorrentList(url: String, gid: Long, token: String): TorrentResult {
+    suspend fun getPTokenListFromMpv(gid: Long, token: String) = ehRequest(EhUrl.getGalleryMultiPageViewerUrl(gid, token), EhUrl.referer)
+        .fetchUsingAsText(GalleryMultiPageViewerPTokenParser::parse)
+
+    suspend fun getTorrentList(gid: Long, token: String): TorrentResult {
+        val url = EhUrl.getTorrentUrl(gid, token)
         val referer = EhUrl.getGalleryDetailUrl(gid, token)
         return ehRequest(url, referer).fetchUsingAsByteBuffer(TorrentParser::parse)
     }
 
-    suspend fun getArchiveList(url: String, gid: Long, token: String): ArchiveParser.Result {
+    suspend fun getTorrentKey() = EhCookieStore.getUserId()?.let { id ->
+        val key = ehRequest(EhUrl.URL_HOME).fetchUsingAsText(HomeParser::parseTorrentKey)
+        "${id}x$key"
+    }
+
+    suspend fun getArchiveList(gid: Long, token: String): ArchiveParser.Result {
+        val url = EhUrl.getArchiveUrl(gid, token)
         val funds = if (EhUtils.isExHentai) getFunds() else null
         return ehRequest(url, EhUrl.getGalleryDetailUrl(gid, token))
-            .fetchUsingAsText(ArchiveParser::parse.partially2(funds))
+            .fetchUsingAsByteBuffer(ArchiveParser::parse.partially2(funds))
     }
 
     suspend fun getImageLimits() = parZip(
@@ -194,14 +219,15 @@ object EhEngine {
     private suspend fun getFunds() = ehRequest(EhUrl.URL_FUNDS).fetchUsingAsText(HomeParser::parseFunds)
 
     suspend fun getNews(parse: Boolean) = ehRequest(EhUrl.URL_NEWS, EhUrl.REFERER_E)
-        .fetchUsingAsText { if (parse) EventPaneParser.parse(this) else null }
+        .fetchUsingAsByteBuffer { if (parse) EventPaneParser.parse(this) else null }
 
     suspend fun getProfile(): ProfileParser.Result {
-        val url = ehRequest(EhUrl.URL_FORUMS).fetchUsingAsText(ForumsParser::parse)
-        return ehRequest(url, EhUrl.URL_FORUMS).fetchUsingAsText(ProfileParser::parse)
+        val url = ehRequest(EhUrl.URL_FORUMS).fetchUsingAsByteBuffer(ProfileParser::parseProfileUrl)
+        return ehRequest(url, EhUrl.URL_FORUMS).fetchUsingAsByteBuffer(ProfileParser::parse)
     }
 
-    suspend fun getUConfig(url: String = EhUrl.uConfigUrl) {
+    suspend fun getUConfig(gallerySite: Int) {
+        val url = EhUrl.getUConfigUrl(gallerySite)
         runSuspendCatching {
             ehRequest(url).fetchUsingAsByteBuffer(UserConfigParser::parse)
         }.onFailure { throwable ->
@@ -224,18 +250,19 @@ object EhEngine {
         .apply { galleryInfoList.fillInfo(url, true) }
         .takeUnless { it.galleryInfoList.isEmpty() } ?: GalleryListParser.emptyResult
 
-    suspend fun getGalleryDetail(url: String) = ehRequest(url, EhUrl.referer).fetchUsingAsText {
-        val eventPane = EventPaneParser.parse(this)
-        if (eventPane != null) {
+    suspend fun getGalleryDetail(url: String) = ehRequest(url, EhUrl.referer).fetchUsingAsByteBuffer(GalleryDetailParser::parse).run {
+        event?.let {
             Settings.lastDawnDays = today
-            showEventNotification(eventPane)
+            showEventNotification(it)
+        }
+        detail.apply {
+            // Fill info for database
+            fillInfo()
+            filterComments()
         }
-        GalleryDetailParser.parse(this)
     }
 
-    suspend fun getPreviewList(url: String) = ehRequest(url, EhUrl.referer).fetchUsingAsText {
-        GalleryDetailParser.parsePreviewList(this)
-    }
+    suspend fun getPreviewList(url: String) = ehRequest(url, EhUrl.referer).fetchUsingAsByteBuffer(GalleryDetailParser::parsePreviews)
 
     suspend fun getFavorites(url: String) = ehRequest(url, EhUrl.referer).fetchUsingAsByteBuffer(FavoritesParser::parse)
         .apply { galleryInfoList.fillInfo(url) }
@@ -269,14 +296,7 @@ object EhEngine {
         // Ktor does not handle POST redirect, we need to do it manually
         // https://youtrack.jetbrains.com/issue/KTOR-478
         val location = response.headers["Location"] ?: url
-        ehRequest(location, url).fetchUsingAsText {
-            val document = Jsoup.parse(this)
-            val elements = document.select("#chd + p")
-            if (elements.size > 0) {
-                throw EhException(elements[0].text())
-            }
-            GalleryDetailParser.parseComments(document)
-        }
+        ehRequest(location, url).fetchUsingAsByteBuffer(GalleryDetailParser::parseComments)
     }
 
     suspend fun modifyFavorites(gid: Long, token: String, dstCat: Int = -1, note: String = "") {
@@ -297,12 +317,15 @@ object EhEngine {
         }.executeSafely { }
     }
 
-    suspend fun downloadArchive(gid: Long, token: String, or: String, res: String, isHAtH: Boolean): String? {
-        val url = EhUrl.getDownloadArchive(gid, token, or)
+    suspend fun getFavoriteNote(gid: Long, token: String) = ehRequest(EhUrl.getAddFavorites(gid, token), EhUrl.getGalleryDetailUrl(gid, token))
+        .fetchUsingAsText(FavoritesParser::parseNote)
+
+    suspend fun downloadArchive(gid: Long, token: String, res: String, isHath: Boolean): String? {
+        val url = EhUrl.getArchiveUrl(gid, token)
         val referer = EhUrl.getGalleryDetailUrl(gid, token)
         val request = ehRequest(url, referer, EhUrl.origin) {
             formBody {
-                if (isHAtH) {
+                if (isHath) {
                     append("hathdl_xres", res)
                 } else {
                     append("dltype", res)
@@ -314,12 +337,12 @@ object EhEngine {
                 }
             }
         }
-        var result = request.fetchUsingAsText(ArchiveParser::parseArchiveUrl)
-        if (!isHAtH) {
+        var result = request.fetchUsingAsByteBuffer(ArchiveParser::parseArchiveUrl)
+        if (!isHath) {
             if (result == null) {
                 // Wait for the server to prepare archives
                 delay(1000)
-                result = request.fetchUsingAsText(ArchiveParser::parseArchiveUrl)
+                result = request.fetchUsingAsByteBuffer(ArchiveParser::parseArchiveUrl)
                 if (result == null) throw EhException("Archive unavailable")
             }
             return result
@@ -329,7 +352,7 @@ object EhEngine {
 
     suspend fun resetImageLimits() = ehRequest(EhUrl.URL_HOME) {
         formBody {
-            append("reset_imagelimit", "Reset Limit")
+            append("reset_imagelimit", "Reset Quota")
         }
     }.fetchUsingAsText(HomeParser::parseResetLimits)
 
@@ -374,54 +397,51 @@ object EhEngine {
         }
     }.fetchUsingAsText(String::parseAs)
 
-    suspend fun fillGalleryListByApi(galleryInfoList: List<GalleryInfo>, referer: String? = null) =
-        galleryInfoList.chunked(MAX_REQUEST_SIZE).chunked(MAX_SEQUENTIAL_REQUESTS).forEachIndexed { index, chunk ->
-            if (index != 0) {
-                delay(REQUEST_INTERVAL)
-            }
-            chunk.parMap {
-                ehRequest(EhUrl.apiUrl, referer, EhUrl.origin) {
-                    jsonBody {
-                        put("method", "gdata")
-                        array("gidlist") {
-                            it.forEach {
-                                addJsonArray {
-                                    add(it.gid)
-                                    add(it.token)
-                                }
+    suspend fun fillGalleryListByApi(galleryInfoList: List<GalleryInfo>, referer: String? = null) = galleryInfoList.chunked(MAX_REQUEST_SIZE).chunked(MAX_SEQUENTIAL_REQUESTS).forEachIndexed { index, chunk ->
+        if (index != 0) {
+            delay(REQUEST_INTERVAL)
+        }
+        chunk.parMap {
+            ehRequest(EhUrl.apiUrl, referer, EhUrl.origin) {
+                jsonBody {
+                    put("method", "gdata")
+                    array("gidlist") {
+                        it.forEach { info ->
+                            addJsonArray {
+                                add(info.gid)
+                                add(info.token)
                             }
                         }
-                        put("namespace", 1)
                     }
-                }.fetchUsingAsText { GalleryApiParser.parse(this, it) }
-            }
+                    put("namespace", 1)
+                }
+            }.fetchUsingAsText { 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", requireNotNull(apiKey))
-                put("gid", gid)
-                put("token", token)
-                put("comment_id", commentId)
-                put("comment_vote", commentVote)
-            }
-        }.fetchUsingAsText(String::parseAs)
+    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", requireNotNull(apiKey))
+            put("gid", gid)
+            put("token", token)
+            put("comment_id", commentId)
+            put("comment_vote", commentVote)
+        }
+    }.fetchUsingAsText(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", requireNotNull(apiKey))
-                put("gid", gid)
-                put("token", token)
-                put("tags", tags)
-                put("vote", vote)
-            }
-        }.fetchUsingAsText(VoteTagParser::parse)
+    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", requireNotNull(apiKey))
+            put("gid", gid)
+            put("token", token)
+            put("tags", tags)
+            put("vote", vote)
+        }
+    }.fetchUsingAsByteBuffer(VoteTagParser::parse)
 
     suspend fun getGalleryToken(gid: Long, gtoken: String, page: Int) = ehRequest(EhUrl.apiUrl, EhUrl.referer, EhUrl.origin) {
         jsonBody {

app/src/main/kotlin/com/hippo/ehviewer/client/EhFilter.kt

@@ -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
@@ -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()) } } ?: false
-    suspend fun filterTagNamespace(info: GalleryInfo) = info.simpleTags?.any { tag -> anyActive(FilterMode.TAG_NAMESPACE) { matchTagNamespace(tag, it.text.lowercase()) } } ?: false
+    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 filterCommenter(commenter: String) = anyActive(FilterMode.COMMENTER) { it.text == commenter }
     suspend fun filterComment(comment: String) = anyActive(FilterMode.COMMENT) { regex(it).containsMatchIn(comment) }
 }

app/src/main/kotlin/com/hippo/ehviewer/client/EhRequestBuilder.kt

@@ -15,12 +15,11 @@
  */
 package com.hippo.ehviewer.client
 
-import com.hippo.ehviewer.BuildConfig
+import com.ehviewer.core.util.logcat
 import com.hippo.ehviewer.EhApplication.Companion.ktorClient
 import com.hippo.ehviewer.EhApplication.Companion.noRedirectKtorClient
-import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.util.bodyAsUtf8Text
-import eu.kanade.tachiyomi.util.system.logcat
+import com.hippo.ehviewer.util.ensureSuccess
 import io.ktor.client.request.HttpRequestBuilder
 import io.ktor.client.request.forms.FormDataContent
 import io.ktor.client.request.header
@@ -29,39 +28,36 @@ import io.ktor.client.request.setBody
 import io.ktor.client.statement.HttpResponse
 import io.ktor.client.statement.HttpStatement
 import io.ktor.http.ContentType
-import io.ktor.http.HttpHeaders
 import io.ktor.http.HttpMethod
 import io.ktor.http.ParametersBuilder
 import io.ktor.http.content.TextContent
-import io.ktor.http.userAgent
 import kotlinx.coroutines.cancel
+import kotlinx.io.Source
 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 okio.BufferedSource
+import kotlinx.serialization.json.io.decodeFromSource
 
 inline fun JsonObjectBuilder.array(name: String, builder: JsonArrayBuilder.() -> Unit) = put(name, buildJsonArray(builder))
 
-suspend inline fun <reified T> HttpStatement.executeAndParseAs() = executeSafely { it.bodyAsUtf8Text().parseAs<T>() }
-inline fun <reified T> BufferedSource.parseAs(): T = json.decodeFromBufferedSource(this)
+suspend inline fun <reified T> HttpStatement.executeAndParseAs() = executeSafely {
+    it.status.ensureSuccess()
+    it.bodyAsUtf8Text().parseAs<T>()
+}
+
+inline fun <reified T> Source.parseAs(): T = json.decodeFromSource(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/${BuildConfig.CHROME_VERSION}.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"
+val json = Json {
+    ignoreUnknownKeys = true
+    explicitNulls = false
+}
 
 fun HttpRequestBuilder.applyEhConfig(referer: String?, origin: String?) {
-    method = HttpMethod.Get
     header("Referer", referer)
     header("Origin", origin)
-    userAgent(Settings.userAgent)
-    header(HttpHeaders.Accept, CHROME_ACCEPT)
-    header(HttpHeaders.AcceptLanguage, CHROME_ACCEPT_LANGUAGE)
 }
 
 suspend inline fun ehRequest(

app/src/main/kotlin/com/hippo/ehviewer/client/EhTagDatabase.kt

@@ -19,37 +19,39 @@ import android.content.Context
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
+import arrow.core.Either
+import com.ehviewer.core.files.metadataOrNull
+import com.ehviewer.core.files.read
+import com.ehviewer.core.files.write
+import com.ehviewer.core.model.TagNamespace
+import com.ehviewer.core.util.logcat
 import com.hippo.ehviewer.EhApplication.Companion.ktorClient
 import com.hippo.ehviewer.R
-import com.hippo.ehviewer.client.data.TagNamespace
 import com.hippo.ehviewer.util.AppConfig
-import com.hippo.ehviewer.util.FileUtils
-import com.hippo.ehviewer.util.StatusCodeException
-import com.hippo.ehviewer.util.copyTo
-import com.hippo.unifile.asUniFile
-import com.hippo.unifile.sha1
-import eu.kanade.tachiyomi.util.system.logcat
-import io.ktor.client.HttpClient
+import com.hippo.ehviewer.util.bodyAsUtf8Text
+import com.hippo.ehviewer.util.ensureSuccess
+import com.hippo.ehviewer.util.utf8
 import io.ktor.client.request.prepareGet
-import io.ktor.client.statement.bodyAsChannel
-import io.ktor.http.isSuccess
-import java.io.File
-import java.nio.charset.StandardCharsets
+import kotlin.time.Clock
+import kotlin.time.Duration.Companion.days
+import kotlin.time.Instant
 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 kotlinx.io.Source
+import kotlinx.io.writeString
+import kotlinx.serialization.json.io.encodeToSink
+import kotlinx.serialization.json.jsonArray
+import kotlinx.serialization.json.jsonObject
+import kotlinx.serialization.json.jsonPrimitive
 import moe.tarsin.coroutines.runSuspendCatching
-import okio.BufferedSource
-import okio.buffer
-import okio.source
 import splitties.init.appCtx
 
 object EhTagDatabase : CoroutineScope {
+    override val coroutineContext = Dispatchers.IO + Job()
     private const val NAMESPACE_PREFIX = "n"
     private val PREFIXES = arrayOf(
         "-",
@@ -59,194 +61,140 @@ object EhTagDatabase : CoroutineScope {
     )
     private lateinit var tagGroups: Map<String, Map<String, String>>
     private val updateLock = 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()?.ifEmpty { null }
-    }
+    fun getTranslation(prefix: String? = NAMESPACE_PREFIX, tag: String?): String? = tagGroups[prefix]?.get(tag)?.trim()?.ifEmpty { null }
 
-    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))
-            }
+    // Copied from https://github.com/EhTagTranslation/EhSyringe/blob/c0cf88da04081072492829673aca34380b14dae6/src/plugin/suggest.ts#L37
+    // TODO: Optimize
+    private val nsScore = mapOf(
+        TagNamespace.Location.prefix to 10f,
+        TagNamespace.Other.prefix to 10f,
+        TagNamespace.Female.prefix to 9f,
+        TagNamespace.Male.prefix to 8.5f,
+        TagNamespace.Mixed.prefix to 8f,
+        TagNamespace.Parody.prefix to 3.3f,
+        TagNamespace.Character.prefix to 2.8f,
+        TagNamespace.Artist.prefix to 2.5f,
+        TagNamespace.Cosplayer.prefix to 2.4f,
+        TagNamespace.Group.prefix to 2.2f,
+        TagNamespace.Language.prefix to 2f,
+    )
+
+    data class Tag(val tag: String, val hint: String?, val score: Float)
+
+    context(_: Context)
+    fun suggestion(rawKeyword: String, expectTranslate: Boolean): List<Tag> {
+        val keyword = PREFIXES.fold(rawKeyword) { kwd, pfx -> kwd.removePrefix(pfx) }
+        if (!initialized || keyword.isEmpty()) return emptyList()
+        val translate = expectTranslate && translatable
+        val prefix = rawKeyword.dropLast(keyword.length)
+        val ns = keyword.substringBefore(':')
+        val tag = keyword.drop(ns.length + 1)
+        val nsPrefix = TagNamespace.from(ns)?.prefix ?: ns
+        val tags = tagGroups[nsPrefix.takeIf { tag.isNotEmpty() && it != NAMESPACE_PREFIX }]
+        return if (tags != null) {
+            lookup(tags, tag, translate).map { it.copy(tag = "$prefix$nsPrefix:${it.tag}") }
         } 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 = TagNamespace(namespace).toPrefix() ?: 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 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 checkData(sha1: String?, data: File): Boolean {
-        return sha1 != null && sha1 == data.asUniFile().sha1()
-    }
-
-    private suspend fun save(client: HttpClient, url: String, file: File) {
-        runCatching {
-            client.prepareGet(url).executeSafely {
-                if (it.status.isSuccess()) {
-                    it.bodyAsChannel().copyTo(file)
+            tagGroups.asSequence().flatMap { (nsPrefix, tags) ->
+                if (nsPrefix != NAMESPACE_PREFIX) {
+                    lookup(tags, keyword, translate).map { it.copy(tag = "$prefix$nsPrefix:${it.tag}", score = it.score / (nsScore[nsPrefix] ?: 1f)) }
                 } else {
-                    throw StatusCodeException(it.status.value)
+                    lookup(tags, keyword, translate).map { it.copy(tag = "$prefix${it.tag}:", score = 0f) }
                 }
             }
-        }.onFailure {
-            file.delete()
-        }.getOrThrow()
+        }.toMutableList().apply { sortBy { it.score } }
     }
 
-    suspend fun update() {
+    private fun lookup(tags: Map<String, String>, keyword: String, translate: Boolean) = if (translate) {
+        tags.asSequence().mapNotNull { (tag, hint) ->
+            val score = if (tag.startsWith(keyword, ignoreCase = true)) {
+                tag.length
+            } else {
+                if (tag.indexOf(" $keyword", ignoreCase = true) != -1) {
+                    tag.length * 2
+                } else {
+                    when (hint.indexOf(keyword, ignoreCase = true)) {
+                        -1 -> 0
+                        0 -> hint.length
+                        else -> hint.length * 2
+                    }
+                }
+            }
+            if (score != 0) Tag(tag, hint, score.toFloat()) else null
+        }
+    } else {
+        tags.keys.asSequence().mapNotNull { tag ->
+            val score = if (tag.startsWith(keyword, ignoreCase = true)) {
+                tag.length
+            } else {
+                if (tag.indexOf(" $keyword", ignoreCase = true) != -1) {
+                    tag.length * 2
+                } else {
+                    0
+                }
+            }
+            if (score != 0) Tag(tag, null, score.toFloat()) else null
+        }
+    }
+
+    private fun metadata(context: Context): Array<String> = context.resources.getStringArray(R.array.tag_translation_metadata)
+
+    context(ctx: Context)
+    val translatable
+        get() = ctx.resources.getBoolean(R.bool.tag_translatable)
+
+    private suspend fun fetch(url: String) = ktorClient.prepareGet(url).executeSafely {
+        it.status.ensureSuccess()
+        it.bodyAsUtf8Text()
+    }
+
+    fun launchUpdate() = launch {
         updateLock.withLock {
-            updateInternal()
-        }
-    }
-
-    private fun issueUpdateInMemoryData(file: File? = null) {
-        val dataFile = file ?: getMetadata(appCtx)?.let { metadata ->
-            val dataName = metadata[2]
-            val dir = AppConfig.getFilesDir("tag-translations")
-            File(dir, dataName).takeIf { it.exists() }
-        } ?: return
-        tagGroups = dataFile.source().buffer().use(BufferedSource::parseAs)
-        initialized = true
-    }
-
-    init {
-        launch {
-            updateLock.withLock {
-                runSuspendCatching {
-                    issueUpdateInMemoryData()
-                }.onFailure {
-                    logcat(it)
-                }
-                updateInternal()
-            }
-        }
-    }
-
-    private suspend fun updateInternal() {
-        getMetadata(appCtx)?.let { metadata ->
-            val sha1Name = metadata[0]
-            val sha1Url = metadata[1]
-            val dataName = metadata[2]
-            val dataUrl = metadata[3]
-
-            val dir = AppConfig.getFilesDir("tag-translations")
-            checkNotNull(dir)
-            val sha1File = File(dir, sha1Name)
-            val dataFile = File(dir, dataName)
-
             runSuspendCatching {
-                // 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")
-                save(ktorClient, sha1Url, tempSha1File)
-                val tempSha1 = getFileContent(tempSha1File)
-
-                // Check new sha1 and current sha1
-                if (tempSha1 == sha1) {
-                    // The data is the same
-                    FileUtils.delete(tempSha1File)
-                    return
-                }
-
-                // Save new data
-                val tempDataFile = File(dir, "$dataName.tmp")
-                save(ktorClient, dataUrl, tempDataFile)
-
-                // Check new sha1 and new data
-                if (!checkData(tempSha1, tempDataFile)) {
-                    FileUtils.delete(tempSha1File)
-                    FileUtils.delete(tempDataFile)
-                    return
-                }
-
-                // 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(dataFile)
+                atomicallyUpdate()
             }.onFailure {
                 logcat(it)
             }
         }
     }
+
+    private suspend fun atomicallyUpdate() {
+        val (sha1Name, sha1Url, dataName, dataUrl) = metadata(appCtx)
+        val workdir = AppConfig.tagTranslationsDir
+        val sha1File = workdir / sha1Name
+        val dataFile = workdir / dataName
+
+        if (!initialized) {
+            Either.catch {
+                tagGroups = dataFile.read(Source::parseAs)
+                initialized = true
+
+                // Perform only one automatic update (on app startup) per day
+                val lastModified = Instant.fromEpochMilliseconds(dataFile.metadataOrNull()!!.lastModifiedAtMillis!!)
+                if (Clock.System.now() - lastModified < 1.days) return
+            }.onLeft {
+                logcat(it)
+            }
+        }
+
+        val currentSha1 = if (initialized) {
+            Either.catch { sha1File.utf8() }.getOrNull()
+        } else {
+            null
+        }
+        val newSha1 = fetch(sha1Url)
+        if (newSha1 == currentSha1) return
+
+        val rawData = fetch(dataUrl)
+        tagGroups = json.parseToJsonElement(rawData).jsonObject["data"]!!.jsonArray.associate { e ->
+            val data = e.jsonObject
+            val namespace = data["namespace"]!!.jsonPrimitive.content
+            val prefix = if (namespace == "rows") NAMESPACE_PREFIX else TagNamespace.from(namespace)!!.prefix!!
+            prefix to data["data"]!!.jsonObject.mapValues { it.value.jsonObject["name"]!!.jsonPrimitive.content }
+        }
+        initialized = true
+        sha1File.write { writeString(newSha1) }
+        dataFile.write { json.encodeToSink(tagGroups, this) }
+    }
 }

app/src/main/kotlin/com/hippo/ehviewer/client/EhUrl.kt

@@ -53,70 +53,64 @@ object EhUrl {
     const val ORIGIN_E = REFERER_E
 
     val domain: String
-        get() = when (Settings.gallerySite) {
+        get() = when (Settings.gallerySite.value) {
             SITE_E -> DOMAIN_E
             SITE_EX -> DOMAIN_EX
             else -> DOMAIN_E
         }
 
     val apiUrl: String
-        get() = if (Settings.forceEhThumb) {
-            API_E
-        } else {
-            when (Settings.gallerySite) {
-                SITE_E -> API_E
-                SITE_EX -> API_EX
-                else -> API_E
-            }
+        get() = when (Settings.gallerySite.value) {
+            SITE_E -> API_E
+            SITE_EX -> API_EX
+            else -> API_E
         }
 
     val referer: String
-        get() = when (Settings.gallerySite) {
+        get() = when (Settings.gallerySite.value) {
             SITE_E -> REFERER_E
             SITE_EX -> REFERER_EX
             else -> REFERER_E
         }
 
     val origin: String
-        get() = when (Settings.gallerySite) {
+        get() = when (Settings.gallerySite.value) {
             SITE_E -> ORIGIN_E
             SITE_EX -> ORIGIN_EX
             else -> ORIGIN_E
         }
 
-    val uConfigUrl: String
-        get() = when (Settings.gallerySite) {
-            SITE_E -> URL_UCONFIG_E
-            SITE_EX -> URL_UCONFIG_EX
-            else -> URL_UCONFIG_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 myTagsUrl: String
-        get() = when (Settings.gallerySite) {
+        get() = when (Settings.gallerySite.value) {
             SITE_E -> URL_MY_TAGS_E
             SITE_EX -> URL_MY_TAGS_EX
             else -> URL_MY_TAGS_E
         }
 
     val popularUrl: String
-        get() = when (Settings.gallerySite) {
+        get() = when (Settings.gallerySite.value) {
             SITE_E -> URL_POPULAR_E
             SITE_EX -> URL_POPULAR_EX
             else -> URL_POPULAR_E
         }
 
     val imageSearchUrl: String
-        get() = when (Settings.gallerySite) {
+        get() = when (Settings.gallerySite.value) {
             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)) {
-            if (index != 0) addQueryParameter("p", "$index")
-            if (allComment) addQueryParameter("hc", "1")
-        }.buildString()
+    fun getGalleryDetailUrl(gid: Long, token: String, index: Int = 0, allComment: Boolean = false) = ehUrl(listOf("g", "$gid", token)) {
+        if (index != 0) addQueryParameter("p", "$index")
+        if (allComment) addQueryParameter("hc", "1")
+    }.buildString()
 
     fun getGalleryMultiPageViewerUrl(gid: Long, token: String) = ehUrl(listOf("mpv", "$gid", token)).buildString()
 
@@ -130,13 +124,22 @@ object EhUrl {
         addQueryParameter("act", "addfav")
     }.buildString()
 
-    fun getDownloadArchive(gid: Long, token: String, or: String) = ehUrl("archiver.php") {
+    fun getArchiveUrl(gid: Long, token: String) = ehUrl("archiver.php") {
         addQueryParameter("gid", "$gid")
         addQueryParameter("token", token)
-        addQueryParameter("or", or)
+    }.buildString()
+
+    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()
 }
 
 inline fun ehUrl(path: String? = null, host: String = EhUrl.domain, builder: ParametersBuilder.() -> Unit) = ehUrl(

app/src/main/kotlin/com/hippo/ehviewer/client/EhUtils.kt

@@ -15,17 +15,31 @@
  */
 package com.hippo.ehviewer.client
 
+import android.app.DownloadManager
+import android.content.ActivityNotFoundException
+import android.content.Context
+import android.content.Intent
+import android.os.Environment
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.runtime.Stable
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.toArgb
-import androidx.core.graphics.ColorUtils
+import androidx.core.net.toUri
 import arrow.core.memoize
+import com.ehviewer.core.model.GalleryDetail
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.util.withUIContext
 import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.client.data.GalleryInfo
-import kotlin.math.abs
+import com.hippo.ehviewer.client.parser.Archive
+import com.hippo.ehviewer.spider.SpiderDen
+import com.hippo.ehviewer.util.AppConfig
+import com.hippo.ehviewer.util.FileUtils
+import com.hippo.ehviewer.util.addTextToClipboard
+import com.materialkolor.hct.Hct
+import com.materialkolor.ktx.from
+import com.materialkolor.ktx.toColor
+import splitties.systemservices.downloadManager
 
 object EhUtils {
     const val NONE = -1 // Use it for homepage
@@ -84,88 +98,76 @@ object EhUtils {
     private val CATEGORY_STRINGS = CATEGORY_VALUES.entries.map { (k, v) -> v to k }
 
     val isExHentai: Boolean
-        get() = Settings.gallerySite == EhUrl.SITE_EX
+        get() = Settings.gallerySite.value == EhUrl.SITE_EX
+
+    val isMpvAvailable
+        get() = EhCookieStore.getHathPerks()?.contains('q') == true
 
     fun getCategory(type: String?): Int {
         for (entry in CATEGORY_STRINGS) {
-            for (str in entry.first)
+            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]
-    }
+    fun getCategory(type: Int): String = CATEGORY_VALUES.getOrDefault(type, CATEGORY_VALUES[UNKNOWN])!![0]
 
-    private fun differenceDegrees(a: Float, b: Float): Float {
-        return 180.0f - abs(abs(a - b) - 180.0f)
-    }
+    fun invCategory(category: Int): Int = category.inv() and ALL_CATEGORY
 
-    private fun sanitizeDegreesDouble(degrees: Float): Float {
-        val deg = degrees % 360.0f
-        return if (deg < 0) deg + 360.0f else deg
-    }
-
-    private fun rotationDirection(from: Float, to: Float): Float {
-        val increasingDifference = sanitizeDegreesDouble(to - from)
-        return if (increasingDifference <= 180.0) 1.0f else -1.0f
-    }
-
-    val harmonizeWithRole = { primaryContainer: Int, src: Int ->
-        val fromHct = FloatArray(3).apply { ColorUtils.colorToM3HCT(src, this) }
-        val toHct = FloatArray(3).apply { ColorUtils.colorToM3HCT(primaryContainer, this) }
-        val differenceDegrees = differenceDegrees(fromHct[0], toHct[0])
-        val rotationDegrees = minOf(differenceDegrees * 0.5f, 15.0f)
-        val outputHue = sanitizeDegreesDouble(fromHct[0] + rotationDegrees * rotationDirection(fromHct[0], toHct[0]))
-        ColorUtils.M3HCTToColor(outputHue, toHct[1], toHct[2])
+    val mergeColor = { primaryContainer: Color, src: Color ->
+        val fromHct = Hct.from(src)
+        val toHct = Hct.from(primaryContainer)
+        Hct.from(fromHct.hue, toHct.chroma, toHct.tone).toColor()
     }.memoize()
 
     @Stable
     @ReadOnlyComposable
     @Composable
     fun getCategoryColor(category: Int): Color {
-        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()
-        val color = if (Settings.harmonizeCategoryColor) {
-            val primaryContainer = MaterialTheme.colorScheme.primaryContainer.toArgb()
-            harmonizeWithRole(primaryContainer, primary)
+        val primary = Color(
+            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.value) {
+            val primaryContainer = MaterialTheme.colorScheme.primaryContainer
+            mergeColor(primaryContainer, primary)
         } else {
             primary
         }
-        return Color(color)
     }
 
     val categoryTextColor = Color(0xffe6e0e9)
 
+    val favoriteIconColor = Color(0xffff3040)
+
     fun signOut() {
         EhCookieStore.removeAllCookies()
         Settings.displayName.value = null
         Settings.hasSignedIn.value = false
-        Settings.gallerySite = EhUrl.SITE_E
-        Settings.needSignIn = true
+        Settings.gallerySite.value = EhUrl.SITE_E
+        Settings.needSignIn.value = true
     }
 
-    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 getSuitableTitle(gi: GalleryInfo): String = if (Settings.showJpnTitle.value) {
+        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
@@ -177,22 +179,34 @@ object EhUtils {
         return title.substringBeforeLast('|').trim().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
+    context(ctx: Context)
+    suspend fun downloadArchive(galleryDetail: GalleryDetail, archive: Archive) {
+        val gid = galleryDetail.gid
+        EhEngine.downloadArchive(gid, galleryDetail.token, archive.res, archive.isHath)?.let {
+            val uri = it.toUri()
+            val intent = Intent().apply {
+                action = Intent.ACTION_VIEW
+                setDataAndType(uri, "application/zip")
+            }
+            val name = "$gid-${getSuitableTitle(galleryDetail)}.zip"
+            try {
+                ctx.startActivity(intent)
+                withUIContext { addTextToClipboard(name, true) }
+            } catch (_: ActivityNotFoundException) {
+                val r = DownloadManager.Request(uri)
+                r.setDestinationInExternalPublicDir(
+                    Environment.DIRECTORY_DOWNLOADS,
+                    AppConfig.APP_DIRNAME + "/" + FileUtils.sanitizeFilename(name),
+                )
+                r.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
+                downloadManager.enqueue(r)
+            }
+            if (Settings.archiveMetadata.value) {
+                SpiderDen(galleryDetail).apply {
+                    initDownloadDir()
+                    writeComicInfo()
+                }
+            }
         }
     }
 }

app/src/main/kotlin/com/hippo/ehviewer/client/data/AbstractDownloadInfo.kt

@@ -1,13 +0,0 @@
-package com.hippo.ehviewer.client.data
-
-interface AbstractDownloadInfo {
-    var state: Int
-    var legacy: Int
-    var time: Long
-    var label: String?
-    var speed: Long
-    var remaining: Long
-    var finished: Int
-    var downloaded: Int
-    var total: Int
-}

app/src/main/kotlin/com/hippo/ehviewer/client/data/BaseGalleryInfo.kt

@@ -1,101 +0,0 @@
-/*
- * 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 androidx.room.TypeConverter
-import androidx.room.TypeConverters
-import com.hippo.ehviewer.client.data.GalleryInfo.Companion.NOT_FAVORITED
-import kotlinx.parcelize.Parcelize
-import kotlinx.serialization.Serializable
-
-@Parcelize
-@Serializable
-@Entity(tableName = "GALLERIES")
-@TypeConverters(SimpleTagsConverter::class)
-data class BaseGalleryInfo(
-    @PrimaryKey
-    @ColumnInfo(name = "GID")
-    override var gid: Long,
-
-    @ColumnInfo(name = "TOKEN")
-    override var token: String,
-
-    @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,
-
-    @ColumnInfo(name = "SIMPLE_TAGS")
-    override var simpleTags: List<String>? = null,
-
-    @ColumnInfo(name = "PAGES", defaultValue = "0")
-    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, "")
-}
-
-class SimpleTagsConverter {
-    @TypeConverter
-    fun fromString(value: String) = value.split(", ")
-
-    @TypeConverter
-    fun toString(value: List<String>) = value.joinToString()
-}

app/src/main/kotlin/com/hippo/ehviewer/client/data/FavListUrlBuilder.kt

@@ -15,24 +15,27 @@
  */
 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.parcelize.Parcelize
+import kotlinx.serialization.Serializable
 
-@Parcelize
+@Serializable
 data class FavListUrlBuilder(
     val favCat: Int = FAV_CAT_ALL,
     val keyword: String? = null,
-    var jumpTo: String? = null,
-    var prev: String? = null,
-    var next: String? = null,
-) : Parcelable {
+    private var jumpTo: String? = null,
+    private var prev: String? = null,
+    private var next: String? = null,
+) {
+    val isLocal
+        get() = favCat == FAV_CAT_LOCAL
+
     fun setIndex(index: String?, isNext: Boolean) {
         next = index.takeIf { isNext }
         prev = index.takeUnless { isNext }
+        jumpTo = null
     }
 
     fun build() = ehUrl(EhUrl.FAV_PATH) {

app/src/main/kotlin/com/hippo/ehviewer/client/data/GalleryDetail.kt

@@ -15,9 +15,14 @@
  */
 package com.hippo.ehviewer.client.data
 
-import android.os.Parcelable
-import com.hippo.ehviewer.client.data.GalleryInfo.Companion.S_LANGS
-import kotlinx.parcelize.Parcelize
+import androidx.compose.ui.util.fastFlatMap
+import com.ehviewer.core.model.GalleryDetail
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.model.GalleryTagGroup
+import com.ehviewer.core.model.PowerStatus
+import com.hippo.ehviewer.EhDB
+import com.hippo.ehviewer.Settings
+import com.hippo.ehviewer.client.EhFilter
 
 private val LANGUAGES = arrayOf(
     "English",
@@ -36,29 +41,27 @@ private val LANGUAGES = arrayOf(
     "Dutch",
 )
 
-@Parcelize
-data 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 visible: String? = null,
-    var language: String? = null,
-    var size: String? = null,
-    var favoriteCount: Int = 0,
-    var ratingCount: Int = 0,
-    val tags: List<GalleryTagGroup>,
-    var comments: GalleryCommentList,
-    val previewPages: Int,
-    val previewList: List<GalleryPreview>,
-) : GalleryInfo by galleryInfo, Parcelable {
-    fun fillInfo() {
-        val index = LANGUAGES.indexOf(language)
-        if (index != -1) simpleLanguage = S_LANGS[index]
-        simpleTags = tags.flatten()
+suspend fun GalleryDetail.fillInfo() {
+    val index = LANGUAGES.indexOf(language)
+    if (index != -1) simpleLanguage = GalleryInfo.S_LANGS[index]
+    simpleTags = tagGroups.fastFlatMap(GalleryTagGroup::tags).map { (text, power, _) ->
+        if (power == PowerStatus.Weak) "_$text" else text
+    }
+    if (favoriteSlot == GalleryInfo.NOT_FAVORITED && EhDB.containLocalFavorites(gid)) {
+        favoriteSlot = GalleryInfo.LOCAL_FAVORITED
+    }
+}
+
+suspend fun GalleryDetail.filterComments() {
+    comments = with(comments) {
+        val scoreThreshold = Settings.commentThreshold.value
+        copy(
+            comments = comments.filter {
+                it.uploader ||
+                    it.score > scoreThreshold &&
+                    !EhFilter.filterCommenter(it.user.orEmpty()) &&
+                    !EhFilter.filterComment(it.comment)
+            },
+        )
     }
 }

app/src/main/kotlin/com/hippo/ehviewer/client/data/ListUrlBuilder.kt

@@ -15,55 +15,58 @@
  */
 package com.hippo.ehviewer.client.data
 
-import android.os.Parcelable
-import androidx.annotation.IntDef
+import com.ehviewer.core.database.model.QuickSearch
+import com.ehviewer.core.model.GalleryInfo
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.client.addQueryParameter
 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.toIntOrDefault
-import java.io.UnsupportedEncodingException
-import java.net.URLDecoder
-import kotlinx.parcelize.Parcelize
+import io.ktor.http.Parameters
+import kotlinx.serialization.Serializable
 
-@Parcelize
+@Serializable
 data class ListUrlBuilder(
-    @get:Mode @Mode
     var mode: Int = MODE_NORMAL,
-    private var mPrev: String? = null,
-    var mNext: String? = null,
-    // Reset to null after initial loading
-    var mJumpTo: String? = null,
-    private var mRange: Int = 0,
+    private var prev: String? = null,
+    private var next: String? = null,
+    private var jumpTo: String? = null,
+    private var range: Int = 0,
     var category: Int = EhUtils.NONE,
     private var mKeyword: String? = null,
     var hash: String? = null,
+    var language: Int = -1,
     var advanceSearch: Int = -1,
     var minRating: Int = -1,
     var pageFrom: Int = -1,
     var pageTo: Int = -1,
-    var imagePath: String? = null,
-) : Parcelable {
+) {
 
     fun setIndex(index: String, isNext: Boolean = true) {
-        mNext = index.takeIf { isNext }
-        mPrev = index.takeUnless { isNext }
-        mRange = 0
+        next = index.takeIf { isNext }
+        prev = index.takeUnless { isNext }
+        range = 0
+        jumpTo = null
     }
 
-    fun setJumpTo(jumpTo: Int) {
-        mJumpTo = jumpTo.takeUnless { it == 0 }?.toString()
+    var page: Int
+        get() = (jumpTo?.toInt() ?: 0) + 1
+        set(value) {
+            jumpTo = (value - 1).takeUnless { it == 0 }?.toString()
+        }
+
+    fun setRange(to: Int) {
+        range = to
+        prev = null
+        next = null
+        jumpTo = null
     }
 
-    fun setRange(range: Int) {
-        mRange = range
-        mPrev = null
-        mNext = null
-        mJumpTo = null
+    fun setSeek(date: String) {
+        setIndex("2", true)
+        jumpTo = date
     }
 
     var keyword: String?
@@ -72,29 +75,27 @@ data class ListUrlBuilder(
             mKeyword = keyword
         }
 
-    constructor(q: QuickSearch) : this() {
-        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('@', "").ifEmpty { null }
-    }
+    constructor(q: QuickSearch) : this(
+        mode = q.mode,
+        category = q.category,
+        mKeyword = q.keyword,
+        advanceSearch = q.advanceSearch,
+        minRating = q.minRating,
+        pageFrom = q.pageFrom,
+        pageTo = q.pageTo,
+        next = q.name.substringAfterLast('@', "").ifEmpty { null },
+    )
 
-    fun toQuickSearch(name: String): QuickSearch {
-        return QuickSearch(
-            name = name,
-            mode = mode,
-            category = category,
-            keyword = mKeyword,
-            advanceSearch = advanceSearch,
-            minRating = minRating,
-            pageFrom = pageFrom,
-            pageTo = pageTo,
-        )
-    }
+    fun toQuickSearch(name: String) = 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) {
@@ -122,235 +123,118 @@ data class ListUrlBuilder(
         }
     }
 
-    /**
-     * @param query xxx=yyy&mmm=nnn
-     */
-    constructor(query: String?) : this() {
-        // TODO page
-        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
+    constructor(params: Parameters) : this(
+        prev = params["prev"],
+        next = params["next"],
+        jumpTo = params["seek"],
+        range = params["range"]?.toIntOrNull() ?: 0,
+        category = params["f_cats"]?.toIntOrNull()?.let(EhUtils::invCategory) ?: EhUtils.NONE,
+        mKeyword = params["f_search"],
+    ) {
+        if (params["advsearch"] == "1") {
+            advanceSearch = 0
+            if (params["f_sh"] == "on") {
+                advanceSearch = advanceSearch or AdvanceTable.SH
             }
-            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
+            if (params["f_sto"] == "on") {
+                advanceSearch = advanceSearch or AdvanceTable.STO
             }
-        }
-        this.category = category
-        mKeyword = keyword
-        if (enableAdvanceSearch) {
-            this.advanceSearch = advanceSearch
-            if (enableMinRating) {
-                this.minRating = minRating
-            } else {
-                this.minRating = -1
+            if (params["f_sfl"] == "on") {
+                advanceSearch = advanceSearch or AdvanceTable.SFL
             }
-            if (enablePage) {
-                this.pageFrom = pageFrom
-                this.pageTo = pageTo
-            } else {
-                this.pageFrom = -1
-                this.pageTo = -1
+            if (params["f_sfu"] == "on") {
+                advanceSearch = advanceSearch or AdvanceTable.SFU
             }
-        } else {
-            this.advanceSearch = -1
+            if (params["f_sft"] == "on") {
+                advanceSearch = advanceSearch or AdvanceTable.SFT
+            }
+            minRating = params["f_srdd"]?.toIntOrNull() ?: -1
+            pageFrom = params["f_spf"]?.toIntOrNull() ?: -1
+            pageTo = params["f_spt"]?.toIntOrNull() ?: -1
         }
     }
 
-    fun build(): String {
-        return when (mode) {
-            MODE_NORMAL, MODE_SUBSCRIPTION -> ehUrl(EhUrl.WATCHED_PATH.takeIf { mode == MODE_SUBSCRIPTION }) {
-                val category = if (!Settings.hasSignedIn.value && category <= 0) EhUtils.NON_H else category
-                if (category > 0) {
-                    addQueryParameter("f_cats", (category.inv() and EhUtils.ALL_CATEGORY).toString())
-                }
-                val query = mKeyword?.let {
-                    val index = Settings.languageFilter.value
-                    GalleryInfo.S_LANG_TAGS.getOrNull(index)?.let { lang ->
-                        "$it $lang"
-                    } ?: it
-                }
-                addQueryParameterIfNotBlank("f_search", query)
-                addQueryParameterIfNotBlank("prev", mPrev)
-                addQueryParameterIfNotBlank("next", mNext)
-                addQueryParameterIfNotBlank("seek", mJumpTo)
-                addQueryParameterIfNotBlank("range", mRange.takeIf { it > 0 }?.toString())
-                // Advance search
-                if (advanceSearch > 0 || minRating > 0 || pageFrom > 0 || pageTo > 0) {
-                    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 > 0) {
-                        addQueryParameter("f_sr", "on")
-                        addQueryParameter("f_srdd", "$minRating")
-                    }
-                    // Pages
-                    if (pageFrom > 0 || pageTo > 0) {
-                        addQueryParameter("f_sp", "on")
-                        addQueryParameterIfNotBlank(
-                            "f_spf",
-                            pageFrom.takeIf { it > 0 }?.toString(),
-                        )
-                        addQueryParameterIfNotBlank(
-                            "f_spt",
-                            pageTo.takeIf { it > 0 }?.toString(),
-                        )
-                    }
-                }
-            }.buildString()
-
-            MODE_UPLOADER, MODE_TAG -> {
-                val path = if (mode == MODE_UPLOADER) "uploader" else "tag"
-                ehUrl(listOf(path, requireNotNull(mKeyword))) {
-                    addQueryParameterIfNotBlank("prev", mPrev)
-                    addQueryParameterIfNotBlank("next", mNext)
-                    addQueryParameterIfNotBlank("seek", mJumpTo)
-                    addQueryParameterIfNotBlank("range", mRange.takeIf { it > 0 }?.toString())
-                }.buildString()
+    fun build(): String = when (mode) {
+        MODE_NORMAL, MODE_SUBSCRIPTION -> ehUrl(EhUrl.WATCHED_PATH.takeIf { mode == MODE_SUBSCRIPTION }) {
+            val category = if (!Settings.hasSignedIn.value && category <= 0) EhUtils.NON_H else category
+            if (category > 0) {
+                addQueryParameter("f_cats", "${EhUtils.invCategory(category)}")
             }
-
-            MODE_WHATS_HOT -> EhUrl.popularUrl
-            MODE_IMAGE_SEARCH -> ehUrl {
-                addQueryParameter("f_shash", requireNotNull(hash))
-            }.buildString()
-            MODE_TOPLIST -> {
-                ehUrl("toplist.php", EhUrl.DOMAIN_E) {
-                    addQueryParameter("tl", requireNotNull(mKeyword))
-                    addQueryParameterIfNotBlank("p", mJumpTo)
-                }.buildString()
+            val query = mKeyword?.let { keyword ->
+                if (language == -1 || "gid:" in keyword || "l:" in keyword || "language:" in keyword) {
+                    keyword
+                } else {
+                    val tag = GalleryInfo.S_LANG_TAGS[language]
+                    if (keyword.isNotEmpty()) {
+                        "$tag $keyword"
+                    } else {
+                        tag
+                    }
+                }
             }
+            addQueryParameterIfNotBlank("f_search", query)
+            addQueryParameterIfNotBlank("prev", prev)
+            addQueryParameterIfNotBlank("next", next)
+            addQueryParameterIfNotBlank("seek", jumpTo)
+            addQueryParameterIfNotBlank("range", range.takeIf { it > 0 }?.toString())
+            // Advance search
+            if (advanceSearch > 0 || minRating > 0 || pageFrom > 0 || pageTo > 0) {
+                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 > 0) {
+                    addQueryParameter("f_srdd", "$minRating")
+                }
+                // Pages
+                if (pageFrom > 0 || pageTo > 0) {
+                    addQueryParameterIfNotBlank(
+                        "f_spf",
+                        pageFrom.takeIf { it > 0 }?.toString(),
+                    )
+                    addQueryParameterIfNotBlank(
+                        "f_spt",
+                        pageTo.takeIf { it > 0 }?.toString(),
+                    )
+                }
+            }
+        }.buildString()
 
-            else -> throw IllegalStateException("Unexpected value: $mode")
+        MODE_UPLOADER, MODE_TAG -> {
+            val path = if (mode == MODE_UPLOADER) "uploader" else "tag"
+            ehUrl(listOf(path, requireNotNull(mKeyword))) {
+                addQueryParameterIfNotBlank("prev", prev)
+                addQueryParameterIfNotBlank("next", next)
+                addQueryParameterIfNotBlank("seek", jumpTo)
+                addQueryParameterIfNotBlank("range", range.takeIf { it > 0 }?.toString())
+            }.buildString()
         }
+
+        MODE_WHATS_HOT -> EhUrl.popularUrl
+        MODE_IMAGE_SEARCH -> ehUrl {
+            addQueryParameter("f_shash", requireNotNull(hash))
+        }.buildString()
+        MODE_TOPLIST -> ehUrl("toplist.php", EhUrl.DOMAIN_E) {
+            addQueryParameter("tl", requireNotNull(mKeyword))
+            addQueryParameterIfNotBlank("p", jumpTo)
+        }.buildString()
+
+        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

app/src/main/kotlin/com/hippo/ehviewer/client/data/TagNamespace.kt

@@ -1,33 +0,0 @@
-package com.hippo.ehviewer.client.data
-
-@JvmInline
-value class TagNamespace(val value: String) {
-    fun toPrefix(): String? = prefixMap[this]
-
-    companion object {
-        val Artist = TagNamespace("artist")
-        val Cosplayer = TagNamespace("cosplayer")
-        val Character = TagNamespace("character")
-        val Female = TagNamespace("female")
-        val Group = TagNamespace("group")
-        val Language = TagNamespace("language")
-        val Male = TagNamespace("male")
-        val Mixed = TagNamespace("mixed")
-        val Other = TagNamespace("other")
-        val Parody = TagNamespace("parody")
-        val Reclass = TagNamespace("reclass")
-        private val prefixMap = mapOf(
-            Artist to "a",
-            Cosplayer to "cos",
-            Character to "c",
-            Female to "f",
-            Group to "g",
-            Language to "l",
-            Male to "m",
-            Mixed to "x",
-            Other to "o",
-            Parody to "p",
-            Reclass to "r",
-        )
-    }
-}

app/src/main/kotlin/com/hippo/ehviewer/client/exception/CloudflareBypassException.kt

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

app/src/main/kotlin/com/hippo/ehviewer/client/exception/FatalException.kt

@@ -0,0 +1,13 @@
+package com.hippo.ehviewer.client.exception
+
+import androidx.annotation.StringRes
+import com.ehviewer.core.i18n.R
+
+sealed class FatalException : EhException {
+    constructor(message: String) : super(message)
+    constructor(@StringRes messageId: Int) : super(messageId)
+}
+
+class IpBannedException(message: String) : FatalException(message)
+class InsufficientGpException : FatalException(R.string.insufficient_gp)
+class QuotaExceededException : FatalException(R.string.error_509)

app/src/main/kotlin/com/hippo/ehviewer/client/exception/InsufficientFundsException.kt

@@ -1,5 +1,5 @@
 package com.hippo.ehviewer.client.exception
 
-import com.hippo.ehviewer.R
+import com.ehviewer.core.i18n.R
 
 class InsufficientFundsException : EhException(R.string.insufficient_funds)

app/src/main/kotlin/com/hippo/ehviewer/client/exception/NoHathClientException.kt

@@ -15,4 +15,6 @@
  */
 package com.hippo.ehviewer.client.exception
 
-class NoHAtHClientException(detailMessage: String?) : EhException(detailMessage)
+import com.ehviewer.core.i18n.R
+
+class NoHathClientException() : EhException(R.string.download_archive_failure_no_hath)

app/src/main/kotlin/com/hippo/ehviewer/client/exception/NoHitsFoundException.kt

@@ -0,0 +1,5 @@
+package com.hippo.ehviewer.client.exception
+
+import com.ehviewer.core.i18n.R
+
+class NoHitsFoundException : EhException(R.string.gallery_list_empty_hit)

app/src/main/kotlin/com/hippo/ehviewer/client/exception/NotLoggedInException.kt

@@ -1,5 +1,5 @@
 package com.hippo.ehviewer.client.exception
 
-import com.hippo.ehviewer.R
+import com.ehviewer.core.i18n.R
 
 class NotLoggedInException : EhException(R.string.sign_in_first)

app/src/main/kotlin/com/hippo/ehviewer/client/exception/QuotaExceededException.kt

@@ -1,5 +0,0 @@
-package com.hippo.ehviewer.client.exception
-
-import com.hippo.ehviewer.R
-
-class QuotaExceededException : EhException(R.string.error_509)

app/src/main/kotlin/com/hippo/ehviewer/client/parser/ArchiveParser.kt

@@ -15,76 +15,43 @@
  */
 package com.hippo.ehviewer.client.parser
 
-import com.hippo.ehviewer.client.exception.InsufficientFundsException
-import com.hippo.ehviewer.client.exception.NoHAtHClientException
-import eu.kanade.tachiyomi.util.system.logcat
-import org.jsoup.Jsoup
+import arrow.core.Either.Companion.catch
+import arrow.core.getOrElse
+import arrow.core.partially3
+import com.hippo.ehviewer.client.exception.ParseException
+import java.nio.ByteBuffer
+import kotlinx.serialization.Serializable
 
 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, maybeFunds: Funds?): 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 {
-                    logcat(it)
-                }
-            }
+    fun parse(body: ByteBuffer, maybeFunds: Funds?) = catch {
+        if (maybeFunds != null) {
+            val archives = unmarshalParsingAs<List<Archive>>(body, ::parseArchives)
+            Result(archives, maybeFunds)
+        } else {
+            unmarshalParsingAs<Result>(body, ::parseArchives.partially3(true))
         }
-        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 funds = maybeFunds ?: PATTERN_CURRENT_FUNDS.find(body)!!.groupValues.run {
-            val fundsGP = ParserUtils.parseInt(get(1), 0)
-            val fundsC = ParserUtils.parseInt(get(2), 0)
-            Funds("%,d".format(fundsGP), "%,d".format(fundsC))
-        }
-        return Result(paramOr, archiveList, funds)
+    }.getOrElse {
+        throw ParseException("Can't parse archive list", it)
     }
 
-    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
+    fun parseArchiveUrl(body: ByteBuffer) = catch {
+        unmarshalParsingAs<String?>(body, ::parseArchiveUrl)
+    }.getOrElse {
+        throw ParseException("Can't parse archive url", it)
     }
 
-    data class Result(val paramOr: String, val archiveList: List<Archive>, val funds: Funds)
+    @Serializable
+    data class Result(val archiveList: List<Archive>, val funds: Funds)
 }
 
+@Serializable
 class Archive(
     val res: String,
     val name: String,
     val size: String,
     val cost: String,
-    val isHAtH: Boolean,
+    val isHath: Boolean,
 )
+
+private external fun parseArchives(body: ByteBuffer, size: Int = body.limit(), parseFunds: Boolean = false): Int
+private external fun parseArchiveUrl(body: ByteBuffer, size: Int = body.limit()): Int

app/src/main/kotlin/com/hippo/ehviewer/client/parser/EventPaneParser.kt

@@ -17,10 +17,10 @@
  */
 package com.hippo.ehviewer.client.parser
 
-import org.jsoup.Jsoup
+import java.nio.ByteBuffer
 
 object EventPaneParser {
-    fun parse(body: String): String? {
-        return Jsoup.parse(body).getElementById("eventpane")?.html()
-    }
+    private external fun parseEventPane(body: ByteBuffer, size: Int = body.limit()): Int
+
+    fun parse(body: ByteBuffer): String? = unmarshalParsingAs(body, ::parseEventPane)
 }

app/src/main/kotlin/com/hippo/ehviewer/client/parser/FavoritesParser.kt

@@ -1,5 +1,6 @@
 package com.hippo.ehviewer.client.parser
 
+import com.ehviewer.core.util.unescapeXml
 import com.hippo.ehviewer.client.exception.ParseException
 import java.nio.ByteBuffer
 import kotlinx.serialization.Serializable
@@ -17,13 +18,16 @@ data class FavParserResult(
 }
 
 object FavoritesParser {
-    fun parse(body: ByteBuffer): FavParserResult {
-        return runSuspendCatching {
-            unmarshalParsingAs<FavParserResult>(body, ::parseFav)
-        }.getOrElse {
-            throw ParseException("Parse favorites error", it)
-        }
+    private val NoteRegex = Regex("<textarea[^>]*>([^<]*)</textarea>")
+
+    fun parse(body: ByteBuffer): FavParserResult = runSuspendCatching {
+        unmarshalParsingAs<FavParserResult>(body, ::parseFav)
+    }.getOrElse {
+        throw ParseException("Parse favorites error", it)
     }
+
+    fun parseNote(body: String) = NoteRegex.find(body)?.run { groupValues[1].unescapeXml() }
+        ?: throw ParseException("Can't parse favorite note")
 }
 
 private external fun parseFav(body: ByteBuffer, limit: Int = body.limit()): Int

app/src/main/kotlin/com/hippo/ehviewer/client/parser/ForumsParser.kt

@@ -1,35 +0,0 @@
-/*
- * 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()
-        }
-    }
-}

app/src/main/kotlin/com/hippo/ehviewer/client/parser/GalleryApiParser.kt

@@ -15,12 +15,11 @@
  */
 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
 
@@ -32,7 +31,7 @@ object GalleryApiParser {
                 title = item.title.unescapeXml()
                 titleJpn = item.titleJpn.unescapeXml()
                 category = getCategory(item.category)
-                thumbKey = getThumbKey(handleThumbUrlResolution(item.thumb)!!)
+                thumbKey = getThumbKey(item.thumb)
                 uploader = item.uploader?.unescapeXml()
                 posted = ParserUtils.formatDate(item.posted * 1000)
                 rating = item.rating

app/src/main/kotlin/com/hippo/ehviewer/client/parser/GalleryDetailParser.kt

@@ -15,481 +15,40 @@
  */
 package com.hippo.ehviewer.client.parser
 
-import arrow.core.unzip
-import com.hippo.ehviewer.EhDB
-import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.client.EhFilter
-import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.client.EhUtils.getCategory
-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 arrow.core.Either
+import arrow.core.getOrElse
+import com.ehviewer.core.model.GalleryCommentList
+import com.ehviewer.core.model.GalleryDetail
+import com.ehviewer.core.model.GalleryPreviewList
 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.toEpochMillis
-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 eu.kanade.tachiyomi.util.system.logcat
-import kotlinx.datetime.LocalDateTime
-import kotlinx.datetime.format.MonthNames
-import kotlinx.datetime.format.char
-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.nio.ByteBuffer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.cbor.CborArray
 
 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_COMMENT_LIST = GalleryCommentList(emptyList(), false)
-
-    // dd MMMM yyyy, HH:mm
-    private val WEB_COMMENT_DATE_FORMAT = LocalDateTime.Format {
-        dayOfMonth()
-        char(' ')
-        monthName(MonthNames.ENGLISH_FULL)
-        char(' ')
-        year()
-        chars(", ")
-        hour()
-        char(':')
-        minute()
-    }
-    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]) }
-        val document = Jsoup.parse(body)
-        val galleryDetail = GalleryDetail(
-            tags = parseTagGroups(document),
-            comments = parseComments(document),
-            previewPages = parsePreviewPages(body),
-            previewList = parsePreviewList(body).first,
-        )
-        parseDetail(galleryDetail, document, body)
-
-        // Fill info for database
-        galleryDetail.fillInfo()
-        return galleryDetail
+    fun parse(body: ByteBuffer) = Either.catch {
+        unmarshalParsingAs<Result>(body, ::nativeParse)
+    }.getOrElse {
+        throw ParseException("Failed to parse gallery detail", it)
     }
 
-    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()
-            gd.newerVersions = select("a").mapIndexedNotNull { index, element ->
-                val result = GalleryDetailUrlParser.parse(element.attr("href"))
-                result?.run {
-                    BaseGalleryInfo(gid, token, element.text().trim(), posted = dates[index])
-                }
-            }
-        }
+    fun parseComments(body: ByteBuffer) = Either.catch {
+        unmarshalParsingAs<GalleryCommentList>(body, ::nativeParseComments)
+    }.getOrElse {
+        throw ParseException("Failed to parse comments", it)
     }
 
-    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)
-                    }
-                }
-            }
-        }
+    fun parsePreviews(body: ByteBuffer) = Either.catch {
+        unmarshalParsingAs<GalleryPreviewList>(body, ::nativeParsePreviews)
+    }.getOrElse {
+        throw ParseException("Failed to parse previews", it)
     }
 
-    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)
-            logcat(e)
-            null
-        }
-    }
+    @Serializable
+    @CborArray
+    class Result(val detail: GalleryDetail, val event: String?)
 
-    /**
-     * Parse tag groups with html parser
-     */
-    private fun parseTagGroups(document: Document): List<GalleryTagGroup> {
-        return try {
-            val taglist = document.getElementById("taglist")!!
-            val tagGroups = taglist.child(0).child(0).children()
-            parseTagGroups(tagGroups)
-        } catch (e: Throwable) {
-            ExceptionUtils.throwIfFatal(e)
-            logcat(e)
-            emptyList()
-        }
-    }
-
-    private fun parseTagGroups(trs: Elements): List<GalleryTagGroup> {
-        return try {
-            trs.mapNotNull { parseTagGroup(it) }
-        } catch (e: Throwable) {
-            ExceptionUtils.throwIfFatal(e)
-            logcat(e)
-            emptyList()
-        }
-    }
-
-    private suspend fun parseComment(element: Element): GalleryComment? {
-        return try {
-            // Id
-            val a = element.previousElementSibling()
-            val name = a!!.attr("name")
-            val id = name trimAnd { substring(1).toInt().toLong() }
-            // Editable, vote up and vote down
-            val c4 = element.getElementsByClass("c4").first()
-            var voteUpAble = false
-            var voteUpEd = false
-            var voteDownAble = false
-            var voteDownEd = false
-            var editable = false
-            var uploader = false
-            if (null != c4) {
-                if ("Uploader Comment" == c4.text()) {
-                    uploader = true
-                }
-                for (e in c4.children()) {
-                    when (e.text()) {
-                        "Vote+" -> {
-                            voteUpAble = true
-                            voteUpEd = e.attr("style").trim().isNotEmpty()
-                        }
-
-                        "Vote-" -> {
-                            voteDownAble = true
-                            voteDownEd = e.attr("style").trim().isNotEmpty()
-                        }
-
-                        "Edit" -> editable = true
-                    }
-                }
-            }
-            // Vote state
-            val c7 = element.getElementsByClass("c7").first()
-            val voteState = c7?.text()?.trim()
-            // Score
-            val c5 = element.getElementsByClass("c5").first()
-            val score = c5?.children()?.first()?.text()?.trim()?.toIntOrDefault(0) ?: 0
-            // time
-            val c3 = element.getElementsByClass("c3").first()
-            val temp = c3!!.ownText()
-            val (timeStr, user) = if (temp.endsWith(':')) {
-                temp.substring("Posted on ".length, temp.length - " by:".length) to c3.child(0).text()
-            } else {
-                temp.substring("Posted on ".length) to null
-            }
-            val time = WEB_COMMENT_DATE_FORMAT.parse(timeStr).toEpochMillis()
-            // 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")
-                }
-            }
-            val commentHtml = c6.html()
-            // filter comment
-            if (!uploader) {
-                val sEhFilter = EhFilter
-                if (score <= Settings.commentThreshold || sEhFilter.filterCommenter(user.orEmpty()) || sEhFilter.filterComment(commentHtml)) {
-                    return null
-                }
-            }
-            // last edited
-            val c8 = element.getElementsByClass("c8").first()
-            val lastEdited = c8?.children()?.first()?.run { WEB_COMMENT_DATE_FORMAT.parse(text()).toEpochMillis() } ?: 0
-            GalleryComment(
-                id, score, editable, voteUpAble, voteUpEd, voteDownAble,
-                voteDownEd, uploader, voteState, time, user, commentHtml, lastEdited,
-            )
-        } catch (e: Throwable) {
-            ExceptionUtils.throwIfFatal(e)
-            logcat(e)
-            null
-        }
-    }
-
-    /**
-     * Parse comments with html parser
-     */
-    suspend fun parseComments(document: Document): GalleryCommentList {
-        // Disable pretty print to get comments in raw html
-        document.outputSettings().prettyPrint(false)
-        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, hasMore)
-        } catch (e: Throwable) {
-            ExceptionUtils.throwIfFatal(e)
-            logcat(e)
-            EMPTY_GALLERY_COMMENT_LIST
-        }
-    }
-
-    /**
-     * 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()
-        }
-    }
+    private external fun nativeParse(body: ByteBuffer, size: Int = body.limit()): Int
+    private external fun nativeParseComments(body: ByteBuffer, size: Int = body.limit()): Int
+    private external fun nativeParsePreviews(body: ByteBuffer, size: Int = body.limit()): Int
 }

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

@@ -1,6 +1,6 @@
 package com.hippo.ehviewer.client.parser
 
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
+import com.ehviewer.core.model.BaseGalleryInfo
 import com.hippo.ehviewer.client.exception.ParseException
 import java.nio.ByteBuffer
 import kotlinx.serialization.Serializable

app/src/main/kotlin/com/hippo/ehviewer/client/parser/GalleryListUrlParser.kt

@@ -15,124 +15,56 @@
  */
 package com.hippo.ehviewer.client.parser
 
-import android.net.Uri
-import android.os.Build
+import arrow.core.Either
 import com.hippo.ehviewer.client.EhUrl
+import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.client.data.ListUrlBuilder
-import eu.kanade.tachiyomi.util.system.logcat
-import java.io.UnsupportedEncodingException
-import java.net.MalformedURLException
-import java.net.URL
-import java.net.URLDecoder
-import java.nio.charset.StandardCharsets
+import io.ktor.http.Url
+import io.ktor.http.decodeURLQueryComponent
 
 object GalleryListUrlParser {
-    private val VALID_HOSTS = arrayOf(EhUrl.DOMAIN_EX, EhUrl.DOMAIN_E)
-    private const val PATH_NORMAL = "/"
-    private const val PATH_UPLOADER = "/uploader/"
-    private const val PATH_TAG = "/tag/"
-    private const val PATH_TOPLIST = "/toplist.php"
-    fun parse(urlStr: String): ListUrlBuilder? {
-        val url = try {
-            URL(urlStr)
-        } catch (e: MalformedURLException) {
+    fun parse(urlStr: String) = Either.catch {
+        val url = Url(urlStr)
+        if (url.host != EhUrl.DOMAIN_E && url.host != EhUrl.DOMAIN_EX) {
             return null
         }
-        if (url.host !in VALID_HOSTS) {
-            return null
-        }
-        val path = url.path ?: return null
-        return if (PATH_NORMAL == path || path.isEmpty()) {
-            ListUrlBuilder(url.query)
-        } else if (path.startsWith(PATH_UPLOADER)) {
-            parseUploader(path)
-        } else if (path.startsWith(PATH_TAG)) {
-            parseTag(path)
-        } else if (path.startsWith(PATH_TOPLIST)) {
-            parseToplist(urlStr)
-        } else if (path.startsWith("/")) {
-            val category = try {
-                path.substring(1).toInt()
-            } catch (e: NumberFormatException) {
-                return null
+        val segments = url.segments
+        if (segments.isEmpty()) {
+            ListUrlBuilder(url.parameters).apply {
+                url.parameters["f_shash"]?.let {
+                    mode = ListUrlBuilder.MODE_IMAGE_SEARCH
+                    hash = it
+                }
             }
-            ListUrlBuilder(url.query).also { it.category = category }
         } else {
-            null
-        }
-    }
+            when (val head = segments[0]) {
+                "uploader", "tag" -> ListUrlBuilder(url.parameters).apply {
+                    mode = if (head == "uploader") ListUrlBuilder.MODE_UPLOADER else ListUrlBuilder.MODE_TAG
+                    keyword = segments[1].decodeURLQueryComponent(plusIsSpace = true)
+                }
 
-    // TODO get page
-    private fun parseUploader(path: String): ListUrlBuilder? {
-        var uploader: String?
-        val prefixLength = PATH_UPLOADER.length
-        val index = path.indexOf('/', prefixLength)
-        uploader = if (index < 0) {
-            path.substring(prefixLength)
-        } else {
-            path.substring(prefixLength, index)
-        }
-        uploader = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            URLDecoder.decode(uploader, StandardCharsets.UTF_8)
-        } else {
-            try {
-                URLDecoder.decode(uploader, StandardCharsets.UTF_8.displayName())
-            } catch (e: UnsupportedEncodingException) {
-                logcat(e)
-                return null
+                "toplist.php" -> {
+                    val tl = url.parameters["tl"]
+                    if (tl != null && tl in arrayOf("11", "12", "13", "15")) {
+                        ListUrlBuilder(
+                            mode = ListUrlBuilder.MODE_TOPLIST,
+                            jumpTo = url.parameters["p"],
+                            mKeyword = tl,
+                        )
+                    } else {
+                        null
+                    }
+                }
+
+                else -> {
+                    val category = EhUtils.getCategory(head)
+                    if (category != EhUtils.UNKNOWN) {
+                        ListUrlBuilder(url.parameters).also { it.category = category }
+                    } else {
+                        null
+                    }
+                }
             }
         }
-        if (uploader.isNullOrEmpty()) {
-            return null
-        }
-        val builder = ListUrlBuilder()
-        builder.mode = ListUrlBuilder.MODE_UPLOADER
-        builder.keyword = uploader
-        return builder
-    }
-
-    // TODO get page
-    private fun parseTag(path: String): ListUrlBuilder? {
-        var tag: String?
-        val prefixLength = PATH_TAG.length
-        val index = path.indexOf('/', prefixLength)
-        tag = if (index < 0) {
-            path.substring(prefixLength)
-        } else {
-            path.substring(prefixLength, index)
-        }
-        tag = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            URLDecoder.decode(tag, StandardCharsets.UTF_8)
-        } else {
-            try {
-                URLDecoder.decode(tag, StandardCharsets.UTF_8.displayName())
-            } catch (e: UnsupportedEncodingException) {
-                logcat(e)
-                return null
-            }
-        }
-        if (tag.isNullOrEmpty()) {
-            return null
-        }
-        val builder = ListUrlBuilder()
-        builder.mode = ListUrlBuilder.MODE_TAG
-        builder.keyword = tag
-        return builder
-    }
-
-    // TODO get page
-    private fun parseToplist(path: String): ListUrlBuilder? {
-        val uri = Uri.parse(path)
-        if (uri == null || uri.getQueryParameter("tl").isNullOrEmpty()) {
-            return null
-        }
-        val tl = uri.getQueryParameter("tl")!!.toInt()
-        if (tl > 15 || tl < 11) {
-            return null
-        }
-        val builder = ListUrlBuilder()
-        builder.mode = ListUrlBuilder.MODE_TOPLIST
-        builder.keyword = tl.toString()
-        return builder
-    }
+    }.getOrNull()
 }

app/src/main/kotlin/com/hippo/ehviewer/client/parser/GalleryMultiPageViewerPTokenParser.kt

@@ -19,22 +19,18 @@ package com.hippo.ehviewer.client.parser
 
 import com.hippo.ehviewer.client.exception.ParseException
 import com.hippo.ehviewer.client.parseAs
-import com.hippo.ehviewer.util.ExceptionUtils
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 object GalleryMultiPageViewerPTokenParser {
     private const val IMAGE_LIST_STRING = "var imagelist = "
 
-    fun parse(body: String): List<String> {
+    fun parse(body: String): List<String> = runCatching {
         val index = body.indexOf(IMAGE_LIST_STRING)
         val imagelist = body.substring(index + IMAGE_LIST_STRING.length, body.indexOf(";", index))
-        return runCatching {
-            imagelist.parseAs<List<Item>>().map(Item::token)
-        }.getOrElse {
-            ExceptionUtils.throwIfFatal(it)
-            throw ParseException("Parse pToken from MPV error", it)
-        }
+        imagelist.parseAs<List<Item>>().map(Item::token)
+    }.getOrElse {
+        throw ParseException("Parse pToken from MPV error", it)
     }
 
     @Serializable

app/src/main/kotlin/com/hippo/ehviewer/client/parser/GalleryNotAvailableParser.kt

@@ -1,35 +0,0 @@
-/*
- * Copyright 2022 Tarsin Norbin
- *
- * This file is part of EhViewer
- *
- * EhViewer is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * EhViewer is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with EhViewer.
- * If not, see <https://www.gnu.org/licenses/>.
- */
-package com.hippo.ehviewer.client.parser
-
-import com.hippo.ehviewer.util.ExceptionUtils
-import eu.kanade.tachiyomi.util.system.logcat
-import org.jsoup.Jsoup
-
-object GalleryNotAvailableParser {
-    fun parse(body: String): String? {
-        return runCatching {
-            val e = Jsoup.parse(body).getElementsByClass("d").first()
-            e!!.child(0).html().replace("<br>", "\n")
-        }.getOrElse {
-            ExceptionUtils.throwIfFatal(it)
-            logcat(it)
-            null
-        }
-    }
-}

app/src/main/kotlin/com/hippo/ehviewer/client/parser/GalleryPageParser.kt

@@ -15,8 +15,8 @@
  */
 package com.hippo.ehviewer.client.parser
 
+import com.ehviewer.core.util.unescapeXml
 import com.hippo.ehviewer.client.exception.ParseException
-import com.hippo.ehviewer.util.unescapeXml
 
 object GalleryPageParser {
     private val PATTERN_IMAGE_URL = Regex("<img[^>]*src=\"([^\"]+)\" style")

app/src/main/kotlin/com/hippo/ehviewer/client/parser/GalleryTokenApiParser.kt

@@ -15,9 +15,10 @@
  */
 package com.hippo.ehviewer.client.parser
 
+import arrow.core.Either
+import arrow.core.getOrElse
 import com.hippo.ehviewer.client.exception.EhException
 import com.hippo.ehviewer.client.parseAs
-import com.hippo.ehviewer.util.ExceptionUtils
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -32,13 +33,10 @@ object GalleryTokenApiParser {
      * ]
      * }
      */
-    fun parse(body: String): String {
-        return runCatching {
-            body.parseAs<Result>().tokenList[0].token
-        }.getOrElse {
-            ExceptionUtils.throwIfFatal(it)
-            throw EhException(body.parseAs<Error>().error)
-        }
+    fun parse(body: String): String = Either.catch {
+        body.parseAs<Result>().tokenList[0].token
+    }.getOrElse {
+        throw EhException(body.parseAs<VoteTagResult>().error)
     }
 
     @Serializable

app/src/main/kotlin/com/hippo/ehviewer/client/parser/HomeParser.kt

@@ -1,14 +1,14 @@
 package com.hippo.ehviewer.client.parser
 
-import android.os.Parcelable
 import com.hippo.ehviewer.client.exception.InsufficientFundsException
 import com.hippo.ehviewer.client.exception.ParseException
 import java.nio.ByteBuffer
-import kotlinx.parcelize.Parcelize
+import kotlin.random.Random
 import kotlinx.serialization.Serializable
 
 object HomeParser {
-    private val PATTERN_FUNDS = Regex("Available: ([\\d,]+) Credits.*Available: ([\\d,]+) kGP", RegexOption.DOT_MATCHES_ALL)
+    private val TorrentKeyRegex = Regex("Your current key is: <[^>]*>([^<]*)<")
+    private val FundsRegex = Regex("Available: ([\\d,]+) Credits.*Available: ([\\d,]+) kGP", RegexOption.DOT_MATCHES_ALL)
     private const val INSUFFICIENT_FUNDS = "Insufficient funds."
 
     fun parse(body: ByteBuffer) = runCatching {
@@ -21,24 +21,25 @@ object HomeParser {
         }
     }
 
+    fun parseTorrentKey(body: String) = TorrentKeyRegex.find(body)?.run { groupValues[1] }
+        ?: throw ParseException("Parse torrent key error")
+
     fun parseFunds(body: String): Funds {
-        PATTERN_FUNDS.find(body)?.groupValues?.run {
-            val fundsC = ParserUtils.parseInt(get(1), 0)
-            val fundsGP = ParserUtils.parseInt(get(2), 0) * 1000
-            return Funds("%,d+".format(fundsGP), "%,d".format(fundsC))
+        FundsRegex.find(body)?.run {
+            val fundsC = ParserUtils.parseInt(groupValues[1], 0)
+            val fundsGP = ParserUtils.parseInt(groupValues[2], 0)
+            return Funds(fundsGP, fundsC)
         }
         throw ParseException("Parse funds error")
     }
 
-    @Parcelize
-    data class Result(val limits: Limits, val funds: Funds) : Parcelable
+    data class Result(val limits: Limits, val funds: Funds, private val id: Int = Random.nextInt())
 }
 
-@Parcelize
-data class Funds(val gp: String, val credit: String) : Parcelable
-
-@Parcelize
 @Serializable
-data class Limits(val current: Int, val maximum: Int, val resetCost: Int) : Parcelable
+data class Funds(val gp: Int, val credit: Int)
+
+@Serializable
+data class Limits(val current: Int, val maximum: Int, val resetCost: Int)
 
 private external fun parseLimit(body: ByteBuffer, limit: Int = body.limit()): Int

app/src/main/kotlin/com/hippo/ehviewer/client/parser/ParserUtils.kt

@@ -15,11 +15,9 @@
  */
 package com.hippo.ehviewer.client.parser
 
-import com.hippo.ehviewer.util.toEpochMillis
-import com.hippo.ehviewer.util.toIntOrDefault
-import com.hippo.ehviewer.util.toLocalDateTime
-import com.hippo.ehviewer.util.toLongOrDefault
-import com.hippo.ehviewer.util.unescapeXml
+import com.ehviewer.core.util.toEpochMillis
+import com.ehviewer.core.util.toIntOrDefault
+import com.ehviewer.core.util.toLocalDateTime
 import kotlinx.datetime.LocalDateTime
 import kotlinx.datetime.format.char
 
@@ -30,30 +28,16 @@ object ParserUtils {
         char('-')
         monthNumber()
         char('-')
-        dayOfMonth()
+        day()
         char(' ')
         hour()
         char(':')
         minute()
     }
 
-    fun formatDate(time: Long): String {
-        return formatter.format(time.toLocalDateTime())
-    }
+    fun formatDate(time: Long): String = formatter.format(time.toLocalDateTime())
 
-    fun parseDate(str: String): Long {
-        return formatter.parse(str).toEpochMillis()
-    }
+    fun parseDate(str: String): Long = formatter.parse(str).toEpochMillis()
 
-    fun trim(str: String?): String {
-        return str?.unescapeXml()?.trim() ?: ""
-    }
-
-    fun parseInt(str: String?, defValue: Int): Int {
-        return trim(str).replace(",", "").toIntOrDefault(defValue)
-    }
-
-    fun parseLong(str: String?, defValue: Long): Long {
-        return trim(str).replace(",", "").toLongOrDefault(defValue)
-    }
+    fun parseInt(str: String, defValue: Int): Int = str.replace(",", "").toIntOrDefault(defValue)
 }

app/src/main/kotlin/com/hippo/ehviewer/client/parser/ProfileParser.kt

@@ -15,39 +15,28 @@
  */
 package com.hippo.ehviewer.client.parser
 
-import com.hippo.ehviewer.client.EhUrl
+import arrow.core.Either.Companion.catch
+import arrow.core.getOrElse
 import com.hippo.ehviewer.client.exception.ParseException
-import com.hippo.ehviewer.util.ExceptionUtils
-import eu.kanade.tachiyomi.util.system.logcat
-import org.jsoup.Jsoup
+import java.nio.ByteBuffer
+import kotlinx.serialization.Serializable
 
 object ProfileParser {
-    fun parse(body: String): Result {
-        return runCatching {
-            val d = Jsoup.parse(body)
-            val profilename = d.getElementById("profilename")
-            val displayName = profilename!!.child(0).text()
-            val avatar = runCatching {
-                val avatar =
-                    profilename.nextElementSibling()!!.nextElementSibling()!!.child(0).attr("src")
-                if (avatar.isEmpty()) {
-                    null
-                } else if (!avatar.startsWith("http")) {
-                    EhUrl.URL_FORUMS + avatar
-                } else {
-                    avatar
-                }
-            }.getOrElse {
-                ExceptionUtils.throwIfFatal(it)
-                logcat { "No avatar" }
-                null
-            }
-            Result(displayName, avatar)
-        }.getOrElse {
-            ExceptionUtils.throwIfFatal(it)
-            throw ParseException("Parse forums error")
-        }
+    fun parse(body: ByteBuffer) = catch {
+        unmarshalParsingAs<Result>(body, ::parseProfile)
+    }.getOrElse {
+        throw ParseException("Failed to parse profile", it)
     }
 
-    class Result(val displayName: String?, val avatar: String?)
+    fun parseProfileUrl(body: ByteBuffer) = catch {
+        unmarshalParsingAs<String>(body, ::parseProfileUrl)
+    }.getOrElse {
+        throw ParseException("Failed to parse profile url", it)
+    }
+
+    @Serializable
+    data class Result(val displayName: String, val avatar: String?)
+
+    private external fun parseProfile(body: ByteBuffer, size: Int = body.limit()): Int
+    private external fun parseProfileUrl(body: ByteBuffer, size: Int = body.limit()): Int
 }

app/src/main/kotlin/com/hippo/ehviewer/client/parser/SignInParser.kt

@@ -25,11 +25,9 @@ object SignInParser {
             "|<span class=\"postcolor\">(.+?)</span>",
     )
 
-    fun parse(body: String): String {
-        return NAME_PATTERN.find(body)?.let {
-            it.groupValues[1]
-        } ?: ERROR_PATTERN.find(body)?.let {
-            throw EhException(it.groupValues[1].ifEmpty { it.groupValues[2] })
-        } ?: throw ParseException("Can't parse sign in")
-    }
+    fun parse(body: String): String = NAME_PATTERN.find(body)?.let {
+        it.groupValues[1]
+    } ?: ERROR_PATTERN.find(body)?.let {
+        throw EhException(it.groupValues[1].ifEmpty { it.groupValues[2] })
+    } ?: throw ParseException("Can't parse sign in")
 }

app/src/main/kotlin/com/hippo/ehviewer/client/parser/VoteTagParser.kt

@@ -17,11 +17,18 @@
  */
 package com.hippo.ehviewer.client.parser
 
-import com.hippo.ehviewer.client.parseAs
+import arrow.core.Either.Companion.catch
+import arrow.core.getOrElse
+import com.ehviewer.core.model.GalleryTagGroup
+import com.hippo.ehviewer.client.exception.ParseException
+import java.nio.ByteBuffer
 
 object VoteTagParser {
-    // {"error":"The tag \"neko\" is not allowed. Use character:neko or artist:neko"}
-    fun parse(body: String): String? {
-        return runCatching { body.parseAs<Error>().error }.getOrNull()
+    fun parse(body: ByteBuffer) = catch {
+        unmarshalParsingAs<List<GalleryTagGroup>>(body, ::nativeParse)
+    }.getOrElse {
+        throw ParseException("Failed to parse vote tag result", it)
     }
+
+    private external fun nativeParse(body: ByteBuffer, size: Int = body.limit()): Int
 }

app/src/main/kotlin/com/hippo/ehviewer/client/parser/VoteTagResult.kt

@@ -3,4 +3,7 @@ package com.hippo.ehviewer.client.parser
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class Error(val error: String)
+data class VoteTagResult(
+    val error: String?,
+    val tagpane: String?,
+)

app/src/main/kotlin/com/hippo/ehviewer/coil/AnimatedWebPDecoder.kt

@@ -0,0 +1,49 @@
+package com.hippo.ehviewer.coil
+
+import coil3.ImageLoader
+import coil3.asImage
+import coil3.decode.ByteBufferMetadata
+import coil3.decode.ContentMetadata
+import coil3.decode.DecodeResult
+import coil3.decode.DecodeUtils
+import coil3.decode.Decoder
+import coil3.decode.ImageSource
+import coil3.fetch.SourceFetchResult
+import coil3.gif.isAnimatedWebP
+import coil3.request.Options
+import java.io.FileInputStream
+import java.nio.ByteBuffer
+import java.nio.channels.FileChannel
+import okio.FileSystem
+
+class AnimatedWebPDecoder(private val source: ByteBuffer) : Decoder {
+    override suspend fun decode() = DecodeResult(AnimatedWebPDrawable(source).asImage(), false)
+
+    object Factory : Decoder.Factory {
+        override fun create(
+            result: SourceFetchResult,
+            options: Options,
+            imageLoader: ImageLoader,
+        ) = if (DecodeUtils.isAnimatedWebP(result.source.source())) {
+            result.source.toByteBufferOrNull()?.let { AnimatedWebPDecoder(it) }
+        } else {
+            null
+        }
+    }
+}
+
+private fun ImageSource.toByteBufferOrNull(): ByteBuffer? {
+    if (fileSystem === FileSystem.SYSTEM) {
+        val file = fileOrNull()
+        if (file != null) {
+            return file.toFile().inputStream().mapReadOnly()
+        }
+    }
+    return when (val metadata = metadata) {
+        is ContentMetadata -> metadata.assetFileDescriptor.createInputStream().mapReadOnly()
+        is ByteBufferMetadata -> metadata.byteBuffer
+        else -> null
+    }
+}
+
+private fun FileInputStream.mapReadOnly(): ByteBuffer = channel.use { it.map(FileChannel.MapMode.READ_ONLY, 0, it.size()) }

app/src/main/kotlin/com/hippo/ehviewer/coil/AnimatedWebPDrawable.kt

@@ -0,0 +1,151 @@
+package com.hippo.ehviewer.coil
+
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.ColorFilter
+import android.graphics.Paint
+import android.graphics.PixelFormat
+import android.graphics.drawable.Animatable
+import android.graphics.drawable.Drawable
+import android.os.SystemClock
+import androidx.core.graphics.createBitmap
+import com.ehviewer.core.util.logcat
+import java.nio.ByteBuffer
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancelAndJoin
+import kotlinx.coroutines.ensureActive
+import kotlinx.coroutines.job
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+
+// Hold a reference to the buffer as it's used by the decoder
+@Suppress("CanBeParameter")
+class AnimatedWebPDrawable(private val source: ByteBuffer) : Drawable(), Animatable {
+    private val decodeScope = CoroutineScope(Dispatchers.IO.limitedParallelism(1))
+    private val paint = Paint(Paint.ANTI_ALIAS_FLAG or Paint.DITHER_FLAG or Paint.FILTER_BITMAP_FLAG)
+    private val decoder = nativeCreateDecoder(source)
+    private val width: Int
+    private val height: Int
+    private val loopCount: Int
+
+    private var decodeJob: Job? = null
+    private var loopsCompleted = 0
+    private var timeToShowNextFrame = 0L
+    private var currentFrame: Frame
+    private var nextFrame: Frame
+
+    init {
+        check(decoder != 0L) { "Failed to create decoder" }
+        val packed = nativeGetImageInfo(decoder)
+        width = (packed shr 40).toInt()
+        height = (packed shr 16 and 0xFFFFFF).toInt()
+        loopCount = (packed and 0xFFFF).toInt()
+        val bitmap = createBitmap(width, height)
+        val timestamp = nativeDecodeNextFrame(decoder, false, bitmap)
+        check(timestamp != 0) {
+            nativeDestroyDecoder(decoder)
+            "Failed to decode first frame"
+        }
+        currentFrame = Frame(bitmap, timestamp)
+        nextFrame = Frame(createBitmap(width, height), 0)
+    }
+
+    override fun getIntrinsicWidth() = width
+
+    override fun getIntrinsicHeight() = height
+
+    private val runnable = Runnable {
+        timeToShowNextFrame = SystemClock.uptimeMillis() + nextFrame.timestamp - currentFrame.timestamp
+        invalidateSelf()
+    }
+
+    private fun decodeNextFrame(reset: Boolean) = decodeScope.launch {
+        val timestamp = nativeDecodeNextFrame(decoder, reset, nextFrame.bitmap)
+        ensureActive()
+        check(timestamp != 0) {
+            decodeJob = null
+            "Failed to decode next frame"
+        }
+        if (timestamp <= currentFrame.timestamp) {
+            if (reset) loopsCompleted = 0 else loopsCompleted++
+            currentFrame.timestamp = 0
+        }
+        nextFrame.timestamp = timestamp
+        nextFrame.bitmap.prepareToDraw()
+    }.apply {
+        invokeOnCompletion { cause ->
+            when (cause) {
+                null -> if (reset) {
+                    runnable.run()
+                } else {
+                    scheduleSelf(runnable, timeToShowNextFrame)
+                }
+                !is CancellationException -> logcat(cause)
+            }
+        }
+    }
+
+    override fun draw(canvas: Canvas) {
+        if (decodeJob?.isCompleted == true && isVisible) {
+            decodeJob = if (loopCount == 0 || loopsCompleted < loopCount) {
+                currentFrame = nextFrame.also { nextFrame = currentFrame }
+                decodeNextFrame(false)
+            } else {
+                null
+            }
+        }
+        canvas.drawBitmap(currentFrame.bitmap, null, bounds, paint)
+    }
+
+    @Deprecated("Deprecated in Java")
+    override fun getOpacity(): Int = PixelFormat.TRANSLUCENT
+
+    override fun setAlpha(alpha: Int) {
+        if (alpha != paint.alpha) {
+            paint.alpha = alpha
+            invalidateSelf()
+        }
+    }
+
+    override fun getAlpha(): Int = paint.alpha
+
+    override fun setColorFilter(colorFilter: ColorFilter?) {
+        if (colorFilter != paint.colorFilter) {
+            paint.colorFilter = colorFilter
+            invalidateSelf()
+        }
+    }
+
+    override fun getColorFilter(): ColorFilter? = paint.colorFilter
+
+    override fun isRunning() = decodeJob != null
+
+    override fun start() {
+        if (decodeJob == null) {
+            decodeJob = decodeNextFrame(true)
+        }
+    }
+
+    override fun stop() {
+        decodeJob?.cancel()
+        decodeJob = null
+        unscheduleSelf(runnable)
+    }
+
+    fun dispose() {
+        runBlocking {
+            decodeScope.coroutineContext.job.cancelAndJoin()
+        }
+        nativeDestroyDecoder(decoder)
+    }
+}
+
+private class Frame(val bitmap: Bitmap, var timestamp: Int)
+
+private external fun nativeCreateDecoder(source: ByteBuffer): Long
+private external fun nativeGetImageInfo(decoder: Long): Long
+private external fun nativeDecodeNextFrame(decoder: Long, reset: Boolean, bitmap: Bitmap): Int
+private external fun nativeDestroyDecoder(decoder: Long)

app/src/main/kotlin/com/hippo/ehviewer/coil/CropBorderInterceptor.kt

@@ -1,88 +1,64 @@
 package com.hippo.ehviewer.coil
 
 import android.graphics.Bitmap
-import androidx.compose.ui.unit.IntRect
-import coil3.BitmapImage
-import coil3.Extras
-import coil3.Image
-import coil3.asCoilImage
-import coil3.getExtra
+import android.hardware.HardwareBuffer
+import android.os.Build
+import androidx.annotation.RequiresApi
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.toIntRect
+import arrow.fx.coroutines.autoCloseable
+import arrow.fx.coroutines.resourceScope
+import coil3.asImage
 import coil3.intercept.Interceptor
-import coil3.intercept.Interceptor.Chain
-import coil3.request.ImageRequest
 import coil3.request.ImageResult
 import coil3.request.SuccessResult
-import coil3.request.allowHardware
-import com.hippo.ehviewer.image.detectBorder
-import com.hippo.ehviewer.util.isAtLeastO
+import com.ehviewer.core.util.isAtLeastQ
+import com.ehviewer.core.util.logcat
+import com.hippo.ehviewer.image.copyBitmapToAHB
+import moe.tarsin.coroutines.runSuspendCatching
 
-private const val CROP_THRESHOLD = 0.75f
-private const val RATIO_THRESHOLD = 2
-
-private val maybeCropBorderKey = Extras.Key(default = false)
-
-fun ImageRequest.Builder.maybeCropBorder(enable: Boolean) = apply {
-    extras[maybeCropBorderKey] = enable
-}
-
-val ImageRequest.maybeCropBorder: Boolean
-    get() = getExtra(maybeCropBorderKey)
-
-class BitmapImageWithRect(
-    val rect: IntRect,
-    val image: Image,
-) : Image by image
+@RequiresApi(Build.VERSION_CODES.O)
+private const val USAGE = HardwareBuffer.USAGE_CPU_WRITE_RARELY or HardwareBuffer.USAGE_GPU_SAMPLED_IMAGE
 
 object CropBorderInterceptor : Interceptor {
-    override suspend fun intercept(chain: Chain): ImageResult {
-        val req = chain.request
-        if (req.maybeCropBorder) {
-            val hw = req.allowHardware && isAtLeastO
-            val result = if (hw) {
-                val nonHw = req.newBuilder().allowHardware(false).build()
-                chain.withRequest(nonHw).proceed()
-            } else {
-                chain.proceed()
-            }
-            if (result is SuccessResult) {
-                val image = result.image
-                if (image is BitmapImage) {
-                    val bitmap = image.bitmap
-                    val ratio = if (image.height > image.width) {
-                        image.height / image.width
-                    } else {
-                        image.width / image.height
-                    }
-                    val rect = if (ratio < RATIO_THRESHOLD) {
-                        val array = detectBorder(bitmap)
-                        val minWidth = image.width * CROP_THRESHOLD
-                        val minHeight = image.height * CROP_THRESHOLD
-                        IntRect(array[0], array[1], array[2], array[3]).takeIf {
-                            it.width > minWidth && it.height > minHeight
-                        }
-                    } else {
-                        null
-                    }
-                    val maybeHwImage = if (hw) {
-                        // Upload to Graphical Buffer to accelerate render
-                        // May fail if the image is too long
-                        bitmap.copy(Bitmap.Config.HARDWARE, false)?.run {
-                            bitmap.recycle()
-                            asCoilImage()
-                        } ?: image
-                    } else {
-                        image
-                    }
-                    val new = if (rect != null) {
-                        BitmapImageWithRect(rect, maybeHwImage)
-                    } else {
-                        maybeHwImage
-                    }
-                    return result.copy(image = new, request = result.request, dataSource = result.dataSource)
+    override suspend fun intercept(chain: Interceptor.Chain): ImageResult {
+        val result = chain.proceed()
+        if (result is SuccessResult) {
+            val image = result.image
+            if (image is BitmapImageWithExtraInfo) {
+                // Copy with cropped region
+                val srcSize = IntSize(image.width, image.height)
+                if (image.rect.size != srcSize) {
+                    val (x, y) = image.rect.topLeft
+                    val (w, h) = image.rect.size
+                    val src = image.image.bitmap
+
+                    // Large hardware bitmaps have rendering issues (e.g. crash, empty) on some devices.
+                    // This is not ideal but I haven't figured out how to probe the threshold.
+                    // All we know is that it's less than the maximum texture size.
+                    val meetHardwareThreshold = maxOf(w, h) <= chain.request.hardwareThreshold
+                    val bitmap = when {
+                        isAtLeastQ && meetHardwareThreshold -> runSuspendCatching {
+                            val format = when (val config = src.config) {
+                                Bitmap.Config.ARGB_8888 -> HardwareBuffer.RGBA_8888
+                                Bitmap.Config.RGB_565 -> HardwareBuffer.RGB_565
+                                Bitmap.Config.RGBA_F16 -> HardwareBuffer.RGBA_FP16
+                                else -> error("Unsupported bitmap config: $config")
+                            }
+                            resourceScope {
+                                val buffer = autoCloseable { HardwareBuffer.create(w, h, format, 1, USAGE) }
+                                copyBitmapToAHB(src, buffer, x, y)
+                                Bitmap.wrapHardwareBuffer(buffer, src.colorSpace)
+                            }
+                        }.onFailure { logcat(it) }.getOrNull()
+                        else -> null
+                    } ?: Bitmap.createBitmap(src, x, y, w, h)
+
+                    src.recycle()
+                    return result.copy(image = image.copy(image = bitmap.asImage(), rect = image.rect.size.toIntRect()))
                 }
             }
-            return result
         }
-        return chain.proceed()
+        return result
     }
 }

app/src/main/kotlin/com/hippo/ehviewer/coil/DetectBorderInterceptor.kt

@@ -0,0 +1,51 @@
+package com.hippo.ehviewer.coil
+
+import androidx.compose.ui.unit.IntRect
+import coil3.Extras
+import coil3.getExtra
+import coil3.intercept.Interceptor
+import coil3.intercept.Interceptor.Chain
+import coil3.request.ImageRequest
+import coil3.request.ImageResult
+import coil3.request.SuccessResult
+import com.hippo.ehviewer.image.detectBorder
+
+private const val CROP_THRESHOLD = 0.75f
+private const val RATIO_THRESHOLD = 2
+
+private val maybeCropBorderKey = Extras.Key(default = false)
+
+fun ImageRequest.Builder.maybeCropBorder(enable: Boolean) = apply {
+    extras[maybeCropBorderKey] = enable
+}
+
+val ImageRequest.maybeCropBorder: Boolean
+    get() = getExtra(maybeCropBorderKey)
+
+object DetectBorderInterceptor : Interceptor {
+    override suspend fun intercept(chain: Chain): ImageResult {
+        val result = chain.proceed()
+        if (chain.request.maybeCropBorder && result is SuccessResult) {
+            val image = result.image
+            if (image is BitmapImageWithExtraInfo && !image.hasQrCode) {
+                val bitmap = image.image.bitmap
+                val ratio = if (image.height > image.width) {
+                    image.height / image.width
+                } else {
+                    image.width / image.height
+                }
+                if (ratio < RATIO_THRESHOLD) {
+                    val array = detectBorder(bitmap)
+                    val minWidth = image.width * CROP_THRESHOLD
+                    val minHeight = image.height * CROP_THRESHOLD
+                    val rect = IntRect(array[0], array[1], array[2], array[3])
+                    if (rect.width > minWidth && rect.height > minHeight) {
+                        val new = image.copy(rect = rect)
+                        return result.copy(image = new)
+                    }
+                }
+            }
+        }
+        return result
+    }
+}

app/src/main/kotlin/com/hippo/ehviewer/coil/DownloadThumbInterceptor.kt

@@ -1,53 +1,64 @@
 package com.hippo.ehviewer.coil
 
+import coil3.Extras
+import coil3.getExtra
 import coil3.intercept.Interceptor
+import coil3.request.ImageRequest
 import coil3.request.ImageResult
 import coil3.request.SuccessResult
+import com.ehviewer.core.database.model.DownloadInfo
+import com.ehviewer.core.files.delete
+import com.ehviewer.core.files.isDirectory
+import com.ehviewer.core.files.isFile
+import com.ehviewer.core.files.sendTo
+import com.ehviewer.core.files.toUri
 import com.hippo.ehviewer.EhApplication.Companion.imageCache
+import com.hippo.ehviewer.EhDB
+import com.hippo.ehviewer.client.getThumbKey
 import com.hippo.ehviewer.download.downloadLocation
-import com.hippo.ehviewer.spider.DownloadInfoMagics.decodeMagicRequestOrUrl
-import com.hippo.ehviewer.util.sendTo
-import com.hippo.unifile.asUniFile
-import eu.kanade.tachiyomi.util.lang.withIOContext
+
+private val downloadInfoKey = Extras.Key<DownloadInfo?>(default = null)
+
+fun ImageRequest.Builder.downloadInfo(info: DownloadInfo) = apply {
+    extras[downloadInfoKey] = info
+}
+
+val ImageRequest.downloadInfo: DownloadInfo?
+    get() = getExtra(downloadInfoKey)
 
 object DownloadThumbInterceptor : Interceptor {
-    // TODO: Remove this after a few releases
-    private const val LEGACY_THUMB_FILE = ".thumb"
-    private const val THUMB_FILE = "thumb.jpg"
     override suspend fun intercept(chain: Interceptor.Chain): ImageResult {
-        val magicOrUrl = chain.request.data as? String
-        if (magicOrUrl != null) {
-            val (url, location) = decodeMagicRequestOrUrl(magicOrUrl)
-            if (location != null) {
-                val thumb = withIOContext {
-                    val legacyThumb = downloadLocation / location / LEGACY_THUMB_FILE
-                    if (legacyThumb.isFile) {
-                        legacyThumb.apply { renameTo(THUMB_FILE) }
-                    } else {
-                        downloadLocation / location / THUMB_FILE
-                    }
-                }
-                if (withIOContext { thumb.isFile }) {
-                    val new = chain.request.newBuilder().data(thumb.uri.toString()).build()
-                    val result = chain.withRequest(new).proceed()
-                    if (result is SuccessResult) return result
-                }
-                val new = chain.request.newBuilder().data(url).build()
+        val info = chain.request.downloadInfo
+        if (info != null && !info.dirname.isNullOrBlank()) {
+            val thumbKey = getThumbKey(chain.request.data as String)
+            if (info.thumbKey != thumbKey) {
+                info.thumbKey = thumbKey
+                EhDB.putGalleryInfo(info.galleryInfo)
+            }
+            val dir = downloadLocation / info.dirname!!
+            val format = thumbKey.substringAfterLast('.', "")
+            check(format.isNotBlank())
+            val thumb = dir / "thumb.$format"
+            val v1Thumb = dir / "thumb.jpg"
+            if (thumb.isFile) {
+                val new = chain.request.newBuilder().data(thumb.toUri()).build()
                 val result = chain.withRequest(new).proceed()
                 if (result is SuccessResult) {
-                    withIOContext {
-                        // Accessing the recreated file immediately after deleting it throws
-                        // FileNotFoundException, so we just overwrite the existing file.
-                        if (thumb.ensureFile()) {
-                            val key = requireNotNull(chain.request.memoryCacheKey)
-                            imageCache.read(key) {
-                                data.asUniFile() sendTo thumb
-                            }
-                        }
-                    }
+                    if (thumb != v1Thumb) v1Thumb.delete()
+                    return result
                 }
-                return result
             }
+            val result = chain.proceed()
+            if (result is SuccessResult && dir.isDirectory) {
+                // Accessing the recreated file immediately after deleting it throws
+                // FileNotFoundException, so we just overwrite the existing file.
+                val key = requireNotNull(chain.request.memoryCacheKey)
+                imageCache.read(key) {
+                    data sendTo thumb
+                }
+                if (thumb != v1Thumb) v1Thumb.delete()
+            }
+            return result
         }
         return chain.proceed()
     }

app/src/main/kotlin/com/hippo/ehviewer/coil/Extensions.kt

@@ -1,52 +1,61 @@
 package com.hippo.ehviewer.coil
 
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
-import coil3.asCoilImage
-import coil3.decode.DecodeResult
-import coil3.decode.Decoder
-import coil3.network.NetworkHeaders
-import coil3.network.httpHeaders
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.paging.compose.LazyPagingItems
+import coil3.decode.BlackholeDecoder
 import coil3.request.CachePolicy
 import coil3.request.ImageRequest
-import coil3.size.Size
-import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.client.CHROME_ACCEPT
-import com.hippo.ehviewer.client.CHROME_ACCEPT_LANGUAGE
-import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.client.data.GalleryPreview
-import com.hippo.ehviewer.client.data.NormalGalleryPreview
-import com.hippo.ehviewer.client.url
-import com.hippo.ehviewer.spider.DownloadInfoMagics.encodeMagicRequestOrUrl
-import io.ktor.http.HttpHeaders
-
-private val header = NetworkHeaders.Builder().apply {
-    add(HttpHeaders.UserAgent, Settings.userAgent)
-    add(HttpHeaders.Accept, CHROME_ACCEPT)
-    add(HttpHeaders.AcceptLanguage, CHROME_ACCEPT_LANGUAGE)
-}.build()
+import coil3.size.SizeResolver
+import com.ehviewer.core.database.model.DownloadInfo
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.model.GalleryPreview
+import com.ehviewer.core.model.V2GalleryPreview
+import com.hippo.ehviewer.client.getThumbKey
+import com.hippo.ehviewer.client.getV2PreviewKey
+import com.hippo.ehviewer.client.thumbUrl
+import com.hippo.ehviewer.download.DownloadManager
+import com.hippo.ehviewer.ktbuilder.execute
 
+// Load in original size so the memory cache can be reused for preload requests
 fun ImageRequest.Builder.ehUrl(info: GalleryInfo) = apply {
     val key = info.thumbKey!!
-    data(encodeMagicRequestOrUrl(info))
+    data(info.thumbUrl)
+    size(SizeResolver.ORIGINAL)
+    val downloadInfo = (info as? DownloadInfo) ?: DownloadManager.getDownloadInfo(info.gid)
+    if (downloadInfo != null) {
+        downloadInfo(downloadInfo)
+    }
     memoryCacheKey(key)
     diskCacheKey(key)
-    httpHeaders(header)
 }
 
+// Load in original size so the memory cache can be reused for preload requests
 fun ImageRequest.Builder.ehPreview(preview: GalleryPreview) = apply {
-    data(preview.url)
-    memoryCacheKey(preview.imageKey)
-    diskCacheKey(preview.imageKey)
-    if (preview is NormalGalleryPreview) size(Size.ORIGINAL)
-    httpHeaders(header)
+    with(preview) {
+        val key = if (this is V2GalleryPreview) getV2PreviewKey(url) else getThumbKey(url)
+        data(url)
+        size(SizeResolver.ORIGINAL)
+        memoryCacheKey(key)
+        diskCacheKey(key)
+    }
 }
 
-private val stubImage = ColorDrawable(Color.BLACK).asCoilImage(true)
-private val stubResult = DecodeResult(stubImage, false)
-private val stubFactory = Decoder { stubResult }
-
 fun ImageRequest.Builder.justDownload() = apply {
     memoryCachePolicy(CachePolicy.DISABLED)
-    decoderFactory { _, _, _ -> stubFactory }
+    decoderFactory(BlackholeDecoder.Factory())
+}
+
+@Composable
+inline fun <T : Any> PrefetchAround(data: LazyPagingItems<T>, index: Int, distance: Int, crossinline f: (T) -> ImageRequest) {
+    data.peek((index - distance).coerceAtLeast(0))?.let { fetchBefore ->
+        LaunchedEffect(fetchBefore) {
+            f(fetchBefore).execute()
+        }
+    }
+    data.peek((index + distance).coerceAtMost(data.itemCount - 1))?.let { fetchAhead ->
+        LaunchedEffect(fetchAhead) {
+            f(fetchAhead).execute()
+        }
+    }
 }

app/src/main/kotlin/com/hippo/ehviewer/coil/HardwareBitmapInterceptor.kt

@@ -1,24 +1,48 @@
 package com.hippo.ehviewer.coil
 
+import android.graphics.Bitmap
+import android.os.Build
+import androidx.annotation.RequiresApi
+import coil3.Extras
+import coil3.asImage
+import coil3.getExtra
 import coil3.intercept.Interceptor
 import coil3.intercept.Interceptor.Chain
-import coil3.request.ErrorResult
+import coil3.request.ImageRequest
 import coil3.request.ImageResult
+import coil3.request.SuccessResult
 import coil3.request.allowHardware
 
-/**
- * Allocating hardware bitmaps may fail on extremely long images.
- *
- * Retry with [allowHardware] disabled.
- */
+private val hardwareThresholdKey = Extras.Key(default = 16384)
+
+fun ImageRequest.Builder.hardwareThreshold(size: Int) = apply {
+    extras[hardwareThresholdKey] = size
+}
+
+val ImageRequest.hardwareThreshold: Int
+    get() = getExtra(hardwareThresholdKey)
+
+@RequiresApi(Build.VERSION_CODES.O)
 object HardwareBitmapInterceptor : Interceptor {
     override suspend fun intercept(chain: Chain): ImageResult {
         val result = chain.proceed()
-        return if (chain.request.allowHardware && result is ErrorResult && result.throwable is OutOfMemoryError) {
-            val req = chain.request.newBuilder().allowHardware(false).build()
-            chain.withRequest(req).proceed()
-        } else {
-            result
+        val request = result.request
+        if (!request.allowHardware && result is SuccessResult) {
+            val image = result.image
+            if (image is BitmapImageWithExtraInfo) {
+                val bitmap = image.image.bitmap
+                val isHardware = bitmap.config == Bitmap.Config.HARDWARE
+                // Large hardware bitmaps have rendering issues (e.g. crash, empty) on some devices.
+                // This is not ideal but I haven't figured out how to probe the threshold.
+                // All we know is that it's less than the maximum texture size.
+                if (!isHardware && maxOf(bitmap.width, bitmap.height) <= request.hardwareThreshold) {
+                    bitmap.copy(Bitmap.Config.HARDWARE, false)?.let { hwBitmap ->
+                        bitmap.recycle()
+                        return result.copy(image = image.copy(image = hwBitmap.asImage()))
+                    }
+                }
+            }
         }
+        return result
     }
 }

app/src/main/kotlin/com/hippo/ehviewer/coil/MapExtraInfoInterceptor.kt

@@ -0,0 +1,29 @@
+package com.hippo.ehviewer.coil
+
+import androidx.compose.ui.unit.IntRect
+import coil3.BitmapImage
+import coil3.Image
+import coil3.intercept.Interceptor
+import coil3.request.ImageResult
+import coil3.request.SuccessResult
+import coil3.request.allowHardware
+
+data class BitmapImageWithExtraInfo(
+    val image: BitmapImage,
+    val rect: IntRect = IntRect(0, 0, image.width, image.height),
+    val hasQrCode: Boolean = false,
+) : Image by image
+
+object MapExtraInfoInterceptor : Interceptor {
+    override suspend fun intercept(chain: Interceptor.Chain): ImageResult {
+        val result = chain.proceed()
+        val needMap = with(chain.request) { maybeCropBorder || detectQrCode || !allowHardware }
+        if (needMap && result is SuccessResult) {
+            val image = result.image
+            if (image is BitmapImage) {
+                return result.copy(image = BitmapImageWithExtraInfo(image))
+            }
+        }
+        return result
+    }
+}

app/src/main/kotlin/com/hippo/ehviewer/coil/MergeInterceptor.kt

@@ -1,82 +1,67 @@
 package com.hippo.ehviewer.coil
 
+import arrow.core.merge
+import arrow.fx.coroutines.raceN
+import coil3.decode.DataSource
+import coil3.imageLoader
 import coil3.intercept.Interceptor
+import coil3.memory.MemoryCache
 import coil3.request.ImageResult
-import com.hippo.ehviewer.Settings
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
+import coil3.request.SuccessResult
 import kotlinx.coroutines.CancellableContinuation
-import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.buffer
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.flow.shareIn
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
-import kotlinx.coroutines.withContext
+import moe.tarsin.coroutines.Counter
+import moe.tarsin.coroutines.Tracker
+import moe.tarsin.coroutines.counter
+import moe.tarsin.coroutines.runSuspendCatching
+import moe.tarsin.coroutines.use
+
+typealias F = suspend () -> Unit
+
+suspend inline fun <T> CancellableContinuation<T>.evalAndResume(f: suspend () -> T) = runSuspendCatching { f() }.takeIf { isActive }?.let(::resumeWith)
+
+class TightRope : CoroutineScope, Counter by counter() {
+    override val coroutineContext = Dispatchers.IO + Job()
+    val actions = Channel<F>()
+    val flow = actions.receiveAsFlow().map(F::invoke).buffer(0).shareIn(this, SharingStarted.WhileSubscribed(stopTimeoutMillis = 200))
+    suspend inline fun <R> sendAndAwait(crossinline block: suspend () -> R) = raceN(
+        { flow.collect {} },
+        { suspendCancellableCoroutine { cont -> launch { actions.send { cont.evalAndResume(block) } } } },
+    ).merge()
+}
+
+object TightRopeTracker : Tracker<TightRope, String>() {
+    override fun new() = TightRope()
+    override fun free(e: TightRope) = e.cancel()
+}
 
 object MergeInterceptor : Interceptor {
-    private val pendingContinuationMap: HashMap<String, MutableList<CancellableContinuation<Unit>>> = hashMapOf()
-    private val pendingContinuationMapLock = Any()
-    private val notifyScope = CoroutineScope(Dispatchers.IO + SupervisorJob())
-    private val EMPTY_LIST = mutableListOf<CancellableContinuation<Unit>>()
-
-    private fun triggerSuccessor(key: String) {
-        notifyScope.launch {
-            synchronized(pendingContinuationMapLock) {
-                // Wake up a pending continuation to continue executing task
-                val successor = pendingContinuationMap[key]?.removeFirstOrNull()?.apply { resume(Unit) { triggerSuccessor(key) } }
-                // If no successor, delete this entry from hashmap
-                successor ?: pendingContinuationMap.remove(key)
-            }
-        }
-    }
-
-    private fun triggerFailure(key: String, e: Throwable) {
-        notifyScope.launch {
-            synchronized(pendingContinuationMapLock) {
-                pendingContinuationMap.remove(key)?.forEach { it.resumeWithException(e) }
-            }
-        }
-    }
-
     override suspend fun intercept(chain: Interceptor.Chain): ImageResult {
         val req = chain.request
-        val key = req.memoryCacheKey?.takeIf { it.startsWith("m/") || Settings.preloadThumbAggressively } ?: return withContext(req.interceptorDispatcher) { chain.proceed() }
-
-        suspendCancellableCoroutine { continuation ->
-            synchronized(pendingContinuationMapLock) {
-                val existPendingContinuations = pendingContinuationMap[key]
-                if (existPendingContinuations == null) {
-                    pendingContinuationMap[key] = EMPTY_LIST
-                    continuation.resume(Unit) {
-                        triggerSuccessor(key)
-                    }
-                } else {
-                    if (existPendingContinuations === EMPTY_LIST) pendingContinuationMap[key] = mutableListOf()
-                    pendingContinuationMap[key]!!.apply {
-                        add(continuation)
-                        continuation.invokeOnCancellation { remove(continuation) }
-                    }
+        val key = req.memoryCacheKey
+        return if (key != null) {
+            val cacheKey = MemoryCache.Key(key, req.memoryCacheKeyExtras)
+            val cached = req.context.imageLoader.memoryCache!![cacheKey] != null
+            val result = TightRopeTracker.use(key) { sendAndAwait { chain.proceed() } }
+            when (result) {
+                is SuccessResult if !cached && result.dataSource == DataSource.MEMORY_CACHE -> {
+                    result.copy(dataSource = DataSource.MEMORY)
                 }
+                else -> result
             }
-        }
-
-        try {
-            return withContext(req.interceptorDispatcher) { chain.proceed() }.apply {
-                // Wake all pending continuations shared with the same memory key since we have written it to memory cache
-                notifyScope.launch {
-                    synchronized(pendingContinuationMapLock) {
-                        pendingContinuationMap.remove(key)?.forEach { it.resume(Unit) }
-                    }
-                }
-            }
-        } catch (e: CancellationException) {
-            triggerSuccessor(key)
-            throw e
-        } catch (e: Throwable) {
-            // Wake all pending continuations since this request is to be failed
-            triggerFailure(key, e)
-            throw e
+        } else {
+            chain.proceed()
         }
     }
 }

app/src/main/kotlin/com/hippo/ehviewer/coil/QrCodeInterceptor.kt

@@ -0,0 +1,33 @@
+package com.hippo.ehviewer.coil
+
+import coil3.Extras
+import coil3.getExtra
+import coil3.intercept.Interceptor
+import coil3.request.ImageRequest
+import coil3.request.ImageResult
+import coil3.request.SuccessResult
+import com.hippo.ehviewer.image.hasQrCode
+
+private val detectQrCodeKey = Extras.Key(default = false)
+
+fun ImageRequest.Builder.detectQrCode(enable: Boolean) = apply {
+    extras[detectQrCodeKey] = enable
+}
+
+val ImageRequest.detectQrCode: Boolean
+    get() = getExtra(detectQrCodeKey)
+
+object QrCodeInterceptor : Interceptor {
+    override suspend fun intercept(chain: Interceptor.Chain): ImageResult {
+        val result = chain.proceed()
+        if (chain.request.detectQrCode && result is SuccessResult) {
+            val image = result.image
+            if (image is BitmapImageWithExtraInfo) {
+                val hasQrCode = hasQrCode(image.image.bitmap)
+                val new = image.copy(hasQrCode = hasQrCode)
+                return result.copy(image = new)
+            }
+        }
+        return result
+    }
+}

app/src/main/kotlin/com/hippo/ehviewer/cronet/CronetExtensions.kt

@@ -1,11 +0,0 @@
-package com.hippo.ehviewer.cronet
-
-import io.ktor.utils.io.pool.DirectByteBufferPool
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.asExecutor
-
-val pool = DirectByteBufferPool(32)
-
-// Limit thread to 1 since we are async & non-blocking
-val cronetDispatcher = Dispatchers.Default.limitedParallelism(1)
-val cronetHttpClientExecutor = cronetDispatcher.asExecutor()

app/src/main/kotlin/com/hippo/ehviewer/cronet/CronetKt.kt

@@ -1,20 +0,0 @@
-package com.hippo.ehviewer.cronet
-
-import com.hippo.ehviewer.Settings
-import okio.Path.Companion.toOkioPath
-import org.chromium.net.CronetEngine
-import splitties.init.appCtx
-
-val cronetHttpClient: CronetEngine = CronetEngine.Builder(appCtx).apply {
-    enableBrotli(true)
-    setUserAgent(Settings.userAgent)
-
-    // Cache Quic hint only since the real cache mechanism should on Ktor layer
-    val cache = (appCtx.cacheDir.toOkioPath() / "http_cache").toFile().apply { mkdirs() }
-    setStoragePath(cache.absolutePath)
-    enableHttpCache(CronetEngine.Builder.HTTP_CACHE_DISK_NO_HTTP, 4096)
-
-    addQuicHint("e-hentai.org", 443, 443)
-    addQuicHint("forums.e-hentai.org", 443, 443)
-    addQuicHint("exhentai.org", 443, 443)
-}.build()

app/src/main/kotlin/com/hippo/ehviewer/dailycheck/DailyCheckWork.kt

@@ -3,12 +3,12 @@ package com.hippo.ehviewer.dailycheck
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
-import android.net.Uri
 import android.text.style.URLSpan
 import androidx.core.app.NotificationChannelCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.PendingIntentCompat
+import androidx.core.net.toUri
 import androidx.core.text.getSpans
 import androidx.core.text.parseAsHtml
 import androidx.work.Constraints
@@ -19,15 +19,15 @@ import androidx.work.PeriodicWorkRequest
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.WorkerParameters
+import com.ehviewer.core.util.logcat
+import com.ehviewer.core.util.withIOContext
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhEngine
-import eu.kanade.tachiyomi.util.lang.withIOContext
-import eu.kanade.tachiyomi.util.system.logcat
 import java.time.Duration
 import java.util.concurrent.TimeUnit
+import kotlin.time.Clock
 import kotlin.time.Duration.Companion.days
-import kotlinx.datetime.Clock
 import kotlinx.datetime.LocalDateTime
 import kotlinx.datetime.LocalTime
 import kotlinx.datetime.TimeZone
@@ -37,8 +37,7 @@ import splitties.init.appCtx
 
 private const val CHANNEL_ID = "DailyCheckNotification"
 
-class DailyCheckWork(context: Context, workerParams: WorkerParameters) :
-    CoroutineWorker(context, workerParams) {
+class DailyCheckWork(context: Context, workerParams: WorkerParameters) : CoroutineWorker(context, workerParams) {
     override suspend fun doWork(): Result = withIOContext {
         checkDawn().onFailure {
             return@withIOContext Result.retry()
@@ -67,7 +66,7 @@ private fun getDailyCheckWorkRequest(): PeriodicWorkRequest {
 private const val WORK_NAME = "DailyCheckWork"
 
 fun updateDailyCheckWork(context: Context) {
-    if (Settings.requestNews) {
+    if (Settings.requestNews.value) {
         WorkManager.getInstance(context).enqueueUniquePeriodicWork(
             WORK_NAME,
             ExistingPeriodicWorkPolicy.CANCEL_AND_REENQUEUE,
@@ -94,7 +93,7 @@ suspend fun checkDawn() = runCatching {
 
 @SuppressLint("MissingPermission")
 fun showEventNotification(html: String) {
-    if (Settings.hideHvEvents && html.contains("You have encountered a monster!")) {
+    if (Settings.hideHvEvents.value && html.contains("You have encountered a monster!")) {
         return
     }
     val notificationManager = NotificationManagerCompat.from(appCtx)
@@ -111,7 +110,7 @@ fun showEventNotification(html: String) {
         .setStyle(NotificationCompat.BigTextStyle())
     val urls = text.getSpans<URLSpan>(0, text.length)
     if (urls.isNotEmpty()) {
-        val intent = Intent(Intent.ACTION_VIEW, Uri.parse(urls.first().url))
+        val intent = Intent(Intent.ACTION_VIEW, urls.first().url.toUri())
         val pi = PendingIntentCompat.getActivity(appCtx, 0, intent, 0, false)
         msg.setContentIntent(pi)
     }

app/src/main/kotlin/com/hippo/ehviewer/dao/DownloadArtistDao.kt

@@ -1,14 +0,0 @@
-package com.hippo.ehviewer.dao
-
-import androidx.room.Dao
-import androidx.room.Insert
-import androidx.room.Query
-
-@Dao
-interface DownloadArtistDao {
-    @Insert
-    suspend fun insert(downloadArtists: List<DownloadArtist>)
-
-    @Query("DELETE FROM DOWNLOAD_ARTISTS WHERE GID = :gid")
-    suspend fun deleteByGid(gid: Long)
-}

app/src/main/kotlin/com/hippo/ehviewer/dao/HistoryInfo.kt

@@ -1,9 +0,0 @@
-package com.hippo.ehviewer.dao
-
-import androidx.room.Entity
-import androidx.room.ForeignKey
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
-import kotlinx.datetime.Clock
-
-@Entity(tableName = "HISTORY", foreignKeys = [ForeignKey(BaseGalleryInfo::class, ["GID"], ["GID"])])
-class HistoryInfo(gid: Long, time: Long = Clock.System.now().toEpochMilliseconds()) : TimeInfo(gid, time)

app/src/main/kotlin/com/hippo/ehviewer/download/DownloadManager.kt

@@ -22,38 +22,44 @@ import androidx.compose.runtime.DisallowComposableCalls
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.State
 import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.toMutableStateList
-import androidx.compose.ui.util.lerp
+import androidx.compose.runtime.setValue
+import androidx.core.util.size
 import arrow.fx.coroutines.parMapNotNull
+import com.ehviewer.core.data.model.asEntity
+import com.ehviewer.core.database.model.DownloadArtist
+import com.ehviewer.core.database.model.DownloadInfo
+import com.ehviewer.core.database.model.DownloadLabel
+import com.ehviewer.core.files.delete
+import com.ehviewer.core.files.find
+import com.ehviewer.core.files.toOkioPath
+import com.ehviewer.core.files.toUri
+import com.ehviewer.core.model.BaseGalleryInfo
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.preferences.edit
+import com.ehviewer.core.util.logcat
+import com.ehviewer.core.util.mapNotNull
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
-import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.dao.DownloadArtist
-import com.hippo.ehviewer.dao.DownloadInfo
-import com.hippo.ehviewer.dao.DownloadLabel
-import com.hippo.ehviewer.image.Image
+import com.hippo.ehviewer.client.exception.FatalException
 import com.hippo.ehviewer.spider.COMIC_INFO_FILE
+import com.hippo.ehviewer.spider.SpeedTracker
 import com.hippo.ehviewer.spider.SpiderQueen
 import com.hippo.ehviewer.spider.SpiderQueen.Companion.SPIDER_INFO_FILENAME
 import com.hippo.ehviewer.spider.SpiderQueen.OnSpiderListener
-import com.hippo.ehviewer.spider.putToDownloadDir
+import com.hippo.ehviewer.spider.downloadDirname
 import com.hippo.ehviewer.spider.readComicInfo
-import com.hippo.ehviewer.spider.readCompatFromUniFile
+import com.hippo.ehviewer.spider.readCompatFromPath
 import com.hippo.ehviewer.spider.toSimpleTags
 import com.hippo.ehviewer.util.AppConfig
 import com.hippo.ehviewer.util.insertWith
-import com.hippo.ehviewer.util.mapNotNull
 import com.hippo.ehviewer.util.runAssertingNotMainThread
-import com.hippo.unifile.UniFile
-import com.hippo.unifile.asUniFile
-import com.hippo.unifile.asUniFileOrNull
-import eu.kanade.tachiyomi.util.system.logcat
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.transform
@@ -61,15 +67,15 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import logcat.LogPriority
-import splitties.preferences.edit
+import okio.Path
+import okio.Path.Companion.toOkioPath
+import okio.Path.Companion.toPath
 
 object DownloadManager : OnSpiderListener, CoroutineScope {
     override val coroutineContext = Dispatchers.IO + Job()
 
     // All download info list
-    private val allInfoList = runAssertingNotMainThread {
-        (EhDB.getAllDownloadInfo() as MutableList).apply { sortWith(comparator()) }
-    }
+    private val allInfoList = runAssertingNotMainThread { EhDB.getAllDownloadInfo() as MutableList }
 
     val downloadInfoList: List<DownloadInfo>
         get() = allInfoList
@@ -78,7 +84,10 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
     private val mAllInfoMap = allInfoList.associateBy { it.gid } as MutableMap<Long, DownloadInfo>
 
     // All labels without default label
-    val labelList = runAssertingNotMainThread { EhDB.getAllDownloadLabelList() }.toMutableStateList()
+    // Create the SnapshotStateList first in case the database query is time-consuming
+    val labelList = mutableStateListOf<DownloadLabel>().apply {
+        addAll(runAssertingNotMainThread { EhDB.getAllDownloadLabelList() })
+    }
 
     // Store download info wait to start
     private val mWaitList = ArrayDeque<DownloadInfo>()
@@ -91,6 +100,21 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
 
     private val mutex = Mutex()
 
+    private val sortMutex = Mutex()
+    private val sortMode
+        get() = SortMode.from(Settings.downloadSortMode.value)
+
+    var isInitialized by mutableStateOf(false)
+        private set
+
+    init {
+        launch {
+            val mode = sortMode
+            if (mode != SortMode.Default) sortDownloads(mode)
+            isInitialized = true
+        }
+    }
+
     fun containLabel(label: String?): Boolean {
         if (label == null) {
             return false
@@ -172,11 +196,13 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
             }
         } else {
             // It is new download info
-            info = DownloadInfo(galleryInfo, galleryInfo.putToDownloadDir())
+            info = DownloadInfo(galleryInfo.asEntity(), galleryInfo.downloadDirname())
             info.label = label
             info.state = DownloadInfo.STATE_WAIT
             // Add to all download list and map
-            allInfoList.insertWith(info, comparator())
+            sortMutex.withLock {
+                allInfoList.insertWith(info, sortMode.comparator())
+            }
             mAllInfoMap[galleryInfo.gid] = info
 
             // Add to wait list
@@ -191,7 +217,7 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
             ensureDownload()
 
             // Add it to history
-            EhDB.putHistoryInfo(info.galleryInfo)
+            EhDB.putHistoryInfo(info)
         }
     }
 
@@ -233,10 +259,12 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
     }.collectAsState(transform(info)).value
 
     suspend fun startAllDownload() {
-        val updateList = allInfoList.filter {
-            when (it.state) {
-                DownloadInfo.STATE_NONE, DownloadInfo.STATE_FAILED -> true
-                else -> false
+        val updateList = sortMutex.withLock {
+            allInfoList.filter {
+                when (it.state) {
+                    DownloadInfo.STATE_NONE, DownloadInfo.STATE_FAILED -> true
+                    else -> false
+                }
             }
         }
         if (updateList.isNotEmpty()) {
@@ -250,8 +278,8 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
         }
     }
 
-    suspend fun addDownload(downloadInfoList: List<DownloadInfo>) {
-        val comparator = comparator()
+    suspend fun addDownload(downloadInfoList: List<DownloadInfo>) = sortMutex.withLock {
+        val comparator = sortMode.comparator()
         downloadInfoList.forEach { info ->
             if (containDownloadInfo(info.gid)) return@forEach
 
@@ -281,11 +309,13 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
     }
 
     suspend fun restoreDownload(galleryInfo: BaseGalleryInfo, dirname: String) {
-        val info = DownloadInfo(galleryInfo, dirname)
+        val info = DownloadInfo(galleryInfo.asEntity(), dirname)
         info.state = DownloadInfo.STATE_NONE
 
         // Add to all download list and map
-        allInfoList.insertWith(info, comparator())
+        sortMutex.withLock {
+            allInfoList.insertWith(info, sortMode.comparator())
+        }
         mAllInfoMap[galleryInfo.gid] = info
 
         // Save to
@@ -305,16 +335,6 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
         }
     }
 
-    suspend fun stopCurrentDownload() {
-        val info = stopCurrentDownloadInternal()
-        if (info != null) {
-            // Update listener
-            mutableNotifyFlow.emit(info)
-            // Ensure download
-            ensureDownload()
-        }
-    }
-
     suspend fun stopRangeDownload(gidList: LongArray) {
         stopRangeDownloadInternal(gidList)
 
@@ -354,7 +374,9 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
             EhDB.removeDownloadInfo(info)
 
             // Remove all list and map
-            allInfoList.remove(info)
+            sortMutex.withLock {
+                allInfoList.remove(info)
+            }
             mAllInfoMap.remove(info.gid)
 
             // Update listener
@@ -377,7 +399,9 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
             mAllInfoMap.remove(gid)
         }
         EhDB.removeDownloadInfo(list)
-        allInfoList.removeAll(list.toSet())
+        sortMutex.withLock {
+            allInfoList.removeAll(list.toSet())
+        }
 
         // Update listener
         list.forEach { mutableNotifyFlow.emit(it) }
@@ -386,7 +410,7 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
         ensureDownload()
     }
 
-    fun sortDownloads(mode: SortMode) {
+    suspend fun sortDownloads(mode: SortMode) = sortMutex.withLock {
         allInfoList.sortWith(mode.comparator())
     }
 
@@ -505,9 +529,11 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
             val new = exist.copy(label = to)
             labelList.add(index, new)
             EhDB.updateDownloadLabel(new)
-            allInfoList.forEach {
-                if (it.label == from) {
-                    it.label = to
+            sortMutex.withLock {
+                allInfoList.forEach {
+                    if (it.label == from) {
+                        it.label = to
+                    }
                 }
             }
         }
@@ -523,25 +549,29 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
             }
             removeAt(index)
         }
-        allInfoList.forEach {
-            if (it.label == label) {
-                it.label = null
+        sortMutex.withLock {
+            allInfoList.forEach {
+                if (it.label == label) {
+                    it.label = null
+                }
             }
         }
     }
 
     suspend fun readMetadataFromLocal() {
-        val list = allInfoList.mapNotNull {
-            val updateGallery = it.pages == 0 || it.simpleTags == null
-            val updateArtist = it.artistInfoList.isEmpty()
-            if (updateGallery || updateArtist) {
-                Triple(it, updateGallery, updateArtist)
-            } else {
-                null
+        val list = sortMutex.withLock {
+            allInfoList.mapNotNull {
+                val updateGallery = it.pages == 0 || it.simpleTags == null
+                val updateArtist = it.artistInfoList.isEmpty()
+                if (updateGallery || updateArtist) {
+                    Triple(it, updateGallery, updateArtist)
+                } else {
+                    null
+                }
             }
         }.parMapNotNull(concurrency = 5) { (info, updateGallery, updateArtist) ->
             info.downloadDir?.run {
-                val comicInfo = findFile(COMIC_INFO_FILE)?.let { readComicInfo(it) }
+                val comicInfo = find(COMIC_INFO_FILE)?.let { readComicInfo(it) }
                 if (comicInfo != null) {
                     val galleryInfo = if (updateGallery) {
                         info.pages = comicInfo.pageCount
@@ -564,8 +594,8 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
                         null
                     }
                 } else if (info.pages == 0) {
-                    val galleryInfo = findFile(SPIDER_INFO_FILENAME)?.let {
-                        readCompatFromUniFile(it)?.run {
+                    val galleryInfo = find(SPIDER_INFO_FILENAME)?.let {
+                        readCompatFromPath(it)?.run {
                             info.pages = pages
                             info.galleryInfo
                         }
@@ -578,13 +608,14 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
             }
         }
 
-        val galleryInfoList = mutableListOf<BaseGalleryInfo>()
-        list.forEach { (info, artists) ->
-            info?.let {
-                galleryInfoList.add(it)
-            }
-            artists?.let { (gid, updateList) ->
-                EhDB.putDownloadArtist(gid, updateList)
+        val galleryInfoList = buildList {
+            list.forEach { (info, artists) ->
+                info?.let {
+                    add(it)
+                }
+                artists?.let { (gid, updateList) ->
+                    EhDB.putDownloadArtist(gid, updateList)
+                }
             }
         }
         if (galleryInfoList.isNotEmpty()) EhDB.updateGalleryInfo(galleryInfoList)
@@ -602,9 +633,10 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
         }
     }
 
-    override fun onGet509(index: Int) {
+    override fun onFatal(error: FatalException) {
         launch {
-            mDownloadListener?.onGet509()
+            mDownloadListener?.onFatal(error)
+            stopAllDownload()
         }
     }
 
@@ -626,7 +658,7 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
                 info.finished = finished
                 info.downloaded = downloaded
                 info.total = total
-                mDownloadListener?.onGetPage(info)
+                mDownloadListener?.onDownload(info)
                 mutableNotifyFlow.emit(info)
             } ?: logcat(TAG, LogPriority.ERROR) { "Current task is null, but it should not be" }
         }
@@ -678,19 +710,11 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
         }
     }
 
-    override fun onGetImageSuccess(index: Int, image: Image?) {
-        // Ignore
-    }
-
-    override fun onGetImageFailure(index: Int, error: String?) {
-        // Ignore
-    }
-
     interface DownloadListener {
         /**
-         * Get 509 error
+         * Fatal error
          */
-        fun onGet509()
+        fun onFatal(error: FatalException)
 
         /**
          * Start download
@@ -702,11 +726,6 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
          */
         fun onDownload(info: DownloadInfo)
 
-        /**
-         * Update page downloaded
-         */
-        fun onGetPage(info: DownloadInfo)
-
         /**
          * Download done
          */
@@ -719,28 +738,24 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
     }
 
     private val mSpeedReminder = object {
-        private val mContentLengthMap = SparseLongArray()
-        private val mReceivedSizeMap = SparseLongArray()
+        private val contentLengthMap = SparseLongArray()
+        private val receivedSizeMap = SparseLongArray()
+        private val tracker = SpeedTracker()
         private val mutex = Mutex()
-        private var mBytesRead = 0L
-        private var oldSpeed = -1L
         private var currentJob: Job? = null
         fun start() {
             if (currentJob == null) {
                 currentJob = launch {
-                    while (true) {
-                        runInternal()
-                    }
+                    tracker.speedFlow().collect(::updateSpeed)
                 }
             }
         }
 
         suspend fun stop() {
-            mBytesRead = 0
-            oldSpeed = -1
+            tracker.reset()
             mutex.withLock {
-                mContentLengthMap.clear()
-                mReceivedSizeMap.clear()
+                contentLengthMap.clear()
+                receivedSizeMap.clear()
             }
             currentJob?.cancel()
             currentJob = null
@@ -748,48 +763,43 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
 
         suspend fun onDownload(index: Int, contentLength: Long, receivedSize: Long, bytesRead: Int) {
             mutex.withLock {
-                mContentLengthMap.put(index, contentLength)
-                mReceivedSizeMap.put(index, receivedSize)
+                contentLengthMap.put(index, contentLength)
+                receivedSizeMap.put(index, receivedSize)
             }
-            mBytesRead += bytesRead.toLong()
+            tracker.track(bytesRead)
         }
 
         suspend fun onDone(index: Int) {
             mutex.withLock {
-                mContentLengthMap.delete(index)
-                mReceivedSizeMap.delete(index)
+                contentLengthMap.delete(index)
+                receivedSizeMap.delete(index)
             }
         }
 
         suspend fun onFinish() {
             mutex.withLock {
-                mContentLengthMap.clear()
-                mReceivedSizeMap.clear()
+                contentLengthMap.clear()
+                receivedSizeMap.clear()
             }
         }
 
-        private suspend fun runInternal() {
+        private suspend fun updateSpeed(speed: Long) {
             mCurrentTask?.let { info ->
-                var newSpeed = mBytesRead / 2
-                if (oldSpeed != -1L) {
-                    newSpeed = lerp(oldSpeed, newSpeed, 0.75f)
-                }
-                oldSpeed = newSpeed
-                info.speed = newSpeed
+                info.speed = speed
 
                 // Calculate remaining
                 if (info.total <= 0) {
                     info.remaining = -1
-                } else if (newSpeed == 0L) {
+                } else if (speed == 0L) {
                     info.remaining = 300L * 24L * 60L * 60L * 1000L // 300 days
                 } else {
                     var downloadingCount = 0
                     var downloadingContentLengthSum = 0L
                     var totalSize = 0L
                     mutex.withLock {
-                        for (i in 0..<mContentLengthMap.size()) {
-                            val contentLength = mContentLengthMap.valueAt(i)
-                            val receivedSize = mReceivedSizeMap.valueAt(i)
+                        for (i in 0..<contentLengthMap.size) {
+                            val contentLength = contentLengthMap.valueAt(i)
+                            val receivedSize = receivedSizeMap.valueAt(i)
                             downloadingCount++
                             downloadingContentLengthSum += contentLength
                             totalSize += contentLength - receivedSize
@@ -797,34 +807,33 @@ object DownloadManager : OnSpiderListener, CoroutineScope {
                     }
                     if (downloadingCount != 0) {
                         totalSize += downloadingContentLengthSum * (info.total - info.downloaded - downloadingCount) / downloadingCount
-                        info.remaining = totalSize / newSpeed * 1000
+                        info.remaining = totalSize / speed * 1000
                     }
                 }
                 mDownloadListener?.onDownload(info)
                 mutableNotifyFlow.emit(info)
             }
-            mBytesRead = 0
-            delay(2000)
         }
     }
 
     private const val TAG = "DownloadManager"
-
-    private fun comparator() = SortMode.from(Settings.downloadSortMode.value).comparator()
 }
 
-var downloadLocation: UniFile
+var downloadLocation: Path
     get() = with(Settings) {
-        val uri = Uri.Builder().apply {
-            scheme(downloadScheme)
-            encodedAuthority(downloadAuthority)
-            encodedPath(downloadPath)
-            encodedQuery(downloadQuery)
-            encodedFragment(downloadFragment)
-        }.build()
-        uri.asUniFileOrNull() ?: AppConfig.defaultDownloadDir?.asUniFile() ?: UniFile.Stub
+        if (downloadScheme != null) {
+            Uri.Builder().apply {
+                scheme(downloadScheme)
+                encodedAuthority(downloadAuthority)
+                encodedPath(downloadPath)
+                encodedQuery(downloadQuery)
+                encodedFragment(downloadFragment)
+            }.build().toOkioPath()
+        } else {
+            AppConfig.defaultDownloadDir?.toOkioPath() ?: "".toPath()
+        }
     }
-    set(value) = with(value.uri) {
+    set(value) = with(value.toUri()) {
         Settings.edit {
             downloadScheme = scheme
             downloadAuthority = encodedAuthority
@@ -835,5 +844,5 @@ var downloadLocation: UniFile
     }
 
 val DownloadInfo.downloadDir get() = dirname?.let { downloadLocation / it }
-val DownloadInfo.archiveFile get() = downloadDir?.run { findFile("$gid.cbz") ?: findFile("$gid.zip") }
-val GalleryInfo.tempDownloadDir get() = AppConfig.getTempDir("$gid")
+val DownloadInfo.archiveFile get() = downloadDir?.run { find("$gid.cbz") ?: find("$gid.zip") }
+val GalleryInfo.tempDownloadDir get() = AppConfig.externalTempPersistDir?.let { it / "$gid" }

app/src/main/kotlin/com/hippo/ehviewer/download/DownloadService.kt

@@ -16,75 +16,89 @@
 package com.hippo.ehviewer.download
 
 import android.Manifest
+import android.app.ForegroundServiceStartNotAllowedException
 import android.app.PendingIntent
 import android.app.Service
+import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Bundle
-import android.os.SystemClock
-import androidx.annotation.IntDef
 import androidx.collection.LongSparseArray
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationChannelCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
-import androidx.core.app.ServiceCompat
-import com.hippo.ehviewer.R
+import androidx.core.content.ContextCompat
+import androidx.savedstate.serialization.decodeFromSavedState
+import androidx.savedstate.serialization.encodeToSavedState
+import com.ehviewer.core.database.model.DownloadInfo
+import com.ehviewer.core.i18n.R
+import com.ehviewer.core.model.BaseGalleryInfo
+import com.ehviewer.core.util.isAtLeastS
+import com.ehviewer.core.util.logcat
+import com.ehviewer.core.util.unsafeLazy
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
-import com.hippo.ehviewer.dao.DownloadInfo
+import com.hippo.ehviewer.client.exception.FatalException
+import com.hippo.ehviewer.client.exception.InsufficientGpException
+import com.hippo.ehviewer.client.exception.IpBannedException
+import com.hippo.ehviewer.client.exception.QuotaExceededException
 import com.hippo.ehviewer.ui.MainActivity
 import com.hippo.ehviewer.util.FileUtils
 import com.hippo.ehviewer.util.ReadableTime
-import com.hippo.ehviewer.util.SimpleHandler
-import com.hippo.ehviewer.util.getParcelableExtraCompat
-import eu.kanade.tachiyomi.util.system.logcat
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.async
 import kotlinx.coroutines.cancel
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.flow.sample
 import kotlinx.coroutines.launch
 
-class DownloadService : Service(), DownloadManager.DownloadListener, CoroutineScope {
+class DownloadService :
+    Service(),
+    DownloadManager.DownloadListener,
+    CoroutineScope {
     override val coroutineContext = Dispatchers.IO + SupervisorJob()
-    private val deferredMgr = async { DownloadManager.apply { setDownloadListener(this@DownloadService) } }
-    private var mNotifyManager: NotificationManagerCompat? = null
-    private var mDownloadingBuilder: NotificationCompat.Builder? = null
-    private var mDownloadedBuilder: NotificationCompat.Builder? = null
-    private var m509dBuilder: NotificationCompat.Builder? = null
-    private var mDownloadingDelay: NotificationDelay? = null
-    private var mDownloadedDelay: NotificationDelay? = null
-    private var m509Delay: NotificationDelay? = null
-    private var mChannelID: String? = null
+    private val deferredMgr = async { DownloadManager }
+    private val notifyManager by unsafeLazy { NotificationManagerCompat.from(this) }
+    private val downloadingNotification by unsafeLazy { initDownloadingNotification() }
+    private val downloadedNotification by lazy { initDownloadedNotification() }
+    private val fatalNotification by lazy { initFatalNotification() }
+    private val channelId by unsafeLazy { "$packageName.download" }
 
     override fun onCreate() {
-        super.onCreate()
-        mChannelID = "$packageName.download"
-        mNotifyManager = NotificationManagerCompat.from(this)
-        mNotifyManager!!.createNotificationChannel(
-            NotificationChannelCompat.Builder(mChannelID!!, NotificationManagerCompat.IMPORTANCE_LOW)
+        notifyManager.createNotificationChannel(
+            NotificationChannelCompat.Builder(channelId, NotificationManagerCompat.IMPORTANCE_LOW)
                 .setName(getString(R.string.download_service)).build(),
         )
-        ensureDownloadingBuilder()
-        mDownloadingBuilder!!.setContentTitle(getString(R.string.download_service))
-            .setContentText(null)
-            .setSubText(null)
-            .setProgress(0, 0, true)
-        startForeground(ID_DOWNLOADING, mDownloadingBuilder!!.build())
+        downloadingNotification.builder.runCatching {
+            setContentTitle(getString(R.string.download_service))
+                .setContentText(null)
+                .setSubText(null)
+                .setProgress(0, 0, true)
+            startForeground(ID_DOWNLOADING, build())
+        }.onFailure {
+            if (isAtLeastS && it is ForegroundServiceStartNotAllowedException) {
+                logcat(it)
+            } else {
+                throw it
+            }
+        }
+        launch {
+            deferredMgr.await().setDownloadListener(this@DownloadService)
+        }
     }
 
     override fun onDestroy() {
-        super.onDestroy()
         val scope = this
         launch {
             deferredMgr.await().setDownloadListener(null)
+            // Wait for the last notification to be posted
+            delay(DELAY)
             scope.cancel()
         }
-        mNotifyManager = null
-        mDownloadingBuilder = null
-        mDownloadedBuilder = null
-        m509dBuilder = null
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
@@ -95,11 +109,9 @@ class DownloadService : Service(), DownloadManager.DownloadListener, CoroutineSc
     private suspend fun handleIntent(intent: Intent?) {
         when (intent?.action) {
             ACTION_START -> {
-                val gi = intent.getParcelableExtraCompat<BaseGalleryInfo>(KEY_GALLERY_INFO)
+                val gi = intent.getBundleExtra(KEY_GALLERY_INFO) ?: return
                 val label = intent.getStringExtra(KEY_LABEL)
-                if (gi != null) {
-                    deferredMgr.await().startDownload(gi, label)
-                }
+                deferredMgr.await().startDownload(decodeFromSavedState(gi), label)
             }
 
             ACTION_START_RANGE -> {
@@ -109,79 +121,36 @@ class DownloadService : Service(), DownloadManager.DownloadListener, CoroutineSc
                 }
             }
 
-            ACTION_START_ALL -> {
-                deferredMgr.await().startAllDownload()
-            }
-
-            ACTION_STOP -> {
-                val gid = intent.getLongExtra(KEY_GID, -1)
-                if (gid != -1L) {
-                    deferredMgr.await().stopDownload(gid)
-                }
-            }
-
-            ACTION_STOP_CURRENT -> deferredMgr.await().stopCurrentDownload()
-
-            ACTION_STOP_RANGE -> {
-                val gidList = intent.getLongArrayExtra(KEY_GID_LIST)
-                if (gidList != null) {
-                    deferredMgr.await().stopRangeDownload(gidList)
-                }
-            }
-
+            ACTION_START_ALL -> deferredMgr.await().startAllDownload()
             ACTION_STOP_ALL -> deferredMgr.await().stopAllDownload()
-
-            ACTION_DELETE -> {
-                val gid = intent.getLongExtra(KEY_GID, -1)
-                if (gid != -1L) {
-                    deferredMgr.await().deleteDownload(gid)
-                }
-            }
-
-            ACTION_DELETE_RANGE -> {
-                val gidList = intent.getLongArrayExtra(KEY_GID_LIST)
-                if (gidList != null) {
-                    deferredMgr.await().deleteRangeDownload(gidList)
-                }
-            }
-
-            ACTION_CLEAR -> {
-                clear()
-                checkStopSelf()
-            }
+            ACTION_CLEAR -> clear()
         }
+        checkStopSelf()
     }
 
-    override fun onBind(intent: Intent) = error("No bindService")
+    override fun onBind(intent: Intent) = null
 
-    private fun ensureDownloadingBuilder() {
-        if (mDownloadingBuilder != null) {
-            return
-        }
+    private fun initDownloadingNotification(): NotificationHandler {
         val stopAllIntent = Intent(this, DownloadService::class.java)
         stopAllIntent.action = ACTION_STOP_ALL
         val piStopAll =
             PendingIntent.getService(this, 0, stopAllIntent, PendingIntent.FLAG_IMMUTABLE)
-        mDownloadingBuilder = NotificationCompat.Builder(applicationContext, mChannelID!!)
+        val builder = NotificationCompat.Builder(applicationContext, channelId)
             .setSmallIcon(android.R.drawable.stat_sys_download)
             .setOngoing(true)
             .setAutoCancel(false)
             .setCategory(NotificationCompat.CATEGORY_PROGRESS)
             .addAction(
-                R.drawable.v_pause_x24,
+                com.hippo.ehviewer.R.drawable.v_pause_x24,
                 getString(R.string.stat_download_action_stop_all),
                 piStopAll,
             )
             .setShowWhen(false)
-            .setChannelId(mChannelID!!)
-        mDownloadingDelay =
-            NotificationDelay(this, mNotifyManager!!, mDownloadingBuilder!!, ID_DOWNLOADING)
+        return NotificationHandler(this, notifyManager, builder, ID_DOWNLOADING)
+            .apply { launch { run() } }
     }
 
-    private fun ensureDownloadedBuilder() {
-        if (mDownloadedBuilder != null) {
-            return
-        }
+    private fun initDownloadedNotification(): NotificationHandler {
         val clearIntent = Intent(this, DownloadService::class.java)
         clearIntent.action = ACTION_CLEAR
         val piClear = PendingIntent.getService(this, 0, clearIntent, PendingIntent.FLAG_IMMUTABLE)
@@ -191,119 +160,91 @@ class DownloadService : Service(), DownloadManager.DownloadListener, CoroutineSc
         activityIntent.action = ACTION_START_DOWNLOADSCENE
         activityIntent.putExtra(ACTION_START_DOWNLOADSCENE_ARGS, bundle)
         val piActivity = PendingIntent.getActivity(
-            this@DownloadService,
+            this,
             0,
             activityIntent,
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
         )
-        mDownloadedBuilder = NotificationCompat.Builder(applicationContext, mChannelID!!)
+        val builder = NotificationCompat.Builder(applicationContext, channelId)
             .setSmallIcon(android.R.drawable.stat_sys_download_done)
             .setContentTitle(getString(R.string.stat_download_done_title))
             .setDeleteIntent(piClear)
             .setOngoing(false)
             .setAutoCancel(true)
             .setContentIntent(piActivity)
-        mDownloadedDelay =
-            NotificationDelay(this, mNotifyManager!!, mDownloadedBuilder!!, ID_DOWNLOADED)
+        return NotificationHandler(this, notifyManager, builder, ID_DOWNLOADED)
+            .apply { launch { run() } }
     }
 
-    private fun ensure509Builder() {
-        if (m509dBuilder != null) {
-            return
-        }
-        m509dBuilder = NotificationCompat.Builder(applicationContext, mChannelID!!)
-            .setSmallIcon(R.drawable.ic_baseline_warning_24)
-            .setContentText(getString(R.string.stat_509_alert_title))
-            .setContentText(getString(R.string.stat_509_alert_text))
-            .setStyle(
-                NotificationCompat.BigTextStyle().bigText(getString(R.string.stat_509_alert_text)),
-            )
+    private fun initFatalNotification(): NotificationHandler {
+        val builder = NotificationCompat.Builder(applicationContext, channelId)
+            .setSmallIcon(com.hippo.ehviewer.R.drawable.ic_baseline_warning_24)
             .setAutoCancel(true)
             .setOngoing(false)
             .setCategory(NotificationCompat.CATEGORY_ERROR)
-        m509Delay = NotificationDelay(this, mNotifyManager!!, m509dBuilder!!, ID_509)
+        return NotificationHandler(this, notifyManager, builder, ID_FATAL)
+            .apply { launch { run() } }
     }
 
-    override fun onGet509() {
-        launch {
-            deferredMgr.await().stopAllDownload()
-            if (mNotifyManager == null) {
-                return@launch
-            }
-            ensure509Builder()
-            m509dBuilder!!.setWhen(System.currentTimeMillis())
-            m509Delay!!.show()
+    override fun onFatal(error: FatalException) {
+        val (title, text) = when (error) {
+            is IpBannedException -> R.string.error_ip_banned to error.message
+            is InsufficientGpException -> R.string.insufficient_funds to error.message
+            is QuotaExceededException -> R.string.stat_509_alert_title to getString(R.string.stat_509_alert_text)
+        }
+        fatalNotification.run {
+            builder.setWhen(System.currentTimeMillis())
+                .setContentTitle(getString(title))
+                .setContentText(text)
+                .setStyle(NotificationCompat.BigTextStyle().bigText(text))
+            show()
         }
     }
 
     override fun onStart(info: DownloadInfo) {
-        if (mNotifyManager == null) {
-            return
-        }
-        ensureDownloadingBuilder()
         val bundle = Bundle()
         bundle.putLong(KEY_GID, info.gid)
         val activityIntent = Intent(this, MainActivity::class.java)
         activityIntent.action = ACTION_START_DOWNLOADSCENE
         activityIntent.putExtra(ACTION_START_DOWNLOADSCENE_ARGS, bundle)
         val piActivity = PendingIntent.getActivity(
-            this@DownloadService,
+            this,
             0,
             activityIntent,
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
         )
-        mDownloadingBuilder!!.setContentTitle(EhUtils.getSuitableTitle(info))
-            .setContentText(null)
-            .setSubText(null)
-            .setProgress(0, 0, true)
-            .setContentIntent(piActivity)
-        mDownloadingDelay!!.startForeground()
-    }
-
-    private fun onUpdate(info: DownloadInfo) {
-        if (mNotifyManager == null) {
-            return
+        downloadingNotification.run {
+            builder.setContentTitle(EhUtils.getSuitableTitle(info))
+                .setContentText(null)
+                .setSubText(null)
+                .setProgress(0, 0, true)
+                .setContentIntent(piActivity)
+            startForeground()
         }
-        ensureDownloadingBuilder()
-        var speed = info.speed
-        if (speed < 0) {
-            speed = 0
-        }
-        var text = FileUtils.humanReadableByteCount(speed, false) + "/s"
-        val remaining = info.remaining
-        text = if (remaining >= 0) {
-            getString(
-                R.string.download_speed_text_2,
-                text,
-                ReadableTime.getShortTimeInterval(remaining),
-            )
-        } else {
-            getString(R.string.download_speed_text, text)
-        }
-        mDownloadingBuilder!!.setContentTitle(EhUtils.getSuitableTitle(info))
-            .setContentText(text)
-            .setStyle(NotificationCompat.BigTextStyle().bigText(text))
-            .setSubText(if (info.total == -1 || info.finished == -1) null else info.finished.toString() + "/" + info.total)
-            .setProgress(info.total, info.finished, false)
-        mDownloadingDelay!!.startForeground()
     }
 
     override fun onDownload(info: DownloadInfo) {
-        onUpdate(info)
-    }
-
-    override fun onGetPage(info: DownloadInfo) {
-        onUpdate(info)
+        val speed = info.speed.coerceAtLeast(0)
+        val speedText = FileUtils.humanReadableByteCount(speed) + "/s"
+        val remaining = info.remaining
+        val text = if (remaining >= 0) {
+            val interval = ReadableTime.getShortTimeInterval(remaining)
+            getString(R.string.download_speed_text_2, speedText, interval)
+        } else {
+            getString(R.string.download_speed_text, speedText)
+        }
+        downloadingNotification.run {
+            builder.setContentTitle(EhUtils.getSuitableTitle(info))
+                .setContentText(text)
+                .setStyle(NotificationCompat.BigTextStyle().bigText(text))
+                .setSubText(if (info.total == -1 || info.finished == -1) null else info.finished.toString() + "/" + info.total)
+                .setProgress(info.total, info.finished, false)
+            startForeground()
+        }
     }
 
     override fun onFinish(info: DownloadInfo) {
-        if (mNotifyManager == null) {
-            return
-        }
-        if (null != mDownloadingDelay) {
-            mDownloadingDelay!!.cancel()
-        }
-        ensureDownloadedBuilder()
+        downloadingNotification.cancel()
         val finish = info.state == DownloadInfo.STATE_FINISH
         val gid = info.gid
         val index = sItemStateArray.indexOfKey(gid)
@@ -392,132 +333,72 @@ class DownloadService : Service(), DownloadManager.DownloadListener, CoroutineSc
         } else {
             style = null
         }
-        mDownloadedBuilder!!.setContentText(text)
-            .setStyle(style)
-            .setWhen(System.currentTimeMillis())
-            .setNumber(sDownloadedCount)
-        mDownloadedDelay!!.show()
+        downloadedNotification.run {
+            builder.setContentText(text)
+                .setStyle(style)
+                .setWhen(System.currentTimeMillis())
+                .setNumber(sDownloadedCount)
+            show()
+        }
         checkStopSelf()
     }
 
     override fun onCancel(info: DownloadInfo) {
-        if (mNotifyManager == null) {
-            return
-        }
-        if (null != mDownloadingDelay) {
-            mDownloadingDelay!!.cancel()
-        }
+        downloadingNotification.cancel()
         checkStopSelf()
     }
 
     private fun checkStopSelf() {
         launch {
             if (deferredMgr.await().isIdle) {
-                ServiceCompat.stopForeground(this@DownloadService, ServiceCompat.STOP_FOREGROUND_REMOVE)
                 stopSelf()
             }
         }
     }
 
-    private class NotificationDelay(
-        private var mService: Service,
-        private val mNotifyManager: NotificationManagerCompat,
-        private val mBuilder: NotificationCompat.Builder,
-        private val mId: Int,
-    ) : Runnable {
-        private var mLastTime: Long = 0
-        private var mPosted = false
-
-        // false for show, true for cancel
-        @Ops
-        private var mOps = 0
+    private class NotificationHandler(
+        private val service: Service,
+        private val notifyManager: NotificationManagerCompat,
+        val builder: NotificationCompat.Builder,
+        private val id: Int,
+    ) {
+        private val channel = Channel<Ops>(Channel.CONFLATED)
 
         fun show() {
-            if (mPosted) {
-                mOps = OPS_NOTIFY
-            } else {
-                val now = SystemClock.currentThreadTimeMillis()
-                if (now - mLastTime > DELAY) {
-                    // Wait long enough, do it now
-                    if (ActivityCompat.checkSelfPermission(
-                            mService,
-                            Manifest.permission.POST_NOTIFICATIONS,
-                        ) != PackageManager.PERMISSION_GRANTED
-                    ) {
-                        return
-                    }
-                    mNotifyManager.notify(mId, mBuilder.build())
-                } else {
-                    // Too quick, post delay
-                    mOps = OPS_NOTIFY
-                    mPosted = true
-                    SimpleHandler.postDelayed(this, DELAY)
-                }
-                mLastTime = now
-            }
+            channel.trySend(Ops.Notify)
         }
 
         fun cancel() {
-            if (mPosted) {
-                mOps = OPS_CANCEL
-            } else {
-                val now = SystemClock.currentThreadTimeMillis()
-                if (now - mLastTime > DELAY) {
-                    // Wait long enough, do it now
-                    mNotifyManager.cancel(mId)
-                } else {
-                    // Too quick, post delay
-                    mOps = OPS_CANCEL
-                    mPosted = true
-                    SimpleHandler.postDelayed(this, DELAY)
-                }
-            }
+            channel.trySend(Ops.Cancel)
         }
 
         fun startForeground() {
-            if (mPosted) {
-                mOps = OPS_START_FOREGROUND
-            } else {
-                val now = SystemClock.currentThreadTimeMillis()
-                if (now - mLastTime > DELAY) {
-                    // Wait long enough, do it now
-                    mService.startForeground(mId, mBuilder.build())
-                } else {
-                    // Too quick, post delay
-                    mOps = OPS_START_FOREGROUND
-                    mPosted = true
-                    SimpleHandler.postDelayed(this, DELAY)
-                }
-            }
+            channel.trySend(Ops.StartForeground)
         }
 
-        override fun run() {
-            mPosted = false
-            when (mOps) {
-                OPS_NOTIFY -> {
-                    if (ActivityCompat.checkSelfPermission(
-                            mService,
-                            Manifest.permission.POST_NOTIFICATIONS,
-                        ) != PackageManager.PERMISSION_GRANTED
-                    ) {
-                        return
+        suspend fun run() {
+            channel.receiveAsFlow().sample(DELAY).collect {
+                when (it) {
+                    Ops.Notify -> {
+                        if (ActivityCompat.checkSelfPermission(
+                                service,
+                                Manifest.permission.POST_NOTIFICATIONS,
+                            ) == PackageManager.PERMISSION_GRANTED
+                        ) {
+                            notifyManager.notify(id, builder.build())
+                        }
                     }
-                    mNotifyManager.notify(mId, mBuilder.build())
-                }
 
-                OPS_CANCEL -> mNotifyManager.cancel(mId)
-                OPS_START_FOREGROUND -> mService.startForeground(mId, mBuilder.build())
+                    Ops.Cancel -> notifyManager.cancel(id)
+                    Ops.StartForeground -> service.startForeground(id, builder.build())
+                }
             }
         }
 
-        @IntDef(OPS_NOTIFY, OPS_CANCEL, OPS_START_FOREGROUND)
-        @Retention(AnnotationRetention.SOURCE)
-        private annotation class Ops
-        companion object {
-            private const val OPS_NOTIFY = 0
-            private const val OPS_CANCEL = 1
-            private const val OPS_START_FOREGROUND = 2
-            private const val DELAY: Long = 1000 // 1s
+        private enum class Ops {
+            Notify,
+            Cancel,
+            StartForeground,
         }
     }
 
@@ -528,12 +409,7 @@ class DownloadService : Service(), DownloadManager.DownloadListener, CoroutineSc
         const val ACTION_START = "start"
         const val ACTION_START_RANGE = "start_range"
         const val ACTION_START_ALL = "start_all"
-        const val ACTION_STOP = "stop"
-        const val ACTION_STOP_RANGE = "stop_range"
-        const val ACTION_STOP_CURRENT = "stop_current"
         const val ACTION_STOP_ALL = "stop_all"
-        const val ACTION_DELETE = "delete"
-        const val ACTION_DELETE_RANGE = "delete_range"
         const val ACTION_CLEAR = "clear"
         const val KEY_GALLERY_INFO = "gallery_info"
         const val KEY_LABEL = "label"
@@ -543,13 +419,31 @@ class DownloadService : Service(), DownloadManager.DownloadListener, CoroutineSc
         const val ACTION_CLEAR_DOWNLOAD_SERVICE = "clear_download_service"
         private const val ID_DOWNLOADING = 1
         private const val ID_DOWNLOADED = 2
-        private const val ID_509 = 3
+        private const val ID_FATAL = 3
+        private const val DELAY = 1000L // 1s
         private val sItemStateArray = LongSparseArray<Boolean>()
         private val sItemTitleArray = LongSparseArray<String>()
         private var sFailedCount = 0
         private var sFinishedCount = 0
         private var sDownloadedCount = 0
 
+        context(ctx: Context)
+        inline fun startService(action: String, intentBuilder: Intent.() -> Unit = {}) {
+            val intent = Intent(ctx, DownloadService::class.java).setAction(action).apply(intentBuilder)
+            ContextCompat.startForegroundService(ctx, intent)
+        }
+
+        context(_: Context)
+        fun startDownload(info: BaseGalleryInfo, label: String? = null) = startService(ACTION_START) {
+            putExtra(KEY_GALLERY_INFO, encodeToSavedState(info))
+            label?.let { putExtra(KEY_LABEL, it) }
+        }
+
+        context(_: Context)
+        fun startRangeDownload(gidList: LongArray) = startService(ACTION_START_RANGE) {
+            putExtra(KEY_GID_LIST, gidList)
+        }
+
         fun clear() {
             sFailedCount = 0
             sFinishedCount = 0

app/src/main/kotlin/com/hippo/ehviewer/download/DownloadsFilterMode.kt

@@ -1,7 +1,7 @@
 package com.hippo.ehviewer.download
 
-import com.hippo.ehviewer.dao.DownloadInfo
-import com.hippo.ehviewer.dao.artists
+import com.ehviewer.core.database.model.DownloadInfo
+import com.ehviewer.core.database.model.artists
 
 enum class DownloadsFilterMode(
     val flag: Int,

app/src/main/kotlin/com/hippo/ehviewer/download/SortMode.kt

@@ -1,7 +1,7 @@
 package com.hippo.ehviewer.download
 
+import com.ehviewer.core.database.model.DownloadInfo
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.dao.DownloadInfo
 
 data class SortMode(val field: Field, val order: Order, val groupByDownloadLabel: Boolean = false) {
     val flag
@@ -11,7 +11,6 @@ data class SortMode(val field: Field, val order: Order, val groupByDownloadLabel
         GID(0),
         TITLE(1),
         TIME(2),
-        LABEL(3),
         PAGES(4),
     }
 
@@ -23,13 +22,16 @@ data class SortMode(val field: Field, val order: Order, val groupByDownloadLabel
     fun comparator(): Comparator<DownloadInfo> {
         var comparator = when (field) {
             Field.GID -> compareBy { it.gid }
-            Field.TITLE, Field.LABEL -> compareBy { EhUtils.getSuitableTitle(it) }
+            Field.TITLE -> compareBy { EhUtils.getSuitableTitle(it) }
             Field.TIME -> compareBy { it.time }
-            Field.PAGES -> compareBy<DownloadInfo> { it.pages }.thenBy { EhUtils.getSuitableTitle(it) }
+            Field.PAGES -> compareBy<DownloadInfo> { it.pages }
         }
         if (order == Order.DESC) {
             comparator = comparator.reversed()
         }
+        if (field == Field.PAGES) {
+            comparator = comparator.thenByDescending { it.time }
+        }
         if (groupByDownloadLabel) {
             comparator = compareBy<DownloadInfo> { it.label }.then(comparator)
         }
@@ -38,15 +40,16 @@ data class SortMode(val field: Field, val order: Order, val groupByDownloadLabel
 
     companion object {
         fun from(flag: Int): SortMode {
-            val field = flag and 0xF shr 1
-            val order = flag and 0x1
+            val fieldValue = flag and 0xF shr 1
+            val orderValue = flag and 0x1
             val groupByDownloadLabel = flag shr 4 == 1
-            require(field in Field.entries.indices && order in Order.entries.indices)
-            return SortMode(Field.entries[field], Order.entries[order], groupByDownloadLabel)
+            val field = Field.entries.find { it.value == fieldValue } ?: Default.field
+            val order = Order.entries.find { it.value == orderValue } ?: Default.order
+            return SortMode(field, order, groupByDownloadLabel)
         }
         val Default = SortMode(Field.TIME, Order.DESC)
         val All = listOf(
-            SortMode(Field.TIME, Order.DESC),
+            Default,
             SortMode(Field.TIME, Order.ASC),
             SortMode(Field.GID, Order.DESC),
             SortMode(Field.GID, Order.ASC),

app/src/main/kotlin/com/hippo/ehviewer/gallery/ArchivePageLoader.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Tarsin Norbin
+ * Copyright 2023-2024 Tarsin Norbin
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,14 @@
  */
 package com.hippo.ehviewer.gallery
 
-import android.os.ParcelFileDescriptor
+import arrow.autoCloseScope
+import com.ehviewer.core.files.openFileDescriptor
+import com.ehviewer.core.model.GalleryInfo
+import com.ehviewer.core.util.logcat
 import com.hippo.ehviewer.Settings.archivePasswds
-import com.hippo.ehviewer.image.ByteBufferSource
-import com.hippo.ehviewer.image.Image
+import com.hippo.ehviewer.client.EhUtils
+import com.hippo.ehviewer.image.ImageSource
+import com.hippo.ehviewer.image.byteBufferSource
 import com.hippo.ehviewer.jni.closeArchive
 import com.hippo.ehviewer.jni.extractToByteBuffer
 import com.hippo.ehviewer.jni.extractToFd
@@ -28,143 +32,65 @@ import com.hippo.ehviewer.jni.openArchive
 import com.hippo.ehviewer.jni.providePassword
 import com.hippo.ehviewer.jni.releaseByteBuffer
 import com.hippo.ehviewer.util.FileUtils
-import com.hippo.unifile.UniFile
-import com.hippo.unifile.displayPath
-import eu.kanade.tachiyomi.util.system.logcat
-import java.nio.ByteBuffer
-import kotlinx.coroutines.CoroutineStart
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.currentCoroutineContext
-import kotlinx.coroutines.ensureActive
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Semaphore
-import kotlinx.coroutines.sync.withPermit
-import moe.tarsin.coroutines.NamedMutex
-import moe.tarsin.coroutines.withLock
+import com.hippo.ehviewer.util.displayName
+import kotlinx.coroutines.coroutineScope
+import moe.tarsin.kt.install
+import okio.Path
 
 typealias PasswdInvalidator = (String) -> Boolean
 typealias PasswdProvider = suspend (PasswdInvalidator) -> String
 
-class ArchivePageLoader(
-    private val file: UniFile,
-    gid: Long = 0,
+suspend inline fun <T> useArchivePageLoader(
+    file: Path,
+    info: GalleryInfo? = null,
     startPage: Int = 0,
-    passwdProvider: PasswdProvider? = null,
-) : PageLoader2(gid, startPage) {
-    private lateinit var pfd: ParcelFileDescriptor
-    private val hostJob = launch(start = CoroutineStart.LAZY) {
-        logcat(DEBUG_TAG) { "Open archive ${file.uri.displayPath}" }
-        pfd = file.openFileDescriptor("r")
-        size = openArchive(pfd.fd, pfd.statSize, gid == 0L || file.name!!.endsWith(".zip"))
-        if (size == 0) {
-            return@launch
+    hasAds: Boolean = false,
+    crossinline passwdProvider: PasswdProvider,
+    crossinline block: suspend (PageLoader) -> T,
+) = autoCloseScope {
+    coroutineScope {
+        val pfd = install(file.openFileDescriptor("r"))
+        val size = install(
+            { openArchive(pfd.fd, pfd.statSize, info == null || file.name.endsWith(".zip")) },
+            { _, _ -> closeArchive() },
+        )
+        check(size > 0) { "Archive have no content!" }
+        if (needPassword() && archivePasswds.none(::providePassword)) {
+            archivePasswds += passwdProvider(::providePassword)
         }
-        if (passwdProvider != null && needPassword()) {
-            archivePasswds?.forEach {
-                it ?: return@forEach
-                if (providePassword(it)) return@launch
-            }
-            val toAdd = passwdProvider { providePassword(it) }
-            archivePasswds = archivePasswds?.toMutableSet()?.apply { add(toAdd) } ?: setOf(toAdd)
-        }
-    }
-
-    override var size = 0
-        private set
-
-    override fun start() {
-        super.start()
-        hostJob.start()
-    }
-
-    override fun stop() {
-        super.stop()
-        closeArchive()
-        pfd.close()
-        logcat(DEBUG_TAG) { "Close archive ${file.uri.displayPath} successfully!" }
-    }
-
-    private val mJobMap = hashMapOf<Int, Job>()
-    private val mWorkerMutex = NamedMutex<Int>()
-    private val mSemaphore = Semaphore(4)
-
-    override fun onRequest(index: Int) {
-        synchronized(mJobMap) {
-            val current = mJobMap[index]
-            if (current?.isActive != true) {
-                mJobMap[index] = launch {
-                    mWorkerMutex.withLock(index) {
-                        mSemaphore.withPermit {
-                            doRealWork(index)
-                        }
+        val loader = install(
+            object : PageLoader(this, info, startPage, size, hasAds) {
+                override val title by lazy {
+                    if (info != null) {
+                        EhUtils.getSuitableTitle(info)
+                    } else {
+                        FileUtils.getNameFromFilename(file.displayName)!!
                     }
                 }
-            }
-        }
+
+                override fun getImageExtension(index: Int) = getExtension(index)
+
+                override fun save(index: Int, file: Path) = runCatching {
+                    file.openFileDescriptor("w").use {
+                        extractToFd(index, it.fd)
+                    }
+                }.getOrElse {
+                    logcat(it)
+                    false
+                }
+
+                override fun openSource(index: Int): ImageSource {
+                    val buffer = extractToByteBuffer(index)
+                    checkNotNull(buffer) { "Extract archive content $index failed!" }
+                    check(buffer.isDirect)
+                    return byteBufferSource(buffer) { releaseByteBuffer(buffer) }
+                }
+
+                override fun prefetchPages(pages: List<Int>, bounds: IntRange) = Unit
+
+                override fun onRequest(index: Int, force: Boolean, orgImg: Boolean) = notifySourceReady(index)
+            },
+        )
+        block(loader)
     }
-
-    private suspend fun doRealWork(index: Int) {
-        val buffer = extractToByteBuffer(index) ?: return notifyPageFailed(index, null)
-        check(buffer.isDirect)
-        val src = object : ByteBufferSource {
-            override val source: ByteBuffer = buffer
-
-            override fun close() {
-                releaseByteBuffer(buffer)
-            }
-        }
-        runCatching {
-            currentCoroutineContext().ensureActive()
-        }.onFailure {
-            src.close()
-            throw it
-        }
-        val image = Image.decode(src) ?: return notifyPageFailed(index, null)
-        runCatching {
-            currentCoroutineContext().ensureActive()
-        }.onFailure {
-            image.recycle()
-            throw it
-        }
-        notifyPageSucceed(index, image)
-    }
-
-    override fun onForceRequest(index: Int, orgImg: Boolean) {
-        onRequest(index)
-    }
-
-    override suspend fun awaitReady(): Boolean {
-        hostJob.join()
-        return super.awaitReady() && size != 0
-    }
-
-    override val isReady: Boolean
-        get() = size != 0
-
-    override fun onCancelRequest(index: Int) {
-        mJobMap[index]?.cancel()
-    }
-
-    override val title by lazy {
-        FileUtils.getNameFromFilename(file.name)!!
-    }
-
-    override fun getImageExtension(index: Int): String {
-        return getExtension(index)
-    }
-
-    override fun save(index: Int, file: UniFile): Boolean {
-        return runCatching {
-            file.openFileDescriptor("w").use {
-                extractToFd(index, it.fd)
-            }
-        }.getOrElse {
-            logcat(it)
-            false
-        }
-    }
-
-    override fun preloadPages(pages: List<Int>, pair: Pair<Int, Int>) {}
 }
-
-private const val DEBUG_TAG = "ArchivePageLoader"