Make release

No need to merge old local db
Clean up
2022-08-04 07:39:53 +08:00 · 2022-08-04 07:06:01 +08:00 · 2022-08-04 06:49:37 +08:00 · 2022-08-04 06:35:42 +08:00 · 2022-08-04 04:59:09 +08:00 · 2022-08-04 04:58:53 +08:00
212 changed files with 3697 additions and 8270 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:
@@ -30,7 +25,6 @@ jobs:
      - name: Gradle Build
        uses: gradle/gradle-build-action@v2
        with:
-          gradle-home-cache-cleanup: true
          arguments: assembleRelease

      - name: Update ARM64
@@ -30,22 +30,14 @@ jobs:
        with:
          arguments: assembleRelease

-      - name: Rename Apks
-        run: |
-          cp app/build/outputs/apk/release/app-universal-release.apk app/build/outputs/apk/release/EhViewer-universal-A11-.apk
-          cp app/build/outputs/apk/release/app-arm64-v8a-release.apk app/build/outputs/apk/release/EhViewer-arm64-v8a-A11-.apk
-          cp app/build/outputs/apk/release/app-x86_64-release.apk app/build/outputs/apk/release/EhViewer-x86_64-A11-.apk
-          cp app/build/outputs/apk/release/app-x86-release.apk app/build/outputs/apk/release/EhViewer-x86-A11-.apk
-          cp app/build/outputs/apk/release/app-armeabi-v7a-release.apk app/build/outputs/apk/release/EhViewer-armeabi-v7a-A11-.apk
-
      - name: Releases
        uses: softprops/action-gh-release@v1
        with:
          body: Bump Version
          discussion_category_name: Announcements
          files: |
