Release 1.7.29.2

2022-07-25 14:54:18 +08:00
363 changed files with 16316 additions and 9087 deletions
@@ -1,17 +1,8 @@
 name: Bug 反馈 / Bug report
-description: 提交一个问题报告 / Create a bug report
+description: 提交一个问题报告 / Create a bug report to help us improve
 labels:
  - "bug"
 body:
-  - type: markdown
-    attributes:
-      value: |
-        感谢您愿意为 Ehviewer-Overhauled 做出贡献！
-        提交问题报告前，还请首先完成文末的自查步骤
-
-        Thanks for your contribution on Ehviewer-Overhauled Project!
-        Please finish verify steps which list in the end first before create bug report
-
  - type: textarea
    id: reproduce
    attributes:
@@ -53,25 +44,12 @@ body:
    validations:
      required: true

-  - type: textarea
-    id: more
-    attributes:
-      label: 备注 / Addition details
-      description: |
-        在此处写下其他您想说的内容
-        Describe addition details here
-      placeholder: |
-        其他有用的信息与附件
-        Additional details and attachments
-    validations:
-      required: false
-
  - type: input
    id: version
    attributes:
      label: EhViewer 版本号 / EhViewer version code
      description: 您可以在设置 - 关于处找到版本号 / You can get version code in Settings - About
-      placeholder: 1.6.9.13
+      placeholder: 四位版本号 / 4 digits version code
    validations:
      required: true

@@ -79,7 +57,7 @@ body:
    id: ci
    attributes:
      label: EhViewer CI 版本 / EhViewer CI Version
-      description: 直接将对应 GitHub Action CI 下载页面网址填入即可 / Simply drop GitHub Action CI download page url here
+      description: 直接将对应 CI 下载页面网址填入即可 / Simply drop CI download page url here
      placeholder: https://github.com/Ehviewer-Overhauled/Ehviewer/actions/runs/XXXXXXXXXX
    validations:
      required: true
@@ -141,4 +119,4 @@ body:
        required: true

      - label: 您确保已使用最新 CI 版本测试，并且该问题在最新 CI 版本中并未解决 / This bug have not solved in latest CI version
-        required: true
+        required: true
@@ -1,4 +1,3 @@
-blank_issues_enabled: false
 contact_links:
 - name: 所有其他问题 / All other questions
   url: https://github.com/Ehviewer-Overhauled/Ehviewer/discussions
@@ -1,17 +1,8 @@
 name: 功能请求 / Feature request
-description: 提出一个功能建议 / Suggest an idea
+description: 提出一个功能建议 / Suggest an idea for this project
 labels:
  - "enhancement"
 body:
-  - type: markdown
-    attributes:
-      value: |
-        感谢您愿意为 Ehviewer-Overhauled 做出贡献！
-        提交功能建议前，还请首先完成文末的自查步骤
-
-        Thanks for your contribution on Ehviewer-Overhauled Project!
-        Please finish verify steps which list in the end first before suggest an idea
-
  - type: textarea
    id: request
    attributes:
@@ -42,7 +33,7 @@ body:
  - type: textarea
    id: more
    attributes:
-      label: 备注 / Addition details
+      label: 其他细节 / Addition details
      description: |
        在此处写下其他您想说的内容
        Describe addition details here
@@ -57,7 +48,7 @@ body:
    attributes:
      label: EhViewer 版本号 / EhViewer version code
      description: 您可以在设置 - 关于处找到版本号 / You can get version code in Settings - About
-      placeholder: 1.6.9.13
+      placeholder: 四位版本号 / 4 digits version code
    validations:
      required: true

@@ -65,7 +56,7 @@ body:
    id: ci
    attributes:
      label: EhViewer CI 版本 / EhViewer CI Version
-      description: 直接将对应 GitHub Action CI 下载页面网址填入即可 / Simply drop GitHub Action CI download page url here
+      description: 直接将对应 CI 下载页面网址填入即可 / Simply drop CI download page url here
      placeholder: https://github.com/Ehviewer-Overhauled/Ehviewer/actions/runs/XXXXXXXXXX
    validations:
      required: true
@@ -91,4 +82,4 @@ body:
        required: true

      - label: 您确保已使用最新 CI 版本测试，并且该功能在最新 CI 版本中并未按照预期实现 / This feature don't implement correctly in latest CI version
-        required: true
+        required: true
@@ -1,11 +1,6 @@
 name: CI

-on:
-  push:
-    branches:
-      - '*'
-    tags-ignore:
-      - "*"
+on: [push]

 jobs:
  linux:
@@ -14,24 +9,25 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v3
-        with:
-          submodules: 'recursive'

-      - name: Setup Java 19
+      - name: Setup Java 11
        uses: actions/setup-java@v3
        with:
          distribution: temurin
-          java-version: 19
+          java-version: 11
+
+      - name: Setup Android SDK Tools
+        uses: android-actions/setup-android@v2

      - name: Install NDK
        run: |
-          echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;25.1.8937393" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
+          echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;25.0.8775105" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null

      - name: Gradle Build
        uses: gradle/gradle-build-action@v2
-        with:
-          gradle-home-cache-cleanup: true
-          arguments: assembleRelease
+      - run: |
+          git submodule update --init --recursive
+          gradle assembleRelease

      - name: Update ARM64
        uses: actions/upload-artifact@v3
@@ -9,23 +9,25 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v3
-        with:
-          submodules: 'recursive'

-      - name: Setup Java 19
+      - name: Setup Java 11
        uses: actions/setup-java@v3
        with:
          distribution: temurin
-          java-version: 19
+          java-version: 11
+
+      - name: Setup Android SDK Tools
+        uses: android-actions/setup-android@v2

      - name: Install NDK
        run: |
-          echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;25.1.8937393" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
+          echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;25.0.8775105" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null

      - name: Gradle Build
        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: assembleRelease
+      - run: |
+          git submodule update --init --recursive
+          gradle assembleRelease

      - name: Update ARM64
        uses: actions/upload-artifact@v3
@@ -12,60 +12,33 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v3
-        with:
-          submodules: 'recursive'

-      - name: Setup Java 19
+      - name: Setup Java 11
        uses: actions/setup-java@v3
        with:
          distribution: temurin
-          java-version: 19
+          java-version: 11
+
+      - name: Setup Android SDK Tools
+        uses: android-actions/setup-android@v2

      - name: Install NDK
        run: |
-          echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;25.1.8937393" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
+          echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;25.0.8775105" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null

      - name: Gradle Build
        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: assembleRelease
-
-      - name: Rename Apks
-        run: |
-          cp app/build/outputs/apk/release/app-universal-release.apk app/build/outputs/apk/release/EhViewer-universal.apk
-          cp app/build/outputs/apk/release/app-arm64-v8a-release.apk app/build/outputs/apk/release/EhViewer-arm64-v8a.apk
-          cp app/build/outputs/apk/release/app-x86_64-release.apk app/build/outputs/apk/release/EhViewer-x86_64.apk
-          cp app/build/outputs/apk/release/app-x86-release.apk app/build/outputs/apk/release/EhViewer-x86.apk
-          cp app/build/outputs/apk/release/app-armeabi-v7a-release.apk app/build/outputs/apk/release/EhViewer-armeabi-v7a.apk
+      - run: |
+          git submodule update --init --recursive
+          gradle assembleRelease

      - name: Releases
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v0.1.14
        with:
          body: Bump Version
          discussion_category_name: Announcements
          files: |
-            app/build/outputs/apk/release/EhViewer-universal.apk
-            app/build/outputs/apk/release/EhViewer-arm64-v8a.apk
-            app/build/outputs/apk/release/EhViewer-x86_64.apk
-            app/build/outputs/apk/release/EhViewer-x86.apk
-            app/build/outputs/apk/release/EhViewer-armeabi-v7a.apk
-
-      - name: Collect Apks
-        run: |
-          mkdir app/build/outputs/apk/release/fdroid
-          cp app/build/outputs/apk/release/app-arm64-v8a-release.apk app/build/outputs/apk/release/fdroid/EhViewer-v$GITHUB_REF_NAME.apk
-          cp app/build/outputs/apk/release/app-armeabi-v7a-release.apk app/build/outputs/apk/release/fdroid/EhViewer-v$GITHUB_REF_NAME-armv7.apk
-
-      - name: Push Apks
-        uses: cpina/github-action-push-to-another-repository@v1.5
-        env:
-         SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
-        with:
-          source-directory: app/build/outputs/apk/release/fdroid
-          destination-github-username: Ehviewer-Overhauled
-          destination-repository-name: fdroid-repo
-          user-name: 'github-actions[bot]'
-          user-email: 'github-actions[bot]@users.noreply.github.com'
-          target-branch: deploy
-          commit-message: Add apks from $GITHUB_REF
-          target-directory: fdroid/tmp-apks
+            app/build/outputs/apk/release/app-arm64-v8a-release.apk
+            app/build/outputs/apk/release/app-x86_64-release.apk
+            app/build/outputs/apk/release/app-x86-release.apk
+            app/build/outputs/apk/release/app-armeabi-v7a-release.apk
@@ -1,9 +1,18 @@
-[submodule "app/src/main/cpp/libarchive"]
-	path = app/src/main/cpp/libarchive
+[submodule "native/src/main/jni/image/libjpeg-turbo/libjpeg-turbo"]
+	path = native/src/main/jni/image/libjpeg-turbo/libjpeg-turbo
+	url = https://github.com/Ehviewer-Overhauled/libjpeg-turbo
+[submodule "native/src/main/jni/image/giflib/giflib"]
+	path = native/src/main/jni/image/giflib/giflib
+	url = https://github.com/Ehviewer-Overhauled/giflib
+[submodule "native/src/main/jni/image/libpng/libpng"]
+	path = native/src/main/jni/image/libpng/libpng
+	url = https://github.com/Ehviewer-Overhauled/libpng
+[submodule "native/src/main/jni/libarchive"]
+	path = native/src/main/jni/libarchive
 	url = https://github.com/Ehviewer-Overhauled/libarchive
-[submodule "app/src/main/cpp/liblzma"]
-	path = app/src/main/cpp/liblzma
+[submodule "native/src/main/jni/liblzma"]
+	path = native/src/main/jni/liblzma
 	url = https://github.com/Ehviewer-Overhauled/xz
-[submodule "app/src/main/cpp/nettle/nettle"]
-	path = app/src/main/cpp/nettle/nettle
+[submodule "native/src/main/jni/nettle/nettle"]
+	path = native/src/main/jni/nettle/nettle
 	url = https://github.com/Ehviewer-Overhauled/nettle
@@ -1,17 +1,5 @@
-<p align="right">
-  <strong>English<strong>
-  <span> | </span>
-  <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/blob/1.8.x.x/docs/README/zh-cn.md">
-  简体中文
-  </a>
-  <span> | <span>
-  <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/blob/1.8.x.x/docs/README/zh-tw.md">
-  正體中文
-  </a>
-</p>
-
 <h1 align="center">
-  <img src="art/launcher_icon-web.svg" width="200">
+  <img src="art/launcher_icon-web.png" width="200">
  <br>EhViewer<br>
 </h1>

@@ -19,7 +7,7 @@
  <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/actions/workflows/ci.yml">
    <img src="https://github.com/Ehviewer-Overhauled/Ehviewer/actions/workflows/ci.yml/badge.svg" alt="Github Actions">
  </a>
-  <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/blob/1.8.x.x/LICENSE">
+  <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/blob/master/LICENSE">
    <img src="https://img.shields.io/github/license/Ehviewer-Overhauled/Ehviewer" alt="LICENSE">
  </a>
  <a href="https://www.codefactor.io/repository/github/Ehviewer-Overhauled/ehviewer">
@@ -33,40 +21,22 @@
  </a>
 </p>

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

+致力于轻量化与良好性能表现的 EhViewer 分支
+
+已针对性适配 Material Design 3 及其动态取色系统
+
+
 EhViewer fork dedicated to lightweight and high-performance

 with Material Design 3 and Dynamic Color Support

 # Download

-<a href="https://github.com/Ehviewer-Overhauled/Ehviewer/releases"><img alt="Get it on GitHub" src="art/get-it-on-github.svg" width="200px"/></a> <a href="https://github.com/Ehviewer-Overhauled/fdroid-repo"><img alt="Git it on F-Droid" src="art/get-it-on-fdroid.svg" width="200px"/></a>
+[Github 下载](https://github.com/Ehviewer-Overhauled/Ehviewer/releases)
+
+[CI 版本下载（需登录）](https://github.com/Ehviewer-Overhauled/Ehviewer/actions/workflows/ci.yml)

 # Screenshot

@@ -75,16 +45,24 @@ with Material Design 3 and Dynamic Color Support

 # Thanks

+本项目受到了诸多开源项目的帮助
+
 Here is the libraries

- [AOSP & AndroidX](http://source.android.com/)
- [FullDraggableDrawer](https://github.com/PureWriter/FullDraggableDrawer)
- [GnuTLS](https://gnutls.org/)
+- [AOSP](http://source.android.com/)
+- [android-advancedrecyclerview](https://github.com/h6ah4i/android-advancedrecyclerview)
 - [material-components-android](https://github.com/material-components/material-components-android)
 - [material-design-icons](https://github.com/google/material-design-icons)
+- [Apache Commons Lang](https://commons.apache.org/proper/commons-lang/)
+- [apng](http://apng.sourceforge.net/)
+- [giflib](http://giflib.sourceforge.net)
+- [greenDAO](https://github.com/greenrobot/greenDAO)
 - [jsoup](https://github.com/jhy/jsoup)
+- [libjpeg-turbo](https://libjpeg-turbo.org/)
+- [libpng](http://www.libpng.org/pub/png/libpng.html)
 - [okhttp](https://github.com/square/okhttp)
- [RikkaX](https://github.com/RikkaApps/RikkaX)
+- [roaster](https://github.com/forge/roaster)
+- [TapTargetView](https://github.com/KeepSafe/TapTargetView)
 - [libarchive](http://www.libarchive.org/)
 - [XZ Utils](https://tukaani.org/xz/)

@@ -4,5 +4,4 @@ manifest-merger-release-report.txt
 /src/main/libs
 /src/main/obj
 # Intellij
-*.iml
-/.cxx
+*.iml
@@ -1,20 +1,23 @@
 plugins {
    id 'com.android.application'
    id 'org.jetbrains.kotlin.android'
-    id 'com.google.devtools.ksp'
+    id 'kotlin-kapt'
 }

 android {
    compileSdkVersion 33
-    buildToolsVersion "33.0.1"
-    ndkVersion "25.1.8937393"
+    buildToolsVersion "33.0.0"
+
+    Properties localProperties = new Properties()
+    if (project.rootProject.file('local.properties').exists()) {
+        localProperties.load(project.rootProject.file('local.properties').newDataInputStream())
+    }

    splits {
        abi {
            enable = true
            reset()
            include 'arm64-v8a', 'x86_64', 'armeabi-v7a', 'x86'
-            universalApk = true
        }
    }

@@ -29,30 +32,20 @@ android {

    defaultConfig {
        applicationId "moe.tarsin.ehviewer"
-        minSdkVersion 28
+        minSdkVersion 26
        targetSdkVersion 33
-        versionCode 180024
-        versionName "1.8.3.3"
+        versionCode 114534
+        versionName "1.7.29.2"
        resConfigs 'zh', 'zh-rCN', 'zh-rHK', 'zh-rTW', 'es', 'ja', 'ko', 'fr', 'de', 'th'
    }

-    externalNativeBuild {
-        cmake {
-            path 'src/main/cpp/CMakeLists.txt'
-        }
-    }
-
    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_19
-        targetCompatibility JavaVersion.VERSION_19
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
    }

    kotlinOptions {
-        jvmTarget = '19'
-        freeCompilerArgs += [
-                "-P",
-                "plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=true"
-        ]
+        jvmTarget = '11'
    }

    lint {
@@ -85,64 +78,56 @@ android {
        }
    }

-    buildFeatures {
-        buildConfig true
-        compose true
-    }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.0-alpha02"
+    sourceSets {
+        main {
+            java.srcDirs += 'src/main/java-gen'
+        }
    }

    namespace 'com.hippo.ehviewer'
 }

+tasks.withType(JavaCompile) {
+    task -> task.dependsOn ":daogenerator:executeDaoGenerator"
+}
+
 dependencies {
-    def activity_version = "1.6.1"
+    def activity_version = "1.6.0-alpha05"
    implementation "androidx.activity:activity:$activity_version"
    implementation "androidx.activity:activity-ktx:$activity_version"

-    implementation "androidx.annotation:annotation:1.5.0"
-    implementation "androidx.annotation:annotation-experimental:1.3.0"
-    implementation "androidx.appcompat:appcompat:1.6.0-rc01"
+    implementation "androidx.annotation:annotation:1.4.0"
+    implementation "androidx.annotation:annotation-experimental:1.2.0"
+    implementation "androidx.appcompat:appcompat:1.6.0-alpha05"

    def arch_core_version = "2.1.0"
    implementation "androidx.arch.core:core-common:$arch_core_version"
    implementation "androidx.arch.core:core-runtime:$arch_core_version"

-    implementation "androidx.biometric:biometric-ktx:1.2.0-alpha05"
+    implementation "androidx.biometric:biometric-ktx:1.2.0-alpha04"
    implementation "androidx.browser:browser:1.4.0"

-    def collection_version = "1.3.0-alpha02"
+    def collection_version = "1.3.0-alpha01"
    implementation "androidx.collection:collection:$collection_version"
    implementation "androidx.collection:collection-ktx:$collection_version"

-    def compose_version = "1.3.1"
-    implementation "androidx.compose.animation:animation:$compose_version"
-    implementation "androidx.compose.foundation:foundation:$compose_version"
-    implementation "androidx.compose.foundation:foundation-layout:$compose_version"
-    implementation "androidx.compose.runtime:runtime:$compose_version"
-    implementation "androidx.compose.runtime:runtime-saveable:$compose_version"
-    implementation "androidx.compose.ui:ui:$compose_version"
-
-    implementation "androidx.compose.material3:material3:1.0.1"
-
-    implementation "androidx.constraintlayout:constraintlayout:2.2.0-alpha04"
+    implementation "androidx.constraintlayout:constraintlayout:2.2.0-alpha03"
    implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"

-    def core_version = "1.9.0"
+    def core_version = "1.9.0-alpha05"
    implementation "androidx.core:core:$core_version"
    implementation "androidx.core:core-ktx:$core_version"

-    implementation "androidx.customview:customview:1.2.0-alpha02"
+    implementation "androidx.customview:customview:1.2.0-alpha01"
+    implementation "androidx.documentfile:documentfile:1.1.0-alpha01"
    implementation "androidx.dynamicanimation:dynamicanimation:1.1.0-alpha03"

-    def fragment_version = "1.6.0-alpha03"
+    def fragment_version = "1.5.0"
    implementation "androidx.fragment:fragment:$fragment_version"
    implementation "androidx.fragment:fragment-ktx:$fragment_version"

-    def lifecycle_version = "2.6.0-alpha03"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
+    def lifecycle_version = "2.6.0-alpha01"
+    implementation "androidx.lifecycle:lifecycle-livedata:$lifecycle_version"
    implementation "androidx.lifecycle:lifecycle-livedata-core-ktx:$lifecycle_version"
    implementation "androidx.lifecycle:lifecycle-process:$lifecycle_version"
    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
@@ -150,23 +135,8 @@ dependencies {
    implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycle_version"

    implementation "androidx.loader:loader:1.1.0"
-
-    def nav_version = "2.5.3"
-    implementation "androidx.navigation:navigation-fragment:$nav_version"
-    implementation "androidx.navigation:navigation-ui:$nav_version"
-    implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
-    implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
-
-    implementation "androidx.paging:paging-runtime:3.2.0-alpha03"
-
    implementation 'androidx.preference:preference:1.2.0'
-    implementation 'androidx.recyclerview:recyclerview:1.3.0-rc01'
-
-    def room_version = "2.5.0-beta02"
-    implementation "androidx.room:room-runtime:$room_version"
-    annotationProcessor "androidx.room:room-compiler:$room_version"
-    implementation "androidx.room:room-paging:$room_version"
-
+    implementation 'androidx.recyclerview:recyclerview:1.3.0-beta01'
    implementation 'androidx.startup:startup-runtime:1.2.0-alpha01'
    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01'
    implementation "androidx.transition:transition-ktx:1.4.1"
@@ -174,25 +144,24 @@ dependencies {
    implementation "androidx.vectordrawable:vectordrawable-animated:1.1.0"
    implementation 'androidx.viewpager:viewpager:1.1.0-alpha01'
    implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
+    implementation 'androidx.webkit:webkit:1.5.0-beta01'

    implementation 'com.drakeet.drawer:drawer:1.0.3'
-    implementation 'com.google.android.material:material:1.8.0-SNAPSHOT'
-
-    implementation 'com.squareup.okhttp3:okhttp-bom:5.0.0-alpha.10'
-    implementation 'com.squareup.okhttp3:okhttp'
-    implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps'
-
+    implementation 'com.google.android.material:material:1.7.0-alpha03'
+    implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.3'
+    implementation 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:1.0.0'
+    implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.10'
    implementation 'dev.rikka.rikkax.core:core-ktx:1.4.1'
    implementation 'dev.rikka.rikkax.insets:insets:1.3.0'
    implementation 'dev.rikka.rikkax.layoutinflater:layoutinflater:1.2.0'
    implementation 'dev.rikka.rikkax.preference:simplemenu-preference:1.0.3'
    implementation 'dev.rikka.rikkax.material:material-preference:2.0.0'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
-    implementation 'org.jsoup:jsoup:1.15.3'
+    implementation 'org.greenrobot:greendao:3.3.0'
+    implementation 'org.jsoup:jsoup:1.15.2'
+    implementation projects.native
 }

 configurations.all {
    exclude group: 'dev.rikka.rikkax.appcompat', module: 'appcompat'
    exclude group: 'dev.rikka.rikkax.material', module: 'material'
-    exclude group: 'androidx.compose.material'
 }
@@ -7,15 +7,28 @@
    public static void throw*(...);
 }

-keepclasseswithmembernames,includedescriptorclasses class * {
-    native <methods>;
-}
+-keep class com.hippo.ehviewer.ui.fragment.* extends com.hippo.ehviewer.ui.fragment.BaseFragment { }
+-keep class com.hippo.ehviewer.ui.fragment.* extends com.hippo.ehviewer.ui.fragment.BasePreferenceFragment { }

-keep,allowoptimization class com.hippo.ehviewer.ui.fragment.* extends com.hippo.ehviewer.ui.fragment.BaseFragment { }
-keep,allowoptimization class com.hippo.ehviewer.ui.fragment.* extends com.hippo.ehviewer.ui.fragment.BasePreferenceFragment { }
+-keepnames class com.hippo.ehviewer.ui.scene.* { }

+-keep class com.hippo.ehviewer.dao.* { *; }
+
+-keepattributes SourceFile,LineNumberTable
 -renamesourcefileattribute
 -repackageclasses
 -allowaccessmodification
-mergeinterfacesaggressively
 -overloadaggressively
+
+-dontwarn net.sqlcipher.database.**
+-dontwarn rx.**
+-dontwarn org.conscrypt.ConscryptHostnameVerifier
+-dontwarn org.conscrypt.Conscrypt$Version
+-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
+-dontwarn org.bouncycastle.jsse.BCSSLSocket
+-dontwarn org.openjsse.javax.net.ssl.SSLParameters
+-dontwarn net.sqlcipher.Cursor
+-dontwarn org.bouncycastle.jsse.BCSSLParameters
+-dontwarn org.conscrypt.Conscrypt
+-dontwarn org.openjsse.javax.net.ssl.SSLSocket
+-dontwarn org.openjsse.net.ssl.OpenJSSE
@@ -23,15 +23,14 @@
        android:name="android.hardware.touchscreen"
        android:required="false" />

-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-
-    <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="28" />
-
+  
+    <!-- Required to maintain app compatibility. -->
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+                     android:maxSdkVersion="32" />
+  
    <uses-feature
        android:glEsVersion="0x00020000"
        android:required="true" />
@@ -41,13 +40,11 @@
        android:allowBackup="true"
        android:appCategory="image"
        android:dataExtractionRules="@xml/data_extraction_rules"
-        android:enableOnBackInvokedCallback="true"
        android:fullBackupContent="@xml/backup_scheme"
        android:hasFragileUserData="true"
        android:icon="@mipmap/ic_launcher"
        android:label="@string/app_name"
        android:largeHeap="true"
-        android:localeConfig="@xml/locales_config"
        android:networkSecurityConfig="@xml/network_security_config"
        android:roundIcon="@mipmap/ic_launcher_round"
        android:theme="@style/AppTheme">
@@ -147,12 +144,6 @@
            android:label="@string/settings"
            android:theme="@style/AppTheme" />

-        <activity
-            android:name="com.hippo.ehviewer.ui.SecurityActivity"
-            android:configChanges="screenSize"
-            android:label="@string/settings"
-            android:theme="@style/AppTheme" />
-
        <activity
            android:name="com.hippo.ehviewer.shortcuts.ShortcutsActivity"
            android:excludeFromRecents="true"
@@ -1,363 +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/>.
- */
-
-#include <assert.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <pthread.h>
-#include <sys/mman.h>
-#include <syscall.h>
-
-#include <jni.h>
-#include <android/log.h>
-
-#include <archive.h>
-#include <archive_entry.h>
-
-#define LOG_TAG "libarchive_wrapper"
-
-#include "ehviewer.h"
-
-typedef struct {
-    int using;
-    int next_index;
-    struct archive *arc;
-    struct archive_entry *entry;
-} archive_ctx;
-
-pthread_mutex_t ctx_lock;
-static archive_ctx **ctx_pool;
-#define CTX_POOL_SIZE 20
-
-static bool need_encrypt = false;
-static char *passwd = NULL;
-static void *archiveAddr = NULL;
-static size_t archiveSize = 0;
-
-const char supportExt[9][6] = {
-        "jpeg",
-        "jpg",
-        "png",
-        "gif",
-        "webp",
-        "bmp",
-        "ico",
-        "wbmp",
-        "heif"
-};
-
-static inline int filename_is_playable_file(const char *name) {
-    const char *dotptr = strrchr(name, '.');
-    if (!dotptr++)
-        return false;
-    int i;
-    for (i = 0; i < 9; i++)
-        if (strcmp(dotptr, supportExt[i]) == 0)
-            return true;
-    return false;
-}
-
-static long archive_list_all_entries(archive_ctx *ctx) {
-    long count = 0;
-    while (archive_read_next_header(ctx->arc, &ctx->entry) == ARCHIVE_OK)
-        if (filename_is_playable_file(archive_entry_pathname(ctx->entry)))
-            count++;
-    if (!count)
-        LOGE("%s", archive_error_string(ctx->arc));
-    return count;
-}
-
-static void archive_release_ctx(archive_ctx *ctx) {
-    if (ctx) {
-        archive_read_close(ctx->arc);
-        archive_read_free(ctx->arc);
-        free(ctx);
-    }
-}
-
-static int archive_alloc_ctx(archive_ctx **ctxptr) {
-    archive_ctx *ctx;
-    int err;
-    ctx = calloc(1, sizeof(archive_ctx));
-    if (!ctx)
-        return -ENOMEM;
-    ctx->arc = archive_read_new();
-    ctx->using = 1;
-    if (!ctx->arc) {
-        free(ctx);
-        return -ENOMEM;
-    }
-    archive_read_support_format_tar(ctx->arc);
-    archive_read_support_format_7zip(ctx->arc);
-    archive_read_support_format_rar5(ctx->arc);
-    archive_read_support_format_zip(ctx->arc);
-    archive_read_support_filter_gzip(ctx->arc);
-    archive_read_support_filter_xz(ctx->arc);
-    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) {
-        archive_read_free(ctx->arc);
-        free(ctx);
-        return err;
-    }
-    *ctxptr = ctx;
-    return 0;
-}
-
-static int archive_skip_to_index(archive_ctx *ctx, int index) {
-    assert(!(ctx->next_index > index));
-    while (archive_read_next_header(ctx->arc, &ctx->entry) == ARCHIVE_OK) {
-        if (!filename_is_playable_file(archive_entry_pathname(ctx->entry)))
-            continue;
-        if (ctx->next_index++ == index) {
-            return ctx->next_index - 1;
-        }
-    }
-    return ARCHIVE_FATAL;
-}
-
-static int archive_get_ctx(archive_ctx **ctxptr, int idx) {
-    int ret;
-    archive_ctx *ctx = NULL;
-    pthread_mutex_lock(&ctx_lock);
-    for (int i = 0; i < CTX_POOL_SIZE; i++) {
-        if (!ctx_pool[i])
-            continue;
-        if (ctx_pool[i]->using)
-            continue;
-        if (ctx_pool[i]->next_index > idx)
-            continue;
-        if (!ctx || ctx_pool[i]->next_index > ctx->next_index)
-            ctx = ctx_pool[i];
-        if (ctx->next_index == idx)
-            break;
-    }
-    if (ctx)
-        ctx->using = 1;
-    pthread_mutex_unlock(&ctx_lock);
-
-    if (!ctx) {
-        archive_ctx *victimCtx = NULL;
-        int victimIdx = 0;
-        int replace = 1;
-        ret = archive_alloc_ctx(&ctx);
-        if (ret)
-            return ret;
-        pthread_mutex_lock(&ctx_lock);
-        for (int i = 0; i < CTX_POOL_SIZE; i++) {
-            if (!ctx_pool[i]) {
-                ctx_pool[i] = ctx;
-                replace = 0;
-                break;
-            }
-            if (ctx_pool[i]->using)
-                continue;
-            if (!victimCtx || ctx_pool[i]->next_index > victimCtx->next_index) {
-                victimCtx = ctx_pool[i];
-                victimIdx = i;
-            }
-        }
-        if (replace) {
-            archive_release_ctx(victimCtx);
-            ctx_pool[victimIdx] = ctx;
-        }
-        pthread_mutex_unlock(&ctx_lock);
-    }
-    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));
-        archive_release_ctx(ctx);
-        return ret;
-    }
-    *ctxptr = ctx;
-    return 0;
-}
-
-JNIEXPORT jint JNICALL
-Java_com_hippo_UriArchiveAccessor_openArchive(JNIEnv *env, jobject thiz, jint fd, jlong size) {
-    EH_UNUSED(env);
-    EH_UNUSED(thiz);
-    archive_ctx *ctx = NULL;
-    archiveAddr = mmap64(0, size, PROT_READ, MAP_PRIVATE, fd, 0);
-    if (archiveAddr == MAP_FAILED) {
-        LOGE("%s%s", "mmap64 failed with error ", strerror(errno));
-        return 0;
-    }
-    archiveSize = size;
-    madvise_log_if_error(archiveAddr, archiveSize, MADV_WILLNEED);
-    pthread_mutex_init(&ctx_lock, 0);
-    ctx_pool = calloc(CTX_POOL_SIZE, sizeof(archive_ctx **));
-    if (!ctx_pool) {
-        LOGE("Allocate archive ctx pool failed:ENOMEM");
-        return 0;
-    }
-    long r = archive_alloc_ctx(&ctx);
-    if (r) {
-        if (r == -ENOMEM)
-            LOGE("%s", "Mem alloc failed");
-        r = 0;
-        LOGE("%s%s", "Archive open failed:", archive_error_string(ctx->arc));
-    } else {
-        r = archive_list_all_entries(ctx);
-        LOGI("%s%ld%s", "Found ", r, " image entries in archive");
-
-        // We must read through the file|vm then we can know whether it is encrypted
-        int encryptRet = archive_read_has_encrypted_entries(ctx->arc);
-        switch (encryptRet) {
-            case 1: // At lease 1 encrypted entry
-                need_encrypt = true;
-                break;
-            case 0: // format supports but no encrypted entry found
-            default:
-                need_encrypt = false;
-        }
-
-        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;
-}
-
-JNIEXPORT jobject JNICALL
-Java_com_hippo_UriArchiveAccessor_extractToByteBuffer(JNIEnv *env, jobject thiz, jint index) {
-    EH_UNUSED(env);
-    EH_UNUSED(thiz);
-    archive_ctx *ctx = NULL;
-    int ret;
-    ret = archive_get_ctx(&ctx, index);
-    if (ret)
-        return 0;
-    long long size = archive_entry_size(ctx->entry);
-    void *buffer = malloc(size);
-    if (!buffer) {
-        ctx->using = 0;
-        LOGE("Allocate buffer for decompression failed:ENOMEM");
-        return 0;
-    }
-    ret = archive_read_data(ctx->arc, buffer, size);
-    ctx->using = 0;
-    if (ret == size)
-        return (*env)->NewDirectByteBuffer(env, buffer, size);
-    if (ret != size)
-        LOGE("%s", "No enough data read, WTF?");
-    if (ret < 0)
-        LOGE("%s%s", "Archive read failed:", archive_error_string(ctx->arc));
-    free(buffer);
-    return 0;
-}
-
-JNIEXPORT void JNICALL
-Java_com_hippo_UriArchiveAccessor_closeArchive(JNIEnv *env, jobject thiz) {
-    EH_UNUSED(env);
-    EH_UNUSED(thiz);
-    for (int i = 0; i < CTX_POOL_SIZE; i++)
-        archive_release_ctx(ctx_pool[i]);
-    free(passwd);
-    free(ctx_pool);
-    pthread_mutex_destroy(&ctx_lock);
-    passwd = NULL;
-    need_encrypt = false;
-    munmap(archiveAddr, archiveSize);
-}
-
-JNIEXPORT jboolean JNICALL
-Java_com_hippo_UriArchiveAccessor_needPassword(JNIEnv *env, jobject thiz) {
-    EH_UNUSED(env);
-    EH_UNUSED(thiz);
-    return need_encrypt;
-}
-
-JNIEXPORT jboolean JNICALL
-Java_com_hippo_UriArchiveAccessor_providePassword(JNIEnv *env, jobject thiz, jstring str) {
-    EH_UNUSED(thiz);
-    struct archive_entry *entry;
-    archive_ctx *ctx;
-    jboolean ret = true;
-    int len = (*env)->GetStringUTFLength(env, str);
-    passwd = realloc(passwd, len * sizeof(char));
-    if (!passwd) {
-        LOGE("Allocate passwd buffer failed");
-        return false;
-    }
-    strcpy(passwd, (*env)->GetStringUTFChars(env, str, NULL));
-    archive_alloc_ctx(&ctx);
-    void *tmpBuf = alloca(4096);
-    while (archive_read_next_header(ctx->arc, &entry) == ARCHIVE_OK) {
-        if (!filename_is_playable_file(archive_entry_pathname(entry)))
-            continue;
-        if (!archive_entry_is_encrypted(entry))
-            continue;
-        if (archive_read_data(ctx->arc, tmpBuf, 4096) < ARCHIVE_OK) {
-            LOGE("%s%s", "Archive read failed:", archive_error_string(ctx->arc));
-            ret = false;
-        }
-        break;
-    }
-    archive_release_ctx(ctx);
-    return ret;
-}
-
-JNIEXPORT jstring JNICALL
-Java_com_hippo_UriArchiveAccessor_getFilename(JNIEnv *env, jobject thiz, jint index) {
-    EH_UNUSED(env);
-    EH_UNUSED(thiz);
-    archive_ctx *ctx = NULL;
-    int ret;
-    ret = archive_get_ctx(&ctx, index);
-    if (ret)
-        return NULL;
-    jstring str = (*env)->NewStringUTF(env, archive_entry_pathname(ctx->entry));
-    ctx->using = 0;
-    return str;
-}
-
-JNIEXPORT void JNICALL
-Java_com_hippo_UriArchiveAccessor_extractToFd(JNIEnv *env, jobject thiz, jint index, jint fd) {
-    EH_UNUSED(env);
-    EH_UNUSED(thiz);
-    archive_ctx *ctx = NULL;
-    int ret;
-    ret = archive_get_ctx(&ctx, index);
-    if (!ret) {
-        archive_read_data_into_fd(ctx->arc, fd);
-        ctx->using = 0;
-    }
-}
-
-JNIEXPORT void JNICALL
-Java_com_hippo_UriArchiveAccessor_releaseByteBuffer(JNIEnv *env, jobject thiz, jobject buffer) {
-    void *addr = (*env)->GetDirectBufferAddress(env, buffer);
-    free(addr);
-}
@@ -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/>.
- */
-
-#ifndef EHVIEWER_EHVIEWER_H
-#define EHVIEWER_EHVIEWER_H
-
-#define EH_UNUSED(x) (void)x
-#define LOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG ,__VA_ARGS__)
-#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG ,__VA_ARGS__)
-#define LOGI(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG ,__VA_ARGS__)
-#define LOGW(...) __android_log_print(ANDROID_LOG_WARN, LOG_TAG ,__VA_ARGS__)
-#define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG ,__VA_ARGS__)
-#define LOGF(...) __android_log_print(ANDROID_LOG_FATAL, LOG_TAG ,__VA_ARGS__)
-
-#define madvise_log_if_error(addr, len, advice) \
-if (madvise(addr, len, advice))                 \
-    LOGE("%s%p%s%zu%s%d%s%s%s", "madvise addr:", addr, "len:", len, "with advice ", advice, " failed with error: ", strerror(errno), ", Ignored")
-
-#endif /* EHVIEWER_EHVIEWER_H */
@@ -1,16 +0,0 @@
-#include <jni.h>
-
-JNIEXPORT jint JNICALL
-Java_com_hippo_Native_getFd(JNIEnv *env, jclass clazz, jobject fileDescriptor) {
-    jint fd = -1;
-    jclass fdClass = (*env)->FindClass(env, "java/io/FileDescriptor");
-
-    if (fdClass != NULL) {
-        jfieldID fdClassDescriptorFieldID = (*env)->GetFieldID(env, fdClass, "descriptor", "I");
-        if (fdClassDescriptorFieldID != NULL && fileDescriptor != NULL) {
-            fd = (*env)->GetIntField(env, fileDescriptor, fdClassDescriptorFieldID);
-        }
-    }
-
-    return fd;
-}
@@ -1,166 +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/>.
- */
-
-#include <stdlib.h>
-#include <string.h>
-
-#include <android/bitmap.h>
-#include <android/data_space.h>
-#include <android/log.h>
-
-#include <GLES2/gl2.h>
-#include <jni.h>
-
-#define TAG "ImageDecoder_wrapper"
-
-#include "ehviewer.h"
-
-#define IMAGE_TILE_MAX_SIZE (512 * 512)
-
-static char tile_buffer[IMAGE_TILE_MAX_SIZE * 4];
-
-bool copy_pixels(const void *src, int src_w, int src_h, int src_x, int src_y,
-                 void *dst, int dst_w, int dst_h, int dst_x, int dst_y,
-                 int width, int height) {
-    int left;
-    int line;
-    size_t line_stride;
-    int src_stride;
-    int src_pos;
-    int dst_pos;
-    size_t dst_blank_length;
-
-    // Sanitize
-    if (src_x < 0) {
-        width -= src_x;
-        dst_x -= src_x;
-        src_x = 0;
-    }
-    if (dst_x < 0) {
-        width -= dst_x;
-        src_x -= dst_x;
-        dst_x = 0;
-    }
-    if (width <= 0) {
-        return false;
-    }
-    if (src_y < 0) {
-        height -= src_y;
-        dst_y -= src_y;
-        src_y = 0;
-    }
-    if (dst_y < 0) {
-        height -= dst_y;
-        src_y -= dst_y;
-        dst_y = 0;
-    }
-    if (height <= 0) {
-        return false;
-    }
-    left = src_x + width - src_w;
-    if (left > 0) {
-        width -= left;
-    }
-    left = dst_x + width - dst_w;
-    if (left > 0) {
-        width -= left;
-    }
-    if (width <= 0) {
-        return false;
-    }
-    left = src_y + height - src_h;
-    if (left > 0) {
-        height -= left;
-    }
-    left = dst_y + height - dst_h;
-    if (left > 0) {
-        height -= left;
-    }
-    if (height <= 0) {
-        return false;
-    }
-
-    // Init
-    line_stride = (size_t) (width * 4);
-    src_stride = src_w * 4;
-    src_pos = src_y * src_stride + src_x * 4;
-    dst_pos = 0;
-
-    dst_blank_length = (size_t) (dst_y * dst_w + dst_x) * 4;
-
-    // First line
-    dst_pos += (int) dst_blank_length;
-    memcpy(dst + dst_pos, src + src_pos, line_stride);
-    dst_pos += (int) line_stride;
-    src_pos += src_stride;
-
-    // Other lines
-    dst_blank_length = (size_t) ((dst_w - width) * 4);
-    for (line = 1; line < height; line++) {
-        dst_pos += (int) dst_blank_length;
-        memcpy(dst + dst_pos, src + src_pos, line_stride);
-        dst_pos += (int) line_stride;
-        src_pos += src_stride;
-    }
-
-    return true;
-}
-
-JNIEXPORT void JNICALL
-Java_com_hippo_image_Image_nativeRender(JNIEnv *env, jclass clazz, jobject srcBitmap, jint src_x,
-                                        jint src_y, jobject dst, jint dst_x, jint dst_y, jint width,
-                                        jint height) {
-    AndroidBitmapInfo dstInfo;
-    AndroidBitmapInfo srcInfo;
-    void *srcPixels = NULL;
-    void *dstPixels = NULL;
-
-    AndroidBitmap_lockPixels(env, srcBitmap, &srcPixels);
-    AndroidBitmap_lockPixels(env, dst, &dstPixels);
-    AndroidBitmap_getInfo(env, srcBitmap, &srcInfo);
-    AndroidBitmap_getInfo(env, dst, &dstInfo);
-
-    copy_pixels(srcPixels, srcInfo.width, srcInfo.height, src_x, src_y, dstPixels, dstInfo.width,
-                dstInfo.height, dst_x, dst_y,
-                width,
-                height);
-
-    AndroidBitmap_unlockPixels(env, dst);
-    AndroidBitmap_unlockPixels(env, srcBitmap);
-}
-
-JNIEXPORT void JNICALL
-Java_com_hippo_image_Image_nativeTexImage(JNIEnv *env, jclass clazz, jobject bitmap, jboolean init,
-                                          jint offset_x, jint offset_y, jint width, jint height) {
-    if (width * height > IMAGE_TILE_MAX_SIZE)
-        return;
-    AndroidBitmapInfo info;
-    void *pixels = NULL;
-    AndroidBitmap_lockPixels(env, bitmap, &pixels);
-    AndroidBitmap_getInfo(env, bitmap, &info);
-    copy_pixels(pixels, info.width, info.height, offset_x, offset_y, tile_buffer, width, height, 0, 0, width, height);
-    AndroidBitmap_unlockPixels(env, bitmap);
-    if (init) {
-        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE,
-                     tile_buffer);
-    } else {
-        glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE,
-                        tile_buffer);
-    }
-}
@@ -1,43 +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
-
-import android.content.Context
-import android.net.Uri
-import java.nio.ByteBuffer
-
-class UriArchiveAccessor(ctx: Context, uri: Uri) {
-    val pfd by lazy { ctx.contentResolver.openFileDescriptor(uri, "r")!! }
-    fun open(): Int {
-        return openArchive(pfd.fd, pfd.statSize)
-    }
-
-    private external fun openArchive(fd: Int, size: Long): Int
-    external fun extractToByteBuffer(index: Int): ByteBuffer?
-
-    external fun releaseByteBuffer(buffer: ByteBuffer)
-    external fun extractToFd(index: Int, fd: Int)
-    external fun getFilename(index: Int): String
-    external fun needPassword(): Boolean
-    external fun providePassword(str: String): Boolean
-    private external fun closeArchive()
-    fun close() {
-        closeArchive()
-        pfd.close()
-    }
-}
@@ -1,8 +0,0 @@
-package com.hippo.app
-
-import android.content.Context
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-
-open class BaseDialogBuilder constructor(
-    context: Context
-) : MaterialAlertDialogBuilder(context)
@@ -18,6 +18,7 @@ package com.hippo.app
 import android.content.Context
 import android.view.LayoutInflater
 import android.widget.CheckBox
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.hippo.ehviewer.R

 class CheckBoxDialogBuilder constructor(
@@ -25,7 +26,7 @@ class CheckBoxDialogBuilder constructor(
    message: String?,
    checkText: String?,
    checked: Boolean
-) : BaseDialogBuilder(
+) : MaterialAlertDialogBuilder(
    context
 ) {
    private val mCheckBox: CheckBox
@@ -23,6 +23,7 @@ import android.widget.EditText
 import android.widget.TextView
 import android.widget.TextView.OnEditorActionListener
 import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.textfield.TextInputLayout
 import com.hippo.ehviewer.R

@@ -30,7 +31,7 @@ class EditTextDialogBuilder constructor(
    context: Context,
    text: String?,
    hint: String?
-) : BaseDialogBuilder(
+) : MaterialAlertDialogBuilder(
    context
 ), OnEditorActionListener {
    private val mTextInputLayout: TextInputLayout
@@ -1,14 +0,0 @@
-package com.hippo.app
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.HapticFeedbackConstants
-import com.google.android.material.slider.Slider
-
-class HapticSlider @JvmOverloads constructor(
-    context: Context, attrs: AttributeSet? = null
-) : Slider(context, attrs) {
-    init {
-        addOnChangeListener { _, _, _ -> performHapticFeedback(HapticFeedbackConstants.CLOCK_TICK) }
-    }
-}
@@ -23,13 +23,14 @@ import android.widget.ArrayAdapter
 import android.widget.CheckBox
 import android.widget.ListView
 import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.hippo.ehviewer.R
 import com.hippo.yorozuya.ViewUtils

 class ListCheckBoxDialogBuilder constructor(
    context: Context, items: Array<CharSequence>,
    listener: OnItemClickListener?, checkText: String?, checked: Boolean
-) : BaseDialogBuilder(
+) : MaterialAlertDialogBuilder(
    context
 ) {
    private val mCheckBox: CheckBox
@@ -167,7 +167,6 @@ public final class DiskLruCache implements Closeable {
     * its sequence number is not equal to its entry's sequence number.
     */
    private long nextSequenceNumber = 0;
-
    private DiskLruCache(File directory, int appVersion, int valueCount, long maxSize) {
        this.directory = directory;
        this.appVersion = appVersion;
@@ -176,7 +175,21 @@ public final class DiskLruCache implements Closeable {
        this.journalFileBackup = new File(directory, JOURNAL_FILE_BACKUP);
        this.valueCount = valueCount;
        this.maxSize = maxSize;
-    }
+    }    private final Callable<Void> cleanupCallable = new Callable<>() {
+        public Void call() throws Exception {
+            synchronized (DiskLruCache.this) {
+                if (journalWriter == null) {
+                    return null; // Closed.
+                }
+                trimToSize();
+                if (journalRebuildRequired()) {
+                    rebuildJournal();
+                    redundantOpCount = 0;
+                }
+            }
+            return null;
+        }
+    };

    /**
     * Opens the cache in {@code directory}, creating a cache if none exists
@@ -246,21 +259,7 @@ public final class DiskLruCache implements Closeable {
        if (!from.renameTo(to)) {
            throw new IOException();
        }
-    }    private final Callable<Void> cleanupCallable = new Callable<>() {
-        public Void call() throws Exception {
-            synchronized (DiskLruCache.this) {
-                if (journalWriter == null) {
-                    return null; // Closed.
-                }
-                trimToSize();
-                if (journalRebuildRequired()) {
-                    rebuildJournal();
-                    redundantOpCount = 0;
-                }
-            }
-            return null;
-        }
-    };
+    }

    private static String inputStreamToString(InputStream in) throws IOException {
        return Util.readFully(new InputStreamReader(in, Util.UTF_8));
@@ -23,6 +23,7 @@ import java.io.Closeable;
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;

 /**
@@ -139,7 +140,7 @@ class StrictLineReader implements Closeable {
            for (int i = pos; i != end; ++i) {
                if (buf[i] == LF) {
                    int lineEnd = (i != pos && buf[i - 1] == CR) ? i - 1 : i;
-                    String res = new String(buf, pos, lineEnd - pos, charset);
+                    String res = new String(buf, pos, lineEnd - pos, charset.name());
                    pos = i + 1;
                    return res;
                }
@@ -151,7 +152,11 @@ class StrictLineReader implements Closeable {
                @Override
                public String toString() {
                    int length = (count > 0 && buf[count - 1] == CR) ? count - 1 : count;
-                    return new String(buf, 0, length, charset);
+                    try {
+                        return new String(buf, 0, length, charset.name());
+                    } catch (UnsupportedEncodingException e) {
+                        throw new AssertionError(e); // Since we control the charset this will never happen.
+                    }
                }
            };

@@ -25,6 +25,7 @@ import androidx.annotation.UiThread;

 import com.hippo.beerbelly.SimpleDiskCache;
 import com.hippo.okhttp.ChromeRequestBuilder;
+import com.hippo.streampipe.InputStreamPipe;
 import com.hippo.streampipe.OutputStreamPipe;

 import java.io.IOException;
@@ -34,6 +35,8 @@ import java.lang.ref.WeakReference;
 import java.util.concurrent.Executor;

 import okhttp3.Call;
+import okhttp3.HttpUrl;
+import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -48,6 +51,7 @@ public final class ConacoTask<V> {
    private final WeakReference<Unikery<V>> mUnikeryWeakReference;
    private final String mKey;
    private final String mUrl;
+    private final DataContainer mDataContainer;
    private final boolean mUseMemoryCache;
    private final boolean mUseDiskCache;
    private final boolean mUseNetwork;
@@ -69,6 +73,7 @@ public final class ConacoTask<V> {
        mUnikeryWeakReference = new WeakReference<>(builder.mUnikery);
        mKey = builder.mKey;
        mUrl = builder.mUrl;
+        mDataContainer = builder.mDataContainer;
        mUseMemoryCache = builder.mUseMemoryCache;
        mUseDiskCache = builder.mUseDiskCache;
        mUseNetwork = builder.mUseNetwork;
@@ -80,6 +85,42 @@ public final class ConacoTask<V> {
        mConaco = builder.mConaco;
    }

+    private static void putFromDiskCacheToDataContainer(String key, ValueCache cache, DataContainer container) {
+        SimpleDiskCache diskCache = cache.getDiskCache();
+        if (diskCache != null) {
+            InputStreamPipe pipe = diskCache.getInputStreamPipe(key);
+            if (pipe != null) {
+                try {
+                    pipe.obtain();
+                    container.save(pipe.open(), -1L, null, null);
+                } catch (IOException e) {
+                    Log.d(TAG, "Can't save value from disk cache to data container");
+                    e.printStackTrace();
+                    container.remove();
+                } finally {
+                    pipe.close();
+                    pipe.release();
+                }
+            }
+        }
+    }
+
+    private static void putFromDataContainerToDiskCache(String key, ValueCache cache, DataContainer container) {
+        InputStreamPipe pipe = container.get();
+        if (pipe != null) {
+            try {
+                pipe.obtain();
+                cache.putRawToDisk(key, pipe.open());
+            } catch (IOException e) {
+                Log.w(TAG, "Can't save value from data container to disk cache", e);
+                cache.removeFromDisk(key);
+            } finally {
+                pipe.close();
+                pipe.release();
+            }
+        }
+    }
+
    int getId() {
        return mId;
    }
@@ -153,6 +194,7 @@ public final class ConacoTask<V> {
        } else if (mNetworkLoadTask != null) { // Getting from network
            mNetworkLoadTask.cancel(false);
            if (mCall != null) {
+                mCall.cancel();
                mCall = null;
            }
        }
@@ -177,6 +219,7 @@ public final class ConacoTask<V> {
        private Unikery<T> mUnikery;
        private String mKey;
        private String mUrl;
+        private DataContainer mDataContainer;
        private boolean mUseMemoryCache = true;
        private boolean mUseDiskCache = true;
        private boolean mUseNetwork = true;
@@ -219,6 +262,11 @@ public final class ConacoTask<V> {
            return this;
        }

+        public Builder<T> setDataContainer(DataContainer dataContainer) {
+            mDataContainer = dataContainer;
+            return this;
+        }
+
        boolean isUseMemoryCache() {
            return mUseMemoryCache;
        }
@@ -284,7 +332,7 @@ public final class ConacoTask<V> {
            if (mUnikery == null) {
                throw new IllegalStateException("Must set unikery");
            }
-            if (mKey == null && mUrl == null) {
+            if (mKey == null && mUrl == null && mDataContainer == null) {
                throw new IllegalStateException("At least one of mKey and mUrl and mDataContainer have to not be null");
            }
        }
@@ -304,13 +352,26 @@ public final class ConacoTask<V> {
            } else {
                V value = null;

+                // First check data container
+                if (mDataContainer != null && mDataContainer.isEnabled()) {
+                    InputStreamPipe isp = mDataContainer.get();
+                    if (isp != null) {
+                        value = mHelper.decode(isp);
+                    }
+                }
+
                // Then check disk cache
                if (mKey != null) {
                    if (value == null && mUseDiskCache) {
                        value = mCache.getFromDisk(mKey);
+                        // Put back to data container
+                        if (value != null && mDataContainer != null && mDataContainer.isEnabled()) {
+                            putFromDiskCacheToDataContainer(mKey, mCache, mDataContainer);
+                        }
                    }

                    if (value != null && mUseMemoryCache && mHelper.useMemoryCache(mKey, value)) {
+                        // Put it to memory
                        mCache.putToMemory(mKey, value);
                    }
                }
@@ -390,6 +451,18 @@ public final class ConacoTask<V> {
            }
        }

+        private boolean putToDataContainer(InputStream is, ResponseBody body) {
+            // Get media type
+            String mediaType;
+            MediaType mt = body.contentType();
+            if (mt != null) {
+                mediaType = mt.type() + '/' + mt.subtype();
+            } else {
+                mediaType = null;
+            }
+            return mDataContainer.save(is, body.contentLength(), mediaType, this);
+        }
+
        @Override
        protected V doInBackground(Void... params) {
            if (isNotNecessary(this)) {
@@ -416,7 +489,7 @@ public final class ConacoTask<V> {
                    return null;
                }

-                if (mKey != null) {
+                if ((mDataContainer == null || !mDataContainer.isEnabled()) && mKey != null) {
                    if (putToDiskCache(is, body.contentLength())) {
                        // Get object from disk cache
                        value = mCache.getFromDisk(mKey);
@@ -433,6 +506,37 @@ public final class ConacoTask<V> {
                        mCache.removeFromDisk(mKey);
                        return null;
                    }
+                } else if (mDataContainer != null && mDataContainer.isEnabled()) {
+                    // Check url Moved
+                    HttpUrl requestHttpUrl = request.url();
+                    HttpUrl responseHttpUrl = response.request().url();
+                    if (!responseHttpUrl.equals(requestHttpUrl)) {
+                        mDataContainer.onUrlMoved(mUrl, responseHttpUrl.url().toString());
+                    }
+
+                    // Put to data container
+                    if (!putToDataContainer(is, body)) {
+                        return null;
+                    }
+
+                    // Get value from data container
+                    InputStreamPipe isp = mDataContainer.get();
+                    if (isp == null) {
+                        return null;
+                    }
+                    value = mHelper.decode(isp);
+                    if (value == null) {
+                        mDataContainer.remove();
+                    } else if (mKey != null) {
+                        // Put to disk cache
+                        putFromDataContainerToDiskCache(mKey, mCache, mDataContainer);
+
+                        if (mUseMemoryCache && mHelper.useMemoryCache(mKey, value)) {
+                            // Put it to memory
+                            mCache.putToMemory(mKey, value);
+                        }
+                    }
+                    return value;
                } else {
                    return null;
                }
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2015-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.conaco;
+
+import androidx.annotation.Nullable;
+
+import com.hippo.streampipe.InputStreamPipe;
+
+import java.io.InputStream;
+
+public interface DataContainer {
+
+    /**
+     * Returns the enabled status for this DataContainer.
+     */
+    boolean isEnabled();
+
+    /**
+     * Get 304 or something like that
+     */
+    void onUrlMoved(String requestUrl, String responseUrl);
+
+    /**
+     * Save the {@code InputStream}
+     */
+    boolean save(InputStream is, long length, @Nullable String mediaType, @Nullable ProgressNotifier notify);
+
+    /**
+     * Get {@code InputStreamPipe} for saved before
+     */
+    @Nullable
+    InputStreamPipe get();
+
+    /**
+     * Remove saved stuff
+     */
+    void remove();
+}
@@ -22,7 +22,6 @@ import android.graphics.ColorFilter;
 import android.graphics.PorterDuff;
 import android.graphics.Rect;
 import android.graphics.Region;
-import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;

 import androidx.annotation.NonNull;
@@ -30,25 +29,17 @@ import androidx.core.graphics.drawable.DrawableCompat;

 public class DrawableWrapper extends Drawable implements Drawable.Callback {
    private Drawable mDrawable;
-    private Rect mBounds;

    public DrawableWrapper(Drawable drawable) {
        this.setWrappedDrawable(drawable);
    }

    public void draw(@NonNull Canvas canvas) {
-        if (mDrawable instanceof BitmapDrawable bitmapDrawable) {
-            canvas.drawBitmap(bitmapDrawable.getBitmap(), null, mBounds, bitmapDrawable.getPaint());
-        } else {
-            synchronized (mDrawable) {
-                mDrawable.setBounds(mBounds);
-                mDrawable.draw(canvas);
-            }
-        }
+        this.mDrawable.draw(canvas);
    }

    protected void onBoundsChange(Rect bounds) {
-        mBounds = bounds;
+        this.mDrawable.setBounds(bounds);
    }

    public int getChangingConfigurations() {
@@ -16,7 +16,6 @@

 package com.hippo.drawable;

-import android.graphics.drawable.AnimatedImageDrawable;
 import android.graphics.drawable.Drawable;
 import android.util.Log;

@@ -26,6 +25,7 @@ import com.hippo.conaco.Conaco;
 import com.hippo.conaco.ConacoTask;
 import com.hippo.conaco.Unikery;
 import com.hippo.image.ImageBitmap;
+import com.hippo.image.ImageDrawable;
 import com.hippo.widget.ObservedTextView;

 public class UnikeryDrawable extends WrapDrawable implements Unikery<ImageBitmap>,
@@ -37,8 +37,6 @@ public class UnikeryDrawable extends WrapDrawable implements Unikery<ImageBitmap
    private int mTaskId = Unikery.INVALID_ID;
    private String mUrl;

-    private ImageBitmap imageBitmap;
-
    public UnikeryDrawable(ObservedTextView textView, Conaco<ImageBitmap> conaco) {
        mTextView = textView;
        mTextView.setOnWindowAttachListener(this);
@@ -64,11 +62,11 @@ public class UnikeryDrawable extends WrapDrawable implements Unikery<ImageBitmap
    }

    private void clearDrawable() {
-        setDrawable(null);
-        if (imageBitmap != null) {
-            imageBitmap.release();
-            imageBitmap = null;
+        Drawable drawable = getDrawable();
+        if (drawable instanceof ImageDrawable) {
+            ((ImageDrawable) drawable).recycle();
        }
+        setDrawable(null);
    }

    @Override
@@ -125,9 +123,9 @@ public class UnikeryDrawable extends WrapDrawable implements Unikery<ImageBitmap

    @Override
    public boolean onGetValue(@NonNull ImageBitmap value, int source) {
-        Drawable drawable;
+        ImageDrawable drawable;
        try {
-            drawable = value.getDrawable();
+            drawable = new ImageDrawable(value);
        } catch (Exception e) {
            Log.d(TAG, "The ImageBitmap is recycled", e);
            return false;
@@ -136,9 +134,7 @@ public class UnikeryDrawable extends WrapDrawable implements Unikery<ImageBitmap
        clearDrawable();

        setDrawable(drawable);
-        imageBitmap = value;
-        if (drawable instanceof AnimatedImageDrawable animatedImageDrawable)
-            animatedImageDrawable.start();
+        drawable.start();

        return true;
    }
@@ -64,7 +64,8 @@ public final class LayoutManagerUtils {
            RecyclerView.LayoutManager layoutManager, Context context, int position,
            int millisecondsPerInch) {
        SimpleSmoothScroller smoothScroller;
-        if (layoutManager instanceof final LinearLayoutManager linearLayoutManager) {
+        if (layoutManager instanceof LinearLayoutManager) {
+            final LinearLayoutManager linearLayoutManager = (LinearLayoutManager) layoutManager;
            smoothScroller = new SimpleSmoothScroller(context, millisecondsPerInch) {
                @Override
                public PointF computeScrollVectorForPosition(int targetPosition) {
@@ -72,7 +73,8 @@ public final class LayoutManagerUtils {
                }
            };

-        } else if (layoutManager instanceof final StaggeredGridLayoutManager staggeredGridLayoutManager) {
+        } else if (layoutManager instanceof StaggeredGridLayoutManager) {
+            final StaggeredGridLayoutManager staggeredGridLayoutManager = (StaggeredGridLayoutManager) layoutManager;
            smoothScroller = new SimpleSmoothScroller(context, millisecondsPerInch) {
                @Override
                public PointF computeScrollVectorForPosition(int targetPosition) {
@@ -26,7 +26,6 @@ import android.content.ServiceConnection;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.AsyncTask;
-import android.os.Build;
 import android.os.Debug;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
@@ -44,8 +43,8 @@ import androidx.lifecycle.DefaultLifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.ProcessLifecycleOwner;

+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.hippo.Native;
-import com.hippo.app.BaseDialogBuilder;
 import com.hippo.beerbelly.SimpleDiskCache;
 import com.hippo.conaco.Conaco;
 import com.hippo.ehviewer.client.EhClient;
@@ -61,13 +60,13 @@ import com.hippo.ehviewer.client.parser.EventPaneParser;
 import com.hippo.ehviewer.download.DownloadManager;
 import com.hippo.ehviewer.spider.SpiderDen;
 import com.hippo.ehviewer.ui.CommonOperations;
-import com.hippo.ehviewer.ui.EhActivity;
 import com.hippo.image.Image;
 import com.hippo.image.ImageBitmap;
 import com.hippo.network.StatusCodeException;
 import com.hippo.scene.SceneApplication;
 import com.hippo.unifile.UniFile;
 import com.hippo.util.BitmapUtils;
+import com.hippo.util.ClipboardUtil;
 import com.hippo.util.ExceptionUtils;
 import com.hippo.util.IoThreadPoolExecutor;
 import com.hippo.util.ReadableTime;
@@ -77,12 +76,14 @@ import com.hippo.yorozuya.OSUtils;
 import com.hippo.yorozuya.SimpleHandler;

 import java.io.File;
+import java.io.IOException;
 import java.security.KeyStore;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.concurrent.TimeUnit;

 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
@@ -106,8 +107,7 @@ public class EhApplication extends SceneApplication {
    private static final boolean DEBUG_PRINT_IMAGE_COUNT = false;
    private static final long DEBUG_PRINT_INTERVAL = 3000L;

-    public static boolean locked = true;
-    public static long locked_last_leave_time = 0;
+    public static boolean locked = false;

    private static EhApplication instance;

@@ -163,29 +163,37 @@ public class EhApplication extends SceneApplication {
        EhApplication application = ((EhApplication) context.getApplicationContext());
        if (application.mOkHttpClient == null) {
            OkHttpClient.Builder builder = new OkHttpClient.Builder()
+                    .connectTimeout(5, TimeUnit.SECONDS)
+                    .readTimeout(5, TimeUnit.SECONDS)
+                    .writeTimeout(5, TimeUnit.SECONDS)
+                    .callTimeout(10, TimeUnit.SECONDS)
                    .cookieJar(getEhCookieStore(application))
                    .cache(getOkHttpCache(application))
                    .dns(new EhDns(application))
+                    .addNetworkInterceptor(chain -> {
+                        try {
+                            return chain.proceed(chain.request());
+                        } catch (NullPointerException e) {
+                            // crash on meizu devices due to old Android version
+                            // https://github.com/square/okhttp/issues/3301#issuecomment-348415095
+                            throw new IOException(e.getMessage());
+                        }
+                    })
                    .proxySelector(getEhProxySelector(application));
-
-            if (Settings.getDF()) {
-                X509TrustManager trustManager;
-                try {
-                    TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(
-                            TrustManagerFactory.getDefaultAlgorithm());
-                    trustManagerFactory.init((KeyStore) null);
-                    TrustManager[] trustManagers = trustManagerFactory.getTrustManagers();
-                    if (trustManagers.length != 1 || !(trustManagers[0] instanceof X509TrustManager trustManager1)) {
-                        throw new IllegalStateException("Unexpected default trust managers:" + Arrays.toString(trustManagers));
-                    }
-                    trustManager = trustManager1;
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    trustManager = new EhX509TrustManager();
+            try {
+                TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(
+                        TrustManagerFactory.getDefaultAlgorithm());
+                trustManagerFactory.init((KeyStore) null);
+                TrustManager[] trustManagers = trustManagerFactory.getTrustManagers();
+                if (trustManagers.length != 1 || !(trustManagers[0] instanceof X509TrustManager)) {
+                    throw new IllegalStateException("Unexpected default trust managers:" + Arrays.toString(trustManagers));
                }
+                X509TrustManager trustManager = (X509TrustManager) trustManagers[0];
                builder.sslSocketFactory(new EhSSLSocketFactory(), trustManager);
+            } catch (Exception e) {
+                e.printStackTrace();
+                builder.sslSocketFactory(new EhSSLSocketFactory(), new EhX509TrustManager());
            }
-
            application.mOkHttpClient = builder.build();
        }
        return application.mOkHttpClient;
@@ -317,8 +325,8 @@ public class EhApplication extends SceneApplication {

        super.onCreate();

-        Image.initialize(this);
        Native.initialize();
+        ClipboardUtil.initialize(this);
        GetText.initialize(this);
        StatusCodeException.initialize(this);
        Settings.initialize(this);
@@ -329,10 +337,11 @@ public class EhApplication extends SceneApplication {
        EhEngine.initialize();
        BitmapUtils.initialize(this);

-        // Locales can be managed by system automatically above Snow Cone v2
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU)
-            AppCompatDelegate.setApplicationLocales(LocaleListCompat.create(Settings.getLocale()));
+        if (EhDB.needMerge()) {
+            EhDB.mergeOldDB(this);
+        }

+        AppCompatDelegate.setApplicationLocales(LocaleListCompat.create(Settings.getLocale()));
        AppCompatDelegate.setDefaultNightMode(Settings.getTheme());

        // Do io tasks in new thread
@@ -420,7 +429,7 @@ public class EhApplication extends SceneApplication {
        Activity activity = getTopActivity();
        if (activity != null) {
            activity.runOnUiThread(() -> {
-                AlertDialog dialog = new BaseDialogBuilder(activity)
+                AlertDialog dialog = new MaterialAlertDialogBuilder(activity)
                        .setMessage(Html.fromHtml(html))
                        .setPositiveButton(android.R.string.ok, null)
                        .create();
@@ -483,6 +492,9 @@ public class EhApplication extends SceneApplication {
                    Log.i(TAG, "Native memory: " + FileUtils.humanReadableByteCount(
                            Debug.getNativeHeapAllocatedSize(), false));
                }
+                if (DEBUG_PRINT_IMAGE_COUNT) {
+                    Log.i(TAG, "Image count: " + Image.getImageCount());
+                }
                SimpleHandler.getInstance().postDelayed(this, DEBUG_PRINT_INTERVAL);
            }
        }.run();
@@ -520,9 +532,9 @@ public class EhApplication extends SceneApplication {
    }

    @Nullable
-    public EhActivity getTopActivity() {
+    public Activity getTopActivity() {
        if (!mActivityList.isEmpty()) {
-            return (EhActivity) mActivityList.get(mActivityList.size() - 1);
+            return mActivityList.get(mActivityList.size() - 1);
        } else {
            return null;
        }
@@ -578,8 +590,6 @@ public class EhApplication extends SceneApplication {
    static class EhlifecycleObserver implements DefaultLifecycleObserver {
        @Override
        public void onPause(@NonNull LifecycleOwner owner) {
-            if (!locked)
-                locked_last_leave_time = System.currentTimeMillis() / 1000;
            locked = true;
        }
    }
@@ -17,24 +17,27 @@
 package com.hippo.ehviewer;

 import android.content.Context;
+import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
 import android.net.Uri;
+import android.util.Log;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.paging.PagingSource;
-import androidx.room.Room;

 import com.hippo.ehviewer.client.data.GalleryInfo;
-import com.hippo.ehviewer.dao.BasicDao;
+import com.hippo.ehviewer.client.data.ListUrlBuilder;
+import com.hippo.ehviewer.dao.DaoMaster;
+import com.hippo.ehviewer.dao.DaoSession;
 import com.hippo.ehviewer.dao.DownloadDirname;
 import com.hippo.ehviewer.dao.DownloadDirnameDao;
 import com.hippo.ehviewer.dao.DownloadInfo;
 import com.hippo.ehviewer.dao.DownloadLabel;
 import com.hippo.ehviewer.dao.DownloadLabelDao;
 import com.hippo.ehviewer.dao.DownloadsDao;
-import com.hippo.ehviewer.dao.EhDatabase;
 import com.hippo.ehviewer.dao.Filter;
+import com.hippo.ehviewer.dao.FilterDao;
 import com.hippo.ehviewer.dao.HistoryDao;
 import com.hippo.ehviewer.dao.HistoryInfo;
 import com.hippo.ehviewer.dao.LocalFavoriteInfo;
@@ -43,8 +46,14 @@ import com.hippo.ehviewer.dao.QuickSearch;
 import com.hippo.ehviewer.dao.QuickSearchDao;
 import com.hippo.ehviewer.download.DownloadManager;
 import com.hippo.util.ExceptionUtils;
+import com.hippo.util.SqlUtils;
 import com.hippo.yorozuya.IOUtils;
 import com.hippo.yorozuya.ObjectUtils;
+import com.hippo.yorozuya.collect.SparseJLArray;
+
+import org.greenrobot.greendao.AbstractDao;
+import org.greenrobot.greendao.query.CloseableListIterator;
+import org.greenrobot.greendao.query.LazyList;

 import java.io.File;
 import java.io.FileInputStream;
@@ -56,9 +65,15 @@ import java.util.ArrayList;
 import java.util.List;

 public class EhDB {
-    private static final int CUR_DB_VER = 4;

-    private static EhDatabase db;
+    private static final String TAG = EhDB.class.getSimpleName();
+
+    private static final int MAX_HISTORY_COUNT = 200;
+
+    private static DaoSession sDaoSession;
+
+    private static boolean sHasOldDB;
+    private static boolean sNewDB;

    private static void upgradeDB(SQLiteDatabase db, int oldVersion) {
        switch (oldVersion) {
@@ -100,12 +115,219 @@ public class EhDB {
    }

    public static void initialize(Context context) {
-        db = Room.databaseBuilder(context, EhDatabase.class, "eh.db").allowMainThreadQueries().build();
+        sHasOldDB = context.getDatabasePath("data").exists();
+
+        DBOpenHelper helper = new DBOpenHelper(
+                context.getApplicationContext(), "eh.db", null);
+
+        SQLiteDatabase db = helper.getWritableDatabase();
+        DaoMaster daoMaster = new DaoMaster(db);
+
+        sDaoSession = daoMaster.newSession();
+    }
+
+    public static boolean needMerge() {
+        return sNewDB && sHasOldDB;
+    }
+
+    public static void mergeOldDB(Context context) {
+        sNewDB = false;
+
+        OldDBHelper oldDBHelper = new OldDBHelper(context);
+        SQLiteDatabase oldDB;
+        try {
+            oldDB = oldDBHelper.getReadableDatabase();
+        } catch (Throwable e) {
+            ExceptionUtils.throwIfFatal(e);
+            return;
+        }
+
+        // Get GalleryInfo list
+        SparseJLArray<GalleryInfo> map = new SparseJLArray<>();
+        try {
+            Cursor cursor = oldDB.rawQuery("select * from " + OldDBHelper.TABLE_GALLERY, null);
+            if (cursor != null) {
+                if (cursor.moveToFirst()) {
+                    while (!cursor.isAfterLast()) {
+                        GalleryInfo gi = new GalleryInfo();
+                        gi.gid = cursor.getInt(0);
+                        gi.token = cursor.getString(1);
+                        gi.title = cursor.getString(2);
+                        gi.posted = cursor.getString(3);
+                        gi.category = cursor.getInt(4);
+                        gi.thumb = cursor.getString(5);
+                        gi.uploader = cursor.getString(6);
+                        try {
+                            // In 0.6.x version, NaN is stored
+                            gi.rating = cursor.getFloat(7);
+                        } catch (Throwable e) {
+                            ExceptionUtils.throwIfFatal(e);
+                            gi.rating = -1.0f;
+                        }
+
+                        map.put(gi.gid, gi);
+
+                        cursor.moveToNext();
+                    }
+                }
+                cursor.close();
+            }
+        } catch (Throwable e) {
+            ExceptionUtils.throwIfFatal(e);
+            // Ignore
+        }
+
+        // Merge local favorites
+        try {
+            Cursor cursor = oldDB.rawQuery("select * from " + OldDBHelper.TABLE_LOCAL_FAVOURITE, null);
+            if (cursor != null) {
+                LocalFavoritesDao dao = sDaoSession.getLocalFavoritesDao();
+                if (cursor.moveToFirst()) {
+                    long i = 0L;
+                    while (!cursor.isAfterLast()) {
+                        // Get GalleryInfo first
+                        long gid = cursor.getInt(0);
+                        GalleryInfo gi = map.get(gid);
+                        if (gi == null) {
+                            Log.e(TAG, "Can't get GalleryInfo with gid: " + gid);
+                            cursor.moveToNext();
+                            continue;
+                        }
+
+                        LocalFavoriteInfo info = new LocalFavoriteInfo(gi);
+                        info.setTime(i);
+                        dao.insert(info);
+                        cursor.moveToNext();
+                        i++;
+                    }
+                }
+                cursor.close();
+            }
+        } catch (Throwable e) {
+            ExceptionUtils.throwIfFatal(e);
+            // Ignore
+        }
+
+
+        // Merge quick search
+        try {
+            Cursor cursor = oldDB.rawQuery("select * from " + OldDBHelper.TABLE_TAG, null);
+            if (cursor != null) {
+                QuickSearchDao dao = sDaoSession.getQuickSearchDao();
+                if (cursor.moveToFirst()) {
+                    while (!cursor.isAfterLast()) {
+                        QuickSearch quickSearch = new QuickSearch();
+
+                        int mode = cursor.getInt(2);
+                        String search = cursor.getString(4);
+                        String tag = cursor.getString(7);
+                        if (mode == ListUrlBuilder.MODE_UPLOADER && search != null &&
+                                search.startsWith("uploader:")) {
+                            search = search.substring("uploader:".length());
+                        }
+
+                        quickSearch.setTime(cursor.getInt(0));
+                        quickSearch.setName(cursor.getString(1));
+                        quickSearch.setMode(mode);
+                        quickSearch.setCategory(cursor.getInt(3));
+                        quickSearch.setKeyword(mode == ListUrlBuilder.MODE_TAG ? tag : search);
+                        quickSearch.setAdvanceSearch(cursor.getInt(5));
+                        quickSearch.setMinRating(cursor.getInt(6));
+
+                        dao.insert(quickSearch);
+                        cursor.moveToNext();
+                    }
+                }
+                cursor.close();
+            }
+        } catch (Throwable e) {
+            ExceptionUtils.throwIfFatal(e);
+            // Ignore
+        }
+
+        // Merge download info
+        try {
+            Cursor cursor = oldDB.rawQuery("select * from " + OldDBHelper.TABLE_DOWNLOAD, null);
+            if (cursor != null) {
+                DownloadsDao dao = sDaoSession.getDownloadsDao();
+                if (cursor.moveToFirst()) {
+                    long i = 0L;
+                    while (!cursor.isAfterLast()) {
+                        // Get GalleryInfo first
+                        long gid = cursor.getInt(0);
+                        GalleryInfo gi = map.get(gid);
+                        if (gi == null) {
+                            Log.e(TAG, "Can't get GalleryInfo with gid: " + gid);
+                            cursor.moveToNext();
+                            continue;
+                        }
+
+                        DownloadInfo info = new DownloadInfo(gi);
+                        int state = cursor.getInt(2);
+                        int legacy = cursor.getInt(3);
+                        if (state == DownloadInfo.STATE_FINISH && legacy > 0) {
+                            state = DownloadInfo.STATE_FAILED;
+                        }
+                        info.setState(state);
+                        info.setLegacy(legacy);
+                        if (cursor.getColumnCount() == 5) {
+                            info.setTime(cursor.getLong(4));
+                        } else {
+                            info.setTime(i);
+                        }
+                        dao.insert(info);
+                        cursor.moveToNext();
+                        i++;
+                    }
+                }
+                cursor.close();
+            }
+        } catch (Throwable e) {
+            ExceptionUtils.throwIfFatal(e);
+            // Ignore
+        }
+
+        try {
+            // Merge history info
+            Cursor cursor = oldDB.rawQuery("select * from " + OldDBHelper.TABLE_HISTORY, null);
+            if (cursor != null) {
+                HistoryDao dao = sDaoSession.getHistoryDao();
+                if (cursor.moveToFirst()) {
+                    while (!cursor.isAfterLast()) {
+                        // Get GalleryInfo first
+                        long gid = cursor.getInt(0);
+                        GalleryInfo gi = map.get(gid);
+                        if (gi == null) {
+                            Log.e(TAG, "Can't get GalleryInfo with gid: " + gid);
+                            cursor.moveToNext();
+                            continue;
+                        }
+
+                        HistoryInfo info = new HistoryInfo(gi);
+                        info.setMode(cursor.getInt(1));
+                        info.setTime(cursor.getLong(2));
+                        dao.insert(info);
+                        cursor.moveToNext();
+                    }
+                }
+                cursor.close();
+            }
+        } catch (Throwable e) {
+            ExceptionUtils.throwIfFatal(e);
+            // Ignore
+        }
+
+        try {
+            oldDBHelper.close();
+        } catch (Throwable e) {
+            ExceptionUtils.throwIfFatal(e);
+            // Ignore
+        }
    }

    public static synchronized List<DownloadInfo> getAllDownloadInfo() {
-        DownloadsDao dao = db.downloadsDao();
-        List<DownloadInfo> list = dao.list();
+        DownloadsDao dao = sDaoSession.getDownloadsDao();
+        List<DownloadInfo> list = dao.queryBuilder().orderDesc(DownloadsDao.Properties.Time).list();
        // Fix state
        for (DownloadInfo info : list) {
            if (info.state == DownloadInfo.STATE_WAIT || info.state == DownloadInfo.STATE_DOWNLOAD) {
@@ -117,7 +339,7 @@ public class EhDB {

    // Insert or update
    public static synchronized void putDownloadInfo(DownloadInfo downloadInfo) {
-        DownloadsDao dao = db.downloadsDao();
+        DownloadsDao dao = sDaoSession.getDownloadsDao();
        if (null != dao.load(downloadInfo.gid)) {
            // Update
            dao.update(downloadInfo);
@@ -127,13 +349,13 @@ public class EhDB {
        }
    }

-    public static synchronized void removeDownloadInfo(DownloadInfo downloadInfo) {
-        db.downloadsDao().delete(downloadInfo);
+    public static synchronized void removeDownloadInfo(long gid) {
+        sDaoSession.getDownloadsDao().deleteByKey(gid);
    }

    @Nullable
    public static synchronized String getDownloadDirname(long gid) {
-        DownloadDirnameDao dao = db.downloadDirnameDao();
+        DownloadDirnameDao dao = sDaoSession.getDownloadDirnameDao();
        DownloadDirname raw = dao.load(gid);
        if (raw != null) {
            return raw.getDirname();
@@ -146,7 +368,7 @@ public class EhDB {
     * Insert or update
     */
    public static synchronized void putDownloadDirname(long gid, String dirname) {
-        DownloadDirnameDao dao = db.downloadDirnameDao();
+        DownloadDirnameDao dao = sDaoSession.getDownloadDirnameDao();
        DownloadDirname raw = dao.load(gid);
        if (raw != null) { // Update
            raw.setDirname(dirname);
@@ -160,23 +382,23 @@ public class EhDB {
    }

    public static synchronized void removeDownloadDirname(long gid) {
-        DownloadDirnameDao dao = db.downloadDirnameDao();
+        DownloadDirnameDao dao = sDaoSession.getDownloadDirnameDao();
        dao.deleteByKey(gid);
    }

    public static synchronized void clearDownloadDirname() {
-        DownloadDirnameDao dao = db.downloadDirnameDao();
+        DownloadDirnameDao dao = sDaoSession.getDownloadDirnameDao();
        dao.deleteAll();
    }

    @NonNull
    public static synchronized List<DownloadLabel> getAllDownloadLabelList() {
-        DownloadLabelDao dao = db.downloadLabelDao();
-        return dao.list();
+        DownloadLabelDao dao = sDaoSession.getDownloadLabelDao();
+        return dao.queryBuilder().orderAsc(DownloadLabelDao.Properties.Time).list();
    }

    public static synchronized DownloadLabel addDownloadLabel(String label) {
-        DownloadLabelDao dao = db.downloadLabelDao();
+        DownloadLabelDao dao = sDaoSession.getDownloadLabelDao();
        DownloadLabel raw = new DownloadLabel();
        raw.setLabel(label);
        raw.setTime(System.currentTimeMillis());
@@ -187,13 +409,13 @@ public class EhDB {
    public static synchronized DownloadLabel addDownloadLabel(DownloadLabel raw) {
        // Reset id
        raw.setId(null);
-        DownloadLabelDao dao = db.downloadLabelDao();
+        DownloadLabelDao dao = sDaoSession.getDownloadLabelDao();
        raw.setId(dao.insert(raw));
        return raw;
    }

    public static synchronized void updateDownloadLabel(DownloadLabel raw) {
-        DownloadLabelDao dao = db.downloadLabelDao();
+        DownloadLabelDao dao = sDaoSession.getDownloadLabelDao();
        dao.update(raw);
    }

@@ -206,8 +428,9 @@ public class EhDB {
        int offset = reverse ? toPosition : fromPosition;
        int limit = reverse ? fromPosition - toPosition + 1 : toPosition - fromPosition + 1;

-        DownloadLabelDao dao = db.downloadLabelDao();
-        List<DownloadLabel> list = dao.list(offset, limit);
+        DownloadLabelDao dao = sDaoSession.getDownloadLabelDao();
+        List<DownloadLabel> list = dao.queryBuilder().orderAsc(DownloadLabelDao.Properties.Time)
+                .offset(offset).limit(limit).list();

        int step = reverse ? 1 : -1;
        int start = reverse ? limit - 1 : 0;
@@ -218,44 +441,50 @@ public class EhDB {
        }
        list.get(start).setTime(toTime);

-        dao.update(list);
+        dao.updateInTx(list);
    }

    public static synchronized void removeDownloadLabel(DownloadLabel raw) {
-        DownloadLabelDao dao = db.downloadLabelDao();
+        DownloadLabelDao dao = sDaoSession.getDownloadLabelDao();
        dao.delete(raw);
    }

    public static synchronized List<GalleryInfo> getAllLocalFavorites() {
-        LocalFavoritesDao dao = db.localFavoritesDao();
-        List<LocalFavoriteInfo> list = dao.list();
-        return new ArrayList<>(list);
+        LocalFavoritesDao dao = sDaoSession.getLocalFavoritesDao();
+        List<LocalFavoriteInfo> list = dao.queryBuilder().orderDesc(LocalFavoritesDao.Properties.Time).list();
+        List<GalleryInfo> result = new ArrayList<>();
+        result.addAll(list);
+        return result;
    }

    public static synchronized List<GalleryInfo> searchLocalFavorites(String query) {
-        LocalFavoritesDao dao = db.localFavoritesDao();
-        List<LocalFavoriteInfo> list = dao.list();
-        return new ArrayList<>(list);
+        query = SqlUtils.sqlEscapeString("%" + query + "%");
+        LocalFavoritesDao dao = sDaoSession.getLocalFavoritesDao();
+        List<LocalFavoriteInfo> list = dao.queryBuilder().orderDesc(LocalFavoritesDao.Properties.Time)
+                .where(LocalFavoritesDao.Properties.Title.like(query)).list();
+        List<GalleryInfo> result = new ArrayList<>();
+        result.addAll(list);
+        return result;
    }

    public static synchronized void removeLocalFavorites(long gid) {
-        db.localFavoritesDao().deleteByKey(gid);
+        sDaoSession.getLocalFavoritesDao().deleteByKey(gid);
    }

    public static synchronized void removeLocalFavorites(long[] gidArray) {
-        LocalFavoritesDao dao = db.localFavoritesDao();
+        LocalFavoritesDao dao = sDaoSession.getLocalFavoritesDao();
        for (long gid : gidArray) {
            dao.deleteByKey(gid);
        }
    }

    public static synchronized boolean containLocalFavorites(long gid) {
-        LocalFavoritesDao dao = db.localFavoritesDao();
+        LocalFavoritesDao dao = sDaoSession.getLocalFavoritesDao();
        return null != dao.load(gid);
    }

    public static synchronized void putLocalFavorites(GalleryInfo galleryInfo) {
-        LocalFavoritesDao dao = db.localFavoritesDao();
+        LocalFavoritesDao dao = sDaoSession.getLocalFavoritesDao();
        if (null == dao.load(galleryInfo.gid)) {
            LocalFavoriteInfo info;
            if (galleryInfo instanceof LocalFavoriteInfo) {
@@ -275,31 +504,31 @@ public class EhDB {
    }

    public static synchronized List<QuickSearch> getAllQuickSearch() {
-        QuickSearchDao dao = db.quickSearchDao();
-        return dao.list();
+        QuickSearchDao dao = sDaoSession.getQuickSearchDao();
+        return dao.queryBuilder().orderAsc(QuickSearchDao.Properties.Time).list();
    }

    public static synchronized void insertQuickSearch(QuickSearch quickSearch) {
-        QuickSearchDao dao = db.quickSearchDao();
+        QuickSearchDao dao = sDaoSession.getQuickSearchDao();
        quickSearch.id = null;
        quickSearch.time = System.currentTimeMillis();
        quickSearch.id = dao.insert(quickSearch);
    }

    public static synchronized void importQuickSearch(List<QuickSearch> quickSearchList) {
-        QuickSearchDao dao = db.quickSearchDao();
+        QuickSearchDao dao = sDaoSession.getQuickSearchDao();
        for (QuickSearch quickSearch : quickSearchList) {
            dao.insert(quickSearch);
        }
    }

    public static synchronized void updateQuickSearch(QuickSearch quickSearch) {
-        QuickSearchDao dao = db.quickSearchDao();
+        QuickSearchDao dao = sDaoSession.getQuickSearchDao();
        dao.update(quickSearch);
    }

    public static synchronized void deleteQuickSearch(QuickSearch quickSearch) {
-        QuickSearchDao dao = db.quickSearchDao();
+        QuickSearchDao dao = sDaoSession.getQuickSearchDao();
        dao.delete(quickSearch);
    }

@@ -312,8 +541,9 @@ public class EhDB {
        int offset = reverse ? toPosition : fromPosition;
        int limit = reverse ? fromPosition - toPosition + 1 : toPosition - fromPosition + 1;

-        QuickSearchDao dao = db.quickSearchDao();
-        List<QuickSearch> list = dao.list(offset, limit);
+        QuickSearchDao dao = sDaoSession.getQuickSearchDao();
+        List<QuickSearch> list = dao.queryBuilder().orderAsc(QuickSearchDao.Properties.Time)
+                .offset(offset).limit(limit).list();

        int step = reverse ? 1 : -1;
        int start = reverse ? limit - 1 : 0;
@@ -324,19 +554,15 @@ public class EhDB {
        }
        list.get(start).setTime(toTime);

-        dao.update(list);
+        dao.updateInTx(list);
    }

-    public static synchronized List<HistoryInfo> getHistoryList() {
-        return db.historyDao().list();
-    }
-
-    public static synchronized PagingSource<Integer, HistoryInfo> getHistoryLazyList() {
-        return db.historyDao().listLazy();
+    public static synchronized LazyList<HistoryInfo> getHistoryLazyList() {
+        return sDaoSession.getHistoryDao().queryBuilder().orderDesc(HistoryDao.Properties.Time).listLazy();
    }

    public static synchronized void putHistoryInfo(GalleryInfo galleryInfo) {
-        HistoryDao dao = db.historyDao();
+        HistoryDao dao = sDaoSession.getHistoryDao();
        HistoryInfo info = dao.load(galleryInfo.gid);
        if (null != info) {
            // Update time
@@ -347,42 +573,49 @@ public class EhDB {
            info = new HistoryInfo(galleryInfo);
            info.time = System.currentTimeMillis();
            dao.insert(info);
+            List<HistoryInfo> list = dao.queryBuilder().orderDesc(HistoryDao.Properties.Time)
+                    .limit(-1).offset(MAX_HISTORY_COUNT).list();
+            dao.deleteInTx(list);
        }
    }

    public static synchronized void putHistoryInfo(List<HistoryInfo> historyInfoList) {
-        HistoryDao dao = db.historyDao();
+        HistoryDao dao = sDaoSession.getHistoryDao();
        for (HistoryInfo info : historyInfoList) {
            if (null == dao.load(info.gid)) {
                dao.insert(info);
            }
        }
+
+        List<HistoryInfo> list = dao.queryBuilder().orderDesc(HistoryDao.Properties.Time)
+                .limit(-1).offset(MAX_HISTORY_COUNT).list();
+        dao.deleteInTx(list);
    }

    public static synchronized void deleteHistoryInfo(HistoryInfo info) {
-        HistoryDao dao = db.historyDao();
+        HistoryDao dao = sDaoSession.getHistoryDao();
        dao.delete(info);
    }

    public static synchronized void clearHistoryInfo() {
-        HistoryDao dao = db.historyDao();
+        HistoryDao dao = sDaoSession.getHistoryDao();
        dao.deleteAll();
    }

    public static synchronized List<Filter> getAllFilter() {
-        return db.filterDao().list();
+        return sDaoSession.getFilterDao().queryBuilder().list();
    }

    public static synchronized boolean addFilter(Filter filter) {
        Filter existFilter;
        try {
-            existFilter = db.filterDao().load(filter.text, filter.mode);
+            existFilter = sDaoSession.getFilterDao().queryBuilder().where(FilterDao.Properties.Text.eq(filter.text), FilterDao.Properties.Mode.eq(filter.mode)).unique();
        } catch (Exception e) {
            existFilter = null;
        }
        if (existFilter == null) {
            filter.setId(null);
-            filter.setId(db.filterDao().insert(filter));
+            filter.setId(sDaoSession.getFilterDao().insert(filter));
            return true;
        } else {
            return false;
@@ -390,19 +623,23 @@ public class EhDB {
    }

    public static synchronized void deleteFilter(Filter filter) {
-        db.filterDao().delete(filter);
+        sDaoSession.getFilterDao().delete(filter);
    }

    public static synchronized void triggerFilter(Filter filter) {
        filter.setEnable(!filter.enable);
-        db.filterDao().update(filter);
+        sDaoSession.getFilterDao().update(filter);
    }

-    private static <T> boolean copyDao(BasicDao<T> from, BasicDao<T> to) {
-        List<T> list = from.list();
-        for (T item : list)
-            to.insert(item);
-        return false;
+    private static <T> boolean copyDao(AbstractDao<T, ?> from, AbstractDao<T, ?> to) {
+        try (CloseableListIterator<T> iterator = from.queryBuilder().listIterator()) {
+            while (iterator.hasNext()) {
+                to.insert(iterator.next());
+            }
+        } catch (IOException e) {
+            return false;
+        }
+        return true;
    }

    public static synchronized boolean exportDB(Context context, Uri uri) {
@@ -410,24 +647,31 @@ public class EhDB {

        // Delete old export db
        context.deleteDatabase(ehExportName);
-        EhDatabase newDb = Room.databaseBuilder(context, EhDatabase.class, ehExportName).allowMainThreadQueries().build();
+
+        DBOpenHelper helper = new DBOpenHelper(context.getApplicationContext(), ehExportName, null);

        try {
            // Copy data to a export db
-            if (copyDao(db.downloadsDao(), newDb.downloadsDao()))
-                return false;
-            if (copyDao(db.downloadLabelDao(), newDb.downloadLabelDao()))
-                return false;
-            if (copyDao(db.downloadDirnameDao(), newDb.downloadDirnameDao()))
-                return false;
-            if (copyDao(db.historyDao(), newDb.historyDao()))
-                return false;
-            if (copyDao(db.quickSearchDao(), newDb.quickSearchDao()))
-                return false;
-            if (copyDao(db.localFavoritesDao(), newDb.localFavoritesDao()))
-                return false;
-            if (copyDao(db.filterDao(), newDb.filterDao()))
-                return false;
+            try (SQLiteDatabase db = helper.getWritableDatabase()) {
+                DaoMaster daoMaster = new DaoMaster(db);
+                DaoSession exportSession = daoMaster.newSession();
+                if (!copyDao(sDaoSession.getDownloadsDao(), exportSession.getDownloadsDao()))
+                    return false;
+                if (!copyDao(sDaoSession.getDownloadLabelDao(), exportSession.getDownloadLabelDao()))
+                    return false;
+                if (!copyDao(sDaoSession.getDownloadDirnameDao(), exportSession.getDownloadDirnameDao()))
+                    return false;
+                if (!copyDao(sDaoSession.getHistoryDao(), exportSession.getHistoryDao()))
+                    return false;
+                if (!copyDao(sDaoSession.getQuickSearchDao(), exportSession.getQuickSearchDao()))
+                    return false;
+                if (!copyDao(sDaoSession.getLocalFavoritesDao(), exportSession.getLocalFavoritesDao()))
+                    return false;
+                if (!copyDao(sDaoSession.getBookmarksDao(), exportSession.getBookmarksDao()))
+                    return false;
+                if (!copyDao(sDaoSession.getFilterDao(), exportSession.getFilterDao()))
+                    return false;
+            }

            // Copy export db to data dir
            File dbFile = context.getDatabasePath(ehExportName);
@@ -474,95 +718,75 @@ public class EhDB {
            inputStream.close();
            outputStream.close();

-            SQLiteDatabase oldDB = SQLiteDatabase.openDatabase(
+            SQLiteDatabase db = SQLiteDatabase.openDatabase(
                    file.getPath(), null, SQLiteDatabase.NO_LOCALIZED_COLLATORS);
-            int newVersion = CUR_DB_VER;
-            int oldVersion = oldDB.getVersion();
+            int newVersion = DaoMaster.SCHEMA_VERSION;
+            int oldVersion = db.getVersion();
            if (oldVersion < newVersion) {
-                upgradeDB(oldDB, oldVersion);
-                oldDB.setVersion(newVersion);
+                upgradeDB(db, oldVersion);
+                db.setVersion(newVersion);
            } else if (oldVersion > newVersion) {
                return context.getString(R.string.cant_read_the_file);
            }

-            String tmpDBName = "tmp.db";
-            context.deleteDatabase(tmpDBName);
-            EhDatabase oldRoomDatabase = Room.databaseBuilder(context, EhDatabase.class, tmpDBName)
-                    .createFromFile(file).allowMainThreadQueries().build();
-
-            // Download label
-            DownloadManager manager = EhApplication.getDownloadManager(context);
-            try {
-                List<DownloadLabel> downloadLabelList = oldRoomDatabase.downloadLabelDao().list();
-                manager.addDownloadLabel(downloadLabelList);
-            } catch (Exception ignored) {
-            }
+            DaoMaster daoMaster = new DaoMaster(db);
+            DaoSession session = daoMaster.newSession();

            // Downloads
-            try {
-                List<DownloadInfo> downloadInfoList = oldRoomDatabase.downloadsDao().list();
-                manager.addDownload(downloadInfoList, false);
-            } catch (Exception ignored) {
-            }
+            DownloadManager manager = EhApplication.getDownloadManager(context);
+            List<DownloadInfo> downloadInfoList = session.getDownloadsDao().queryBuilder().list();
+            manager.addDownload(downloadInfoList, false);
+
+            // Download label
+            List<DownloadLabel> downloadLabelList = session.getDownloadLabelDao().queryBuilder().list();
+            manager.addDownloadLabel(downloadLabelList);

            // Download dirname
-            try {
-                List<DownloadDirname> downloadDirnameList = oldRoomDatabase.downloadDirnameDao().list();
-                for (DownloadDirname dirname : downloadDirnameList) {
-                    putDownloadDirname(dirname.getGid(), dirname.getDirname());
-                }
-            } catch (Exception ignored) {
+            List<DownloadDirname> downloadDirnameList = session.getDownloadDirnameDao().queryBuilder().list();
+            for (DownloadDirname dirname : downloadDirnameList) {
+                putDownloadDirname(dirname.getGid(), dirname.getDirname());
            }

            // History
-            try {
-                List<HistoryInfo> historyInfoList = oldRoomDatabase.historyDao().list();
-                putHistoryInfo(historyInfoList);
-            } catch (Exception ignored) {
-            }
+            List<HistoryInfo> historyInfoList = session.getHistoryDao().queryBuilder().list();
+            putHistoryInfo(historyInfoList);

            // QuickSearch
-            try {
-                List<QuickSearch> quickSearchList = oldRoomDatabase.quickSearchDao().list();
-                List<QuickSearch> currentQuickSearchList = db.quickSearchDao().list();
-                List<QuickSearch> importList = new ArrayList<>();
-                for (QuickSearch quickSearch : quickSearchList) {
-                    String name = quickSearch.name;
-                    for (QuickSearch q : currentQuickSearchList) {
-                        if (ObjectUtils.equal(q.name, name)) {
-                            // The same name
-                            name = null;
-                            break;
-                        }
+            List<QuickSearch> quickSearchList = session.getQuickSearchDao().queryBuilder().list();
+            List<QuickSearch> currentQuickSearchList = sDaoSession.getQuickSearchDao().queryBuilder().list();
+            List<QuickSearch> importList = new ArrayList<>();
+            for (QuickSearch quickSearch : quickSearchList) {
+                String name = quickSearch.name;
+                for (QuickSearch q : currentQuickSearchList) {
+                    if (ObjectUtils.equal(q.name, name)) {
+                        // The same name
+                        name = null;
+                        break;
                    }
-                    if (null == name) {
-                        continue;
-                    }
-                    importList.add(quickSearch);
                }
-                importQuickSearch(importList);
-            } catch (Exception ignored) {
+                if (null == name) {
+                    continue;
+                }
+                importList.add(quickSearch);
            }
+            importQuickSearch(importList);

            // LocalFavorites
-            try {
-                List<LocalFavoriteInfo> localFavoriteInfoList = oldRoomDatabase.localFavoritesDao().list();
-                for (LocalFavoriteInfo info : localFavoriteInfoList) {
-                    putLocalFavorites(info);
-                }
-            } catch (Exception ignored) {
+            List<LocalFavoriteInfo> localFavoriteInfoList = session.getLocalFavoritesDao().queryBuilder().list();
+            for (LocalFavoriteInfo info : localFavoriteInfoList) {
+                putLocalFavorites(info);
            }

+            // Bookmarks
+            // TODO
+
            // Filter
-            try {
-                List<Filter> filterList = oldRoomDatabase.filterDao().list();
-                List<Filter> currentFilterList = db.filterDao().list();
-                for (Filter filter : filterList) {
-                    if (!currentFilterList.contains(filter)) {
-                        addFilter(filter);
-                    }
+            List<Filter> filterList = session.getFilterDao().queryBuilder().list();
+            List<Filter> currentFilterList = sDaoSession.getFilterDao().queryBuilder().list();
+            for (Filter filter : filterList) {
+                if (!currentFilterList.contains(filter)) {
+                    addFilter(filter);
                }
-            } catch (Exception ignored) {
            }

            return null;
@@ -572,4 +796,46 @@ public class EhDB {
            return context.getString(R.string.cant_read_the_file);
        }
    }
+
+    private static class DBOpenHelper extends DaoMaster.OpenHelper {
+
+        public DBOpenHelper(Context context, String name, SQLiteDatabase.CursorFactory factory) {
+            super(context, name, factory);
+        }
+
+        @Override
+        public void onCreate(SQLiteDatabase db) {
+            super.onCreate(db);
+            sNewDB = true;
+        }
+
+        @Override
+        public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+            upgradeDB(db, oldVersion);
+        }
+    }
+
+    private static class OldDBHelper extends SQLiteOpenHelper {
+
+        private static final String DB_NAME = "data";
+        private static final int VERSION = 4;
+
+        private static final String TABLE_GALLERY = "gallery";
+        private static final String TABLE_LOCAL_FAVOURITE = "local_favourite";
+        private static final String TABLE_TAG = "tag";
+        private static final String TABLE_DOWNLOAD = "download";
+        private static final String TABLE_HISTORY = "history";
+
+        public OldDBHelper(Context context) {
+            super(context, DB_NAME, null, VERSION);
+        }
+
+        @Override
+        public void onCreate(SQLiteDatabase db) {
+        }
+
+        @Override
+        public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        }
+    }
 }
@@ -23,7 +23,6 @@ import com.hippo.conaco.ValueHelper;
 import com.hippo.image.ImageBitmap;
 import com.hippo.streampipe.InputStreamPipe;

-import java.io.FileInputStream;
 import java.io.IOException;

 public class ImageBitmapHelper implements ValueHelper<ImageBitmap> {
@@ -35,8 +34,7 @@ public class ImageBitmapHelper implements ValueHelper<ImageBitmap> {
    public ImageBitmap decode(@NonNull InputStreamPipe isPipe) {
        try {
            isPipe.obtain();
-            FileInputStream is = (FileInputStream) isPipe.open();
-            return ImageBitmap.decode(is);
+            return ImageBitmap.decode(isPipe.open());
        } catch (OutOfMemoryError | IOException e) {
            return null;
        } finally {
@@ -50,8 +50,6 @@ public class Settings {
     ********************/

    public static final String KEY_THEME = "theme";
-
-    public static final String KEY_ACCOUNT = "account";
    public static final String KEY_BLACK_DARK_THEME = "black_dark_theme";
    public static final int THEME_LIGHT = 1;
    public static final int THEME_SYSTEM = -1;
@@ -62,15 +60,11 @@ public class Settings {
    public static final String KEY_DETAIL_SIZE = "detail_size";
    public static final String KEY_THUMB_SIZE = "thumb_size";
    public static final String KEY_THUMB_RESOLUTION = "thumb_resolution";
-    private static final String KEY_SHOW_COMMENTS = "show_gallery_comments";
-    private static final boolean DEFAULT_SHOW_COMMENTS = true;
    public static final String KEY_SHOW_TAG_TRANSLATIONS = "show_tag_translations";
    public static final String KEY_DEFAULT_CATEGORIES = "default_categories";
    public static final int DEFAULT_DEFAULT_CATEGORIES = EhUtils.ALL_CATEGORY;
    public static final String KEY_EXCLUDED_TAG_NAMESPACES = "excluded_tag_namespaces";
    public static final String KEY_EXCLUDED_LANGUAGES = "excluded_languages";
-    private static final String KEY_PREVIEW_NUM = "preview_num";
-    private static final int DEFAULT_PREVIEW_NUM = 60;
    /********************
     ****** Privacy and Security
     ********************/
@@ -82,8 +76,6 @@ public class Settings {
    public static final String KEY_DOWNLOAD_SAVE_SCHEME = "image_scheme";
    public static final String KEY_DOWNLOAD_SAVE_AUTHORITY = "image_authority";
    public static final String KEY_DOWNLOAD_SAVE_PATH = "image_path";
-
-    public static final String KEY_NOTIFICATION_REQUIRED = "notification_required";
    public static final String KEY_DOWNLOAD_SAVE_QUERY = "image_query";
    public static final String KEY_DOWNLOAD_SAVE_FRAGMENT = "image_fragment";
    public static final String KEY_MEDIA_SCAN = "media_scan";
@@ -96,7 +88,6 @@ public class Settings {
     ********************/
    public static final String KEY_SAVE_PARSE_ERROR_BODY = "save_parse_error_body";
    public static final String KEY_SECURITY = "require_unlock";
-    public static final String KEY_SECURITY_DELAY = "require_unlock_delay";
    public static final String DEFAULT_SECURITY = "";
    public static final String KEY_ENABLE_FINGERPRINT = "enable_fingerprint";
    public static final String KEY_READ_CACHE_SIZE = "read_cache_size";
@@ -104,13 +95,11 @@ public class Settings {
    public static final String KEY_BUILT_IN_HOSTS = "built_in_hosts_2";
    public static final String KEY_DOMAIN_FRONTING = "domain_fronting";
    public static final String KEY_APP_LANGUAGE = "app_language";
-    public static final String KEY_LIST_THUMB_SIZE = "list_tile_size";
    private static final String TAG = Settings.class.getSimpleName();
    private static final String KEY_VERSION_CODE = "version_code";
    private static final int DEFAULT_VERSION_CODE = 0;
    private static final String KEY_DISPLAY_NAME = "display_name";
    private static final String DEFAULT_DISPLAY_NAME = null;
-    private static final int DEFAULT_LIST_THUMB_SIZE = 40;
    private static final String KEY_AVATAR = "avatar";
    private static final String DEFAULT_AVATAR = null;
    private static final String KEY_SHOW_WARNING = "show_warning";
@@ -132,6 +121,8 @@ public class Settings {
    private static final int DEFAULT_DETAIL_SIZE = 0;
    private static final int DEFAULT_THUMB_SIZE = 1;
    private static final int DEFAULT_THUMB_RESOLUTION = 0;
+    private static final String KEY_FIX_THUMB_URL = "fix_thumb_url";
+    private static final boolean DEFAULT_FIX_THUMB_URL = false;
    private static final String KEY_SHOW_JPN_TITLE = "show_jpn_title";
    private static final boolean DEFAULT_SHOW_JPN_TITLE = false;
    private static final String KEY_SHOW_GALLERY_PAGES = "show_gallery_pages";
@@ -281,9 +272,11 @@ public class Settings {
    private static final int DEFAULT_DOWNLOAD_DELAY = 0;
    private static final String KEY_REQUEST_NEWS = "request_news";
    private static final boolean DEFAULT_REQUEST_NEWS = true;
+
+
    private static final String KEY_ARCHIVE_PASSWDS = "archive_passwds";
-    public static boolean LIST_THUMB_SIZE_INITED = false;
-    private static int LIST_THUMB_SIZE = 40;
+
+
    private static Context sContext;
    private static SharedPreferences sSettingsPre;
    private static EhConfig sEhConfig;
@@ -433,7 +426,6 @@ public class Settings {
        putInt(KEY_VERSION_CODE, value);
    }

-    @Nullable
    public static String getDisplayName() {
        return getString(KEY_DISPLAY_NAME, DEFAULT_DISPLAY_NAME);
    }
@@ -561,8 +553,8 @@ public class Settings {
        return getIntFromStr(KEY_THUMB_RESOLUTION, DEFAULT_THUMB_RESOLUTION);
    }

-    public static boolean getShowComments() {
-        return getBoolean(KEY_SHOW_COMMENTS, DEFAULT_SHOW_COMMENTS);
+    public static boolean getFixThumbUrl() {
+        return getBoolean(KEY_FIX_THUMB_URL, DEFAULT_FIX_THUMB_URL);
    }

    public static boolean getRequestNews() {
@@ -585,10 +577,6 @@ public class Settings {
        putBoolean(KEY_SHOW_TAG_TRANSLATIONS, value);
    }

-    public static int getPreviewNum() {
-        return getInt(KEY_PREVIEW_NUM, DEFAULT_PREVIEW_NUM);
-    }
-
    public static int getDefaultCategories() {
        return getInt(KEY_DEFAULT_CATEGORIES, DEFAULT_DEFAULT_CATEGORIES);
    }
@@ -980,11 +968,11 @@ public class Settings {
        boolean writeFile = false;
        String userID = getString(KEY_USER_ID, null);
        File file = AppConfig.getFileInExternalAppDir(FILENAME_USER_ID);
-        if (!isValidUserID(userID)) {
+        if (null == userID || !isValidUserID(userID)) {
            writeXml = true;
            // Get use ID from out sd card file
            userID = FileUtils.read(file);
-            if (!isValidUserID(userID)) {
+            if (null == userID || !isValidUserID(userID)) {
                writeFile = true;
                userID = generateUserID();
            }
@@ -1069,10 +1057,6 @@ public class Settings {
        putBoolean(KEY_SECURITY, value);
    }

-    public static int getSecurityDelay() {
-        return getInt(KEY_SECURITY_DELAY, 0);
-    }
-
    public static boolean getEnableFingerprint() {
        return getBoolean(KEY_ENABLE_FINGERPRINT, true);
    }
@@ -1184,22 +1168,4 @@ public class Settings {
    public static void putPasswdToArchivePasswds(String value) {
        putStringToStringSet(KEY_ARCHIVE_PASSWDS, value);
    }
-
-    public static int getListThumbSize() {
-        if (LIST_THUMB_SIZE_INITED) {
-            return LIST_THUMB_SIZE;
-        }
-        int size = 3 * getInt(KEY_LIST_THUMB_SIZE, DEFAULT_LIST_THUMB_SIZE);
-        LIST_THUMB_SIZE = size;
-        LIST_THUMB_SIZE_INITED = true;
-        return size;
-    }
-
-    public static boolean getNotificationRequired() {
-        return getBoolean(KEY_NOTIFICATION_REQUIRED, false);
-    }
-
-    public static void putNotificationRequired() {
-        putBoolean(KEY_NOTIFICATION_REQUIRED, true);
-    }
 }
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2018 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;
+
+/*
+ * Created by Hippo on 2018/3/23.
+ */
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.hippo.ehviewer.EhApplication;
+import com.hippo.ehviewer.Hosts;
+import com.hippo.ehviewer.Settings;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import okhttp3.Dns;
+
+public class EhDns implements Dns {
+
+    private static final Map<String, List<InetAddress>> builtInHosts;
+
+    static {
+        Map<String, List<InetAddress>> map = new HashMap<>();
+        put(map, "e-hentai.org", "104.20.134.21", "104.20.135.21", "172.67.0.127");
+        put(map, "exhentai.org", "178.175.128.252", "178.175.129.252", "178.175.129.254", "178.175.128.254",
+                "178.175.132.20", "178.175.132.22");
+        put(map, "repo.e-hentai.org", "94.100.28.57", "94.100.29.73");
+        put(map, "forums.e-hentai.org", "94.100.18.243");
+        put(map, "ehgt.org", "37.48.89.44", "81.171.10.48", "178.162.139.24", "178.162.140.212"
+                , "2001:1af8:4700:a062:8::47de", "2001:1af8:4700:a062:9::47de", "2001:1af8:4700:a0c9:4::47de", "2001:1af8:4700:a0c9:3::47de");
+        put(map, "gt0.ehgt.org", "37.48.89.44", "81.171.10.48", "178.162.139.24", "178.162.140.212"
+                , "2001:1af8:4700:a062:8::47de", "2001:1af8:4700:a062:9::47de", "2001:1af8:4700:a0c9:4::47de", "2001:1af8:4700:a0c9:3::47de");
+        put(map, "gt1.ehgt.org", "37.48.89.44", "81.171.10.48", "178.162.139.24", "178.162.140.212"
+                , "2001:1af8:4700:a062:8::47de", "2001:1af8:4700:a062:9::47de", "2001:1af8:4700:a0c9:4::47de", "2001:1af8:4700:a0c9:3::47de");
+        put(map, "gt2.ehgt.org", "37.48.89.44", "81.171.10.48", "178.162.139.24", "178.162.140.212"
+                , "2001:1af8:4700:a062:8::47de", "2001:1af8:4700:a062:9::47de", "2001:1af8:4700:a0c9:4::47de", "2001:1af8:4700:a0c9:3::47de");
+        put(map, "gt3.ehgt.org", "37.48.89.44", "81.171.10.48", "178.162.139.24", "178.162.140.212"
+                , "2001:1af8:4700:a062:8::47de", "2001:1af8:4700:a062:9::47de", "2001:1af8:4700:a0c9:4::47de", "2001:1af8:4700:a0c9:3::47de");
+        put(map, "ul.ehgt.org", "94.100.24.82", "94.100.24.72");
+        put(map, "raw.githubusercontent.com", "151.101.0.133", "151.101.64.133", "151.101.128.133", "151.101.192.133");
+        builtInHosts = map;
+    }
+
+    private final Hosts hosts;
+
+    public EhDns(Context context) {
+        hosts = EhApplication.getHosts(context);
+    }
+
+    private static void put(Map<String, List<InetAddress>> map, String host, String... ips) {
+        List<InetAddress> addresses = new ArrayList<>();
+        for (String ip : ips) {
+            addresses.add(Hosts.toInetAddress(host, ip));
+        }
+        map.put(host, addresses);
+    }
+
+    @NonNull
+    @Override
+    public List<InetAddress> lookup(@NonNull String hostname) throws UnknownHostException {
+        List<InetAddress> inetAddresses = hosts.get(hostname);
+        if (inetAddresses != null) {
+            return inetAddresses;
+        }
+        if (Settings.getBuiltInHosts()) {
+            inetAddresses = builtInHosts.get(hostname);
+            if (inetAddresses != null) {
+                return inetAddresses;
+            }
+        }
+        return SYSTEM.lookup(hostname);
+    }
+}
@@ -1,127 +0,0 @@
-/*
- * Copyright 2018 Hippo Seven
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.hippo.ehviewer.client
-
-import android.content.Context
-import com.hippo.ehviewer.EhApplication
-import com.hippo.ehviewer.Hosts
-import com.hippo.ehviewer.Settings
-import okhttp3.Dns
-import java.net.InetAddress
-import java.net.UnknownHostException
-
-class EhDns(context: Context) : Dns {
-    private val hosts = EhApplication.getHosts(context)
-    private val builtInHosts: MutableMap<String, List<InetAddress>> = mutableMapOf()
-
-    init {
-        /* Pair(ip: String!, blockedByCCP: Boolean!) */
-        val ehgtHosts = arrayOf(
-            Pair("37.48.89.44", false),
-            Pair("81.171.10.48", false),
-            Pair("178.162.139.24", false),
-            Pair("178.162.140.212", false),
-            Pair("2001:1af8:4700:a062:8::47de", false),
-            Pair("2001:1af8:4700:a062:9::47de", true),
-            Pair("2001:1af8:4700:a0c9:4::47de", false),
-            Pair("2001:1af8:4700:a0c9:3::47de", true),
-        )
-
-        put(
-            builtInHosts,
-            "e-hentai.org",
-            Pair("104.20.134.21", true),
-            Pair("104.20.135.21", false),
-            Pair("172.67.0.127", false),
-        )
-        put(
-            builtInHosts,
-            "exhentai.org",
-            Pair("178.175.128.252", false),
-            Pair("178.175.129.252", false),
-            Pair("178.175.129.254", false),
-            Pair("178.175.128.254", false),
-            Pair("178.175.132.20", false),
-            Pair("178.175.132.22", false),
-        )
-        put(
-            builtInHosts,
-            "repo.e-hentai.org",
-            Pair("94.100.28.57", true),
-            Pair("94.100.29.73", true),
-        )
-        put(
-            builtInHosts,
-            "forums.e-hentai.org",
-            Pair("94.100.18.243", false),
-        )
-        put(
-            builtInHosts,
-            "ehgt.org",
-            *ehgtHosts
-        )
-        put(
-            builtInHosts,
-            "gt0.ehgt.org",
-            *ehgtHosts
-        )
-        put(
-            builtInHosts,
-            "gt1.ehgt.org",
-            *ehgtHosts
-        )
-        put(
-            builtInHosts,
-            "gt2.ehgt.org",
-            *ehgtHosts
-        )
-        put(
-            builtInHosts,
-            "gt3.ehgt.org",
-            *ehgtHosts
-        )
-        put(
-            builtInHosts,
-            "ul.ehgt.org",
-            Pair("94.100.24.82", true),
-            Pair("94.100.24.72", true),
-        )
-        put(
-            builtInHosts,
-            "raw.githubusercontent.com",
-            Pair("151.101.0.133", false),
-            Pair("151.101.64.133", false),
-            Pair("151.101.128.133", false),
-            Pair("151.101.192.133", false),
-        )
-    }
-
-    private fun put(
-        map: MutableMap<String, List<InetAddress>>,
-        host: String,
-        vararg ips: Pair<String, Boolean>
-    ) {
-        map[host] = ips.mapNotNull { pair ->
-            Hosts.toInetAddress(host, pair.first).takeUnless { Settings.getDF() && pair.second }
-        }
-    }
-
-    @Throws(UnknownHostException::class)
-    override fun lookup(hostname: String): List<InetAddress> {
-        return hosts[hostname] ?: builtInHosts[hostname].takeIf { Settings.getBuiltInHosts() }
-        ?: Dns.SYSTEM.lookup(hostname)
-    }
-}
@@ -245,6 +245,12 @@ public class EhEngine {
                }
            }
        }
+
+        if (Settings.getFixThumbUrl()) {
+            for (GalleryInfo info : list) {
+                info.thumb = EhUrl.getFixedPreviewThumbUrl(info.thumb);
+            }
+        }
    }

    public static GalleryListParser.Result getGalleryList(@Nullable EhClient.Task task, OkHttpClient okHttpClient,
@@ -0,0 +1,79 @@
+/*
+ * 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;
+
+import android.util.Log;
+
+import com.hippo.ehviewer.Settings;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.Socket;
+
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.SSLSocketFactory;
+
+public class EhSSLSocketFactory extends SSLSocketFactory {
+    @Override
+    public String[] getDefaultCipherSuites() {
+        return ((SSLSocketFactory) getDefault()).getDefaultCipherSuites();
+    }
+
+    @Override
+    public String[] getSupportedCipherSuites() {
+        return ((SSLSocketFactory) getDefault()).getSupportedCipherSuites();
+    }
+
+    @Override
+    public Socket createSocket(Socket s, String host, int port, boolean autoClose) throws IOException {
+        SSLSocketFactory defaultFactory = (SSLSocketFactory) getDefault();
+        if (!Settings.getDF()) {
+            return defaultFactory.createSocket(s, host, port, autoClose);
+        }
+        String address = s.getInetAddress().getHostAddress();
+        SSLSocket socket = (SSLSocket) defaultFactory.createSocket(s, address, port, autoClose);
+        SSLSession sslSession = socket.getSession();
+        Log.d("EhSSLSocketFactory", "Host: " + host + " Address: " + address + " Protocol:" + sslSession.getProtocol() + " CipherSuite:" + sslSession.getCipherSuite());
+        socket.setEnabledProtocols(socket.getSupportedProtocols());
+        return socket;
+    }
+
+    @Override
+    public Socket createSocket(String host, int port) throws IOException {
+        return getDefault().createSocket(host, port);
+    }
+
+    @Override
+    public Socket createSocket(String host, int port, InetAddress localHost, int localPort) throws IOException {
+        return getDefault().createSocket(host, port, localHost, localPort);
+    }
+
+    @Override
+    public Socket createSocket(InetAddress host, int port) throws IOException {
+        return getDefault().createSocket(host, port);
+    }
+
+    @Override
+    public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort) throws IOException {
+        return getDefault().createSocket(address, port, localAddress, localPort);
+    }
+
+
+}
@@ -1,72 +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
-
-import android.util.Log
-import java.net.InetAddress
-import java.net.Socket
-import javax.net.ssl.SSLSocket
-import javax.net.ssl.SSLSocketFactory
-
-class EhSSLSocketFactory : SSLSocketFactory() {
-    private val sslSocketFactory = getDefault() as SSLSocketFactory
-    override fun getDefaultCipherSuites(): Array<String> {
-        return sslSocketFactory.defaultCipherSuites
-    }
-
-    override fun getSupportedCipherSuites(): Array<String> {
-        return sslSocketFactory.supportedCipherSuites
-    }
-
-    override fun createSocket(s: Socket, host: String, port: Int, autoClose: Boolean): Socket {
-        val address = s.inetAddress.hostAddress
-        val socket = sslSocketFactory.createSocket(s, address, port, autoClose) as SSLSocket
-        val sslSession = socket.session
-        Log.d(
-            "EhSSLSocketFactory",
-            "Host: " + host + " Address: " + address + " Protocol:" + sslSession.protocol + " CipherSuite:" + sslSession.cipherSuite
-        )
-        return socket
-    }
-
-    override fun createSocket(host: String, port: Int): Socket {
-        return sslSocketFactory.createSocket(host, port)
-    }
-
-    override fun createSocket(
-        host: String,
-        port: Int,
-        localHost: InetAddress,
-        localPort: Int
-    ): Socket {
-        return sslSocketFactory.createSocket(host, port, localHost, localPort)
-    }
-
-    override fun createSocket(host: InetAddress, port: Int): Socket {
-        return sslSocketFactory.createSocket(host, port)
-    }
-
-    override fun createSocket(
-        address: InetAddress,
-        port: Int,
-        localAddress: InetAddress,
-        localPort: Int
-    ): Socket {
-        return sslSocketFactory.createSocket(address, port, localAddress, localPort)
-    }
-}
@@ -21,6 +21,11 @@ import androidx.annotation.NonNull;
 import com.hippo.ehviewer.Settings;
 import com.hippo.network.UrlBuilder;

+import java.util.List;
+import java.util.ListIterator;
+
+import okhttp3.HttpUrl;
+
 public class EhUrl {

    public static final int SITE_E = 0;
@@ -54,6 +59,8 @@ public class EhUrl {
    public static final String ORIGIN_EX = REFERER_EX;
    public static final String REFERER_E = "https://" + DOMAIN_E;
    public static final String ORIGIN_E = REFERER_E;
+    private static final String URL_PREFIX_THUMB_E = "https://ehgt.org/";
+    private static final String URL_PREFIX_THUMB_EX = "https://exhentai.org/t/";

    public static String getGalleryDetailUrl(long gid, String token) {
        return getGalleryDetailUrl(gid, token, 0, false);
@@ -193,4 +200,44 @@ public class EhUrl {
                return URL_WATCHED_EX;
        }
    }
+
+    public static String getThumbUrlPrefix() {
+        switch (Settings.getGallerySite()) {
+            default:
+                //case SITE_E:
+                return URL_PREFIX_THUMB_E;
+            //case SITE_EX:
+            //    return URL_PREFIX_THUMB_EX;
+        }
+    }
+
+    public static String getFixedPreviewThumbUrl(String originUrl) {
+        HttpUrl url = HttpUrl.parse(originUrl);
+        if (url == null) return originUrl;
+        List<String> pathSegments = url.pathSegments();
+        if (pathSegments.size() < 3) return originUrl;
+
+        ListIterator<String> iterator = pathSegments.listIterator(pathSegments.size());
+        // The last segments, like
+        // 317a1a254cd9c3269e71b2aa2671fe8d28c91097-260198-640-480-png_250.jpg
+        if (!iterator.hasPrevious()) return originUrl;
+        String lastSegment = iterator.previous();
+        // The second last segments, like
+        // 7a
+        if (!iterator.hasPrevious()) return originUrl;
+        String secondLastSegment = iterator.previous();
+        // The third last segments, like
+        // 31
+        if (!iterator.hasPrevious()) return originUrl;
+        String thirdLastSegment = iterator.previous();
+        // Check path segments
+        if (lastSegment != null && secondLastSegment != null
+                && thirdLastSegment != null
+                && lastSegment.startsWith(thirdLastSegment)
+                && lastSegment.startsWith(secondLastSegment, thirdLastSegment.length())) {
+            return getThumbUrlPrefix() + thirdLastSegment + "/" + secondLastSegment + "/" + lastSegment;
+        } else {
+            return originUrl;
+        }
+    }
 }
@@ -20,7 +20,6 @@ import android.content.Context;
 import android.graphics.Color;
 import android.text.TextUtils;

-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

 import com.hippo.ehviewer.EhApplication;
@@ -95,7 +94,6 @@ public class EhUtils {
        return CATEGORY_VALUES[i];
    }

-    @NonNull
    public static String getCategory(int type) {
        int i;
        for (i = 0; i < CATEGORY_VALUES.length - 1; i++) {
@@ -15,23 +15,30 @@
 * 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

-import android.annotation.SuppressLint
-import java.security.cert.X509Certificate
-import javax.net.ssl.X509TrustManager
+package com.hippo.ehviewer.client;

-@SuppressLint("CustomX509TrustManager")
-class EhX509TrustManager : X509TrustManager {
+import android.annotation.SuppressLint;
+
+import java.security.cert.X509Certificate;
+
+import javax.net.ssl.X509TrustManager;
+
+public class EhX509TrustManager implements X509TrustManager {
    @SuppressLint("TrustAllX509TrustManager")
-    override fun checkClientTrusted(chain: Array<X509Certificate>, authType: String) {
+    @Override
+    public void checkClientTrusted(X509Certificate[] chain, String authType) {
+
    }

    @SuppressLint("TrustAllX509TrustManager")
-    override fun checkServerTrusted(chain: Array<X509Certificate>, authType: String) {
+    @Override
+    public void checkServerTrusted(X509Certificate[] chain, String authType) {
+
    }

-    override fun getAcceptedIssuers(): Array<X509Certificate?> {
-        return arrayOfNulls(0)
+    @Override
+    public X509Certificate[] getAcceptedIssuers() {
+        return new X509Certificate[0];
    }
 }
@@ -16,17 +16,16 @@

 package com.hippo.ehviewer.client.data;

-import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.text.TextUtils;
+import android.util.Log;

 import com.hippo.ehviewer.client.EhUrl;
 import com.hippo.network.UrlBuilder;

 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;

 public class FavListUrlBuilder implements Parcelable {

@@ -45,9 +44,7 @@ public class FavListUrlBuilder implements Parcelable {
        }
    };
    private static final String TAG = FavListUrlBuilder.class.getSimpleName();
-    private String mPrev;
-    private String mNext;
-    private String mJumpTo;
+    private int mIndex;
    private String mKeyword;
    private int mFavCat = FAV_CAT_ALL;

@@ -55,9 +52,7 @@ public class FavListUrlBuilder implements Parcelable {
    }

    protected FavListUrlBuilder(Parcel in) {
-        this.mPrev = in.readString();
-        this.mNext = in.readString();
-        this.mJumpTo = in.readString();
+        this.mIndex = in.readInt();
        this.mKeyword = in.readString();
        this.mFavCat = in.readInt();
    }
@@ -66,16 +61,8 @@ public class FavListUrlBuilder implements Parcelable {
        return favCat >= 0 && favCat <= 9;
    }

-    public void setPrev(String prev) {
-        mPrev = prev;
-    }
-
-    public void setNext(String next) {
-        mNext = next;
-    }
-
-    public void setJumpTo(String jumpTo) {
-        mJumpTo = jumpTo;
+    public void setIndex(int index) {
+        mIndex = index;
    }

    public String getKeyword() {
@@ -106,30 +93,20 @@ public class FavListUrlBuilder implements Parcelable {
            ub.addQuery("favcat", "all");
        }
        if (!TextUtils.isEmpty(mKeyword)) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                ub.addQuery("f_search", URLEncoder.encode(mKeyword, StandardCharsets.UTF_8));
-            } else {
-                try {
-                    ub.addQuery("f_search", URLEncoder.encode(mKeyword, StandardCharsets.UTF_8.displayName()));
-                } catch (UnsupportedEncodingException e) {
-                    e.printStackTrace();
-                }
+            try {
+                ub.addQuery("f_search", URLEncoder.encode(mKeyword, "UTF-8"));
+                // Name
+                ub.addQuery("sn", "on");
+                // Tags
+                ub.addQuery("st", "on");
+                // Note
+                ub.addQuery("sf", "on");
+            } catch (UnsupportedEncodingException e) {
+                Log.e(TAG, "Can't URLEncoder.encode " + mKeyword);
            }
-            // Name
-            ub.addQuery("sn", "on");
-            // Tags
-            ub.addQuery("st", "on");
-            // Note
-            ub.addQuery("sf", "on");
        }
-        if (mPrev != null && !mPrev.isEmpty()) {
-            ub.addQuery("prev", mPrev);
-        }
-        if (mNext != null && !mNext.isEmpty()) {
-            ub.addQuery("next", mNext);
-        }
-        if (mJumpTo != null && !mJumpTo.isEmpty()) {
-            ub.addQuery("seek", mJumpTo);
+        if (mIndex > 0) {
+            ub.addQuery("page", Integer.toString(mIndex));
        }
        return ub.build();
    }
@@ -141,9 +118,7 @@ public class FavListUrlBuilder implements Parcelable {

    @Override
    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(this.mPrev);
-        dest.writeString(this.mNext);
-        dest.writeString(this.mJumpTo);
+        dest.writeInt(this.mIndex);
        dest.writeString(this.mKeyword);
        dest.writeInt(this.mFavCat);
    }
@@ -20,9 +20,6 @@ import android.os.Parcel;
 import android.os.Parcelable;

 import androidx.annotation.Nullable;
-import androidx.room.ColumnInfo;
-import androidx.room.Ignore;
-import androidx.room.PrimaryKey;

 import java.util.regex.Pattern;

@@ -111,52 +108,30 @@ public class GalleryInfo implements Parcelable {
            return new GalleryInfo[size];
        }
    };
-    @PrimaryKey
-    @ColumnInfo(name = "GID")
    public long gid;
-    @ColumnInfo(name = "TOKEN")
    public String token;
-    @ColumnInfo(name = "TITLE")
    public String title;
-    @ColumnInfo(name = "TITLE_JPN")
    public String titleJpn;
-    @ColumnInfo(name = "THUMB")
    public String thumb;
-    @ColumnInfo(name = "CATEGORY")
    public int category;
-    @ColumnInfo(name = "POSTED")
    public String posted;
-    @ColumnInfo(name = "UPLOADER")
    public String uploader;
-    @Ignore
    public boolean disowned;
-    @ColumnInfo(name = "RATING")
    public float rating;
-    @Ignore
    public boolean rated;
    @Nullable
-    @Ignore
    public String[] simpleTags;
-    @Ignore
    public int pages;
-    @Ignore
    public int thumbWidth;
-    @Ignore
    public int thumbHeight;
-    @Ignore
    public int spanSize;
-    @Ignore
    public int spanIndex;
-    @Ignore
    public int spanGroupIndex;
    /**
     * language from title
     */
-    @ColumnInfo(name = "SIMPLE_LANGUAGE")
    public String simpleLanguage;
-    @Ignore
    public int favoriteSlot = -2;
-    @Ignore
    public String favoriteName;

    public GalleryInfo() {
@@ -195,7 +170,6 @@ public class GalleryInfo implements Parcelable {
    }

    private void generateSLangFromTags() {
-        assert simpleTags != null;
        for (String tag : simpleTags) {
            for (int i = 0; i < S_LANGS.length; i++) {
                if (S_LANG_TAGS[i].equals(tag)) {
@@ -0,0 +1,636 @@
+/*
+ * Copyright (C) 2015 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hippo.ehviewer.client.data;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.text.TextUtils;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
+
+import com.hippo.ehviewer.client.EhConfig;
+import com.hippo.ehviewer.client.EhUrl;
+import com.hippo.ehviewer.client.EhUtils;
+import com.hippo.ehviewer.dao.QuickSearch;
+import com.hippo.ehviewer.widget.AdvanceSearchTable;
+import com.hippo.network.UrlBuilder;
+import com.hippo.yorozuya.NumberUtils;
+import com.hippo.yorozuya.StringUtils;
+
+import java.io.UnsupportedEncodingException;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+
+public class ListUrlBuilder implements Cloneable, Parcelable {
+
+    // Mode
+    public static final int MODE_NORMAL = 0x0;
+    public static final int MODE_UPLOADER = 0x1;
+    public static final int MODE_TAG = 0x2;
+    public static final int MODE_WHATS_HOT = 0x3;
+    public static final int MODE_IMAGE_SEARCH = 0x4;
+    public static final int MODE_SUBSCRIPTION = 0x5;
+    public static final int MODE_TOPLIST = 0x6;
+    public static final int DEFAULT_ADVANCE = AdvanceSearchTable.SNAME | AdvanceSearchTable.STAGS;
+    public static final int DEFAULT_MIN_RATING = 2;
+    public static final Creator<ListUrlBuilder> CREATOR = new Creator<ListUrlBuilder>() {
+        @Override
+        public ListUrlBuilder createFromParcel(Parcel source) {
+            return new ListUrlBuilder(source);
+        }
+
+        @Override
+        public ListUrlBuilder[] newArray(int size) {
+            return new ListUrlBuilder[size];
+        }
+    };
+    @Mode
+    private int mMode = MODE_NORMAL;
+
+    private int mPageIndex = 0;
+
+    private int mCategory = EhUtils.NONE;
+    private String mKeyword = null;
+    private String mSHash = null;
+
+    private int mAdvanceSearch = -1;
+    private int mMinRating = -1;
+    private int mPageFrom = -1;
+    private int mPageTo = -1;
+
+    private String mImagePath;
+    private boolean mUseSimilarityScan;
+    private boolean mOnlySearchCovers;
+    private boolean mShowExpunged;
+
+    public ListUrlBuilder() {
+    }
+
+    @SuppressWarnings("WrongConstant")
+    protected ListUrlBuilder(Parcel in) {
+        this.mMode = in.readInt();
+        this.mPageIndex = in.readInt();
+        this.mCategory = in.readInt();
+        this.mKeyword = in.readString();
+        this.mAdvanceSearch = in.readInt();
+        this.mMinRating = in.readInt();
+        this.mPageFrom = in.readInt();
+        this.mPageTo = in.readInt();
+        this.mImagePath = in.readString();
+        this.mUseSimilarityScan = in.readByte() != 0;
+        this.mOnlySearchCovers = in.readByte() != 0;
+        this.mShowExpunged = in.readByte() != 0;
+        this.mSHash = in.readString();
+    }
+
+    /**
+     * Make this ListUrlBuilder point to homepage
+     */
+    public void reset() {
+        mMode = MODE_NORMAL;
+        mPageIndex = 0;
+        mCategory = EhUtils.NONE;
+        mKeyword = null;
+        mAdvanceSearch = -1;
+        mMinRating = -1;
+        mPageFrom = -1;
+        mPageTo = -1;
+        mImagePath = null;
+        mUseSimilarityScan = false;
+        mOnlySearchCovers = false;
+        mShowExpunged = false;
+        mSHash = null;
+    }
+
+    @Override
+    public ListUrlBuilder clone() {
+        try {
+            return (ListUrlBuilder) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+    @Mode
+    public int getMode() {
+        return mMode;
+    }
+
+    public void setMode(@Mode int mode) {
+        mMode = mode;
+    }
+
+    public int getPageIndex() {
+        return mPageIndex;
+    }
+
+    public void setPageIndex(int pageIndex) {
+        mPageIndex = pageIndex;
+    }
+
+    public int getCategory() {
+        return mCategory;
+    }
+
+    public void setCategory(int category) {
+        mCategory = category;
+    }
+
+    public String getKeyword() {
+        return MODE_UPLOADER == mMode ? "uploader:" + mKeyword : mKeyword;
+    }
+
+    public void setKeyword(String keyword) {
+        mKeyword = keyword;
+    }
+
+    public int getAdvanceSearch() {
+        return mAdvanceSearch;
+    }
+
+    public void setAdvanceSearch(int advanceSearch) {
+        mAdvanceSearch = advanceSearch;
+    }
+
+    public int getMinRating() {
+        return mMinRating;
+    }
+
+    public void setMinRating(int minRating) {
+        mMinRating = minRating;
+    }
+
+    public int getPageFrom() {
+        return mPageFrom;
+    }
+
+    public void setPageFrom(int pageFrom) {
+        mPageFrom = pageFrom;
+    }
+
+    public int getPageTo() {
+        return mPageTo;
+    }
+
+    public void setPageTo(int pageTo) {
+        mPageTo = pageTo;
+    }
+
+    @Nullable
+    public String getImagePath() {
+        return mImagePath;
+    }
+
+    public void setImagePath(String imagePath) {
+        mImagePath = imagePath;
+    }
+
+    public boolean isUseSimilarityScan() {
+        return mUseSimilarityScan;
+    }
+
+    public void setUseSimilarityScan(boolean useSimilarityScan) {
+        mUseSimilarityScan = useSimilarityScan;
+    }
+
+    public boolean isOnlySearchCovers() {
+        return mOnlySearchCovers;
+    }
+
+    public void setOnlySearchCovers(boolean onlySearchCovers) {
+        mOnlySearchCovers = onlySearchCovers;
+    }
+
+    public boolean isShowExpunged() {
+        return mShowExpunged;
+    }
+
+    public void setShowExpunged(boolean showExpunged) {
+        mShowExpunged = showExpunged;
+    }
+
+    /**
+     * Make them the same
+     *
+     * @param lub The template
+     */
+    public void set(ListUrlBuilder lub) {
+        mMode = lub.mMode;
+        mPageIndex = lub.mPageIndex;
+        mCategory = lub.mCategory;
+        mKeyword = lub.mKeyword;
+        mAdvanceSearch = lub.mAdvanceSearch;
+        mMinRating = lub.mMinRating;
+        mPageFrom = lub.mPageFrom;
+        mPageTo = lub.mPageTo;
+        mImagePath = lub.mImagePath;
+        mUseSimilarityScan = lub.mUseSimilarityScan;
+        mOnlySearchCovers = lub.mOnlySearchCovers;
+        mShowExpunged = lub.mShowExpunged;
+        mSHash = lub.mSHash;
+    }
+
+    public void set(QuickSearch q) {
+        mMode = q.mode;
+        mCategory = q.category;
+        mKeyword = q.keyword;
+        mAdvanceSearch = q.advanceSearch;
+        mMinRating = q.minRating;
+        mPageFrom = q.pageFrom;
+        mPageTo = q.pageTo;
+        mImagePath = null;
+        mUseSimilarityScan = false;
+        mOnlySearchCovers = false;
+        mShowExpunged = false;
+    }
+
+    public QuickSearch toQuickSearch() {
+        QuickSearch q = new QuickSearch();
+        q.mode = mMode;
+        q.category = mCategory;
+        q.keyword = mKeyword;
+        q.advanceSearch = mAdvanceSearch;
+        q.minRating = mMinRating;
+        q.pageFrom = mPageFrom;
+        q.pageTo = mPageTo;
+        return q;
+    }
+
+    public boolean equalsQuickSearch(QuickSearch q) {
+        if (null == q) {
+            return false;
+        }
+
+        if (q.mode != mMode) {
+            return false;
+        }
+        if (q.category != mCategory) {
+            return false;
+        }
+        if (!StringUtils.equals(q.keyword, mKeyword)) {
+            return false;
+        }
+        if (q.advanceSearch != mAdvanceSearch) {
+            return false;
+        }
+        if (q.minRating != mMinRating) {
+            return false;
+        }
+        if (q.pageFrom != mPageFrom) {
+            return false;
+        }
+        return q.pageTo == mPageTo;
+    }
+
+    /**
+     * @param query xxx=yyy&mmm=nnn
+     */
+    // TODO page
+    public void setQuery(String query) {
+        reset();
+
+        if (TextUtils.isEmpty(query)) {
+            return;
+        }
+        String[] querys = StringUtils.split(query, '&');
+        int category = 0;
+        String keyword = null;
+        boolean enableAdvanceSearch = false;
+        int advanceSearch = 0;
+        boolean enableMinRating = false;
+        int minRating = -1;
+        boolean enablePage = false;
+        int pageFrom = -1;
+        int pageTo = -1;
+        for (String str : querys) {
+            int index = str.indexOf('=');
+            if (index < 0) {
+                continue;
+            }
+            String key = str.substring(0, index);
+            String value = str.substring(index + 1);
+            switch (key) {
+                case "f_cats":
+                    int cats = NumberUtils.parseIntSafely(value, EhConfig.ALL_CATEGORY);
+                    category |= (~cats) & EhConfig.ALL_CATEGORY;
+                    break;
+                case "f_doujinshi":
+                    if ("1".equals(value)) {
+                        category |= EhConfig.DOUJINSHI;
+                    }
+                    break;
+                case "f_manga":
+                    if ("1".equals(value)) {
+                        category |= EhConfig.MANGA;
+                    }
+                    break;
+                case "f_artistcg":
+                    if ("1".equals(value)) {
+                        category |= EhConfig.ARTIST_CG;
+                    }
+                    break;
+                case "f_gamecg":
+                    if ("1".equals(value)) {
+                        category |= EhConfig.GAME_CG;
+                    }
+                    break;
+                case "f_western":
+                    if ("1".equals(value)) {
+                        category |= EhConfig.WESTERN;
+                    }
+                    break;
+                case "f_non-h":
+                    if ("1".equals(value)) {
+                        category |= EhConfig.NON_H;
+                    }
+                    break;
+                case "f_imageset":
+                    if ("1".equals(value)) {
+                        category |= EhConfig.IMAGE_SET;
+                    }
+                    break;
+                case "f_cosplay":
+                    if ("1".equals(value)) {
+                        category |= EhConfig.COSPLAY;
+                    }
+                    break;
+                case "f_asianporn":
+                    if ("1".equals(value)) {
+                        category |= EhConfig.ASIAN_PORN;
+                    }
+                    break;
+                case "f_misc":
+                    if ("1".equals(value)) {
+                        category |= EhConfig.MISC;
+                    }
+                    break;
+                case "f_search":
+                    try {
+                        keyword = URLDecoder.decode(value, "utf-8");
+                    } catch (UnsupportedEncodingException | IllegalArgumentException e) {
+                        // Ignore
+                    }
+                    break;
+                case "advsearch":
+                    if ("1".equals(value)) {
+                        enableAdvanceSearch = true;
+                    }
+                    break;
+                case "f_sname":
+                    if ("on".equals(value)) {
+                        advanceSearch |= AdvanceSearchTable.SNAME;
+                    }
+                    break;
+                case "f_stags":
+                    if ("on".equals(value)) {
+                        advanceSearch |= AdvanceSearchTable.STAGS;
+                    }
+                    break;
+                case "f_sdesc":
+                    if ("on".equals(value)) {
+                        advanceSearch |= AdvanceSearchTable.SDESC;
+                    }
+                    break;
+                case "f_storr":
+                    if ("on".equals(value)) {
+                        advanceSearch |= AdvanceSearchTable.STORR;
+                    }
+                    break;
+                case "f_sto":
+                    if ("on".equals(value)) {
+                        advanceSearch |= AdvanceSearchTable.STO;
+                    }
+                    break;
+                case "f_sdt1":
+                    if ("on".equals(value)) {
+                        advanceSearch |= AdvanceSearchTable.SDT1;
+                    }
+                    break;
+                case "f_sdt2":
+                    if ("on".equals(value)) {
+                        advanceSearch |= AdvanceSearchTable.SDT2;
+                    }
+                    break;
+                case "f_sh":
+                    if ("on".equals(value)) {
+                        advanceSearch |= AdvanceSearchTable.SH;
+                    }
+                    break;
+                case "f_sfl":
+                    if ("on".equals(value)) {
+                        advanceSearch |= AdvanceSearchTable.SFL;
+                    }
+                    break;
+                case "f_sfu":
+                    if ("on".equals(value)) {
+                        advanceSearch |= AdvanceSearchTable.SFU;
+                    }
+                    break;
+                case "f_sft":
+                    if ("on".equals(value)) {
+                        advanceSearch |= AdvanceSearchTable.SFT;
+                    }
+                    break;
+                case "f_sr":
+                    if ("on".equals(value)) {
+                        enableMinRating = true;
+                    }
+                    break;
+                case "f_srdd":
+                    minRating = NumberUtils.parseIntSafely(value, -1);
+                    break;
+                case "f_sp":
+                    if ("on".equals(value)) {
+                        enablePage = true;
+                    }
+                    break;
+                case "f_spf":
+                    pageFrom = NumberUtils.parseIntSafely(value, -1);
+                    break;
+                case "f_spt":
+                    pageTo = NumberUtils.parseIntSafely(value, -1);
+                    break;
+                case "f_shash":
+                    mSHash = value;
+                    break;
+            }
+        }
+
+        mCategory = category;
+        mKeyword = keyword;
+        if (enableAdvanceSearch) {
+            mAdvanceSearch = advanceSearch;
+            if (enableMinRating) {
+                mMinRating = minRating;
+            } else {
+                mMinRating = -1;
+            }
+            if (enablePage) {
+                mPageFrom = pageFrom;
+                mPageTo = pageTo;
+            } else {
+                mPageFrom = -1;
+                mPageTo = -1;
+            }
+        } else {
+            mAdvanceSearch = -1;
+        }
+    }
+
+    public String build() {
+        switch (mMode) {
+            default:
+            case MODE_NORMAL:
+            case MODE_SUBSCRIPTION: {
+                String url;
+                if (mMode == MODE_NORMAL) {
+                    url = EhUrl.getHost();
+                } else {
+                    url = EhUrl.getWatchedUrl();
+                }
+
+                UrlBuilder ub = new UrlBuilder(url);
+                if (mCategory != EhUtils.NONE) {
+                    ub.addQuery("f_cats", (~mCategory) & EhConfig.ALL_CATEGORY);
+                }
+                // Search key
+                if (mKeyword != null) {
+                    String keyword = mKeyword.trim();
+                    if (!keyword.isEmpty()) {
+                        try {
+                            ub.addQuery("f_search", URLEncoder.encode(mKeyword, "UTF-8"));
+                        } catch (UnsupportedEncodingException e) {
+                            // Empty
+                        }
+                    }
+                }
+                if (mSHash != null) {
+                    ub.addQuery("f_shash", mSHash);
+                }
+                // Page index
+                if (mPageIndex != 0) {
+                    ub.addQuery("page", mPageIndex);
+                }
+                // Advance search
+                if (mAdvanceSearch != -1) {
+                    ub.addQuery("advsearch", "1");
+                    if ((mAdvanceSearch & AdvanceSearchTable.SNAME) != 0)
+                        ub.addQuery("f_sname", "on");
+                    if ((mAdvanceSearch & AdvanceSearchTable.STAGS) != 0)
+                        ub.addQuery("f_stags", "on");
+                    if ((mAdvanceSearch & AdvanceSearchTable.SDESC) != 0)
+                        ub.addQuery("f_sdesc", "on");
+                    if ((mAdvanceSearch & AdvanceSearchTable.STORR) != 0)
+                        ub.addQuery("f_storr", "on");
+                    if ((mAdvanceSearch & AdvanceSearchTable.STO) != 0) ub.addQuery("f_sto", "on");
+                    if ((mAdvanceSearch & AdvanceSearchTable.SDT1) != 0)
+                        ub.addQuery("f_sdt1", "on");
+                    if ((mAdvanceSearch & AdvanceSearchTable.SDT2) != 0)
+                        ub.addQuery("f_sdt2", "on");
+                    if ((mAdvanceSearch & AdvanceSearchTable.SH) != 0) ub.addQuery("f_sh", "on");
+                    if ((mAdvanceSearch & AdvanceSearchTable.SFL) != 0) ub.addQuery("f_sfl", "on");
+                    if ((mAdvanceSearch & AdvanceSearchTable.SFU) != 0) ub.addQuery("f_sfu", "on");
+                    if ((mAdvanceSearch & AdvanceSearchTable.SFT) != 0) ub.addQuery("f_sft", "on");
+                    // Set min star
+                    if (mMinRating != -1) {
+                        ub.addQuery("f_sr", "on");
+                        ub.addQuery("f_srdd", mMinRating);
+                    }
+                    // Pages
+                    if (mPageFrom != -1 || mPageTo != -1) {
+                        ub.addQuery("f_sp", "on");
+                        ub.addQuery("f_spf", mPageFrom != -1 ? Integer.toString(mPageFrom) : "");
+                        ub.addQuery("f_spt", mPageTo != -1 ? Integer.toString(mPageTo) : "");
+                    }
+                }
+                return ub.build();
+            }
+            case MODE_UPLOADER: {
+                StringBuilder sb = new StringBuilder(EhUrl.getHost());
+                sb.append("uploader/");
+                try {
+                    sb.append(URLEncoder.encode(mKeyword, "UTF-8"));
+                } catch (UnsupportedEncodingException e) {
+                    // Empty
+                }
+                if (mPageIndex != 0) {
+                    sb.append('/').append(mPageIndex);
+                }
+                return sb.toString();
+            }
+            case MODE_TAG: {
+                StringBuilder sb = new StringBuilder(EhUrl.getHost());
+                sb.append("tag/");
+                try {
+                    sb.append(URLEncoder.encode(mKeyword, "UTF-8"));
+                } catch (UnsupportedEncodingException e) {
+                    // Empty
+                }
+                if (mPageIndex != 0) {
+                    sb.append('/').append(mPageIndex);
+                }
+                return sb.toString();
+            }
+            case MODE_WHATS_HOT:
+                return EhUrl.getPopularUrl();
+            case MODE_IMAGE_SEARCH:
+                return EhUrl.getImageSearchUrl();
+            case MODE_TOPLIST:
+                StringBuilder sb = new StringBuilder(EhUrl.HOST_E);
+                sb.append("toplist.php?tl=");
+                try {
+                    sb.append(URLEncoder.encode(mKeyword, "UTF-8"));
+                } catch (UnsupportedEncodingException e) {
+                    // Empty
+                }
+                if (mPageIndex != 0) {
+                    sb.append("&p=").append(mPageIndex);
+                }
+                return sb.toString();
+        }
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeInt(this.mMode);
+        dest.writeInt(this.mPageIndex);
+        dest.writeInt(this.mCategory);
+        dest.writeString(this.mKeyword);
+        dest.writeInt(this.mAdvanceSearch);
+        dest.writeInt(this.mMinRating);
+        dest.writeInt(this.mPageFrom);
+        dest.writeInt(this.mPageTo);
+        dest.writeString(this.mImagePath);
+        dest.writeByte(mUseSimilarityScan ? (byte) 1 : (byte) 0);
+        dest.writeByte(mOnlySearchCovers ? (byte) 1 : (byte) 0);
+        dest.writeByte(mShowExpunged ? (byte) 1 : (byte) 0);
+        dest.writeString(this.mSHash);
+    }
+
+    @IntDef({MODE_NORMAL, MODE_UPLOADER, MODE_TAG, MODE_WHATS_HOT, MODE_IMAGE_SEARCH, MODE_SUBSCRIPTION, MODE_TOPLIST})
+    @Retention(RetentionPolicy.SOURCE)
+    private @interface Mode {
+    }
+}
@@ -1,547 +0,0 @@
-/*
- * Copyright (C) 2015 Hippo Seven
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.hippo.ehviewer.client.data
-
-import android.os.Parcel
-import android.os.Parcelable
-import android.os.Parcelable.Creator
-import android.text.TextUtils
-import androidx.annotation.IntDef
-import com.hippo.ehviewer.client.EhConfig
-import com.hippo.ehviewer.client.EhUrl
-import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.dao.QuickSearch
-import com.hippo.ehviewer.widget.AdvanceSearchTable
-import com.hippo.network.UrlBuilder
-import com.hippo.yorozuya.NumberUtils
-import com.hippo.yorozuya.StringUtils
-import java.io.UnsupportedEncodingException
-import java.net.URLDecoder
-import java.net.URLEncoder
-
-open class ListUrlBuilder : Cloneable, Parcelable {
-    @get:Mode
-    @Mode
-    var mode = MODE_NORMAL
-    private var mPrevGid = 0
-    private var mNextGid = 0
-    private var mJumpTo: String? = null
-    var category = EhUtils.NONE
-    private var mKeyword: String? = null
-    private var mSHash: String? = null
-    var advanceSearch = -1
-    var minRating = -1
-    var pageFrom = -1
-    var pageTo = -1
-    var imagePath: String? = null
-    var isUseSimilarityScan = false
-    var isOnlySearchCovers = false
-    var isShowExpunged = false
-
-    constructor()
-    protected constructor(parcel: Parcel) {
-        mode = parcel.readInt()
-        mPrevGid = parcel.readInt()
-        mNextGid = parcel.readInt()
-        mJumpTo = parcel.readString()
-        this.category = parcel.readInt()
-        mKeyword = parcel.readString()
-        advanceSearch = parcel.readInt()
-        minRating = parcel.readInt()
-        pageFrom = parcel.readInt()
-        pageTo = parcel.readInt()
-        imagePath = parcel.readString()
-        isUseSimilarityScan = parcel.readByte().toInt() != 0
-        isOnlySearchCovers = parcel.readByte().toInt() != 0
-        isShowExpunged = parcel.readByte().toInt() != 0
-        mSHash = parcel.readString()
-    }
-
-    fun reset() {
-        mode = MODE_NORMAL
-        mPrevGid = 0
-        mNextGid = 0
-        mJumpTo = null
-        this.category = EhUtils.NONE
-        mKeyword = null
-        advanceSearch = -1
-        minRating = -1
-        pageFrom = -1
-        pageTo = -1
-        imagePath = null
-        isUseSimilarityScan = false
-        isOnlySearchCovers = false
-        isShowExpunged = false
-        mSHash = null
-    }
-
-    public override fun clone(): ListUrlBuilder {
-        return try {
-            super.clone() as ListUrlBuilder
-        } catch (e: CloneNotSupportedException) {
-            throw IllegalStateException(e)
-        }
-    }
-
-    fun setPrevGid(prevGid: Int) {
-        mPrevGid = prevGid
-    }
-
-    fun setNextGid(nextGid: Int) {
-        mNextGid = nextGid
-    }
-
-    fun setJumpTo(jumpTo: String?) {
-        mJumpTo = jumpTo
-    }
-
-    var keyword: String?
-        get() = if (MODE_UPLOADER == mode) "uploader:$mKeyword" else mKeyword
-        set(keyword) {
-            mKeyword = keyword
-        }
-
-    /**
-     * Make them the same
-     *
-     * @param lub The template
-     */
-    fun set(lub: ListUrlBuilder) {
-        mode = lub.mode
-        mPrevGid = lub.mPrevGid
-        mNextGid = lub.mNextGid
-        mJumpTo = lub.mJumpTo
-        this.category = lub.category
-        mKeyword = lub.mKeyword
-        advanceSearch = lub.advanceSearch
-        minRating = lub.minRating
-        pageFrom = lub.pageFrom
-        pageTo = lub.pageTo
-        imagePath = lub.imagePath
-        isUseSimilarityScan = lub.isUseSimilarityScan
-        isOnlySearchCovers = lub.isOnlySearchCovers
-        isShowExpunged = lub.isShowExpunged
-        mSHash = lub.mSHash
-    }
-
-    fun set(q: QuickSearch) {
-        mode = q.mode
-        this.category = q.category
-        mKeyword = q.keyword
-        advanceSearch = q.advanceSearch
-        minRating = q.minRating
-        pageFrom = q.pageFrom
-        pageTo = q.pageTo
-        imagePath = null
-        isUseSimilarityScan = false
-        isOnlySearchCovers = false
-        isShowExpunged = false
-    }
-
-    fun toQuickSearch(): QuickSearch {
-        val q = QuickSearch()
-        q.mode = mode
-        q.category = this.category
-        q.keyword = mKeyword
-        q.advanceSearch = advanceSearch
-        q.minRating = minRating
-        q.pageFrom = pageFrom
-        q.pageTo = pageTo
-        return q
-    }
-
-    fun equalsQuickSearch(q: QuickSearch?): Boolean {
-        if (null == q) {
-            return false
-        }
-        if (q.mode != mode) {
-            return false
-        }
-        if (q.category != this.category) {
-            return false
-        }
-        if (!StringUtils.equals(q.keyword, mKeyword)) {
-            return false
-        }
-        if (q.advanceSearch != advanceSearch) {
-            return false
-        }
-        if (q.minRating != minRating) {
-            return false
-        }
-        return if (q.pageFrom != pageFrom) {
-            false
-        } else q.pageTo == pageTo
-    }
-
-    /**
-     * @param query xxx=yyy&mmm=nnn
-     */
-    // TODO page
-    fun setQuery(query: String?) {
-        reset()
-        if (TextUtils.isEmpty(query)) {
-            return
-        }
-        val querys = StringUtils.split(query, '&')
-        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 querys) {
-            val index = str.indexOf('=')
-            if (index < 0) {
-                continue
-            }
-            val key = str.substring(0, index)
-            val value = str.substring(index + 1)
-            when (key) {
-                "f_cats" -> {
-                    val cats = NumberUtils.parseIntSafely(value, EhConfig.ALL_CATEGORY)
-                    category = category or (cats.inv() and EhConfig.ALL_CATEGORY)
-                }
-
-                "f_doujinshi" -> if ("1" == value) {
-                    category = category or EhConfig.DOUJINSHI
-                }
-
-                "f_manga" -> if ("1" == value) {
-                    category = category or EhConfig.MANGA
-                }
-
-                "f_artistcg" -> if ("1" == value) {
-                    category = category or EhConfig.ARTIST_CG
-                }
-
-                "f_gamecg" -> if ("1" == value) {
-                    category = category or EhConfig.GAME_CG
-                }
-
-                "f_western" -> if ("1" == value) {
-                    category = category or EhConfig.WESTERN
-                }
-
-                "f_non-h" -> if ("1" == value) {
-                    category = category or EhConfig.NON_H
-                }
-
-                "f_imageset" -> if ("1" == value) {
-                    category = category or EhConfig.IMAGE_SET
-                }
-
-                "f_cosplay" -> if ("1" == value) {
-                    category = category or EhConfig.COSPLAY
-                }
-
-                "f_asianporn" -> if ("1" == value) {
-                    category = category or EhConfig.ASIAN_PORN
-                }
-
-                "f_misc" -> if ("1" == value) {
-                    category = category or EhConfig.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 AdvanceSearchTable.SH
-                }
-
-                "f_sto" -> if ("on" == value) {
-                    advanceSearch = advanceSearch or AdvanceSearchTable.STO
-                }
-
-                "f_sfl" -> if ("on" == value) {
-                    advanceSearch = advanceSearch or AdvanceSearchTable.SFL
-                }
-
-                "f_sfu" -> if ("on" == value) {
-                    advanceSearch = advanceSearch or AdvanceSearchTable.SFU
-                }
-
-                "f_sft" -> if ("on" == value) {
-                    advanceSearch = advanceSearch or AdvanceSearchTable.SFT
-                }
-
-                "f_sr" -> if ("on" == value) {
-                    enableMinRating = true
-                }
-
-                "f_srdd" -> minRating = NumberUtils.parseIntSafely(value, -1)
-                "f_sp" -> if ("on" == value) {
-                    enablePage = true
-                }
-
-                "f_spf" -> pageFrom = NumberUtils.parseIntSafely(value, -1)
-                "f_spt" -> pageTo = NumberUtils.parseIntSafely(value, -1)
-                "f_shash" -> mSHash = value
-            }
-        }
-        this.category = category
-        mKeyword = keyword
-        if (enableAdvanceSearch) {
-            this.advanceSearch = advanceSearch
-            if (enableMinRating) {
-                this.minRating = minRating
-            } else {
-                this.minRating = -1
-            }
-            if (enablePage) {
-                this.pageFrom = pageFrom
-                this.pageTo = pageTo
-            } else {
-                this.pageFrom = -1
-                this.pageTo = -1
-            }
-        } else {
-            this.advanceSearch = -1
-        }
-    }
-
-    fun build(): String {
-        return when (mode) {
-            MODE_NORMAL, MODE_SUBSCRIPTION -> {
-                val url: String = if (mode == MODE_NORMAL) {
-                    EhUrl.getHost()
-                } else {
-                    EhUrl.getWatchedUrl()
-                }
-                val ub = UrlBuilder(url)
-                if (this.category != EhUtils.NONE) {
-                    ub.addQuery("f_cats", category.inv() and EhConfig.ALL_CATEGORY)
-                }
-                // Search key
-                if (mKeyword != null) {
-                    val keyword = mKeyword!!.trim { it <= ' ' }
-                    if (keyword.isNotEmpty()) {
-                        try {
-                            ub.addQuery("f_search", URLEncoder.encode(mKeyword, "UTF-8"))
-                        } catch (e: UnsupportedEncodingException) {
-                            // Empty
-                        }
-                    }
-                }
-                if (mSHash != null) {
-                    ub.addQuery("f_shash", mSHash!!)
-                }
-                mJumpTo?.let {
-                    ub.addQuery("seek", mJumpTo!!)
-                    mPrevGid = 0
-                    mNextGid = 0
-                }
-                if (mPrevGid != 0) {
-                    ub.addQuery("prev", mPrevGid)
-                }
-                if (mNextGid != 0) {
-                    ub.addQuery("next", mNextGid)
-                }
-                // Advance search
-                if (advanceSearch != -1) {
-                    ub.addQuery("advsearch", "1")
-                    if (advanceSearch and AdvanceSearchTable.SH != 0) ub.addQuery("f_sh", "on")
-                    if (advanceSearch and AdvanceSearchTable.STO != 0) ub.addQuery("f_sto", "on")
-                    if (advanceSearch and AdvanceSearchTable.SFL != 0) ub.addQuery("f_sfl", "on")
-                    if (advanceSearch and AdvanceSearchTable.SFU != 0) ub.addQuery("f_sfu", "on")
-                    if (advanceSearch and AdvanceSearchTable.SFT != 0) ub.addQuery("f_sft", "on")
-                    // Set min star
-                    if (minRating != -1) {
-                        ub.addQuery("f_sr", "on")
-                        ub.addQuery("f_srdd", minRating)
-                    }
-                    // Pages
-                    if (pageFrom != -1 || pageTo != -1) {
-                        ub.addQuery("f_sp", "on")
-                        ub.addQuery("f_spf", if (pageFrom != -1) pageFrom.toString() else "")
-                        ub.addQuery("f_spt", if (pageTo != -1) pageTo.toString() else "")
-                    }
-                }
-                ub.build()
-            }
-
-            MODE_UPLOADER -> {
-                val sb = StringBuilder(EhUrl.getHost())
-                sb.append("uploader/")
-                try {
-                    sb.append(URLEncoder.encode(mKeyword, "UTF-8"))
-                } catch (e: UnsupportedEncodingException) {
-                    // Empty
-                }
-                if (mPrevGid != 0) {
-                    sb.append("?prev=").append(mPrevGid)
-                }
-                if (mNextGid != 0) {
-                    sb.append("?next=").append(mNextGid)
-                }
-                if (mJumpTo != null) {
-                    sb.append("&seek=").append(mJumpTo)
-                }
-                sb.toString()
-            }
-
-            MODE_TAG -> {
-                val sb = StringBuilder(EhUrl.getHost())
-                sb.append("tag/")
-                try {
-                    sb.append(URLEncoder.encode(mKeyword, "UTF-8"))
-                } catch (e: UnsupportedEncodingException) {
-                    // Empty
-                }
-                if (mPrevGid != 0) {
-                    sb.append("?prev=").append(mPrevGid)
-                }
-                if (mNextGid != 0) {
-                    sb.append("?next=").append(mNextGid)
-                }
-                if (mJumpTo != null) {
-                    sb.append("&seek=").append(mJumpTo)
-                }
-                sb.toString()
-            }
-
-            MODE_WHATS_HOT -> EhUrl.getPopularUrl()
-            MODE_IMAGE_SEARCH -> EhUrl.getImageSearchUrl()
-            MODE_TOPLIST -> {
-                val sb = StringBuilder(EhUrl.HOST_E)
-                sb.append("toplist.php?tl=")
-                try {
-                    sb.append(URLEncoder.encode(mKeyword, "UTF-8"))
-                } catch (e: UnsupportedEncodingException) {
-                    // Empty
-                }
-                if (mNextGid != 0) {
-                    sb.append("&p=").append(mNextGid)
-                }
-                sb.toString()
-            }
-
-            else -> {
-                val url: String = if (mode == MODE_NORMAL) {
-                    EhUrl.getHost()
-                } else {
-                    EhUrl.getWatchedUrl()
-                }
-                val ub = UrlBuilder(url)
-                if (this.category != EhUtils.NONE) {
-                    ub.addQuery("f_cats", category.inv() and EhConfig.ALL_CATEGORY)
-                }
-                if (mKeyword != null) {
-                    val keyword = mKeyword!!.trim { it <= ' ' }
-                    if (keyword.isNotEmpty()) {
-                        try {
-                            ub.addQuery("f_search", URLEncoder.encode(mKeyword, "UTF-8"))
-                        } catch (_: UnsupportedEncodingException) {
-                        }
-                    }
-                }
-                if (mSHash != null) {
-                    ub.addQuery("f_shash", mSHash!!)
-                }
-                if (mPrevGid != 0) {
-                    ub.addQuery("prev", mPrevGid)
-                }
-                if (mNextGid != 0) {
-                    ub.addQuery("next", mNextGid)
-                }
-                if (advanceSearch != -1) {
-                    ub.addQuery("advsearch", "1")
-                    if (advanceSearch and AdvanceSearchTable.SH != 0) ub.addQuery("f_sh", "on")
-                    if (advanceSearch and AdvanceSearchTable.STO != 0) ub.addQuery("f_sto", "on")
-                    if (advanceSearch and AdvanceSearchTable.SFL != 0) ub.addQuery("f_sfl", "on")
-                    if (advanceSearch and AdvanceSearchTable.SFU != 0) ub.addQuery("f_sfu", "on")
-                    if (advanceSearch and AdvanceSearchTable.SFT != 0) ub.addQuery("f_sft", "on")
-                    if (minRating != -1) {
-                        ub.addQuery("f_sr", "on")
-                        ub.addQuery("f_srdd", minRating)
-                    }
-                    if (pageFrom != -1 || pageTo != -1) {
-                        ub.addQuery("f_sp", "on")
-                        ub.addQuery("f_spf", if (pageFrom != -1) pageFrom.toString() else "")
-                        ub.addQuery("f_spt", if (pageTo != -1) pageTo.toString() else "")
-                    }
-                }
-                ub.build()
-            }
-        }
-    }
-
-    override fun describeContents(): Int {
-        return 0
-    }
-
-    override fun writeToParcel(dest: Parcel, flags: Int) {
-        dest.writeInt(mode)
-        dest.writeInt(mPrevGid)
-        dest.writeInt(mNextGid)
-        dest.writeString(mJumpTo)
-        dest.writeInt(this.category)
-        dest.writeString(mKeyword)
-        dest.writeInt(advanceSearch)
-        dest.writeInt(minRating)
-        dest.writeInt(pageFrom)
-        dest.writeInt(pageTo)
-        dest.writeString(imagePath)
-        dest.writeByte(if (isUseSimilarityScan) 1.toByte() else 0.toByte())
-        dest.writeByte(if (isOnlySearchCovers) 1.toByte() else 0.toByte())
-        dest.writeByte(if (isShowExpunged) 1.toByte() else 0.toByte())
-        dest.writeString(mSHash)
-    }
-
-    @IntDef(
-        MODE_NORMAL,
-        MODE_UPLOADER,
-        MODE_TAG,
-        MODE_WHATS_HOT,
-        MODE_IMAGE_SEARCH,
-        MODE_SUBSCRIPTION,
-        MODE_TOPLIST
-    )
-    @Retention(AnnotationRetention.SOURCE)
-    private annotation class Mode
-    companion object {
-        const val MODE_NORMAL = 0x0
-        const val MODE_UPLOADER = 0x1
-        const val MODE_TAG = 0x2
-        const val MODE_WHATS_HOT = 0x3
-        const val MODE_IMAGE_SEARCH = 0x4
-        const val MODE_SUBSCRIPTION = 0x5
-        const val MODE_TOPLIST = 0x6
-
-        @JvmField
-        val CREATOR: Creator<ListUrlBuilder> = object : Creator<ListUrlBuilder> {
-            override fun createFromParcel(source: Parcel): ListUrlBuilder {
-                return ListUrlBuilder(source)
-            }
-
-            override fun newArray(size: Int): Array<ListUrlBuilder?> {
-                return arrayOfNulls(size)
-            }
-        }
-    }
-}
@@ -31,22 +31,18 @@ import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;

 import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;

 public class FavoritesParser {
-    private static final Pattern PATTERN_PREV_PAGE = Pattern.compile("prev=(\\d+(-\\d+)?)");
-    private static final Pattern PATTERN_NEXT_PAGE = Pattern.compile("next=(\\d+(-\\d+)?)");

    public static Result parse(String body) throws Exception {
        if (body.contains("This page requires you to log on.</p>")) {
            throw new EhException(GetText.getString(R.string.need_sign_in));
        }
-        Document d = Jsoup.parse(body);
-
        String[] catArray = new String[10];
        int[] countArray = new int[10];
+
        try {
+            Document d = Jsoup.parse(body);
            Element ido = JsoupUtils.getElementByClass(d, "ido");
            //noinspection ConstantConditions
            Elements fps = ido.getElementsByClass("fp");
@@ -64,24 +60,13 @@ public class FavoritesParser {
            throw new ParseException("Parse favorites error", body);
        }

-        Result re = new Result();
-        try {
-            Element prev = d.getElementById("uprev");
-            Element next = d.getElementById("unext");
-            assert prev != null;
-            assert next != null;
-            Matcher matcherPrev = PATTERN_PREV_PAGE.matcher(prev.attr("href"));
-            Matcher matcherNext = PATTERN_NEXT_PAGE.matcher(next.attr("href"));
-            if (matcherPrev.find()) re.prevPage = matcherPrev.group(1);
-            if (matcherNext.find()) re.nextPage = matcherNext.group(1);
-        } catch (Throwable e) {
-            e.printStackTrace();
-        }
-
        GalleryListParser.Result result = GalleryListParser.parse(body);

+        Result re = new Result();
        re.catArray = catArray;
        re.countArray = countArray;
+        re.pages = result.pages;
+        re.nextPage = result.nextPage;
        re.galleryInfoList = result.galleryInfoList;

        return re;
@@ -90,8 +75,8 @@ public class FavoritesParser {
    public static class Result {
        public String[] catArray; // Size 10
        public int[] countArray; // Size 10
-        public String prevPage;
-        public String nextPage;
+        public int pages;
+        public int nextPage;
        public List<GalleryInfo> galleryInfoList;
    }
 }
@@ -19,6 +19,8 @@ package com.hippo.ehviewer.client.parser;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

+import com.hippo.ehviewer.Settings;
+import com.hippo.ehviewer.client.EhUrl;
 import com.hippo.ehviewer.client.EhUtils;
 import com.hippo.ehviewer.client.data.GalleryComment;
 import com.hippo.ehviewer.client.data.GalleryCommentList;
@@ -46,12 +48,14 @@ import org.jsoup.select.Elements;
 import org.jsoup.select.NodeTraversor;
 import org.jsoup.select.NodeVisitor;

-import java.time.Instant;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeFormatter;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
+import java.util.TimeZone;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

@@ -62,6 +66,9 @@ public class GalleryDetailParser {
    private static final Pattern PATTERN_TORRENT = Pattern.compile("<a[^<>]*onclick=\"return popUp\\('([^']+)'[^)]+\\)\">Torrent Download[^<]+(\\d+)[^<]+</a");
    private static final Pattern PATTERN_ARCHIVE = Pattern.compile("<a[^<>]*onclick=\"return popUp\\('([^']+)'[^)]+\\)\">Archive Download</a>");
    private static final Pattern PATTERN_COVER = Pattern.compile("width:(\\d+)px; height:(\\d+)px.+?url\\((.+?)\\)");
+    private static final Pattern PATTERN_TAG_GROUP = Pattern.compile("<tr><td[^<>]+>([\\w\\s]+):</td><td>(?:<div[^<>]+><a[^<>]+>[\\w\\s]+</a></div>)+</td></tr>");
+    private static final Pattern PATTERN_TAG = Pattern.compile("<div[^<>]+><a[^<>]+>([\\w\\s]+)</a></div>");
+    private static final Pattern PATTERN_COMMENT = Pattern.compile("<div class=\"c3\">Posted on ([^<>]+) by: &nbsp; <a[^<>]+>([^<>]+)</a>.+?<div class=\"c6\"[^>]*>(.+?)</div><div class=\"c[78]\"");
    private static final Pattern PATTERN_PAGES = Pattern.compile("<tr><td[^<>]*>Length:</td><td[^<>]*>([\\d,]+) pages</td></tr>");
    private static final Pattern PATTERN_PREVIEW_PAGES = Pattern.compile("<td[^>]+><a[^>]+>([\\d,]+)</a></td><td[^>]+>(?:<a[^>]+>)?&gt;(?:</a>)?</td>");
    private static final Pattern PATTERN_NORMAL_PREVIEW = Pattern.compile("<div class=\"gdtm\"[^<>]*><div[^<>]*width:(\\d+)[^<>]*height:(\\d+)[^<>]*\\((.+?)\\)[^<>]*-(\\d+)px[^<>]*><a[^<>]*href=\"(.+?)\"[^<>]*><img alt=\"([\\d,]+)\"");
@@ -71,13 +78,16 @@ public class GalleryDetailParser {
    private static final GalleryTagGroup[] EMPTY_GALLERY_TAG_GROUP_ARRAY = new GalleryTagGroup[0];
    private static final GalleryCommentList EMPTY_GALLERY_COMMENT_ARRAY = new GalleryCommentList(new GalleryComment[0], false);

-    private static final DateTimeFormatter WEB_COMMENT_DATE_FORMAT = DateTimeFormatter
-            .ofPattern("dd MMMM yyyy, HH:mm", Locale.US).withZone(ZoneOffset.UTC);
+    private static final DateFormat WEB_COMMENT_DATE_FORMAT = new SimpleDateFormat("dd MMMMM yyyy, HH:mm", Locale.US);
    private static final String OFFENSIVE_STRING =
            "<p>(And if you choose to ignore this warning, you lose all rights to complain about it in the future.)</p>";
    private static final String PINING_STRING =
            "<p>This gallery is pining for the fjords.</p>";

+    static {
+        WEB_COMMENT_DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
+    }
+
    public static GalleryDetail parse(String body) throws EhException {
        if (body.contains(OFFENSIVE_STRING)) {
            throw new OffensiveException();
@@ -188,13 +198,14 @@ public class GalleryDetailParser {
            gd.posted = "";
            gd.parent = "";
            gd.visible = "";
+            gd.visible = "";
            gd.size = "";
            gd.pages = 0;
            gd.favoriteCount = 0;
            try {
                Elements es = gdd.child(0).child(0).children();
                for (int i = 0, n = es.size(); i < n; i++) {
-                    parseDetailInfo(gd, es.get(i));
+                    parseDetailInfo(gd, es.get(i), body);
                }
            } catch (Throwable e) {
                ExceptionUtils.throwIfFatal(e);
@@ -282,7 +293,7 @@ public class GalleryDetailParser {
        }
    }

-    private static void parseDetailInfo(GalleryDetail gd, Element e) {
+    private static void parseDetailInfo(GalleryDetail gd, Element e, String body) {
        Elements es = e.children();
        if (es.size() < 2) {
            return;
@@ -312,16 +323,20 @@ public class GalleryDetailParser {
            }
        } else if (key.startsWith("Favorited")) {
            switch (value) {
-                case "Never" -> gd.favoriteCount = 0;
-                case "Once" -> gd.favoriteCount = 1;
-                default -> {
+                case "Never":
+                    gd.favoriteCount = 0;
+                    break;
+                case "Once":
+                    gd.favoriteCount = 1;
+                    break;
+                default:
                    int index = value.indexOf(' ');
                    if (index == -1) {
                        gd.favoriteCount = 0;
                    } else {
                        gd.favoriteCount = NumberUtils.parseIntSafely(value.substring(0, index), 0);
                    }
-                }
+                    break;
            }
        }
    }
@@ -362,7 +377,6 @@ public class GalleryDetailParser {
    public static GalleryTagGroup[] parseTagGroups(Document document) {
        try {
            Element taglist = document.getElementById("taglist");
-            assert taglist != null;
            Elements tagGroups = taglist.child(0).child(0).children();
            return parseTagGroups(tagGroups);
        } catch (Throwable e) {
@@ -382,7 +396,7 @@ public class GalleryDetailParser {
                    list.add(group);
                }
            }
-            return list.toArray(new GalleryTagGroup[0]);
+            return list.toArray(new GalleryTagGroup[list.size()]);
        } catch (Throwable e) {
            ExceptionUtils.throwIfFatal(e);
            e.printStackTrace();
@@ -390,6 +404,31 @@ public class GalleryDetailParser {
        }
    }

+    /**
+     * Parse tag groups with regular expressions
+     */
+    @NonNull
+    private static GalleryTagGroup[] parseTagGroups(String body) throws EhException {
+        List<GalleryTagGroup> list = new LinkedList<>();
+
+        Matcher m = PATTERN_TAG_GROUP.matcher(body);
+        while (m.find()) {
+            GalleryTagGroup tagGroup = new GalleryTagGroup();
+            tagGroup.groupName = ParserUtils.trim(m.group(1));
+            parseGroup(tagGroup, m.group(0));
+            list.add(tagGroup);
+        }
+
+        return list.toArray(new GalleryTagGroup[list.size()]);
+    }
+
+    private static void parseGroup(GalleryTagGroup tagGroup, String body) {
+        Matcher m = PATTERN_TAG.matcher(body);
+        while (m.find()) {
+            tagGroup.addTag(ParserUtils.trim(m.group(1)));
+        }
+    }
+
    @Nullable
    @SuppressWarnings("ConstantConditions")
    public static GalleryComment parseComment(Element element) {
@@ -407,15 +446,17 @@ public class GalleryDetailParser {
                }
                for (Element e : c4.children()) {
                    switch (e.text()) {
-                        case "Vote+" -> {
+                        case "Vote+":
                            comment.voteUpAble = true;
                            comment.voteUpEd = !StringUtils.trim(e.attr("style")).isEmpty();
-                        }
-                        case "Vote-" -> {
+                            break;
+                        case "Vote-":
                            comment.voteDownAble = true;
                            comment.voteDownEd = !StringUtils.trim(e.attr("style")).isEmpty();
-                        }
-                        case "Edit" -> comment.editable = true;
+                            break;
+                        case "Edit":
+                            comment.editable = true;
+                            break;
                    }
                }
            }
@@ -436,7 +477,7 @@ public class GalleryDetailParser {
            Element c3 = JsoupUtils.getElementByClass(element, "c3");
            String temp = c3.ownText();
            temp = temp.substring("Posted on ".length(), temp.length() - " by:".length());
-            comment.time = Instant.from(WEB_COMMENT_DATE_FORMAT.parse(temp)).toEpochMilli();
+            comment.time = WEB_COMMENT_DATE_FORMAT.parse(temp).getTime();
            // user
            comment.user = c3.child(0).text();
            // comment
@@ -446,7 +487,7 @@ public class GalleryDetailParser {
            if (c8 != null) {
                Element e = c8.children().first();
                if (e != null) {
-                    comment.lastEdited = Instant.from(WEB_COMMENT_DATE_FORMAT.parse(temp)).toEpochMilli();
+                    comment.lastEdited = WEB_COMMENT_DATE_FORMAT.parse(temp).getTime();
                }
            }
            return comment;
@@ -464,7 +505,6 @@ public class GalleryDetailParser {
    public static GalleryCommentList parseComments(Document document) {
        try {
            Element cdiv = document.getElementById("cdiv");
-            assert cdiv != null;
            Elements c1s = cdiv.getElementsByClass("c1");

            List<GalleryComment> list = new ArrayList<>(c1s.size());
@@ -477,21 +517,20 @@ public class GalleryDetailParser {

            Element chd = cdiv.getElementById("chd");
            MutableBoolean hasMore = new MutableBoolean(false);
-            assert chd != null;
            NodeTraversor.traverse(new NodeVisitor() {
                @Override
-                public void head(@NonNull Node node, int depth) {
+                public void head(Node node, int depth) {
                    if (node instanceof Element && ((Element) node).text().equals("click to show all")) {
                        hasMore.value = true;
                    }
                }

                @Override
-                public void tail(@NonNull Node node, int depth) {
+                public void tail(Node node, int depth) {
                }
            }, chd);

-            return new GalleryCommentList(list.toArray(new GalleryComment[0]), hasMore.value);
+            return new GalleryCommentList(list.toArray(new GalleryComment[list.size()]), hasMore.value);
        } catch (Throwable e) {
            ExceptionUtils.throwIfFatal(e);
            e.printStackTrace();
@@ -499,14 +538,38 @@ public class GalleryDetailParser {
        }
    }

+    /**
+     * Parse comments with regular expressions
+     */
+    @NonNull
+    public static GalleryComment[] parseComments(String body) {
+        List<GalleryComment> list = new LinkedList<>();
+
+        Matcher m = PATTERN_COMMENT.matcher(body);
+        while (m.find()) {
+            String webDateString = ParserUtils.trim(m.group(1));
+            Date date;
+            try {
+                date = WEB_COMMENT_DATE_FORMAT.parse(webDateString);
+            } catch (java.text.ParseException e) {
+                date = new Date(0L);
+            }
+            GalleryComment comment = new GalleryComment();
+            comment.time = date.getTime();
+            comment.user = ParserUtils.trim(m.group(2));
+            comment.comment = m.group(3);
+            list.add(comment);
+        }
+
+        return list.toArray(new GalleryComment[list.size()]);
+    }
+
    /**
     * Parse preview pages with html parser
     */
    public static int parsePreviewPages(Document document, String body) throws ParseException {
        try {
-            Element ptt = document.getElementsByClass("ptt").first();
-            assert ptt != null;
-            Elements elements = ptt.child(0).child(0).children();
+            Elements elements = document.getElementsByClass("ptt").first().child(0).child(0).children();
            return Integer.parseInt(elements.get(elements.size() - 2).text());
        } catch (Throwable e) {
            ExceptionUtils.throwIfFatal(e);
@@ -573,10 +636,9 @@ public class GalleryDetailParser {
        try {
            LargePreviewSet largePreviewSet = new LargePreviewSet();
            Element gdt = d.getElementById("gdt");
-            assert gdt != null;
            Elements gdtls = gdt.getElementsByClass("gdtl");
            int n = gdtls.size();
-            if (n == 0) {
+            if (n <= 0) {
                throw new ParseException("Can't parse large preview", body);
            }
            for (int i = 0; i < n; i++) {
@@ -584,6 +646,9 @@ public class GalleryDetailParser {
                String pageUrl = element.attr("href");
                element = element.child(0);
                String imageUrl = element.attr("src");
+                if (Settings.getFixThumbUrl()) {
+                    imageUrl = EhUrl.getFixedPreviewThumbUrl(imageUrl);
+                }
                int index = Integer.parseInt(element.attr("alt")) - 1;
                largePreviewSet.addItem(index, imageUrl, pageUrl);
            }
@@ -609,6 +674,9 @@ public class GalleryDetailParser {
            }
            String imageUrl = ParserUtils.trim(m.group(3));
            String pageUrl = ParserUtils.trim(m.group(1));
+            if (Settings.getFixThumbUrl()) {
+                imageUrl = EhUrl.getFixedPreviewThumbUrl(imageUrl);
+            }
            largePreviewSet.addItem(index, imageUrl, pageUrl);
        }

@@ -51,8 +51,7 @@ public class GalleryListParser {
    private static final Pattern PATTERN_THUMB_SIZE = Pattern.compile("height:(\\d+)px;width:(\\d+)px");
    private static final Pattern PATTERN_FAVORITE_SLOT = Pattern.compile("background-color:rgba\\((\\d+),(\\d+),(\\d+),");
    private static final Pattern PATTERN_PAGES = Pattern.compile("(\\d+) page");
-    private static final Pattern PATTERN_PREV_PAGE = Pattern.compile("prev=(\\d+)");
-    private static final Pattern PATTERN_NEXT_PAGE = Pattern.compile("next=(\\d+)");
+    private static final Pattern PATTERN_NEXT_PAGE = Pattern.compile("page=(\\d+)");

    private static final String[][] FAVORITE_SLOT_RGB = new String[][]{
            new String[]{"0", "0", "0"},
@@ -299,33 +298,37 @@ public class GalleryListParser {
    }

    public static Result parse(@NonNull String body) throws Exception {
-
        Result result = new Result();
        Document d = Jsoup.parse(body);
+
        try {
-            Element prev = d.getElementById("uprev");
-            Element next = d.getElementById("unext");
-            assert prev != null;
-            assert next != null;
-            Matcher matcherPrev = PATTERN_PREV_PAGE.matcher(prev.attr("href"));
-            Matcher matcherNext = PATTERN_NEXT_PAGE.matcher(next.attr("href"));
-            if (matcherPrev.find())
-                result.prevGid = NumberUtils.parseIntSafely(matcherPrev.group(1), 0);
-            if (matcherNext.find())
-                result.nextGid = NumberUtils.parseIntSafely(matcherNext.group(1), 0);
-            result.founds = Integer.MAX_VALUE;
+            Element ptt = d.getElementsByClass("ptt").first();
+            Elements es = ptt.child(0).child(0).children();
+            result.pages = Integer.parseInt(es.get(es.size() - 2).text().trim());
+
+            Element e = es.get(es.size() - 1);
+            if (e != null) {
+                e = e.children().first();
+                if (e != null) {
+                    String href = e.attr("href");
+                    Matcher matcher = PATTERN_NEXT_PAGE.matcher(href);
+                    if (matcher.find()) {
+                        result.nextPage = NumberUtils.parseIntSafely(matcher.group(1), 0);
+                    }
+                }
+            }
        } catch (Throwable e) {
            ExceptionUtils.throwIfFatal(e);
            result.noWatchedTags = body.contains("<p>You do not have any watched tags");
            if (body.contains("No hits found</p>")) {
-                result.founds = 0;
+                result.pages = 0;
                //noinspection unchecked
                result.galleryInfoList = Collections.EMPTY_LIST;
                return result;
            } else if (d.getElementsByClass("ptt").isEmpty()) {
-                result.founds = 1;
+                result.pages = 1;
            } else {
-                result.founds = Integer.MAX_VALUE;
+                result.pages = Integer.MAX_VALUE;
            }
        }

@@ -347,7 +350,7 @@ public class GalleryListParser {
            }
            if (list.isEmpty()) {
                if (es.size() < 2 || !NO_UNFILTERED_TEXT.equals(es.get(1).text())) {
-                    Log.d(TAG, "No gallery found");
+                    throw new ParseException("No gallery", body);
                }
            }
            result.galleryInfoList = list;
@@ -361,9 +364,8 @@ public class GalleryListParser {
    }

    public static class Result {
-        public int founds;
-        public int prevGid;
-        public int nextGid;
+        public int pages;
+        public int nextPage;
        public boolean noWatchedTags;
        public List<GalleryInfo> galleryInfoList;
    }
@@ -17,7 +17,6 @@
 package com.hippo.ehviewer.client.parser;

 import android.net.Uri;
-import android.os.Build;
 import android.text.TextUtils;

 import com.hippo.ehviewer.client.EhUrl;
@@ -28,7 +27,6 @@ import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLDecoder;
-import java.nio.charset.StandardCharsets;

 public final class GalleryListUrlParser {

@@ -93,15 +91,10 @@ public final class GalleryListUrlParser {
            uploader = path.substring(prefixLength, index);
        }

-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            uploader = URLDecoder.decode(uploader, StandardCharsets.UTF_8);
-        } else {
-            try {
-                uploader = URLDecoder.decode(uploader, StandardCharsets.UTF_8.displayName());
-            } catch (UnsupportedEncodingException e) {
-                e.printStackTrace();
-                return null;
-            }
+        try {
+            uploader = URLDecoder.decode(uploader, "utf-8");
+        } catch (UnsupportedEncodingException e) {
+            return null;
        }

        if (TextUtils.isEmpty(uploader)) {
@@ -127,15 +120,10 @@ public final class GalleryListUrlParser {
            tag = path.substring(prefixLength, index);
        }

-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            tag = URLDecoder.decode(tag, StandardCharsets.UTF_8);
-        } else {
-            try {
-                tag = URLDecoder.decode(tag, StandardCharsets.UTF_8.displayName());
-            } catch (UnsupportedEncodingException e) {
-                e.printStackTrace();
-                return null;
-            }
+        try {
+            tag = URLDecoder.decode(tag, "utf-8");
+        } catch (UnsupportedEncodingException e) {
+            return null;
        }

        if (TextUtils.isEmpty(tag)) {
@@ -19,18 +19,17 @@ package com.hippo.ehviewer.client.parser;
 import com.hippo.yorozuya.NumberUtils;
 import com.hippo.yorozuya.StringUtils;

-import java.time.Instant;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeFormatter;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Locale;

 public class ParserUtils {

-    public static final DateTimeFormatter formatter = DateTimeFormatter
-            .ofPattern("yyyy-MM-dd HH:mm", Locale.US).withZone(ZoneOffset.UTC);
+    public static final DateFormat sDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.US);

    public static synchronized String formatDate(long time) {
-        return formatter.format(Instant.ofEpochMilli(time));
+        return sDateFormat.format(new Date(time));
    }

    public static String trim(String str) {
@@ -49,4 +48,7 @@ public class ParserUtils {
        return NumberUtils.parseLongSafely(trim(str).replace(",", ""), defValue);
    }

+    public static float parseFloat(String str, float defValue) {
+        return NumberUtils.parseFloatSafely(trim(str).replace(",", ""), defValue);
+    }
 }
@@ -1,9 +0,0 @@
-package com.hippo.ehviewer.dao;
-
-import java.util.List;
-
-public interface BasicDao<T> {
-    List<T> list();
-
-    long insert(T t);
-}
@@ -1,160 +0,0 @@
-package com.hippo.ehviewer.dao;
-
-import android.os.Parcel;
-
-import androidx.room.ColumnInfo;
-import androidx.room.Entity;
-
-import com.hippo.ehviewer.client.data.GalleryInfo;
-
-@Entity(tableName = "BOOKMARKS")
-public class BookmarkInfo extends GalleryInfo {
-    public static final Creator<BookmarkInfo> CREATOR = new Creator<>() {
-        @Override
-        public BookmarkInfo createFromParcel(Parcel source) {
-            return new BookmarkInfo(source);
-        }
-
-        @Override
-        public BookmarkInfo[] newArray(int size) {
-            return new BookmarkInfo[size];
-        }
-    };
-    @ColumnInfo(name = "PAGE")
-    public int page;
-    @ColumnInfo(name = "TIME")
-    public long time;
-
-    protected BookmarkInfo(Parcel in) {
-        super(in);
-        this.page = in.readInt();
-        this.time = in.readLong();
-    }
-
-    public BookmarkInfo(GalleryInfo galleryInfo) {
-        this.gid = galleryInfo.gid;
-        this.token = galleryInfo.token;
-        this.title = galleryInfo.title;
-        this.titleJpn = galleryInfo.titleJpn;
-        this.thumb = galleryInfo.thumb;
-        this.category = galleryInfo.category;
-        this.posted = galleryInfo.posted;
-        this.uploader = galleryInfo.uploader;
-        this.rating = galleryInfo.rating;
-        this.simpleTags = galleryInfo.simpleTags;
-        this.simpleLanguage = galleryInfo.simpleLanguage;
-    }
-
-    public BookmarkInfo(int page, long time) {
-        this.page = page;
-        this.time = time;
-    }
-
-    public long getGid() {
-        return gid;
-    }
-
-    public void setGid(long gid) {
-        this.gid = gid;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getTitleJpn() {
-        return titleJpn;
-    }
-
-    public void setTitleJpn(String titleJpn) {
-        this.titleJpn = titleJpn;
-    }
-
-    public String getThumb() {
-        return thumb;
-    }
-
-    public void setThumb(String thumb) {
-        this.thumb = thumb;
-    }
-
-    public int getCategory() {
-        return category;
-    }
-
-    public void setCategory(int category) {
-        this.category = category;
-    }
-
-    public String getPosted() {
-        return posted;
-    }
-
-    public void setPosted(String posted) {
-        this.posted = posted;
-    }
-
-    public String getUploader() {
-        return uploader;
-    }
-
-    public void setUploader(String uploader) {
-        this.uploader = uploader;
-    }
-
-    public float getRating() {
-        return rating;
-    }
-
-    public void setRating(float rating) {
-        this.rating = rating;
-    }
-
-    public String getSimpleLanguage() {
-        return simpleLanguage;
-    }
-
-    public void setSimpleLanguage(String simpleLanguage) {
-        this.simpleLanguage = simpleLanguage;
-    }
-
-    public int getPage() {
-        return page;
-    }
-
-    public void setPage(int page) {
-        this.page = page;
-    }
-
-    public long getTime() {
-        return time;
-    }
-
-    public void setTime(long time) {
-        this.time = time;
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        super.writeToParcel(dest, flags);
-        dest.writeInt(this.page);
-        dest.writeLong(this.time);
-    }
-}
@@ -1,20 +0,0 @@
-package com.hippo.ehviewer.dao;
-
-import androidx.room.Dao;
-import androidx.room.Delete;
-import androidx.room.Insert;
-import androidx.room.Query;
-
-import java.util.List;
-
-@Dao
-public interface BookmarksDao extends BasicDao<BookmarkInfo> {
-    @Insert
-    long insert(BookmarkInfo bookmark);
-
-    @Delete
-    void delete(BookmarkInfo bookmark);
-
-    @Query("SELECT * FROM BOOKMARKS ORDER BY TIME DESC")
-    List<BookmarkInfo> list();
-}
@@ -1,30 +0,0 @@
-package com.hippo.ehviewer.dao;
-
-import androidx.room.ColumnInfo;
-import androidx.room.Entity;
-import androidx.room.PrimaryKey;
-
-@Entity(tableName = "DOWNLOAD_DIRNAME")
-public class DownloadDirname {
-    @PrimaryKey
-    @ColumnInfo(name = "GID")
-    private long gid;
-    @ColumnInfo(name = "DIRNAME")
-    private String dirname;
-
-    public long getGid() {
-        return gid;
-    }
-
-    public void setGid(long gid) {
-        this.gid = gid;
-    }
-
-    public String getDirname() {
-        return dirname;
-    }
-
-    public void setDirname(String dirname) {
-        this.dirname = dirname;
-    }
-}
@@ -1,29 +0,0 @@
-package com.hippo.ehviewer.dao;
-
-import androidx.room.Dao;
-import androidx.room.Insert;
-import androidx.room.Query;
-import androidx.room.Update;
-
-import java.util.List;
-
-@Dao
-public interface DownloadDirnameDao extends BasicDao<DownloadDirname> {
-    @Query("SELECT * FROM DOWNLOAD_DIRNAME WHERE GID = :gid")
-    DownloadDirname load(long gid);
-
-    @Update
-    void update(DownloadDirname downloadDirname);
-
-    @Insert
-    long insert(DownloadDirname downloadDirname);
-
-    @Query("DELETE FROM DOWNLOAD_DIRNAME WHERE GID = :gid")
-    void deleteByKey(long gid);
-
-    @Query("DELETE FROM DOWNLOAD_DIRNAME")
-    void deleteAll();
-
-    @Query("SELECT * FROM DOWNLOAD_DIRNAME")
-    List<DownloadDirname> list();
-}
@@ -1,252 +0,0 @@
-package com.hippo.ehviewer.dao;
-
-import android.os.Parcel;
-
-import androidx.room.ColumnInfo;
-import androidx.room.Entity;
-import androidx.room.Ignore;
-
-import com.hippo.ehviewer.client.data.GalleryInfo;
-
-@Entity(tableName = "DOWNLOADS")
-public class DownloadInfo extends GalleryInfo {
-    public static final Creator<DownloadInfo> CREATOR = new Creator<>() {
-        @Override
-        public DownloadInfo createFromParcel(Parcel source) {
-            return new DownloadInfo(source);
-        }
-
-        @Override
-        public DownloadInfo[] newArray(int size) {
-            return new DownloadInfo[size];
-        }
-    };
-    public static final int STATE_INVALID = -1;
-    public static final int STATE_NONE = 0;
-    public static final int STATE_WAIT = 1;
-    public static final int STATE_DOWNLOAD = 2;
-    public static final int STATE_FINISH = 3;
-    public static final int STATE_FAILED = 4;
-    @ColumnInfo(name = "STATE")
-    public int state;
-    @ColumnInfo(name = "LEGACY")
-    public int legacy;
-    @ColumnInfo(name = "TIME")
-    public long time;
-    @ColumnInfo(name = "LABEL")
-    public String label;
-    @Ignore
-    public long speed;
-    @Ignore
-    public long remaining;
-    @Ignore
-    public int finished;
-    @Ignore
-    public int downloaded;
-    @Ignore
-    public int total;
-
-    DownloadInfo() {
-    }
-
-    protected DownloadInfo(Parcel in) {
-        super(in);
-        this.state = in.readInt();
-        this.legacy = in.readInt();
-        this.time = in.readLong();
-        this.label = in.readString();
-    }
-
-    public DownloadInfo(GalleryInfo galleryInfo) {
-        this.gid = galleryInfo.gid;
-        this.token = galleryInfo.token;
-        this.title = galleryInfo.title;
-        this.titleJpn = galleryInfo.titleJpn;
-        this.thumb = galleryInfo.thumb;
-        this.category = galleryInfo.category;
-        this.posted = galleryInfo.posted;
-        this.uploader = galleryInfo.uploader;
-        this.rating = galleryInfo.rating;
-        this.simpleTags = galleryInfo.simpleTags;
-        this.simpleLanguage = galleryInfo.simpleLanguage;
-    }
-
-    public DownloadInfo(int state, int legacy, long time, String label, long speed, long remaining,
-                        int finished, int downloaded, int total) {
-        this.state = state;
-        this.legacy = legacy;
-        this.time = time;
-        this.label = label;
-        this.speed = speed;
-        this.remaining = remaining;
-        this.finished = finished;
-        this.downloaded = downloaded;
-        this.total = total;
-    }
-
-    public long getGid() {
-        return gid;
-    }
-
-    public void setGid(long gid) {
-        this.gid = gid;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getTitleJpn() {
-        return titleJpn;
-    }
-
-    public void setTitleJpn(String titleJpn) {
-        this.titleJpn = titleJpn;
-    }
-
-    public String getThumb() {
-        return thumb;
-    }
-
-    public void setThumb(String thumb) {
-        this.thumb = thumb;
-    }
-
-    public int getCategory() {
-        return category;
-    }
-
-    public void setCategory(int category) {
-        this.category = category;
-    }
-
-    public String getPosted() {
-        return posted;
-    }
-
-    public void setPosted(String posted) {
-        this.posted = posted;
-    }
-
-    public String getUploader() {
-        return uploader;
-    }
-
-    public void setUploader(String uploader) {
-        this.uploader = uploader;
-    }
-
-    public float getRating() {
-        return rating;
-    }
-
-    public void setRating(float rating) {
-        this.rating = rating;
-    }
-
-    public String getSimpleLanguage() {
-        return simpleLanguage;
-    }
-
-    public void setSimpleLanguage(String simpleLanguage) {
-        this.simpleLanguage = simpleLanguage;
-    }
-
-    public int getState() {
-        return state;
-    }
-
-    public void setState(int state) {
-        this.state = state;
-    }
-
-    public int getLegacy() {
-        return legacy;
-    }
-
-    public void setLegacy(int legacy) {
-        this.legacy = legacy;
-    }
-
-    public long getTime() {
-        return time;
-    }
-
-    public void setTime(long time) {
-        this.time = time;
-    }
-
-    public String getLabel() {
-        return label;
-    }
-
-    public void setLabel(String label) {
-        this.label = label;
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        super.writeToParcel(dest, flags);
-        dest.writeInt(this.state);
-        dest.writeInt(this.legacy);
-        dest.writeLong(this.time);
-        dest.writeString(this.label);
-    }
-
-    public long getSpeed() {
-        return this.speed;
-    }
-
-    public void setSpeed(long speed) {
-        this.speed = speed;
-    }
-
-    public long getRemaining() {
-        return this.remaining;
-    }
-
-    public void setRemaining(long remaining) {
-        this.remaining = remaining;
-    }
-
-    public int getFinished() {
-        return this.finished;
-    }
-
-    public void setFinished(int finished) {
-        this.finished = finished;
-    }
-
-    public int getDownloaded() {
-        return this.downloaded;
-    }
-
-    public void setDownloaded(int downloaded) {
-        this.downloaded = downloaded;
-    }
-
-    public int getTotal() {
-        return this.total;
-    }
-
-    public void setTotal(int total) {
-        this.total = total;
-    }
-}
@@ -1,40 +0,0 @@
-package com.hippo.ehviewer.dao;
-
-import androidx.room.ColumnInfo;
-import androidx.room.Entity;
-import androidx.room.PrimaryKey;
-
-@Entity(tableName = "DOWNLOAD_LABELS")
-public class DownloadLabel {
-    @PrimaryKey
-    @ColumnInfo(name = "_id")
-    private Long id;
-    @ColumnInfo(name = "LABEL")
-    private String label;
-    @ColumnInfo(name = "TIME")
-    private long time;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getLabel() {
-        return label;
-    }
-
-    public void setLabel(String label) {
-        this.label = label;
-    }
-
-    public long getTime() {
-        return time;
-    }
-
-    public void setTime(long time) {
-        this.time = time;
-    }
-}
@@ -1,30 +0,0 @@
-package com.hippo.ehviewer.dao;
-
-import androidx.room.Dao;
-import androidx.room.Delete;
-import androidx.room.Insert;
-import androidx.room.Query;
-import androidx.room.Update;
-
-import java.util.List;
-
-@Dao
-public interface DownloadLabelDao extends BasicDao<DownloadLabel> {
-    @Query("SELECT * FROM DOWNLOAD_LABELS ORDER BY TIME ASC")
-    List<DownloadLabel> list();
-
-    @Query("SELECT * FROM DOWNLOAD_LABELS ORDER BY TIME ASC LIMIT :limit OFFSET :offset")
-    List<DownloadLabel> list(int offset, int limit);
-
-    @Update
-    void update(List<DownloadLabel> downloadLabels);
-
-    @Update
-    void update(DownloadLabel downloadLabel);
-
-    @Insert
-    long insert(DownloadLabel downloadLabel);
-
-    @Delete
-    void delete(DownloadLabel downloadLabel);
-}
@@ -1,27 +0,0 @@
-package com.hippo.ehviewer.dao;
-
-import androidx.room.Dao;
-import androidx.room.Delete;
-import androidx.room.Insert;
-import androidx.room.Query;
-import androidx.room.Update;
-
-import java.util.List;
-
-@Dao
-public interface DownloadsDao extends BasicDao<DownloadInfo> {
-    @Query("SELECT * FROM DOWNLOADS ORDER BY TIME DESC")
-    List<DownloadInfo> list();
-
-    @Query("SELECT * FROM DOWNLOADS WHERE GID = :gid")
-    DownloadInfo load(long gid);
-
-    @Update
-    void update(DownloadInfo downloadInfo);
-
-    @Insert
-    long insert(DownloadInfo downloadInfo);
-
-    @Delete
-    void delete(DownloadInfo downloadInfo);
-}
@@ -1,23 +0,0 @@
-package com.hippo.ehviewer.dao;
-
-import androidx.room.Database;
-import androidx.room.RoomDatabase;
-
-@Database(entities = {BookmarkInfo.class, DownloadInfo.class, DownloadLabel.class, DownloadDirname.class, Filter.class, HistoryInfo.class, LocalFavoriteInfo.class, QuickSearch.class}, version = 4, exportSchema = false)
-public abstract class EhDatabase extends RoomDatabase {
-    public abstract BookmarksDao bookmarksBao();
-
-    public abstract DownloadDirnameDao downloadDirnameDao();
-
-    public abstract DownloadLabelDao downloadLabelDao();
-
-    public abstract DownloadsDao downloadsDao();
-
-    public abstract FilterDao filterDao();
-
-    public abstract HistoryDao historyDao();
-
-    public abstract LocalFavoritesDao localFavoritesDao();
-
-    public abstract QuickSearchDao quickSearchDao();
-}
@@ -1,66 +0,0 @@
-package com.hippo.ehviewer.dao;
-
-import androidx.room.ColumnInfo;
-import androidx.room.Entity;
-import androidx.room.PrimaryKey;
-
-import com.hippo.util.HashCodeUtils;
-import com.hippo.yorozuya.ObjectUtils;
-
-@Entity(tableName = "FILTER")
-public class Filter {
-    @ColumnInfo(name = "MODE")
-    public int mode;
-    @ColumnInfo(name = "TEXT")
-    public String text;
-    @ColumnInfo(name = "ENABLE")
-    public Boolean enable;
-    @PrimaryKey
-    @ColumnInfo(name = "_id")
-    private Long id;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public int getMode() {
-        return mode;
-    }
-
-    public void setMode(int mode) {
-        this.mode = mode;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    public Boolean getEnable() {
-        return enable;
-    }
-
-    public void setEnable(Boolean enable) {
-        this.enable = enable;
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeUtils.hashCode(mode, text);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (!(o instanceof Filter filter)) {
-            return false;
-        }
-        return filter.mode == mode && ObjectUtils.equal(filter.text, text);
-    }
-}
@@ -1,27 +0,0 @@
-package com.hippo.ehviewer.dao;
-
-import androidx.room.Dao;
-import androidx.room.Delete;
-import androidx.room.Insert;
-import androidx.room.Query;
-import androidx.room.Update;
-
-import java.util.List;
-
-@Dao
-public interface FilterDao extends BasicDao<Filter> {
-    @Query("SELECT * FROM FILTER")
-    List<Filter> list();
-
-    @Update
-    void update(Filter filter);
-
-    @Insert
-    long insert(Filter filter);
-
-    @Delete
-    void delete(Filter filter);
-
-    @Query("SELECT * FROM FILTER WHERE TEXT = :text AND MODE = :mode")
-    Filter load(String text, int mode);
-}
@@ -1,40 +0,0 @@
-package com.hippo.ehviewer.dao;
-
-import androidx.paging.PagingSource;
-import androidx.room.Dao;
-import androidx.room.Delete;
-import androidx.room.Insert;
-import androidx.room.Query;
-import androidx.room.Update;
-
-import java.util.List;
-
-@Dao
-public interface HistoryDao extends BasicDao<HistoryInfo> {
-    @Query("SELECT * FROM HISTORY WHERE GID = :gid")
-    HistoryInfo load(long gid);
-
-    @Query("SELECT * FROM HISTORY ORDER BY TIME DESC")
-    List<HistoryInfo> list();
-
-    @Query("SELECT * FROM HISTORY ORDER BY TIME DESC LIMIT :limit OFFSET :offset")
-    List<HistoryInfo> list(int offset, int limit);
-
-    @Query("SELECT * FROM HISTORY ORDER BY TIME DESC")
-    PagingSource<Integer, HistoryInfo> listLazy();
-
-    @Update
-    void update(HistoryInfo historyInfo);
-
-    @Insert
-    long insert(HistoryInfo historyInfo);
-
-    @Delete
-    void delete(HistoryInfo historyInfos);
-
-    @Delete
-    void delete(List<HistoryInfo> historyInfos);
-
-    @Query("DELETE FROM HISTORY")
-    void deleteAll();
-}
@@ -1,160 +0,0 @@
-package com.hippo.ehviewer.dao;
-
-import android.os.Parcel;
-
-import androidx.room.ColumnInfo;
-import androidx.room.Entity;
-
-import com.hippo.ehviewer.client.data.GalleryInfo;
-
-@Entity(tableName = "HISTORY")
-public class HistoryInfo extends GalleryInfo {
-    public static final Creator<HistoryInfo> CREATOR = new Creator<>() {
-        @Override
-        public HistoryInfo createFromParcel(Parcel source) {
-            return new HistoryInfo(source);
-        }
-
-        @Override
-        public HistoryInfo[] newArray(int size) {
-            return new HistoryInfo[size];
-        }
-    };
-    @ColumnInfo(name = "MODE")
-    public int mode;
-    @ColumnInfo(name = "TIME")
-    public long time;
-
-    protected HistoryInfo(Parcel in) {
-        super(in);
-        this.mode = in.readInt();
-        this.time = in.readLong();
-    }
-
-    public HistoryInfo(GalleryInfo galleryInfo) {
-        this.gid = galleryInfo.gid;
-        this.token = galleryInfo.token;
-        this.title = galleryInfo.title;
-        this.titleJpn = galleryInfo.titleJpn;
-        this.thumb = galleryInfo.thumb;
-        this.category = galleryInfo.category;
-        this.posted = galleryInfo.posted;
-        this.uploader = galleryInfo.uploader;
-        this.rating = galleryInfo.rating;
-        this.simpleTags = galleryInfo.simpleTags;
-        this.simpleLanguage = galleryInfo.simpleLanguage;
-    }
-
-    public HistoryInfo(int mode, long time) {
-        this.mode = mode;
-        this.time = time;
-    }
-
-    public long getGid() {
-        return gid;
-    }
-
-    public void setGid(long gid) {
-        this.gid = gid;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getTitleJpn() {
-        return titleJpn;
-    }
-
-    public void setTitleJpn(String titleJpn) {
-        this.titleJpn = titleJpn;
-    }
-
-    public String getThumb() {
-        return thumb;
-    }
-
-    public void setThumb(String thumb) {
-        this.thumb = thumb;
-    }
-
-    public int getCategory() {
-        return category;
-    }
-
-    public void setCategory(int category) {
-        this.category = category;
-    }
-
-    public String getPosted() {
-        return posted;
-    }
-
-    public void setPosted(String posted) {
-        this.posted = posted;
-    }
-
-    public String getUploader() {
-        return uploader;
-    }
-
-    public void setUploader(String uploader) {
-        this.uploader = uploader;
-    }
-
-    public float getRating() {
-        return rating;
-    }
-
-    public void setRating(float rating) {
-        this.rating = rating;
-    }
-
-    public String getSimpleLanguage() {
-        return simpleLanguage;
-    }
-
-    public void setSimpleLanguage(String simpleLanguage) {
-        this.simpleLanguage = simpleLanguage;
-    }
-
-    public int getMode() {
-        return mode;
-    }
-
-    public void setMode(int mode) {
-        this.mode = mode;
-    }
-
-    public long getTime() {
-        return time;
-    }
-
-    public void setTime(long time) {
-        this.time = time;
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        super.writeToParcel(dest, flags);
-        dest.writeInt(this.mode);
-        dest.writeLong(this.time);
-    }
-}
@@ -1,147 +0,0 @@
-package com.hippo.ehviewer.dao;
-
-import android.os.Parcel;
-
-import androidx.room.ColumnInfo;
-import androidx.room.Entity;
-
-import com.hippo.ehviewer.client.data.GalleryInfo;
-
-@Entity(tableName = "LOCAL_FAVORITES")
-public class LocalFavoriteInfo extends GalleryInfo {
-
-    public static final Creator<LocalFavoriteInfo> CREATOR = new Creator<>() {
-        @Override
-        public LocalFavoriteInfo createFromParcel(Parcel source) {
-            return new LocalFavoriteInfo(source);
-        }
-
-        @Override
-        public LocalFavoriteInfo[] newArray(int size) {
-            return new LocalFavoriteInfo[size];
-        }
-    };
-    @ColumnInfo(name = "TIME")
-    public long time;
-
-    protected LocalFavoriteInfo(Parcel in) {
-        super(in);
-        this.time = in.readLong();
-    }
-
-    public LocalFavoriteInfo(GalleryInfo galleryInfo) {
-        this.gid = galleryInfo.gid;
-        this.token = galleryInfo.token;
-        this.title = galleryInfo.title;
-        this.titleJpn = galleryInfo.titleJpn;
-        this.thumb = galleryInfo.thumb;
-        this.category = galleryInfo.category;
-        this.posted = galleryInfo.posted;
-        this.uploader = galleryInfo.uploader;
-        this.rating = galleryInfo.rating;
-        this.simpleTags = galleryInfo.simpleTags;
-        this.simpleLanguage = galleryInfo.simpleLanguage;
-    }
-
-    public LocalFavoriteInfo() {
-    }
-
-    public long getGid() {
-        return gid;
-    }
-
-    public void setGid(long gid) {
-        this.gid = gid;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getTitleJpn() {
-        return titleJpn;
-    }
-
-    public void setTitleJpn(String titleJpn) {
-        this.titleJpn = titleJpn;
-    }
-
-    public String getThumb() {
-        return thumb;
-    }
-
-    public void setThumb(String thumb) {
-        this.thumb = thumb;
-    }
-
-    public int getCategory() {
-        return category;
-    }
-
-    public void setCategory(int category) {
-        this.category = category;
-    }
-
-    public String getPosted() {
-        return posted;
-    }
-
-    public void setPosted(String posted) {
-        this.posted = posted;
-    }
-
-    public String getUploader() {
-        return uploader;
-    }
-
-    public void setUploader(String uploader) {
-        this.uploader = uploader;
-    }
-
-    public float getRating() {
-        return rating;
-    }
-
-    public void setRating(float rating) {
-        this.rating = rating;
-    }
-
-    public String getSimpleLanguage() {
-        return simpleLanguage;
-    }
-
-    public void setSimpleLanguage(String simpleLanguage) {
-        this.simpleLanguage = simpleLanguage;
-    }
-
-    public long getTime() {
-        return time;
-    }
-
-    public void setTime(long time) {
-        this.time = time;
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        super.writeToParcel(dest, flags);
-        dest.writeLong(this.time);
-    }
-}
@@ -1,29 +0,0 @@
-package com.hippo.ehviewer.dao;
-
-import androidx.room.Dao;
-import androidx.room.Delete;
-import androidx.room.Insert;
-import androidx.room.Query;
-
-import java.util.List;
-
-@Dao
-public interface LocalFavoritesDao extends BasicDao<LocalFavoriteInfo> {
-    @Query("SELECT * FROM LOCAL_FAVORITES ORDER BY TIME DESC")
-    List<LocalFavoriteInfo> list();
-
-    @Query("SELECT * FROM LOCAL_FAVORITES WHERE TITLE LIKE :title ORDER BY TIME DESC")
-    List<LocalFavoriteInfo> list(String title);
-
-    @Query("SELECT * FROM LOCAL_FAVORITES WHERE GID = :gid")
-    LocalFavoriteInfo load(long gid);
-
-    @Insert
-    long insert(LocalFavoriteInfo localFavoriteInfo);
-
-    @Delete
-    void delete(LocalFavoriteInfo localFavoriteInfo);
-
-    @Query("DELETE FROM LOCAL_FAVORITES WHERE GID = :gid")
-    void deleteByKey(long gid);
-}
@@ -1,117 +0,0 @@
-package com.hippo.ehviewer.dao;
-
-import androidx.annotation.NonNull;
-import androidx.room.ColumnInfo;
-import androidx.room.Entity;
-import androidx.room.PrimaryKey;
-
-@Entity(tableName = "QUICK_SEARCH")
-public class QuickSearch {
-    @PrimaryKey
-    @ColumnInfo(name = "_id")
-    public Long id;
-    @ColumnInfo(name = "NAME")
-    public String name;
-    @ColumnInfo(name = "MODE")
-    public int mode;
-    @ColumnInfo(name = "CATEGORY")
-    public int category;
-    @ColumnInfo(name = "KEYWORD")
-    public String keyword;
-    @ColumnInfo(name = "ADVANCE_SEARCH")
-    public int advanceSearch;
-    @ColumnInfo(name = "MIN_RATING")
-    public int minRating;
-    @ColumnInfo(name = "PAGE_FROM")
-    public int pageFrom;
-    @ColumnInfo(name = "PAGE_TO")
-    public int pageTo;
-    @ColumnInfo(name = "TIME")
-    public long time;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public int getMode() {
-        return mode;
-    }
-
-    public void setMode(int mode) {
-        this.mode = mode;
-    }
-
-    public int getCategory() {
-        return category;
-    }
-
-    public void setCategory(int category) {
-        this.category = category;
-    }
-
-    public String getKeyword() {
-        return keyword;
-    }
-
-    public void setKeyword(String keyword) {
-        this.keyword = keyword;
-    }
-
-    public int getAdvanceSearch() {
-        return advanceSearch;
-    }
-
-    public void setAdvanceSearch(int advanceSearch) {
-        this.advanceSearch = advanceSearch;
-    }
-
-    public int getMinRating() {
-        return minRating;
-    }
-
-    public void setMinRating(int minRating) {
-        this.minRating = minRating;
-    }
-
-    public int getPageFrom() {
-        return pageFrom;
-    }
-
-    public void setPageFrom(int pageFrom) {
-        this.pageFrom = pageFrom;
-    }
-
-    public int getPageTo() {
-        return pageTo;
-    }
-
-    public void setPageTo(int pageTo) {
-        this.pageTo = pageTo;
-    }
-
-    public long getTime() {
-        return time;
-    }
-
-    public void setTime(long time) {
-        this.time = time;
-    }
-
-    @NonNull
-    @Override
-    public String toString() {
-        return name;
-    }
-}
@@ -1,30 +0,0 @@
-package com.hippo.ehviewer.dao;
-
-import androidx.room.Dao;
-import androidx.room.Delete;
-import androidx.room.Insert;
-import androidx.room.Query;
-import androidx.room.Update;
-
-import java.util.List;
-
-@Dao
-public interface QuickSearchDao extends BasicDao<QuickSearch> {
-    @Query("SELECT * FROM QUICK_SEARCH ORDER BY TIME ASC")
-    List<QuickSearch> list();
-
-    @Query("SELECT * FROM QUICK_SEARCH ORDER BY TIME ASC LIMIT :limit OFFSET :offset")
-    List<QuickSearch> list(int offset, int limit);
-
-    @Update
-    void update(List<QuickSearch> downloadLabels);
-
-    @Update
-    void update(QuickSearch quickSearch);
-
-    @Insert
-    long insert(QuickSearch quickSearch);
-
-    @Delete
-    void delete(QuickSearch quickSearch);
-}
@@ -516,7 +516,7 @@ public class DownloadManager implements SpiderQueen.OnSpiderListener {
        DownloadInfo info = mAllInfoMap.get(gid);
        if (info != null) {
            // Remove from DB
-            EhDB.removeDownloadInfo(info);
+            EhDB.removeDownloadInfo(info.gid);

            // Remove all list and map
            mAllInfoList.remove(info);
@@ -552,7 +552,7 @@ public class DownloadManager implements SpiderQueen.OnSpiderListener {
            }

            // Remove from DB
-            EhDB.removeDownloadInfo(info);
+            EhDB.removeDownloadInfo(info.gid);

            // Remove from all info map
            mAllInfoList.remove(info);
@@ -0,0 +1,581 @@
+/*
+ * 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.download;
+
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.os.SystemClock;
+import android.util.Log;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationChannelCompat;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
+
+import com.hippo.ehviewer.EhApplication;
+import com.hippo.ehviewer.R;
+import com.hippo.ehviewer.client.EhUtils;
+import com.hippo.ehviewer.client.data.GalleryInfo;
+import com.hippo.ehviewer.dao.DownloadInfo;
+import com.hippo.ehviewer.ui.MainActivity;
+import com.hippo.ehviewer.ui.scene.DownloadsScene;
+import com.hippo.scene.StageActivity;
+import com.hippo.util.ReadableTime;
+import com.hippo.yorozuya.FileUtils;
+import com.hippo.yorozuya.SimpleHandler;
+import com.hippo.yorozuya.collect.LongList;
+import com.hippo.yorozuya.collect.SparseJBArray;
+import com.hippo.yorozuya.collect.SparseJLArray;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+public class DownloadService extends Service implements DownloadManager.DownloadListener {
+
+    public static final String ACTION_START = "start";
+    public static final String ACTION_START_RANGE = "start_range";
+    public static final String ACTION_START_ALL = "start_all";
+    public static final String ACTION_STOP = "stop";
+    public static final String ACTION_STOP_RANGE = "stop_range";
+    public static final String ACTION_STOP_CURRENT = "stop_current";
+    public static final String ACTION_STOP_ALL = "stop_all";
+    public static final String ACTION_DELETE = "delete";
+    public static final String ACTION_DELETE_RANGE = "delete_range";
+
+    public static final String ACTION_CLEAR = "clear";
+
+    public static final String KEY_GALLERY_INFO = "gallery_info";
+    public static final String KEY_LABEL = "label";
+    public static final String KEY_GID = "gid";
+    public static final String KEY_GID_LIST = "gid_list";
+
+    private static final int ID_DOWNLOADING = 1;
+    private static final int ID_DOWNLOADED = 2;
+    private static final int ID_509 = 3;
+    private final static SparseJBArray sItemStateArray = new SparseJBArray();
+    private final static SparseJLArray<String> sItemTitleArray = new SparseJLArray<>();
+    private static int sFailedCount;
+    private static int sFinishedCount;
+    private static int sDownloadedCount;
+    @Nullable
+    private NotificationManagerCompat mNotifyManager;
+    @Nullable
+    private DownloadManager mDownloadManager;
+    private NotificationCompat.Builder mDownloadingBuilder;
+    private NotificationCompat.Builder mDownloadedBuilder;
+    private NotificationCompat.Builder m509dBuilder;
+    private NotificationDelay mDownloadingDelay;
+    private NotificationDelay mDownloadedDelay;
+    private NotificationDelay m509Delay;
+    private String CHANNEL_ID;
+
+    public static void clear() {
+        sFailedCount = 0;
+        sFinishedCount = 0;
+        sDownloadedCount = 0;
+        sItemStateArray.clear();
+        sItemTitleArray.clear();
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        CHANNEL_ID = getPackageName() + ".download";
+        mNotifyManager = NotificationManagerCompat.from(this);
+        mNotifyManager.createNotificationChannel(
+                new NotificationChannelCompat.Builder(CHANNEL_ID, NotificationManagerCompat.IMPORTANCE_LOW)
+                        .setName(getString(R.string.download_service))
+                        .build());
+        mDownloadManager = EhApplication.getDownloadManager(getApplicationContext());
+        mDownloadManager.setDownloadListener(this);
+
+        ensureDownloadingBuilder();
+
+        mDownloadingBuilder.setContentTitle(getString(R.string.download_service))
+                .setContentText(null)
+                .setSubText(null)
+                .setProgress(0, 0, true);
+
+        startForeground(ID_DOWNLOADING, mDownloadingBuilder.build());
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        mNotifyManager = null;
+        if (mDownloadManager != null) {
+            mDownloadManager.setDownloadListener(null);
+            mDownloadManager = null;
+        }
+        mDownloadingBuilder = null;
+        mDownloadedBuilder = null;
+        m509dBuilder = null;
+        if (mDownloadingDelay != null) {
+            mDownloadingDelay.release();
+        }
+        if (mDownloadedDelay != null) {
+            mDownloadedDelay.release();
+        }
+        if (m509Delay != null) {
+            m509Delay.release();
+        }
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        handleIntent(intent);
+        return START_STICKY;
+    }
+
+    private void handleIntent(Intent intent) {
+        String action = null;
+        if (intent != null) {
+            action = intent.getAction();
+        }
+
+        if (ACTION_START.equals(action)) {
+            GalleryInfo gi = intent.getParcelableExtra(KEY_GALLERY_INFO);
+            String label = intent.getStringExtra(KEY_LABEL);
+            if (gi != null && mDownloadManager != null) {
+                mDownloadManager.startDownload(gi, label);
+            }
+        } else if (ACTION_START_RANGE.equals(action)) {
+            LongList gidList = intent.getParcelableExtra(KEY_GID_LIST);
+            if (gidList != null && mDownloadManager != null) {
+                mDownloadManager.startRangeDownload(gidList);
+            }
+        } else if (ACTION_START_ALL.equals(action)) {
+            if (mDownloadManager != null) {
+                mDownloadManager.startAllDownload();
+            }
+        } else if (ACTION_STOP.equals(action)) {
+            long gid = intent.getLongExtra(KEY_GID, -1);
+            if (gid != -1 && mDownloadManager != null) {
+                mDownloadManager.stopDownload(gid);
+            }
+        } else if (ACTION_STOP_CURRENT.equals(action)) {
+            if (mDownloadManager != null) {
+                mDownloadManager.stopCurrentDownload();
+            }
+        } else if (ACTION_STOP_RANGE.equals(action)) {
+            LongList gidList = intent.getParcelableExtra(KEY_GID_LIST);
+            if (gidList != null && mDownloadManager != null) {
+                mDownloadManager.stopRangeDownload(gidList);
+            }
+        } else if (ACTION_STOP_ALL.equals(action)) {
+            if (mDownloadManager != null) {
+                mDownloadManager.stopAllDownload();
+            }
+        } else if (ACTION_DELETE.equals(action)) {
+            long gid = intent.getLongExtra(KEY_GID, -1);
+            if (gid != -1 && mDownloadManager != null) {
+                mDownloadManager.deleteDownload(gid);
+            }
+        } else if (ACTION_DELETE_RANGE.equals(action)) {
+            LongList gidList = intent.getParcelableExtra(KEY_GID_LIST);
+            if (gidList != null && mDownloadManager != null) {
+                mDownloadManager.deleteRangeDownload(gidList);
+            }
+        } else if (ACTION_CLEAR.equals(action)) {
+            clear();
+        }
+
+        checkStopSelf();
+    }
+
+    @Nullable
+    @Override
+    public IBinder onBind(Intent intent) {
+        throw new IllegalStateException("No bindService");
+    }
+
+    private void ensureDownloadingBuilder() {
+        if (mDownloadingBuilder != null) {
+            return;
+        }
+
+        Intent stopAllIntent = new Intent(this, DownloadService.class);
+        stopAllIntent.setAction(ACTION_STOP_ALL);
+        PendingIntent piStopAll = PendingIntent.getService(this, 0, stopAllIntent, PendingIntent.FLAG_IMMUTABLE);
+
+        mDownloadingBuilder = new NotificationCompat.Builder(getApplicationContext(), CHANNEL_ID)
+                .setSmallIcon(android.R.drawable.stat_sys_download)
+                .setOngoing(true)
+                .setAutoCancel(false)
+                .setCategory(NotificationCompat.CATEGORY_PROGRESS)
+                .addAction(R.drawable.v_pause_x24, getString(R.string.stat_download_action_stop_all), piStopAll)
+                .setShowWhen(false)
+                .setChannelId(CHANNEL_ID);
+
+        mDownloadingDelay = new NotificationDelay(this, mNotifyManager, mDownloadingBuilder, ID_DOWNLOADING);
+    }
+
+    private void ensureDownloadedBuilder() {
+        if (mDownloadedBuilder != null) {
+            return;
+        }
+
+        Intent clearIntent = new Intent(this, DownloadService.class);
+        clearIntent.setAction(ACTION_CLEAR);
+        PendingIntent piClear = PendingIntent.getService(this, 0, clearIntent, PendingIntent.FLAG_IMMUTABLE);
+
+        Bundle bundle = new Bundle();
+        bundle.putString(DownloadsScene.KEY_ACTION, DownloadsScene.ACTION_CLEAR_DOWNLOAD_SERVICE);
+        Intent activityIntent = new Intent(this, MainActivity.class);
+        activityIntent.setAction(StageActivity.ACTION_START_SCENE);
+        activityIntent.putExtra(StageActivity.KEY_SCENE_NAME, DownloadsScene.class.getName());
+        activityIntent.putExtra(StageActivity.KEY_SCENE_ARGS, bundle);
+        PendingIntent piActivity = PendingIntent.getActivity(DownloadService.this, 0,
+                activityIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+
+        mDownloadedBuilder = new NotificationCompat.Builder(getApplicationContext(), CHANNEL_ID)
+                .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 = new NotificationDelay(this, mNotifyManager, mDownloadedBuilder, ID_DOWNLOADED);
+    }
+
+    private void ensure509Builder() {
+        if (m509dBuilder != null) {
+            return;
+        }
+
+        m509dBuilder = new NotificationCompat.Builder(getApplicationContext(), CHANNEL_ID)
+                .setSmallIcon(R.drawable.ic_baseline_warning_24)
+                .setContentText(getString(R.string.stat_509_alert_title))
+                .setContentText(getString(R.string.stat_509_alert_text))
+                .setStyle(new NotificationCompat.BigTextStyle().bigText(getString(R.string.stat_509_alert_text)))
+                .setAutoCancel(true)
+                .setOngoing(false)
+                .setCategory(NotificationCompat.CATEGORY_ERROR);
+
+        m509Delay = new NotificationDelay(this, mNotifyManager, m509dBuilder, ID_509);
+    }
+
+    @Override
+    public void onGet509() {
+        if (mDownloadManager != null) {
+            mDownloadManager.stopAllDownload();
+        }
+        if (mNotifyManager == null) {
+            return;
+        }
+
+        ensure509Builder();
+        m509dBuilder.setWhen(System.currentTimeMillis());
+        m509Delay.show();
+    }
+
+    @Override
+    public void onStart(DownloadInfo info) {
+        if (mNotifyManager == null) {
+            return;
+        }
+
+        ensureDownloadingBuilder();
+
+        Bundle bundle = new Bundle();
+        bundle.putLong(DownloadsScene.KEY_GID, info.gid);
+        Intent activityIntent = new Intent(this, MainActivity.class);
+        activityIntent.setAction(StageActivity.ACTION_START_SCENE);
+        activityIntent.putExtra(StageActivity.KEY_SCENE_NAME, DownloadsScene.class.getName());
+        activityIntent.putExtra(StageActivity.KEY_SCENE_ARGS, bundle);
+        PendingIntent piActivity = PendingIntent.getActivity(DownloadService.this, 0,
+                activityIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+
+        mDownloadingBuilder.setContentTitle(EhUtils.getSuitableTitle(info))
+                .setContentText(null)
+                .setSubText(null)
+                .setProgress(0, 0, true)
+                .setContentIntent(piActivity);
+
+        mDownloadingDelay.startForeground();
+    }
+
+    private void onUpdate(DownloadInfo info) {
+        if (mNotifyManager == null) {
+            return;
+        }
+        ensureDownloadingBuilder();
+
+        long speed = info.speed;
+        if (speed < 0) {
+            speed = 0;
+        }
+        String text = FileUtils.humanReadableByteCount(speed, false) + "/s";
+        long remaining = info.remaining;
+        if (remaining >= 0) {
+            text = getString(R.string.download_speed_text_2, text, ReadableTime.getShortTimeInterval(remaining));
+        } else {
+            text = getString(R.string.download_speed_text, text);
+        }
+        mDownloadingBuilder.setContentTitle(EhUtils.getSuitableTitle(info))
+                .setContentText(text)
+                .setStyle(new NotificationCompat.BigTextStyle().bigText(text))
+                .setSubText(info.total == -1 || info.finished == -1 ? null : info.finished + "/" + info.total)
+                .setProgress(info.total, info.finished, false);
+
+        mDownloadingDelay.startForeground();
+    }
+
+    @Override
+    public void onDownload(DownloadInfo info) {
+        onUpdate(info);
+    }
+
+    @Override
+    public void onGetPage(DownloadInfo info) {
+        onUpdate(info);
+    }
+
+    @Override
+    public void onFinish(DownloadInfo info) {
+        if (mNotifyManager == null) {
+            return;
+        }
+
+        if (null != mDownloadingDelay) {
+            mDownloadingDelay.cancel();
+        }
+
+        ensureDownloadedBuilder();
+
+        boolean finish = info.state == DownloadInfo.STATE_FINISH;
+        long gid = info.gid;
+        int index = sItemStateArray.indexOfKey(gid);
+        if (index < 0) { // Not contain
+            sItemStateArray.put(gid, finish);
+            sItemTitleArray.put(gid, EhUtils.getSuitableTitle(info));
+            sDownloadedCount++;
+            if (finish) {
+                sFinishedCount++;
+            } else {
+                sFailedCount++;
+            }
+        } else { // Contain
+            boolean oldFinish = sItemStateArray.valueAt(index);
+            sItemStateArray.put(gid, finish);
+            sItemTitleArray.put(gid, EhUtils.getSuitableTitle(info));
+            if (oldFinish && !finish) {
+                sFinishedCount--;
+                sFailedCount++;
+            } else if (!oldFinish && finish) {
+                sFinishedCount++;
+                sFailedCount--;
+            }
+        }
+
+        String text;
+        boolean needStyle;
+        if (sFinishedCount != 0 && sFailedCount == 0) {
+            if (sFinishedCount == 1) {
+                if (sItemTitleArray.size() >= 1) {
+                    text = getString(R.string.stat_download_done_line_succeeded, sItemTitleArray.valueAt(0));
+                } else {
+                    Log.d("TAG", "WTF, sItemTitleArray is null");
+                    text = getString(R.string.error_unknown);
+                }
+                needStyle = false;
+            } else {
+                text = getString(R.string.stat_download_done_text_succeeded, sFinishedCount);
+                needStyle = true;
+            }
+        } else if (sFinishedCount == 0 && sFailedCount != 0) {
+            if (sFailedCount == 1) {
+                if (sItemTitleArray.size() >= 1) {
+                    text = getString(R.string.stat_download_done_line_failed, sItemTitleArray.valueAt(0));
+                } else {
+                    Log.d("TAG", "WTF, sItemTitleArray is null");
+                    text = getString(R.string.error_unknown);
+                }
+                needStyle = false;
+            } else {
+                text = getString(R.string.stat_download_done_text_failed, sFailedCount);
+                needStyle = true;
+            }
+        } else {
+            text = getString(R.string.stat_download_done_text_mix, sFinishedCount, sFailedCount);
+            needStyle = true;
+        }
+
+        NotificationCompat.InboxStyle style;
+        if (needStyle) {
+            style = new NotificationCompat.InboxStyle();
+            style.setBigContentTitle(getString(R.string.stat_download_done_title));
+            SparseJBArray stateArray = sItemStateArray;
+            for (int i = 0, n = stateArray.size(); i < n; i++) {
+                long id = stateArray.keyAt(i);
+                boolean fin = stateArray.valueAt(i);
+                String title = sItemTitleArray.get(id);
+                if (title == null) {
+                    continue;
+                }
+                style.addLine(getString(fin ? R.string.stat_download_done_line_succeeded :
+                        R.string.stat_download_done_line_failed, title));
+            }
+        } else {
+            style = null;
+        }
+
+        mDownloadedBuilder.setContentText(text)
+                .setStyle(style)
+                .setWhen(System.currentTimeMillis())
+                .setNumber(sDownloadedCount);
+
+        mDownloadedDelay.show();
+
+        checkStopSelf();
+    }
+
+    @Override
+    public void onCancel(DownloadInfo info) {
+        if (mNotifyManager == null) {
+            return;
+        }
+
+        if (null != mDownloadingDelay) {
+            mDownloadingDelay.cancel();
+        }
+
+        checkStopSelf();
+    }
+
+    private void checkStopSelf() {
+        if (mDownloadManager == null || mDownloadManager.isIdle()) {
+            stopForeground(true);
+            stopSelf();
+        }
+    }
+
+    // TODO Include all notification in one delay
+    // Avoid frequent notification
+    private static class NotificationDelay implements Runnable {
+
+        private static final int OPS_NOTIFY = 0;
+        private static final int OPS_CANCEL = 1;
+        private static final int OPS_START_FOREGROUND = 2;
+        private static final long DELAY = 1000; // 1s
+        private final NotificationManagerCompat mNotifyManager;
+        private final NotificationCompat.Builder mBuilder;
+        private final int mId;
+        private Service mService;
+        private long mLastTime;
+        private boolean mPosted;
+        // false for show, true for cancel
+        @Ops
+        private int mOps;
+
+        public NotificationDelay(Service service, NotificationManagerCompat notifyManager,
+                                 NotificationCompat.Builder builder, int id) {
+            mService = service;
+            mNotifyManager = notifyManager;
+            mBuilder = builder;
+            mId = id;
+        }
+
+        public void release() {
+            mService = null;
+        }
+
+        public void show() {
+            if (mPosted) {
+                mOps = OPS_NOTIFY;
+            } else {
+                long now = SystemClock.currentThreadTimeMillis();
+                if (now - mLastTime > DELAY) {
+                    // Wait long enough, do it now
+                    mNotifyManager.notify(mId, mBuilder.build());
+                } else {
+                    // Too quick, post delay
+                    mOps = OPS_NOTIFY;
+                    mPosted = true;
+                    SimpleHandler.getInstance().postDelayed(this, DELAY);
+                }
+                mLastTime = now;
+            }
+        }
+
+        public void cancel() {
+            if (mPosted) {
+                mOps = OPS_CANCEL;
+            } else {
+                long 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.getInstance().postDelayed(this, DELAY);
+                }
+            }
+        }
+
+        public void startForeground() {
+            if (mPosted) {
+                mOps = OPS_START_FOREGROUND;
+            } else {
+                long now = SystemClock.currentThreadTimeMillis();
+                if (now - mLastTime > DELAY) {
+                    // Wait long enough, do it now
+                    if (mService != null) {
+                        mService.startForeground(mId, mBuilder.build());
+                    }
+                } else {
+                    // Too quick, post delay
+                    mOps = OPS_START_FOREGROUND;
+                    mPosted = true;
+                    SimpleHandler.getInstance().postDelayed(this, DELAY);
+                }
+            }
+        }
+
+        @Override
+        public void run() {
+            mPosted = false;
+            switch (mOps) {
+                case OPS_NOTIFY:
+                    mNotifyManager.notify(mId, mBuilder.build());
+                    break;
+                case OPS_CANCEL:
+                    mNotifyManager.cancel(mId);
+                    break;
+                case OPS_START_FOREGROUND:
+                    if (mService != null) {
+                        mService.startForeground(mId, mBuilder.build());
+                    }
+                    break;
+            }
+        }
+
+        @IntDef({OPS_NOTIFY, OPS_CANCEL, OPS_START_FOREGROUND})
+        @Retention(RetentionPolicy.SOURCE)
+        private @interface Ops {
+        }
+    }
+}
@@ -1,551 +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.download
-
-import android.Manifest
-import android.app.PendingIntent
-import android.app.Service
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.os.Bundle
-import android.os.IBinder
-import android.os.SystemClock
-import android.util.Log
-import androidx.annotation.IntDef
-import androidx.core.app.ActivityCompat
-import androidx.core.app.NotificationChannelCompat
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
-import com.hippo.ehviewer.EhApplication
-import com.hippo.ehviewer.R
-import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.dao.DownloadInfo
-import com.hippo.ehviewer.ui.MainActivity
-import com.hippo.ehviewer.ui.scene.DownloadsScene
-import com.hippo.scene.StageActivity
-import com.hippo.util.ReadableTime
-import com.hippo.yorozuya.FileUtils
-import com.hippo.yorozuya.SimpleHandler
-import com.hippo.yorozuya.collect.LongList
-import com.hippo.yorozuya.collect.SparseJBArray
-import com.hippo.yorozuya.collect.SparseJLArray
-
-class DownloadService : Service(), DownloadManager.DownloadListener {
-    private var mNotifyManager: NotificationManagerCompat? = null
-    private var mDownloadManager: DownloadManager? = 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
-
-    override fun onCreate() {
-        super.onCreate()
-        mChannelID = "$packageName.download"
-        mNotifyManager = NotificationManagerCompat.from(this)
-        mNotifyManager!!.createNotificationChannel(
-            NotificationChannelCompat.Builder(
-                mChannelID!!,
-                NotificationManagerCompat.IMPORTANCE_LOW
-            )
-                .setName(getString(R.string.download_service))
-                .build()
-        )
-        mDownloadManager = EhApplication.getDownloadManager(applicationContext)
-        mDownloadManager!!.setDownloadListener(this)
-        ensureDownloadingBuilder()
-        mDownloadingBuilder!!.setContentTitle(getString(R.string.download_service))
-            .setContentText(null)
-            .setSubText(null)
-            .setProgress(0, 0, true)
-        startForeground(ID_DOWNLOADING, mDownloadingBuilder!!.build())
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        mNotifyManager = null
-        if (mDownloadManager != null) {
-            mDownloadManager!!.setDownloadListener(null)
-            mDownloadManager = null
-        }
-        mDownloadingBuilder = null
-        mDownloadedBuilder = null
-        m509dBuilder = null
-    }
-
-    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
-        handleIntent(intent)
-        return START_STICKY
-    }
-
-    private fun handleIntent(intent: Intent?) {
-        var action: String? = null
-        if (intent != null) {
-            action = intent.action
-        }
-        if (ACTION_START == action) {
-            val gi = intent!!.getParcelableExtra<GalleryInfo>(KEY_GALLERY_INFO)
-            val label = intent.getStringExtra(KEY_LABEL)
-            if (gi != null && mDownloadManager != null) {
-                mDownloadManager!!.startDownload(gi, label)
-            }
-        } else if (ACTION_START_RANGE == action) {
-            val gidList = intent!!.getParcelableExtra<LongList>(KEY_GID_LIST)
-            if (gidList != null && mDownloadManager != null) {
-                mDownloadManager!!.startRangeDownload(gidList)
-            }
-        } else if (ACTION_START_ALL == action) {
-            if (mDownloadManager != null) {
-                mDownloadManager!!.startAllDownload()
-            }
-        } else if (ACTION_STOP == action) {
-            val gid = intent!!.getLongExtra(KEY_GID, -1)
-            if (gid != -1L && mDownloadManager != null) {
-                mDownloadManager!!.stopDownload(gid)
-            }
-        } else if (ACTION_STOP_CURRENT == action) {
-            if (mDownloadManager != null) {
-                mDownloadManager!!.stopCurrentDownload()
-            }
-        } else if (ACTION_STOP_RANGE == action) {
-            val gidList = intent!!.getParcelableExtra<LongList>(KEY_GID_LIST)
-            if (gidList != null && mDownloadManager != null) {
-                mDownloadManager!!.stopRangeDownload(gidList)
-            }
-        } else if (ACTION_STOP_ALL == action) {
-            if (mDownloadManager != null) {
-                mDownloadManager!!.stopAllDownload()
-            }
-        } else if (ACTION_DELETE == action) {
-            val gid = intent!!.getLongExtra(KEY_GID, -1)
-            if (gid != -1L && mDownloadManager != null) {
-                mDownloadManager!!.deleteDownload(gid)
-            }
-        } else if (ACTION_DELETE_RANGE == action) {
-            val gidList = intent!!.getParcelableExtra<LongList>(KEY_GID_LIST)
-            if (gidList != null && mDownloadManager != null) {
-                mDownloadManager!!.deleteRangeDownload(gidList)
-            }
-        } else if (ACTION_CLEAR == action) {
-            clear()
-        }
-        checkStopSelf()
-    }
-
-    override fun onBind(intent: Intent): IBinder? {
-        throw IllegalStateException("No bindService")
-    }
-
-    private fun ensureDownloadingBuilder() {
-        if (mDownloadingBuilder != null) {
-            return
-        }
-        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!!)
-            .setSmallIcon(android.R.drawable.stat_sys_download)
-            .setOngoing(true)
-            .setAutoCancel(false)
-            .setCategory(NotificationCompat.CATEGORY_PROGRESS)
-            .addAction(
-                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)
-    }
-
-    private fun ensureDownloadedBuilder() {
-        if (mDownloadedBuilder != null) {
-            return
-        }
-        val clearIntent = Intent(this, DownloadService::class.java)
-        clearIntent.action = ACTION_CLEAR
-        val piClear = PendingIntent.getService(this, 0, clearIntent, PendingIntent.FLAG_IMMUTABLE)
-        val bundle = Bundle()
-        bundle.putString(DownloadsScene.KEY_ACTION, DownloadsScene.ACTION_CLEAR_DOWNLOAD_SERVICE)
-        val activityIntent = Intent(this, MainActivity::class.java)
-        activityIntent.action = StageActivity.ACTION_START_SCENE
-        activityIntent.putExtra(StageActivity.KEY_SCENE_NAME, DownloadsScene::class.java.name)
-        activityIntent.putExtra(StageActivity.KEY_SCENE_ARGS, bundle)
-        val piActivity = PendingIntent.getActivity(
-            this@DownloadService, 0,
-            activityIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
-        )
-        mDownloadedBuilder = NotificationCompat.Builder(applicationContext, mChannelID!!)
-            .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)
-    }
-
-    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))
-            )
-            .setAutoCancel(true)
-            .setOngoing(false)
-            .setCategory(NotificationCompat.CATEGORY_ERROR)
-        m509Delay = NotificationDelay(this, mNotifyManager!!, m509dBuilder!!, ID_509)
-    }
-
-    override fun onGet509() {
-        if (mDownloadManager != null) {
-            mDownloadManager!!.stopAllDownload()
-        }
-        if (mNotifyManager == null) {
-            return
-        }
-        ensure509Builder()
-        m509dBuilder!!.setWhen(System.currentTimeMillis())
-        m509Delay!!.show()
-    }
-
-    override fun onStart(info: DownloadInfo) {
-        if (mNotifyManager == null) {
-            return
-        }
-        ensureDownloadingBuilder()
-        val bundle = Bundle()
-        bundle.putLong(DownloadsScene.KEY_GID, info.gid)
-        val activityIntent = Intent(this, MainActivity::class.java)
-        activityIntent.action = StageActivity.ACTION_START_SCENE
-        activityIntent.putExtra(StageActivity.KEY_SCENE_NAME, DownloadsScene::class.java.name)
-        activityIntent.putExtra(StageActivity.KEY_SCENE_ARGS, bundle)
-        val piActivity = PendingIntent.getActivity(
-            this@DownloadService, 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
-        }
-        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)
-    }
-
-    override fun onFinish(info: DownloadInfo) {
-        if (mNotifyManager == null) {
-            return
-        }
-        if (null != mDownloadingDelay) {
-            mDownloadingDelay!!.cancel()
-        }
-        ensureDownloadedBuilder()
-        val finish = info.state == DownloadInfo.STATE_FINISH
-        val gid = info.gid
-        val index = sItemStateArray.indexOfKey(gid)
-        if (index < 0) { // Not contain
-            sItemStateArray.put(gid, finish)
-            sItemTitleArray.put(gid, EhUtils.getSuitableTitle(info))
-            sDownloadedCount++
-            if (finish) {
-                sFinishedCount++
-            } else {
-                sFailedCount++
-            }
-        } else { // Contain
-            val oldFinish = sItemStateArray.valueAt(index)
-            sItemStateArray.put(gid, finish)
-            sItemTitleArray.put(gid, EhUtils.getSuitableTitle(info))
-            if (oldFinish && !finish) {
-                sFinishedCount--
-                sFailedCount++
-            } else if (!oldFinish && finish) {
-                sFinishedCount++
-                sFailedCount--
-            }
-        }
-        val text: String
-        val needStyle: Boolean
-        if (sFinishedCount != 0 && sFailedCount == 0) {
-            if (sFinishedCount == 1) {
-                text = if (sItemTitleArray.size() >= 1) {
-                    getString(
-                        R.string.stat_download_done_line_succeeded,
-                        sItemTitleArray.valueAt(0)
-                    )
-                } else {
-                    Log.d("TAG", "WTF, sItemTitleArray is null")
-                    getString(R.string.error_unknown)
-                }
-                needStyle = false
-            } else {
-                text = getString(R.string.stat_download_done_text_succeeded, sFinishedCount)
-                needStyle = true
-            }
-        } else if (sFinishedCount == 0 && sFailedCount != 0) {
-            if (sFailedCount == 1) {
-                text = if (sItemTitleArray.size() >= 1) {
-                    getString(
-                        R.string.stat_download_done_line_failed,
-                        sItemTitleArray.valueAt(0)
-                    )
-                } else {
-                    Log.d("TAG", "WTF, sItemTitleArray is null")
-                    getString(R.string.error_unknown)
-                }
-                needStyle = false
-            } else {
-                text = getString(R.string.stat_download_done_text_failed, sFailedCount)
-                needStyle = true
-            }
-        } else {
-            text = getString(R.string.stat_download_done_text_mix, sFinishedCount, sFailedCount)
-            needStyle = true
-        }
-        val style: NotificationCompat.InboxStyle?
-        if (needStyle) {
-            style = NotificationCompat.InboxStyle()
-            style.setBigContentTitle(getString(R.string.stat_download_done_title))
-            val stateArray = sItemStateArray
-            var i = 0
-            val n = stateArray.size()
-            while (i < n) {
-                val id = stateArray.keyAt(i)
-                val fin = stateArray.valueAt(i)
-                val title = sItemTitleArray[id]
-                if (title == null) {
-                    i++
-                    continue
-                }
-                style.addLine(
-                    getString(
-                        if (fin) R.string.stat_download_done_line_succeeded else R.string.stat_download_done_line_failed,
-                        title
-                    )
-                )
-                i++
-            }
-        } else {
-            style = null
-        }
-        mDownloadedBuilder!!.setContentText(text)
-            .setStyle(style)
-            .setWhen(System.currentTimeMillis())
-            .setNumber(sDownloadedCount)
-        mDownloadedDelay!!.show()
-        checkStopSelf()
-    }
-
-    override fun onCancel(info: DownloadInfo) {
-        if (mNotifyManager == null) {
-            return
-        }
-        if (null != mDownloadingDelay) {
-            mDownloadingDelay!!.cancel()
-        }
-        checkStopSelf()
-    }
-
-    private fun checkStopSelf() {
-        if (mDownloadManager == null || mDownloadManager!!.isIdle) {
-            stopForeground(true)
-            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
-
-        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.getInstance().postDelayed(this, DELAY)
-                }
-                mLastTime = now
-            }
-        }
-
-        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.getInstance().postDelayed(this, DELAY)
-                }
-            }
-        }
-
-        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.getInstance().postDelayed(this, DELAY)
-                }
-            }
-        }
-
-        override fun run() {
-            mPosted = false
-            when (mOps) {
-                OPS_NOTIFY -> {
-                    if (ActivityCompat.checkSelfPermission(
-                            mService,
-                            Manifest.permission.POST_NOTIFICATIONS
-                        ) != PackageManager.PERMISSION_GRANTED
-                    ) {
-                        return
-                    }
-                    mNotifyManager.notify(mId, mBuilder.build())
-                }
-
-                OPS_CANCEL -> mNotifyManager.cancel(mId)
-                OPS_START_FOREGROUND -> mService.startForeground(mId, mBuilder.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
-        }
-    }
-
-    companion object {
-        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"
-        const val KEY_GID = "gid"
-        const val KEY_GID_LIST = "gid_list"
-        private const val ID_DOWNLOADING = 1
-        private const val ID_DOWNLOADED = 2
-        private const val ID_509 = 3
-        private val sItemStateArray = SparseJBArray()
-        private val sItemTitleArray = SparseJLArray<String>()
-        private var sFailedCount = 0
-        private var sFinishedCount = 0
-        private var sDownloadedCount = 0
-
-        @JvmStatic
-        fun clear() {
-            sFailedCount = 0
-            sFinishedCount = 0
-            sDownloadedCount = 0
-            sItemStateArray.clear()
-            sItemTitleArray.clear()
-        }
-    }
-}
@@ -17,7 +17,6 @@
 package com.hippo.ehviewer.gallery;

 import android.content.Context;
-import android.graphics.ImageDecoder;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Process;
@@ -25,20 +24,17 @@ import android.os.Process;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

-import com.hippo.Native;
 import com.hippo.UriArchiveAccessor;
 import com.hippo.ehviewer.GetText;
 import com.hippo.ehviewer.R;
 import com.hippo.ehviewer.Settings;
+import com.hippo.glgallery.GalleryPageView;
 import com.hippo.image.Image;
 import com.hippo.unifile.UniFile;
-import com.hippo.yorozuya.FileUtils;
 import com.hippo.yorozuya.thread.PVLock;
 import com.hippo.yorozuya.thread.PriorityThread;

-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
+import java.io.InputStream;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -53,14 +49,11 @@ public class ArchiveGalleryProvider extends GalleryProvider2 {
    public static PVLock pv = new PVLock(0);
    private final UriArchiveAccessor archiveAccessor;
    private final Stack<Integer> requests = new Stack<>();
-    private final LinkedHashMap<Integer, ByteBuffer> streams = new LinkedHashMap<>();
-    private final Thread[] decodeThread = new Thread[]{
-            new Thread(new DecodeTask()),
-            new Thread(new DecodeTask()),
-            new Thread(new DecodeTask()),
-            new Thread(new DecodeTask())
-    };
+    private final AtomicInteger extractingIndex = new AtomicInteger(GalleryPageView.INVALID_INDEX);
+    private final LinkedHashMap<Integer, InputStream> streams = new LinkedHashMap<>();
+    private final AtomicInteger decodingIndex = new AtomicInteger(GalleryPageView.INVALID_INDEX);
    private Thread archiveThread;
+    private Thread decodeThread;
    private volatile int size = STATE_WAIT;
    private String error;

@@ -82,22 +75,25 @@ public class ArchiveGalleryProvider extends GalleryProvider2 {
        int id = sIdGenerator.incrementAndGet();

        archiveThread = new PriorityThread(
-                new ArchiveHostTask(), "ArchiveTask" + '-' + id, Process.THREAD_PRIORITY_BACKGROUND);
+                new ArchiveTask(), "ArchiveTask" + '-' + id, Process.THREAD_PRIORITY_BACKGROUND);
        archiveThread.start();
-        for (Thread i : decodeThread) {
-            i.start();
-        }
+
+        decodeThread = new PriorityThread(
+                new DecodeTask(), "DecodeTask" + '-' + id, Process.THREAD_PRIORITY_BACKGROUND);
+        decodeThread.start();
    }

    @Override
    public void stop() {
        super.stop();
+
        if (archiveThread != null) {
            archiveThread.interrupt();
            archiveThread = null;
        }
-        for (Thread i : decodeThread) {
-            i.interrupt();
+        if (decodeThread != null) {
+            decodeThread.interrupt();
+            decodeThread = null;
        }
        try {
            archiveAccessor.close();
@@ -115,11 +111,11 @@ public class ArchiveGalleryProvider extends GalleryProvider2 {
    protected void onRequest(int index) {
        boolean inDecodeTask;
        synchronized (streams) {
-            inDecodeTask = streams.containsKey(index);
+            inDecodeTask = streams.containsKey(index) || index == decodingIndex.get();
        }

        synchronized (requests) {
-            boolean inArchiveTask = requests.contains(index);
+            boolean inArchiveTask = requests.contains(index) || index == extractingIndex.get();
            if (!inArchiveTask && !inDecodeTask) {
                requests.add(index);
                requests.notify();
@@ -148,53 +144,31 @@ public class ArchiveGalleryProvider extends GalleryProvider2 {
    @NonNull
    @Override
    public String getImageFilename(int index) {
-        return FileUtils.getNameFromFilename(getImageFilenameWithExtension(index));
-    }
-
-    @NonNull
-    @Override
-    public String getImageFilenameWithExtension(int index) {
-        return FileUtils.sanitizeFilename(archiveAccessor.getFilename(index));
+        // TODO
+        return Integer.toString(index);
    }

    @Override
    public boolean save(int index, @NonNull UniFile file) {
-        int fd;
-        FileOutputStream stream;
-        try {
-            stream = (FileOutputStream) file.openOutputStream();
-            fd = Native.getFd(stream.getFD());
-        } catch (IOException e) {
-            e.printStackTrace();
-            return false;
-        }
-        archiveAccessor.extractToFd(index, fd);
-        try {
-            stream.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-            return false;
-        }
-        return true;
+        // TODO
+        return false;
    }

    @Nullable
    @Override
    public UniFile save(int index, @NonNull UniFile dir, @NonNull String filename) {
-        String extension = FileUtils.getExtensionFromFilename(getImageFilenameWithExtension(index));
-        UniFile dst = dir.subFile(null != extension ? filename + "." + extension : filename);
-        save(index, dst);
-        return dst;
+        // TODO
+        return null;
    }

-    private class ArchiveHostTask implements Runnable {
-        public final Thread[] archiveThreads = new Thread[]{
-                new Thread(new ArchiveTask()),
-                new Thread(new ArchiveTask()),
-                new Thread(new ArchiveTask()),
-                new Thread(new ArchiveTask())
-        };
+    @NonNull
+    @Override
+    public String getImageFilenameWithExtension(int index) {
+        // TODO
+        return Integer.toString(index);
+    }

+    private class ArchiveTask implements Runnable {
        private void waitPasswd() throws InterruptedException {
            showPasswd.sendEmptyMessage(0);
            pv.p();
@@ -252,26 +226,7 @@ public class ArchiveGalleryProvider extends GalleryProvider2 {
                    }
                }
            }
-            for (Thread i : archiveThreads) {
-                i.start();
-            }

-            Object o = new Object();
-            synchronized (o) {
-                try {
-                    o.wait();
-                } catch (InterruptedException e) {
-                    for (Thread i : archiveThreads) {
-                        i.interrupt();
-                    }
-                }
-            }
-        }
-    }
-
-    private class ArchiveTask implements Runnable {
-        @Override
-        public void run() {
            while (!Thread.currentThread().isInterrupted()) {
                int index;
                synchronized (requests) {
@@ -285,26 +240,28 @@ public class ArchiveGalleryProvider extends GalleryProvider2 {
                        continue;
                    }
                    index = requests.pop();
+                    extractingIndex.lazySet(index);
                }

                // Check index valid
                if (index < 0 || index >= size) {
+                    extractingIndex.lazySet(GalleryPageView.INVALID_INDEX);
                    notifyPageFailed(index, GetText.getString(R.string.error_out_of_range));
                    continue;
                }

+                Pipe pipe = new Pipe();
+
                synchronized (streams) {
                    if (streams.get(index) != null) {
                        continue;
                    }
-                }
-
-                ByteBuffer buffer = archiveAccessor.extractToByteBuffer(index);
-
-                synchronized (streams) {
-                    streams.put(index, buffer);
+                    streams.put(index, pipe.getInputStream());
                    streams.notify();
                }
+
+                archiveAccessor.extracttoOutputStream(index, pipe.getOutputFd());
+                pipe.closeOutputFd();
            }
        }
    }
@@ -314,40 +271,35 @@ public class ArchiveGalleryProvider extends GalleryProvider2 {
        public void run() {
            while (!Thread.currentThread().isInterrupted()) {
                int index;
-                ByteBuffer buffer;
+                InputStream stream;
                synchronized (streams) {
                    if (streams.isEmpty()) {
                        try {
                            streams.wait();
                        } catch (InterruptedException e) {
+                            // Interrupted
                            break;
                        }
                        continue;
                    }

-                    Iterator<Map.Entry<Integer, ByteBuffer>> iterator = streams.entrySet().iterator();
-                    Map.Entry<Integer, ByteBuffer> entry = iterator.next();
+                    Iterator<Map.Entry<Integer, InputStream>> iterator = streams.entrySet().iterator();
+                    Map.Entry<Integer, InputStream> entry = iterator.next();
                    iterator.remove();
                    index = entry.getKey();
-                    buffer = entry.getValue();
+                    stream = entry.getValue();
+                    decodingIndex.lazySet(index);
                }

-                Image image = null;
-                if (buffer != null) {
-                    try {
-                        image = Image.decode(buffer, false, () -> {
-                            archiveAccessor.releaseByteBuffer(buffer);
-                            return null;
-                        });
-                    } catch (ImageDecoder.DecodeException e) {
-                        archiveAccessor.releaseByteBuffer(buffer);
-                        e.printStackTrace();
+                try {
+                    Image image = Image.decode(stream, true);
+                    if (image != null) {
+                        notifyPageSucceed(index, image);
+                    } else {
+                        notifyPageFailed(index, GetText.getString(R.string.error_decoding_failed));
                    }
-                }
-                if (image != null) {
-                    notifyPageSucceed(index, image);
-                } else {
-                    notifyPageFailed(index, GetText.getString(R.string.error_decoding_failed));
+                } finally {
+                    decodingIndex.lazySet(GalleryPageView.INVALID_INDEX);
                }
            }
        }
@@ -34,7 +34,6 @@ import com.hippo.yorozuya.IOUtils;
 import com.hippo.yorozuya.StringUtils;
 import com.hippo.yorozuya.thread.PriorityThread;

-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -259,9 +258,13 @@ public class DirGalleryProvider extends GalleryProvider2 implements Runnable {
            InputStream is = null;
            try {
                is = files[index].openInputStream();
-                Image image = Image.decode((FileInputStream) is, false);
+                Image image = Image.decode(is, true);
                mDecodingIndex.lazySet(GalleryPageView.INVALID_INDEX);
-                notifyPageSucceed(index, image);
+                if (image != null) {
+                    notifyPageSucceed(index, image);
+                } else {
+                    notifyPageFailed(index, GetText.getString(R.string.error_decoding_failed));
+                }
            } catch (IOException e) {
                mDecodingIndex.lazySet(GalleryPageView.INVALID_INDEX);
                notifyPageFailed(index, GetText.getString(R.string.error_reading_failed));
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2019 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hippo.ehviewer.gallery;
+
+import android.os.ParcelFileDescriptor;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+class Pipe {
+    private ParcelFileDescriptor[] fd;
+    {
+        try {
+            fd = ParcelFileDescriptor.createPipe();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private final InputStream inputStream = new FileInputStream(fd[0].getFileDescriptor());
+
+    InputStream getInputStream() {
+        return inputStream;
+    }
+
+    int getOutputFd() {
+        return fd[1].getFd();
+    }
+
+    void closeOutputFd() {
+        try {
+            fd[1].close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}
@@ -1,93 +0,0 @@
-/*
- * Copyright 2018 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.preference
-
-import android.content.Context
-import android.content.DialogInterface
-import android.text.Html
-import android.util.AttributeSet
-import androidx.appcompat.app.AlertDialog
-import com.hippo.ehviewer.EhApplication
-import com.hippo.ehviewer.R
-import com.hippo.ehviewer.client.EhCookieStore
-import com.hippo.ehviewer.client.EhUrl
-import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.ui.SettingsActivity
-import com.hippo.ehviewer.ui.scene.BaseScene
-import com.hippo.preference.MessagePreference
-import com.hippo.util.addTextToClipboard
-import okhttp3.Cookie
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import java.util.LinkedList
-
-class AccountPreference @JvmOverloads constructor(
-    context: Context, attrs: AttributeSet? = null
-) : MessagePreference(context, attrs) {
-    private val mActivity = context as SettingsActivity
-    private var message: String? = null
-
-    init {
-        val store = EhApplication.getEhCookieStore(context)
-        val eCookies = store.getCookies(EhUrl.HOST_E.toHttpUrl())
-        val exCookies = store.getCookies(EhUrl.HOST_EX.toHttpUrl())
-        val cookies: MutableList<Cookie> = LinkedList(eCookies)
-        cookies.addAll(exCookies)
-        var ipbMemberId: String? = null
-        var ipbPassHash: String? = null
-        var igneous: String? = null
-        var i = 0
-        val n = cookies.size
-        while (i < n) {
-            val cookie = cookies[i]
-            when (cookie.name) {
-                EhCookieStore.KEY_IPD_MEMBER_ID -> ipbMemberId = cookie.value
-                EhCookieStore.KEY_IPD_PASS_HASH -> ipbPassHash = cookie.value
-                EhCookieStore.KEY_IGNEOUS -> igneous = cookie.value
-            }
-            i++
-        }
-        if (ipbMemberId != null || ipbPassHash != null || igneous != null) {
-            message = (EhCookieStore.KEY_IPD_MEMBER_ID + ": " + ipbMemberId + "<br>"
-                    + EhCookieStore.KEY_IPD_PASS_HASH + ": " + ipbPassHash + "<br>"
-                    + EhCookieStore.KEY_IGNEOUS + ": " + igneous)
-            setDialogMessage(
-                Html.fromHtml(
-                    context.getString(
-                        R.string.settings_eh_identity_cookies_signed,
-                        message
-                    ), Html.FROM_HTML_MODE_LEGACY
-                )
-            )
-            message = message!!.replace("<br>", "\n")
-        } else {
-            setDialogMessage(context.getString(R.string.settings_eh_identity_cookies_tourist))
-        }
-    }
-
-    override fun onPrepareDialogBuilder(builder: AlertDialog.Builder) {
-        super.onPrepareDialogBuilder(builder)
-        if (message != null) {
-            builder.setNeutralButton(R.string.settings_eh_identity_cookies_copy) { dialog: DialogInterface?, which: Int ->
-                mActivity.addTextToClipboard(message, true)
-                this@AccountPreference.onClick(dialog, which)
-            }
-        }
-        builder.setPositiveButton(R.string.settings_eh_sign_out) { _: DialogInterface?, _: Int ->
-            EhUtils.signOut(context)
-            mActivity.showTip(R.string.settings_eh_sign_out_tip, BaseScene.LENGTH_SHORT)
-        }
-    }
-}
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2018 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.preference;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.text.Html;
+import android.util.AttributeSet;
+
+import androidx.appcompat.app.AlertDialog;
+
+import com.hippo.ehviewer.EhApplication;
+import com.hippo.ehviewer.R;
+import com.hippo.ehviewer.client.EhCookieStore;
+import com.hippo.ehviewer.client.EhUrl;
+import com.hippo.ehviewer.ui.SettingsActivity;
+import com.hippo.ehviewer.ui.scene.BaseScene;
+import com.hippo.preference.MessagePreference;
+import com.hippo.util.ClipboardUtil;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import okhttp3.Cookie;
+import okhttp3.HttpUrl;
+
+public class IdentityCookiePreference extends MessagePreference {
+
+    @SuppressLint("StaticFieldLeak")
+    private final SettingsActivity mActivity;
+    private String message;
+
+    public IdentityCookiePreference(Context context) {
+        super(context);
+        mActivity = (SettingsActivity) context;
+        init();
+    }
+
+    public IdentityCookiePreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mActivity = (SettingsActivity) context;
+        init();
+    }
+
+    public IdentityCookiePreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        mActivity = (SettingsActivity) context;
+        init();
+    }
+
+    private void init() {
+        EhCookieStore store = EhApplication.getEhCookieStore(getContext());
+        List<Cookie> eCookies = store.getCookies(HttpUrl.get(EhUrl.HOST_E));
+        List<Cookie> exCookies = store.getCookies(HttpUrl.get(EhUrl.HOST_EX));
+        List<Cookie> cookies = new LinkedList<>(eCookies);
+        cookies.addAll(exCookies);
+
+        String ipbMemberId = null;
+        String ipbPassHash = null;
+        String igneous = null;
+
+        for (int i = 0, n = cookies.size(); i < n; i++) {
+            Cookie cookie = cookies.get(i);
+            switch (cookie.name()) {
+                case EhCookieStore.KEY_IPD_MEMBER_ID:
+                    ipbMemberId = cookie.value();
+                    break;
+                case EhCookieStore.KEY_IPD_PASS_HASH:
+                    ipbPassHash = cookie.value();
+                    break;
+                case EhCookieStore.KEY_IGNEOUS:
+                    igneous = cookie.value();
+                    break;
+            }
+        }
+
+        if (ipbMemberId != null || ipbPassHash != null || igneous != null) {
+            message = EhCookieStore.KEY_IPD_MEMBER_ID + ": " + ipbMemberId + "<br>"
+                    + EhCookieStore.KEY_IPD_PASS_HASH + ": " + ipbPassHash + "<br>"
+                    + EhCookieStore.KEY_IGNEOUS + ": " + igneous;
+            setDialogMessage(Html.fromHtml(getContext().getString(R.string.settings_eh_identity_cookies_signed, message), Html.FROM_HTML_MODE_LEGACY));
+            message = message.replace("<br>", "\n");
+        } else {
+            setDialogMessage(getContext().getString(R.string.settings_eh_identity_cookies_tourist));
+        }
+    }
+
+    @Override
+    protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
+        super.onPrepareDialogBuilder(builder);
+        if (message != null) {
+            builder.setPositiveButton(R.string.settings_eh_identity_cookies_copy, (dialog, which) -> {
+                ClipboardUtil.addTextToClipboard(message);
+                mActivity.showTip(R.string.copied_to_clipboard, BaseScene.LENGTH_SHORT);
+
+                IdentityCookiePreference.this.onClick(dialog, which);
+            });
+            builder.setNegativeButton(android.R.string.cancel, null);
+        } else {
+            builder.setPositiveButton(android.R.string.ok, null);
+        }
+    }
+}
@@ -28,6 +28,7 @@ import com.hippo.ehviewer.client.EhCookieStore;
 import com.hippo.ehviewer.client.EhUrl;
 import com.hippo.ehviewer.ui.SettingsActivity;
 import com.hippo.ehviewer.ui.scene.BaseScene;
+import com.hippo.util.WebViewUtil;

 import okhttp3.HttpUrl;

@@ -58,6 +59,10 @@ public class SignInRequiredPreference extends Preference implements Preference.O

    @Override
    public boolean onPreferenceClick(Preference preference) {
+        if (!WebViewUtil.available(getContext())) {
+            mActivity.showTip(R.string.error_no_webview, BaseScene.LENGTH_SHORT);
+            return true;
+        }
        EhCookieStore store = EhApplication.getEhCookieStore(getContext());
        HttpUrl e = HttpUrl.get(EhUrl.HOST_E);
        HttpUrl ex = HttpUrl.get(EhUrl.HOST_EX);
@@ -0,0 +1,73 @@
+/*
+ * 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.preference;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.appcompat.app.AlertDialog;
+
+import com.hippo.ehviewer.R;
+import com.hippo.ehviewer.client.EhUtils;
+import com.hippo.ehviewer.ui.SettingsActivity;
+import com.hippo.ehviewer.ui.scene.BaseScene;
+import com.hippo.preference.MessagePreference;
+
+public class SignOutPreference extends MessagePreference {
+
+    @SuppressLint("StaticFieldLeak")
+    private final SettingsActivity mActivity;
+
+    public SignOutPreference(Context context) {
+        super(context);
+        init();
+        mActivity = (SettingsActivity) context;
+    }
+
+    public SignOutPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+        mActivity = (SettingsActivity) context;
+    }
+
+    public SignOutPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+        mActivity = (SettingsActivity) context;
+    }
+
+    private void init() {
+        setDialogMessage(getContext().getString(R.string.settings_eh_sign_out_warning));
+    }
+
+    @Override
+    protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
+        super.onPrepareDialogBuilder(builder);
+        builder.setPositiveButton(R.string.settings_eh_sign_out_yes, this);
+        builder.setNegativeButton(android.R.string.cancel, null);
+    }
+
+    @Override
+    protected void onDialogClosed(boolean positiveResult) {
+        super.onDialogClosed(positiveResult);
+        if (positiveResult) {
+            EhUtils.signOut(getContext());
+            mActivity.showTip(R.string.settings_eh_sign_out_tip, BaseScene.LENGTH_SHORT);
+        }
+    }
+}
@@ -18,12 +18,14 @@ package com.hippo.ehviewer.preference
 import android.content.Context
 import android.content.pm.PackageManager
 import android.util.AttributeSet
-import androidx.preference.Preference
+import androidx.appcompat.app.AlertDialog
+import com.hippo.Native
 import com.hippo.ehviewer.R
+import com.hippo.preference.MessagePreference

 class VersionPreference @JvmOverloads constructor(
    context: Context, attrs: AttributeSet? = null
-) : Preference(context, attrs) {
+) : MessagePreference(context, attrs) {
    init {
        setTitle(R.string.settings_about_version)
        @Suppress("DEPRECATION") val version: String = try {
@@ -35,4 +37,32 @@ class VersionPreference @JvmOverloads constructor(
        }
        summary = version
    }
+
+    override fun onPrepareDialogBuilder(builder: AlertDialog.Builder) {
+        super.onPrepareDialogBuilder(builder)
+        builder.setTitle(R.string.show_library_version)
+        val info = NativeLibInfo().addLib(Native.getlibarchiveVersion())
+            .addLib("lzma(xz-utils)", Native.getliblzmaVersion())
+            .addLib("zlib", Native.getzlibVersion())
+            .addLib("libjpeg-turbo", Native.getlibjpeg_turboVersion())
+            .addLib(Native.getnettleVersion())
+        builder.setMessage(info.getMessage())
+    }
+
+    inner class NativeLibInfo {
+        private var message: String = ""
+        fun addLib(libname:String, libversion:String): NativeLibInfo {
+            message = "$message$libname $libversion\n"
+            return this
+        }
+
+        fun getMessage(): String {
+            return message;
+        }
+
+        fun addLib(msg: String): NativeLibInfo {
+            message = "$message$msg\n"
+            return this
+        }
+    }
 }
@@ -18,7 +18,6 @@ package com.hippo.ehviewer.spider;

 import android.content.Context;
 import android.graphics.BitmapFactory;
-import android.graphics.ImageDecoder;
 import android.os.AsyncTask;
 import android.os.Process;
 import android.text.TextUtils;
@@ -67,7 +66,6 @@ import com.hippo.yorozuya.thread.PriorityThread;
 import com.hippo.yorozuya.thread.PriorityThreadFactory;

 import java.io.BufferedInputStream;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -1098,6 +1096,33 @@ public final class SpiderQueen implements Runnable {
        void onGetImageFailure(int index, String error);
    }

+    private static class AutoCloseInputStream extends InputStream {
+
+        private final InputStreamPipe mPipe;
+        private final InputStream mIs;
+
+        public AutoCloseInputStream(InputStreamPipe pipe, InputStream is) {
+            mPipe = pipe;
+            mIs = is;
+        }
+
+        @Override
+        public int read() throws IOException {
+            return mIs.read();
+        }
+
+        @Override
+        public int read(@NonNull byte[] buffer, int byteOffset, int byteCount) throws IOException {
+            return mIs.read(buffer, byteOffset, byteCount);
+        }
+
+        @Override
+        public void close() throws IOException {
+            mPipe.close();
+            mPipe.release();
+        }
+    }
+
    private class SpiderWorker implements Runnable {

        private final long mGid;
@@ -1668,7 +1693,7 @@ public final class SpiderQueen implements Runnable {

                pipe.obtain();
                try {
-                    is = pipe.open();
+                    is = new AutoCloseInputStream(pipe, pipe.open());
                } catch (IOException e) {
                    // Can't open pipe
                    error = GetText.getString(R.string.error_reading_failed);
@@ -1678,17 +1703,7 @@ public final class SpiderQueen implements Runnable {
                }

                if (is != null) {
-                    try {
-                        image = Image.decode(((FileInputStream) is), false);
-                    } catch (ImageDecoder.DecodeException e) {
-                        e.printStackTrace();
-                    } finally {
-                        try {
-                            is.close();
-                        } catch (IOException e) {
-                            e.printStackTrace();
-                        }
-                    }
+                    image = Image.decode(is, true);
                    if (image == null) {
                        error = GetText.getString(R.string.error_decoding_failed);
                    }
@@ -18,7 +18,6 @@ package com.hippo.ehviewer.ui;

 import android.app.Activity;
 import android.content.Intent;
-import android.os.Build;

 import androidx.core.content.ContextCompat;

@@ -43,7 +42,6 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Objects;

 public final class CommonOperations {

@@ -112,14 +110,8 @@ public final class CommonOperations {
        startDownload(activity, Collections.singletonList(galleryInfo), forceDefault);
    }

+    // TODO Add context if activity and context are different style
    public static void startDownload(final MainActivity activity, final List<GalleryInfo> galleryInfos, boolean forceDefault) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            Objects.requireNonNull(EhApplication.getInstance().getTopActivity()).checkAndRequestNotificationPermission();
-        }
-        doStartDownload(activity, galleryInfos, forceDefault);
-    }
-
-    private static void doStartDownload(final MainActivity activity, final List<GalleryInfo> galleryInfos, boolean forceDefault) {
        final DownloadManager dm = EhApplication.getDownloadManager(activity);

        LongList toStart = new LongList();
@@ -0,0 +1,134 @@
+/*
+ * 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.ui;
+
+import android.content.Context;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.graphics.Color;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.Window;
+import android.view.WindowInsets;
+import android.view.WindowManager;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.StyleRes;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.hippo.ehviewer.EhApplication;
+import com.hippo.ehviewer.R;
+import com.hippo.ehviewer.Settings;
+
+import rikka.core.res.ResourcesKt;
+import rikka.insets.WindowInsetsHelper;
+import rikka.layoutinflater.view.LayoutInflaterFactory;
+
+public abstract class EhActivity extends AppCompatActivity {
+
+    private static final String THEME_DEFAULT = "DEFAULT";
+    private static final String THEME_BLACK = "BLACK";
+
+    public static boolean isBlackNightTheme() {
+        return Settings.getBoolean("black_dark_theme", false);
+    }
+
+    public static String getTheme(Context context) {
+        if (isBlackNightTheme() && isNightMode(context.getResources().getConfiguration()))
+            return THEME_BLACK;
+        return THEME_DEFAULT;
+    }
+
+    public static boolean isNightMode(Configuration configuration) {
+        return (configuration.uiMode & Configuration.UI_MODE_NIGHT_YES) > 0;
+    }
+
+    @StyleRes
+    public int getThemeStyleRes(Context context) {
+        if (THEME_BLACK.equals(getTheme(context))) {
+            return R.style.ThemeOverlay_Black;
+        }
+        return R.style.ThemeOverlay;
+    }
+
+    @Override
+    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
+        if (getParent() == null) {
+            theme.applyStyle(resid, true);
+        } else {
+            try {
+                theme.setTo(getParent().getTheme());
+            } catch (Exception ignored) {
+            }
+            theme.applyStyle(resid, false);
+        }
+        theme.applyStyle(getThemeStyleRes(this), true);
+        super.onApplyThemeResource(theme, R.style.ThemeOverlay, first);
+    }
+
+    @Override
+    protected void onNightModeChanged(int mode) {
+        getTheme().applyStyle(getThemeStyleRes(this), true);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        getLayoutInflater().setFactory2((new LayoutInflaterFactory(getDelegate())).addOnViewCreatedListener(WindowInsetsHelper.getLISTENER()));
+        super.onCreate(savedInstanceState);
+
+
+        Window window = getWindow();
+        window.setStatusBarColor(Color.TRANSPARENT);
+
+        window.getDecorView().post(() -> {
+            WindowInsets rootWindowInsets = window.getDecorView().getRootWindowInsets();
+            if (rootWindowInsets != null && rootWindowInsets.getSystemWindowInsetBottom() >= Resources.getSystem().getDisplayMetrics().density * 40) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                    window.setNavigationBarDividerColor(getColor(R.color.navigation_bar_divider));
+                }
+                window.setNavigationBarColor(ResourcesKt.resolveColor(getTheme(), android.R.attr.navigationBarColor) & 0x00ffffff | -0x20000000);
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                    window.setNavigationBarContrastEnforced(false);
+                }
+            } else {
+                window.setNavigationBarColor(Color.TRANSPARENT);
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                    window.setNavigationBarContrastEnforced(true);
+                }
+            }
+        });
+
+        ((EhApplication) getApplication()).registerActivity(this);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        ((EhApplication) getApplication()).unregisterActivity(this);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (Settings.getEnabledSecurity()) {
+            getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE,
+                    WindowManager.LayoutParams.FLAG_SECURE);
+        } else {
+            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
+        }
+    }
+}
@@ -1,145 +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.ui
-
-import android.Manifest
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.content.res.Configuration
-import android.content.res.Resources
-import android.content.res.Resources.Theme
-import android.os.Build
-import android.os.Bundle
-import android.view.WindowManager
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.annotation.RequiresApi
-import androidx.annotation.StyleRes
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.ContextCompat
-import com.hippo.ehviewer.EhApplication
-import com.hippo.ehviewer.EhApplication.locked_last_leave_time
-import com.hippo.ehviewer.R
-import com.hippo.ehviewer.Settings
-import rikka.core.res.resolveColor
-import rikka.insets.WindowInsetsHelper
-import rikka.layoutinflater.view.LayoutInflaterFactory
-
-abstract class EhActivity : AppCompatActivity() {
-    @StyleRes
-    fun getThemeStyleRes(context: Context): Int {
-        return if (THEME_BLACK == getTheme(context)) {
-            R.style.ThemeOverlay_Black
-        } else R.style.ThemeOverlay
-    }
-
-    override fun onApplyThemeResource(theme: Theme, resid: Int, first: Boolean) {
-        if (parent == null) {
-            theme.applyStyle(resid, true)
-        } else {
-            try {
-                theme.setTo(parent.theme)
-            } catch (ignored: Exception) {
-            }
-            theme.applyStyle(resid, false)
-        }
-        theme.applyStyle(getThemeStyleRes(this), true)
-        super.onApplyThemeResource(theme, R.style.ThemeOverlay, first)
-    }
-
-    override fun onNightModeChanged(mode: Int) {
-        theme.applyStyle(getThemeStyleRes(this), true)
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        layoutInflater.factory2 =
-            LayoutInflaterFactory(delegate).addOnViewCreatedListener(
-                WindowInsetsHelper.LISTENER
-            )
-        super.onCreate(savedInstanceState)
-        window.decorView.post {
-            val rootWindowInsets = window.decorView.rootWindowInsets
-            if (rootWindowInsets != null && rootWindowInsets.systemWindowInsetBottom >= Resources.getSystem().displayMetrics.density * 40) {
-                window.navigationBarDividerColor = getColor(R.color.navigation_bar_divider)
-                window.navigationBarColor =
-                    theme.resolveColor(android.R.attr.navigationBarColor) and 0x00ffffff or -0x20000000
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                    window.isNavigationBarContrastEnforced = false
-                }
-            }
-        }
-        (application as EhApplication).registerActivity(this)
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        (application as EhApplication).unregisterActivity(this)
-    }
-
-    override fun onResume() {
-        val locked_resume_time = System.currentTimeMillis() / 1000
-        val locked_delay_time = locked_resume_time - locked_last_leave_time
-        if (locked_delay_time < Settings.getSecurityDelay() * 60) {
-            EhApplication.locked = false
-        } else if (Settings.getSecurity() && isAuthenticationSupported() && EhApplication.locked) {
-            startActivity(Intent(this, SecurityActivity::class.java))
-        }
-        super.onResume()
-        if (Settings.getEnabledSecurity()) {
-            window.setFlags(
-                WindowManager.LayoutParams.FLAG_SECURE,
-                WindowManager.LayoutParams.FLAG_SECURE
-            )
-        } else {
-            window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
-        }
-    }
-
-    private val requestPermissionLauncher = registerForActivityResult(
-        ActivityResultContracts.RequestPermission()
-    ) {
-        Settings.putNotificationRequired()
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.TIRAMISU)
-    fun checkAndRequestNotificationPermission() {
-        if (ContextCompat.checkSelfPermission(
-                this,
-                Manifest.permission.POST_NOTIFICATIONS
-            ) == PackageManager.PERMISSION_GRANTED
-        ) {
-            return
-        }
-        if (Settings.getNotificationRequired())
-            return
-        requestPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
-    }
-
-    companion object {
-        private const val THEME_DEFAULT = "DEFAULT"
-        private const val THEME_BLACK = "BLACK"
-        private val isBlackNightTheme: Boolean
-            get() = Settings.getBoolean("black_dark_theme", false)
-
-        fun getTheme(context: Context): String {
-            return if (isBlackNightTheme && isNightMode(context.resources.configuration)) THEME_BLACK else THEME_DEFAULT
-        }
-
-        private fun isNightMode(configuration: Configuration): Boolean {
-            return configuration.uiMode and Configuration.UI_MODE_NIGHT_YES > 0
-        }
-    }
-}
@@ -67,8 +67,8 @@ import androidx.core.view.WindowCompat;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.core.view.WindowInsetsControllerCompat;

+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.materialswitch.MaterialSwitch;
-import com.hippo.app.BaseDialogBuilder;
 import com.hippo.app.EditTextDialogBuilder;
 import com.hippo.ehviewer.AppConfig;
 import com.hippo.ehviewer.BuildConfig;
@@ -226,9 +226,6 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
    private int mSize;
    private int mCurrentIndex;
    private int mSavingPage = -1;
-    private EditTextDialogBuilder builder;
-    private boolean dialogShown = false;
-    private AlertDialog dialog;

    private void buildProvider() {
        if (mGalleryProvider != null) {
@@ -395,25 +392,21 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
            if (mGalleryView == null) {
                return false;
            }
-            if (event.getAction() == MotionEvent.ACTION_SCROLL) {
-                float scroll = event.getAxisValue(MotionEvent.AXIS_VSCROLL) * 300;
-                if (scroll < 0.0f) {
-                    if (mLayoutMode == GalleryView.LAYOUT_RIGHT_TO_LEFT) {
-                        mGalleryView.pageLeft();
-                    } else if (mLayoutMode == GalleryView.LAYOUT_LEFT_TO_RIGHT) {
-                        mGalleryView.pageRight();
-                    } else if (mLayoutMode == GalleryView.LAYOUT_TOP_TO_BOTTOM) {
-                        mGalleryView.onScroll(0, -scroll, 0, -scroll, 0, -scroll);
+            switch (event.getAction()) {
+                case MotionEvent.ACTION_SCROLL:
+                    if (event.getAxisValue(MotionEvent.AXIS_VSCROLL) < 0.0f) {
+                        if (mLayoutMode == GalleryView.LAYOUT_RIGHT_TO_LEFT) {
+                            mGalleryView.pageLeft();
+                        } else {
+                            mGalleryView.pageRight();
+                        }
+                    } else {
+                        if (mLayoutMode == GalleryView.LAYOUT_RIGHT_TO_LEFT) {
+                            mGalleryView.pageRight();
+                        } else {
+                            mGalleryView.pageLeft();
+                        }
                    }
-                } else {
-                    if (mLayoutMode == GalleryView.LAYOUT_RIGHT_TO_LEFT) {
-                        mGalleryView.pageRight();
-                    } else if (mLayoutMode == GalleryView.LAYOUT_LEFT_TO_RIGHT) {
-                        mGalleryView.pageLeft();
-                    } else if (mLayoutMode == GalleryView.LAYOUT_TOP_TO_BOTTOM) {
-                        mGalleryView.onScroll(0, -scroll, 0, -scroll, 0, -scroll);
-                    }
-                }
            }
            return false;
        });
@@ -484,7 +477,16 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
            FrameLayout mainLayout = (FrameLayout) ViewUtils.$$(this, R.id.main);
            mainLayout.addView(new GalleryGuideView(this));
        }
-    }
+    }    ActivityResultLauncher<String> requestStoragePermissionLauncher = registerForActivityResult(
+            new ActivityResultContracts.RequestPermission(),
+            result -> {
+                if (result && mSavingPage != -1) {
+                    saveImage(mSavingPage);
+                } else {
+                    Toast.makeText(this, R.string.error_cant_save_image, Toast.LENGTH_SHORT).show();
+                }
+                mSavingPage = -1;
+            });

    @Override
    protected void onDestroy() {
@@ -511,16 +513,7 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
        mSeekBar = null;

        SimpleHandler.getInstance().removeCallbacks(mHideSliderRunnable);
-    }    ActivityResultLauncher<String> requestStoragePermissionLauncher = registerForActivityResult(
-            new ActivityResultContracts.RequestPermission(),
-            result -> {
-                if (result && mSavingPage != -1) {
-                    saveImage(mSavingPage);
-                } else {
-                    Toast.makeText(this, R.string.error_cant_save_image, Toast.LENGTH_SHORT).show();
-                }
-                mSavingPage = -1;
-            });
+    }

    @Override
    protected void onPause() {
@@ -857,8 +850,7 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
        intent.setAction(Intent.ACTION_SEND);
        intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
        intent.putExtra(Intent.EXTRA_STREAM, uri);
-        if (mGalleryInfo != null)
-            intent.putExtra(Intent.EXTRA_TEXT, EhUrl.getGalleryDetailUrl(mGalleryInfo.gid, mGalleryInfo.token));
+        intent.putExtra(Intent.EXTRA_TEXT, EhUrl.getGalleryDetailUrl(mGalleryInfo.gid, mGalleryInfo.token));
        intent.setDataAndType(uri, mimeType);

        try {
@@ -990,7 +982,7 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan

    private void showPageDialog(final int page) {
        Resources resources = GalleryActivity.this.getResources();
-        BaseDialogBuilder builder = new BaseDialogBuilder(GalleryActivity.this);
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(GalleryActivity.this);
        builder.setTitle(resources.getString(R.string.page_menu_title, page + 1));

        final CharSequence[] items;
@@ -1054,66 +1046,6 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
        }
    }

-    private void showPasswdDialog() {
-        if (!dialogShown) {
-            dialogShown = true;
-            dialog.show();
-            if (dialog.getButton(AlertDialog.BUTTON_POSITIVE) != null) {
-                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(v -> {
-                    GalleryActivity.this.onProvidePasswd();
-                });
-            }
-            dialog.setOnCancelListener(v -> finish());
-        }
-    }
-
-    private void onProvidePasswd() {
-        String passwd = builder.getText();
-        if (passwd.isEmpty())
-            builder.setError(getString(R.string.passwd_cannot_be_empty));
-        else {
-            ArchiveGalleryProvider.passwd = passwd;
-            ArchiveGalleryProvider.pv.v();
-        }
-    }
-
-    private void onPasswdWrong() {
-        builder.setError(getString(R.string.passwd_wrong));
-    }
-
-    private void onPasswdCorrect() {
-        dialog.dismiss();
-    }
-
-    private static class ShowPasswdDialogHandler extends Handler {
-
-        //弱引用持有HandlerActivity , GC 回收时会被回收掉
-        private final WeakReference<GalleryActivity> weakReference;
-
-        public ShowPasswdDialogHandler(GalleryActivity activity) {
-            this.weakReference = new WeakReference(activity);
-        }
-
-        @Override
-        public void handleMessage(Message msg) {
-            GalleryActivity activity = weakReference.get();
-            super.handleMessage(msg);
-            if (null != activity) {
-                switch (msg.what) {
-                    case 0:
-                        activity.showPasswdDialog();
-                        break;
-                    case 1:
-                        activity.onPasswdWrong();
-                        break;
-                    case 2:
-                        activity.onPasswdCorrect();
-                        break;
-                }
-            }
-        }
-    }
-
    private class GalleryMenuHelper implements DialogInterface.OnClickListener {

        private final View mView;
@@ -1286,7 +1218,7 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
        }

        private void onTapMenuArea() {
-            BaseDialogBuilder builder = new BaseDialogBuilder(GalleryActivity.this);
+            MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(GalleryActivity.this);
            GalleryMenuHelper helper = new GalleryMenuHelper(builder.getContext());
            builder.setTitle(R.string.gallery_menu_title)
                    .setView(helper.getView())
@@ -1374,7 +1306,69 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
        }
    }

+    private EditTextDialogBuilder builder;

+    private boolean dialogShown = false;

+    private AlertDialog dialog;

+    private void showPasswdDialog() {
+        if (!dialogShown) {
+            dialogShown = true;
+            dialog.show();
+            if (dialog.getButton(AlertDialog.BUTTON_POSITIVE) != null) {
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(v -> {
+                    GalleryActivity.this.onProvidePasswd();
+                });
+            }
+            dialog.setOnCancelListener(v -> finish());
+        }
+    }
+
+    private void onProvidePasswd() {
+        String passwd = builder.getText();
+        if (passwd.isEmpty())
+            builder.setError(getString(R.string.passwd_cannot_be_empty));
+        else {
+            ArchiveGalleryProvider.passwd = passwd;
+            ArchiveGalleryProvider.pv.v();
+        }
+    }
+
+    private void onPasswdWrong() {
+        builder.setError(getString(R.string.passwd_wrong));
+    }
+
+    private void onPasswdCorrect() {
+        dialog.dismiss();
+    }
+
+    private static class ShowPasswdDialogHandler extends Handler {
+
+        //弱引用持有HandlerActivity , GC 回收时会被回收掉
+        private final WeakReference<GalleryActivity> weakReference;
+
+        public ShowPasswdDialogHandler(GalleryActivity activity) {
+            this.weakReference = new WeakReference(activity);
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            GalleryActivity activity = weakReference.get();
+            super.handleMessage(msg);
+            if (null != activity) {
+                switch (msg.what) {
+                    case 0:
+                        activity.showPasswdDialog();
+                        break;
+                    case 1:
+                        activity.onPasswdWrong();
+                        break;
+                    case 2:
+                        activity.onPasswdCorrect();
+                        break;
+                }
+            }
+        }
+    }
 }
@@ -1,187 +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.ui
-
-import android.os.Build
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.WindowManager
-import android.widget.TextView
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import com.hippo.ehviewer.R
-import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.UrlOpener
-import com.hippo.ehviewer.client.EhUrl
-import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.client.data.GalleryDetail
-import com.hippo.util.addTextToClipboard
-
-class GalleryInfoBottomSheet(detail: GalleryDetail) : BottomSheetDialogFragment() {
-    private var mKeys: ArrayList<String> = arrayListOf()
-    private var mValues: ArrayList<String> = arrayListOf()
-    private var mRecyclerView: RecyclerView? = null
-    private val mDetail: GalleryDetail = detail
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        parseDetail()
-        val view = inflater.inflate(R.layout.scene_gallery_info, container, false)
-        val recyclerView = view.findViewById(R.id.recycler_view) as RecyclerView
-        val adapter = InfoAdapter()
-        recyclerView.adapter = adapter
-        recyclerView.layoutManager = LinearLayoutManager(context, RecyclerView.VERTICAL, false)
-        recyclerView.clipToPadding = false
-        recyclerView.setHasFixedSize(true)
-        mRecyclerView = recyclerView
-        return view
-    }
-
-    private fun parseDetail() {
-        mKeys.add(getString(R.string.header_key))
-        mValues.add(getString(R.string.header_value))
-        mKeys.add(getString(R.string.key_gid))
-        mValues.add(mDetail.gid.toString())
-        mKeys.add(getString(R.string.key_token))
-        mValues.add(mDetail.token)
-        mKeys.add(getString(R.string.key_url))
-        mValues.add(EhUrl.getGalleryDetailUrl(mDetail.gid, mDetail.token))
-        mKeys.add(getString(R.string.key_title))
-        mValues.add(mDetail.title)
-        mKeys.add(getString(R.string.key_title_jpn))
-        mValues.add(mDetail.titleJpn)
-        mKeys.add(getString(R.string.key_thumb))
-        mValues.add(mDetail.thumb)
-        mKeys.add(getString(R.string.key_category))
-        mValues.add(EhUtils.getCategory(mDetail.category))
-        mKeys.add(getString(R.string.key_uploader))
-        mValues.add(mDetail.uploader)
-        mKeys.add(getString(R.string.key_posted))
-        mValues.add(mDetail.posted)
-        mKeys.add(getString(R.string.key_parent))
-        mValues.add(mDetail.parent)
-        mKeys.add(getString(R.string.key_visible))
-        mValues.add(mDetail.visible)
-        mKeys.add(getString(R.string.key_language))
-        mValues.add(mDetail.language)
-        mKeys.add(getString(R.string.key_pages))
-        mValues.add(mDetail.pages.toString())
-        mKeys.add(getString(R.string.key_size))
-        mValues.add(mDetail.size)
-        mKeys.add(getString(R.string.key_favorite_count))
-        mValues.add(mDetail.favoriteCount.toString())
-        mKeys.add(getString(R.string.key_favorited))
-        mValues.add(java.lang.Boolean.toString(mDetail.isFavorited))
-        mKeys.add(getString(R.string.key_rating_count))
-        mValues.add(mDetail.ratingCount.toString())
-        mKeys.add(getString(R.string.key_rating))
-        mValues.add(mDetail.rating.toString())
-        mKeys.add(getString(R.string.key_torrents))
-        mValues.add(mDetail.torrentCount.toString())
-        mKeys.add(getString(R.string.key_torrent_url))
-        mValues.add(mDetail.torrentUrl)
-        mKeys.add(getString(R.string.favorite_name))
-        mValues.add(mDetail.favoriteName)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        (view.findViewById(R.id.title) as TextView).setText(R.string.gallery_info)
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        mRecyclerView?.stopScroll()
-    }
-
-    fun onItemClick(position: Int): Boolean {
-        val context = context
-        return if (null != context && 0 != position) {
-            if (position == INDEX_PARENT) {
-                UrlOpener.openUrl(context, mValues[position], true)
-            } else {
-                activity?.addTextToClipboard(
-                    mValues[position],
-                    false,
-                )
-                if (position == INDEX_URL) {
-                    // Save it to avoid detect the gallery
-                    Settings.putClipboardTextHashCode(mValues[position].hashCode())
-                }
-            }
-            true
-        } else {
-            false
-        }
-    }
-
-    private class InfoHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val key: TextView
-        val value: TextView
-
-        init {
-            key = itemView.findViewById(R.id.key)
-            value = itemView.findViewById(R.id.value)
-        }
-    }
-
-    private inner class InfoAdapter : RecyclerView.Adapter<InfoHolder>() {
-        private val mInflater: LayoutInflater = layoutInflater
-
-        override fun getItemViewType(position: Int): Int {
-            return if (position == 0) {
-                TYPE_HEADER
-            } else {
-                TYPE_DATA
-            }
-        }
-
-        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): InfoHolder {
-            return InfoHolder(
-                mInflater.inflate(
-                    if (viewType == TYPE_HEADER) R.layout.item_gallery_info_header else R.layout.item_gallery_info_data,
-                    parent,
-                    false
-                )
-            )
-        }
-
-        override fun onBindViewHolder(holder: InfoHolder, position: Int) {
-            holder.key.text = mKeys[position]
-            holder.value.text = mValues[position]
-            holder.itemView.isEnabled = position != 0
-            holder.itemView.setOnClickListener { onItemClick(position) }
-        }
-
-        override fun getItemCount(): Int {
-            return mKeys.size.coerceAtMost(mValues.size)
-        }
-    }
-
-    companion object {
-        const val TAG = "GalleryInfoBottomSheet"
-        private const val INDEX_URL = 3
-        private const val INDEX_PARENT = 10
-        private const val TYPE_HEADER = 0
-        private const val TYPE_DATA = 1
-    }
-}
@@ -42,11 +42,12 @@ import androidx.annotation.RequiresApi;
 import androidx.annotation.StringRes;
 import androidx.drawerlayout.widget.DrawerLayout;

+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.navigation.NavigationView;
 import com.google.android.material.snackbar.Snackbar;
-import com.hippo.app.BaseDialogBuilder;
 import com.hippo.app.EditTextDialogBuilder;
 import com.hippo.ehviewer.AppConfig;
+import com.hippo.ehviewer.EhApplication;
 import com.hippo.ehviewer.R;
 import com.hippo.ehviewer.Settings;
 import com.hippo.ehviewer.client.EhTagDatabase;
@@ -61,13 +62,16 @@ import com.hippo.ehviewer.ui.scene.DownloadsScene;
 import com.hippo.ehviewer.ui.scene.FavoritesScene;
 import com.hippo.ehviewer.ui.scene.GalleryCommentsScene;
 import com.hippo.ehviewer.ui.scene.GalleryDetailScene;
+import com.hippo.ehviewer.ui.scene.GalleryInfoScene;
 import com.hippo.ehviewer.ui.scene.GalleryListScene;
 import com.hippo.ehviewer.ui.scene.GalleryPreviewsScene;
 import com.hippo.ehviewer.ui.scene.HistoryScene;
 import com.hippo.ehviewer.ui.scene.ProgressScene;
+import com.hippo.ehviewer.ui.scene.SecurityScene;
 import com.hippo.ehviewer.ui.scene.SelectSiteScene;
 import com.hippo.ehviewer.ui.scene.SignInScene;
 import com.hippo.ehviewer.ui.scene.SolidScene;
+import com.hippo.ehviewer.ui.scene.WarningScene;
 import com.hippo.ehviewer.ui.scene.WebViewSignInScene;
 import com.hippo.ehviewer.widget.EhStageLayout;
 import com.hippo.io.UniFileInputStreamPipe;
@@ -76,7 +80,7 @@ import com.hippo.scene.SceneFragment;
 import com.hippo.scene.StageActivity;
 import com.hippo.unifile.UniFile;
 import com.hippo.util.BitmapUtils;
-import com.hippo.util.ClipboardUtilKt;
+import com.hippo.util.ClipboardUtil;
 import com.hippo.widget.DrawerView;
 import com.hippo.yorozuya.IOUtils;
 import com.hippo.yorozuya.SimpleHandler;
@@ -94,12 +98,15 @@ public final class MainActivity extends StageActivity
    private static final String KEY_NAV_CHECKED_ITEM = "nav_checked_item";

    static {
+        registerLaunchMode(SecurityScene.class, SceneFragment.LAUNCH_MODE_SINGLE_TASK);
+        registerLaunchMode(WarningScene.class, SceneFragment.LAUNCH_MODE_SINGLE_TASK);
        registerLaunchMode(SignInScene.class, SceneFragment.LAUNCH_MODE_SINGLE_TASK);
        registerLaunchMode(WebViewSignInScene.class, SceneFragment.LAUNCH_MODE_SINGLE_TASK);
        registerLaunchMode(CookieSignInScene.class, SceneFragment.LAUNCH_MODE_SINGLE_TASK);
        registerLaunchMode(SelectSiteScene.class, SceneFragment.LAUNCH_MODE_SINGLE_TASK);
        registerLaunchMode(GalleryListScene.class, SceneFragment.LAUNCH_MODE_SINGLE_TOP);
        registerLaunchMode(GalleryDetailScene.class, SceneFragment.LAUNCH_MODE_STANDARD);
+        registerLaunchMode(GalleryInfoScene.class, SceneFragment.LAUNCH_MODE_STANDARD);
        registerLaunchMode(GalleryCommentsScene.class, SceneFragment.LAUNCH_MODE_STANDARD);
        registerLaunchMode(GalleryPreviewsScene.class, SceneFragment.LAUNCH_MODE_STANDARD);
        registerLaunchMode(DownloadsScene.class, SceneFragment.LAUNCH_MODE_SINGLE_TASK);
@@ -136,7 +143,11 @@ public final class MainActivity extends StageActivity
    @NonNull
    @Override
    protected Announcer getLaunchAnnouncer() {
-        if (EhUtils.needSignedIn(this)) {
+        if (Settings.getSecurity() && SecurityScene.Companion.isAuthenticationSupported(this)) {
+            return new Announcer(SecurityScene.class);
+        } else if (Settings.getShowWarning()) {
+            return new Announcer(WarningScene.class);
+        } else if (EhUtils.needSignedIn(this)) {
            return new Announcer(SignInScene.class);
        } else if (Settings.getSelectSite()) {
            return new Announcer(SelectSiteScene.class);
@@ -150,7 +161,17 @@ public final class MainActivity extends StageActivity
    // Sometimes scene can't show directly
    private Announcer processAnnouncer(Announcer announcer) {
        if (0 == getSceneCount()) {
-            if (EhUtils.needSignedIn(this)) {
+            if (Settings.getSecurity() && SecurityScene.Companion.isAuthenticationSupported(this)) {
+                Bundle newArgs = new Bundle();
+                newArgs.putString(SecurityScene.KEY_TARGET_SCENE, announcer.getClazz().getName());
+                newArgs.putBundle(SecurityScene.KEY_TARGET_ARGS, announcer.getArgs());
+                return new Announcer(SecurityScene.class).setArgs(newArgs);
+            } else if (Settings.getShowWarning()) {
+                Bundle newArgs = new Bundle();
+                newArgs.putString(WarningScene.KEY_TARGET_SCENE, announcer.getClazz().getName());
+                newArgs.putBundle(WarningScene.KEY_TARGET_ARGS, announcer.getArgs());
+                return new Announcer(WarningScene.class).setArgs(newArgs);
+            } else if (EhUtils.needSignedIn(this)) {
                Bundle newArgs = new Bundle();
                newArgs.putString(SignInScene.KEY_TARGET_SCENE, announcer.getClazz().getName());
                newArgs.putBundle(SignInScene.KEY_TARGET_ARGS, announcer.getArgs());
@@ -230,6 +251,7 @@ public final class MainActivity extends StageActivity
                        builder.setMode(ListUrlBuilder.MODE_IMAGE_SEARCH);
                        builder.setImagePath(temp.getPath());
                        builder.setUseSimilarityScan(true);
+                        builder.setShowExpunged(true);
                        startScene(processAnnouncer(GalleryListScene.getStartAnnouncer(builder)));
                        return true;
                    }
@@ -256,7 +278,7 @@ public final class MainActivity extends StageActivity
                    String url = intent.getData().toString();
                    new EditTextDialogBuilder(this, url, "")
                            .setTitle(R.string.error_cannot_parse_the_url)
-                            .setPositiveButton(android.R.string.copy, (dialog, which) -> ClipboardUtilKt.addTextToClipboard(this, url, false))
+                            .setPositiveButton(android.R.string.copy, (dialog, which) -> ClipboardUtil.addTextToClipboard(url))
                            .show();
                }
            }
@@ -285,6 +307,7 @@ public final class MainActivity extends StageActivity

        mStageLayout = (EhStageLayout) ViewUtils.$$(this, R.id.fragment_container);
        mDrawerLayout = (DrawerLayout) ViewUtils.$$(this, R.id.draw_view);
+        mDrawerLayout.setStatusBarBackgroundColor(0);
        mNavView = (NavigationView) ViewUtils.$$(this, R.id.nav_view);
        mRightDrawer = (DrawerView) ViewUtils.$$(this, R.id.right_drawer);

@@ -334,7 +357,7 @@ public final class MainActivity extends StageActivity
            break;
        }
        if (hasUnverified) {
-            new BaseDialogBuilder(this)
+            new MaterialAlertDialogBuilder(this)
                    .setTitle(R.string.app_link_not_verified_title)
                    .setMessage(R.string.app_link_not_verified_message)
                    .setPositiveButton(R.string.open_settings, (dialogInterface, i) -> {
@@ -360,7 +383,7 @@ public final class MainActivity extends StageActivity
        if (null == uniFile || uniFile.ensureDir()) {
            return;
        }
-        new BaseDialogBuilder(this)
+        new MaterialAlertDialogBuilder(this)
                .setTitle(R.string.waring)
                .setMessage(R.string.invalid_download_location)
                .setPositiveButton(R.string.get_it, null)
@@ -404,6 +427,9 @@ public final class MainActivity extends StageActivity

    @Override
    protected void onResume() {
+        if (Settings.getSecurity() && SecurityScene.Companion.isAuthenticationSupported(this) && EhApplication.locked) {
+            startScene(new Announcer(SecurityScene.class), true);
+        }
        super.onResume();
        setNavCheckedItem(mNavCheckedItem);
        checkClipboardUrl();
@@ -453,7 +479,7 @@ public final class MainActivity extends StageActivity
    }

    private void checkClipboardUrlInternal() {
-        String text = ClipboardUtilKt.getUrlFromClipboard(ClipboardUtilKt.getClipboardManager(this), this);
+        String text = ClipboardUtil.getUrlFromClipboard();
        int hashCode = text != null ? text.hashCode() : 0;

        if (text != null && hashCode != 0 && Settings.getClipboardTextHashCode() != hashCode) {
@@ -477,7 +503,8 @@ public final class MainActivity extends StageActivity

    @SuppressLint("RtlHardcoded")
    public void createDrawerView(SceneFragment scene) {
-        if (scene instanceof BaseScene baseScene && mRightDrawer != null && mDrawerLayout != null) {
+        if (scene instanceof BaseScene && mRightDrawer != null && mDrawerLayout != null) {
+            BaseScene baseScene = (BaseScene) scene;
            mRightDrawer.removeAllViews();
            View drawerView = baseScene.createDrawerView(
                    baseScene.getLayoutInflater(), mRightDrawer, null);
@@ -494,7 +521,8 @@ public final class MainActivity extends StageActivity
    public void onSceneViewDestroyed(SceneFragment scene) {
        super.onSceneViewDestroyed(scene);

-        if (scene instanceof BaseScene baseScene) {
+        if (scene instanceof BaseScene) {
+            BaseScene baseScene = (BaseScene) scene;
            baseScene.destroyDrawerView();
        }
    }
@@ -0,0 +1,68 @@
+/*
+ * 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.ui;
+
+import android.os.Bundle;
+import android.view.MenuItem;
+
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.ActionBar;
+import androidx.fragment.app.FragmentTransaction;
+
+import com.google.android.material.snackbar.Snackbar;
+import com.hippo.ehviewer.R;
+import com.hippo.ehviewer.ui.fragment.SettingsFragment;
+import com.hippo.ehviewer.ui.scene.BaseScene;
+
+public final class SettingsActivity extends EhActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_preference);
+        setSupportActionBar(findViewById(R.id.toolbar));
+        ActionBar bar = getSupportActionBar();
+        if (bar != null) {
+            bar.setDisplayHomeAsUpEnabled(true);
+        }
+        if (savedInstanceState == null) {
+            getSupportFragmentManager()
+                    .beginTransaction()
+                    .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_MATCH_ACTIVITY_OPEN)
+                    .replace(R.id.fragment, new SettingsFragment())
+                    .commitAllowingStateLoss();
+        }
+    }
+
+    public void showTip(@StringRes int id, int length) {
+        showTip(getString(id), length);
+    }
+
+    public void showTip(CharSequence message, int length) {
+        Snackbar.make(findViewById(R.id.snackbar), message,
+                length == BaseScene.LENGTH_LONG ? Snackbar.LENGTH_LONG : Snackbar.LENGTH_SHORT).show();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            onBackPressed();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}
@@ -1,85 +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.ui
-
-import android.content.res.Configuration
-import android.os.Bundle
-import android.view.MenuItem
-import android.widget.TextView
-import androidx.annotation.StringRes
-import androidx.core.view.WindowCompat
-import androidx.fragment.app.FragmentTransaction
-import com.google.android.material.appbar.AppBarLayout
-import com.google.android.material.floatingactionbutton.FloatingActionButton
-import com.google.android.material.snackbar.Snackbar
-import com.hippo.ehviewer.R
-import com.hippo.ehviewer.ui.fragment.SettingsFragment
-import com.hippo.ehviewer.ui.scene.BaseScene
-
-class SettingsActivity : EhActivity() {
-    private var mFab: FloatingActionButton? = null
-    private var mContentText: TextView? = null
-    private var mAppbarLayout: AppBarLayout? = null
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_preference)
-        setSupportActionBar(findViewById(R.id.toolbar))
-        mContentText = findViewById(R.id.tip)
-        mFab = findViewById(R.id.fab)
-        mAppbarLayout = findViewById(R.id.appbar)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightStatusBars =
-            (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_YES) <= 0
-        if (savedInstanceState == null) {
-            supportFragmentManager
-                .beginTransaction()
-                .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_MATCH_ACTIVITY_OPEN)
-                .replace(R.id.fragment, SettingsFragment())
-                .commitAllowingStateLoss()
-        }
-    }
-
-    fun showTip(@StringRes id: Int, length: Int) {
-        showTip(getString(id), length)
-    }
-
-    fun showTip(message: CharSequence?, length: Int) {
-        Snackbar.make(
-            findViewById(R.id.snackbar), message!!,
-            if (length == BaseScene.LENGTH_LONG) Snackbar.LENGTH_LONG else Snackbar.LENGTH_SHORT
-        ).show()
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        if (item.itemId == android.R.id.home) {
-            onBackPressedDispatcher.onBackPressed()
-            return true
-        }
-        return super.onOptionsItemSelected(item)
-    }
-
-    fun getMFab(): FloatingActionButton {
-        return mFab!!
-    }
-
-    fun getMContentText(): TextView {
-        return mContentText!!
-    }
-
-    fun resetAppbarLiftStatus() {
-        mAppbarLayout?.setExpanded(true)
-    }
-}
@@ -22,7 +22,7 @@ import android.content.res.Resources;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.util.Log;
+import android.provider.Settings;

 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
@@ -32,18 +32,13 @@ import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.os.LocaleListCompat;
 import androidx.preference.Preference;

-import com.hippo.app.BaseDialogBuilder;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.hippo.ehviewer.AppConfig;
 import com.hippo.ehviewer.BuildConfig;
 import com.hippo.ehviewer.EhApplication;
 import com.hippo.ehviewer.EhDB;
 import com.hippo.ehviewer.GetText;
 import com.hippo.ehviewer.R;
-import com.hippo.ehviewer.Settings;
-import com.hippo.ehviewer.client.EhClient;
-import com.hippo.ehviewer.client.EhRequest;
-import com.hippo.ehviewer.client.data.FavListUrlBuilder;
-import com.hippo.ehviewer.client.parser.FavoritesParser;
 import com.hippo.ehviewer.ui.scene.BaseScene;
 import com.hippo.util.ExceptionUtils;
 import com.hippo.util.IoThreadPoolExecutor;
@@ -64,11 +59,12 @@ import java.util.zip.ZipOutputStream;
 public class AdvancedFragment extends BasePreferenceFragment {

    private static final String KEY_DUMP_LOGCAT = "dump_logcat";
+    private static final String KEY_CLEAR_MEMORY_CACHE = "clear_memory_cache";
    private static final String KEY_APP_LANGUAGE = "app_language";
    private static final String KEY_IMPORT_DATA = "import_data";
    private static final String KEY_EXPORT_DATA = "export_data";
    private static final String KEY_OPEN_BY_DEFAULT = "open_by_default";
-    private static final String KEY_BACKUP_FAVORITE = "backup_favorite";
+
    ActivityResultLauncher<String> exportLauncher = registerForActivityResult(
            new ActivityResultContracts.CreateDocument(),
            uri -> {
@@ -81,7 +77,7 @@ public class AdvancedFragment extends BasePreferenceFragment {
                        e.printStackTrace();
                    }
                    try {
-                        AlertDialog alertDialog = new BaseDialogBuilder(requireActivity())
+                        AlertDialog alertDialog = new MaterialAlertDialogBuilder(requireActivity())
                                .setCancelable(false)
                                .setView(R.layout.preference_dialog_task)
                                .show();
@@ -198,7 +194,7 @@ public class AdvancedFragment extends BasePreferenceFragment {
                        e.printStackTrace();
                    }
                    try {
-                        AlertDialog alertDialog = new BaseDialogBuilder(requireActivity())
+                        AlertDialog alertDialog = new MaterialAlertDialogBuilder(requireActivity())
                                .setCancelable(false)
                                .setView(R.layout.preference_dialog_task)
                                .show();
@@ -224,20 +220,16 @@ public class AdvancedFragment extends BasePreferenceFragment {
                    }
                }
            });
-    private int favTotal;
-    private int favIndex;

    @Override
    public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) {
        addPreferencesFromResource(R.xml.advanced_settings);

        Preference dumpLogcat = findPreference(KEY_DUMP_LOGCAT);
+        Preference clearMemoryCache = findPreference(KEY_CLEAR_MEMORY_CACHE);
        Preference appLanguage = findPreference(KEY_APP_LANGUAGE);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)
-            appLanguage.setVisible(false);
        Preference importData = findPreference(KEY_IMPORT_DATA);
        Preference exportData = findPreference(KEY_EXPORT_DATA);
-        Preference backupFavorite = findPreference(KEY_BACKUP_FAVORITE);
        Preference openByDefault = findPreference(KEY_OPEN_BY_DEFAULT);

        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
@@ -247,9 +239,9 @@ public class AdvancedFragment extends BasePreferenceFragment {
        }

        dumpLogcat.setOnPreferenceClickListener(this);
+        clearMemoryCache.setOnPreferenceClickListener(this);
        importData.setOnPreferenceClickListener(this);
        exportData.setOnPreferenceClickListener(this);
-        backupFavorite.setOnPreferenceClickListener(this);

        appLanguage.setOnPreferenceChangeListener(this);
    }
@@ -265,6 +257,10 @@ public class AdvancedFragment extends BasePreferenceFragment {
                showTip(R.string.error_cant_find_activity, BaseScene.LENGTH_SHORT);
            }
            return true;
+        } else if (KEY_CLEAR_MEMORY_CACHE.equals(key)) {
+            ((EhApplication) requireContext().getApplicationContext()).clearMemoryCache();
+            Runtime.getRuntime().gc();
+            showTip(R.string.settings_advanced_clear_memory_cache_done, BaseScene.LENGTH_SHORT);
        } else if (KEY_IMPORT_DATA.equals(key)) {
            try {
                importDataLauncher.launch(new String[]{"*/*"});
@@ -281,14 +277,6 @@ public class AdvancedFragment extends BasePreferenceFragment {
                showTip(R.string.error_cant_find_activity, BaseScene.LENGTH_SHORT);
            }
            return true;
-        } else if (KEY_BACKUP_FAVORITE.equals(key)) {
-            try {
-                backupFavorite();
-            } catch (Exception e) {
-                ExceptionUtils.throwIfFatal(e);
-                showTip(R.string.settings_advanced_backup_favorite_failed, BaseScene.LENGTH_SHORT);
-            }
-            return true;
        } else if (KEY_OPEN_BY_DEFAULT.equals(key)) {
            try {
                Intent intent = new Intent(android.provider.Settings.ACTION_APP_OPEN_BY_DEFAULT_SETTINGS,
@@ -304,73 +292,10 @@ public class AdvancedFragment extends BasePreferenceFragment {
        return false;
    }

-    private void backupFavorite() {
-        EhClient mClient = EhApplication.getEhClient(requireContext());
-        FavListUrlBuilder favListUrlBuilder = new FavListUrlBuilder();
-        favTotal = 0;
-        favIndex = 1;
-
-        EhRequest request = new EhRequest();
-        request.setMethod(EhClient.METHOD_GET_FAVORITES);
-        request.setCallback(new EhClient.Callback() {
-            @Override
-            public void onSuccess(Object result) {
-                try {
-                    FavoritesParser.Result favResult = (FavoritesParser.Result) result;
-                    if (favResult.galleryInfoList.isEmpty()) {
-                        showTip(R.string.settings_advanced_backup_favorite_nothing, BaseScene.LENGTH_SHORT);
-                    } else {
-                        if (favTotal == 0 && favResult.countArray != null) {
-                            int totalFav = 0;
-                            for (int i = 0; i < 10; i++) {
-                                totalFav = totalFav + favResult.countArray[i];
-                            }
-                            favTotal = (int) Math.ceil((double) totalFav / favResult.galleryInfoList.size());
-                        }
-
-                        String status = "(" + favIndex + "/" + favTotal + ")";
-                        showTip(GetText.getString(R.string.settings_advanced_backup_favorite_start, status), BaseScene.LENGTH_SHORT);
-                        Log.d("LocalFavorites", "now backup page " + status);
-                        EhDB.putLocalFavorites(favResult.galleryInfoList);
-
-                        if (favResult.nextPage != null) {
-                            try {
-                                Thread.sleep(Settings.getDownloadDelay());
-                            } catch (InterruptedException e) {
-                                e.printStackTrace();
-                            }
-                            favIndex++;
-                            favListUrlBuilder.setNext(favResult.nextPage);
-                            request.setArgs(favListUrlBuilder.build(), Settings.getShowJpnTitle());
-                            mClient.execute(request);
-                        } else {
-                            showTip(R.string.settings_advanced_backup_favorite_success, BaseScene.LENGTH_SHORT);
-                        }
-                    }
-                } catch (Exception e) {
-                    showTip(R.string.settings_advanced_backup_favorite_failed, BaseScene.LENGTH_SHORT);
-                }
-            }
-
-            @Override
-            public void onFailure(Exception e) {
-                showTip(R.string.settings_advanced_backup_favorite_failed, BaseScene.LENGTH_SHORT);
-            }
-
-            @Override
-            public void onCancel() {
-                showTip(R.string.settings_advanced_backup_favorite_failed, BaseScene.LENGTH_SHORT);
-            }
-        });
-
-        request.setArgs(favListUrlBuilder.build(), Settings.getShowJpnTitle());
-        mClient.execute(request);
-    }
-
    @Override
    public boolean onPreferenceChange(Preference preference, Object newValue) {
        String key = preference.getKey();
-        if (KEY_APP_LANGUAGE.equals(key) && Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+        if (KEY_APP_LANGUAGE.equals(key)) {
            if ("system".equals(newValue)) {
                AppCompatDelegate.setApplicationLocales(LocaleListCompat.wrap(Resources.getSystem().getConfiguration().getLocales()));
            } else {
@@ -0,0 +1,50 @@
+/*
+ * 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.ui.fragment;
+
+import androidx.annotation.StringRes;
+import androidx.fragment.app.Fragment;
+
+import com.hippo.ehviewer.ui.SettingsActivity;
+
+public class BaseFragment extends Fragment {
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        setTitle(getFragmentTitle());
+    }
+
+    @StringRes
+    public int getFragmentTitle() {
+        return -1;
+    }
+
+    private void setTitle(@StringRes int string) {
+        requireActivity().setTitle(string);
+    }
+
+    public void showTip(@StringRes int id, int length) {
+        ((SettingsActivity) requireActivity()).showTip(getString(id), length);
+    }
+
+    public void showTip(CharSequence message, int length) {
+        ((SettingsActivity) requireActivity()).showTip(message, length);
+    }
+}
@@ -1,73 +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.ui.fragment
-
-import android.view.View
-import android.widget.TextView
-import androidx.annotation.StringRes
-import androidx.fragment.app.Fragment
-import com.google.android.material.floatingactionbutton.FloatingActionButton
-import com.hippo.ehviewer.ui.SettingsActivity
-
-abstract class BaseFragment : Fragment() {
-    override fun onStart() {
-        super.onStart()
-        setTitle(getFragmentTitle())
-        (requireActivity() as SettingsActivity).resetAppbarLiftStatus()
-    }
-
-    override fun onDestroyView() {
-        hideFabAndClearTip()
-        super.onDestroyView()
-    }
-
-    abstract fun getFragmentTitle(): Int
-
-    private fun setTitle(@StringRes string: Int) {
-        requireActivity().setTitle(string)
-    }
-
-    fun showTip(@StringRes id: Int, length: Int) {
-        (requireActivity() as SettingsActivity).showTip(getString(id), length)
-    }
-
-    fun showTip(message: CharSequence?, length: Int) {
-        (requireActivity() as SettingsActivity).showTip(message, length)
-    }
-
-    fun getTipView(@StringRes res: Int? = null): TextView {
-        return (requireActivity() as SettingsActivity).getMContentText().apply {
-            visibility = View.VISIBLE
-            res?.let { text = getString(it) }
-        }
-    }
-
-    fun getFabViewAndShow(): FloatingActionButton {
-        return (requireActivity() as SettingsActivity).getMFab().apply { visibility = View.VISIBLE }
-    }
-
-    private fun hideFabAndClearTip() {
-        getFabViewAndShow().apply {
-            visibility = View.GONE
-            setOnClickListener(null)
-        }
-        getTipView().apply {
-            visibility = View.GONE
-        }
-    }
-}
@@ -70,8 +70,7 @@ public class BasePreferenceFragment extends PreferenceFragmentCompat
                    .replace(R.id.fragment, classObj)
                    .addToBackStack(null)
                    .commitAllowingStateLoss();
-        } catch (ClassNotFoundException | IllegalAccessException |
-                 java.lang.InstantiationException ignored) {
+        } catch (ClassNotFoundException | IllegalAccessException | java.lang.InstantiationException ignored) {
        }
        return true;
    }
@@ -25,7 +25,7 @@ import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.Nullable;
 import androidx.preference.Preference;

-import com.hippo.app.BaseDialogBuilder;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.hippo.ehviewer.AppConfig;
 import com.hippo.ehviewer.R;
 import com.hippo.ehviewer.Settings;
@@ -99,7 +99,7 @@ public class DownloadFragment extends BasePreferenceFragment {
        if (KEY_DOWNLOAD_LOCATION.equals(key)) {
            UniFile file = Settings.getDownloadLocation();
            if (file != null && !UniFile.isFileUri(Settings.getDownloadLocation().getUri())) {
-                new BaseDialogBuilder(requireContext())
+                new MaterialAlertDialogBuilder(requireContext())
                        .setTitle(R.string.settings_download_download_location)
                        .setMessage(file.getUri().toString())
                        .setPositiveButton(R.string.pick_new_download_location, (dialogInterface, i) -> openDirPickerL())
@@ -0,0 +1,94 @@
+/*
+ * 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.ui.fragment;
+
+import android.app.Activity;
+import android.content.res.Configuration;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.preference.Preference;
+
+import com.hippo.ehviewer.R;
+import com.hippo.ehviewer.Settings;
+import com.hippo.ehviewer.client.EhTagDatabase;
+
+public class EhFragment extends BasePreferenceFragment {
+
+    @Override
+    public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) {
+        addPreferencesFromResource(R.xml.eh_settings);
+
+        Preference theme = findPreference(Settings.KEY_THEME);
+        Preference blackDarkTheme = findPreference(Settings.KEY_BLACK_DARK_THEME);
+        Preference gallerySite = findPreference(Settings.KEY_GALLERY_SITE);
+        Preference listMode = findPreference(Settings.KEY_LIST_MODE);
+        Preference detailSize = findPreference(Settings.KEY_DETAIL_SIZE);
+        Preference thumbSize = findPreference(Settings.KEY_THUMB_SIZE);
+        Preference showTagTranslations = findPreference(Settings.KEY_SHOW_TAG_TRANSLATIONS);
+        Preference tagTranslationsSource = findPreference("tag_translations_source");
+
+        theme.setOnPreferenceChangeListener(this);
+        gallerySite.setOnPreferenceChangeListener(this);
+        listMode.setOnPreferenceChangeListener(this);
+        detailSize.setOnPreferenceChangeListener(this);
+        thumbSize.setOnPreferenceChangeListener(this);
+        showTagTranslations.setOnPreferenceChangeListener(this);
+        blackDarkTheme.setOnPreferenceChangeListener(this);
+
+        if (!EhTagDatabase.isPossible(requireActivity())) {
+            getPreferenceScreen().removePreference(showTagTranslations);
+            getPreferenceScreen().removePreference(tagTranslationsSource);
+        }
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        String key = preference.getKey();
+        if (Settings.KEY_THEME.equals(key)) {
+            AppCompatDelegate.setDefaultNightMode(Integer.parseInt((String) newValue));
+            requireActivity().recreate();
+            return true;
+        } else if (Settings.KEY_GALLERY_SITE.equals(key)) {
+            requireActivity().setResult(Activity.RESULT_OK);
+            return true;
+        } else if (Settings.KEY_LIST_MODE.equals(key)) {
+            requireActivity().setResult(Activity.RESULT_OK);
+            return true;
+        } else if (Settings.KEY_DETAIL_SIZE.equals(key)) {
+            requireActivity().setResult(Activity.RESULT_OK);
+        } else if (Settings.KEY_THUMB_SIZE.equals(key)) {
+            requireActivity().setResult(Activity.RESULT_OK);
+        } else if (Settings.KEY_SHOW_TAG_TRANSLATIONS.equals(key)) {
+            if (Boolean.TRUE.equals(newValue)) {
+                EhTagDatabase.update(requireActivity());
+            }
+        } else if (Settings.KEY_BLACK_DARK_THEME.equals(key)) {
+            if ((requireActivity().getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_YES) > 0) {
+                requireActivity().recreate();
+            }
+            return true;
+        }
+        return true;
+    }
+
+    @Override
+    public int getFragmentTitle() {
+        return R.string.settings_eh;
+    }
+}
@@ -1,91 +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.ui.fragment
-
-import android.app.Activity
-import android.content.res.Configuration
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.preference.Preference
-import com.hippo.ehviewer.R
-import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.client.EhTagDatabase
-
-class EhFragment : BasePreferenceFragment() {
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        addPreferencesFromResource(R.xml.eh_settings)
-        val account = findPreference<Preference>(Settings.KEY_ACCOUNT)
-        val theme = findPreference<Preference>(Settings.KEY_THEME)
-        val blackDarkTheme = findPreference<Preference>(Settings.KEY_BLACK_DARK_THEME)
-        val gallerySite = findPreference<Preference>(Settings.KEY_GALLERY_SITE)
-        val listMode = findPreference<Preference>(Settings.KEY_LIST_MODE)
-        val listThumbSize = findPreference<Preference>(Settings.KEY_LIST_THUMB_SIZE)
-        val detailSize = findPreference<Preference>(Settings.KEY_DETAIL_SIZE)
-        val thumbSize = findPreference<Preference>(Settings.KEY_THUMB_SIZE)
-        val showTagTranslations = findPreference<Preference>(Settings.KEY_SHOW_TAG_TRANSLATIONS)
-        val tagTranslationsSource = findPreference<Preference>("tag_translations_source")
-        Settings.getDisplayName()?.let { account?.summary = it }
-        theme!!.onPreferenceChangeListener = this
-        gallerySite!!.onPreferenceChangeListener = this
-        listMode!!.onPreferenceChangeListener = this
-        listThumbSize!!.onPreferenceChangeListener = this
-        detailSize!!.onPreferenceChangeListener = this
-        thumbSize!!.onPreferenceChangeListener = this
-        showTagTranslations!!.onPreferenceChangeListener = this
-        blackDarkTheme!!.onPreferenceChangeListener = this
-        if (!EhTagDatabase.isPossible(requireActivity())) {
-            preferenceScreen.removePreference(showTagTranslations)
-            preferenceScreen.removePreference(tagTranslationsSource!!)
-        }
-    }
-
-    override fun onPreferenceChange(preference: Preference, newValue: Any): Boolean {
-        val key = preference.key
-        if (Settings.KEY_THEME == key) {
-            AppCompatDelegate.setDefaultNightMode((newValue as String).toInt())
-            requireActivity().recreate()
-            return true
-        } else if (Settings.KEY_GALLERY_SITE == key) {
-            requireActivity().setResult(Activity.RESULT_OK)
-            return true
-        } else if (Settings.KEY_LIST_MODE == key) {
-            requireActivity().setResult(Activity.RESULT_OK)
-            return true
-        } else if (Settings.KEY_LIST_THUMB_SIZE == key) {
-            Settings.LIST_THUMB_SIZE_INITED = false
-            requireActivity().setResult(Activity.RESULT_OK)
-            return true
-        } else if (Settings.KEY_DETAIL_SIZE == key) {
-            requireActivity().setResult(Activity.RESULT_OK)
-        } else if (Settings.KEY_THUMB_SIZE == key) {
-            requireActivity().setResult(Activity.RESULT_OK)
-        } else if (Settings.KEY_SHOW_TAG_TRANSLATIONS == key) {
-            if (java.lang.Boolean.TRUE == newValue) {
-                EhTagDatabase.update(requireActivity())
-            }
-        } else if (Settings.KEY_BLACK_DARK_THEME == key) {
-            if (requireActivity().resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_YES > 0) {
-                requireActivity().recreate()
-            }
-            return true
-        }
-        return true
-    }
-
-    override fun getFragmentTitle(): Int {
-        return R.string.settings_eh
-    }
-}
@@ -20,12 +20,7 @@ package com.hippo.ehviewer.ui.fragment
 import android.content.DialogInterface
 import android.os.Bundle
 import android.text.TextUtils
-import android.view.LayoutInflater
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
+import android.view.*
 import android.widget.EditText
 import android.widget.ImageView
 import android.widget.TextView
@@ -36,8 +31,10 @@ import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.checkbox.MaterialCheckBox
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.textfield.TextInputLayout
-import com.hippo.app.BaseDialogBuilder
+import com.hippo.easyrecyclerview.EasyRecyclerView
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.client.EhFilter
 import com.hippo.ehviewer.dao.Filter
@@ -69,23 +66,26 @@ class FilterFragment : BaseFragment() {
        inflater: LayoutInflater,
        container: ViewGroup?,
        savedInstanceState: Bundle?
-    ): View {
-        val recyclerView =
-            inflater.inflate(R.layout.rv_layout, container, false) as RecyclerView
-        val tip = getTipView(R.string.filter)
+    ): View? {
+        val view = inflater.inflate(R.layout.activity_filter, container, false)
+        val recyclerView: RecyclerView =
+            ViewUtils.`$$`(view, R.id.recycler_view) as EasyRecyclerView
+        val tip = ViewUtils.`$$`(view, R.id.tip) as TextView
        mViewTransition = ViewTransition(recyclerView, tip)
-        val fab = getFabViewAndShow()
+        val fab = view.findViewById<FloatingActionButton>(R.id.fab)
        val drawable = ContextCompat.getDrawable(requireActivity(), R.drawable.big_filter)
-        drawable?.setBounds(0, 0, drawable.intrinsicWidth, drawable.intrinsicHeight)
+        drawable!!.setBounds(0, 0, drawable.intrinsicWidth, drawable.intrinsicHeight)
        tip.setCompoundDrawables(null, drawable, null, null)
        mAdapter.setHasStableIds(true)
        recyclerView.adapter = mAdapter
+        recyclerView.clipToPadding = false
+        recyclerView.clipChildren = false
        recyclerView.layoutManager = LinearLayoutManager(requireContext())
        recyclerView.setHasFixedSize(true)
        val defaultItemAnimator = recyclerView.itemAnimator as DefaultItemAnimator?
        defaultItemAnimator?.supportsChangeAnimations = false
        fab.setOnClickListener { showAddFilterDialog() }
-        return recyclerView
+        return view
    }

    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -106,13 +106,13 @@ class FilterFragment : BaseFragment() {
    }

    override fun onDestroyView() {
+        super.onDestroyView()
        mViewTransition = null
        requireActivity().removeMenuProvider(mMenuProvider)
-        super.onDestroyView()
    }

    private fun showTipDialog() {
-        BaseDialogBuilder(requireActivity())
+        MaterialAlertDialogBuilder(requireActivity())
            .setTitle(R.string.filter)
            .setMessage(R.string.filter_tip)
            .setPositiveButton(android.R.string.ok, null)
@@ -120,7 +120,7 @@ class FilterFragment : BaseFragment() {
    }

    private fun showAddFilterDialog() {
-        val dialog = BaseDialogBuilder(requireActivity())
+        val dialog = MaterialAlertDialogBuilder(requireActivity())
            .setTitle(R.string.add_filter)
            .setView(R.layout.dialog_add_filter)
            .setPositiveButton(R.string.add, null)
@@ -131,7 +131,7 @@ class FilterFragment : BaseFragment() {

    private fun showDeleteFilterDialog(filter: Filter) {
        val message = getString(R.string.delete_filter, filter.text)
-        BaseDialogBuilder(requireActivity())
+        MaterialAlertDialogBuilder(requireActivity())
            .setMessage(message)
            .setPositiveButton(R.string.delete) { _: DialogInterface?, which: Int ->
                if (DialogInterface.BUTTON_POSITIVE != which) {
@@ -0,0 +1,282 @@
+/*
+ * 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.ui.fragment;
+
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.util.Pair;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.textfield.TextInputLayout;
+import com.hippo.ehviewer.EhApplication;
+import com.hippo.ehviewer.Hosts;
+import com.hippo.ehviewer.R;
+import com.hippo.view.ViewTransition;
+import com.hippo.yorozuya.ViewUtils;
+
+import java.util.List;
+import java.util.Locale;
+
+public class HostsFragment extends BaseFragment
+        implements View.OnClickListener {
+
+    private static final String DIALOG_TAG_ADD_HOST = AddHostDialogFragment.class.getName();
+    private static final String DIALOG_TAG_EDIT_HOST = EditHostDialogFragment.class.getName();
+
+    private static final String KEY_HOST = "com.hippo.ehviewer.ui.fragment.HostsFragment.HOST";
+    private static final String KEY_IP = "com.hippo.ehviewer.ui.fragment.HostsFragment.IP";
+
+    private Hosts hosts;
+    private List<Pair<String, String>> data;
+
+    private ViewTransition mViewTransition;
+    private HostsAdapter adapter;
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        hosts = EhApplication.getHosts(requireContext());
+        data = hosts.getAll();
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.activity_hosts, container, false);
+        RecyclerView recyclerView = view.findViewById(R.id.recycler_view);
+        TextView tip = (TextView) ViewUtils.$$(view, R.id.tip);
+        mViewTransition = new ViewTransition(recyclerView, tip);
+        FloatingActionButton fab = view.findViewById(R.id.fab);
+
+        adapter = new HostsAdapter();
+        recyclerView.setAdapter(adapter);
+        recyclerView.setLayoutManager(new LinearLayoutManager(requireActivity(), RecyclerView.VERTICAL, false));
+        recyclerView.setHasFixedSize(true);
+
+        fab.setOnClickListener(this);
+
+        return view;
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        updateView(false);
+    }
+
+    public boolean onItemClick(int position) {
+        Pair<String, String> pair = data.get(position);
+        Bundle args = new Bundle();
+        args.putString(KEY_HOST, pair.first);
+        args.putString(KEY_IP, pair.second);
+
+        DialogFragment fragment = new EditHostDialogFragment();
+        fragment.setArguments(args);
+        fragment.show(getChildFragmentManager(), DIALOG_TAG_EDIT_HOST);
+
+        return true;
+    }
+
+    @Override
+    public void onClick(View v) {
+        new AddHostDialogFragment().show(getChildFragmentManager(), DIALOG_TAG_ADD_HOST);
+    }
+
+    private void updateView(boolean animation) {
+        if (null == mViewTransition) {
+            return;
+        }
+
+        data = hosts.getAll();
+        if (data.isEmpty()) {
+            mViewTransition.showView(1, animation);
+        } else {
+            mViewTransition.showView(0, animation);
+        }
+        adapter.notifyDataSetChanged();
+    }
+
+    @Override
+    public int getFragmentTitle() {
+        return R.string.hosts;
+    }
+
+    public abstract static class HostDialogFragment extends DialogFragment {
+
+        private HostsFragment hostsFragment;
+
+        @NonNull
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            hostsFragment = (HostsFragment) getParentFragment();
+            View view = getLayoutInflater().inflate(R.layout.dialog_hosts, null, false);
+            TextView host = view.findViewById(R.id.host);
+            TextView ip = view.findViewById(R.id.ip);
+
+            Bundle arguments = getArguments();
+            if (savedInstanceState == null && arguments != null) {
+                host.setText(arguments.getString(KEY_HOST));
+                ip.setText(arguments.getString(KEY_IP));
+            }
+
+            MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext()).setView(view);
+            onCreateDialogBuilder(builder);
+            AlertDialog dialog = builder.create();
+            dialog.setOnShowListener(d -> onCreateDialog((AlertDialog) d));
+
+            return dialog;
+        }
+
+        protected abstract void onCreateDialogBuilder(AlertDialog.Builder builder);
+
+        protected abstract void onCreateDialog(AlertDialog dialog);
+
+        protected void put(AlertDialog dialog) {
+            TextView host = dialog.findViewById(R.id.host);
+            TextView ip = dialog.findViewById(R.id.ip);
+            if (host == null || ip == null) {
+                return;
+            }
+            String hostString = host.getText().toString().trim().toLowerCase(Locale.US);
+            String ipString = ip.getText().toString().trim();
+
+            if (!Hosts.isValidHost(hostString)) {
+                TextInputLayout hostInputLayout = dialog.findViewById(R.id.host_input_layout);
+                if (hostInputLayout == null) {
+                    return;
+                }
+                hostInputLayout.setError(getString(R.string.invalid_host));
+                return;
+            }
+
+            if (!Hosts.isValidIp(ipString)) {
+                TextInputLayout ipInputLayout = dialog.findViewById(R.id.ip_input_layout);
+                if (ipInputLayout == null) {
+                    return;
+                }
+                ipInputLayout.setError(getString(R.string.invalid_ip));
+                return;
+            }
+
+            hostsFragment.hosts.put(hostString, ipString);
+            hostsFragment.updateView(true);
+
+            dialog.dismiss();
+        }
+
+        protected void delete(AlertDialog dialog) {
+            TextView host = dialog.findViewById(R.id.host);
+            if (host == null) {
+                return;
+            }
+            String hostString = host.getText().toString().trim().toLowerCase(Locale.US);
+
+            hostsFragment.hosts.delete(hostString);
+            hostsFragment.updateView(true);
+
+            dialog.dismiss();
+        }
+    }
+
+    public static class AddHostDialogFragment extends HostDialogFragment {
+
+        @Override
+        protected void onCreateDialogBuilder(AlertDialog.Builder builder) {
+            builder.setTitle(R.string.add_host);
+            builder.setPositiveButton(R.string.add_host_add, null);
+            builder.setNegativeButton(android.R.string.cancel, null);
+        }
+
+        @Override
+        protected void onCreateDialog(AlertDialog dialog) {
+            dialog.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener(v -> put(dialog));
+        }
+    }
+
+    public static class EditHostDialogFragment extends HostDialogFragment {
+
+        @Override
+        protected void onCreateDialogBuilder(AlertDialog.Builder builder) {
+            builder.setTitle(R.string.edit_host);
+            builder.setPositiveButton(R.string.edit_host_confirm, null);
+            builder.setNegativeButton(R.string.edit_host_delete, null);
+        }
+
+        @Override
+        protected void onCreateDialog(AlertDialog dialog) {
+            TextInputLayout hostInputLayout = dialog.findViewById(R.id.host_input_layout);
+            if (hostInputLayout == null) {
+                return;
+            }
+            hostInputLayout.setEnabled(false);
+            dialog.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener(v -> put(dialog));
+            dialog.getButton(DialogInterface.BUTTON_NEGATIVE).setOnClickListener(v -> delete(dialog));
+        }
+    }
+
+    private static class HostsHolder extends RecyclerView.ViewHolder {
+
+        public final TextView host;
+        public final TextView ip;
+
+        public HostsHolder(View itemView) {
+            super(itemView);
+            host = itemView.findViewById(R.id.host);
+            ip = itemView.findViewById(R.id.ip);
+        }
+    }
+
+    private class HostsAdapter extends RecyclerView.Adapter<HostsHolder> {
+
+        private final LayoutInflater inflater = getLayoutInflater();
+
+        @NonNull
+        @Override
+        public HostsHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            return new HostsHolder(inflater.inflate(R.layout.item_hosts, parent, false));
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull HostsHolder holder, int position) {
+            Pair<String, String> pair = data.get(position);
+            holder.host.setText(pair.first);
+            holder.ip.setText(pair.second);
+            holder.itemView.setOnClickListener(v -> onItemClick(position));
+        }
+
+        @Override
+        public int getItemCount() {
+            return data.size();
+        }
+    }
+}