-            app/build/outputs/apk/release/EhViewer-universal-A11-.apk
-            app/build/outputs/apk/release/EhViewer-arm64-v8a-A11-.apk
-            app/build/outputs/apk/release/EhViewer-x86_64-A11-.apk
-            app/build/outputs/apk/release/EhViewer-x86-A11-.apk
-            app/build/outputs/apk/release/EhViewer-armeabi-v7a-A11-.apk
+            app/build/outputs/apk/release/app-universal-release.apk
+            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,18 +1,9 @@
-[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
+[submodule "app/src/main/cpp/libarchive"]
+	path = app/src/main/cpp/libarchive
 	url = https://github.com/Ehviewer-Overhauled/libarchive
-[submodule "native/src/main/jni/liblzma"]
-	path = native/src/main/jni/liblzma
+[submodule "app/src/main/cpp/liblzma"]
+	path = app/src/main/cpp/liblzma
 	url = https://github.com/Ehviewer-Overhauled/xz
-[submodule "native/src/main/jni/nettle/nettle"]
-	path = native/src/main/jni/nettle/nettle
+[submodule "app/src/main/cpp/nettle/nettle"]
+	path = app/src/main/cpp/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.7.x.x/docs/README/zh-cn.md">
-  简体中文
-  </a>
-  <span> | <span>
-  <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/blob/1.7.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.7.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,66 +21,45 @@
  </a>
 </p>

-<div align="center">
-  <h3>
-    <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/blob/1.7.x.x/docs/README/en.md#description">
-    Description
-    </a>
-    <span> | </span>
-    <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/blob/1.7.x.x/docs/README/en.md#download">
-    Download
-    </a>
-    <span> | </span>
-    <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/blob/1.7.x.x/docs/README/en.md#screenshot">
-    Screenshot
-    </a>
-    <span> | </span>
-    <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/blob/1.7.x.x/docs/README/en.md#thanks">
-    Thanks
-    </a>
-    <span> | </span>
-    <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/blob/1.7.x.x/docs/README/en.md#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/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>
+
+App 分為 1.8 與 1.7 兩個版本。1.8 版本適配 Android 12 及以上系統，為開發主線；1.7 版本適配 Android 11 及以下版本，削減了 Android 12 及以上系統的獨有功能，使其能在低版本 Android 上正常工作

 App is divided into two versions: 1.7 and 1.8 . Version 1.8 support Android 12 and above, also the develop mainline. Version 1.7 support Android 11 and below, drop down some spicetify functions for Android 12 to make app useable on lower Android System

 # Screenshot

-![screenshot-01](../../art/screenshot-01.png)
-![screenshot-02](../../art/screenshot-02.png)
+![screenshot-01](art/screenshot-01.png)
+![screenshot-02](art/screenshot-02.png)

 # Thanks

+本項目受到了諸多開源項目的幫助
+
 Here is the libraries

- [AOSP & AndroidX](http://source.android.com/)
+- [AOSP&AndroidX](http://source.android.com/)
+- [android-advancedrecyclerview](https://github.com/h6ah4i/android-advancedrecyclerview)
 - [FullDraggableDrawer](https://github.com/PureWriter/FullDraggableDrawer)
 - [GnuTLS](https://gnutls.org/)
 - [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)
- [roaster](https://github.com/forge/roaster)
+- [RikkaX](https://github.com/RikkaApps/RikkaX)
 - [libarchive](http://www.libarchive.org/)
 - [XZ Utils](https://tukaani.org/xz/)

@@ -1,17 +1,5 @@
-<p align="right">
-  <strong>English<strong>
-  <span> | </span>
-  <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/blob/1.7.x.x/docs/README/zh-cn.md">
-  简体中文
-  </a>
-  <span> | <span>
-  <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/blob/1.7.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.7.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/tree/1.7.x.x#description">
-    Description
-    </a>
-    <span> | </span>
-    <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/tree/1.7.x.x#download">
-    Download
-    </a>
-    <span> | </span>
-    <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/tree/1.7.x.x#screenshot">
-    Screenshot
-    </a>
-    <span> | </span>
-    <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/tree/1.7.x.x#thanks">
-    Thanks
-    </a>
-    <span> | </span>
-    <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/tree/1.7.x.x#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/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>
+
+App 分为 1.8 与 1.7 两个版本。1.8 版本适配 Android 12 及以上系统，为开发主线；1.7 版本适配 Android 11 及以下版本，削减了 Android 12 及以上系统的独有功能，使其能在低版本 Android 上正常工作

 App is divided into two versions: 1.7 and 1.8 . Version 1.8 support Android 12 and above, also the develop mainline. Version 1.7 support Android 11 and below, drop down some spicetify functions for Android 12 to make app useable on lower Android System

@@ -77,22 +47,19 @@ App is divided into two versions: 1.7 and 1.8 . Version 1.8 support Android 12 a

 # Thanks

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

- [AOSP & AndroidX](http://source.android.com/)
+- [AOSP&AndroidX](http://source.android.com/)
+- [android-advancedrecyclerview](https://github.com/h6ah4i/android-advancedrecyclerview)
 - [FullDraggableDrawer](https://github.com/PureWriter/FullDraggableDrawer)
 - [GnuTLS](https://gnutls.org/)
 - [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)
- [roaster](https://github.com/forge/roaster)
+- [RikkaX](https://github.com/RikkaApps/RikkaX)
 - [libarchive](http://www.libarchive.org/)
 - [XZ Utils](https://tukaani.org/xz/)

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

 android {
    compileSdkVersion 33
    buildToolsVersion "33.0.0"
+    ndkVersion "25.0.8775105"

    Properties localProperties = new Properties()
    if (project.rootProject.file('local.properties').exists()) {
@@ -33,11 +34,23 @@ android {

    defaultConfig {
        applicationId "moe.tarsin.ehviewer"
-        minSdkVersion 26
+        minSdkVersion 31
        targetSdkVersion 33
-        versionCode 114537
-        versionName "1.7.31.0-alpha02"
+        versionCode 180005
+        versionName "1.8.1.0-alpha01"
        resConfigs 'zh', 'zh-rCN', 'zh-rHK', 'zh-rTW', 'es', 'ja', 'ko', 'fr', 'de', 'th'
+
+        externalNativeBuild {
+            cmake {
+                arguments '-DANDROID_STL=none'
+            }
+        }
+    }
+
+    externalNativeBuild {
+        cmake {
+            path 'src/main/cpp/CMakeLists.txt'
+        }
    }

    compileOptions {
@@ -79,56 +92,46 @@ android {
        }
    }

-    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"
    implementation "androidx.collection:collection:$collection_version"
    implementation "androidx.collection:collection-ktx:$collection_version"

-    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.5.4"
+    def fragment_version = "1.5.1"
    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"
@@ -136,8 +139,20 @@ dependencies {
    implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycle_version"

    implementation "androidx.loader:loader:1.1.0"
+
+    def nav_version = "2.5.1"
+    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.preference:preference:1.2.0'
-    implementation 'androidx.recyclerview:recyclerview:1.3.0-rc01'
+    implementation 'androidx.recyclerview:recyclerview:1.3.0-beta01'
+
+    def room_version = "2.5.0-alpha02"
+    implementation "androidx.room:room-runtime:$room_version"
+    annotationProcessor "androidx.room:room-compiler:$room_version"
+
    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"
@@ -145,24 +160,18 @@ 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'
+    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-alpha02'
-
-    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.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.greenrobot:greendao:3.3.0'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
-    implementation 'org.jsoup:jsoup:1.15.3'
-    implementation projects.native
+    implementation 'org.jsoup:jsoup:1.15.2'
 }

 configurations.all {
@@ -32,3 +32,5 @@
 -dontwarn org.conscrypt.Conscrypt
 -dontwarn org.openjsse.javax.net.ssl.SSLSocket
 -dontwarn org.openjsse.net.ssl.OpenJSSE
+
+-keepclasseswithmembernames class * { native <methods>;}
@@ -26,11 +26,12 @@
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-  
+
    <!-- Required to maintain app compatibility. -->
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
-                     android:maxSdkVersion="32" />
-  
+    <uses-permission
+        android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
+
    <uses-feature
        android:glEsVersion="0x00020000"
        android:required="true" />
@@ -144,6 +145,12 @@
            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,17 +1,17 @@
 project(ehviewer)
 cmake_minimum_required(VERSION 3.4.1)

-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Oz -fvisibility=hidden -fvisibility-inlines-hidden -ffunction-sections -fdata-sections -flto\
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Ofast -fvisibility=hidden -fvisibility-inlines-hidden -ffunction-sections -fdata-sections -flto \
           -mllvm -polly \
           -mllvm -polly-run-dce \
-		   -mllvm -polly-run-inliner \
+           -mllvm -polly-run-inliner \
           -mllvm -polly-isl-arg=--no-schedule-serialize-sccs \
-		   -mllvm -polly-ast-use-context \
+           -mllvm -polly-ast-use-context \
           -mllvm -polly-detect-keep-going \
           -mllvm -polly-position=before-vectorizer \
-		   -mllvm -polly-vectorizer=stripmine \
+           -mllvm -polly-vectorizer=stripmine \
           -mllvm -polly-detect-profitability-min-per-loop-insts=40 \
-		   -mllvm -polly-invariant-load-hoisting")
+           -mllvm -polly-invariant-load-hoisting")

 # Build GNUTLS libnettle
 add_subdirectory(nettle)
@@ -43,21 +43,27 @@ static char *passwd = NULL;
 static void *archiveAddr = NULL;
 static jlong archiveSize = 0;

+const char supportExt[9][6] = {
+        "jpeg",
+        "jpg",
+        "png",
+        "gif",
+        "webp",
+        "bmp",
+        "ico",
+        "wbmp",
+        "heif"
+};
+
 static int filename_is_playable_file(const char *name) {
    const char *dotptr = strrchr(name, '.');
-    if (dotptr++) {
-        switch (*dotptr) {
-            case 'j':
-                return (strcmp(dotptr, "jpg") == 0) || (strcmp(dotptr, "jpeg") == 0);
-            case 'p':
-                return strcmp(dotptr, "png") == 0;
-            case 'g':
-                return strcmp(dotptr, "gif") == 0;
-            default:
-                return 0;
-        }
-    }
-    return 0;
+    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() {
@@ -111,7 +117,6 @@ Java_com_hippo_UriArchiveAccessor_openArchive(JNIEnv *_, jobject thiz, jlong add
                need_encrypt = true;
                break;
            case 0: // format supports but no encrypted entry found
-            case ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW: // Sometimes we might not read through whole file|vm, but it means so far we haven't meet any encrypted entry yet
            default:
                need_encrypt = false;
        }
@@ -121,35 +126,35 @@ Java_com_hippo_UriArchiveAccessor_openArchive(JNIEnv *_, jobject thiz, jlong add
    return r;
 }

-JNIEXPORT void JNICALL
-Java_com_hippo_UriArchiveAccessor_extracttoOutputStream(JNIEnv *_, jobject thiz, jint index,
-                                                        jint fd) {
+typedef struct Memarea {
+    void *buffer;
+    long size;
+} Memarea;
+
+JNIEXPORT jlong JNICALL
+Java_com_hippo_UriArchiveAccessor_extracttoOutputStream(JNIEnv *_, jobject thiz, jint index) {
    struct archive_entry *entry;
-    size_t size;
    int ret;
-    la_int64_t offset;
-    const void *buff;
    if (!arc || index < cur_index) {
        archive_alloc();
        cur_index = 0;
    }
+    Memarea *memarea = malloc(sizeof(Memarea));
    while (archive_read_next_header(arc, &entry) == ARCHIVE_OK) {
        if (!filename_is_playable_file(archive_entry_pathname(entry)))
            continue;
        if (cur_index++ == index) {
-            for (;;) {
-                ret = archive_read_data_block(arc, &buff, &size, &offset);
-                if (ret == ARCHIVE_EOF)
-                    break;
-                if (ret != ARCHIVE_OK) {
-                    LOGE("%s%s", "Archive read failed:", archive_error_string(arc));
-                    break;
-                }
-                write(fd, buff, size);
-            }
+            memarea->size = archive_entry_size(entry);
+            memarea->buffer = malloc(memarea->size);
+            ret = archive_read_data(arc, memarea->buffer, memarea->size);
+            if (ret != memarea->size)
+                LOGE("%s", "No enough data read, WTF?");
+            if (ret < 0)
+                LOGE("%s%s", "Archive read failed:", archive_error_string(arc));
            break;
        }
    }
+    return (jlong) memarea;
 }

 JNIEXPORT void JNICALL
@@ -18,12 +18,6 @@ project(image C)
 set(IMAGE_SOURCES
        image.c
        image_utils.c
-        image_plain.c
-        image_jpeg.c
-        image_png.c
-        image_gif.c
-        filter/clahe.c
-        filter/gray.c
        java_wrapper.c
        )
 set(IMAGE_INCLUDES
@@ -33,10 +27,6 @@ set(IMAGE_LIBRARIES
        log
        jnigraphics
        GLESv2
-        stream
-        jpeg
-        png
-        gif
        )

 add_library(image STATIC ${IMAGE_SOURCES})
@@ -0,0 +1,112 @@
+/*
+ * 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 <android/data_space.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "image.h"
+#include "image_utils.h"
+
+void decodeCommon(IMAGE *image, SOURCE *src) {
+    image->src = src;
+    AImageDecoder *decoder = src->decoder;
+    image->isAnimated = AImageDecoder_isAnimated(decoder);
+    AImageDecoder_setDataSpace(decoder, ADATASPACE_SRGB);
+    AImageDecoder_setAndroidBitmapFormat(decoder, ANDROID_BITMAP_FORMAT_RGBA_8888);
+    const AImageDecoderHeaderInfo *headerInfo = AImageDecoder_getHeaderInfo(decoder);
+    image->height = AImageDecoderHeaderInfo_getHeight(headerInfo);
+    image->width = AImageDecoderHeaderInfo_getWidth(headerInfo);
+    image->alpha =
+            AImageDecoderHeaderInfo_getAlphaFlags(headerInfo) == ANDROID_BITMAP_FLAGS_ALPHA_PREMUL;
+    src->stride = AImageDecoder_getMinimumStride(decoder);
+    image->bufferLen = (int) (image->height * src->stride);
+    image->buffer = malloc(image->bufferLen);
+    if (image->isAnimated) {
+        AImageDecoder_setInternallyHandleDisposePrevious(decoder, false);
+        AImageDecoderFrameInfo *frameInfo = AImageDecoderFrameInfo_create();
+        AImageDecoder_getFrameInfo(decoder, frameInfo);
+        image->delay = (int) AImageDecoderFrameInfo_getDuration(frameInfo) / 1000000;
+        AImageDecoderFrameInfo_delete(frameInfo);
+    }
+    AImageDecoder_decodeImage(decoder, image->buffer, src->stride, image->bufferLen);
+    if (!image->isAnimated) {
+        recycleSource(image->src);
+        image->src = NULL;
+    }
+}
+
+IMAGE *createFromFd(int fd) {
+    AImageDecoder *decoder = NULL;
+    if (AImageDecoder_createFromFd(fd, &decoder) != ANDROID_IMAGE_DECODER_SUCCESS)
+        return NULL;
+    IMAGE *image = calloc(1, sizeof(IMAGE));
+    SOURCE *src = calloc(1, sizeof(SOURCE));
+    src->decoder = decoder;
+    src->fd = fd;
+    decodeCommon(image, src);
+    return image;
+}
+
+IMAGE *createFromAddr(void *addr, long size) {
+    AImageDecoder *decoder;
+    AImageDecoder_createFromBuffer((const void *) addr, size, &decoder);
+    IMAGE *image = calloc(1, sizeof(IMAGE));
+    SOURCE *src = calloc(1, sizeof(SOURCE));
+    src->decoder = decoder;
+    src->srcBuffer = addr;
+    decodeCommon(image, src);
+    return image;
+}
+
+IMAGE *create(int32_t width, int32_t height, const void *data) {
+    IMAGE *plain = calloc(1, sizeof(IMAGE));
+    void *buffer = NULL;
+    size_t length = width * height * 4;
+
+    buffer = malloc(length);
+    memcpy(buffer, data, length);
+
+    // plain->isAnimated = false; this is unnecessary since we use calloc
+    plain->width = width;
+    plain->height = height;
+    plain->buffer = buffer;
+    plain->bufferLen = (int) length;
+
+    return plain;
+}
+
+void render(IMAGE *image, int src_x, int src_y,
+            void *dst, int dst_w, int dst_h, int dst_x, int dst_y,
+            int width, int height) {
+    copy_pixels(image->buffer, image->width, image->height, src_x, src_y, dst, dst_w, dst_h, dst_x,
+                dst_y, width, height);
+}
+
+void advance(IMAGE *image) {
+    if (image->isAnimated) {
+        AImageDecoder_advanceFrame(image->src->decoder);
+        if (AImageDecoder_decodeImage(image->src->decoder, image->buffer, image->src->stride,
+                                      image->bufferLen) == ANDROID_IMAGE_DECODER_FINISHED) {
+            AImageDecoder_rewind(image->src->decoder);
+            AImageDecoder_decodeImage(image->src->decoder, image->buffer, image->src->stride,
+                                      image->bufferLen);
+        }
+    }
+}
@@ -0,0 +1,72 @@
+/*
+ * 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 IMAGE_IMAGE_H
+#define IMAGE_IMAGE_H
+
+#include <android/imagedecoder.h>
+#include <stdbool.h>
+
+typedef struct {
+    AImageDecoder *decoder;
+    void *srcBuffer;
+    size_t stride;
+    int fd;
+} SOURCE;
+
+typedef struct {
+    int32_t width;
+    int32_t height;
+    void *buffer;
+    int bufferLen;
+    bool isAnimated;
+    bool alpha;
+    int delay;
+    SOURCE *src;
+} IMAGE;
+
+static void recycleSource(SOURCE *src) {
+    if (!src)
+        return;
+    AImageDecoder_delete(src->decoder);
+    free(src->srcBuffer);
+    free(src);
+}
+
+static void recycle(IMAGE *image) {
+    if (!image)
+        return;
+    recycleSource(image->src);
+    free(image->buffer);
+    free(image);
+}
+
+IMAGE *createFromFd(int fd);
+
+IMAGE *createFromAddr(void *addr, long size);
+
+IMAGE *create(int32_t width, int32_t height, const void *data);
+
+void render(IMAGE *image, int src_x, int src_y,
+            void *dst, int dst_w, int dst_h, int dst_x, int dst_y,
+            int width, int height);
+
+void advance(IMAGE *image);
+
+#endif /* IMAGE_IMAGE_H */
@@ -0,0 +1,107 @@
+/*
+ * Copyright 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.
+ */
+
+#include "image_utils.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+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 += dst_blank_length;
+    memcpy(dst + dst_pos, src + src_pos, line_stride);
+    dst_pos += 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 += dst_blank_length;
+        memcpy(dst + dst_pos, src + src_pos, line_stride);
+        dst_pos += line_stride;
+        src_pos += src_stride;
+    }
+
+    return true;
+}
@@ -17,17 +17,13 @@
 * EhViewer. If not, see <https://www.gnu.org/licenses/>.
 */

-//
-// Created by Hippo on 12/27/2015.
-//
-
 #ifndef IMAGE_IMAGE_UTILS_H
 #define IMAGE_IMAGE_UTILS_H

 #include <stdbool.h>

-void 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, bool fill_blank, int default_color);
+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);

-#endif //IMAGE_IMAGE_UTILS_H
+#endif /* IMAGE_IMAGE_UTILS_H */
@@ -0,0 +1,152 @@
+/*
+ * Copyright 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.
+ */
+
+#include <stdlib.h>
+#include <android/bitmap.h>
+#include <GLES2/gl2.h>
+#include <jni.h>
+
+#include "java_wrapper.h"
+#include "image.h"
+#include "log.h"
+
+static void *tile_buffer = NULL;
+
+static int jniGetFDFromFileDescriptor(JNIEnv *env, 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;
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_hippo_image_Image_nativeDecodeFdInt(JNIEnv *env, jclass clazz, jint fd) {
+    IMAGE *image = createFromFd(fd);
+    return (jlong) image;
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_hippo_image_Image_nativeDecode(JNIEnv *env, jclass clazz, jobject fd) {
+    return Java_com_hippo_image_Image_nativeDecodeFdInt(env, clazz,
+                                                        jniGetFDFromFileDescriptor(env, fd));
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_hippo_image_Image_nativeCreate(JNIEnv *env, jclass clazz, jobject bitmap) {
+    AndroidBitmapInfo info;
+    void *pixels = NULL;
+    void *image = NULL;
+
+    AndroidBitmap_getInfo(env, bitmap, &info);
+    AndroidBitmap_lockPixels(env, bitmap, &pixels);
+
+    image = create(info.width, info.height, pixels);
+    AndroidBitmap_unlockPixels(env, bitmap);
+    return (jlong) image;
+}
+
+JNIEXPORT void JNICALL
+Java_com_hippo_image_Image_nativeRender(JNIEnv *env, jclass clazz, jlong ptr, jint src_x,
+                                        jint src_y, jobject dst, jint dst_x, jint dst_y, jint width,
+                                        jint height) {
+    AndroidBitmapInfo info;
+    void *pixels = NULL;
+
+    AndroidBitmap_getInfo(env, dst, &info);
+    AndroidBitmap_lockPixels(env, dst, &pixels);
+
+    render((IMAGE *) ptr, src_x, src_y, pixels, info.width, info.height, dst_x, dst_y, width,
+           height);
+
+    AndroidBitmap_unlockPixels(env, dst);
+}
+
+JNIEXPORT void JNICALL
+Java_com_hippo_image_Image_nativeTexImage(JNIEnv *env, jclass clazz, jlong ptr, jboolean init,
+                                          jint src_x, jint src_y, jint width, jint height) {
+    if (width * height > IMAGE_TILE_MAX_SIZE)
+        return;
+
+    render((IMAGE *) ptr, src_x, src_y, tile_buffer, width, height, 0, 0, width, height);
+
+    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);
+    }
+}
+
+JNIEXPORT void JNICALL
+Java_com_hippo_image_Image_nativeAdvance(JNIEnv *env, jclass clazz, jlong ptr) {
+    advance((IMAGE *) ptr);
+}
+
+JNIEXPORT jint JNICALL
+Java_com_hippo_image_Image_nativeGetDelay(JNIEnv *env, jclass clazz, jlong ptr) {
+    return ((IMAGE *) ptr)->delay;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_hippo_image_Image_nativeIsOpaque(JNIEnv *env, jclass clazz, jlong ptr) {
+    return ((IMAGE *) ptr)->alpha;
+}
+
+JNIEXPORT void JNICALL
+Java_com_hippo_image_Image_nativeRecycle(JNIEnv *env, jclass clazz, jlong ptr) {
+    recycle((IMAGE *) ptr);
+}
+
+bool image_onLoad() {
+    tile_buffer = malloc(IMAGE_TILE_MAX_SIZE * 4);
+    return tile_buffer != NULL;
+}
+
+void image_onUnload() {
+    free(tile_buffer);
+    tile_buffer = NULL;
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_hippo_image_Image_nativeDecodeAddr(JNIEnv *env, jclass clazz, jlong addr) {
+    Memarea *memarea = (Memarea *) addr;
+    IMAGE *image = createFromAddr(memarea->buffer, memarea->size);
+    free(memarea);
+    return (jlong) image;
+}
+
+JNIEXPORT jint JNICALL
+Java_com_hippo_image_Image_nativeGetFormat(JNIEnv *env, jclass clazz, jlong native_ptr) {
+    return ((IMAGE *) native_ptr)->isAnimated;
+}
+
+JNIEXPORT jint JNICALL
+Java_com_hippo_image_Image_nativeGetWidth(JNIEnv *env, jclass clazz, jlong native_ptr) {
+    return ((IMAGE *) native_ptr)->width;
+}
+
+JNIEXPORT jint JNICALL
+Java_com_hippo_image_Image_nativeGetHeight(JNIEnv *env, jclass clazz, jlong native_ptr) {
+    return ((IMAGE *) native_ptr)->height;
+}
@@ -17,22 +17,20 @@
 * EhViewer. If not, see <https://www.gnu.org/licenses/>.
 */

-//
-// Created by Hippo on 12/28/2015.
-//
-
 #ifndef IMAGE_JAVA_WRAPPER_H
 #define IMAGE_JAVA_WRAPPER_H

-#include <jni.h>
 #include <stdbool.h>

 #define IMAGE_TILE_MAX_SIZE (512 * 512)

-bool image_onLoad(JavaVM *vm);
+typedef struct Memarea {
+    void *buffer;
+    long size;
+} Memarea;

-JNIEnv *obtain_env(bool *attach);
+bool image_onLoad();

-void release_env();
+void image_onUnload();

-#endif // IMAGE_JAVA_WRAPPER_H
+#endif /* IMAGE_JAVA_WRAPPER_H */
@@ -14,18 +14,12 @@
 * limitations under the License.
 */

-//
-// Created by Hippo on 10/19/2015.
-//
-
 #ifndef LOG_H
 #define LOG_H

 #include <android/log.h>

-#include "utils.h"
-
-#define TAG "Image"
+#define TAG "ImageDecoder_wrapper"
 #define LOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, TAG ,__VA_ARGS__)
 #define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, TAG ,__VA_ARGS__)
 #define LOGI(...) __android_log_print(ANDROID_LOG_INFO, TAG ,__VA_ARGS__)
@@ -33,11 +27,4 @@
 #define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, TAG ,__VA_ARGS__)
 #define LOGF(...) __android_log_print(ANDROID_LOG_FATAL, TAG ,__VA_ARGS__)

-#define FILE_LINE MAKESTRING(STRINGIZE, __LINE__ )
-#define MSG(msg) __FILE__ "(" FILE_LINE "): "msg
-
-#define OUT_OF_MEMORY "Out of memory"
-
-#define WTF_OM LOGE(MSG(OUT_OF_MEMORY))
-
-#endif //LOG_H
+#endif /* LOG_H */
@@ -21,10 +21,9 @@
 #include <archive.h>
 #include <lzma.h>
 #include <zlib.h>
-#include "image/libjpeg-turbo/jconfigint.h"
 #include <nettle/config.h>

-#include "java_wrapper.h"
+#include "image/java_wrapper.h"

 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
    JNIEnv *env;
@@ -40,6 +39,11 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
    return JNI_VERSION_1_6;
 }

+JNIEXPORT void JNICALL
+JNI_OnUnload(JavaVM *vm, void *reserved) {
+    image_onUnload();
+}
+
 JNIEXPORT jstring JNICALL
 Java_com_hippo_Native_getlibarchiveVersion(JNIEnv *env, jclass clazz) {
    return (*env)->NewStringUTF(env, ARCHIVE_VERSION_STRING);
@@ -50,11 +54,6 @@ Java_com_hippo_Native_getliblzmaVersion(JNIEnv *env, jclass clazz) {
    return (*env)->NewStringUTF(env, lzma_version_string());
 }

-JNIEXPORT jstring JNICALL
-Java_com_hippo_Native_getlibjpeg_1turboVersion(JNIEnv *env, jclass clazz) {
-    return (*env)->NewStringUTF(env, VERSION);
-}
-
 JNIEXPORT jstring JNICALL
 Java_com_hippo_Native_getzlibVersion(JNIEnv *env, jclass clazz) {
    return (*env)->NewStringUTF(env, ZLIB_VERSION);
@@ -28,8 +28,6 @@ public class Native {

    public static native String getliblzmaVersion();

-    public static native String getlibjpeg_turboVersion();
-
    public static native String getzlibVersion();

    public static native String getnettleVersion();
@@ -47,7 +47,7 @@ public class UriArchiveAccessor {

    private native int openArchive(long addr, long size);

-    public native void extracttoOutputStream(int index, int fd);
+    public native long extracttoOutputStream(int index);

    public native boolean needPassword();

@@ -167,6 +167,7 @@ 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;
@@ -175,21 +176,7 @@ 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
@@ -244,7 +231,21 @@ public final class DiskLruCache implements Closeable {
        cache = new DiskLruCache(directory, appVersion, valueCount, maxSize);
        cache.rebuildJournal();
        return cache;
-    }
+    }    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 void deleteIfExists(File file) throws IOException {
        if (file.exists() && !file.delete()) {
@@ -51,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;
@@ -72,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;
@@ -83,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;
    }
@@ -181,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;
@@ -223,6 +262,11 @@ public final class ConacoTask<V> {
            return this;
        }

+        public Builder<T> setDataContainer(DataContainer dataContainer) {
+            mDataContainer = dataContainer;
+            return this;
+        }
+
        boolean isUseMemoryCache() {
            return mUseMemoryCache;
        }
@@ -288,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");
            }
        }
@@ -308,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);
                    }
                }
@@ -394,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)) {
@@ -420,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);
@@ -437,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();
+}
@@ -107,7 +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 = false;
+    public static boolean locked = true;

    private static EhApplication instance;

@@ -337,10 +337,6 @@ public class EhApplication extends SceneApplication {
        EhEngine.initialize();
        BitmapUtils.initialize(this);

-        if (EhDB.needMerge()) {
-            EhDB.mergeOldDB(this);
-        }
-
        AppCompatDelegate.setApplicationLocales(LocaleListCompat.create(Settings.getLocale()));
        AppCompatDelegate.setDefaultNightMode(Settings.getTheme());

@@ -17,27 +17,23 @@
 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.room.Room;

 import com.hippo.ehviewer.client.data.GalleryInfo;
-import com.hippo.ehviewer.client.data.ListUrlBuilder;
-import com.hippo.ehviewer.dao.DaoMaster;
-import com.hippo.ehviewer.dao.DaoSession;
+import com.hippo.ehviewer.dao.BasicDao;
 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;
@@ -46,14 +42,8 @@ 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;
@@ -65,15 +55,11 @@ import java.util.ArrayList;
 import java.util.List;

 public class EhDB {
-
-    private static final String TAG = EhDB.class.getSimpleName();
+    private static final int CUR_DB_VER = 4;

    private static final int MAX_HISTORY_COUNT = 200;

-    private static DaoSession sDaoSession;
-
-    private static boolean sHasOldDB;
-    private static boolean sNewDB;
+    private static EhDatabase db;

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

    public static void initialize(Context context) {
-        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
-        }
+        db = Room.databaseBuilder(context, EhDatabase.class, "eh.db").allowMainThreadQueries().build();
    }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    public static synchronized List<GalleryInfo> searchLocalFavorites(String query) {
-        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;
+        LocalFavoritesDao dao = db.localFavoritesDao();
+        List<LocalFavoriteInfo> list = dao.list();
+        return new ArrayList<>(list);
    }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    public static synchronized void putHistoryInfo(GalleryInfo galleryInfo) {
-        HistoryDao dao = sDaoSession.getHistoryDao();
+        HistoryDao dao = db.historyDao();
        HistoryInfo info = dao.load(galleryInfo.gid);
        if (null != info) {
            // Update time
@@ -573,49 +344,47 @@ 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);
+            List<HistoryInfo> list = dao.list(MAX_HISTORY_COUNT, -1);
+            dao.delete(list);
        }
    }

    public static synchronized void putHistoryInfo(List<HistoryInfo> historyInfoList) {
-        HistoryDao dao = sDaoSession.getHistoryDao();
+        HistoryDao dao = db.historyDao();
        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);
+        List<HistoryInfo> list = dao.list(MAX_HISTORY_COUNT, -1);
+        dao.delete(list);
    }

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

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

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

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

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

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

-    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;
+    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;
    }

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

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

        try {
            // Copy data to a export db
-            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;
-            }
+            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;

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

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

-            DaoMaster daoMaster = new DaoMaster(db);
-            DaoSession session = daoMaster.newSession();
+            String tmpDBName = "tmp.db";
+            context.deleteDatabase(tmpDBName);
+            EhDatabase oldRoomDatabase = Room.databaseBuilder(context, EhDatabase.class, tmpDBName)
+                    .createFromFile(file).allowMainThreadQueries().build();
+

            // Downloads
            DownloadManager manager = EhApplication.getDownloadManager(context);
-            List<DownloadInfo> downloadInfoList = session.getDownloadsDao().queryBuilder().list();
+            List<DownloadInfo> downloadInfoList = oldRoomDatabase.downloadsDao().list();
            manager.addDownload(downloadInfoList, false);

            // Download label
-            List<DownloadLabel> downloadLabelList = session.getDownloadLabelDao().queryBuilder().list();
+            List<DownloadLabel> downloadLabelList = oldRoomDatabase.downloadLabelDao().list();
            manager.addDownloadLabel(downloadLabelList);

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

            // History
-            List<HistoryInfo> historyInfoList = session.getHistoryDao().queryBuilder().list();
+            List<HistoryInfo> historyInfoList = oldRoomDatabase.historyDao().list();
            putHistoryInfo(historyInfoList);

            // QuickSearch
-            List<QuickSearch> quickSearchList = session.getQuickSearchDao().queryBuilder().list();
-            List<QuickSearch> currentQuickSearchList = sDaoSession.getQuickSearchDao().queryBuilder().list();
+            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;
@@ -772,17 +533,14 @@ public class EhDB {
            importQuickSearch(importList);

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

-            // Bookmarks
-            // TODO
-
            // Filter
-            List<Filter> filterList = session.getFilterDao().queryBuilder().list();
-            List<Filter> currentFilterList = sDaoSession.getFilterDao().queryBuilder().list();
+            List<Filter> filterList = oldRoomDatabase.filterDao().list();
+            List<Filter> currentFilterList = db.filterDao().list();
            for (Filter filter : filterList) {
                if (!currentFilterList.contains(filter)) {
                    addFilter(filter);
@@ -796,46 +554,4 @@ 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,6 +23,7 @@ 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> {
@@ -34,7 +35,8 @@ public class ImageBitmapHelper implements ValueHelper<ImageBitmap> {
    public ImageBitmap decode(@NonNull InputStreamPipe isPipe) {
        try {
            isPipe.obtain();
-            return ImageBitmap.decode(isPipe.open());
+            FileInputStream is = (FileInputStream) isPipe.open();
+            return ImageBitmap.decode(is.getFD());
        } catch (OutOfMemoryError | IOException e) {
            return null;
        } finally {
@@ -100,11 +100,6 @@ public class Settings {
    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;
-    public static final String KEY_LIST_THUMB_SIZE = "list_tile_size";
-    private static final int DEFAULT_LIST_THUMB_SIZE = 40;
-    private static int LIST_THUMB_SIZE = 40;
-
-    public static boolean LIST_THUMB_SIZE_INITED = false;
    private static final String KEY_AVATAR = "avatar";
    private static final String DEFAULT_AVATAR = null;
    private static final String KEY_SHOW_WARNING = "show_warning";
@@ -1173,14 +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;
-    }
 }
@@ -44,7 +44,7 @@ public class FavListUrlBuilder implements Parcelable {
        }
    };
    private static final String TAG = FavListUrlBuilder.class.getSimpleName();
-    private String mNext;
+    private int mIndex;
    private String mKeyword;
    private int mFavCat = FAV_CAT_ALL;

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

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

-    public void setNext(String next) {
-        mNext = next;
+    public void setIndex(int index) {
+        mIndex = index;
    }

    public String getKeyword() {
@@ -105,8 +105,8 @@ public class FavListUrlBuilder implements Parcelable {
                Log.e(TAG, "Can't URLEncoder.encode " + mKeyword);
            }
        }
-        if (mNext != null && !mNext.isEmpty()) {
-            ub.addQuery("next", mNext);
+        if (mIndex > 0) {
+            ub.addQuery("page", Integer.toString(mIndex));
        }
        return ub.build();
    }
@@ -118,7 +118,7 @@ public class FavListUrlBuilder implements Parcelable {

    @Override
    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(this.mNext);
+        dest.writeInt(this.mIndex);
        dest.writeString(this.mKeyword);
        dest.writeInt(this.mFavCat);
    }
@@ -20,6 +20,9 @@ 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;

@@ -108,30 +111,52 @@ 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() {
@@ -170,6 +195,7 @@ 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)) {
@@ -64,8 +64,7 @@ public class ListUrlBuilder implements Cloneable, Parcelable {
    @Mode
    private int mMode = MODE_NORMAL;

-    private int mNextGid = 0;
-    private int mPrevGid = 0;
+    private int mPageIndex = 0;

    private int mCategory = EhUtils.NONE;
    private String mKeyword = null;
@@ -87,8 +86,7 @@ public class ListUrlBuilder implements Cloneable, Parcelable {
    @SuppressWarnings("WrongConstant")
    protected ListUrlBuilder(Parcel in) {
        this.mMode = in.readInt();
-        this.mNextGid = in.readInt();
-        this.mPrevGid = in.readInt();
+        this.mPageIndex = in.readInt();
        this.mCategory = in.readInt();
        this.mKeyword = in.readString();
        this.mAdvanceSearch = in.readInt();
@@ -107,8 +105,7 @@ public class ListUrlBuilder implements Cloneable, Parcelable {
     */
    public void reset() {
        mMode = MODE_NORMAL;
-        mNextGid = 0;
-        mPrevGid = 0;
+        mPageIndex = 0;
        mCategory = EhUtils.NONE;
        mKeyword = null;
        mAdvanceSearch = -1;
@@ -140,12 +137,12 @@ public class ListUrlBuilder implements Cloneable, Parcelable {
        mMode = mode;
    }

-    public void setNextGid(int nextGid) {
-        mNextGid = nextGid;
+    public int getPageIndex() {
+        return mPageIndex;
    }

-    public void setPrevGid(int prevGid) {
-        mPrevGid = prevGid;
+    public void setPageIndex(int pageIndex) {
+        mPageIndex = pageIndex;
    }

    public int getCategory() {
@@ -236,8 +233,7 @@ public class ListUrlBuilder implements Cloneable, Parcelable {
     */
    public void set(ListUrlBuilder lub) {
        mMode = lub.mMode;
-        mNextGid = lub.mNextGid;
-        mPrevGid = lub.mPrevGid;
+        mPageIndex = lub.mPageIndex;
        mCategory = lub.mCategory;
        mKeyword = lub.mKeyword;
        mAdvanceSearch = lub.mAdvanceSearch;
@@ -528,11 +524,9 @@ public class ListUrlBuilder implements Cloneable, Parcelable {
                if (mSHash != null) {
                    ub.addQuery("f_shash", mSHash);
                }
-                if (mNextGid != 0) {
-                    ub.addQuery("next", mNextGid);
-                }
-                if (mPrevGid != 0) {
-                    ub.addQuery("prev", mPrevGid);
+                // Page index
+                if (mPageIndex != 0) {
+                    ub.addQuery("page", mPageIndex);
                }
                // Advance search
                if (mAdvanceSearch != -1) {
@@ -576,8 +570,8 @@ public class ListUrlBuilder implements Cloneable, Parcelable {
                } catch (UnsupportedEncodingException e) {
                    // Empty
                }
-                if (mNextGid != 0) {
-                    sb.append("?next=").append(mNextGid);
+                if (mPageIndex != 0) {
+                    sb.append('/').append(mPageIndex);
                }
                return sb.toString();
            }
@@ -589,8 +583,8 @@ public class ListUrlBuilder implements Cloneable, Parcelable {
                } catch (UnsupportedEncodingException e) {
                    // Empty
                }
-                if (mNextGid != 0) {
-                    sb.append("?next=").append(mNextGid);
+                if (mPageIndex != 0) {
+                    sb.append('/').append(mPageIndex);
                }
                return sb.toString();
            }
@@ -606,8 +600,8 @@ public class ListUrlBuilder implements Cloneable, Parcelable {
                } catch (UnsupportedEncodingException e) {
                    // Empty
                }
-                if (mNextGid != 0) {
-                    sb.append("&p=").append(mNextGid);
+                if (mPageIndex != 0) {
+                    sb.append("&p=").append(mPageIndex);
                }
                return sb.toString();
        }
@@ -621,8 +615,7 @@ public class ListUrlBuilder implements Cloneable, Parcelable {
    @Override
    public void writeToParcel(Parcel dest, int flags) {
        dest.writeInt(this.mMode);
-        dest.writeInt(this.mNextGid);
-        dest.writeInt(this.mPrevGid);
+        dest.writeInt(this.mPageIndex);
        dest.writeInt(this.mCategory);
        dest.writeString(this.mKeyword);
        dest.writeInt(this.mAdvanceSearch);
@@ -31,10 +31,8 @@ import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;

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

 public class FavoritesParser {
-    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>")) {
@@ -61,25 +59,14 @@ public class FavoritesParser {
            e.printStackTrace();
            throw new ParseException("Parse favorites error", body);
        }
-        Result re = new Result();
-
-        try {
-            var d = Jsoup.parse(body);
-            var snv = d.getElementsByClass("searchnav").first();
-            assert snv != null;
-            var href = snv.child(3).child(0).attr("href");
-            var matcher = PATTERN_NEXT_PAGE.matcher(href);
-            if (matcher.find()) {
-                re.nextPage = matcher.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;
@@ -88,7 +75,8 @@ public class FavoritesParser {
    public static class Result {
        public String[] catArray; // Size 10
        public int[] countArray; // Size 10
-        public String nextPage;
+        public int pages;
+        public int nextPage;
        public List<GalleryInfo> galleryInfoList;
    }
 }
@@ -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_GETINT = Pattern.compile("[^0-9]");
+    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"},
@@ -298,21 +297,39 @@ public class GalleryListParser {
        return gi;
    }

-    private static int getInt(String str) {
-        var m = PATTERN_GETINT.matcher(str);
-        return Integer.parseInt(m.replaceAll("").trim());
-    }
-
    public static Result parse(@NonNull String body) throws Exception {
        Result result = new Result();
        Document d = Jsoup.parse(body);

-        result.founds = Integer.MAX_VALUE;
-        result.noWatchedTags = body.contains("<p>You do not have any watched tags");
-        if (body.contains("No hits found</p>")) {
-            result.founds = 0;
-            result.galleryInfoList = Collections.EMPTY_LIST;
-            return result;
+        try {
+            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.pages = 0;
+                //noinspection unchecked
+                result.galleryInfoList = Collections.EMPTY_LIST;
+                return result;
+            } else if (d.getElementsByClass("ptt").isEmpty()) {
+                result.pages = 1;
+            } else {
+                result.pages = Integer.MAX_VALUE;
+            }
        }

        try {
@@ -347,7 +364,8 @@ public class GalleryListParser {
    }

    public static class Result {
-        public int founds;
+        public int pages;
+        public int nextPage;
        public boolean noWatchedTags;
        public List<GalleryInfo> galleryInfoList;
    }
@@ -0,0 +1,8 @@
+package com.hippo.ehviewer.dao;
+
+import java.util.List;
+
+public interface BasicDao<T> {
+    List<T> list();
+    long insert(T t);
+}
@@ -0,0 +1,160 @@
+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);
+    }
+}
@@ -0,0 +1,20 @@
+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();
+}
@@ -0,0 +1,30 @@
+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;
+    }
+}
@@ -0,0 +1,29 @@
+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();
+}
@@ -0,0 +1,252 @@
+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;
+    }
+}
@@ -0,0 +1,40 @@
+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;
+    }
+}
@@ -0,0 +1,30 @@
+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);
+}
@@ -0,0 +1,27 @@
+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);
+}
@@ -0,0 +1,23 @@
+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();
+}
@@ -0,0 +1,67 @@
+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)) {
+            return false;
+        }
+        Filter filter = (Filter) o;
+        return filter.mode == mode && ObjectUtils.equal(filter.text, text);
+    }
+}
@@ -0,0 +1,27 @@
+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);
+}
@@ -0,0 +1,36 @@
+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 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);
+
+    @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();
+}
@@ -0,0 +1,160 @@
+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);
+    }
+}
@@ -0,0 +1,147 @@
+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);
+    }
+}
@@ -0,0 +1,29 @@
+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);
+}
@@ -0,0 +1,117 @@
+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;
+    }
+}
@@ -0,0 +1,30 @@
+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.gid);
+            EhDB.removeDownloadInfo(info);

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

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

            // Remove from all info map
            mAllInfoList.remove(info);
@@ -34,7 +34,6 @@ import com.hippo.unifile.UniFile;
 import com.hippo.yorozuya.thread.PVLock;
 import com.hippo.yorozuya.thread.PriorityThread;

-import java.io.InputStream;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -50,7 +49,7 @@ public class ArchiveGalleryProvider extends GalleryProvider2 {
    private final UriArchiveAccessor archiveAccessor;
    private final Stack<Integer> requests = new Stack<>();
    private final AtomicInteger extractingIndex = new AtomicInteger(GalleryPageView.INVALID_INDEX);
-    private final LinkedHashMap<Integer, InputStream> streams = new LinkedHashMap<>();
+    private final LinkedHashMap<Integer, Long> streams = new LinkedHashMap<>();
    private final AtomicInteger decodingIndex = new AtomicInteger(GalleryPageView.INVALID_INDEX);
    private Thread archiveThread;
    private Thread decodeThread;
@@ -250,18 +249,18 @@ public class ArchiveGalleryProvider extends GalleryProvider2 {
                    continue;
                }

-                Pipe pipe = new Pipe();
-
                synchronized (streams) {
                    if (streams.get(index) != null) {
                        continue;
                    }
-                    streams.put(index, pipe.getInputStream());
-                    streams.notify();
                }

-                archiveAccessor.extracttoOutputStream(index, pipe.getOutputFd());
-                pipe.closeOutputFd();
+                long addr = archiveAccessor.extracttoOutputStream(index);
+
+                synchronized (streams) {
+                    streams.put(index, addr);
+                    streams.notify();
+                }
            }
        }
    }
@@ -271,7 +270,7 @@ public class ArchiveGalleryProvider extends GalleryProvider2 {
        public void run() {
            while (!Thread.currentThread().isInterrupted()) {
                int index;
-                InputStream stream;
+                Long addr;
                synchronized (streams) {
                    if (streams.isEmpty()) {
                        try {
@@ -283,16 +282,16 @@ public class ArchiveGalleryProvider extends GalleryProvider2 {
                        continue;
                    }

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

                try {
-                    Image image = Image.decode(stream, true);
+                    Image image = Image.decodeAddr(addr, true);
                    if (image != null) {
                        notifyPageSucceed(index, image);
                    } else {
@@ -34,6 +34,7 @@ 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;
@@ -258,7 +259,7 @@ public class DirGalleryProvider extends GalleryProvider2 implements Runnable {
            InputStream is = null;
            try {
                is = files[index].openInputStream();
-                Image image = Image.decode(is, true);
+                Image image = Image.decode(((FileInputStream) is).getFD(), true);
                mDecodingIndex.lazySet(GalleryPageView.INVALID_INDEX);
                if (image != null) {
                    notifyPageSucceed(index, image);
@@ -1,52 +0,0 @@
-/*
- * 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();
-        }
-    }
-}
@@ -44,14 +44,13 @@ class VersionPreference @JvmOverloads constructor(
        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 {
+        fun addLib(libname: String, libversion: String): NativeLibInfo {
            message = "$message$libname $libversion\n"
            return this
        }
@@ -66,6 +66,7 @@ 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;
@@ -1096,33 +1097,6 @@ 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;
@@ -1693,7 +1667,7 @@ public final class SpiderQueen implements Runnable {

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

                if (is != null) {
-                    image = Image.decode(is, true);
+                    try {
+                        image = Image.decode(((FileInputStream) is).getFD(), true);
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    } finally {
+                        try {
+                            is.close();
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                    }
                    if (image == null) {
                        error = GetText.getString(R.string.error_decoding_failed);
                    }
@@ -45,10 +45,6 @@ import java.util.List;

 public final class CommonOperations {

-    public static int getPagesForFounds(int founds, int per) {
-        return (int)Math.ceil((double) founds/per);
-    }
-
    private static void doAddToFavorites(Activity activity, GalleryInfo galleryInfo,
                                         int slot, EhClient.Callback<Void> listener) {
        if (slot == -1) {
@@ -17,6 +17,7 @@
 package com.hippo.ehviewer.ui;

 import android.content.Context;
+import android.content.Intent;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Color;
@@ -123,6 +124,9 @@ public abstract class EhActivity extends AppCompatActivity {

    @Override
    protected void onResume() {
+        if (Settings.getSecurity() && SecurityActivity.Companion.isAuthenticationSupported(this) && EhApplication.locked) {
+            startActivity(new Intent(this, SecurityActivity.class));
+        }
        super.onResume();
        if (Settings.getEnabledSecurity()) {
            getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE,
@@ -226,6 +226,9 @@ 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) {
@@ -287,7 +290,16 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
        }
        outState.putInt(KEY_PAGE, mPage);
        outState.putInt(KEY_CURRENT_INDEX, mCurrentIndex);
-    }
+    }    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 attachBaseContext(@NonNull Context newBase) {
@@ -394,22 +406,17 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
            }
            switch (event.getAction()) {
                case MotionEvent.ACTION_SCROLL:
-                    float scroll = event.getAxisValue(MotionEvent.AXIS_VSCROLL) * 300;
-                    if (scroll < 0.0f) {
+                    if (event.getAxisValue(MotionEvent.AXIS_VSCROLL) < 0.0f) {
                        if (mLayoutMode == GalleryView.LAYOUT_RIGHT_TO_LEFT) {
                            mGalleryView.pageLeft();
-                        } else if (mLayoutMode == GalleryView.LAYOUT_LEFT_TO_RIGHT){
+                        } else {
                            mGalleryView.pageRight();
-                        } else if (mLayoutMode == GalleryView.LAYOUT_TOP_TO_BOTTOM) {
-                            mGalleryView.onScroll(0, -scroll, 0, -scroll, 0, -scroll);
                        }
                    } else {
                        if (mLayoutMode == GalleryView.LAYOUT_RIGHT_TO_LEFT) {
                            mGalleryView.pageRight();
-                        } else if (mLayoutMode == GalleryView.LAYOUT_LEFT_TO_RIGHT) {
+                        } else {
                            mGalleryView.pageLeft();
-                        } else if (mLayoutMode == GalleryView.LAYOUT_TOP_TO_BOTTOM) {
-                            mGalleryView.onScroll(0, -scroll, 0, -scroll, 0, -scroll);
                        }
                    }
            }
@@ -482,16 +489,7 @@ 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() {
@@ -1051,6 +1049,66 @@ 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;
@@ -1311,69 +1369,5 @@ 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;
-                }
-            }
-        }
-    }
 }
@@ -47,7 +47,6 @@ import com.google.android.material.navigation.NavigationView;
 import com.google.android.material.snackbar.Snackbar;
 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;
@@ -67,11 +66,9 @@ 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;
@@ -98,8 +95,6 @@ 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);
@@ -143,11 +138,7 @@ public final class MainActivity extends StageActivity
    @NonNull
    @Override
    protected Announcer getLaunchAnnouncer() {
-        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)) {
+        if (EhUtils.needSignedIn(this)) {
            return new Announcer(SignInScene.class);
        } else if (Settings.getSelectSite()) {
            return new Announcer(SelectSiteScene.class);
@@ -161,17 +152,7 @@ public final class MainActivity extends StageActivity
    // Sometimes scene can't show directly
    private Announcer processAnnouncer(Announcer announcer) {
        if (0 == getSceneCount()) {
-            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)) {
+            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());
@@ -307,6 +288,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);

@@ -426,9 +408,6 @@ 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();
@@ -16,10 +16,11 @@
 * If not, see <https://www.gnu.org/licenses/>.
 */

-package com.hippo.ehviewer.ui.scene
+package com.hippo.ehviewer.ui

 import android.content.Context
 import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import androidx.biometric.BiometricManager
 import androidx.biometric.BiometricManager.Authenticators.DEVICE_CREDENTIAL
 import androidx.biometric.BiometricPrompt
@@ -30,14 +31,10 @@ import androidx.fragment.app.FragmentActivity
 import com.hippo.ehviewer.EhApplication
 import com.hippo.ehviewer.R

-class SecurityScene : SolidScene() {
-    override fun needShowLeftDrawer(): Boolean {
-        return false
-    }
-
+class SecurityActivity : AppCompatActivity() {
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-        if (isAuthenticationSupported(requireContext()))
+        if (isAuthenticationSupported(this))
            startAuthentication(getString(R.string.settings_privacy_require_unlock))
        else
            onSuccess()
@@ -52,7 +49,7 @@ class SecurityScene : SolidScene() {
            title = title,
            subtitle = subtitle,
            confirmationRequired = confirmationRequired,
-            executor = ContextCompat.getMainExecutor(requireContext()),
+            executor = ContextCompat.getMainExecutor(this),
            callback = AuthenticationCallback()
        )
    }
@@ -70,7 +67,7 @@ class SecurityScene : SolidScene() {
            errorCode: Int,
            errString: CharSequence
        ) {
-            requireActivity().finish()
+            moveTaskToBack(true)
        }
    }

@@ -84,8 +81,6 @@ class SecurityScene : SolidScene() {

    private fun onSuccess() {
        EhApplication.locked = false
-        if (stackIndex == 0)
-            startSceneForCheckStep(CHECK_STEP_SECURITY, arguments)
        finish()
    }
 }
@@ -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,64 +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 androidx.annotation.StringRes
-import androidx.core.view.WindowCompat
-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
-
-class SettingsActivity : EhActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_preference)
-        setSupportActionBar(findViewById(R.id.toolbar))
-        val bar = supportActionBar
-        bar?.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) {
-            onBackPressed()
-            return true
-        }
-        return super.onOptionsItemSelected(item)
-    }
-}
@@ -17,13 +17,11 @@
 package com.hippo.ehviewer.ui.fragment;

 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.util.Log;

 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
@@ -40,11 +38,6 @@ 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;
@@ -59,7 +52,6 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;

@@ -71,7 +63,6 @@ public class AdvancedFragment extends BasePreferenceFragment {
    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(),
@@ -239,7 +230,6 @@ public class AdvancedFragment extends BasePreferenceFragment {
        Preference importData = findPreference(KEY_IMPORT_DATA);
        Preference exportData = findPreference(KEY_EXPORT_DATA);
        Preference openByDefault = findPreference(KEY_OPEN_BY_DEFAULT);
-        Preference backupFavorite = findPreference(KEY_BACKUP_FAVORITE);

        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
            openByDefault.setVisible(false);
@@ -251,7 +241,6 @@ public class AdvancedFragment extends BasePreferenceFragment {
        clearMemoryCache.setOnPreferenceClickListener(this);
        importData.setOnPreferenceClickListener(this);
        exportData.setOnPreferenceClickListener(this);
-        backupFavorite.setOnPreferenceClickListener(this);

        appLanguage.setOnPreferenceChangeListener(this);
    }
@@ -298,62 +287,10 @@ public class AdvancedFragment extends BasePreferenceFragment {
                startActivity(intent);
            }
            return true;
-        } else if (KEY_BACKUP_FAVORITE.equals(key)) {
-            try {
-                showTip(R.string.backup_favorite_start, BaseScene.LENGTH_SHORT);
-                backupFavorite();
-            } catch (Exception e) {
-                ExceptionUtils.throwIfFatal(e);
-                showTip(R.string.backup_favorite_failed, BaseScene.LENGTH_SHORT);
-            }
-            return true;
        }
        return false;
    }

-    private void backupFavorite() {
-        AtomicInteger page = new AtomicInteger(0);
-        Context context = requireContext();
-        Activity activity = requireActivity();
-        EhClient mClient = EhApplication.getEhClient(context);
-        FavListUrlBuilder favListUrlBuilder = new FavListUrlBuilder();
-        // favListUrlBuilder.setNext(page.get());
-
-        EhRequest request = new EhRequest();
-        request.setMethod(EhClient.METHOD_GET_FAVORITES);
-        request.setCallback(new EhClient.Callback() {
-            @Override
-            public void onSuccess(Object result) {
-                try {
-                    FavoritesParser.Result result1 = (FavoritesParser.Result) result;
-                    EhDB.putLocalFavorites(result1.galleryInfoList);
-                    Log.d("LocalFavorites", "now backup page " + page.get());
-                    if (!result1.galleryInfoList.isEmpty()) {
-                        // favListUrlBuilder.setNext(page.incrementAndGet());
-                        request.setArgs(favListUrlBuilder.build(), Settings.getShowJpnTitle());
-                        mClient.execute(request);
-                    } else {
-                        showTip(R.string.backup_favorite_success, BaseScene.LENGTH_SHORT);
-                    }
-                } catch (Exception e) {
-                    showTip(R.string.backup_favorite_failed, BaseScene.LENGTH_SHORT);
-                }
-            }
-
-            @Override
-            public void onFailure(Exception e) {
-                showTip(R.string.backup_favorite_failed, BaseScene.LENGTH_SHORT);
-            }
-
-            @Override
-            public void onCancel() {
-                showTip(R.string.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();
@@ -38,7 +38,6 @@ public class EhFragment extends BasePreferenceFragment {
        Preference blackDarkTheme = findPreference(Settings.KEY_BLACK_DARK_THEME);
        Preference gallerySite = findPreference(Settings.KEY_GALLERY_SITE);
        Preference listMode = findPreference(Settings.KEY_LIST_MODE);
-        Preference listThumbSize = findPreference(Settings.KEY_LIST_THUMB_SIZE);
        Preference detailSize = findPreference(Settings.KEY_DETAIL_SIZE);
        Preference thumbSize = findPreference(Settings.KEY_THUMB_SIZE);
        Preference showTagTranslations = findPreference(Settings.KEY_SHOW_TAG_TRANSLATIONS);
@@ -47,7 +46,6 @@ public class EhFragment extends BasePreferenceFragment {
        theme.setOnPreferenceChangeListener(this);
        gallerySite.setOnPreferenceChangeListener(this);
        listMode.setOnPreferenceChangeListener(this);
-        listThumbSize.setOnPreferenceChangeListener(this);
        detailSize.setOnPreferenceChangeListener(this);
        thumbSize.setOnPreferenceChangeListener(this);
        showTagTranslations.setOnPreferenceChangeListener(this);
@@ -72,10 +70,6 @@ public class EhFragment extends BasePreferenceFragment {
        } else if (Settings.KEY_LIST_MODE.equals(key)) {
            requireActivity().setResult(Activity.RESULT_OK);
            return true;
-        } else if (Settings.KEY_LIST_THUMB_SIZE.equals(key)) {
-            Settings.LIST_THUMB_SIZE_INITED = false;
-            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)) {
@@ -22,7 +22,7 @@ import android.os.Bundle
 import androidx.preference.SwitchPreferenceCompat
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.ui.scene.SecurityScene.Companion.isAuthenticationSupported
+import com.hippo.ehviewer.ui.SecurityActivity.Companion.isAuthenticationSupported

 /**
 * Created by Mo10 on 2018/2/10.
@@ -56,6 +56,7 @@ public abstract class BaseScene extends SceneFragment {
    private View drawerView;
    @Nullable
    private SparseArray<Parcelable> drawerViewState;
+    private boolean needWhiteStatusBar = needWhiteStatusBar();

    public void addAboveSnackView(View view) {
        FragmentActivity activity = getActivity();
@@ -117,6 +118,10 @@ public abstract class BaseScene extends SceneFragment {
        return true;
    }

+    public boolean needWhiteStatusBar() {
+        return true;
+    }
+
    public int getNavCheckedItem() {
        return 0;
    }
@@ -171,6 +176,14 @@ public abstract class BaseScene extends SceneFragment {
        drawerView = null;
    }

+    public void setLightStatusBar(boolean set) {
+        var insetsController = getInsetsController();
+        if (insetsController != null) {
+            insetsController.setAppearanceLightStatusBars(set && (requireActivity().getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_YES) <= 0);
+        }
+        needWhiteStatusBar = set;
+    }
+
    public void onDestroyDrawerView() {
    }

@@ -200,11 +213,7 @@ public abstract class BaseScene extends SceneFragment {

        // Hide soft ime
        hideSoftInput();
-
-        insetsController = getInsetsController();
-        if (insetsController != null) {
-            insetsController.setAppearanceLightStatusBars((requireActivity().getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_YES) <= 0);
-        }
+        setLightStatusBar(needWhiteStatusBar);
    }

    @Nullable
@@ -22,17 +22,21 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Resources;
+import android.graphics.Point;
+import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseBooleanArray;
+import android.view.Display;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
@@ -41,11 +45,11 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.PopupMenu;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
-import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.SimpleItemAnimator;
@@ -53,8 +57,16 @@ import androidx.recyclerview.widget.StaggeredGridLayoutManager;

 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.h6ah4i.android.widget.advrecyclerview.animator.DraggableItemAnimator;
+import com.h6ah4i.android.widget.advrecyclerview.animator.GeneralItemAnimator;
+import com.h6ah4i.android.widget.advrecyclerview.draggable.DraggableItemAdapter;
+import com.h6ah4i.android.widget.advrecyclerview.draggable.ItemDraggableRange;
+import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager;
+import com.h6ah4i.android.widget.advrecyclerview.utils.AbstractDraggableItemViewHolder;
 import com.hippo.app.CheckBoxDialogBuilder;
 import com.hippo.app.EditTextDialogBuilder;
+import com.hippo.conaco.DataContainer;
+import com.hippo.conaco.ProgressNotifier;
 import com.hippo.easyrecyclerview.EasyRecyclerView;
 import com.hippo.easyrecyclerview.FastScroller;
 import com.hippo.easyrecyclerview.HandlerDrawable;
@@ -71,6 +83,7 @@ import com.hippo.ehviewer.download.DownloadManager;
 import com.hippo.ehviewer.download.DownloadService;
 import com.hippo.ehviewer.spider.SpiderDen;
 import com.hippo.ehviewer.ui.GalleryActivity;
+import com.hippo.ehviewer.ui.MainActivity;
 import com.hippo.ehviewer.widget.SimpleRatingView;
 import com.hippo.io.UniFileInputStreamPipe;
 import com.hippo.scene.Announcer;
@@ -84,6 +97,7 @@ import com.hippo.widget.recyclerview.AutoStaggeredGridLayoutManager;
 import com.hippo.yorozuya.AssertUtils;
 import com.hippo.yorozuya.FileUtils;
 import com.hippo.yorozuya.IOUtils;
+import com.hippo.yorozuya.LayoutUtils;
 import com.hippo.yorozuya.ObjectUtils;
 import com.hippo.yorozuya.ViewUtils;
 import com.hippo.yorozuya.collect.LongList;
@@ -542,13 +556,20 @@ public class DownloadsScene extends ToolbarScene

        initLabels();

+        RecyclerViewDragDropManager dragDropManager = new RecyclerViewDragDropManager();
+        dragDropManager.setInitiateOnLongPress(true);
+        dragDropManager.setInitiateOnTouch(false);
+        dragDropManager.setDraggingItemAlpha(0.8f);
+
        mLabelAdapter = new DownloadLabelAdapter(inflater);
        final EasyRecyclerView recyclerView = view.findViewById(R.id.recycler_view_drawer);
        recyclerView.setLayoutManager(new LinearLayoutManager(context));
        mLabelAdapter.setHasStableIds(true);
-        ItemTouchHelper itemTouchHelper = new ItemTouchHelper(new DownloadLabelItemTouchHelperCallback());
-        itemTouchHelper.attachToRecyclerView(recyclerView);
-        recyclerView.setAdapter(mLabelAdapter);
+        final GeneralItemAnimator animator = new DraggableItemAnimator();
+        recyclerView.setItemAnimator(animator);
+        recyclerView.setAdapter(dragDropManager.createWrappedAdapter(mLabelAdapter));
+        dragDropManager.attachRecyclerView(recyclerView);
+

        return view;
    }
@@ -871,7 +892,7 @@ public class DownloadsScene extends ToolbarScene
        holder.speed.setText(FileUtils.humanReadableByteCount(speed, false) + "/S");
    }

-    private static class DownloadLabelHolder extends RecyclerView.ViewHolder {
+    private static class DownloadLabelHolder extends AbstractDraggableItemViewHolder {

        private final TextView label;
        private final ImageView option;
@@ -883,7 +904,74 @@ public class DownloadsScene extends ToolbarScene
        }
    }

-    private class DownloadLabelAdapter extends RecyclerView.Adapter<DownloadLabelHolder> {
+    private static class ThumbDataContainer implements DataContainer {
+
+        private final DownloadInfo mInfo;
+        @Nullable
+        private UniFile mFile;
+
+        public ThumbDataContainer(@NonNull DownloadInfo info) {
+            mInfo = info;
+        }
+
+        private void ensureFile() {
+            if (mFile == null) {
+                UniFile dir = SpiderDen.getGalleryDownloadDir(mInfo);
+                if (dir != null && dir.isDirectory()) {
+                    mFile = dir.createFile(".thumb");
+                }
+            }
+        }
+
+        @Override
+        public boolean isEnabled() {
+            ensureFile();
+            return mFile != null;
+        }
+
+        @Override
+        public void onUrlMoved(String requestUrl, String responseUrl) {
+        }
+
+        @Override
+        public boolean save(InputStream is, long length, String mediaType, ProgressNotifier notify) {
+            ensureFile();
+            if (mFile == null) {
+                return false;
+            }
+
+            OutputStream os = null;
+            try {
+                os = mFile.openOutputStream();
+                IOUtils.copy(is, os);
+                return true;
+            } catch (IOException e) {
+                e.printStackTrace();
+                return false;
+            } finally {
+                IOUtils.closeQuietly(os);
+            }
+        }
+
+        @Override
+        public InputStreamPipe get() {
+            ensureFile();
+            if (mFile != null) {
+                return new UniFileInputStreamPipe(mFile);
+            } else {
+                return null;
+            }
+        }
+
+        @Override
+        public void remove() {
+            if (mFile != null) {
+                mFile.delete();
+            }
+        }
+    }
+
+    private class DownloadLabelAdapter extends RecyclerView.Adapter<DownloadLabelHolder> implements DraggableItemAdapter<DownloadLabelHolder> {

        private final LayoutInflater mInflater;

@@ -937,15 +1025,36 @@ public class DownloadsScene extends ToolbarScene
                });
                if (position > 0) {
                    holder.option.setVisibility(View.VISIBLE);
-                    holder.option.setOnClickListener(v -> {
+                    holder.itemView.setOnLongClickListener(v -> {
                        if (context != null) {
-                            EditTextDialogBuilder builder = new EditTextDialogBuilder(
-                                    context, label, getString(R.string.download_labels));
-                            builder.setTitle(R.string.rename_label_title);
-                            builder.setPositiveButton(android.R.string.ok, null);
-                            AlertDialog dialog = builder.show();
-                            new RenameLabelDialogHelper(builder, dialog, label);
+                            PopupMenu popupMenu = new PopupMenu(context, holder.option);
+                            popupMenu.inflate(R.menu.download_label_option);
+                            popupMenu.show();
+                            popupMenu.setOnMenuItemClickListener(item -> {
+                                int itemId = item.getItemId();
+                                if (itemId == R.id.menu_label_rename) {
+                                    EditTextDialogBuilder builder = new EditTextDialogBuilder(
+                                            context, label, getString(R.string.download_labels));
+                                    builder.setTitle(R.string.rename_label_title);
+                                    builder.setPositiveButton(android.R.string.ok, null);
+                                    AlertDialog dialog = builder.show();
+                                    new RenameLabelDialogHelper(builder, dialog, label);
+                                } else if (itemId == R.id.menu_label_remove) {
+                                    new MaterialAlertDialogBuilder(requireContext())
+                                            .setTitle(getString(R.string.delete_label_title))
+                                            .setMessage(getString(R.string.delete_label_message, label))
+                                            .setPositiveButton(R.string.delete, (dialog, which) -> {
+                                                mDownloadManager.deleteLabel(label);
+                                                mLabels.remove(position);
+                                                notifyDataSetChanged();
+                                            })
+                                            .setNegativeButton(android.R.string.cancel, null)
+                                            .show();
+                                }
+                                return false;
+                            });
                        }
+                        return true;
                    });
                } else {
                    holder.option.setVisibility(View.GONE);
@@ -962,6 +1071,43 @@ public class DownloadsScene extends ToolbarScene
        public int getItemCount() {
            return mLabels != null ? mLabels.size() : 0;
        }
+
+        @Override
+        public boolean onCheckCanStartDrag(@NonNull DownloadLabelHolder holder, int position, int x, int y) {
+            return position != 0 && x > holder.option.getX() && y > holder.option.getY();
+        }
+
+        @Override
+        public ItemDraggableRange onGetItemDraggableRange(@NonNull DownloadLabelHolder holder, int position) {
+            return new ItemDraggableRange(1, getItemCount() - 1);
+        }
+
+        @Override
+        public void onMoveItem(int fromPosition, int toPosition) {
+            Context context = getContext();
+            if (null == context || fromPosition == toPosition || toPosition == 0) {
+                return;
+            }
+
+            EhApplication.getDownloadManager(context).moveLabel(fromPosition - 1, toPosition - 1);
+            final String item = mLabels.remove(fromPosition);
+            mLabels.add(toPosition, item);
+        }
+
+        @Override
+        public boolean onCheckCanDrop(int draggingPosition, int dropPosition) {
+            return dropPosition != 0;
+        }
+
+        @Override
+        public void onItemDragStarted(int position) {
+            notifyDataSetChanged();
+        }
+
+        @Override
+        public void onItemDragFinished(int fromPosition, int toPosition, boolean result) {
+            notifyDataSetChanged();
+        }
    }

    private class DeleteRangeDialogHelper implements DialogInterface.OnClickListener {
@@ -1161,7 +1307,8 @@ public class DownloadsScene extends ToolbarScene
                return;
            }
            DownloadInfo info = mList.get(position);
-            holder.thumb.load(EhCacheKeyFactory.getThumbKey(info.gid), info.thumb, true);
+            holder.thumb.load(EhCacheKeyFactory.getThumbKey(info.gid), info.thumb,
+                    new ThumbDataContainer(info), true);
            holder.title.setText(EhUtils.getSuitableTitle(info));
            holder.uploader.setText(info.uploader);
            holder.rating.setRating(info.rating);
@@ -1298,43 +1445,4 @@ public class DownloadsScene extends ToolbarScene
            }
        }
    }
-
-    private class DownloadLabelItemTouchHelperCallback extends ItemTouchHelper.Callback {
-
-        @Override
-        public int getMovementFlags(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder) {
-            return makeMovementFlags(ItemTouchHelper.UP | ItemTouchHelper.DOWN, ItemTouchHelper.LEFT);
-        }
-
-        @SuppressLint("NotifyDataSetChanged")
-        @Override
-        public boolean onMove(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, @NonNull RecyclerView.ViewHolder target) {
-            int fromPosition = viewHolder.getBindingAdapterPosition();
-            int toPosition = target.getBindingAdapterPosition();
-            Context context = getContext();
-            if (null == context || fromPosition == toPosition || toPosition == 0 || fromPosition == 0) {
-                return false;
-            }
-
-            EhApplication.getDownloadManager(context).moveLabel(fromPosition - 1, toPosition - 1);
-            final String item = mLabels.remove(fromPosition);
-            mLabels.add(toPosition, item);
-            mLabelAdapter.notifyDataSetChanged();
-            return true;
-        }
-
-        @SuppressLint("NotifyDataSetChanged")
-        @Override
-        public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int direction) {
-            int position = viewHolder.getBindingAdapterPosition();
-            if (mDownloadManager == null)
-                return;
-            if (position != 0) {
-                String label = mLabels.get(position);
-                mDownloadManager.deleteLabel(label);
-            }
-            mLabels.remove(position);
-            mLabelAdapter.notifyDataSetChanged();
-        }
-    }
 }
@@ -24,7 +24,6 @@ import android.content.res.Resources;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.os.Bundle;
-import android.os.Parcelable;
 import android.text.InputType;
 import android.text.TextUtils;
 import android.util.SparseBooleanArray;
@@ -855,14 +854,7 @@ public class FavoritesScene extends BaseScene implements
            }

            updateSearchBar();
-            int pages = 0;
-            assert mUrlBuilder != null;
-            if (FavListUrlBuilder.isValidFavCat(mUrlBuilder.getFavCat()))
-                pages = CommonOperations.getPagesForFounds(mFavCountArray[mUrlBuilder.getFavCat()], 50);
-            else if (mUrlBuilder.getFavCat() == FavListUrlBuilder.FAV_CAT_ALL)
-                pages = CommonOperations.getPagesForFounds(mFavCountSum, 50);
-            mHelper.nextPg = result.nextPage;
-            mHelper.onGetPageData(taskId, pages, mHelper.pgCounter + 1, result.galleryInfoList);
+            mHelper.onGetPageData(taskId, result.pages, result.nextPage, result.galleryInfoList);

            if (mDrawerAdapter != null) {
                mDrawerAdapter.notifyDataSetChanged();
@@ -1181,8 +1173,6 @@ public class FavoritesScene extends BaseScene implements
    }

    private class FavoritesHelper extends GalleryInfoContentHelper {
-        public int pgCounter = 0;
-        public String nextPg = null;

        @Override
        protected void getPageData(final int taskId, int type, int page) {
@@ -1190,7 +1180,6 @@ public class FavoritesScene extends BaseScene implements
            if (null == activity || null == mUrlBuilder || null == mClient) {
                return;
            }
-            pgCounter = page;

            if (mEnableModify) {
                mEnableModify = false;
@@ -1230,7 +1219,7 @@ public class FavoritesScene extends BaseScene implements
                        url = mUrlBuilder.build();
                    }

-                    mUrlBuilder.setNext(nextPg);
+                    mUrlBuilder.setIndex(page);
                    EhRequest request = new EhRequest();
                    request.setMethod(EhClient.METHOD_MODIFY_FAVORITES);
                    request.setCallback(new GetFavoritesListener(getContext(),
@@ -1243,7 +1232,7 @@ public class FavoritesScene extends BaseScene implements
                final String keyword = mUrlBuilder.getKeyword();
                SimpleHandler.getInstance().post(() -> onGetFavoritesLocal(keyword, taskId));
            } else {
-                mUrlBuilder.setNext(nextPg);
+                mUrlBuilder.setIndex(page);
                String url = mUrlBuilder.build();
                EhRequest request = new EhRequest();
                request.setMethod(EhClient.METHOD_GET_FAVORITES);
@@ -1306,25 +1295,5 @@ public class FavoritesScene extends BaseScene implements
                }
            }
        }
-
-        @Override
-        protected void onClearData() {
-            super.onClearData();
-            nextPg = null;
-        }
-
-        @Override
-        protected Parcelable saveInstanceState(Parcelable superState) {
-            Bundle bundle = (Bundle) super.saveInstanceState(superState);
-            bundle.putString(KEY_NEXT_PAGE, nextPg);
-            return bundle;
-        }
-
-        @Override
-        protected Parcelable restoreInstanceState(Parcelable state) {
-            Bundle bundle = (Bundle) state;
-            nextPg = bundle.getString(KEY_NEXT_PAGE);
-            return super.restoreInstanceState(state);
-        }
    }
 }
@@ -184,7 +184,14 @@ public final class GalleryCommentsScene extends ToolbarScene
                mEditPanel,
                mFabLayout
        ));
-        mRefreshLayout.setColorSchemeColors(ResourcesKt.resolveColor(getTheme(), androidx.appcompat.R.attr.colorPrimary));
+
+        mRefreshLayout.setColorSchemeResources(
+                R.color.loading_indicator_red,
+                R.color.loading_indicator_purple,
+                R.color.loading_indicator_blue,
+                R.color.loading_indicator_cyan,
+                R.color.loading_indicator_green,
+                R.color.loading_indicator_yellow);
        mRefreshLayout.setOnRefreshListener(this);

        Context context = requireContext();
@@ -559,6 +559,12 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList

        ViewGroup main = (ViewGroup) ViewUtils.$$(view, R.id.main);
        ScrollView mainView = (ScrollView) ViewUtils.$$(main, R.id.scroll_view);
+        mainView.setOnScrollChangeListener((v, scrollX, scrollY, oldScrollX, oldScrollY) -> {
+            if (mActionGroup != null && mHeader != null) {
+                //noinspection IntegerDivisionInFloatingPointContext
+                setLightStatusBar(mActionGroup.getY() - mHeader.findViewById(R.id.header_content).getPaddingTop() / 2 < scrollY);
+            }
+        });
        View progressView = ViewUtils.$$(main, R.id.progress_view);
        mTip = (TextView) ViewUtils.$$(main, R.id.tip);
        mViewTransition = new ViewTransition(mainView, progressView, mTip);
@@ -662,6 +668,11 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
        return view;
    }

+    @Override
+    public boolean needWhiteStatusBar() {
+        return false;
+    }
+
    @Override
    public void onDestroyView() {
        super.onDestroyView();
@@ -830,16 +841,19 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList

        switch (state) {
            case STATE_NORMAL:
+                setLightStatusBar(false);
                // Show mMainView
                mViewTransition.showView(0, animation);
                // Show mBelowHeader
                mViewTransition2.showView(0, animation);
                break;
            case STATE_REFRESH:
+                setLightStatusBar(true);
                // Show mProgressView
                mViewTransition.showView(1, animation);
                break;
            case STATE_REFRESH_HEADER:
+                setLightStatusBar(false);
                // Show mMainView
                mViewTransition.showView(0, animation);
                // Show mProgress
@@ -848,6 +862,7 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
            default:
            case STATE_INIT:
            case STATE_FAILED:
+                setLightStatusBar(true);
                // Show mFailedView
                mViewTransition.showView(2, animation);
                break;
@@ -18,10 +18,13 @@ package com.hippo.ehviewer.ui.scene;

 import android.animation.Animator;
 import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Resources;
+import android.graphics.Point;
+import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
@@ -30,8 +33,10 @@ import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.style.ImageSpan;
+import android.view.Display;
 import android.view.Gravity;
 import android.view.LayoutInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewConfiguration;
 import android.view.ViewGroup;
@@ -45,17 +50,23 @@ import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.PopupMenu;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsAnimationCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
-import androidx.recyclerview.widget.ItemTouchHelper;
 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.h6ah4i.android.widget.advrecyclerview.animator.DraggableItemAnimator;
+import com.h6ah4i.android.widget.advrecyclerview.animator.GeneralItemAnimator;
+import com.h6ah4i.android.widget.advrecyclerview.draggable.DraggableItemAdapter;
+import com.h6ah4i.android.widget.advrecyclerview.draggable.ItemDraggableRange;
+import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager;
+import com.h6ah4i.android.widget.advrecyclerview.utils.AbstractDraggableItemViewHolder;
 import com.hippo.app.EditTextDialogBuilder;
 import com.hippo.drawable.AddDeleteDrawable;
 import com.hippo.drawable.DrawerArrowDrawable;
@@ -98,6 +109,7 @@ import com.hippo.widget.FabLayout;
 import com.hippo.widget.SearchBarMover;
 import com.hippo.yorozuya.AnimationUtils;
 import com.hippo.yorozuya.AssertUtils;
+import com.hippo.yorozuya.LayoutUtils;
 import com.hippo.yorozuya.MathUtils;
 import com.hippo.yorozuya.SimpleAnimatorListener;
 import com.hippo.yorozuya.StringUtils;
@@ -741,13 +753,19 @@ public final class GalleryListScene extends BaseScene
        Context context = getContext();
        AssertUtils.assertNotNull(context);

+        RecyclerViewDragDropManager dragDropManager = new RecyclerViewDragDropManager();
+        dragDropManager.setInitiateOnLongPress(true);
+        dragDropManager.setInitiateOnTouch(false);
+        dragDropManager.setDraggingItemAlpha(0.8f);
+
        final EasyRecyclerView recyclerView = view.findViewById(R.id.recycler_view_drawer);
        recyclerView.setLayoutManager(new LinearLayoutManager(context));
        final QsDrawerAdapter qsDrawerAdapter = new QsDrawerAdapter(inflater);
        qsDrawerAdapter.setHasStableIds(true);
-        recyclerView.setAdapter(qsDrawerAdapter);
-        ItemTouchHelper itemTouchHelper = new ItemTouchHelper(new GalleryListQSItemTouchHelperCallback(qsDrawerAdapter));
-        itemTouchHelper.attachToRecyclerView(recyclerView);
+        final GeneralItemAnimator animator = new DraggableItemAnimator();
+        recyclerView.setItemAnimator(animator);
+        recyclerView.setAdapter(dragDropManager.createWrappedAdapter(qsDrawerAdapter));
+        dragDropManager.attachRecyclerView(recyclerView);
        mQuickSearchList = EhDB.getAllQuickSearch();
        tip.setText(R.string.quick_search_tip);
        if (mIsTopList) {
@@ -1371,7 +1389,7 @@ public final class GalleryListScene extends BaseScene
                    ? R.string.gallery_list_empty_hit_subscription
                    : R.string.gallery_list_empty_hit);
            mHelper.setEmptyString(emptyString);
-            mHelper.onGetPageData(taskId, CommonOperations.getPagesForFounds(result.founds, 25), mHelper.pgCounter + 1, result.galleryInfoList);
+            mHelper.onGetPageData(taskId, result.pages, result.nextPage, result.galleryInfoList);
        }
    }

@@ -1474,7 +1492,7 @@ public final class GalleryListScene extends BaseScene
        }
    }

-    private static class QsDrawerHolder extends RecyclerView.ViewHolder {
+    private static class QsDrawerHolder extends AbstractDraggableItemViewHolder {

        private final TextView key;
        private final ImageView option;
@@ -1519,7 +1537,7 @@ public final class GalleryListScene extends BaseScene
        }
    }

-    private class QsDrawerAdapter extends RecyclerView.Adapter<QsDrawerHolder> {
+    private class QsDrawerAdapter extends RecyclerView.Adapter<QsDrawerHolder> implements DraggableItemAdapter<QsDrawerHolder> {

        private final LayoutInflater mInflater;

@@ -1544,12 +1562,40 @@ public final class GalleryListScene extends BaseScene
                    }

                    mUrlBuilder.set(mQuickSearchList.get(position));
-                    mUrlBuilder.setNextGid(0);
+                    mUrlBuilder.setPageIndex(0);
                    onUpdateUrlBuilder();
                    mHelper.refresh();
                    setState(STATE_NORMAL);
                    closeDrawer(Gravity.RIGHT);
                });
+                holder.itemView.setOnLongClickListener(v -> {
+                    PopupMenu popupMenu = new PopupMenu(requireContext(), holder.option);
+                    popupMenu.inflate(R.menu.quicksearch_option);
+                    popupMenu.show();
+                    popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+
+                        final QuickSearch quickSearch = mQuickSearchList.get(position);
+
+                        @Override
+                        public boolean onMenuItemClick(MenuItem item) {
+                            if (item.getItemId() == R.id.menu_qs_remove) {
+                                new MaterialAlertDialogBuilder(requireContext())
+                                        .setTitle(getString(R.string.delete_quick_search_title))
+                                        .setMessage(getString(R.string.delete_quick_search_message, quickSearch.name))
+                                        .setPositiveButton(R.string.delete, (dialog, which) -> {
+                                            EhDB.deleteQuickSearch(quickSearch);
+                                            mQuickSearchList.remove(position);
+                                            notifyDataSetChanged();
+                                        })
+                                        .setNegativeButton(android.R.string.cancel, null)
+                                        .show();
+                                return true;
+                            }
+                            return false;
+                        }
+                    });
+                    return true;
+                });
            } else {
                int[] keywords = {11, 12, 13, 15};
                int[] toplists = {R.string.toplist_alltime, R.string.toplist_pastyear, R.string.toplist_pastmonth, R.string.toplist_yesterday};
@@ -1561,7 +1607,7 @@ public final class GalleryListScene extends BaseScene
                    }

                    mUrlBuilder.setKeyword(String.valueOf(keywords[position]));
-                    mUrlBuilder.setNextGid(0);
+                    mUrlBuilder.setPageIndex(0);
                    onUpdateUrlBuilder();
                    mHelper.refresh();
                    setState(STATE_NORMAL);
@@ -1585,6 +1631,44 @@ public final class GalleryListScene extends BaseScene
        public int getItemCount() {
            return !mIsTopList ? mQuickSearchList != null ? mQuickSearchList.size() : 0 : 4;
        }
+
+        @Override
+        public boolean onCheckCanStartDrag(@NonNull QsDrawerHolder holder, int position, int x, int y) {
+            return !mIsTopList && x > holder.option.getX() && y > holder.option.getY();
+        }
+
+        @Override
+        public ItemDraggableRange onGetItemDraggableRange(@NonNull QsDrawerHolder holder, int position) {
+            return null;
+        }
+
+        @Override
+        public void onMoveItem(int fromPosition, int toPosition) {
+            if (fromPosition == toPosition) {
+                return;
+            }
+            if (null == mQuickSearchList) {
+                return;
+            }
+            EhDB.moveQuickSearch(fromPosition, toPosition);
+            final QuickSearch item = mQuickSearchList.remove(fromPosition);
+            mQuickSearchList.add(toPosition, item);
+        }
+
+        @Override
+        public boolean onCheckCanDrop(int draggingPosition, int dropPosition) {
+            return true;
+        }
+
+        @Override
+        public void onItemDragStarted(int position) {
+            notifyDataSetChanged();
+        }
+
+        @Override
+        public void onItemDragFinished(int fromPosition, int toPosition, boolean result) {
+            notifyDataSetChanged();
+        }
    }

    private abstract class UrlSuggestion extends SearchBar.Suggestion {
@@ -1691,20 +1775,15 @@ public final class GalleryListScene extends BaseScene
    }

    private class GalleryListHelper extends GalleryInfoContentHelper {
-        public int pgCounter = 0;

        @Override
        protected void getPageData(int taskId, int type, int page) {
-            pgCounter = page;
            MainActivity activity = getMainActivity();
            if (null == activity || null == mClient || null == mUrlBuilder) {
                return;
            }

-            if (page != 0)
-                mUrlBuilder.setNextGid(minGid);
-            else
-                mUrlBuilder.setNextGid(0);
+            mUrlBuilder.setPageIndex(page);
            if (ListUrlBuilder.MODE_IMAGE_SEARCH == mUrlBuilder.getMode()) {
                EhRequest request = new EhRequest();
                request.setMethod(EhClient.METHOD_IMAGE_SEARCH);
@@ -1774,47 +1853,4 @@ public final class GalleryListScene extends BaseScene
            }
        }
    }
-
-    private class GalleryListQSItemTouchHelperCallback extends ItemTouchHelper.Callback {
-        private final QsDrawerAdapter mAdapter;
-
-        public GalleryListQSItemTouchHelperCallback(QsDrawerAdapter adapter) {
-            mAdapter = adapter;
-        }
-
-        @Override
-        public int getMovementFlags(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder) {
-            return makeMovementFlags(ItemTouchHelper.UP | ItemTouchHelper.DOWN, ItemTouchHelper.LEFT);
-        }
-
-        @SuppressLint("NotifyDataSetChanged")
-        @Override
-        public boolean onMove(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, @NonNull RecyclerView.ViewHolder target) {
-            int fromPosition = viewHolder.getBindingAdapterPosition();
-            int toPosition = target.getBindingAdapterPosition();
-            if (fromPosition == toPosition) {
-                return false;
-            }
-            if (null == mQuickSearchList) {
-                return false;
-            }
-            EhDB.moveQuickSearch(fromPosition, toPosition);
-            final QuickSearch item = mQuickSearchList.remove(fromPosition);
-            mQuickSearchList.add(toPosition, item);
-            mAdapter.notifyDataSetChanged();
-            return true;
-        }
-
-        @SuppressLint("NotifyDataSetChanged")
-        @Override
-        public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int direction) {
-            if (mQuickSearchList == null)
-                return;
-            int position = viewHolder.getBindingAdapterPosition();
-            final QuickSearch quickSearch = mQuickSearchList.get(position);
-            EhDB.deleteQuickSearch(quickSearch);
-            mQuickSearchList.remove(position);
-            mAdapter.notifyDataSetChanged();
-        }
-    }
 }
@@ -36,11 +36,20 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
-import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.StaggeredGridLayoutManager;

 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.h6ah4i.android.widget.advrecyclerview.animator.GeneralItemAnimator;
+import com.h6ah4i.android.widget.advrecyclerview.animator.SwipeDismissItemAnimator;
+import com.h6ah4i.android.widget.advrecyclerview.swipeable.RecyclerViewSwipeManager;
+import com.h6ah4i.android.widget.advrecyclerview.swipeable.SwipeableItemAdapter;
+import com.h6ah4i.android.widget.advrecyclerview.swipeable.SwipeableItemConstants;
+import com.h6ah4i.android.widget.advrecyclerview.swipeable.action.SwipeResultAction;
+import com.h6ah4i.android.widget.advrecyclerview.swipeable.action.SwipeResultActionDefault;
+import com.h6ah4i.android.widget.advrecyclerview.swipeable.action.SwipeResultActionRemoveItem;
+import com.h6ah4i.android.widget.advrecyclerview.touchguard.RecyclerViewTouchActionGuardManager;
+import com.h6ah4i.android.widget.advrecyclerview.utils.AbstractSwipeableItemViewHolder;
 import com.hippo.easyrecyclerview.EasyRecyclerView;
 import com.hippo.easyrecyclerview.FastScroller;
 import com.hippo.easyrecyclerview.HandlerDrawable;
@@ -70,8 +79,6 @@ import com.hippo.widget.recyclerview.AutoStaggeredGridLayoutManager;
 import com.hippo.yorozuya.AssertUtils;
 import com.hippo.yorozuya.ViewUtils;

-import org.greenrobot.greendao.query.LazyList;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -94,7 +101,7 @@ public class HistoryScene extends ToolbarScene {
    @Nullable
    private RecyclerView.Adapter<?> mAdapter;
    @Nullable
-    private LazyList<HistoryInfo> mLazyList;
+    private List<HistoryInfo> mLazyList;

    private DownloadManager mDownloadManager;
    private DownloadManager.DownloadInfoListener mDownloadInfoListener;
@@ -197,9 +204,17 @@ public class HistoryScene extends ToolbarScene {
        drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
        mTip.setCompoundDrawables(null, drawable, null, null);

+        RecyclerViewTouchActionGuardManager guardManager = new RecyclerViewTouchActionGuardManager();
+        guardManager.setInterceptVerticalScrollingWhileAnimationRunning(true);
+        guardManager.setEnabled(true);
+        RecyclerViewSwipeManager swipeManager = new RecyclerViewSwipeManager();
        mAdapter = new HistoryAdapter();
        mAdapter.setHasStableIds(true);
+        mAdapter = swipeManager.createWrappedAdapter(mAdapter);
        mRecyclerView.setAdapter(mAdapter);
+        final GeneralItemAnimator animator = new SwipeDismissItemAnimator();
+        animator.setSupportsChangeAnimations(false);
+        mRecyclerView.setItemAnimator(animator);
        AutoStaggeredGridLayoutManager layoutManager = new AutoStaggeredGridLayoutManager(
                0, StaggeredGridLayoutManager.VERTICAL);
        layoutManager.setColumnSize(resources.getDimensionPixelOffset(Settings.getDetailSizeResId()));
@@ -212,8 +227,9 @@ public class HistoryScene extends ToolbarScene {
        int paddingV = resources.getDimensionPixelOffset(R.dimen.gallery_list_margin_v);
        MarginItemDecoration decoration = new MarginItemDecoration(interval, paddingH, paddingV, paddingH, paddingV);
        mRecyclerView.addItemDecoration(decoration);
-        ItemTouchHelper itemTouchHelper = new ItemTouchHelper(new HistoryItemTouchHelperCallback());
-        itemTouchHelper.attachToRecyclerView(mRecyclerView);
+        guardManager.attachRecyclerView(mRecyclerView);
+        swipeManager.attachRecyclerView(mRecyclerView);
+
        mFastScroller.attachToRecyclerView(mRecyclerView);
        HandlerDrawable handlerDrawable = new HandlerDrawable();
        handlerDrawable.setColor(ResourcesKt.resolveColor(getTheme(), com.google.android.material.R.attr.colorPrimary));
@@ -237,7 +253,6 @@ public class HistoryScene extends ToolbarScene {
        super.onDestroyView();

        if (null != mLazyList) {
-            mLazyList.close();
            mLazyList = null;
            if (mAdapter != null) {
                mAdapter.notifyDataSetChanged();
@@ -254,11 +269,7 @@ public class HistoryScene extends ToolbarScene {

    // Remember to notify
    private void updateLazyList() {
-        LazyList<HistoryInfo> lazyList = EhDB.getHistoryLazyList();
-        if (mLazyList != null) {
-            mLazyList.close();
-        }
-        mLazyList = lazyList;
+        mLazyList = EhDB.getHistoryLazyList();
    }

    private void updateView(boolean animation) {
@@ -484,7 +495,7 @@ public class HistoryScene extends ToolbarScene {
        }
    }

-    private static class HistoryHolder extends RecyclerView.ViewHolder {
+    private static class HistoryHolder extends AbstractSwipeableItemViewHolder {

        public final View card;
        public final LoadImageView thumb;
@@ -511,6 +522,12 @@ public class HistoryScene extends ToolbarScene {
            pages = itemView.findViewById(R.id.pages);
            downloaded = itemView.findViewById(R.id.downloaded);
        }
+
+        @NonNull
+        @Override
+        public View getSwipeableContainerView() {
+            return card;
+        }
    }

    private class MoveDialogHelper implements DialogInterface.OnClickListener {
@@ -546,7 +563,8 @@ public class HistoryScene extends ToolbarScene {
        }
    }

-    private class HistoryAdapter extends RecyclerView.Adapter<HistoryHolder> {
+    private class HistoryAdapter extends RecyclerView.Adapter<HistoryHolder>
+            implements SwipeableItemAdapter<HistoryHolder> {

        private final LayoutInflater mInflater;
        private final int mListThumbWidth;
@@ -624,30 +642,55 @@ public class HistoryScene extends ToolbarScene {
        public int getItemCount() {
            return null != mLazyList ? mLazyList.size() : 0;
        }
+
+        @Override
+        public int onGetSwipeReactionType(@NonNull HistoryHolder holder, int position, int x, int y) {
+            return SwipeableItemConstants.REACTION_CAN_SWIPE_LEFT;
+        }
+
+        @Override
+        public void onSwipeItemStarted(@NonNull HistoryHolder holder, int position) {
+        }
+
+        @Override
+        public void onSetSwipeBackground(@NonNull HistoryHolder holder, int position, int type) {
+        }
+
+        @Override
+        public SwipeResultAction onSwipeItem(@NonNull HistoryHolder holder, int position, int result) {
+            switch (result) {
+                case SwipeableItemConstants.RESULT_SWIPED_LEFT:
+                    return new SwipeResultActionClear(position);
+                case SwipeableItemConstants.RESULT_SWIPED_RIGHT:
+                case SwipeableItemConstants.RESULT_CANCELED:
+                case SwipeableItemConstants.RESULT_NONE:
+                case SwipeableItemConstants.RESULT_SWIPED_DOWN:
+                case SwipeableItemConstants.RESULT_SWIPED_UP:
+                default:
+                    return new SwipeResultActionDefault();
+            }
+        }
    }

-    private class HistoryItemTouchHelperCallback extends ItemTouchHelper.Callback {
+    private class SwipeResultActionClear extends SwipeResultActionRemoveItem {

-        @Override
-        public int getMovementFlags(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder) {
-            return makeMovementFlags(0, ItemTouchHelper.LEFT);
+        private final int mPosition;
+
+        protected SwipeResultActionClear(int position) {
+            mPosition = position;
        }

        @Override
-        public boolean onMove(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, @NonNull RecyclerView.ViewHolder target) {
-            return false;
-        }
-
-        @Override
-        public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int direction) {
-            int mPosition = viewHolder.getBindingAdapterPosition();
-            if (null == mLazyList || mAdapter == null) {
+        protected void onPerformAction() {
+            super.onPerformAction();
+            if (null == mLazyList || null == mAdapter) {
                return;
            }
+
            HistoryInfo info = mLazyList.get(mPosition);
            EhDB.deleteHistoryInfo(info);
            updateLazyList();
-            mAdapter.notifyItemRemoved(mPosition);
+            mAdapter.notifyDataSetChanged();
            updateView(true);
        }
    }
@@ -28,26 +28,14 @@ import com.hippo.scene.Announcer;
 */
 public class SolidScene extends BaseScene {

-    public static final int CHECK_STEP_SECURITY = 0;
-    public static final int CHECK_STEP_WARNING = 1;
-    public static final int CHECK_STEP_SIGN_IN = 2;
-    public static final int CHECK_STEP_SELECT_SITE = 3;
+    public static final int CHECK_STEP_SIGN_IN = 1;
+    public static final int CHECK_STEP_SELECT_SITE = 2;
    public static final String KEY_TARGET_SCENE = "target_scene";
    public static final String KEY_TARGET_ARGS = "target_args";
    private static final String TAG = SolidScene.class.getSimpleName();

    public void startSceneForCheckStep(int checkStep, Bundle args) {
        switch (checkStep) {
-            case CHECK_STEP_SECURITY:
-                if (Settings.getShowWarning()) {
-                    startScene(new Announcer(WarningScene.class).setArgs(args), true);
-                    break;
-                }
-            case CHECK_STEP_WARNING:
-                if (EhUtils.needSignedIn(getContext())) {
-                    startScene(new Announcer(SignInScene.class).setArgs(args), true);
-                    break;
-                }
            case CHECK_STEP_SIGN_IN:
                if (Settings.getSelectSite()) {
                    startScene(new Announcer(SelectSiteScene.class).setArgs(args), true);
@@ -87,6 +87,12 @@ public abstract class ToolbarScene extends BaseScene {
        }
    }

+    @Override
+    public boolean needWhiteStatusBar() {
+        return false;
+    }
+
+
    public int getMenuResId() {
        return 0;
    }
@@ -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.scene;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.hippo.ehviewer.R;
-import com.hippo.ehviewer.Settings;
-import com.hippo.ehviewer.ui.MainActivity;
-import com.hippo.ehviewer.ui.annotation.ViewLifeCircle;
-import com.hippo.yorozuya.ViewUtils;
-
-public final class WarningScene extends SolidScene implements View.OnClickListener {
-
-    @Nullable
-    private View mReject;
-    @Nullable
-    @ViewLifeCircle
-    private View mAccept;
-
-    @Override
-    public boolean needShowLeftDrawer() {
-        return false;
-    }
-
-    @NonNull
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.scene_warning, container, false);
-
-        mReject = ViewUtils.$$(view, R.id.reject);
-        mAccept = ViewUtils.$$(view, R.id.accept);
-
-        mReject.setOnClickListener(this);
-        mAccept.setOnClickListener(this);
-
-        return view;
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-
-        mReject = null;
-        mAccept = null;
-    }
-
-    @Override
-    public void onClick(View v) {
-        if (mReject == v) {
-            finishStage();
-        } else if (mAccept == v) {
-            // Never show this warning anymore
-            Settings.putShowWarning(false);
-
-            // Start new scene and finish it self
-            MainActivity activity = getMainActivity();
-            if (null != activity) {
-                startSceneForCheckStep(CHECK_STEP_WARNING, getArguments());
-            }
-            finish();
-        }
-    }
-}
@@ -53,6 +53,11 @@ public class FixedThumb extends LoadImageView {
        a.recycle();
    }

+    public void setFix(float minAspect, float maxAspect) {
+        this.minAspect = minAspect;
+        this.maxAspect = maxAspect;
+    }
+
    @Override
    public void onPreSetImageDrawable(Drawable drawable, boolean isTarget) {
        if (alwaysCutAndScale) {
@@ -31,14 +31,8 @@ import java.util.List;
 import java.util.Map;

 public abstract class GalleryInfoContentHelper extends ContentLayout.ContentHelper<GalleryInfo> {
-    public int maxGid = -1;
-    public int minGid = -1;

    private static final String KEY_DATA_MAP = "data_map";
-    private static final String KEY_MAX_GID = "max_gid";
-    private static final String KEY_MIN_GID = "min_gid";
-
-    public static final String KEY_NEXT_PAGE = "next_page";
    private final FavouriteStatusRouter.Listener listener;
    @SuppressLint("UseSparseArrays")
    private Map<Long, GalleryInfo> map = new HashMap<>();
@@ -65,12 +59,6 @@ public abstract class GalleryInfoContentHelper extends ContentLayout.ContentHelp
    @Override
    protected void onAddData(List<GalleryInfo> data) {
        for (GalleryInfo info : data) {
-            if (maxGid == -1)
-                maxGid = (int) info.gid;
-            if (minGid == -1)
-                minGid = (int) info.gid;
-            maxGid = (int) Math.max(maxGid, info.gid);
-            minGid = (int) Math.min(minGid, info.gid);
            map.put(info.gid, info);
        }
    }
@@ -90,8 +78,6 @@ public abstract class GalleryInfoContentHelper extends ContentLayout.ContentHelp
    @Override
    protected void onClearData() {
        map.clear();
-        maxGid = -1;
-        minGid = -1;
    }

    @Override
@@ -102,8 +88,6 @@ public abstract class GalleryInfoContentHelper extends ContentLayout.ContentHelp
        FavouriteStatusRouter router = EhApplication.getFavouriteStatusRouter();
        int id = router.saveDataMap(map);
        bundle.putInt(KEY_DATA_MAP, id);
-        bundle.putInt(KEY_MIN_GID, minGid);
-        bundle.putInt(KEY_MAX_GID, maxGid);

        return bundle;
    }
@@ -120,8 +104,6 @@ public abstract class GalleryInfoContentHelper extends ContentLayout.ContentHelp
                this.map = map;
            }
        }
-        minGid = bundle.getInt(KEY_MIN_GID);
-        maxGid = bundle.getInt(KEY_MAX_GID);

        return super.restoreInstanceState(state);
    }
@@ -1,13 +0,0 @@
-package com.hippo.ehviewer.widget
-
-import android.content.Context
-import android.util.AttributeSet
-import com.hippo.ehviewer.Settings
-
-class ResizeableFixedThumb @JvmOverloads constructor(
-    context: Context, attrs: AttributeSet? = null
-) : FixedThumb(context, attrs) {
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        setMeasuredDimension(Settings.getListThumbSize() * 2, Settings.getListThumbSize() * 3)
-    }
-}
@@ -57,6 +57,7 @@ public abstract class GalleryProvider {
    public void stop() {
        OSUtils.checkMainLoop();
        mImageCache.evictAll();
+        Image.lazyEvictAll();
    }

    public void setGLRoot(GLRoot glRoot) {
@@ -245,18 +246,14 @@ public abstract class GalleryProvider {
        }

        public void add(Integer key, ImageWrapper value) {
-            if (value.getFormat() != Image.FORMAT_GIF && value.obtain()) {
-                put(key, value);
-            }
+            if (value.getFormat() != Image.FORMAT_ANIMATED)
+                if (value.obtain())
+                    put(key, value);
        }

        @Override
        protected int sizeOf(Integer key, ImageWrapper value) {
-            int size = value.getWidth() * value.getHeight() * 4;
-            if (value.getFormat() == Image.FORMAT_GIF) {
-                size *= 5;
-            }
-            return size;
+            return value.getWidth() * value.getHeight() * 4;
        }

        @Override
@@ -153,12 +153,6 @@ public class ImageTexture implements Texture, Animatable {
        }

        mTiles = list.toArray(new Tile[list.size()]);
-
-        if (!mImage.isCompleted()) {
-            Runnable runnable = new AnimateRunnable();
-            mAnimateRunnable = runnable;
-            sThreadExecutor.execute(runnable);
-        }
    }

    private static Tile obtainSmallTile() {
@@ -239,7 +233,7 @@ public class ImageTexture implements Texture, Animatable {
        }

        boolean end = mReleased.get() || mImage.isImageRecycled() || mNeedRelease.get() ||
-                (mImage.isCompleted() && mImage.getFrameCount() <= 1) || mRunning.get();
+                (mImage.getFormat() == 0) || mRunning.get();

        synchronized (mImage) {
            mImageBusy = false;
@@ -597,25 +591,11 @@ public class ImageTexture implements Texture, Animatable {
                mImageBusy = true;
            }

-            if (!mImage.isCompleted()) {
-                try {
-                    sPVLock.p();
-                } catch (InterruptedException e) {
-                    // Ignore
-                }
-                if (!mNeedRelease.get()) {
-                    mImage.complete();
-                }
-                sPVLock.v();
-            }
-
-            int frameCount = mImage.getFrameCount();
-
            synchronized (mImage) {
                // Release image
                mImageBusy = false;
                // Check need release, frameCount <= 1
-                if (mNeedRelease.get() || frameCount <= 1) {
+                if (mNeedRelease.get() || mImage.getFormat() == 0) {
                    mAnimateRunnable = null;
                    return;
                }
@@ -122,22 +122,6 @@ public class ImageWrapper {
        return mCut.height();
    }

-    /**
-     * @see Image#complete()
-     */
-    public boolean complete() {
-        synchronized (mImage) {
-            return mImage.complete();
-        }
-    }
-
-    /**
-     * @see Image#isCompleted()
-     */
-    public boolean isCompleted() {
-        return mImage.isCompleted();
-    }
-
    /**
     * @see Image#render(int, int, Bitmap, int, int, int, int, boolean, int)
     */
@@ -168,13 +152,6 @@ public class ImageWrapper {
        return mImage.getDelay();
    }

-    /**
-     * @see Image#getFrameCount()
-     */
-    public int getFrameCount() {
-        return mImage.getFrameCount();
-    }
-
    /**
     * @see Image#isOpaque()
     */
@@ -0,0 +1,219 @@
+/*
+ * 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.image;
+
+import android.graphics.Bitmap;
+
+import androidx.annotation.Nullable;
+
+import java.io.FileDescriptor;
+import java.util.ArrayList;
+
+/**
+ * The {@code Image} is a image which stored pixel data in native heap
+ */
+public final class Image {
+    public static final int FORMAT_NORMAL = 0;
+    public static final int FORMAT_ANIMATED = 1;
+    private static final ArrayList<Image> imageList = new ArrayList<>();
+    private static boolean needEvictAll = false;
+    private long mNativePtr;
+
+    private Image(long nativePtr) {
+        if (needEvictAll)
+            evictAll();
+        mNativePtr = nativePtr;
+        imageList.add(this);
+    }
+
+    private static Image newFromAddr(long addr) {
+        if (addr == 0)
+            return null;
+        return new Image(addr);
+    }
+
+    public static void lazyEvictAll() {
+        needEvictAll = true;
+    }
+
+    private static void evictAll() {
+        (new ArrayList<>(imageList)).forEach(Image::recycle);
+        needEvictAll = false;
+    }
+
+    /**
+     * Decode image from {@code InputStream}
+     */
+    @Nullable
+    public static Image decode(FileDescriptor fd, boolean partially) {
+        return newFromAddr(nativeDecode(fd));
+    }
+
+    /**
+     * Decode image from {@code InputStream}
+     */
+    @Nullable
+    public static Image decode(Integer fd, boolean partially) {
+        return newFromAddr(nativeDecodeFdInt(fd));
+    }
+
+    /**
+     * Decode image from {@code InputStream}
+     */
+    @Nullable
+    public static Image decodeAddr(Long addr, boolean partially) {
+        return newFromAddr(nativeDecodeAddr(addr));
+    }
+
+    /**
+     * Create a plain image from Bitmap
+     */
+    @Nullable
+    public static Image create(Bitmap bitmap) {
+        return newFromAddr(nativeCreate(bitmap));
+    }
+
+    /**
+     * Return all un-recycled {@code Image} instance count.
+     * It is useful for debug.
+     */
+    public static int getImageCount() {
+        return imageList.size();
+    }
+
+    private static native long nativeDecode(FileDescriptor fd);
+
+    private static native long nativeDecodeFdInt(int fd);
+
+    private static native long nativeDecodeAddr(long addr);
+
+    private static native long nativeCreate(Bitmap bitmap);
+
+    private static native void nativeRender(long nativePtr,
+                                            int srcX, int srcY, Bitmap dst, int dstX, int dstY,
+                                            int width, int height);
+
+    private static native void nativeTexImage(long nativePtr, boolean init, int offsetX, int offsetY, int width, int height);
+
+    private static native void nativeAdvance(long nativePtr);
+
+    private static native int nativeGetDelay(long nativePtr);
+
+    private static native boolean nativeIsOpaque(long nativePtr);
+
+    private static native void nativeRecycle(long nativePtr);
+
+    private static native int nativeGetFormat(long nativePtr);
+
+    private static native int nativeGetWidth(long nativePtr);
+
+    private static native int nativeGetHeight(long nativePtr);
+
+    /**
+     * Return the format of the image
+     */
+    public int getFormat() {
+        checkRecycled();
+        return nativeGetFormat(mNativePtr);
+    }
+
+    /**
+     * Return the width of the image
+     */
+    public int getWidth() {
+        checkRecycled();
+        return nativeGetWidth(mNativePtr);
+    }
+
+    /**
+     * Return the height of the image
+     */
+    public int getHeight() {
+        checkRecycled();
+        return nativeGetHeight(mNativePtr);
+    }
+
+    private void checkRecycled() {
+        if (mNativePtr == 0) {
+            throw new IllegalStateException("The image is recycled.");
+        }
+    }
+
+    /**
+     * Render the image to {@code Bitmap}
+     */
+    public void render(int srcX, int srcY, Bitmap dst, int dstX, int dstY,
+                       int width, int height, boolean fillBlank, int defaultColor) {
+        checkRecycled();
+        nativeRender(mNativePtr, srcX, srcY, dst, dstX, dstY, width, height);
+    }
+
+    /**
+     * Call {@code glTexImage2D} for init is true and
+     * call {@code glTexSubImage2D} for init is false.
+     * width * height must <= 512 * 512 or do nothing
+     */
+    public void texImage(boolean init, int offsetX, int offsetY, int width, int height) {
+        checkRecycled();
+        nativeTexImage(mNativePtr, init, offsetX, offsetY, width, height);
+    }
+
+    /**
+     * Move to next frame. Do nothing for non-animation image
+     */
+    public void advance() {
+        checkRecycled();
+        nativeAdvance(mNativePtr);
+    }
+
+    /**
+     * Return current frame delay. 0 for non-animation image
+     */
+    public int getDelay() {
+        checkRecycled();
+        int delay = nativeGetDelay(mNativePtr);
+        return delay <= 10 ? 100 : delay;
+    }
+
+    /**
+     * Return is the image opaque
+     */
+    public boolean isOpaque() {
+        checkRecycled();
+        return nativeIsOpaque(mNativePtr);
+    }
+
+    /**
+     * Free the native object associated with this image.
+     * It must be called when the image will not be used.
+     * The image can't be used after this method is called.
+     */
+    public synchronized void recycle() {
+        if (mNativePtr != 0) {
+            nativeRecycle(mNativePtr);
+            mNativePtr = 0;
+            imageList.remove(this);
+        }
+    }
+
+    /**
+     * Returns true if this image has been recycled.
+     */
+    public boolean isRecycled() {
+        return mNativePtr == 0;
+    }
+}
@@ -28,6 +28,7 @@ import android.os.Looper;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

+import java.io.FileDescriptor;
 import java.io.InputStream;
 import java.lang.ref.WeakReference;
 import java.util.Iterator;
@@ -44,8 +45,6 @@ public final class ImageBitmap implements Animatable, Runnable {
    private final Bitmap mBitmap;
    private final int mFormat;
    private final boolean mIsOpaque;
-    private final int mByteCount;
-    private final int mFrameCount;
    private final Set<WeakReference<Callback>> mCallbackSet = new LinkedHashSet<>();
    @Nullable
    private Image mImage;
@@ -60,10 +59,8 @@ public final class ImageBitmap implements Animatable, Runnable {
        image.render(0, 0, mBitmap, 0, 0, width, height, false, 0);
        mFormat = image.getFormat();
        mIsOpaque = image.isOpaque();
-        mByteCount = image.getByteCount();
-        mFrameCount = image.getFrameCount();

-        if (mFrameCount > 1) {
+        if (mFormat == 1) {
            // For animated image, save image object
            mImage = image;
        } else {
@@ -73,19 +70,17 @@ public final class ImageBitmap implements Animatable, Runnable {
    }

    private ImageBitmap(@NonNull Bitmap bitmap) {
-        mFormat = Image.FORMAT_PLAIN;
+        mFormat = Image.FORMAT_NORMAL;
        mBitmap = bitmap;
        mIsOpaque = !bitmap.hasAlpha();
-        mByteCount = bitmap.getRowBytes() * bitmap.getHeight();
-        mFrameCount = 1;
    }

    /**
     * Decode {@code InputStream}, then create image.
     */
    @Nullable
-    public static ImageBitmap decode(@NonNull InputStream is) {
-        Image image = Image.decode(is, false);
+    public static ImageBitmap decode(@NonNull FileDescriptor fd) {
+        Image image = Image.decode(fd, false);
        if (image != null) {
            return create(image);
        } else {
@@ -223,13 +218,6 @@ public final class ImageBitmap implements Animatable, Runnable {
        return mIsOpaque;
    }

-    /**
-     * Return byte count of image
-     */
-    public int getByteCount() {
-        return mByteCount;
-    }
-
    /**
     * Return image is animated
     */
@@ -237,13 +225,6 @@ public final class ImageBitmap implements Animatable, Runnable {
        return mImage != null;
    }

-    /**
-     * Return image frame count
-     */
-    public int getFrameCount() {
-        return mFrameCount;
-    }
-
    /**
     * Draw image to canvas
     */
@@ -14,11 +14,14 @@
 * limitations under the License.
 */

-package com.hippo.ehviewer.daogenerator;
+package com.hippo.scene;

-public class Main {
+import android.content.Context;

-    public static void main(String[] args) throws Exception {
-        EhDaoGenerator.generate();
-    }
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+
+public interface TransitionHelper {
+
+    boolean onTransition(Context context, FragmentTransaction transaction, Fragment exit, Fragment enter);
 }
@@ -33,6 +33,7 @@ final class DocumentsContractApi21 {
    private static final String TAG = DocumentsContractApi21.class.getSimpleName();
    private static final String PATH_DOCUMENT = "document";
    private static final String PATH_TREE = "tree";
+
    private DocumentsContractApi21() {
    }
Author	SHA1	Message	Date
tarsin	a5d90cc97d	Make release CI / Build (push) Has been cancelled Details Releases / Build (push) Has been cancelled Details	2022-08-04 07:39:53 +08:00
tarsin	657d566e89	No need to merge old local db	2022-08-04 07:06:01 +08:00
tarsin	5e6d24f01e	Clean up	2022-08-04 06:49:37 +08:00
tarsin	e353bbe4c3	Refine database import export	2022-08-04 06:35:42 +08:00
renovate[bot]	4ee2cdf19c	Update plugin com.android.application to v7.2.2 (1.8.x.x) (#162 ) Update plugin com.android.application to v7.2.2 Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2022-08-04 04:59:09 +08:00
txyyh	b28831a8aa	Delete useless string (#161 )	2022-08-04 04:58:53 +08:00
EdwardWuandtarsin	800b64d5d3	fixup! Ehviewer: Add Chinese(Traditional) Translate (#160 ) * Ehviewer: Add Chinese(Traditional) Translate Signed-off-by: Edward Wu <bluehome.wu@gmail.com> * fixup! Ehviewer: Add Chinese(Traditional) Translate Signed-off-by: Edward Wu <bluehome.wu@gmail.com> Co-authored-by: tarsin <43900799+asuka-mio@users.noreply.github.com>	2022-08-03 22:22:08 +08:00
tarsin	cfa6164b5c	Use ksp	2022-08-03 22:16:01 +08:00
tarsin	9cb22b6e17	Initial stub migrate to androidx room	2022-08-03 21:59:55 +08:00
tarsin	19891e6768	Fix location	2022-08-03 20:39:11 +08:00
tarsin	c616410e0b	Drop daogenerator first	2022-08-03 20:33:45 +08:00
EdwardWu	31e1e79ed2	Ehviewer: Add Chinese(Traditional) Translate (#158 ) Signed-off-by: Edward Wu <bluehome.wu@gmail.com>	2022-08-03 19:48:22 +08:00
tarsin	6191a9827d	Use Ofast	2022-08-03 19:14:11 +08:00
tarsin	f373d8f293	Allow universal apk build	2022-08-03 19:07:08 +08:00
tarsin	c233eb5a30	Avoid unnecessary native method calling java method	2022-08-03 18:49:00 +08:00
tarsin	360a3e9b5f	Clean up	2022-08-03 18:10:30 +08:00
tarsin	01aff59d46	Re-checkout	2022-08-03 17:56:27 +08:00
tarsin	f0f1dca7cb	Fix build	2022-08-03 17:51:01 +08:00
tarsin	6f3bd92539	Merge native	2022-08-03 17:48:46 +08:00
tarsin	a8023f7334	Minify proguard rules	2022-08-03 17:34:21 +08:00
txyyh	8c368972ec	Add get-it-on-fdroid into README (#157 ) * Fix wrong alt * Add get-it-on-fdroid	2022-08-02 23:52:50 +08:00
tarsin	5aea90314a	Update README.md	2022-08-02 14:02:53 +08:00
tarsin	0c8ba49d61	Update README.md	2022-08-02 14:00:40 +08:00
tarsin	ea5b8b9f81	Update README.md	2022-08-02 13:52:28 +08:00
LaLucid	6b21f5082c	update CI (#155 ) * update CI * do not need setup-android	2022-08-02 13:46:49 +08:00
tarsin	438d7f1b34	Use O3 optimization	2022-08-01 22:24:01 +08:00
tarsin	301797b477	Import androidx navigation	2022-08-01 10:18:36 +08:00
tarsin	2758be2462	Code clean	2022-08-01 10:14:33 +08:00
tarsin	8f03e4910d	Code clean	2022-08-01 10:04:27 +08:00
tarsin	a09efd3eea	Fix #81	2022-08-01 09:48:56 +08:00
tarsin	a66d460572	Remove warning	2022-08-01 09:35:17 +08:00
txyyh	162b88915e	1.8.0.4 CI / Build (push) Has been cancelled Details Releases / Build (push) Has been cancelled Details	2022-07-31 23:10:42 +08:00
txyyh	d014b6947c	Rewrite download section in README (#150 ) * Delete CI Download in README * Add Chinese NOTE * Add English NOTE * Use icon for github download	2022-07-31 12:34:48 +08:00
tarsin	a6188964c9	Add simple sanitize, Fix#148	2022-07-31 09:23:41 +08:00
tarsin	722fbec72c	1.8.0.3 CI / Build (push) Has been cancelled Details Releases / Build (push) Has been cancelled Details	2022-07-29 18:08:31 +08:00
tarsin	22190fb686	Fix a double-free problem	2022-07-28 23:45:35 +08:00
txyyh	49ea70c839	Add monochrome icon (#144 )	2022-07-28 12:06:56 +08:00
tarsin	c655e7e1c9	Drop blank res	2022-07-28 11:28:45 +08:00
tarsin	d13cd1e07f	1.8.0.2 CI / Build (push) Has been cancelled Details Releases / Build (push) Has been cancelled Details	2022-07-28 10:37:07 +08:00
tarsin	7365fd0448	Fix a memleak	2022-07-28 10:33:47 +08:00
txyyh	f1febca312	Let renovate bot detect two branch	2022-07-28 04:12:33 +08:00
renovate[bot]	dbf67404c0	Update fragment_version to v1.5.1 (#138 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2022-07-28 03:39:42 +08:00
renovate[bot]	8cfe8c4b80	Update collection_version to v1.3.0-alpha02 (#137 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2022-07-28 03:39:25 +08:00
tarsin	674f53315f	Code clean	2022-07-27 19:46:39 +08:00
tarsin	e51cd6b90d	Drop taptargetview * Not MD3	2022-07-25 20:44:59 +08:00
tarsin	a44f12b2e0	Reformat Code	2022-07-25 20:07:16 +08:00
tarsin	a2552ed5b9	Reformat	2022-07-25 20:05:38 +08:00
tarsin	763c007950	Log tweaks	2022-07-25 20:02:47 +08:00
tarsin	b221bf8e52	Release 1.8.0.1 CI / Build (push) Has been cancelled Details Releases / Build (push) Has been cancelled Details	2022-07-25 19:16:07 +08:00
tarsin	ab9a89685c	Code clean	2022-07-25 19:02:10 +08:00
tarsin	41ccb16227	Code clean	2022-07-25 18:42:18 +08:00
tarsin	f6bf7b1ba6	No need to thanks image decs anymore	2022-07-25 13:06:24 +08:00
tarsin	09e7113df1	Fix a dirty dealloc	2022-07-25 12:23:52 +08:00
tarsin	62a7e283a4	Should be able to support all format now	2022-07-25 10:51:57 +08:00
tarsin	a7f7bf1316	Release 1.8 CI / Build (push) Has been cancelled Details Releases / Build (push) Has been cancelled Details	2022-07-25 10:20:16 +08:00
tarsin	a72fca3dfb	Fix a lag	2022-07-25 10:16:54 +08:00
tarsin	c5e7a6e8f9	Code clean	2022-07-25 10:02:34 +08:00
tarsin	80a20f25b9	Fix animated	2022-07-25 09:28:40 +08:00
tarsin	500163fe1a	Merge pull request #132 from Ehviewer-Overhauled/master Pull master	2022-07-25 07:54:04 +08:00
tarsin	50c6111773	Imagedecoder do not support anon pipe, drop it and use memarea	2022-07-24 23:32:03 +08:00
tarsin	3a05649c71	Code clean	2022-07-24 22:34:19 +08:00
tarsin	9d25376e1f	Refactor	2022-07-24 21:41:53 +08:00
tarsin	89935b5639	Hard cast	2022-07-24 20:32:39 +08:00
tarsin	e095627aee	Refactor	2022-07-24 20:20:04 +08:00
tarsin	b61e46e956	Clean up	2022-07-24 19:49:34 +08:00
tarsin	76459c5dd2	Initial stupid migrate to ImageDecoder	2022-07-24 19:18:54 +08:00
tarsin	7ad67a3dbd	Minsdk 31	2022-07-24 18:24:24 +08:00
tarsin	577b49ac19	Drop image decode native libs	2022-07-24 18:17:37 +08:00