Release 1.8.6.2

Fix 509 detection false positive
Clean up unfinished download files
2023-02-20 19:06:59 +08:00 · 2023-02-20 19:06:13 +08:00 · 2023-02-20 18:48:49 +08:00 · 2023-02-20 18:48:40 +08:00 · 2023-02-20 18:48:34 +08:00 · 2023-02-20 18:48:27 +08:00
494 changed files with 23976 additions and 15076 deletions
@@ -18,9 +18,7 @@ body:
      label: 复现步骤 / Step to reproduce
      description: |
        请从全新安装应用开始，在此处写下复现的方式。请尽量附带录屏
-        如果不能稳定复现，请在下方上传应用日志
        Describe how to reproduce here with fresh installation, with screen recording if possible.
-        If you can't reproduce it consistently, please upload app logs below
      placeholder: |
        0. 重新安装应用 / Fresh install
        1.
@@ -57,15 +55,6 @@ body:
    validations:
      required: true

-  - type: textarea
-    id: log
-    attributes:
-      label: 应用日志 / App logs
-      description: 您可以通过设置-高级-导出日志来获得日志文件 / You can get logs file in Settings - Advanced - Dump logcat
-      placeholder: 06-15 17:44:53.704 23382 23382 E ...
-    validations:
-      required: false
-
  - type: textarea
    id: more
    attributes:
@@ -92,8 +81,8 @@ body:
    id: ci
    attributes:
      label: EhViewer CI 版本 / EhViewer CI Version
-      description: 位于设置 - 关于中的版本号后 / Next to the version code in Settings - About
-      placeholder: 26f05a0
+      description: 直接将对应 GitHub Action CI 下载页面网址填入即可 / Simply drop GitHub Action CI download page url here
+      placeholder: https://github.com/Ehviewer-Overhauled/Ehviewer/actions/runs/XXXXXXXXXX
    validations:
      required: true

@@ -65,8 +65,8 @@ body:
    id: ci
    attributes:
      label: EhViewer CI 版本 / EhViewer CI Version
-      description: 位于设置 - 关于中的版本号后 / Next to the version code in Settings - About
-      placeholder: 26f05a0
+      description: 直接将对应 GitHub Action CI 下载页面网址填入即可 / Simply drop GitHub Action CI download page url here
+      placeholder: https://github.com/Ehviewer-Overhauled/Ehviewer/actions/runs/XXXXXXXXXX
    validations:
      required: true

@@ -17,19 +17,16 @@ jobs:
        with:
          submodules: 'recursive'

-      - name: Setup Java 17
+      - name: Setup Java 19
        uses: actions/setup-java@v3
        with:
          distribution: temurin
-          java-version: 17
+          java-version: 19

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

-      - name: Ktlint Check
-        run: ./gradlew ktlintCheck
-
      - name: Gradle Build
        uses: gradle/gradle-build-action@v2
        with:
@@ -12,19 +12,16 @@ jobs:
        with:
          submodules: 'recursive'

-      - name: Setup Java 17
+      - name: Setup Java 19
        uses: actions/setup-java@v3
        with:
          distribution: temurin
-          java-version: 17
+          java-version: 19

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

-      - name: Ktlint Check
-        run: ./gradlew ktlintCheck
-
      - name: Gradle Build
        uses: gradle/gradle-build-action@v2
        with:
@@ -15,11 +15,11 @@ jobs:
        with:
          submodules: 'recursive'

-      - name: Setup Java 17
+      - name: Setup Java 19
        uses: actions/setup-java@v3
        with:
          distribution: temurin
-          java-version: 17
+          java-version: 19

      - name: Install NDK
        run: |
@@ -1,3 +1,9 @@
+[submodule "app/src/main/cpp/libarchive"]
+	path = app/src/main/cpp/libarchive
+	url = https://github.com/Ehviewer-Overhauled/libarchive
+[submodule "app/src/main/cpp/liblzma"]
+	path = app/src/main/cpp/liblzma
+	url = https://github.com/Ehviewer-Overhauled/xz
 [submodule "app/src/main/cpp/nettle/nettle"]
 	path = app/src/main/cpp/nettle/nettle
 	url = https://github.com/Ehviewer-Overhauled/nettle
@@ -25,9 +25,6 @@
  <a href="https://www.codefactor.io/repository/github/Ehviewer-Overhauled/ehviewer">
    <img src="https://www.codefactor.io/repository/github/Ehviewer-Overhauled/ehviewer/badge" alt="CodeFactor">
  </a>
-  <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/releases">
-    <img src="https://img.shields.io/github/downloads/Ehviewer-Overhauled/EhViewer/total.svg" alt="Downloads">
-  </a>
  <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/releases">
    <img src="https://img.shields.io/github/v/release/Ehviewer-Overhauled/ehviewer?include_prereleases" alt="Release">
  </a>
@@ -60,12 +57,12 @@
  </h3>
 </div>

+
 # Description

 EhViewer fork dedicated to lightweight and high-performance

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

 # Download

@@ -80,19 +77,18 @@ and [Dynamic Color](https://m3.material.io/styles/color/dynamic-color/overview)

 Here is the libraries

- [Arrow](https://arrow-kt.io/)
 - [AOSP & AndroidX](http://source.android.com/)
- [Kotlin & KotlinX](https://kotlinlang.org/)
- [FullDraggableDrawer](https://github.com/PureWriter/FullDraggableDrawer)
- [MCA](https://github.com/material-components/material-components-android)
- [material-design-icons](https://github.com/google/material-design-icons)
- [Okhttp](https://square.github.io/okhttp/)
- [RikkaX](https://github.com/RikkaApps/RikkaX)
- [Libarchive](http://www.libarchive.org/)
 - [Coil](https://coil-kt.github.io/coil/)
- [Jsoup](https://jsoup.org/)
+- [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)
+- [jsoup](https://github.com/jhy/jsoup)
+- [okhttp](https://github.com/square/okhttp)
+- [RikkaX](https://github.com/RikkaApps/RikkaX)
+- [libarchive](http://www.libarchive.org/)
+- [XZ Utils](https://tukaani.org/xz/)

-Specially thanks [Tachiyomi](https://tachiyomi.org/) for its reader implementation!

 # License

@@ -1,8 +1,3 @@
-import java.io.ByteArrayOutputStream
-import java.time.Instant
-import java.time.ZoneOffset
-import java.time.format.DateTimeFormatter
-
 plugins {
    id("com.android.application")
    kotlin("android")
@@ -13,20 +8,15 @@ plugins {

 android {
    compileSdk = 33
-    buildToolsVersion = "33.0.2"
+    buildToolsVersion = "33.0.1"
    ndkVersion = "25.2.9519653"
-    androidResources.generateLocaleConfig = true

    splits {
        abi {
            isEnable = true
            reset()
-            if (gradle.startParameter.taskNames.any { it.contains("Release") }) {
-                include("arm64-v8a", "x86_64", "armeabi-v7a", "x86")
-                isUniversalApk = true
-            } else {
-                include("arm64-v8a")
-            }
+            include("arm64-v8a", "x86_64", "armeabi-v7a", "x86")
+            isUniversalApk = true
        }
    }

@@ -35,30 +25,17 @@ android {
        storePassword = "000000"
        keyAlias = "key0"
        keyPassword = "000000"
+
        enableV3Signing = true
        enableV4Signing = true
    }

-    val commitSha by lazy {
-        val stdout = ByteArrayOutputStream()
-        exec {
-            commandLine = "git rev-parse --short=7 HEAD".split(' ')
-            standardOutput = stdout
-        }
-        stdout.toString().trim()
-    }
-
-    val buildTime by lazy {
-        val formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm").withZone(ZoneOffset.UTC)
-        formatter.format(Instant.now())
-    }
-
    defaultConfig {
        applicationId = "moe.tarsin.ehviewer"
        minSdk = 28
        targetSdk = 33
-        versionCode = 180038
-        versionName = "1.8.8.0-beta"
+        versionCode = 180034
+        versionName = "1.8.6.2"
        resourceConfigurations.addAll(
            listOf(
                "zh",
@@ -72,11 +49,9 @@ android {
                "de",
                "th",
                "tr",
-                "nb-rNO",
-            ),
+                "nb-rNO"
+            )
        )
-        buildConfigField("String", "COMMIT_SHA", "\"$commitSha\"")
-        buildConfigField("String", "BUILD_TIME", "\"$buildTime\"")
    }

    externalNativeBuild {
@@ -86,27 +61,26 @@ android {
    }

    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_19
+        targetCompatibility = JavaVersion.VERSION_19
    }

    kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = "19"
        freeCompilerArgs = listOf(
            // https://kotlinlang.org/docs/compiler-reference.html#progressive
            "-progressive",
-            "-Xjvm-default=all",
-            "-Xlambdas=indy",

            "-opt-in=coil.annotation.ExperimentalCoilApi",
+            "-opt-in=com.google.accompanist.permissions.ExperimentalPermissionsApi",
            "-opt-in=androidx.compose.foundation.layout.ExperimentalLayoutApi",
+            "-opt-in=androidx.compose.material.ExperimentalMaterialApi",
            "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api",
-            "-opt-in=androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi",
+            "-opt-in=androidx.compose.material.ExperimentalMaterialApi",
            "-opt-in=androidx.compose.ui.ExperimentalComposeUiApi",
            "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi",
            "-opt-in=androidx.compose.animation.ExperimentalAnimationApi",
-            "-opt-in=androidx.paging.ExperimentalPagingApi",
-            "-opt-in=kotlin.contracts.ExperimentalContracts",
+            "-opt-in=androidx.compose.animation.graphics.ExperimentalAnimationGraphicsApi",
            "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
            "-opt-in=kotlinx.coroutines.FlowPreview",
            "-opt-in=kotlinx.coroutines.InternalCoroutinesApi",
@@ -122,7 +96,8 @@ android {

    packaging {
        resources {
-            excludes += "/META-INF/**"
+            excludes += "/META-INF/CHANGES"
+            excludes += "/META-INF/README.md"
            excludes += "/kotlin/**"
            excludes += "**.txt"
            excludes += "**.bin"
@@ -150,7 +125,7 @@ android {
    }

    composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.7"
+        kotlinCompilerExtensionVersion = "1.4.2"
    }

    namespace = "com.hippo.ehviewer"
@@ -158,26 +133,23 @@ android {

 dependencies {
    // https://developer.android.com/jetpack/androidx/releases/activity
-    implementation("androidx.activity:activity-compose:1.7.1")
+    implementation("androidx.activity:activity-compose:1.6.1")
    implementation("androidx.appcompat:appcompat:1.6.1")
    implementation("androidx.biometric:biometric-ktx:1.2.0-alpha05")
    implementation("androidx.browser:browser:1.5.0")
-    implementation("androidx.collection:collection-ktx:1.3.0-alpha04")
+    implementation("androidx.collection:collection-ktx:1.3.0-alpha02")

    // https://developer.android.com/jetpack/androidx/releases/compose-material3
-    // api(platform("androidx.compose:compose-bom:2023.03.00"))
-    api(platform("dev.chrisbanes.compose:compose-bom:2023.04.00-SNAPSHOT"))
+    implementation(platform("androidx.compose:compose-bom:2023.01.00"))
    implementation("androidx.compose.material:material-icons-extended")
    implementation("androidx.compose.material3:material3")
-    implementation("androidx.compose.material3:material3-window-size-class")

-    implementation("androidx.core:core-ktx:1.11.0-alpha04")
+    implementation("androidx.core:core-ktx:1.10.0-alpha02")

-    implementation("androidx.constraintlayout:constraintlayout-compose:1.1.0-alpha09")
+    implementation("androidx.constraintlayout:constraintlayout:2.2.0-alpha07")
    implementation("androidx.coordinatorlayout:coordinatorlayout:1.2.0")
-    implementation("androidx.drawerlayout:drawerlayout:1.2.0")
    // https://developer.android.com/jetpack/androidx/releases/lifecycle
-    implementation("androidx.lifecycle:lifecycle-process:2.6.1")
+    implementation("androidx.lifecycle:lifecycle-process:2.5.1")

    // https://developer.android.com/jetpack/androidx/releases/navigation
    val nav_version = "2.5.3"
@@ -186,25 +158,23 @@ dependencies {
    implementation("androidx.navigation:navigation-compose:$nav_version")

    // https://developer.android.com/jetpack/androidx/releases/paging
-    implementation("androidx.paging:paging-common-ktx:3.2.0-alpha05")
-    implementation("androidx.paging:paging-compose:1.0.0-alpha19")
+    implementation("androidx.paging:paging-runtime-ktx:3.2.0-alpha04")
+    implementation("androidx.paging:paging-compose:1.0.0-alpha18")
    implementation("androidx.preference:preference-ktx:1.2.0")
-    implementation("androidx.recyclerview:recyclerview:1.3.0")
+    implementation("androidx.recyclerview:recyclerview:1.3.0-rc01")

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

    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01")
-    implementation("androidx.work:work-runtime-ktx:2.8.1")
    implementation("com.drakeet.drawer:drawer:1.0.3")
    implementation("com.github.chrisbanes:PhotoView:2.3.0") // Dead Dependency
    implementation("com.github.tachiyomiorg:DirectionalViewPager:1.0.0") // Dead Dependency
-    implementation("com.github.nanihadesuka:LazyColumnScrollbar:1.6.3")
    // https://github.com/google/accompanist/releases
-    implementation("com.google.accompanist:accompanist-themeadapter-material3:0.30.1")
-    implementation("com.google.android.material:material:1.9.0")
+    implementation("com.google.accompanist:accompanist-themeadapter-material3:0.28.0")
+    implementation("com.google.android.material:material:1.8.0")

    // https://square.github.io/okhttp/changelogs/changelog/
    implementation("com.squareup.okhttp3:okhttp-bom:5.0.0-alpha.11")
@@ -215,27 +185,22 @@ dependencies {
    implementation("dev.chrisbanes.insetter:insetter:0.6.1") // Dead Dependency
    implementation("dev.rikka.rikkax.core:core-ktx:1.4.1")
    implementation("dev.rikka.rikkax.insets:insets:1.3.0")
-    implementation("dev.rikka.rikkax.layoutinflater:layoutinflater:1.3.0")
+    implementation("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(platform("io.arrow-kt:arrow-stack:2.0.0-SNAPSHOT"))
-    implementation("io.arrow-kt:arrow-functions")
-    implementation("io.arrow-kt:arrow-fx-coroutines")
-
    // https://coil-kt.github.io/coil/changelog/
-    implementation("io.coil-kt:coil-compose:2.3.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-cbor:1.5.1")
-    implementation("org.jsoup:jsoup:1.16.1")
+    // implementation 'io.coil-kt:coil:2.2.2'
+    implementation("com.github.Ehviewer-Overhauled.coil:coil-compose:53302f2")
+
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-cbor:1.5.0-RC")
+    implementation("org.jsoup:jsoup:1.15.3")
 }

 configurations.all {
    exclude("dev.rikka.rikkax.appcompat", "appcompat")
    exclude("dev.rikka.rikkax.material", "material")
-}
-
-ksp {
-    arg("room.schemaLocation", "$projectDir/schemas")
-    arg("room.generateKotlin", "true")
+    exclude("org.jetbrains.kotlin", "kotlin-android-extensions-runtime")
+    exclude("org.jetbrains.kotlin", "kotlin-stdlib-jdk7")
+    exclude("org.jetbrains.kotlin", "kotlin-stdlib-jdk8")
 }
@@ -13,6 +13,9 @@

 -keep class androidx.viewpager.widget.ViewPager$LayoutParams { int position; }

+# Ktor logger
+-dontwarn org.slf4j.impl.StaticLoggerBinder
+
 -keepattributes LineNumberTable,SourceFile
 -renamesourcefileattribute SourceFile

@@ -1,88 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 1,
-    "identityHash": "c801ee62729ba20a203b150211234d5c",
-    "entities": [
-      {
-        "tableName": "OK_HTTP_3_COOKIE",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`NAME` TEXT, `VALUE` TEXT, `EXPIRES_AT` INTEGER NOT NULL, `DOMAIN` TEXT, `PATH` TEXT, `SECURE` INTEGER NOT NULL, `HTTP_ONLY` INTEGER NOT NULL, `PERSISTENT` INTEGER NOT NULL, `HOST_ONLY` INTEGER NOT NULL, `_id` INTEGER NOT NULL, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "name",
-            "columnName": "NAME",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "value",
-            "columnName": "VALUE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "expiresAt",
-            "columnName": "EXPIRES_AT",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "domain",
-            "columnName": "DOMAIN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "path",
-            "columnName": "PATH",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "secure",
-            "columnName": "SECURE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "httpOnly",
-            "columnName": "HTTP_ONLY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "persistent",
-            "columnName": "PERSISTENT",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "hostOnly",
-            "columnName": "HOST_ONLY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'c801ee62729ba20a203b150211234d5c')"
-    ]
-  }
-}
@@ -1,88 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 2,
-    "identityHash": "1b80cd29939b0f43934721f1289ba94d",
-    "entities": [
-      {
-        "tableName": "OK_HTTP_3_COOKIE",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`NAME` TEXT NOT NULL, `VALUE` TEXT NOT NULL, `EXPIRES_AT` INTEGER NOT NULL, `DOMAIN` TEXT NOT NULL, `PATH` TEXT NOT NULL, `SECURE` INTEGER NOT NULL, `HTTP_ONLY` INTEGER NOT NULL, `PERSISTENT` INTEGER NOT NULL, `HOST_ONLY` INTEGER NOT NULL, `_id` INTEGER, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "name",
-            "columnName": "NAME",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "value",
-            "columnName": "VALUE",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "expiresAt",
-            "columnName": "EXPIRES_AT",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "domain",
-            "columnName": "DOMAIN",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "path",
-            "columnName": "PATH",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "secure",
-            "columnName": "SECURE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "httpOnly",
-            "columnName": "HTTP_ONLY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "persistent",
-            "columnName": "PERSISTENT",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "hostOnly",
-            "columnName": "HOST_ONLY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '1b80cd29939b0f43934721f1289ba94d')"
-    ]
-  }
-}
@@ -27,6 +27,7 @@
        android:hasFragileUserData="true"
        android:icon="@mipmap/ic_launcher"
        android:label="@string/app_name"
+        android:localeConfig="@xml/locales_config"
        android:networkSecurityConfig="@xml/network_security_config"
        android:roundIcon="@mipmap/ic_launcher_round"
        android:supportsRtl="true"
@@ -1,34 +0,0 @@
-From fc9fb0ea245259e346ab46c334f03b557fe63b6b Mon Sep 17 00:00:00 2001
-From: tarsin <yuanqingxiang233@163.com>
-Date: Tue, 22 Nov 2022 12:37:12 +0800
-Subject: [PATCH] Don't build other binarys
-
---
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 01c73cd..b461e68 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -592,7 +592,7 @@ check_symbol_exists(getopt_long getopt.h HAVE_GETOPT_LONG)
- # xzdec
- #############################################################################
- 
-if(HAVE_GETOPT_LONG)
-+if(0)
-     add_executable(xzdec
-         src/common/sysdefs.h
-         src/common/tuklib_common.h
-@@ -630,7 +630,7 @@ endif()
- # xz
- #############################################################################
- 
-if(NOT MSVC AND HAVE_GETOPT_LONG)
-+if(0)
-     add_executable(xz
-         src/common/mythread.h
-         src/common/sysdefs.h
-- 
-2.39.2
-
@@ -1,38 +0,0 @@
-From 2a67861e6f06794f3671c4988bac12330d8422e3 Mon Sep 17 00:00:00 2001
-From: tarsin <yuanqingxiang233@163.com>
-Date: Fri, 27 May 2022 23:21:20 +0800
-Subject: [PATCH 1/2] Don't build shared lib
-
---
- libarchive/CMakeLists.txt | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt
-index ff7ade00..00c2e170 100644
--- a/libarchive/CMakeLists.txt
-+++ b/libarchive/CMakeLists.txt
-@@ -242,12 +242,6 @@ ELSEIF(ARCHIVE_ACL_SUNOS)
-   LIST(APPEND libarchive_SOURCES archive_disk_acl_sunos.c)
- ENDIF()
- 
-# Libarchive is a shared library
-ADD_LIBRARY(archive SHARED ${libarchive_SOURCES} ${include_HEADERS})
-TARGET_INCLUDE_DIRECTORIES(archive PUBLIC .)
-TARGET_LINK_LIBRARIES(archive ${ADDITIONAL_LIBS})
-SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION})
-
- # archive_static is a static library
- ADD_LIBRARY(archive_static STATIC ${libarchive_SOURCES} ${include_HEADERS})
- TARGET_LINK_LIBRARIES(archive_static ${ADDITIONAL_LIBS})
-@@ -260,7 +254,7 @@ ENDIF(NOT WIN32 OR CYGWIN)
- 
- IF(ENABLE_INSTALL)
-   # How to install the libraries
-  INSTALL(TARGETS archive archive_static
-+  INSTALL(TARGETS archive_static
-           RUNTIME DESTINATION bin
-           LIBRARY DESTINATION lib
-           ARCHIVE DESTINATION lib)
-- 
-2.39.2
-
@@ -1,25 +0,0 @@
-From c9298fd6dc0a8b04dd4b2247118b9cb895c46e58 Mon Sep 17 00:00:00 2001
-From: tarsin <yuanqingxiang233@163.com>
-Date: Sat, 23 Jul 2022 16:05:36 +0800
-Subject: [PATCH 2/2] Insert link libs
-
---
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 713e3bc5..7247640d 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -415,7 +415,7 @@ IF(DEFINED __GNUWIN32PATH AND EXISTS "${__GNUWIN32PATH}")
-   # #  endif
- ENDIF(DEFINED __GNUWIN32PATH AND EXISTS "${__GNUWIN32PATH}")
- 
-SET(ADDITIONAL_LIBS "")
-+SET(ADDITIONAL_LIBS ${LIBARCHIVE_CUSTOM_LIBS})
- #
- # Find ZLIB
- #
-- 
-2.39.2
-
@@ -1,9 +1,7 @@
-cmake_minimum_required(VERSION 3.14)
-project(ehviewer C ASM)
-include(FetchContent)
+project(ehviewer)
+cmake_minimum_required(VERSION 3.4.1)

-if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Ofast -fvisibility=hidden -fvisibility-inlines-hidden -funroll-loops -flto=thin \
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Ofast -fvisibility=hidden -fvisibility-inlines-hidden -ffunction-sections -fdata-sections -funroll-loops -flto=thin \
           -mllvm -polly \
           -mllvm -polly-run-dce \
           -mllvm -polly-run-inliner \
@@ -14,20 +12,6 @@ if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
           -mllvm -polly-vectorizer=stripmine \
           -mllvm -polly-detect-profitability-min-per-loop-insts=40 \
           -mllvm -polly-invariant-load-hoisting")
-endif (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-
-# Change the default path of fetch content to avoid downloading the same dependencies per architecture
-get_filename_component(deps "../_deps" REALPATH BASE_DIR "${CMAKE_BINARY_DIR}")
-set(FETCHCONTENT_BASE_DIR ${deps})
-
-FetchContent_Declare(liblzma
-        GIT_REPOSITORY https://git.tukaani.org/xz.git
-        GIT_TAG v5.4.1
-        PATCH_COMMAND git apply ${CMAKE_CURRENT_LIST_DIR}/0001-Don-t-build-other-binarys.patch || cd .
-        )
-
-FetchContent_MakeAvailable(liblzma)
-include_directories(${liblzma_SOURCE_DIR}/src/liblzma/api)

 # Build GNUTLS libnettle
 add_subdirectory(nettle)
@@ -43,7 +27,11 @@ set(HAVE_NETTLE_PBKDF2_H 1)
 set(HAVE_NETTLE_RIPEMD160_H 1)
 set(HAVE_NETTLE_SHA_H 1)

+# Build liblzma
+add_subdirectory(liblzma)
+
 # Configure lzma support for libarchive
+include_directories(liblzma/src/liblzma/api)
 SET(HAVE_LIBLZMA 1)
 SET(HAVE_LZMA_H 1)
 SET(HAVE_LZMA_STREAM_ENCODER_MT 1)
@@ -51,17 +39,12 @@ SET(HAVE_LZMADEC_H 1)
 SET(HAVE_LIBLZMADEC 1)

 # Configure libarchive link's static lib
-SET(LIBARCHIVE_CUSTOM_LIBS "nettle" "liblzma")
+SET(LIBARCHIVE_CUSTOM_LIBS "liblzma" "nettle")

-FetchContent_Declare(libarchive
-        GIT_REPOSITORY https://github.com/libarchive/libarchive
-        GIT_TAG v3.6.2
-        PATCH_COMMAND git apply ${CMAKE_CURRENT_LIST_DIR}/0001-Don-t-build-shared-lib.patch ${CMAKE_CURRENT_LIST_DIR}/0002-Insert-link-libs.patch || cd .
-        )
-
-FetchContent_MakeAvailable(libarchive)
-include_directories(${libarchive_SOURCE_DIR}/libarchive)
+# Build libarchive
+add_subdirectory(libarchive)

 # Build and link our app's native lib
-add_library(${PROJECT_NAME} SHARED archive.c gifutils.c natsort/strnatcmp.c)
-target_link_libraries(${PROJECT_NAME} archive_static log)
+add_library(${PROJECT_NAME} SHARED archive.c fdutils.c gifutils.c)
+target_include_directories(${PROJECT_NAME} PUBLIC libarchive/libarchive)
+target_link_libraries(${PROJECT_NAME} archive_static log -Wl,--gc-sections)
@@ -17,12 +17,14 @@
 * EhViewer. If not, see <https://www.gnu.org/licenses/>.
 */

+#include <assert.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #include <pthread.h>
 #include <sys/mman.h>
+#include <syscall.h>

 #include <jni.h>
 #include <android/log.h>
@@ -32,9 +34,7 @@

 #define LOG_TAG "libarchive_wrapper"

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

 typedef struct {
    int using;
@@ -46,25 +46,12 @@ typedef struct {
 typedef struct {
    const char *filename;
    int index;
-    size_t size;
 } entry;

-_Atomic mcs_lock ctx_lock;
+pthread_mutex_t ctx_lock;
 static archive_ctx **ctx_pool;
 #define CTX_POOL_SIZE 20

-static void *mempool = NULL;
-static size_t *mempoolofs = NULL;
-
-#define PAGE_ALIGN(x) ((x + ~PAGE_MASK) & PAGE_MASK)
-
-#define MEMPOOL_ADDR_BY_SORTED_IDX(x) (mempool + (index ? mempoolofs[index - 1] : 0))
-#define MEMPOOL_SIZE (mempoolofs[entryCount - 1])
-#define MEMPOOL_ENTITY_SIZE(x) PAGE_ALIGN(entries[x].size)
-
-#define PROT_RW (PROT_WRITE | PROT_READ)
-#define MAP_ANON_POOL (MAP_ANONYMOUS | MAP_NORESERVE | MAP_PRIVATE | MAP_UNINITIALIZED)
-
 static bool need_encrypt = false;
 static char *passwd = NULL;
 static void *archiveAddr = NULL;
@@ -72,7 +59,9 @@ static size_t archiveSize = 0;
 static entry *entries = NULL;
 static size_t entryCount = 0;

-const char supportExt[10][6] = {
+#define POPULATE_THRESHOLD (512 * 1024 * 1024) // 512 MiB
+
+const char supportExt[9][6] = {
        "jpeg",
        "jpg",
        "png",
@@ -81,8 +70,7 @@ const char supportExt[10][6] = {
        "bmp",
        "ico",
        "wbmp",
-        "heif",
-        "avif"
+        "heif"
 };

 static inline int filename_is_playable_file(const char *name) {
@@ -90,7 +78,7 @@ static inline int filename_is_playable_file(const char *name) {
    if (!dotptr++)
        return false;
    int i;
-    for (i = 0; i < 10; i++)
+    for (i = 0; i < 9; i++)
        if (strcmp(dotptr, supportExt[i]) == 0)
            return true;
    return false;
@@ -99,7 +87,9 @@ static inline int filename_is_playable_file(const char *name) {
 static inline int compare_entries(const void *a, const void *b) {
    const char *fa = ((entry *) a)->filename;
    const char *fb = ((entry *) b)->filename;
-    return strnatcmp(fa, fb);
+    int a_len = (int) strlen(fa);
+    int b_len = (int) strlen(fb);
+    return a_len == b_len ? strcmp(fa, fb) : a_len - b_len;
 }

 static long archive_map_entries_index(archive_ctx *ctx) {
@@ -109,7 +99,6 @@ static long archive_map_entries_index(archive_ctx *ctx) {
        if (filename_is_playable_file(name)) {
            entries[count].filename = strdup(name);
            entries[count].index = count;
-            entries[count].size = archive_entry_size(ctx->entry);
            count++;
        }
    }
@@ -119,48 +108,6 @@ static long archive_map_entries_index(archive_ctx *ctx) {
    return count;
 }

-static bool archive_prealloc_mempool() {
-    mempoolofs = calloc(entryCount, sizeof(size_t));
-    for (int i = 0; i < entryCount; ++i) {
-        if (!i)
-            mempoolofs[i] = PAGE_ALIGN(entries[i].size);
-        else
-            mempoolofs[i] = PAGE_ALIGN(entries[i].size) + mempoolofs[i - 1];
-    }
-    mempool = mmap(0, MEMPOOL_SIZE, PROT_RW, MAP_ANON_POOL, -1, 0);
-    if (mempool == MAP_FAILED) {
-        LOGE("%s%s", "mmap failed with error ", strerror(errno));
-        return false;
-    }
-    return true;
-}
-
-
-// Mincore does not support anon mapping yet
-// Now that we use MADV_FREE, how can we detect whether pages is reclaimed?
-static bool is_mempool_pages_present_and_lock(int index) {
-    void *addr = MEMPOOL_ADDR_BY_SORTED_IDX(index);
-    size_t size = MEMPOOL_ENTITY_SIZE(index);
-    mlock(addr, size);
-#if 0
-    unsigned char vec[size / PAGE_SIZE];
-    unsigned char r = 1;
-    mincore(addr, size, vec);
-    for (int i = 0; i < size / PAGE_SIZE; ++i) r &= vec[i];
-    return r;
-#endif
-    return false;
-}
-
-#define MEMPOOL_IN_CORE_AND_LOCK(x) is_mempool_pages_present_and_lock(x)
-
-static void mempool_release_pages(void *addr, size_t size) {
-    size = PAGE_ALIGN(size);
-    munlock(addr, size);
-    int ret = madvise(addr, size, MADV_FREE);
-    if (ret == -EINVAL) madvise(addr, size, MADV_DONTNEED);
-}
-
 static long archive_list_all_entries(archive_ctx *ctx) {
    long count = 0;
    while (archive_read_next_header(ctx->arc, &ctx->entry) == ARCHIVE_OK)
@@ -211,6 +158,7 @@ static int archive_alloc_ctx(archive_ctx **ctxptr) {
 }

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

    if (!ctx) {
        archive_ctx *victimCtx = NULL;
@@ -249,7 +196,7 @@ static int archive_get_ctx(archive_ctx **ctxptr, int idx) {
        ret = archive_alloc_ctx(&ctx);
        if (ret)
            return ret;
-        lock_mcs(&ctx_lock, &local_lock);
+        pthread_mutex_lock(&ctx_lock);
        for (int i = 0; i < CTX_POOL_SIZE; i++) {
            if (!ctx_pool[i]) {
                ctx_pool[i] = ctx;
@@ -263,9 +210,11 @@ static int archive_get_ctx(archive_ctx **ctxptr, int idx) {
                victimIdx = i;
            }
        }
-        if (replace) ctx_pool[victimIdx] = ctx;
-        unlock_mcs(&ctx_lock, &local_lock);
-        if (replace) archive_release_ctx(victimCtx);
+        if (replace) {
+            archive_release_ctx(victimCtx);
+            ctx_pool[victimIdx] = ctx;
+        }
+        pthread_mutex_unlock(&ctx_lock);
    }
    ret = archive_skip_to_index(ctx, idx);
    if (ret != idx) {
@@ -279,12 +228,13 @@ static int archive_get_ctx(archive_ctx **ctxptr, int idx) {
 }

 JNIEXPORT jint JNICALL
-Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_openArchive(JNIEnv *env, jclass thiz, jint fd,
-                                                                jlong size) {
+Java_com_hippo_UriArchiveAccessor_openArchive(JNIEnv *env, jobject thiz, jint fd, jlong size) {
    EH_UNUSED(env);
    EH_UNUSED(thiz);
    archive_ctx *ctx = NULL;
    int mmap_flags = MAP_PRIVATE;
+    if (size <= POPULATE_THRESHOLD)
+        mmap_flags |= MAP_POPULATE;
    archiveAddr = mmap64(0, size, PROT_READ, mmap_flags, fd, 0);
    if (archiveAddr == MAP_FAILED) {
        LOGE("%s%s", "mmap64 failed with error ", strerror(errno));
@@ -292,6 +242,7 @@ Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_openArchive(JNIEnv *env, jcl
    }
    archiveSize = size;
    madvise_log_if_error(archiveAddr, archiveSize, MADV_WILLNEED);
+    pthread_mutex_init(&ctx_lock, 0);
    ctx_pool = calloc(CTX_POOL_SIZE, sizeof(archive_ctx **));
    if (!ctx_pool) {
        LOGE("Allocate archive ctx pool failed:ENOMEM");
@@ -304,7 +255,7 @@ Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_openArchive(JNIEnv *env, jcl
        LOGE("%s%s", "Archive open failed:", archive_error_string(ctx->arc));
    } else {
        entryCount = archive_list_all_entries(ctx);
-        LOGI("%s%zu%s", "Found ", entryCount, " image entries in archive");
+        LOGI("%s%ld%s", "Found ", r, " image entries in archive");

        // We must read through the file|vm then we can know whether it is encrypted
        int encryptRet = archive_read_has_encrypted_entries(ctx->arc);
@@ -341,66 +292,53 @@ Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_openArchive(JNIEnv *env, jcl
    } else {
        entries = calloc(entryCount, sizeof(entry));
        r = archive_map_entries_index(ctx);
-        if (!archive_prealloc_mempool()) {
-            r = 0;
-            for (int i = 0; i < entryCount; ++i) {
-                free((void *) entries[i].filename);
-            }
-            free(entries);
-        }
    }

    archive_release_ctx(ctx);
    return r;
 }

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

-#pragma clang diagnostic pop
-
 JNIEXPORT void JNICALL
-Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_closeArchive(JNIEnv *env, jclass thiz) {
+Java_com_hippo_UriArchiveAccessor_closeArchive(JNIEnv *env, jobject thiz) {
    EH_UNUSED(env);
    EH_UNUSED(thiz);
    for (int i = 0; i < CTX_POOL_SIZE; i++)
        archive_release_ctx(ctx_pool[i]);
    free(passwd);
    free(ctx_pool);
+    pthread_mutex_destroy(&ctx_lock);
    passwd = NULL;
    need_encrypt = false;
    munmap(archiveAddr, archiveSize);
-    munmap(mempool, MEMPOOL_SIZE);
-    free(mempoolofs);
    for (int i = 0; i < entryCount; ++i) {
        free((void *) entries[i].filename);
    }
@@ -408,15 +346,14 @@ Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_closeArchive(JNIEnv *env, jc
 }

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

 JNIEXPORT jboolean JNICALL
-Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_providePassword(JNIEnv *env, jclass thiz,
-                                                                    jstring str) {
+Java_com_hippo_UriArchiveAccessor_providePassword(JNIEnv *env, jobject thiz, jstring str) {
    EH_UNUSED(thiz);
    struct archive_entry *entry;
    archive_ctx *ctx;
@@ -446,8 +383,7 @@ Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_providePassword(JNIEnv *env,
 }

 JNIEXPORT jstring JNICALL
-Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_getFilename(JNIEnv *env, jclass thiz,
-                                                                jint index) {
+Java_com_hippo_UriArchiveAccessor_getFilename(JNIEnv *env, jobject thiz, jint index) {
    EH_UNUSED(env);
    EH_UNUSED(thiz);
    index = entries[index].index;
@@ -462,8 +398,7 @@ Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_getFilename(JNIEnv *env, jcl
 }

 JNIEXPORT void JNICALL
-Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_extractToFd(JNIEnv *env, jclass thiz,
-                                                                jint index, jint fd) {
+Java_com_hippo_UriArchiveAccessor_extractToFd(JNIEnv *env, jobject thiz, jint index, jint fd) {
    EH_UNUSED(env);
    EH_UNUSED(thiz);
    index = entries[index].index;
@@ -477,10 +412,8 @@ Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_extractToFd(JNIEnv *env, jcl
 }

 JNIEXPORT void JNICALL
-Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_releaseByteBuffer(JNIEnv *env, jclass thiz,
-                                                                      jobject buffer) {
+Java_com_hippo_UriArchiveAccessor_releaseByteBuffer(JNIEnv *env, jobject thiz, jobject buffer) {
    EH_UNUSED(thiz);
    void *addr = (*env)->GetDirectBufferAddress(env, buffer);
-    size_t size = (*env)->GetDirectBufferCapacity(env, buffer);
-    mempool_release_pages(addr, size);
-}
+    free(addr);
+}
@@ -0,0 +1,27 @@
+#include <jni.h>
+#include <sys/mman.h>
+
+#include <android/log.h>
+#include <string.h>
+#include <errno.h>
+
+#define LOG_TAG "mmap_utils"
+
+#include "ehviewer.h"
+
+// TODO: Replace it with AFileDescriptor_getFd when minsdk 31
+// https://developer.android.com/ndk/reference/group/file-descriptor
+JNIEXPORT jint JNICALL
+Java_com_hippo_Native_getFd(JNIEnv *env, jclass clazz, jobject fileDescriptor) {
+    jint fd = -1;
+    jclass fdClass = (*env)->FindClass(env, "java/io/FileDescriptor");
+
+    if (fdClass != NULL) {
+        jfieldID fdClassDescriptorFieldID = (*env)->GetFieldID(env, fdClass, "descriptor", "I");
+        if (fdClassDescriptorFieldID != NULL && fileDescriptor != NULL) {
+            fd = (*env)->GetIntField(env, fileDescriptor, fdClassDescriptorFieldID);
+        }
+    }
+
+    return fd;
+}
@@ -2,8 +2,6 @@
 #include <string.h>
 #include <stdbool.h>
 #include <android/log.h>
-#include <sys/stat.h>
-#include <sys/mman.h>

 #define LOG_TAG "gifUtils"

@@ -24,7 +22,10 @@ static inline bool isGif(void *addr) {
    return !memcmp(addr, GIF_HEADER_87A, 6) || !memcmp(addr, GIF_HEADER_89A, 6);
 }

-static void doRewrite(byte *addr, size_t size) {
+JNIEXPORT void JNICALL
+Java_com_hippo_image_Image_rewriteGifSource(JNIEnv *env, jclass clazz, jobject buffer) {
+    byte *addr = (*env)->GetDirectBufferAddress(env, buffer);
+    size_t size = (*env)->GetDirectBufferCapacity(env, buffer);
    if (size < 7 || !isGif(addr)) return;
    for (size_t i = 0; i < size - 8; i++) {
        // TODO: Optimize this hex find with SIMD?
@@ -41,21 +42,3 @@ static void doRewrite(byte *addr, size_t size) {
        }
    }
 }
-
-JNIEXPORT void JNICALL
-Java_com_hippo_ehviewer_image_ImageKt_rewriteGifSource(JNIEnv *env, jclass clazz, jobject buffer) {
-    byte *addr = (*env)->GetDirectBufferAddress(env, buffer);
-    size_t size = (*env)->GetDirectBufferCapacity(env, buffer);
-    doRewrite(addr, size);
-}
-
-JNIEXPORT void JNICALL
-Java_com_hippo_ehviewer_image_ImageKt_rewriteGifSource2(JNIEnv *env, jclass clazz, jint fd) {
-    struct stat64 st;
-    fstat64(fd, &st);
-    size_t size = st.st_size;
-    byte *addr = mmap64(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
-    if (addr == MAP_FAILED) return;
-    doRewrite(addr, size);
-    munmap(addr, size);
-}
@@ -1,177 +0,0 @@
-/* -*- mode: c; c-file-style: "k&r" -*-
-
-  strnatcmp.c -- Perform 'natural order' comparisons of strings in C.
-  Copyright (C) 2000, 2004 by Martin Pool <mbp sourcefrog net>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-
-/* partial change history:
- *
- * 2004-10-10 mbp: Lift out character type dependencies into macros.
- *
- * Eric Sosman pointed out that ctype functions take a parameter whose
- * value must be that of an unsigned int, even on platforms that have
- * negative chars in their default char type.
- */
-
-#include <stddef.h>     /* size_t */
-#include <ctype.h>
-
-#include "strnatcmp.h"
-
-
-/* These are defined as macros to make it easier to adapt this code to
- * different characters types or comparison functions. */
-static inline int
-nat_isdigit(nat_char a)
-{
-     return isdigit((unsigned char) a);
-}
-
-
-static inline int
-nat_isspace(nat_char a)
-{
-     return isspace((unsigned char) a);
-}
-
-
-static inline nat_char
-nat_toupper(nat_char a)
-{
-     return toupper((unsigned char) a);
-}
-
-
-static int
-compare_right(nat_char const *a, nat_char const *b)
-{
-     int bias = 0;
-
-     /* The longest run of digits wins.  That aside, the greatest
-        value wins, but we can't know that it will until we've scanned
-        both numbers to know that they have the same magnitude, so we
-        remember it in BIAS. */
-     for (;; a++, b++) {
-          if (!nat_isdigit(*a)  &&  !nat_isdigit(*b))
-               return bias;
-          if (!nat_isdigit(*a))
-               return -1;
-          if (!nat_isdigit(*b))
-               return +1;
-          if (*a < *b) {
-               if (!bias)
-                    bias = -1;
-          } else if (*a > *b) {
-               if (!bias)
-                    bias = +1;
-          } else if (!*a  &&  !*b)
-               return bias;
-     }
-
-     return 0;
-}
-
-
-static int
-compare_left(nat_char const *a, nat_char const *b)
-{
-     /* Compare two left-aligned numbers: the first to have a
-        different value wins. */
-     for (;; a++, b++) {
-          if (!nat_isdigit(*a)  &&  !nat_isdigit(*b))
-               return 0;
-          if (!nat_isdigit(*a))
-               return -1;
-          if (!nat_isdigit(*b))
-               return +1;
-          if (*a < *b)
-               return -1;
-          if (*a > *b)
-               return +1;
-     }
-
-     return 0;
-}
-
-
-static int
-strnatcmp0(nat_char const *a, nat_char const *b, int fold_case)
-{
-     int ai, bi;
-     nat_char ca, cb;
-     int fractional, result;
-
-     ai = bi = 0;
-     while (1) {
-          ca = a[ai]; cb = b[bi];
-
-          /* skip over leading spaces or zeros */
-          while (nat_isspace(ca))
-               ca = a[++ai];
-
-          while (nat_isspace(cb))
-               cb = b[++bi];
-
-          /* process run of digits */
-          if (nat_isdigit(ca)  &&  nat_isdigit(cb)) {
-               fractional = (ca == '0' || cb == '0');
-
-               if (fractional) {
-                    if ((result = compare_left(a+ai, b+bi)) != 0)
-                         return result;
-               } else {
-                    if ((result = compare_right(a+ai, b+bi)) != 0)
-                         return result;
-               }
-          }
-
-          if (!ca && !cb) {
-               /* The strings compare the same.  Perhaps the caller
-                  will want to call strcmp to break the tie. */
-               return 0;
-          }
-
-          if (fold_case) {
-               ca = nat_toupper(ca);
-               cb = nat_toupper(cb);
-          }
-
-          if (ca < cb)
-               return -1;
-
-          if (ca > cb)
-               return +1;
-
-          ++ai; ++bi;
-     }
-}
-
-
-int
-strnatcmp(nat_char const *a, nat_char const *b) {
-     return strnatcmp0(a, b, 0);
-}
-
-
-/* Compare, recognizing numeric string and ignoring case. */
-int
-strnatcasecmp(nat_char const *a, nat_char const *b) {
-     return strnatcmp0(a, b, 1);
-}
@@ -1,38 +0,0 @@
-/* -*- mode: c; c-file-style: "k&r" -*-
-
-  strnatcmp.c -- Perform 'natural order' comparisons of strings in C.
-  Copyright (C) 2000, 2004 by Martin Pool <mbp sourcefrog net>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* CUSTOMIZATION SECTION
- *
- * You can change this typedef, but must then also change the inline
- * functions in strnatcmp.c */
-typedef char nat_char;
-
-int strnatcmp(nat_char const *a, nat_char const *b);
-int strnatcasecmp(nat_char const *a, nat_char const *b);
-
-#ifdef __cplusplus
-}
-#endif
@@ -1,44 +0,0 @@
-#ifndef EHVIEWER_SPINLOCK_H
-#define EHVIEWER_SPINLOCK_H
-
-#include <stddef.h>
-#include <stdatomic.h>
-
-#define cmpxchg(P, O, N) __sync_val_compare_and_swap((P), (O), (N))
-
-#define barrier() __asm__ __volatile__("":::"memory")
-
-#if defined(__aarch64__) || defined(__arm__)
-#define cpu_relax() __asm__ volatile ("wfe");
-#else
-#define cpu_relax() __asm__ volatile ("pause" ::: "memory");
-#endif
-
-typedef struct mcs_lock_t mcs_lock_t;
-struct mcs_lock_t {
-    mcs_lock_t *next;
-    int spin;
-};
-typedef struct mcs_lock_t *mcs_lock;
-
-static inline void lock_mcs(_Atomic mcs_lock *m, mcs_lock_t *me) {
-    mcs_lock_t *tail;
-    me->next = NULL;
-    me->spin = 0;
-    tail = atomic_exchange(m, me);
-    if (!tail) return;
-    tail->next = me;
-    barrier();
-    while (!me->spin) cpu_relax();
-    return;
-}
-
-static inline void unlock_mcs(mcs_lock *m, mcs_lock_t *me) {
-    if (!me->next) {
-        if (cmpxchg(m, me, NULL) == me) return;
-        while (!me->next) cpu_relax();
-    }
-    me->next->spin = 1;
-}
-
-#endif //EHVIEWER_SPINLOCK_H
@@ -13,7 +13,7 @@ fun onNavDestinationSelected2(item: MenuItem, navController: NavController): Boo
    val builder = NavOptions.Builder().setLaunchSingleTop(true)
    if (
        navController.currentDestination!!.parent!!.findNode(item.itemId)
-        is ActivityNavigator.Destination
+                is ActivityNavigator.Destination
    ) {
        builder.setEnterAnim(R.anim.nav_default_enter_anim)
            .setExitAnim(R.anim.nav_default_exit_anim)
@@ -37,4 +37,4 @@ fun onNavDestinationSelected2(item: MenuItem, navController: NavController): Boo
 }

 fun NavDestination.matchDestination(@IdRes destId: Int): Boolean =
-    hierarchy.any { it.id == destId }
+    hierarchy.any { it.id == destId }
@@ -7,10 +7,10 @@ import android.util.AttributeSet
 import androidx.core.graphics.ColorUtils
 import rikka.core.res.resolveColor

+
@SuppressLint("PrivateResource")
 class ThemedSwipeRefreshLayout @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
+    context: Context, attrs: AttributeSet? = null
 ) : SwipeRefreshLayout(context, attrs) {

    init {
@@ -22,4 +22,4 @@ class ThemedSwipeRefreshLayout @JvmOverloads constructor(
        (mCircleView.background as ShapeDrawable).paint.color = backgroundColor
        setColorSchemeColors(context.theme.resolveColor(com.google.android.material.R.attr.colorAccent))
    }
-}
+}
@@ -0,0 +1,66 @@
+@file:JvmName("GifDecodeUtils")
+
+package coil.decode
+
+import kotlin.experimental.and
+import okio.BufferedSource
+import okio.ByteString.Companion.encodeUtf8
+
+// https://www.matthewflickinger.com/lab/whatsinagif/bits_and_bytes.asp
+private val GIF_HEADER_87A = "GIF87a".encodeUtf8()
+private val GIF_HEADER_89A = "GIF89a".encodeUtf8()
+
+// https://developers.google.com/speed/webp/docs/riff_container
+private val WEBP_HEADER_RIFF = "RIFF".encodeUtf8()
+private val WEBP_HEADER_WEBP = "WEBP".encodeUtf8()
+private val WEBP_HEADER_VPX8 = "VP8X".encodeUtf8()
+
+// https://nokiatech.github.io/heif/technical.html
+private val HEIF_HEADER_FTYP = "ftyp".encodeUtf8()
+private val HEIF_HEADER_MSF1 = "msf1".encodeUtf8()
+private val HEIF_HEADER_HEVC = "hevc".encodeUtf8()
+private val HEIF_HEADER_HEVX = "hevx".encodeUtf8()
+
+/**
+ * Return 'true' if the [source] contains a GIF image. The [source] is not consumed.
+ */
+fun DecodeUtils.isGif(source: BufferedSource): Boolean {
+    return source.rangeEquals(0, GIF_HEADER_89A) ||
+        source.rangeEquals(0, GIF_HEADER_87A)
+}
+
+/**
+ * Return 'true' if the [source] contains a WebP image. The [source] is not consumed.
+ */
+fun DecodeUtils.isWebP(source: BufferedSource): Boolean {
+    return source.rangeEquals(0, WEBP_HEADER_RIFF) &&
+        source.rangeEquals(8, WEBP_HEADER_WEBP)
+}
+
+/**
+ * Return 'true' if the [source] contains an animated WebP image. The [source] is not consumed.
+ */
+fun DecodeUtils.isAnimatedWebP(source: BufferedSource): Boolean {
+    return isWebP(source) &&
+        source.rangeEquals(12, WEBP_HEADER_VPX8) &&
+        source.request(17) &&
+        (source.buffer[16] and 0b00000010) > 0
+}
+
+/**
+ * Return 'true' if the [source] contains an HEIF image. The [source] is not consumed.
+ */
+fun DecodeUtils.isHeif(source: BufferedSource): Boolean {
+    return source.rangeEquals(4, HEIF_HEADER_FTYP)
+}
+
+/**
+ * Return 'true' if the [source] contains an animated HEIF image sequence. The [source] is not
+ * consumed.
+ */
+fun DecodeUtils.isAnimatedHeif(source: BufferedSource): Boolean {
+    return isHeif(source) &&
+        (source.rangeEquals(8, HEIF_HEADER_MSF1) ||
+            source.rangeEquals(8, HEIF_HEADER_HEVC) ||
+            source.rangeEquals(8, HEIF_HEADER_HEVX))
+}
@@ -0,0 +1,88 @@
+@file:Suppress("SameParameterValue")
+
+package coil.decode
+
+import okio.Buffer
+import okio.ByteString
+import okio.ByteString.Companion.decodeHex
+import okio.ForwardingSource
+import okio.Source
+
+/**
+ * A [ForwardingSource] that rewrites the GIF frame delay in every graphics control block if it's
+ * below a threshold.
+ */
+internal class FrameDelayRewritingSource(delegate: Source) : ForwardingSource(delegate) {
+
+    // An intermediary buffer so we can read and alter the data before it's written to the destination.
+    private val buffer = Buffer()
+
+    override fun read(sink: Buffer, byteCount: Long): Long {
+        // Ensure our buffer has enough bytes to satisfy this read.
+        request(byteCount)
+
+        // Short circuit if there are no bytes in the buffer.
+        if (buffer.size == 0L) {
+            return if (byteCount == 0L) 0L else -1L
+        }
+
+        // Search through the buffer and rewrite any frame delays below the threshold.
+        var bytesWritten = 0L
+        while (true) {
+            val index = indexOf(FRAME_DELAY_START_MARKER)
+            if (index == -1L) break
+
+            // Write up until the end of the frame delay start marker.
+            bytesWritten += write(sink, index + FRAME_DELAY_START_MARKER_SIZE_BYTES)
+
+            // Check for the end of the graphics control extension block.
+            if (!request(5) || buffer[4] != 0.toByte()) continue
+
+            // Rewrite the frame delay if it is below the threshold.
+            // The frame delay is stored as two unsigned bytes in reverse order
+            // (i.e. the most significant bits are in the byte that's read second).
+            val frameDelay = (buffer[2].toUByte().toInt() shl 8) or buffer[1].toUByte().toInt()
+            if (frameDelay < MINIMUM_FRAME_DELAY) {
+                sink.writeByte(buffer[0].toInt())
+                sink.writeByte(DEFAULT_FRAME_DELAY)
+                sink.writeByte(0)
+                buffer.skip(3)
+            }
+        }
+
+        // Write anything left in the source.
+        if (bytesWritten < byteCount) {
+            bytesWritten += write(sink, byteCount - bytesWritten)
+        }
+        return if (bytesWritten == 0L) -1 else bytesWritten
+    }
+
+    private fun indexOf(bytes: ByteString): Long {
+        var index = -1L
+        while (true) {
+            index = buffer.indexOf(bytes[0], index + 1)
+            if (index == -1L) break
+            if (request(bytes.size.toLong()) && buffer.rangeEquals(index, bytes)) break
+        }
+        return index
+    }
+
+    private fun write(sink: Buffer, byteCount: Long): Long {
+        return buffer.read(sink, byteCount).coerceAtLeast(0)
+    }
+
+    private fun request(byteCount: Long): Boolean {
+        if (buffer.size >= byteCount) return true
+        val toRead = byteCount - buffer.size
+        return super.read(buffer, toRead) == toRead
+    }
+
+    private companion object {
+        // https://www.matthewflickinger.com/lab/whatsinagif/bits_and_bytes.asp
+        // See: "Graphics Control Extension"
+        private val FRAME_DELAY_START_MARKER = "0021F904".decodeHex()
+        private const val FRAME_DELAY_START_MARKER_SIZE_BYTES = 4
+        private const val MINIMUM_FRAME_DELAY = 2
+        private const val DEFAULT_FRAME_DELAY = 10
+    }
+}
@@ -1,8 +1,15 @@
 package com.davemorrissey.labs.subscaleview

+import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.Rect
+import android.net.Uri
+import com.davemorrissey.labs.subscaleview.provider.AssetInputProvider
 import com.davemorrissey.labs.subscaleview.provider.InputProvider
+import com.davemorrissey.labs.subscaleview.provider.OpenStreamProvider
+import com.davemorrissey.labs.subscaleview.provider.ResourceInputProvider
+import com.davemorrissey.labs.subscaleview.provider.UriInputProvider
+import java.io.InputStream

 /**
 * Helper class used to set the source and additional attributes from a variety of sources. Supports
@@ -76,6 +83,38 @@ class ImageSource {
    }

    companion object {
+        /**
+         * Create an instance from a resource. The correct resource for the device screen resolution will be used.
+         *
+         * @param resId resource ID.
+         * @return an [ImageSource] instance.
+         */
+        @JvmStatic
+        fun resource(context: Context, resId: Int): ImageSource {
+            return ImageSource(ResourceInputProvider(context, resId))
+        }
+
+        /**
+         * Create an instance from an asset name.
+         *
+         * @param assetName asset name.
+         * @return an [ImageSource] instance.
+         */
+        @JvmStatic
+        fun asset(context: Context, assetName: String): ImageSource {
+            return ImageSource(AssetInputProvider(context, assetName))
+        }
+
+        /**
+         * Create an instance from a URI.
+         *
+         * @param uri image URI.
+         * @return an [ImageSource] instance.
+         */
+        fun uri(context: Context, uri: Uri): ImageSource {
+            return ImageSource(UriInputProvider(context, uri))
+        }
+
        /**
         * Create an instance from an input provider.
         *
@@ -86,6 +125,16 @@ class ImageSource {
            return ImageSource(provider)
        }

+        /**
+         * Create an instance from an input stream.
+         *
+         * @param stream open input stream.
+         * @return an [ImageSource] instance.
+         */
+        fun inputStream(stream: InputStream): ImageSource {
+            return ImageSource(OpenStreamProvider(stream))
+        }
+
        /**
         * Provide a loaded bitmap for display.
         *
@@ -19,10 +19,12 @@ import android.view.MotionEvent
 import android.view.View
 import androidx.annotation.AnyThread
 import androidx.annotation.IntDef
+import com.davemorrissey.labs.subscaleview.ImageSource.Companion.asset
+import com.davemorrissey.labs.subscaleview.ImageSource.Companion.resource
 import com.davemorrissey.labs.subscaleview.decoder.Decoder
 import com.davemorrissey.labs.subscaleview.decoder.ImageDecoder
 import com.davemorrissey.labs.subscaleview.provider.InputProvider
-import eu.kanade.tachiyomi.ui.reader.ReaderActivity
+import com.hippo.ehviewer.R
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -63,7 +65,7 @@ import kotlin.math.sqrt
@Suppress("unused")
 open class SubsamplingScaleImageView @JvmOverloads constructor(
    context: Context,
-    attr: AttributeSet? = null,
+    attr: AttributeSet? = null
 ) : View(context, attr) {
    private val decoderLock: ReadWriteLock = ReentrantReadWriteLock(true)

@@ -79,7 +81,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
    private val srcArray = FloatArray(8)
    private val dstArray = FloatArray(8)

-    // The logical density of the display
+    //The logical density of the display
    private val density: Float = resources.displayMetrics.density

    // Bitmap (preview or full image)
@@ -140,7 +142,6 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(

    // Double tap zoom behaviour
    private var doubleTapZoomScale = 1F
-
    @ZoomStyle private var doubleTapZoomStyle = ZOOM_FOCUS_FIXED
    private var doubleTapZoomDuration = 500

@@ -302,6 +303,42 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
        setMinimumDpi(160)
        setDoubleTapZoomDpi(160)
        setGestureDetector(context)
+
+        // Handle XML attributes
+        if (attr != null) {
+            val typedAttr = getContext().obtainStyledAttributes(attr, R.styleable.SubsamplingScaleImageView)
+            if (typedAttr.hasValue(R.styleable.SubsamplingScaleImageView_assetName)) {
+                val assetName = typedAttr.getString(R.styleable.SubsamplingScaleImageView_assetName)
+                if (assetName != null && assetName.isNotEmpty()) {
+                    setImage(asset(context, assetName))
+                }
+            }
+            if (typedAttr.hasValue(R.styleable.SubsamplingScaleImageView_src)) {
+                val resId = typedAttr.getResourceId(R.styleable.SubsamplingScaleImageView_src, 0)
+                if (resId > 0) {
+                    setImage(resource(context, resId))
+                }
+            }
+            if (typedAttr.hasValue(R.styleable.SubsamplingScaleImageView_panEnabled)) {
+                setPanEnabled(typedAttr.getBoolean(R.styleable.SubsamplingScaleImageView_panEnabled, true))
+            }
+            if (typedAttr.hasValue(R.styleable.SubsamplingScaleImageView_zoomEnabled)) {
+                isZoomEnabled = typedAttr.getBoolean(R.styleable.SubsamplingScaleImageView_zoomEnabled, true)
+            }
+            if (typedAttr.hasValue(R.styleable.SubsamplingScaleImageView_quickScaleEnabled)) {
+                isQuickScaleEnabled =
+                    typedAttr.getBoolean(R.styleable.SubsamplingScaleImageView_quickScaleEnabled, true)
+            }
+            if (typedAttr.hasValue(R.styleable.SubsamplingScaleImageView_tileBackgroundColor)) {
+                setTileBackgroundColor(
+                    typedAttr.getColor(
+                        R.styleable.SubsamplingScaleImageView_tileBackgroundColor,
+                        Color.argb(0, 0, 0, 0)
+                    )
+                )
+            }
+            typedAttr.recycle()
+        }
        quickScaleThreshold =
            TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 20F, context.resources.displayMetrics)
    }
@@ -333,9 +370,8 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
                    imageSource.sRegion.left,
                    imageSource.sRegion.top,
                    imageSource.sRegion.width(),
-                    imageSource.sRegion.height(),
-                ),
-                false,
+                    imageSource.sRegion.height()
+                ), false
            )
        } else if (imageSource.bitmap != null) {
            onImageLoaded(imageSource.bitmap, imageSource.isCached)
@@ -439,71 +475,64 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
    }

    private fun setGestureDetector(context: Context) {
-        detector = GestureDetector(
-            context,
-            object : GestureDetector.SimpleOnGestureListener() {
-                override fun onFling(e1: MotionEvent, e2: MotionEvent, velocityX: Float, velocityY: Float): Boolean {
-                    if (panEnabled && isReady && vTranslate != null && (abs(e1.x - e2.x) > 50 || abs(e1.y - e2.y) > 50) && (abs(velocityX) > 500 || abs(velocityY) > 500) && !isZooming) {
-                        val vTranslateEnd = PointF(vTranslate!!.x + velocityX * 0.25F, vTranslate!!.y + velocityY * 0.25F)
-                        val sCenterXEnd = (width / 2 - vTranslateEnd.x) / scale
-                        val sCenterYEnd = (height / 2 - vTranslateEnd.y) / scale
-                        AnimationBuilder(PointF(sCenterXEnd, sCenterYEnd))
-                            .withEasing(EASE_OUT_QUAD)
-                            .withPanLimited(false)
-                            .withOrigin(ORIGIN_FLING)
-                            .start()
-                        return true
-                    }
-                    return super.onFling(e1, e2, velocityX, velocityY)
-                }
-
-                override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
-                    performClick()
+        detector = GestureDetector(context, object : GestureDetector.SimpleOnGestureListener() {
+            override fun onFling(e1: MotionEvent, e2: MotionEvent, velocityX: Float, velocityY: Float): Boolean {
+                if (panEnabled && isReady && vTranslate != null && (abs(e1.x - e2.x) > 50 || abs(e1.y - e2.y) > 50) && (abs(velocityX) > 500 || abs(velocityY) > 500) && !isZooming) {
+                    val vTranslateEnd = PointF(vTranslate!!.x + velocityX * 0.25F, vTranslate!!.y + velocityY * 0.25F)
+                    val sCenterXEnd = (width / 2 - vTranslateEnd.x) / scale
+                    val sCenterYEnd = (height / 2 - vTranslateEnd.y) / scale
+                    AnimationBuilder(PointF(sCenterXEnd, sCenterYEnd))
+                        .withEasing(EASE_OUT_QUAD)
+                        .withPanLimited(false)
+                        .withOrigin(ORIGIN_FLING)
+                        .start()
                    return true
                }
+                return super.onFling(e1, e2, velocityX, velocityY)
+            }

-                override fun onDoubleTap(e: MotionEvent): Boolean {
-                    if (!ReaderActivity.readerPreferences.doubleTapToZoom().get()) return false
-                    if (isZoomEnabled && isReady && vTranslate != null) {
-                        // Hacky solution for #15 - after a double tap the GestureDetector gets in a state
-                        // where the next fling is ignored, so here we replace it with a new one.
-                        setGestureDetector(context)
-                        return if (isQuickScaleEnabled) {
-                            // Store quick scale params. This will become either a double tap zoom or a
-                            // quick scale depending on whether the user swipes.
-                            vCenterStart = PointF(e.x, e.y)
-                            vTranslateStart = PointF(vTranslate!!.x, vTranslate!!.y)
-                            scaleStart = scale
-                            isQuickScaling = true
-                            isZooming = true
-                            quickScaleLastDistance = -1F
-                            quickScaleSCenter = viewToSourceCoord(vCenterStart!!)
-                            quickScaleVStart = PointF(e.x, e.y)
-                            quickScaleVLastPoint = PointF(quickScaleSCenter!!.x, quickScaleSCenter!!.y)
-                            quickScaleMoved = false
-                            // We need to get events in onTouchEvent after this.
-                            false
-                        } else {
-                            // Start double tap zoom animation.
-                            viewToSourceCoord(PointF(e.x, e.y))?.let { center ->
-                                doubleTapZoom(center, PointF(e.x, e.y))
-                            }
-                            true
+            override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
+                performClick()
+                return true
+            }
+
+            override fun onDoubleTap(e: MotionEvent): Boolean {
+                if (isZoomEnabled && isReady && vTranslate != null) {
+                    // Hacky solution for #15 - after a double tap the GestureDetector gets in a state
+                    // where the next fling is ignored, so here we replace it with a new one.
+                    setGestureDetector(context)
+                    return if (isQuickScaleEnabled) {
+                        // Store quick scale params. This will become either a double tap zoom or a
+                        // quick scale depending on whether the user swipes.
+                        vCenterStart = PointF(e.x, e.y)
+                        vTranslateStart = PointF(vTranslate!!.x, vTranslate!!.y)
+                        scaleStart = scale
+                        isQuickScaling = true
+                        isZooming = true
+                        quickScaleLastDistance = -1F
+                        quickScaleSCenter = viewToSourceCoord(vCenterStart!!)
+                        quickScaleVStart = PointF(e.x, e.y)
+                        quickScaleVLastPoint = PointF(quickScaleSCenter!!.x, quickScaleSCenter!!.y)
+                        quickScaleMoved = false
+                        // We need to get events in onTouchEvent after this.
+                        false
+                    } else {
+                        // Start double tap zoom animation.
+                        viewToSourceCoord(PointF(e.x, e.y))?.let { center ->
+                            doubleTapZoom(center, PointF(e.x, e.y))
                        }
+                        true
                    }
-                    return super.onDoubleTapEvent(e)
                }
-            },
-        )
-        singleDetector = GestureDetector(
-            context,
-            object : GestureDetector.SimpleOnGestureListener() {
-                override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
-                    performClick()
-                    return true
-                }
-            },
-        )
+                return super.onDoubleTapEvent(e)
+            }
+        })
+        singleDetector = GestureDetector(context, object : GestureDetector.SimpleOnGestureListener() {
+            override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
+                performClick()
+                return true
+            }
+        })
    }

    override fun onDetachedFromWindow() {
@@ -740,7 +769,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
                        val dx = abs(event.x - vCenterStart!!.x)
                        val dy = abs(event.y - vCenterStart!!.y)

-                        // On the Samsung S6 long click event does not work, because the dx > 5 usually true
+                        //On the Samsung S6 long click event does not work, because the dx > 5 usually true
                        val offset = density * 5
                        if (dx > offset || dy > offset || isPanning) {
                            consumed = true
@@ -904,7 +933,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
                scaleElapsed,
                anim!!.scaleStart,
                anim!!.scaleEnd - anim!!.scaleStart,
-                anim!!.duration,
+                anim!!.duration
            )

            // Apply required animation to the focal point
@@ -913,14 +942,14 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
                scaleElapsed,
                anim!!.vFocusStart!!.x,
                anim!!.vFocusEnd.x - anim!!.vFocusStart!!.x,
-                anim!!.duration,
+                anim!!.duration
            )
            val vFocusNowY = ease(
                anim!!.easing,
                scaleElapsed,
                anim!!.vFocusStart!!.y,
                anim!!.vFocusEnd.y - anim!!.vFocusStart!!.y,
-                anim!!.duration,
+                anim!!.duration
            )
            // Find out where the focal point is at this scale and adjust its position to follow the animation path
            vTranslate!!.x -= sourceToViewX(anim!!.sCenterEnd.x) - vFocusNowX
@@ -977,7 +1006,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
                                tileWidth,
                                tileHeight,
                                0F,
-                                tileHeight,
+                                tileHeight
                            )
                            setMatrixArray(
                                dstArray,
@@ -988,7 +1017,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
                                tile.vRect.right.toFloat(),
                                tile.vRect.bottom.toFloat(),
                                tile.vRect.left.toFloat(),
-                                tile.vRect.bottom.toFloat(),
+                                tile.vRect.bottom.toFloat()
                            )
                            mtrx.setPolyToPoly(srcArray, 0, dstArray, 0, 4)
                            canvas.drawBitmap(tile.bitmap!!, mtrx, bitmapPaint)
@@ -1000,7 +1029,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
                                "LOADING",
                                (tile.vRect.left + px(5)).toFloat(),
                                (tile.vRect.top + px(35)).toFloat(),
-                                debugTextPaint,
+                                debugTextPaint
                            )
                        }
                        if (tile.visible && debug) {
@@ -1008,7 +1037,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
                                "ISS " + tile.sampleSize + " RECT " + tile.sRect.top + "," + tile.sRect.left + "," + tile.sRect.bottom + "," + tile.sRect.right,
                                (tile.vRect.left + px(5)).toFloat(),
                                (tile.vRect.top + px(15)).toFloat(),
-                                debugTextPaint,
+                                debugTextPaint
                            )
                        }
                    }
@@ -1033,36 +1062,21 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
                "Scale: " + String.format(Locale.ENGLISH, "%.2f", scale) + " (" + String.format(
                    Locale.ENGLISH,
                    "%.2f",
-                    minScale(),
+                    minScale()
                ) + " - " + String.format(
-                    Locale.ENGLISH,
-                    "%.2f",
-                    maxScale,
-                ) + ")",
-                px(5).toFloat(),
-                px(15).toFloat(),
-                debugTextPaint,
+                    Locale.ENGLISH, "%.2f", maxScale
+                ) + ")", px(5).toFloat(), px(15).toFloat(), debugTextPaint
            )
            canvas.drawText(
                "Translate: " + String.format(Locale.ENGLISH, "%.2f", vTranslate!!.x) + ":" + String.format(
-                    Locale.ENGLISH,
-                    "%.2f",
-                    vTranslate!!.y,
-                ),
-                px(5).toFloat(),
-                px(30).toFloat(),
-                debugTextPaint,
+                    Locale.ENGLISH, "%.2f", vTranslate!!.y
+                ), px(5).toFloat(), px(30).toFloat(), debugTextPaint
            )
            val center = center
            canvas.drawText(
                "Source center: " + String.format(Locale.ENGLISH, "%.2f", center!!.x) + ":" + String.format(
-                    Locale.ENGLISH,
-                    "%.2f",
-                    center.y,
-                ),
-                px(5).toFloat(),
-                px(45).toFloat(),
-                debugTextPaint,
+                    Locale.ENGLISH, "%.2f", center.y
+                ), px(5).toFloat(), px(45).toFloat(), debugTextPaint
            )
            if (anim != null) {
                val vCenterStart = sourceToViewCoord(anim!!.sCenterStart)
@@ -1086,7 +1100,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
                    sourceToViewX(quickScaleSCenter!!.x),
                    sourceToViewY(quickScaleSCenter!!.y),
                    px(35).toFloat(),
-                    debugLinePaint,
+                    debugLinePaint
                )
            }
            if (quickScaleVStart != null && isQuickScaling) {
@@ -1109,7 +1123,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
        f4: Float,
        f5: Float,
        f6: Float,
-        f7: Float,
+        f7: Float
    ) {
        array[0] = f0
        array[1] = f1
@@ -1183,7 +1197,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
            debug(
                "loadTile, tile.sRect=%s, tile.sampleSize=%d",
                tile.sRect,
-                tile.sampleSize,
+                tile.sampleSize
            )
            decoderLock.readLock().lock()
            try {
@@ -1454,13 +1468,13 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
                        x * sTileWidth,
                        y * sTileHeight,
                        if (x == xTiles - 1) sWidth else (x + 1) * sTileWidth,
-                        if (y == yTiles - 1) sHeight else (y + 1) * sTileHeight,
+                        if (y == yTiles - 1) sHeight else (y + 1) * sTileHeight
                    )
                    val tile = Tile(
                        sRect = sRect,
                        sampleSize = sampleSize,
                        vRect = Rect(0, 0, 0, 0),
-                        fileSRect = Rect(sRect),
+                        fileSRect = Rect(sRect)
                    )
                    tileGrid.add(tile)
                }
@@ -1589,7 +1603,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
    private fun getMaxBitmapDimensions(canvas: Canvas): Point {
        return Point(
            canvas.maximumBitmapWidth.coerceAtMost(maxTileWidth),
-            canvas.maximumBitmapHeight.coerceAtMost(maxTileHeight),
+            canvas.maximumBitmapHeight.coerceAtMost(maxTileHeight)
        )
    }

@@ -1654,15 +1668,15 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
        if (vTranslate == null || !isReady) return

        fRect[
-            viewToSourceX(vRect.left.toFloat()).toInt(),
-            viewToSourceY(vRect.top.toFloat()).toInt(),
-            viewToSourceX(vRect.right.toFloat()).toInt(),
+                viewToSourceX(vRect.left.toFloat()).toInt(),
+                viewToSourceY(vRect.top.toFloat()).toInt(),
+                viewToSourceX(vRect.right.toFloat()).toInt()
        ] = viewToSourceY(vRect.bottom.toFloat()).toInt()
        fileSRect(fRect, fRect)
        fRect[
-            fRect.left.coerceAtLeast(0),
-            fRect.top.coerceAtLeast(0),
-            fRect.right.coerceAtLeast(sWidth),
+                fRect.left.coerceAtLeast(0),
+                fRect.top.coerceAtLeast(0),
+                fRect.right.coerceAtLeast(sWidth)
        ] = fRect.bottom.coerceAtLeast(sHeight)
        if (!sRegion.isEmpty) {
            fRect.offset(sRegion.left, sRegion.top)
@@ -1779,9 +1793,9 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
     */
    private fun sourceToViewRect(sRect: Rect, vTarget: Rect) {
        vTarget[
-            sourceToViewX(sRect.left.toFloat()).toInt(),
-            sourceToViewY(sRect.top.toFloat()).toInt(),
-            sourceToViewX(sRect.right.toFloat()).toInt(),
+                sourceToViewX(sRect.left.toFloat()).toInt(),
+                sourceToViewY(sRect.top.toFloat()).toInt(),
+                sourceToViewX(sRect.right.toFloat()).toInt()
        ] = sourceToViewY(sRect.bottom.toFloat()).toInt()
    }

@@ -1828,11 +1842,11 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
        return when (minimumScaleType) {
            SCALE_TYPE_CENTER_INSIDE -> min(
                (width - hPadding) / sWidth.toFloat(),
-                (height - vPadding) / sHeight.toFloat(),
+                (height - vPadding) / sHeight.toFloat()
            )
            SCALE_TYPE_CENTER_CROP -> max(
                (width - hPadding) / sWidth.toFloat(),
-                (height - vPadding) / sHeight.toFloat(),
+                (height - vPadding) / sHeight.toFloat()
            )
            SCALE_TYPE_FIT_WIDTH -> (width - hPadding) / sWidth.toFloat()
            SCALE_TYPE_FIT_HEIGHT -> (height - vPadding) / sHeight.toFloat()
@@ -1939,20 +1953,20 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
        val scaleHeight = scale * sHeight
        when (panLimit) {
            PAN_LIMIT_CENTER -> {
-                vTarget.top = (-(vTranslate!!.y - height / 2)).coerceAtLeast(0F)
-                vTarget.left = (-(vTranslate!!.x - width / 2)).coerceAtLeast(0F)
+                vTarget.top = -(vTranslate!!.y - height / 2).coerceAtLeast(0F)
+                vTarget.left = -(vTranslate!!.x - width / 2).coerceAtLeast(0F)
                vTarget.bottom = (vTranslate!!.y - (height / 2 - scaleHeight)).coerceAtLeast(0F)
                vTarget.right = (vTranslate!!.x - (width / 2 - scaleWidth)).coerceAtLeast(0F)
            }
            PAN_LIMIT_OUTSIDE -> {
-                vTarget.top = (-(vTranslate!!.y - height)).coerceAtLeast(0F)
-                vTarget.left = (-(vTranslate!!.x - width)).coerceAtLeast(0F)
+                vTarget.top = -(vTranslate!!.y - height).coerceAtLeast(0F)
+                vTarget.left = -(vTranslate!!.x - width).coerceAtLeast(0F)
                vTarget.bottom = (vTranslate!!.y + scaleHeight).coerceAtLeast(0F)
                vTarget.right = (vTranslate!!.x + scaleWidth).coerceAtLeast(0F)
            }
            else -> {
-                vTarget.top = (-vTranslate!!.y).coerceAtLeast(0F)
-                vTarget.left = (-vTranslate!!.x).coerceAtLeast(0F)
+                vTarget.top = -vTranslate!!.y.coerceAtLeast(0F)
+                vTarget.left = -vTranslate!!.x.coerceAtLeast(0F)
                vTarget.bottom = (scaleHeight + vTranslate!!.y - height).coerceAtLeast(0F)
                vTarget.right = (scaleWidth + vTranslate!!.x - width).coerceAtLeast(0F)
            }
@@ -2136,9 +2150,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
    val state: ImageViewState?
        get() = if (vTranslate != null && sWidth > 0 && sHeight > 0) {
            ImageViewState(scale, center!!)
-        } else {
-            null
-        }
+        } else null

    /**
     * Returns true if pan gesture detection is enabled.
@@ -2424,7 +2436,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
        val sRect: Rect,
        val sampleSize: Int,
        val vRect: Rect,
-        val fileSRect: Rect,
+        val fileSRect: Rect
    ) {
        var bitmap: Bitmap? = null
        var loading = false
@@ -2459,7 +2471,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
        val easing: Int,
        val origin: Int,
        val time: Long = System.currentTimeMillis(),
-        val listener: OnAnimationEventListener?,
+        val listener: OnAnimationEventListener?
    )

    private data class ScaleAndTranslate(var scale: Float, val vTranslate: PointF)
@@ -2605,16 +2617,12 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
            val vxCenter = paddingLeft + (width - paddingRight - paddingLeft) / 2
            val vyCenter = paddingTop + (height - paddingBottom - paddingTop) / 2
            val targetScale = limitedScale(targetScale)
-            val targetSCenter = if (panLimited) {
-                limitedSCenter(
-                    targetSCenter!!.x,
-                    targetSCenter.y,
-                    targetScale,
-                    PointF(),
-                )
-            } else {
-                targetSCenter!!
-            }
+            val targetSCenter = if (panLimited) limitedSCenter(
+                targetSCenter!!.x,
+                targetSCenter.y,
+                targetScale,
+                PointF()
+            ) else targetSCenter!!
            anim = Anim(
                scaleStart = scale,
                scaleEnd = targetScale,
@@ -2624,13 +2632,13 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
                vFocusStart = sourceToViewCoord(targetSCenter),
                vFocusEnd = PointF(
                    vxCenter.toFloat(),
-                    vyCenter.toFloat(),
+                    vyCenter.toFloat()
                ),
                duration = duration,
                interruptible = interruptible,
                easing = easing,
                origin = origin,
-                listener = listener,
+                listener = listener
            )
            if (vFocus != null) {
                // Calculate where translation will be at the end of the anim
@@ -2642,7 +2650,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
                // Adjust the position of the focus point at end so image will be in bounds
                anim!!.vFocusEnd.set(
                    vFocus.x + (satEnd.vTranslate.x - vTranslateXEnd),
-                    vFocus.y + (satEnd.vTranslate.y - vTranslateYEnd),
+                    vFocus.y + (satEnd.vTranslate.y - vTranslateYEnd)
                )
            }
            invalidate()
@@ -2654,7 +2662,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
        @IntDef(
            ZOOM_FOCUS_FIXED,
            ZOOM_FOCUS_CENTER,
-            ZOOM_FOCUS_CENTER_IMMEDIATE,
+            ZOOM_FOCUS_CENTER_IMMEDIATE
        )
        annotation class ZoomStyle

@@ -2676,7 +2684,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
        @Retention(AnnotationRetention.SOURCE)
        @IntDef(
            EASE_IN_OUT_QUAD,
-            EASE_OUT_QUAD,
+            EASE_OUT_QUAD
        )
        annotation class EasingStyle

@@ -2694,7 +2702,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
        @IntDef(
            PAN_LIMIT_INSIDE,
            PAN_LIMIT_OUTSIDE,
-            PAN_LIMIT_CENTER,
+            PAN_LIMIT_CENTER
        )
        annotation class PanLimit

@@ -2721,7 +2729,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
            SCALE_TYPE_FIT_HEIGHT,
            SCALE_TYPE_ORIGINAL_SIZE,
            SCALE_TYPE_SMART_FIT,
-            SCALE_TYPE_CUSTOM,
+            SCALE_TYPE_CUSTOM
        )
        annotation class ScaleType

@@ -4,9 +4,9 @@ import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.Point
 import android.graphics.Rect
+import kotlin.Throws
 import com.davemorrissey.labs.subscaleview.provider.InputProvider
 import java.lang.Exception
-import kotlin.Throws

 /**
 * Interface for image decoding classes.
@@ -50,4 +50,4 @@ interface Decoder {
     * resources still in use.
     */
    fun recycle()
-}
+}
@@ -4,12 +4,14 @@ import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.Point
 import android.graphics.Rect
-import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
+import kotlin.Throws
 import com.davemorrissey.labs.subscaleview.provider.InputProvider
+import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
+import java.lang.Exception

 class ImageDecoder @JvmOverloads constructor(
    private val cropBorders: Boolean,
-    bitmapConfig: Bitmap.Config? = null,
+    bitmapConfig: Bitmap.Config? = null
 ) : Decoder {
    init {
        val globalBitmapConfig = SubsamplingScaleImageView.preferredBitmapConfig
@@ -59,4 +61,4 @@ class ImageDecoder @JvmOverloads constructor(
    override fun recycle() {
        TODO()
    }
-}
+}
@@ -0,0 +1,11 @@
+package com.davemorrissey.labs.subscaleview.provider
+
+import android.content.Context
+import java.io.IOException
+
+class AssetInputProvider(context: Context, val assetName: String) : InputProvider {
+    private val assets = context.assets
+
+    @Throws(IOException::class)
+    override fun openStream() = assets.open(assetName)
+}
@@ -1,3 +1,10 @@
 package com.davemorrissey.labs.subscaleview.provider

-interface InputProvider
+import java.io.IOException
+import java.io.InputStream
+import kotlin.Throws
+
+interface InputProvider {
+    @Throws(IOException::class)
+    fun openStream(): InputStream?
+}
@@ -0,0 +1,16 @@
+package com.davemorrissey.labs.subscaleview.provider
+
+import java.io.IOException
+import java.io.InputStream
+import kotlin.Throws
+
+/**
+ * Provider from an already open input stream.
+ *
+ *
+ * Please keep in mind this provider is not reusable.
+ */
+class OpenStreamProvider(private val stream: InputStream) : InputProvider {
+    @Throws(IOException::class)
+    override fun openStream() = stream
+}
@@ -0,0 +1,11 @@
+package com.davemorrissey.labs.subscaleview.provider
+
+import android.content.Context
+import java.io.IOException
+
+class ResourceInputProvider(context: Context, val resource: Int) : InputProvider {
+    private val resources = context.resources
+
+    @Throws(IOException::class)
+    override fun openStream() = resources.openRawResource(resource)
+}
@@ -0,0 +1,13 @@
+package com.davemorrissey.labs.subscaleview.provider
+
+import android.content.Context
+import android.net.Uri
+import java.io.IOException
+import kotlin.Throws
+
+class UriInputProvider(context: Context, val uri: Uri) : InputProvider {
+    private val resolver = context.contentResolver
+
+    @Throws(IOException::class)
+    override fun openStream() = resolver.openInputStream(uri)
+}
@@ -15,12 +15,15 @@
 * You should have received a copy of the GNU General Public License along with EhViewer.
 * If not, see <https://www.gnu.org/licenses/>.
 */
-package com.hippo.ehviewer.client.parser
+package com.hippo

-import org.jsoup.Jsoup
+import java.io.FileDescriptor

-object EventPaneParser {
-    fun parse(body: String): String? {
-        return Jsoup.parse(body).getElementById("eventpane")?.html()
+object Native {
+    fun initialize() {
+        System.loadLibrary("ehviewer")
    }
+
+    @JvmStatic
+    external fun getFd(fd: FileDescriptor?): Int
 }
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2022 Tarsin Norbin
+ *
+ * This file is part of EhViewer
+ *
+ * EhViewer is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * EhViewer is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with EhViewer.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.hippo
+
+import android.content.Context
+import android.graphics.ImageDecoder
+import android.net.Uri
+import com.hippo.image.Image
+import java.nio.ByteBuffer
+
+class UriArchiveAccessor(ctx: Context, uri: Uri) {
+    val pfd by lazy { ctx.contentResolver.openFileDescriptor(uri, "r")!! }
+    fun open(): Int {
+        return openArchive(pfd.fd, pfd.statSize)
+    }
+
+    private external fun openArchive(fd: Int, size: Long): Int
+    private external fun extractToByteBuffer(index: Int): ByteBuffer?
+    external fun extractToFd(index: Int, fd: Int)
+    external fun getFilename(index: Int): String
+    external fun needPassword(): Boolean
+    external fun providePassword(str: String): Boolean
+    private external fun closeArchive()
+    fun close() {
+        closeArchive()
+        pfd.close()
+    }
+
+    fun getImageSource(index: Int): Image.CloseableSource? {
+        val buffer = extractToByteBuffer(index)
+        buffer ?: return null
+        check(buffer.isDirect)
+        Image.rewriteGifSource(buffer)
+        val source = ImageDecoder.createSource(buffer)
+        return object : Image.CloseableSource {
+            override val source: ImageDecoder.Source
+                get() = source
+
+            override fun close() {
+                releaseByteBuffer(buffer)
+            }
+        }
+    }
+
+    companion object {
+        @JvmStatic
+        private external fun releaseByteBuffer(buffer: ByteBuffer)
+    }
+}
@@ -1,8 +1,8 @@
-package com.hippo.ehviewer.ui.legacy
+package com.hippo.app

 import android.content.Context
 import com.google.android.material.dialog.MaterialAlertDialogBuilder

 open class BaseDialogBuilder constructor(
-    context: Context,
+    context: Context
 ) : MaterialAlertDialogBuilder(context)
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.hippo.ehviewer.ui.legacy
+package com.hippo.app

 import android.content.Context
 import android.view.LayoutInflater
@@ -24,9 +24,9 @@ class CheckBoxDialogBuilder constructor(
    context: Context,
    message: String?,
    checkText: String?,
-    checked: Boolean,
+    checked: Boolean
 ) : BaseDialogBuilder(
-    context,
+    context
 ) {
    private val mCheckBox: CheckBox
    val isChecked: Boolean
@@ -41,4 +41,4 @@ class CheckBoxDialogBuilder constructor(
        mCheckBox.isChecked = checked
        view.setOnClickListener { mCheckBox.toggle() }
    }
-}
+}
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.hippo.ehviewer.ui.legacy
+package com.hippo.app

 import android.content.Context
 import android.content.DialogInterface
@@ -29,11 +29,10 @@ import com.hippo.ehviewer.R
 class EditTextDialogBuilder constructor(
    context: Context,
    text: String?,
-    hint: String?,
+    hint: String?
 ) : BaseDialogBuilder(
-    context,
-),
-    OnEditorActionListener {
+    context
+), OnEditorActionListener {
    private val mTextInputLayout: TextInputLayout
    val editText: EditText
    private var mDialog: AlertDialog? = null
@@ -69,4 +68,4 @@ class EditTextDialogBuilder constructor(
        editText.setOnEditorActionListener(this)
        mTextInputLayout.hint = hint
    }
-}
+}
@@ -0,0 +1,14 @@
+package com.hippo.app
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.HapticFeedbackConstants
+import com.google.android.material.slider.Slider
+
+class HapticSlider @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null
+) : Slider(context, attrs) {
+    init {
+        addOnChangeListener { _, _, _ -> performHapticFeedback(HapticFeedbackConstants.CLOCK_TICK) }
+    }
+}
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.hippo.ehviewer.ui.legacy
+package com.hippo.app

 import android.content.Context
 import android.view.LayoutInflater
@@ -24,16 +24,16 @@ import android.widget.CheckBox
 import android.widget.ListView
 import androidx.appcompat.app.AlertDialog
 import com.hippo.ehviewer.R
-import com.hippo.ehviewer.yorozuya.ViewUtils
+import com.hippo.yorozuya.ViewUtils

 class ListCheckBoxDialogBuilder(
    context: Context,
    items: List<CharSequence>,
-    listener: (ListCheckBoxDialogBuilder, AlertDialog?, Int) -> Unit,
+    listener: (ListCheckBoxDialogBuilder?, AlertDialog?, Int) -> Unit,
    checkText: String?,
-    checked: Boolean,
+    checked: Boolean
 ) : BaseDialogBuilder(
-    context,
+    context
 ) {
    private val mCheckBox: CheckBox
    private var mDialog: AlertDialog? = null
@@ -60,4 +60,4 @@ class ListCheckBoxDialogBuilder(
        mCheckBox.text = checkText
        mCheckBox.isChecked = checked
    }
-}
+}
@@ -1,7 +1,7 @@
-package com.hippo.ehviewer.legacy
+package com.hippo.compat

 import com.hippo.ehviewer.spider.SpiderInfo
-import com.hippo.ehviewer.yorozuya.IOUtils
+import com.hippo.yorozuya.IOUtils
 import java.io.InputStream

 fun readLegacySpiderInfo(inputStream: InputStream): SpiderInfo {
@@ -26,15 +26,13 @@ fun readLegacySpiderInfo(inputStream: InputStream): SpiderInfo {
    val pTokenMap = hashMapOf<Int, String>()
    val info = SpiderInfo(gid, pages, pTokenMap, 0, token, previewPages, previewPerPage)
    runCatching {
-        while (true) {
-            val line = read()
-            val pos = line.indexOf(" ")
-            if (pos > 0) {
-                val index = line.substring(0, pos).toInt()
-                val pToken = line.substring(pos + 1)
-                if (pToken.isNotEmpty()) {
-                    pTokenMap[index] = pToken
-                }
+        val line = read()
+        val pos = line.indexOf(" ")
+        if (pos > 0) {
+            val index = line.substring(0, pos).toInt()
+            val pToken = line.substring(pos + 1)
+            if (pToken.isNotEmpty()) {
+                pTokenMap[index] = pToken
            }
        }
    }
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.hippo.ehviewer.database
+package com.hippo.database

 import android.content.Context
 import android.database.sqlite.SQLiteOpenHelper
@@ -54,25 +54,25 @@ class MSQLiteBuilder {
     */
    fun version(version: Int): MSQLiteBuilder {
        check(version > this.version) {
-            (
-                "New version must be bigger than current version. " +
-                    "current version: " + this.version + ", new version: " + version + "."
-                )
+            ("New version must be bigger than current version. "
+                    + "current version: " + this.version + ", new version: " + version + ".")
        }
        this.version = version
        statements = ArrayList()
        statementsMap.put(version, statements)
        return this
    }
-
    /**
     * Creates a table.
     */
+    /**
+     * Creates a table with int [.COLUMN_ID] primary key.
+     */
    @JvmOverloads
    fun createTable(
        table: String,
        column: String = COLUMN_ID,
-        clazz: Class<*>? = Int::class.javaPrimitiveType,
+        clazz: Class<*>? = Int::class.javaPrimitiveType
    ): MSQLiteBuilder {
        return statement("CREATE TABLE " + table + " (" + column + " " + javaTypeToSQLiteType(clazz) + " PRIMARY KEY);")
    }
@@ -90,8 +90,8 @@ class MSQLiteBuilder {
    fun insertColumn(table: String, column: String, clazz: Class<*>?): MSQLiteBuilder {
        return statement(
            "ALTER TABLE $table ADD COLUMN $column " + javaTypeToSQLiteType(
-                clazz,
-            ) + ";",
+                clazz
+            ) + ";"
        )
    }

@@ -121,4 +121,4 @@ class MSQLiteBuilder {
        }
        return result
    }
-}
+}
@@ -13,18 +13,18 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.hippo.ehviewer.database
+package com.hippo.database

 import android.content.Context
 import android.database.sqlite.SQLiteDatabase
 import android.database.sqlite.SQLiteOpenHelper
-import com.hippo.ehviewer.util.SqlUtils
+import com.hippo.util.SqlUtils

 internal class MSQLiteOpenHelper(
    context: Context?,
    name: String?,
    private val version: Int,
-    private val builder: MSQLiteBuilder,
+    private val builder: MSQLiteBuilder
 ) : SQLiteOpenHelper(context, name, null, version) {
    override fun onCreate(db: SQLiteDatabase) {
        onUpgrade(db, 0, version)
@@ -40,4 +40,4 @@ internal class MSQLiteOpenHelper(
        SqlUtils.dropAllTable(db)
        onCreate(db)
    }
-}
+}
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package com.hippo.ehviewer.ui.legacy;
+package com.hippo.drawable;

 import android.animation.ObjectAnimator;
 import android.content.Context;
@@ -30,7 +30,7 @@ import android.graphics.drawable.Drawable;
 import androidx.annotation.Keep;

 import com.hippo.ehviewer.R;
-import com.hippo.ehviewer.yorozuya.MathUtils;
+import com.hippo.yorozuya.MathUtils;

 public class AddDeleteDrawable extends Drawable {

@@ -0,0 +1,190 @@
+/*
+ * Copyright 2018 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hippo.drawable;
+
+import android.content.res.ColorStateList;
+import android.graphics.Canvas;
+import android.graphics.ColorFilter;
+import android.graphics.PorterDuff;
+import android.graphics.Rect;
+import android.graphics.Region;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+
+import androidx.annotation.NonNull;
+import androidx.core.graphics.drawable.DrawableCompat;
+
+public class DrawableWrapper extends Drawable implements Drawable.Callback {
+    private Drawable mDrawable;
+    private Rect mBounds;
+
+    public DrawableWrapper(Drawable drawable) {
+        this.setWrappedDrawable(drawable);
+    }
+
+    public void draw(@NonNull Canvas canvas) {
+        if (mDrawable instanceof BitmapDrawable bitmapDrawable) {
+            canvas.drawBitmap(bitmapDrawable.getBitmap(), null, mBounds, bitmapDrawable.getPaint());
+        } else {
+            synchronized (mDrawable) {
+                mDrawable.setBounds(mBounds);
+                mDrawable.draw(canvas);
+            }
+        }
+    }
+
+    protected void onBoundsChange(Rect bounds) {
+        mBounds = bounds;
+    }
+
+    public int getChangingConfigurations() {
+        return this.mDrawable.getChangingConfigurations();
+    }
+
+    public void setChangingConfigurations(int configs) {
+        this.mDrawable.setChangingConfigurations(configs);
+    }
+
+    public void setDither(boolean dither) {
+        this.mDrawable.setDither(dither);
+    }
+
+    public void setFilterBitmap(boolean filter) {
+        this.mDrawable.setFilterBitmap(filter);
+    }
+
+    public void setAlpha(int alpha) {
+        this.mDrawable.setAlpha(alpha);
+    }
+
+    public void setColorFilter(ColorFilter cf) {
+        this.mDrawable.setColorFilter(cf);
+    }
+
+    public boolean isStateful() {
+        return this.mDrawable.isStateful();
+    }
+
+    public boolean setState(@NonNull int[] stateSet) {
+        return this.mDrawable.setState(stateSet);
+    }
+
+    @NonNull
+    public int[] getState() {
+        return this.mDrawable.getState();
+    }
+
+    public void jumpToCurrentState() {
+        this.mDrawable.jumpToCurrentState();
+    }
+
+    @NonNull
+    public Drawable getCurrent() {
+        return this.mDrawable.getCurrent();
+    }
+
+    public boolean setVisible(boolean visible, boolean restart) {
+        return super.setVisible(visible, restart) || this.mDrawable.setVisible(visible, restart);
+    }
+
+    public int getOpacity() {
+        return this.mDrawable.getOpacity();
+    }
+
+    public Region getTransparentRegion() {
+        return this.mDrawable.getTransparentRegion();
+    }
+
+    public int getIntrinsicWidth() {
+        return this.mDrawable.getIntrinsicWidth();
+    }
+
+    public int getIntrinsicHeight() {
+        return this.mDrawable.getIntrinsicHeight();
+    }
+
+    public int getMinimumWidth() {
+        return this.mDrawable.getMinimumWidth();
+    }
+
+    public int getMinimumHeight() {
+        return this.mDrawable.getMinimumHeight();
+    }
+
+    public boolean getPadding(@NonNull Rect padding) {
+        return this.mDrawable.getPadding(padding);
+    }
+
+    public void invalidateDrawable(@NonNull Drawable who) {
+        this.invalidateSelf();
+    }
+
+    public void scheduleDrawable(@NonNull Drawable who, @NonNull Runnable what, long when) {
+        this.scheduleSelf(what, when);
+    }
+
+    public void unscheduleDrawable(@NonNull Drawable who, @NonNull Runnable what) {
+        this.unscheduleSelf(what);
+    }
+
+    protected boolean onLevelChange(int level) {
+        return this.mDrawable.setLevel(level);
+    }
+
+    public boolean isAutoMirrored() {
+        return DrawableCompat.isAutoMirrored(this.mDrawable);
+    }
+
+    public void setAutoMirrored(boolean mirrored) {
+        DrawableCompat.setAutoMirrored(this.mDrawable, mirrored);
+    }
+
+    public void setTint(int tint) {
+        DrawableCompat.setTint(this.mDrawable, tint);
+    }
+
+    public void setTintList(ColorStateList tint) {
+        DrawableCompat.setTintList(this.mDrawable, tint);
+    }
+
+    public void setTintMode(@NonNull PorterDuff.Mode tintMode) {
+        DrawableCompat.setTintMode(this.mDrawable, tintMode);
+    }
+
+    public void setHotspot(float x, float y) {
+        DrawableCompat.setHotspot(this.mDrawable, x, y);
+    }
+
+    public void setHotspotBounds(int left, int top, int right, int bottom) {
+        DrawableCompat.setHotspotBounds(this.mDrawable, left, top, right, bottom);
+    }
+
+    public Drawable getWrappedDrawable() {
+        return this.mDrawable;
+    }
+
+    public void setWrappedDrawable(Drawable drawable) {
+        if (this.mDrawable != null) {
+            this.mDrawable.setCallback(null);
+        }
+
+        this.mDrawable = drawable;
+        if (drawable != null) {
+            drawable.setCallback(this);
+        }
+    }
+}
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hippo.drawable;
+
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.graphics.drawable.Drawable;
+
+import com.hippo.yorozuya.MathUtils;
+
+/**
+ * Show a part of the original drawable
+ */
+public class PreciselyClipDrawable extends DrawableWrapper {
+
+    private final boolean mClip;
+    private RectF mScale;
+    private Rect mTemp;
+
+    public PreciselyClipDrawable(Drawable drawable, int offsetX, int offsetY, int width, int height) {
+        super(drawable);
+        float originWidth = drawable.getIntrinsicWidth();
+        float originHeight = drawable.getIntrinsicHeight();
+
+        if (originWidth <= 0 || originHeight <= 0) {
+            // Can not clip
+            mClip = false;
+        } else {
+            mClip = true;
+            mScale = new RectF();
+            mScale.set(MathUtils.clamp(offsetX / originWidth, 0.0f, 1.0f),
+                    MathUtils.clamp(offsetY / originHeight, 0.0f, 1.0f),
+                    MathUtils.clamp((offsetX + width) / originWidth, 0.0f, 1.0f),
+                    MathUtils.clamp((offsetY + height) / originHeight, 0.0f, 1.0f));
+            mTemp = new Rect();
+        }
+    }
+
+    @Override
+    protected void onBoundsChange(Rect bounds) {
+        if (mClip) {
+            if (!mScale.isEmpty()) {
+                mTemp.left = (int) ((mScale.left * bounds.right - mScale.right * bounds.left) /
+                        (mScale.left * (1 - mScale.right) - mScale.right * (1 - mScale.left)));
+                mTemp.right = (int) (((1 - mScale.right) * bounds.left - (1 - mScale.left) * bounds.right) /
+                        (mScale.left * (1 - mScale.right) - mScale.right * (1 - mScale.left)));
+                mTemp.top = (int) ((mScale.top * bounds.bottom - mScale.bottom * bounds.top) /
+                        (mScale.top * (1 - mScale.bottom) - mScale.bottom * (1 - mScale.top)));
+                mTemp.bottom = (int) (((1 - mScale.bottom) * bounds.top - (1 - mScale.top) * bounds.bottom) /
+                        (mScale.top * (1 - mScale.bottom) - mScale.bottom * (1 - mScale.top)));
+                super.onBoundsChange(mTemp);
+            }
+        } else {
+            super.onBoundsChange(bounds);
+        }
+    }
+
+    @Override
+    public int getIntrinsicWidth() {
+        if (mClip) {
+            return (int) (super.getIntrinsicWidth() * mScale.width());
+        } else {
+            return super.getIntrinsicWidth();
+        }
+    }
+
+    @Override
+    public int getIntrinsicHeight() {
+        if (mClip) {
+            return (int) (super.getIntrinsicHeight() * mScale.height());
+        } else {
+            return super.getIntrinsicHeight();
+        }
+    }
+
+    @Override
+    public void draw(Canvas canvas) {
+        if (mClip) {
+            if (!mScale.isEmpty()) {
+                int saveCount = canvas.save();
+                canvas.clipRect(getBounds());
+                super.draw(canvas);
+                canvas.restoreToCount(saveCount);
+            }
+        } else {
+            super.draw(canvas);
+        }
+    }
+}
@@ -0,0 +1,72 @@
+/*
+ * 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.drawable;
+
+import android.graphics.Canvas;
+import android.graphics.ColorFilter;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.PixelFormat;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+
+public class TriangleDrawable extends Drawable {
+
+    private final Paint mPaint;
+    private final Path mPath;
+
+    public TriangleDrawable(int color) {
+        mPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.DITHER_FLAG);
+        mPaint.setColor(color);
+        mPath = new Path();
+    }
+
+    public void setColor(int color) {
+        mPaint.setColor(color);
+        invalidateSelf();
+    }
+
+    @Override
+    protected void onBoundsChange(Rect bounds) {
+        super.onBoundsChange(bounds);
+        mPath.reset();
+        mPath.moveTo(bounds.left, bounds.top);
+        mPath.lineTo(bounds.right, bounds.top);
+        mPath.lineTo(bounds.right, bounds.bottom);
+        mPath.close();
+    }
+
+    @Override
+    public void draw(Canvas canvas) {
+        canvas.drawPath(mPath, mPaint);
+    }
+
+    @Override
+    public void setAlpha(int alpha) {
+        mPaint.setAlpha(alpha);
+    }
+
+    @Override
+    public void setColorFilter(ColorFilter colorFilter) {
+        mPaint.setColorFilter(colorFilter);
+    }
+
+    @Override
+    public int getOpacity() {
+        return PixelFormat.OPAQUE;
+    }
+}
@@ -0,0 +1,104 @@
+/*
+ * 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.
+ */
+
+package com.hippo.drawable;
+
+import android.graphics.drawable.AnimatedImageDrawable;
+import android.graphics.drawable.Drawable;
+
+import com.hippo.widget.ObservedTextView;
+
+import coil.Coil;
+import coil.request.Disposable;
+import coil.request.ImageRequest;
+
+public class UnikeryDrawable extends WrapDrawable implements ObservedTextView.OnWindowAttachListener {
+
+    private static final String TAG = UnikeryDrawable.class.getSimpleName();
+    private final ObservedTextView mTextView;
+    private String mUrl;
+    private Disposable task;
+
+    public UnikeryDrawable(ObservedTextView textView) {
+        mTextView = textView;
+        mTextView.setOnWindowAttachListener(this);
+    }
+
+    @Override
+    public void onAttachedToWindow() {
+        load(mUrl);
+    }
+
+    @Override
+    public void onDetachedFromWindow() {
+        if (task != null && !task.isDisposed())
+            task.dispose();
+        clearDrawable();
+    }
+
+    public void load(String url) {
+        if (url != null) {
+            mUrl = url;
+            var imageLoader = Coil.imageLoader(mTextView.getContext());
+            var request = new ImageRequest.Builder(mTextView.getContext()).data(url).memoryCacheKey(url).diskCacheKey(url).target(
+                    drawable -> null,
+                    drawable -> null,
+                    drawable -> {
+                        onGetValue(drawable);
+                        return null;
+                    }
+            ).build();
+            task = imageLoader.enqueue(request);
+        }
+    }
+
+    private void clearDrawable() {
+        setDrawable(null);
+    }
+
+    @Override
+    public void setDrawable(Drawable drawable) {
+        // Remove old callback
+        Drawable oldDrawable = getDrawable();
+        if (oldDrawable != null) {
+            oldDrawable.setCallback(null);
+        }
+
+        super.setDrawable(drawable);
+
+        if (drawable != null) {
+            drawable.setCallback(mTextView);
+        }
+
+        updateBounds();
+        if (drawable != null) {
+            invalidateSelf();
+        }
+    }
+
+    @Override
+    public void invalidateSelf() {
+        CharSequence cs = mTextView.getText();
+        mTextView.setText(cs);
+    }
+
+    public void onGetValue(Drawable drawable) {
+        clearDrawable();
+        setDrawable(drawable);
+        if (drawable instanceof AnimatedImageDrawable animatedImageDrawable)
+            animatedImageDrawable.start();
+    }
+}
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package com.hippo.ehviewer.ui.legacy;
+package com.hippo.drawable;

 import android.graphics.Canvas;
 import android.graphics.ColorFilter;
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package com.hippo.ehviewer.ui.legacy.easyrecyclerview;
+package com.hippo.easyrecyclerview;

 import android.content.Context;
 import android.os.Parcel;
@@ -31,7 +31,7 @@ import androidx.annotation.NonNull;
 import androidx.collection.LongSparseArray;
 import androidx.recyclerview.widget.RecyclerView;

-import com.hippo.ehviewer.yorozuya.NumberUtils;
+import com.hippo.yorozuya.NumberUtils;

 /**
 * Add setChoiceMode for RecyclerView
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package com.hippo.ehviewer.ui.legacy.easyrecyclerview;
+package com.hippo.easyrecyclerview;

 import android.animation.Animator;
 import android.animation.ObjectAnimator;
@@ -33,11 +33,11 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;

 import com.hippo.ehviewer.R;
-import com.hippo.ehviewer.yorozuya.AnimationUtils;
-import com.hippo.ehviewer.yorozuya.LayoutUtils;
-import com.hippo.ehviewer.yorozuya.MathUtils;
-import com.hippo.ehviewer.yorozuya.SimpleAnimatorListener;
-import com.hippo.ehviewer.yorozuya.SimpleHandler;
+import com.hippo.yorozuya.AnimationUtils;
+import com.hippo.yorozuya.LayoutUtils;
+import com.hippo.yorozuya.MathUtils;
+import com.hippo.yorozuya.SimpleAnimatorListener;
+import com.hippo.yorozuya.SimpleHandler;

 public class FastScroller extends View {

@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package com.hippo.ehviewer.ui.legacy.easyrecyclerview;
+package com.hippo.easyrecyclerview;

 import android.graphics.Canvas;
 import android.graphics.Color;
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package com.hippo.ehviewer.ui.legacy.easyrecyclerview;
+package com.hippo.easyrecyclerview;

 import android.content.Context;
 import android.graphics.PointF;
@@ -23,8 +23,8 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.StaggeredGridLayoutManager;

-import com.hippo.ehviewer.yorozuya.MathUtils;
-import com.hippo.ehviewer.yorozuya.SimpleHandler;
+import com.hippo.yorozuya.MathUtils;
+import com.hippo.yorozuya.SimpleHandler;

 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package com.hippo.ehviewer.ui.legacy.easyrecyclerview;
+package com.hippo.easyrecyclerview;

 import android.graphics.Rect;
 import android.view.View;
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package com.hippo.ehviewer.ui.legacy.easyrecyclerview;
+package com.hippo.easyrecyclerview;

 import android.view.View;

@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package com.hippo.ehviewer.ui.legacy.easyrecyclerview;
+package com.hippo.easyrecyclerview;

 import android.content.Context;

@@ -20,13 +20,12 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Environment;

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

 import com.hippo.ehviewer.client.exception.ParseException;
-import com.hippo.ehviewer.util.ReadableTime;
-import com.hippo.ehviewer.yorozuya.FileUtils;
-import com.hippo.ehviewer.yorozuya.IOUtils;
+import com.hippo.util.ReadableTime;
+import com.hippo.yorozuya.FileUtils;
+import com.hippo.yorozuya.IOUtils;

 import java.io.File;
 import java.io.FileOutputStream;
@@ -135,7 +134,7 @@ public class AppConfig {
        return FileUtils.createTempFile(getTempDir(), null);
    }

-    public static void saveParseErrorBody(@NonNull ParseException e) {
+    public static void saveParseErrorBody(ParseException e) {
        File dir = getExternalParseErrorDir();
        if (null == dir) {
            return;
@@ -151,7 +150,9 @@ public class AppConfig {
                os.write(message.getBytes(StandardCharsets.UTF_8));
                os.write('\n');
            }
-            os.write(body.getBytes(StandardCharsets.UTF_8));
+            if (null != body) {
+                os.write(body.getBytes(StandardCharsets.UTF_8));
+            }
            os.flush();
        } catch (IOException e1) {
            // Ignore
@@ -0,0 +1,202 @@
+/*
+ * 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;
+
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.Build;
+import android.os.Debug;
+
+import androidx.annotation.NonNull;
+
+import com.hippo.util.PackageUtils;
+import com.hippo.util.ReadableTime;
+import com.hippo.yorozuya.FileUtils;
+import com.hippo.yorozuya.IOUtils;
+import com.hippo.yorozuya.OSUtils;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Arrays;
+
+public final class Crash {
+    private Crash() {
+    }
+
+    @NonNull
+    private static String avoidNull(String str) {
+        return null != str ? str : "null";
+    }
+
+    private static void collectInfo(Context context, FileWriter fw) throws IOException {
+        try {
+            PackageManager pm = context.getPackageManager();
+            PackageInfo pi = pm.getPackageInfo(context.getPackageName(), PackageManager.GET_ACTIVITIES);
+            if (pi != null) {
+                String versionName = pi.versionName == null ? "null" : pi.versionName;
+                String versionCode = String.valueOf(pi.versionCode);
+                fw.write("======== PackageInfo ========\r\n");
+                fw.write("PackageName=");
+                fw.write(pi.packageName);
+                fw.write("\r\n");
+                fw.write("VersionName=");
+                fw.write(versionName);
+                fw.write("\r\n");
+                fw.write("VersionCode=");
+                fw.write(versionCode);
+                fw.write("\r\n");
+                String signature = PackageUtils.getSignature(context, pi.packageName);
+                fw.write("Signature=");
+                fw.write(null != signature ? signature : "null");
+                fw.write("\r\n");
+                fw.write("\r\n");
+            }
+        } catch (PackageManager.NameNotFoundException e) {
+            fw.write("======== PackageInfo ========\r\n");
+            fw.write("Can't get package information\r\n");
+            fw.write("\r\n");
+        }
+
+        // Runtime
+        String topActivityClazzName = "null";
+        fw.write("======== Runtime ========\r\n");
+        fw.write("TopActivity=");
+        fw.write(avoidNull(topActivityClazzName));
+        fw.write("\r\n");
+        fw.write("\r\n");
+        fw.write("\r\n");
+
+        // Device info
+        fw.write("======== DeviceInfo ========\r\n");
+        fw.write("BOARD=");
+        fw.write(Build.BOARD);
+        fw.write("\r\n");
+        fw.write("BOOTLOADER=");
+        fw.write(Build.BOOTLOADER);
+        fw.write("\r\n");
+        fw.write("SUPPORTED_ABIS=");
+        fw.write(Arrays.toString(Build.SUPPORTED_ABIS));
+        fw.write("\r\n");
+        fw.write("DEVICE=");
+        fw.write(Build.DEVICE);
+        fw.write("\r\n");
+        fw.write("DISPLAY=");
+        fw.write(Build.DISPLAY);
+        fw.write("\r\n");
+        fw.write("FINGERPRINT=");
+        fw.write(Build.FINGERPRINT);
+        fw.write("\r\n");
+        fw.write("HARDWARE=");
+        fw.write(Build.HARDWARE);
+        fw.write("\r\n");
+        fw.write("HOST=");
+        fw.write(Build.HOST);
+        fw.write("\r\n");
+        fw.write("ID=");
+        fw.write(Build.ID);
+        fw.write("\r\n");
+        fw.write("MANUFACTURER=");
+        fw.write(Build.MANUFACTURER);
+        fw.write("\r\n");
+        fw.write("MODEL=");
+        fw.write(Build.MODEL);
+        fw.write("\r\n");
+        fw.write("PRODUCT=");
+        fw.write(Build.PRODUCT);
+        fw.write("\r\n");
+        fw.write("RADIO=");
+        fw.write(Build.getRadioVersion());
+        fw.write("\r\n");
+        fw.write("TAGS=");
+        fw.write(Build.TAGS);
+        fw.write("\r\n");
+        fw.write("TYPE=");
+        fw.write(Build.TYPE);
+        fw.write("\r\n");
+        fw.write("USER=");
+        fw.write(Build.USER);
+        fw.write("\r\n");
+        fw.write("CODENAME=");
+        fw.write(Build.VERSION.CODENAME);
+        fw.write("\r\n");
+        fw.write("INCREMENTAL=");
+        fw.write(Build.VERSION.INCREMENTAL);
+        fw.write("\r\n");
+        fw.write("RELEASE=");
+        fw.write(Build.VERSION.RELEASE);
+        fw.write("\r\n");
+        fw.write("SDK=");
+        fw.write(Integer.toString(Build.VERSION.SDK_INT));
+        fw.write("\r\n");
+        fw.write("MEMORY=");
+        fw.write(
+                FileUtils.humanReadableByteCount(OSUtils.getAppAllocatedMemory(), false));
+        fw.write("\r\n");
+        fw.write("MEMORY_NATIVE=");
+        fw.write(FileUtils.humanReadableByteCount(Debug.getNativeHeapAllocatedSize(), false));
+        fw.write("\r\n");
+        fw.write("MEMORY_MAX=");
+        fw.write(FileUtils.humanReadableByteCount(OSUtils.getAppMaxMemory(), false));
+        fw.write("\r\n");
+        fw.write("MEMORY_TOTAL=");
+        fw.write(FileUtils.humanReadableByteCount(OSUtils.getTotalMemory(), false));
+        fw.write("\r\n");
+        fw.write("\r\n");
+    }
+
+    private static void getThrowableInfo(Throwable t, FileWriter fw) {
+        PrintWriter printWriter = new PrintWriter(fw);
+        t.printStackTrace(printWriter);
+        Throwable cause = t.getCause();
+        while (cause != null) {
+            cause.printStackTrace(printWriter);
+            cause = cause.getCause();
+        }
+    }
+
+    public static void saveCrashLog(Context context, Throwable t) {
+        File dir = AppConfig.getExternalCrashDir();
+        if (dir == null) {
+            return;
+        }
+
+        String nowString = ReadableTime.getFilenamableTime(System.currentTimeMillis());
+        String fileName = "crash-" + nowString + ".log";
+        File file = new File(dir, fileName);
+
+        FileWriter fw = null;
+        try {
+            fw = new FileWriter(file);
+            fw.write("TIME=");
+            fw.write(nowString);
+            fw.write("\r\n");
+            fw.write("\r\n");
+            collectInfo(context, fw);
+            fw.write("======== CrashInfo ========\r\n");
+            getThrowableInfo(t, fw);
+            fw.write("\r\n");
+            fw.flush();
+        } catch (Exception e) {
+            file.delete();
+        } finally {
+            IOUtils.closeQuietly(fw);
+        }
+    }
+}
@@ -1,96 +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
-
-import android.os.Build
-import android.os.Debug
-import com.hippo.ehviewer.util.ReadableTime
-import com.hippo.ehviewer.yorozuya.FileUtils
-import com.hippo.ehviewer.yorozuya.OSUtils
-import java.io.File
-import java.io.FileWriter
-import java.io.PrintWriter
-
-private fun joinIfStringArray(any: Any?): String {
-    return if (any is Array<*>) any.joinToString() else any.toString()
-}
-
-private fun collectClassStaticInfo(clazz: Class<*>): String {
-    return clazz.declaredFields.joinToString("\n") {
-        "${it.name}=${joinIfStringArray(it.get(null))}"
-    }
-}
-
-object Crash {
-    private fun collectInfo(fw: FileWriter) {
-        fw.write("======== PackageInfo ========\n")
-        fw.write("PackageName=${BuildConfig.APPLICATION_ID}\n")
-        fw.write("VersionName=${BuildConfig.VERSION_NAME}\n")
-        fw.write("VersionCode=${BuildConfig.VERSION_CODE}\n")
-        fw.write("CommitSha=${BuildConfig.COMMIT_SHA}\n")
-        fw.write("BuildTime=${BuildConfig.BUILD_TIME}\n")
-        fw.write("\n")
-
-        // Device info
-        fw.write("======== DeviceInfo ========\n")
-        fw.write("${collectClassStaticInfo(Build::class.java)}\n")
-        fw.write("${collectClassStaticInfo(Build.VERSION::class.java)}\n")
-        fw.write("MEMORY=")
-        fw.write(FileUtils.humanReadableByteCount(OSUtils.getAppAllocatedMemory(), false))
-        fw.write("\n")
-        fw.write("MEMORY_NATIVE=")
-        fw.write(FileUtils.humanReadableByteCount(Debug.getNativeHeapAllocatedSize(), false))
-        fw.write("\n")
-        fw.write("MEMORY_MAX=")
-        fw.write(FileUtils.humanReadableByteCount(OSUtils.getAppMaxMemory(), false))
-        fw.write("\n")
-        fw.write("MEMORY_TOTAL=")
-        fw.write(FileUtils.humanReadableByteCount(OSUtils.getTotalMemory(), false))
-        fw.write("\n")
-        fw.write("\n")
-    }
-
-    private fun getThrowableInfo(t: Throwable, fw: FileWriter) {
-        val printWriter = PrintWriter(fw)
-        t.printStackTrace(printWriter)
-        var cause = t.cause
-        while (cause != null) {
-            cause.printStackTrace(printWriter)
-            cause = cause.cause
-        }
-    }
-
-    fun saveCrashLog(t: Throwable) {
-        val dir = AppConfig.getExternalCrashDir() ?: return
-        val nowString = ReadableTime.getFilenamableTime(System.currentTimeMillis())
-        val fileName = "crash-$nowString.log"
-        val file = File(dir, fileName)
-        runCatching {
-            FileWriter(file).use { fw ->
-                fw.write("TIME=${nowString}\n")
-                fw.write("\n")
-                collectInfo(fw)
-                fw.write("======== CrashInfo ========\n")
-                getThrowableInfo(t, fw)
-                fw.write("\n")
-                fw.flush()
-            }
-        }.onFailure {
-            it.printStackTrace()
-            file.delete()
-        }
-    }
-}
@@ -16,96 +16,175 @@

 package com.hippo.ehviewer

+import android.annotation.SuppressLint
+import android.app.Activity
+import android.app.ActivityManager
 import android.app.Application
 import android.content.ComponentCallbacks2
+import android.text.Html
+import android.text.method.LinkMovementMethod
+import android.view.View
+import android.widget.TextView
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.collection.LruCache
+import androidx.core.content.getSystemService
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.ProcessLifecycleOwner
 import coil.ImageLoader
 import coil.ImageLoaderFactory
-import coil.util.DebugLogger
+import com.hippo.Native
+import com.hippo.app.BaseDialogBuilder
 import com.hippo.ehviewer.client.EhCookieStore
 import com.hippo.ehviewer.client.EhDns
+import com.hippo.ehviewer.client.EhRequestBuilder
 import com.hippo.ehviewer.client.EhSSLSocketFactory
 import com.hippo.ehviewer.client.EhTagDatabase
+import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.data.GalleryDetail
-import com.hippo.ehviewer.coil.MergeInterceptor
-import com.hippo.ehviewer.coil.diskCache
-import com.hippo.ehviewer.dailycheck.checkDawn
+import com.hippo.ehviewer.client.parser.EventPaneParser
 import com.hippo.ehviewer.dao.buildMainDB
 import com.hippo.ehviewer.download.DownloadManager
-import com.hippo.ehviewer.legacy.cleanObsoleteCache
-import com.hippo.ehviewer.ui.keepNoMediaFileStatus
-import com.hippo.ehviewer.util.ReadableTime
-import com.hippo.ehviewer.yorozuya.FileUtils
+import com.hippo.ehviewer.ui.CommonOperations
+import com.hippo.ehviewer.ui.EhActivity
+import com.hippo.util.ExceptionUtils
+import com.hippo.util.ReadableTime
+import com.hippo.yorozuya.FileUtils
+import com.hippo.yorozuya.IntIdGenerator
 import eu.kanade.tachiyomi.core.preference.AndroidPreferenceStore
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences
 import eu.kanade.tachiyomi.util.lang.launchIO
 import kotlinx.coroutines.DelicateCoroutinesApi
-import okhttp3.Cache
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import okhttp3.OkHttpClient
-import okio.FileSystem
-import okio.Path.Companion.toOkioPath
 import java.net.Proxy
 import java.security.KeyStore
 import javax.net.ssl.TrustManagerFactory
 import javax.net.ssl.X509TrustManager

 class EhApplication : Application(), DefaultLifecycleObserver, ImageLoaderFactory {
+    private val mIdGenerator = IntIdGenerator()
+    private val mGlobalStuffMap = HashMap<Int, Any>()
+    private val mActivityList = ArrayList<Activity>()
+    val topActivity: EhActivity?
+        get() = if (mActivityList.isNotEmpty()) {
+            mActivityList[mActivityList.size - 1] as EhActivity
+        } else {
+            null
+        }
+
+    fun recreateAllActivity() {
+        mActivityList.forEach { it.recreate() }
+    }
+
    @OptIn(DelicateCoroutinesApi::class)
+    @SuppressLint("StaticFieldLeak")
    override fun onCreate() {
        ProcessLifecycleOwner.get().lifecycle.addObserver(this)
        application = this
        val handler = Thread.getDefaultUncaughtExceptionHandler()
        Thread.setDefaultUncaughtExceptionHandler { t, e ->
            try {
-                if (Settings.saveCrashLog) {
-                    Crash.saveCrashLog(e)
+                if (Settings.getSaveCrashLog()) {
+                    Crash.saveCrashLog(application, e)
                }
            } catch (ignored: Throwable) {
            }
            handler?.uncaughtException(t, e)
        }
        super<Application>.onCreate()
-        System.loadLibrary("ehviewer")
+        Native.initialize()
+        GetText.initialize(this)
        Settings.initialize()
        ReadableTime.initialize(this)
        AppConfig.initialize(this)
-        AppCompatDelegate.setDefaultNightMode(Settings.theme)
+        EhTagDatabase.update()
+        AppCompatDelegate.setDefaultNightMode(Settings.getTheme())
        launchIO {
-            launchIO {
-                EhTagDatabase.update()
-            }
            launchIO {
                ehDatabase
            }
            launchIO {
-                DownloadManager.isIdle
+                downloadManager
            }
            launchIO {
                cleanupDownload()
            }
-            if (Settings.requestNews) {
-                launchIO {
-                    checkDawn()
-                }
+            launchIO {
+                theDawnOfNewDay()
            }
        }
-        cleanObsoleteCache(this)
+        mIdGenerator.setNextId(Settings.getInt(KEY_GLOBAL_STUFF_NEXT_ID, 0))
    }

-    private suspend fun cleanupDownload() {
-        runCatching {
-            keepNoMediaFileStatus()
-        }.onFailure {
-            it.printStackTrace()
+    private fun cleanupDownload() {
+        try {
+            val downloadLocation = Settings.getDownloadLocation()
+            if (Settings.getMediaScan()) {
+                CommonOperations.removeNoMediaFile(downloadLocation)
+            } else {
+                CommonOperations.ensureNoMediaFile(downloadLocation)
+            }
+        } catch (t: Throwable) {
+            t.printStackTrace()
+            ExceptionUtils.throwIfFatal(t)
        }
-        runCatching {
+
+        // Clear temp files
+        try {
            clearTempDir()
-        }.onFailure {
-            it.printStackTrace()
+        } catch (t: Throwable) {
+            t.printStackTrace()
+            ExceptionUtils.throwIfFatal(t)
+        }
+    }
+
+    private fun theDawnOfNewDay() {
+        if (!Settings.getRequestNews()) {
+            return
+        }
+
+        if (ehCookieStore.hasSignedIn()) {
+            val referer = EhUrl.REFERER_E
+            val request = EhRequestBuilder(EhUrl.HOST_E + "news.php", referer).build()
+            val call = okHttpClient.newCall(request)
+            try {
+                call.execute().use { response ->
+                    val responseBody = response.body
+                    val body = responseBody.string()
+                    val html = EventPaneParser.parse(body)
+                    if (html != null) {
+                        showEventPane(html)
+                    }
+                }
+            } catch (e: Throwable) {
+                e.printStackTrace()
+            }
+        }
+    }
+
+    fun showEventPane(html: String) {
+        if (Settings.getHideHvEvents() && html.contains("You have encountered a monster!")) {
+            return
+        }
+        val activity = topActivity
+        activity?.runOnUiThread {
+            val dialog = BaseDialogBuilder(activity)
+                .setMessage(Html.fromHtml(html, Html.FROM_HTML_MODE_LEGACY))
+                .setPositiveButton(android.R.string.ok, null)
+                .create()
+            dialog.setOnShowListener {
+                val messageView = dialog.findViewById<View>(android.R.id.message)
+                if (messageView is TextView) {
+                    messageView.movementMethod = LinkMovementMethod.getInstance()
+                }
+            }
+            try {
+                dialog.show()
+            } catch (t: Throwable) {
+                // ignore
+            }
        }
    }

@@ -127,61 +206,92 @@ class EhApplication : Application(), DefaultLifecycleObserver, ImageLoaderFactor
        }
    }

+    fun putGlobalStuff(o: Any): Int {
+        val id = mIdGenerator.nextId()
+        mGlobalStuffMap[id] = o
+        Settings.putInt(KEY_GLOBAL_STUFF_NEXT_ID, mIdGenerator.nextId())
+        return id
+    }
+
+    fun containGlobalStuff(id: Int): Boolean {
+        return mGlobalStuffMap.containsKey(id)
+    }
+
+    fun getGlobalStuff(id: Int): Any? {
+        return mGlobalStuffMap[id]
+    }
+
+    fun removeGlobalStuff(id: Int): Any? {
+        return mGlobalStuffMap.remove(id)
+    }
+
+    fun removeGlobalStuff(o: Any) {
+        mGlobalStuffMap.values.removeAll(setOf(o))
+    }
+
+    fun registerActivity(activity: Activity) {
+        mActivityList.add(activity)
+    }
+
+    fun unregisterActivity(activity: Activity) {
+        mActivityList.remove(activity)
+    }
+
    override fun onPause(owner: LifecycleOwner) {
-        if (!locked) {
+        if (!locked)
            locked_last_leave_time = System.currentTimeMillis() / 1000
-        }
        locked = true
    }

+    @OptIn(ExperimentalCoroutinesApi::class)
    override fun newImageLoader(): ImageLoader {
        return ImageLoader.Builder(this).apply {
-            okHttpClient(nonCacheOkHttpClient)
-            components { add(MergeInterceptor) }
-            diskCache(imageCache)
-            crossfade(300)
-            error(R.drawable.image_failed)
-            if (BuildConfig.DEBUG) logger(DebugLogger())
+            okHttpClient(okHttpClient)
+            allowRgb565(getSystemService<ActivityManager>()!!.isLowRamDevice)
+            // Coil spawns a new thread for every image load by default
+            fetcherDispatcher(Dispatchers.IO.limitedParallelism(8))
+            decoderDispatcher(Dispatchers.IO.limitedParallelism(2))
+            transformationDispatcher(Dispatchers.IO.limitedParallelism(2))
+            crossfade(true)
        }.build()
    }

    companion object {
+        private const val KEY_GLOBAL_STUFF_NEXT_ID = "global_stuff_next_id"
        var locked = true
        var locked_last_leave_time: Long = 0

+        @JvmStatic
        lateinit var application: EhApplication
            private set

+        @JvmStatic
+        val ehCookieStore by lazy { EhCookieStore }
+
+        @JvmStatic
        val ehProxySelector by lazy { EhProxySelector() }

-        val nonCacheOkHttpClient by lazy {
-            OkHttpClient.Builder().apply {
-                cookieJar(EhCookieStore)
-                dns(EhDns)
-                proxySelector(ehProxySelector)
-                if (Settings.dF) {
-                    val factory =
-                        TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())!!
-                    factory.init(null as KeyStore?)
-                    val manager = factory.trustManagers!!
-                    val trustManager = manager.filterIsInstance<X509TrustManager>().first()
-                    sslSocketFactory(EhSSLSocketFactory, trustManager)
-                    proxy(Proxy.NO_PROXY)
-                }
-            }.build()
-        }
-
-        // Never use this okhttp client to download large blobs!!!
+        @JvmStatic
        val okHttpClient by lazy {
-            nonCacheOkHttpClient.newBuilder().cache(
-                Cache(
-                    application.cacheDir.toOkioPath() / "http_cache",
-                    20L * 1024L * 1024L,
-                    FileSystem.SYSTEM,
-                ),
-            ).build()
+            val builder = OkHttpClient.Builder()
+                .cookieJar(ehCookieStore)
+                .dns(EhDns)
+                .proxySelector(ehProxySelector)
+
+            if (Settings.getDF()) {
+                val factory =
+                    TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())!!
+                factory.init(null as KeyStore?)
+                val manager = factory.trustManagers!!
+
+                val trustManager = manager.filterIsInstance<X509TrustManager>().first()
+                builder.sslSocketFactory(EhSSLSocketFactory, trustManager)
+                builder.proxy(Proxy.NO_PROXY)
+            }
+            builder.build()
        }

+        @JvmStatic
        val galleryDetailCache by lazy {
            LruCache<Long, GalleryDetail>(25).also {
                favouriteStatusRouter.addListener { gid, slot ->
@@ -190,19 +300,19 @@ class EhApplication : Application(), DefaultLifecycleObserver, ImageLoaderFactor
            }
        }

+        @JvmStatic
+        val downloadManager by lazy { DownloadManager }
+
+        @JvmStatic
        val hosts by lazy { Hosts(application, "hosts.db") }

+        @JvmStatic
        val favouriteStatusRouter by lazy { FavouriteStatusRouter() }

+        @JvmStatic
        val readerPreferences by lazy { ReaderPreferences(AndroidPreferenceStore(application)) }

+        @JvmStatic
        val ehDatabase by lazy { buildMainDB(application) }
-
-        val imageCache by lazy {
-            diskCache {
-                directory(application.cacheDir.toOkioPath() / "image_cache")
-                maxSizeBytes(Settings.readCacheSize.coerceIn(320, 5120).toLong() * 1024 * 1024)
-            }
-        }
    }
 }
@@ -0,0 +1,591 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hippo.ehviewer;
+
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.paging.PagingSource;
+import androidx.room.Room;
+
+import com.hippo.ehviewer.client.data.GalleryInfo;
+import com.hippo.ehviewer.dao.BasicDao;
+import com.hippo.ehviewer.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.HistoryDao;
+import com.hippo.ehviewer.dao.HistoryInfo;
+import com.hippo.ehviewer.dao.LocalFavoriteInfo;
+import com.hippo.ehviewer.dao.LocalFavoritesDao;
+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.yorozuya.IOUtils;
+import com.hippo.yorozuya.ObjectUtils;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+public class EhDB {
+    private static final int CUR_DB_VER = 4;
+
+    private static final EhDatabase db = EhApplication.getEhDatabase();
+
+    private static void upgradeDB(SQLiteDatabase db, int oldVersion) {
+        switch (oldVersion) {
+            case 1: // 1 to 2, add FILTER
+                db.execSQL("CREATE TABLE IF NOT EXISTS \"FILTER\" (" + //
+                        "\"_id\" INTEGER PRIMARY KEY ," + // 0: id
+                        "\"MODE\" INTEGER NOT NULL ," + // 1: mode
+                        "\"TEXT\" TEXT," + // 2: text
+                        "\"ENABLE\" INTEGER);"); // 3: enable
+            case 2: // 2 to 3, add ENABLE column to table FILTER
+                db.execSQL("CREATE TABLE " + "\"FILTER2\" (" +
+                        "\"_id\" INTEGER PRIMARY KEY ," +
+                        "\"MODE\" INTEGER NOT NULL ," +
+                        "\"TEXT\" TEXT," +
+                        "\"ENABLE\" INTEGER);");
+                db.execSQL("INSERT INTO \"FILTER2\" (" +
+                        "_id, MODE, TEXT, ENABLE)" +
+                        "SELECT _id, MODE, TEXT, 1 FROM FILTER;");
+                db.execSQL("DROP TABLE FILTER");
+                db.execSQL("ALTER TABLE FILTER2 RENAME TO FILTER");
+            case 3: // 3 to 4, add PAGE_FROM and PAGE_TO column to QUICK_SEARCH
+                db.execSQL("CREATE TABLE " + "\"QUICK_SEARCH2\" (" +
+                        "\"_id\" INTEGER PRIMARY KEY ," +
+                        "\"NAME\" TEXT," +
+                        "\"MODE\" INTEGER NOT NULL ," +
+                        "\"CATEGORY\" INTEGER NOT NULL ," +
+                        "\"KEYWORD\" TEXT," +
+                        "\"ADVANCE_SEARCH\" INTEGER NOT NULL ," +
+                        "\"MIN_RATING\" INTEGER NOT NULL ," +
+                        "\"PAGE_FROM\" INTEGER NOT NULL ," +
+                        "\"PAGE_TO\" INTEGER NOT NULL ," +
+                        "\"TIME\" INTEGER NOT NULL );");
+                db.execSQL("INSERT INTO \"QUICK_SEARCH2\" (" +
+                        "_id, NAME, MODE, CATEGORY, KEYWORD, ADVANCE_SEARCH, MIN_RATING, PAGE_FROM, PAGE_TO, TIME)" +
+                        "SELECT _id, NAME, MODE, CATEGORY, KEYWORD, ADVANCE_SEARCH, MIN_RATING, -1, -1, TIME FROM QUICK_SEARCH;");
+                db.execSQL("DROP TABLE QUICK_SEARCH");
+                db.execSQL("ALTER TABLE QUICK_SEARCH2 RENAME TO QUICK_SEARCH");
+        }
+    }
+
+    public static synchronized List<DownloadInfo> getAllDownloadInfo() {
+        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) {
+                info.state = DownloadInfo.STATE_NONE;
+            }
+        }
+        return list;
+    }
+
+    public static synchronized void updateDownloadInfo(List<DownloadInfo> downloadInfos) {
+        DownloadsDao dao = db.downloadsDao();
+        dao.update(downloadInfos);
+    }
+
+    // Insert or update
+    public static synchronized void putDownloadInfo(DownloadInfo downloadInfo) {
+        DownloadsDao dao = db.downloadsDao();
+        if (null != dao.load(downloadInfo.getGid())) {
+            // Update
+            dao.update(downloadInfo);
+        } else {
+            // Insert
+            dao.insert(downloadInfo);
+        }
+    }
+
+    public static synchronized void removeDownloadInfo(DownloadInfo downloadInfo) {
+        db.downloadsDao().delete(downloadInfo);
+    }
+
+    @Nullable
+    public static synchronized String getDownloadDirname(long gid) {
+        DownloadDirnameDao dao = db.downloadDirnameDao();
+        DownloadDirname raw = dao.load(gid);
+        if (raw != null) {
+            return raw.getDirname();
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Insert or update
+     */
+    public static synchronized void putDownloadDirname(long gid, String dirname) {
+        DownloadDirnameDao dao = db.downloadDirnameDao();
+        DownloadDirname raw = dao.load(gid);
+        if (raw != null) { // Update
+            raw.setDirname(dirname);
+            dao.update(raw);
+        } else { // Insert
+            raw = new DownloadDirname();
+            raw.setGid(gid);
+            raw.setDirname(dirname);
+            dao.insert(raw);
+        }
+    }
+
+    public static synchronized void removeDownloadDirname(long gid) {
+        DownloadDirnameDao dao = db.downloadDirnameDao();
+        dao.deleteByKey(gid);
+    }
+
+    public static synchronized void clearDownloadDirname() {
+        DownloadDirnameDao dao = db.downloadDirnameDao();
+        dao.deleteAll();
+    }
+
+    @NonNull
+    public static synchronized List<DownloadLabel> getAllDownloadLabelList() {
+        DownloadLabelDao dao = db.downloadLabelDao();
+        return dao.list();
+    }
+
+    public static synchronized DownloadLabel addDownloadLabel(String label) {
+        DownloadLabelDao dao = db.downloadLabelDao();
+        DownloadLabel raw = new DownloadLabel();
+        raw.setLabel(label);
+        raw.setTime(System.currentTimeMillis());
+        raw.setId(dao.insert(raw));
+        return raw;
+    }
+
+    public static synchronized DownloadLabel addDownloadLabel(DownloadLabel raw) {
+        // Reset id
+        raw.setId(null);
+        DownloadLabelDao dao = db.downloadLabelDao();
+        raw.setId(dao.insert(raw));
+        return raw;
+    }
+
+    public static synchronized void updateDownloadLabel(DownloadLabel raw) {
+        DownloadLabelDao dao = db.downloadLabelDao();
+        dao.update(raw);
+    }
+
+    public static synchronized void moveDownloadLabel(int fromPosition, int toPosition) {
+        if (fromPosition == toPosition) {
+            return;
+        }
+
+        boolean reverse = fromPosition > toPosition;
+        int offset = reverse ? toPosition : fromPosition;
+        int limit = reverse ? fromPosition - toPosition + 1 : toPosition - fromPosition + 1;
+
+        DownloadLabelDao dao = db.downloadLabelDao();
+        List<DownloadLabel> list = dao.list(offset, limit);
+
+        int step = reverse ? 1 : -1;
+        int start = reverse ? limit - 1 : 0;
+        int end = reverse ? 0 : limit - 1;
+        long toTime = list.get(end).getTime();
+        for (int i = end; reverse ? i < start : i > start; i += step) {
+            list.get(i).setTime(list.get(i + step).getTime());
+        }
+        list.get(start).setTime(toTime);
+
+        dao.update(list);
+    }
+
+    public static synchronized void removeDownloadLabel(DownloadLabel raw) {
+        DownloadLabelDao dao = db.downloadLabelDao();
+        dao.delete(raw);
+    }
+
+    public static synchronized List<GalleryInfo> getAllLocalFavorites() {
+        LocalFavoritesDao dao = db.localFavoritesDao();
+        List<LocalFavoriteInfo> list = dao.list();
+        return new ArrayList<>(list);
+    }
+
+    public static synchronized List<GalleryInfo> searchLocalFavorites(String query) {
+        LocalFavoritesDao dao = db.localFavoritesDao();
+        List<LocalFavoriteInfo> list = dao.list("%" + query + "%");
+        return new ArrayList<>(list);
+    }
+
+    public static synchronized void removeLocalFavorites(long gid) {
+        db.localFavoritesDao().deleteByKey(gid);
+    }
+
+    public static synchronized void removeLocalFavorites(long[] gidArray) {
+        LocalFavoritesDao dao = db.localFavoritesDao();
+        for (long gid : gidArray) {
+            dao.deleteByKey(gid);
+        }
+    }
+
+    public static synchronized boolean containLocalFavorites(long gid) {
+        LocalFavoritesDao dao = db.localFavoritesDao();
+        return null != dao.load(gid);
+    }
+
+    public static synchronized void putLocalFavorites(GalleryInfo galleryInfo) {
+        LocalFavoritesDao dao = db.localFavoritesDao();
+        if (null == dao.load(galleryInfo.getGid())) {
+            LocalFavoriteInfo info;
+            if (galleryInfo instanceof LocalFavoriteInfo) {
+                info = (LocalFavoriteInfo) galleryInfo;
+            } else {
+                info = new LocalFavoriteInfo(galleryInfo);
+                info.time = System.currentTimeMillis();
+            }
+            dao.insert(info);
+        }
+    }
+
+    public static synchronized void putLocalFavorites(List<GalleryInfo> galleryInfoList) {
+        for (GalleryInfo gi : galleryInfoList) {
+            putLocalFavorites(gi);
+        }
+    }
+
+    public static synchronized List<QuickSearch> getAllQuickSearch() {
+        QuickSearchDao dao = db.quickSearchDao();
+        return dao.list();
+    }
+
+    public static synchronized void insertQuickSearch(QuickSearch quickSearch) {
+        QuickSearchDao dao = db.quickSearchDao();
+        quickSearch.setId(null);
+        quickSearch.setTime(System.currentTimeMillis());
+        quickSearch.setId(dao.insert(quickSearch));
+    }
+
+    public static synchronized void importQuickSearch(List<QuickSearch> quickSearchList) {
+        QuickSearchDao dao = db.quickSearchDao();
+        for (QuickSearch quickSearch : quickSearchList) {
+            dao.insert(quickSearch);
+        }
+    }
+
+    public static synchronized void deleteQuickSearch(QuickSearch quickSearch) {
+        QuickSearchDao dao = db.quickSearchDao();
+        dao.delete(quickSearch);
+    }
+
+    public static synchronized void moveQuickSearch(int fromPosition, int toPosition) {
+        if (fromPosition == toPosition) {
+            return;
+        }
+
+        boolean reverse = fromPosition > toPosition;
+        int offset = reverse ? toPosition : fromPosition;
+        int limit = reverse ? fromPosition - toPosition + 1 : toPosition - fromPosition + 1;
+
+        QuickSearchDao dao = db.quickSearchDao();
+        List<QuickSearch> list = dao.list(offset, limit);
+
+        int step = reverse ? 1 : -1;
+        int start = reverse ? limit - 1 : 0;
+        int end = reverse ? 0 : limit - 1;
+        long toTime = list.get(end).getTime();
+        for (int i = end; reverse ? i < start : i > start; i += step) {
+            list.get(i).setTime(list.get(i + step).getTime());
+        }
+        list.get(start).setTime(toTime);
+
+        dao.update(list);
+    }
+
+    public static synchronized PagingSource<Integer, HistoryInfo> getHistoryLazyList() {
+        return db.historyDao().listLazy();
+    }
+
+    public static synchronized void putHistoryInfo(GalleryInfo galleryInfo) {
+        HistoryDao dao = db.historyDao();
+        HistoryInfo info;
+        if (galleryInfo instanceof HistoryInfo) {
+            info = (HistoryInfo) galleryInfo;
+        } else {
+            info = new HistoryInfo(galleryInfo);
+        }
+        info.time = System.currentTimeMillis();
+        if (null != dao.load(info.getGid())) {
+            dao.update(info);
+        } else {
+            dao.insert(info);
+        }
+    }
+
+    public static synchronized void putHistoryInfoNonRefresh(GalleryInfo info) {
+        HistoryDao dao = db.historyDao();
+        var i = dao.load(info.getGid());
+        if (null != i) {
+            HistoryInfo historyInfo;
+            if (info instanceof HistoryInfo) {
+                historyInfo = (HistoryInfo) info;
+            } else {
+                historyInfo = new HistoryInfo(info);
+                historyInfo.time = i.time;
+            }
+            dao.update(historyInfo);
+        }
+    }
+
+    public static synchronized void putHistoryInfo(List<HistoryInfo> historyInfoList) {
+        HistoryDao dao = db.historyDao();
+        for (HistoryInfo info : historyInfoList) {
+            if (null == dao.load(info.getGid())) {
+                dao.insert(info);
+            }
+        }
+    }
+
+    public static synchronized void deleteHistoryInfo(HistoryInfo info) {
+        HistoryDao dao = db.historyDao();
+        dao.delete(info);
+    }
+
+    public static synchronized void clearHistoryInfo() {
+        HistoryDao dao = db.historyDao();
+        dao.deleteAll();
+    }
+
+    public static synchronized List<Filter> getAllFilter() {
+        return db.filterDao().list();
+    }
+
+    public static synchronized boolean addFilter(Filter filter) {
+        Filter existFilter;
+        try {
+            existFilter = db.filterDao().load(filter.text, filter.mode);
+        } catch (Exception e) {
+            existFilter = null;
+        }
+        if (existFilter == null) {
+            filter.setId(null);
+            filter.setId(db.filterDao().insert(filter));
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public static synchronized void deleteFilter(Filter filter) {
+        db.filterDao().delete(filter);
+    }
+
+    public static synchronized void triggerFilter(Filter filter) {
+        filter.enable = !filter.enable;
+        db.filterDao().update(filter);
+    }
+
+    private static <T> void copyDao(BasicDao<T> from, BasicDao<T> to) {
+        List<T> list = from.list();
+        for (T item : list)
+            to.insert(item);
+    }
+
+    public static synchronized boolean exportDB(Context context, Uri uri) {
+        final String ehExportName = "eh.export.db";
+
+        // Delete old export db
+        context.deleteDatabase(ehExportName);
+        EhDatabase newDb = Room.databaseBuilder(context, EhDatabase.class, ehExportName).allowMainThreadQueries().build();
+
+        try {
+            // Copy data to a export db
+            copyDao(db.downloadsDao(), newDb.downloadsDao());
+            copyDao(db.downloadLabelDao(), newDb.downloadLabelDao());
+            copyDao(db.downloadDirnameDao(), newDb.downloadDirnameDao());
+            copyDao(db.historyDao(), newDb.historyDao());
+            copyDao(db.quickSearchDao(), newDb.quickSearchDao());
+            copyDao(db.localFavoritesDao(), newDb.localFavoritesDao());
+            copyDao(db.filterDao(), newDb.filterDao());
+
+            // Close export db so we can copy it
+            if (newDb.isOpen()) {
+                newDb.close();
+            }
+
+            // Copy export db to data dir
+            File dbFile = context.getDatabasePath(ehExportName);
+            if (dbFile == null || !dbFile.isFile()) {
+                return false;
+            }
+            InputStream is = null;
+            OutputStream os = null;
+            try {
+                is = new FileInputStream(dbFile);
+                os = context.getContentResolver().openOutputStream(uri);
+                IOUtils.copy(is, os);
+                return true;
+            } catch (IOException e) {
+                e.printStackTrace();
+            } finally {
+                IOUtils.closeQuietly(is);
+                IOUtils.closeQuietly(os);
+            }
+
+            // Delete failed file
+            return false;
+        } finally {
+            context.deleteDatabase(ehExportName);
+        }
+    }
+
+    /**
+     * @return error string, null for no error
+     */
+    public static synchronized String importDB(Context context, Uri uri) {
+        try {
+            InputStream inputStream = context.getContentResolver().openInputStream(uri);
+
+            // Copy file to cache dir
+            File file = File.createTempFile("importDatabase", "");
+            FileOutputStream outputStream = new FileOutputStream(file);
+            byte[] buff = new byte[1024];
+            int read;
+            if (inputStream != null) {
+                while ((read = inputStream.read(buff, 0, buff.length)) > 0) {
+                    outputStream.write(buff, 0, read);
+                }
+            } else {
+                return context.getString(R.string.cant_read_the_file);
+            }
+            inputStream.close();
+            outputStream.close();
+
+            // Check database version
+            SQLiteDatabase oldDB = SQLiteDatabase.openDatabase(
+                    file.getPath(), null, SQLiteDatabase.NO_LOCALIZED_COLLATORS);
+            int newVersion = CUR_DB_VER;
+            int oldVersion = oldDB.getVersion();
+            if (oldVersion < newVersion) {
+                upgradeDB(oldDB, oldVersion);
+                oldDB.setVersion(newVersion);
+            } else if (oldVersion > newVersion) {
+                return context.getString(R.string.db_version_too_high);
+            }
+
+            // Crete temp room database from cache file
+            String tmpDBName = "tmp.db";
+            context.deleteDatabase(tmpDBName);
+            EhDatabase oldRoomDatabase = Room.databaseBuilder(context, EhDatabase.class, tmpDBName)
+                    .createFromFile(file).allowMainThreadQueries().build();
+
+            // Download label
+            DownloadManager manager = EhApplication.getDownloadManager();
+            try {
+                List<DownloadLabel> downloadLabelList = oldRoomDatabase.downloadLabelDao().list();
+                manager.addDownloadLabel(downloadLabelList);
+            } catch (Exception ignored) {
+            }
+
+            // Downloads
+            try {
+                List<DownloadInfo> downloadInfoList = oldRoomDatabase.downloadsDao().list();
+                manager.addDownload(downloadInfoList, false);
+            } catch (Exception ignored) {
+            }
+
+            // Download dirname
+            try {
+                List<DownloadDirname> downloadDirnameList = oldRoomDatabase.downloadDirnameDao().list();
+                for (DownloadDirname dirname : downloadDirnameList) {
+                    putDownloadDirname(dirname.getGid(), dirname.getDirname());
+                }
+            } catch (Exception ignored) {
+            }
+
+            // History
+            try {
+                List<HistoryInfo> historyInfoList = oldRoomDatabase.historyDao().list();
+                putHistoryInfo(historyInfoList);
+            } catch (Exception ignored) {
+            }
+
+            // QuickSearch
+            try {
+                List<QuickSearch> quickSearchList = oldRoomDatabase.quickSearchDao().list();
+                List<QuickSearch> currentQuickSearchList = db.quickSearchDao().list();
+                List<QuickSearch> importList = new ArrayList<>();
+                for (QuickSearch quickSearch : quickSearchList) {
+                    String name = quickSearch.getName();
+                    for (QuickSearch q : currentQuickSearchList) {
+                        if (ObjectUtils.equal(q.getName(), name)) {
+                            // The same name
+                            name = null;
+                            break;
+                        }
+                    }
+                    if (null == name) {
+                        continue;
+                    }
+                    importList.add(quickSearch);
+                }
+                importQuickSearch(importList);
+            } catch (Exception ignored) {
+            }
+
+            // LocalFavorites
+            try {
+                List<LocalFavoriteInfo> localFavoriteInfoList = oldRoomDatabase.localFavoritesDao().list();
+                for (LocalFavoriteInfo info : localFavoriteInfoList) {
+                    putLocalFavorites(info);
+                }
+            } catch (Exception ignored) {
+            }
+
+            // Filter
+            try {
+                List<Filter> filterList = oldRoomDatabase.filterDao().list();
+                List<Filter> currentFilterList = db.filterDao().list();
+                for (Filter filter : filterList) {
+                    if (!currentFilterList.contains(filter)) {
+                        addFilter(filter);
+                    }
+                }
+            } catch (Exception ignored) {
+            }
+
+            // Delete temp database
+            if (oldRoomDatabase.isOpen()) {
+                oldRoomDatabase.close();
+            }
+            context.deleteDatabase(tmpDBName);
+
+            return null;
+        } catch (Throwable e) {
+            ExceptionUtils.throwIfFatal(e);
+            // Ignore
+            return context.getString(R.string.cant_read_the_file);
+        }
+    }
+}
@@ -1,465 +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
-
-import android.content.Context
-import android.net.Uri
-import android.os.ParcelFileDescriptor
-import android.os.ParcelFileDescriptor.MODE_READ_ONLY
-import androidx.paging.PagingSource
-import androidx.room.Room.databaseBuilder
-import com.hippo.ehviewer.EhApplication.Companion.ehDatabase
-import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.dao.BasicDao
-import com.hippo.ehviewer.dao.DownloadDirname
-import com.hippo.ehviewer.dao.DownloadInfo
-import com.hippo.ehviewer.dao.DownloadLabel
-import com.hippo.ehviewer.dao.EHDB_MIGRATION_4_5
-import com.hippo.ehviewer.dao.EhDatabase
-import com.hippo.ehviewer.dao.Filter
-import com.hippo.ehviewer.dao.HistoryInfo
-import com.hippo.ehviewer.dao.LocalFavoriteInfo
-import com.hippo.ehviewer.dao.QuickSearch
-import com.hippo.ehviewer.download.DownloadManager
-import com.hippo.ehviewer.util.sendTo
-
-object EhDB {
-    private const val CUR_DB_VER = 4
-    private val db = ehDatabase
-
-    // Fix state
-    @get:Synchronized
-    val allDownloadInfo: List<DownloadInfo>
-        get() = db.downloadsDao().list().onEach {
-            if (it.state == DownloadInfo.STATE_WAIT || it.state == DownloadInfo.STATE_DOWNLOAD) {
-                it.state = DownloadInfo.STATE_NONE
-            }
-        }
-
-    @Synchronized
-    fun updateDownloadInfo(downloadInfos: List<DownloadInfo>) {
-        val dao = db.downloadsDao()
-        dao.update(downloadInfos)
-    }
-
-    @Synchronized
-    fun putDownloadInfo(downloadInfo: DownloadInfo) {
-        db.downloadsDao().run {
-            if (load(downloadInfo.gid) != null) {
-                update(downloadInfo)
-            } else {
-                insert(downloadInfo)
-            }
-        }
-    }
-
-    @Synchronized
-    fun removeDownloadInfo(downloadInfo: DownloadInfo) {
-        db.downloadsDao().delete(downloadInfo)
-    }
-
-    @Synchronized
-    fun getDownloadDirname(gid: Long): String? {
-        val dao = db.downloadDirnameDao()
-        val raw = dao.load(gid)
-        return raw?.dirname
-    }
-
-    @Synchronized
-    fun putDownloadDirname(gid: Long, dirname: String?) {
-        val dao = db.downloadDirnameDao()
-        var raw = dao.load(gid)
-        if (raw != null) {
-            raw.dirname = dirname
-            dao.update(raw)
-        } else {
-            raw = DownloadDirname(gid, dirname)
-            dao.insert(raw)
-        }
-    }
-
-    @Synchronized
-    fun removeDownloadDirname(gid: Long) {
-        val dao = db.downloadDirnameDao()
-        dao.deleteByKey(gid)
-    }
-
-    @Synchronized
-    fun clearDownloadDirname() {
-        val dao = db.downloadDirnameDao()
-        dao.deleteAll()
-    }
-
-    @get:Synchronized
-    val allDownloadLabelList: List<DownloadLabel>
-        get() = db.downloadLabelDao().list()
-
-    @Synchronized
-    fun addDownloadLabel(label: String): DownloadLabel {
-        val dao = db.downloadLabelDao()
-        val raw = DownloadLabel()
-        raw.label = label
-        raw.time = System.currentTimeMillis()
-        raw.id = dao.insert(raw)
-        return raw
-    }
-
-    @Synchronized
-    fun addDownloadLabel(raw: DownloadLabel): DownloadLabel {
-        // Reset id
-        raw.id = null
-        val dao = db.downloadLabelDao()
-        raw.id = dao.insert(raw)
-        return raw
-    }
-
-    @Synchronized
-    fun updateDownloadLabel(raw: DownloadLabel?) {
-        val dao = db.downloadLabelDao()
-        dao.update(raw!!)
-    }
-
-    @Synchronized
-    fun moveDownloadLabel(fromPosition: Int, toPosition: Int) {
-        if (fromPosition == toPosition) {
-            return
-        }
-        val reverse = fromPosition > toPosition
-        val offset = if (reverse) toPosition else fromPosition
-        val limit = if (reverse) fromPosition - toPosition + 1 else toPosition - fromPosition + 1
-        val dao = db.downloadLabelDao()
-        val list = dao.list(offset, limit)
-        val step = if (reverse) 1 else -1
-        val start = if (reverse) limit - 1 else 0
-        val end = if (reverse) 0 else limit - 1
-        val toTime = list[end].time
-        var i = end
-        while (if (reverse) i < start else i > start) {
-            list[i].time = list[i + step].time
-            i += step
-        }
-        list[start].time = toTime
-        dao.update(list)
-    }
-
-    @Synchronized
-    fun removeDownloadLabel(raw: DownloadLabel?) {
-        val dao = db.downloadLabelDao()
-        dao.delete(raw!!)
-    }
-
-    @get:Synchronized
-    val allLocalFavorites: List<GalleryInfo>
-        get() {
-            val dao = db.localFavoritesDao()
-            val list = dao.list()
-            return ArrayList<GalleryInfo>(list)
-        }
-
-    @Synchronized
-    fun searchLocalFavorites(query: String): List<GalleryInfo> {
-        val dao = db.localFavoritesDao()
-        val list = dao.list("%$query%")
-        return ArrayList<GalleryInfo>(list)
-    }
-
-    @Synchronized
-    fun removeLocalFavorites(gid: Long) {
-        db.localFavoritesDao().deleteByKey(gid)
-    }
-
-    @Synchronized
-    fun removeLocalFavorites(gidArray: LongArray) {
-        val dao = db.localFavoritesDao()
-        for (gid in gidArray) {
-            dao.deleteByKey(gid)
-        }
-    }
-
-    @JvmStatic
-    @Synchronized
-    fun containLocalFavorites(gid: Long): Boolean {
-        val dao = db.localFavoritesDao()
-        return dao.contains(gid)
-    }
-
-    @Synchronized
-    fun putLocalFavorites(galleryInfo: GalleryInfo) {
-        val dao = db.localFavoritesDao()
-        if (null == dao.load(galleryInfo.gid)) {
-            val info: LocalFavoriteInfo
-            if (galleryInfo is LocalFavoriteInfo) {
-                info = galleryInfo
-            } else {
-                info = LocalFavoriteInfo(galleryInfo)
-                info.time = System.currentTimeMillis()
-            }
-            dao.insert(info)
-        }
-    }
-
-    @Synchronized
-    fun putLocalFavorites(galleryInfoList: List<GalleryInfo>) {
-        for (gi in galleryInfoList) {
-            putLocalFavorites(gi)
-        }
-    }
-
-    @get:Synchronized
-    val allQuickSearch: List<QuickSearch>
-        get() {
-            val dao = db.quickSearchDao()
-            return dao.list()
-        }
-
-    @Synchronized
-    fun insertQuickSearch(quickSearch: QuickSearch) {
-        val dao = db.quickSearchDao()
-        quickSearch.id = null
-        quickSearch.time = System.currentTimeMillis()
-        quickSearch.id = dao.insert(quickSearch)
-    }
-
-    @Synchronized
-    fun importQuickSearch(quickSearchList: List<QuickSearch?>) {
-        val dao = db.quickSearchDao()
-        for (quickSearch in quickSearchList) {
-            dao.insert(quickSearch!!)
-        }
-    }
-
-    @Synchronized
-    fun deleteQuickSearch(quickSearch: QuickSearch?) {
-        val dao = db.quickSearchDao()
-        if (quickSearch != null) {
-            dao.delete(quickSearch)
-        }
-    }
-
-    @Synchronized
-    fun moveQuickSearch(fromPosition: Int, toPosition: Int) {
-        if (fromPosition == toPosition) {
-            return
-        }
-        val reverse = fromPosition > toPosition
-        val offset = if (reverse) toPosition else fromPosition
-        val limit = if (reverse) fromPosition - toPosition + 1 else toPosition - fromPosition + 1
-        val dao = db.quickSearchDao()
-        val list = dao.list(offset, limit)
-        val step = if (reverse) 1 else -1
-        val start = if (reverse) limit - 1 else 0
-        val end = if (reverse) 0 else limit - 1
-        val toTime = list[end].time
-        var i = end
-        while (if (reverse) i < start else i > start) {
-            list[i].time = list[i + step].time
-            i += step
-        }
-        list[start].time = toTime
-        dao.update(list)
-    }
-
-    @get:Synchronized
-    val historyLazyList: PagingSource<Int, HistoryInfo>
-        get() = db.historyDao().listLazy()
-
-    @Synchronized
-    fun putHistoryInfo(galleryInfo: GalleryInfo?) {
-        val dao = db.historyDao()
-        val info: HistoryInfo = if (galleryInfo is HistoryInfo) {
-            galleryInfo
-        } else {
-            HistoryInfo(galleryInfo!!)
-        }
-        info.time = System.currentTimeMillis()
-        if (null != dao.load(info.gid)) {
-            dao.update(info)
-        } else {
-            dao.insert(info)
-        }
-    }
-
-    @Synchronized
-    fun putHistoryInfoNonRefresh(info: GalleryInfo) {
-        val dao = db.historyDao()
-        val i = dao.load(info.gid)
-        if (null != i) {
-            val historyInfo: HistoryInfo
-            if (info is HistoryInfo) {
-                historyInfo = info
-            } else {
-                historyInfo = HistoryInfo(info)
-                historyInfo.time = i.time
-            }
-            dao.update(historyInfo)
-        }
-    }
-
-    @Synchronized
-    fun putHistoryInfo(historyInfoList: List<HistoryInfo>) {
-        val dao = db.historyDao()
-        for (info in historyInfoList) {
-            if (null == dao.load(info.gid)) {
-                dao.insert(info)
-            }
-        }
-    }
-
-    @Synchronized
-    fun deleteHistoryInfo(info: HistoryInfo?) {
-        val dao = db.historyDao()
-        dao.delete(info!!)
-    }
-
-    @Synchronized
-    fun clearHistoryInfo() {
-        val dao = db.historyDao()
-        dao.deleteAll()
-    }
-
-    @get:Synchronized
-    val allFilter: List<Filter>
-        get() = db.filterDao().list()
-
-    @Synchronized
-    fun addFilter(filter: Filter): Boolean {
-        val existFilter: Filter? = try {
-            db.filterDao().load(filter.text!!, filter.mode)
-        } catch (e: Exception) {
-            null
-        }
-        return if (existFilter == null) {
-            filter.id = null
-            filter.id = db.filterDao().insert(filter)
-            true
-        } else {
-            false
-        }
-    }
-
-    @Synchronized
-    fun deleteFilter(filter: Filter) {
-        db.filterDao().delete(filter)
-    }
-
-    @Synchronized
-    fun triggerFilter(filter: Filter) {
-        filter.enable = filter.enable?.not() ?: false
-        db.filterDao().update(filter)
-    }
-
-    private fun <T> copyDao(from: BasicDao<T>, to: BasicDao<T>) {
-        val list = from.list()
-        for (item in list) to.insert(item)
-    }
-
-    @Synchronized
-    fun exportDB(context: Context, uri: Uri): Boolean {
-        val ehExportName = "eh.export.db"
-        runCatching {
-            context.deleteDatabase(ehExportName)
-            val newDb = databaseBuilder(context, EhDatabase::class.java, ehExportName).build()
-            copyDao(db.downloadsDao(), newDb.downloadsDao())
-            copyDao(db.downloadLabelDao(), newDb.downloadLabelDao())
-            copyDao(db.downloadDirnameDao(), newDb.downloadDirnameDao())
-            copyDao(db.historyDao(), newDb.historyDao())
-            copyDao(db.quickSearchDao(), newDb.quickSearchDao())
-            copyDao(db.localFavoritesDao(), newDb.localFavoritesDao())
-            copyDao(db.filterDao(), newDb.filterDao())
-            newDb.close()
-            val dbFile = context.getDatabasePath(ehExportName)
-            context.contentResolver.openFileDescriptor(uri, "rw")!!.use { toFd ->
-                ParcelFileDescriptor.open(dbFile, MODE_READ_ONLY).use { fromFd ->
-                    fromFd sendTo toFd
-                }
-            }
-            return true
-        }.onFailure {
-            it.printStackTrace()
-        }
-        return false
-    }
-
-    /**
-     * @return error string, null for no error
-     */
-    @Synchronized
-    fun importDB(context: Context, uri: Uri): String? {
-        runCatching {
-            val oldDB = databaseBuilder(context, EhDatabase::class.java, "tmp.db")
-                .createFromInputStream { context.contentResolver.openInputStream(uri) }
-                .addMigrations(EHDB_MIGRATION_4_5)
-                .build()
-
-            // Download label
-            val manager = DownloadManager
-            runCatching {
-                val downloadLabelList = oldDB.downloadLabelDao().list()
-                manager.addDownloadLabel(downloadLabelList)
-            }
-
-            // Downloads
-            runCatching {
-                val downloadInfoList = oldDB.downloadsDao().list()
-                manager.addDownload(downloadInfoList, false)
-            }
-
-            // Download dirname
-            runCatching {
-                oldDB.downloadDirnameDao().list().forEach {
-                    putDownloadDirname(it.gid, it.dirname)
-                }
-            }
-
-            // History
-            runCatching {
-                val historyInfoList = oldDB.historyDao().list()
-                putHistoryInfo(historyInfoList)
-            }
-
-            // QuickSearch
-            runCatching {
-                val quickSearchList = oldDB.quickSearchDao().list()
-                val currentQuickSearchList = db.quickSearchDao().list()
-                val importList = quickSearchList.mapNotNull { newQS ->
-                    newQS.takeIf { currentQuickSearchList.find { it.name == newQS.name } == null }
-                }
-                importQuickSearch(importList)
-            }
-
-            // LocalFavorites
-            runCatching {
-                oldDB.localFavoritesDao().list().forEach {
-                    putLocalFavorites(it)
-                }
-            }
-
-            // Filter
-            runCatching {
-                val filterList = oldDB.filterDao().list()
-                val currentFilterList = db.filterDao().list()
-                filterList.forEach {
-                    if (it !in currentFilterList) addFilter(it)
-                }
-            }
-            oldDB.close()
-        }.onFailure {
-            it.printStackTrace()
-            return context.getString(R.string.cant_read_the_file)
-        }
-        return null
-    }
-}
@@ -0,0 +1,110 @@
+/*
+ * 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;
+
+import android.text.TextUtils;
+
+import com.hippo.network.InetValidator;
+import com.hippo.util.ExceptionUtils;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.ProxySelector;
+import java.net.SocketAddress;
+import java.net.URI;
+import java.util.Collections;
+import java.util.List;
+
+public class EhProxySelector extends ProxySelector {
+
+    public static final int TYPE_DIRECT = 0;
+    public static final int TYPE_SYSTEM = 1;
+    public static final int TYPE_HTTP = 2;
+    public static final int TYPE_SOCKS = 3;
+
+    private ProxySelector delegation;
+    private ProxySelector alternative;
+
+    EhProxySelector() {
+        alternative = ProxySelector.getDefault();
+        if (alternative == null) {
+            alternative = new NullProxySelector();
+        }
+
+        updateProxy();
+    }
+
+    public void updateProxy() {
+        switch (Settings.getProxyType()) {
+            case TYPE_DIRECT:
+                delegation = new NullProxySelector();
+                break;
+            default:
+            case TYPE_SYSTEM:
+                delegation = alternative;
+                break;
+            case TYPE_HTTP:
+            case TYPE_SOCKS:
+                delegation = null;
+                break;
+        }
+    }
+
+    @Override
+    public List<Proxy> select(URI uri) {
+        int type = Settings.getProxyType();
+        if (type == TYPE_HTTP || type == TYPE_SOCKS) {
+            try {
+                String ip = Settings.getProxyIp();
+                int port = Settings.getProxyPort();
+                if (!TextUtils.isEmpty(ip) && InetValidator.isValidInetPort(port)) {
+                    InetAddress inetAddress = InetAddress.getByName(ip);
+                    SocketAddress socketAddress = new InetSocketAddress(inetAddress, port);
+                    return Collections.singletonList(new Proxy(type == TYPE_HTTP ? Proxy.Type.HTTP : Proxy.Type.SOCKS, socketAddress));
+                }
+            } catch (Throwable t) {
+                ExceptionUtils.throwIfFatal(t);
+            }
+        }
+
+        if (delegation != null) {
+            return delegation.select(uri);
+        }
+
+        return alternative.select(uri);
+    }
+
+    @Override
+    public void connectFailed(URI uri, SocketAddress sa, IOException ioe) {
+        if (delegation != null) {
+            delegation.select(uri);
+        }
+    }
+
+    private static class NullProxySelector extends ProxySelector {
+        @Override
+        public List<Proxy> select(URI uri) {
+            return Collections.singletonList(Proxy.NO_PROXY);
+        }
+
+        @Override
+        public void connectFailed(URI uri, SocketAddress sa, IOException ioe) {
+        }
+    }
+}
@@ -1,92 +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
-
-import android.text.TextUtils
-import com.hippo.ehviewer.Settings.proxyIp
-import com.hippo.ehviewer.Settings.proxyPort
-import com.hippo.ehviewer.Settings.proxyType
-import com.hippo.ehviewer.network.InetValidator.isValidInetPort
-import com.hippo.ehviewer.util.ExceptionUtils
-import java.io.IOException
-import java.net.InetAddress
-import java.net.InetSocketAddress
-import java.net.Proxy
-import java.net.ProxySelector
-import java.net.SocketAddress
-import java.net.URI
-
-class EhProxySelector internal constructor() : ProxySelector() {
-    private var delegation: ProxySelector? = null
-    private var alternative: ProxySelector?
-
-    init {
-        alternative = getDefault() ?: NullProxySelector()
-        updateProxy()
-    }
-
-    fun updateProxy() {
-        delegation = when (proxyType) {
-            TYPE_DIRECT -> NullProxySelector()
-            TYPE_SYSTEM -> alternative
-            TYPE_HTTP, TYPE_SOCKS -> null
-            else -> alternative
-        }
-    }
-
-    override fun select(uri: URI): List<Proxy> {
-        val type = proxyType
-        if (type == TYPE_HTTP || type == TYPE_SOCKS) {
-            runCatching {
-                val ip = proxyIp
-                val port = proxyPort
-                if (!TextUtils.isEmpty(ip) && isValidInetPort(port)) {
-                    val inetAddress = InetAddress.getByName(ip)
-                    val socketAddress = InetSocketAddress(inetAddress, port)
-                    return listOf(
-                        Proxy(
-                            if (type == TYPE_HTTP) Proxy.Type.HTTP else Proxy.Type.SOCKS,
-                            socketAddress,
-                        ),
-                    )
-                }
-            }.onFailure {
-                ExceptionUtils.throwIfFatal(it)
-                it.printStackTrace()
-            }
-        }
-        return delegation?.select(uri) ?: alternative!!.select(uri)
-    }
-
-    override fun connectFailed(uri: URI, sa: SocketAddress, ioe: IOException) {
-        delegation?.select(uri)
-    }
-
-    private class NullProxySelector : ProxySelector() {
-        override fun select(uri: URI): List<Proxy> {
-            return listOf(Proxy.NO_PROXY)
-        }
-
-        override fun connectFailed(uri: URI, sa: SocketAddress, ioe: IOException) {}
-    }
-
-    companion object {
-        const val TYPE_DIRECT = 0
-        const val TYPE_SYSTEM = 1
-        const val TYPE_HTTP = 2
-        const val TYPE_SOCKS = 3
-    }
-}
@@ -19,7 +19,7 @@ package com.hippo.ehviewer;
 import android.annotation.SuppressLint;

 import com.hippo.ehviewer.client.data.GalleryInfo;
-import com.hippo.ehviewer.yorozuya.IntIdGenerator;
+import com.hippo.yorozuya.IntIdGenerator;

 import java.util.ArrayList;
 import java.util.HashMap;
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hippo.ehviewer;
+
+import android.content.Context;
+import android.content.res.Resources;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+
+public class GetText {
+
+    private static Resources sResources;
+
+    public static void initialize(Context context) {
+        sResources = context.getApplicationContext().getResources();
+    }
+
+    @NonNull
+    public static String getString(@StringRes int id) {
+        return sResources.getString(id);
+    }
+
+    @NonNull
+    public static String getString(@StringRes int id, Object... formatArgs) {
+        return sResources.getString(id, formatArgs);
+    }
+}
@@ -29,8 +29,8 @@ import android.util.Pair;

 import androidx.annotation.Nullable;

-import com.hippo.ehviewer.database.MSQLiteBuilder;
-import com.hippo.ehviewer.util.SqlUtils;
+import com.hippo.database.MSQLiteBuilder;
+import com.hippo.util.SqlUtils;

 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -0,0 +1,752 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hippo.ehviewer;
+
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.util.Log;
+
+import androidx.annotation.DimenRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.preference.PreferenceManager;
+
+import com.hippo.ehviewer.client.EhConfig;
+import com.hippo.ehviewer.client.data.FavListUrlBuilder;
+import com.hippo.ehviewer.ui.CommonOperations;
+import com.hippo.ehviewer.ui.scene.GalleryListScene;
+import com.hippo.unifile.UniFile;
+import com.hippo.yorozuya.AssertUtils;
+import com.hippo.yorozuya.NumberUtils;
+
+import java.util.Locale;
+import java.util.Set;
+
+public class Settings {
+
+    /********************
+     ****** Eh
+     ********************/
+
+    public static final String KEY_THEME = "theme";
+
+    public static final String KEY_ACCOUNT = "account";
+    public static final String KEY_IMAGE_LIMITS = "image_limits";
+    public static final String KEY_U_CONFIG = "uconfig";
+    public static final String KEY_MY_TAGS = "mytags";
+    public static final String KEY_BLACK_DARK_THEME = "black_dark_theme";
+    public static final int THEME_SYSTEM = -1;
+    public static final String KEY_GALLERY_SITE = "gallery_site";
+    public static final String KEY_LIST_MODE = "list_mode";
+    public static final String KEY_DETAIL_SIZE = "detail_size";
+    public static final String KEY_THUMB_SIZE = "thumb_size_";
+    public static final String KEY_THUMB_RESOLUTION = "thumb_resolution";
+    public static final String KEY_SHOW_JPN_TITLE = "show_jpn_title";
+    public static final String KEY_SHOW_TAG_TRANSLATIONS = "show_tag_translations";
+    public static final String KEY_TAG_TRANSLATIONS_SOURCE = "tag_translations_source";
+    public static final String KEY_DEFAULT_CATEGORIES = "default_categories";
+    public static final int DEFAULT_DEFAULT_CATEGORIES = EhConfig.ALL_CATEGORY;
+    public static final String KEY_EXCLUDED_TAG_NAMESPACES = "excluded_tag_namespaces";
+    public static final String KEY_EXCLUDED_LANGUAGES = "excluded_languages";
+    public static final String KEY_REQUEST_NEWS = "request_news";
+    public static final String KEY_HIDE_HV_EVENTS = "hide_hv_events";
+    public static final String[] SIGN_IN_REQUIRED = {
+            KEY_IMAGE_LIMITS,
+            KEY_GALLERY_SITE,
+            KEY_U_CONFIG,
+            KEY_MY_TAGS,
+            KEY_SHOW_JPN_TITLE,
+            KEY_REQUEST_NEWS,
+            KEY_HIDE_HV_EVENTS
+    };
+    /********************
+     ****** Privacy and Security
+     ********************/
+    public static final String KEY_SEC_SECURITY = "enable_secure";
+    public static final boolean VALUE_SEC_SECURITY = false;
+    /********************
+     ****** Download
+     ********************/
+    public static final String KEY_DOWNLOAD_SAVE_SCHEME = "image_scheme";
+    public static final String KEY_DOWNLOAD_SAVE_AUTHORITY = "image_authority";
+    public static final String KEY_DOWNLOAD_SAVE_PATH = "image_path";
+    public static final String KEY_NOTIFICATION_REQUIRED = "notification_required";
+    public static final String KEY_DOWNLOAD_SAVE_QUERY = "image_query";
+    public static final String KEY_DOWNLOAD_SAVE_FRAGMENT = "image_fragment";
+    public static final String KEY_MEDIA_SCAN = "media_scan";
+    public static final String KEY_IMAGE_RESOLUTION = "image_size";
+    public static final String DEFAULT_IMAGE_RESOLUTION = EhConfig.IMAGE_SIZE_AUTO;
+    public static final int INVALID_DEFAULT_FAV_SLOT = -2;
+    /********************
+     ****** Advanced
+     ********************/
+    public static final String KEY_SAVE_PARSE_ERROR_BODY = "save_parse_error_body";
+    public static final String KEY_SECURITY = "require_unlock";
+    public static final String KEY_SECURITY_DELAY = "require_unlock_delay";
+    public static final String KEY_READ_CACHE_SIZE = "read_cache_size";
+    public static final int DEFAULT_READ_CACHE_SIZE = 320;
+    public static final String KEY_BUILT_IN_HOSTS = "built_in_hosts_2";
+    public static final String KEY_DOMAIN_FRONTING = "domain_fronting";
+    public static final String KEY_BYPASS_VPN = "bypass_vpn";
+    public static final String KEY_LIST_THUMB_SIZE = "list_tile_size";
+    private static final boolean DEFAULT_HIDE_HV_EVENTS = true;
+    private static final String KEY_SHOW_COMMENTS = "show_gallery_comments";
+    private static final boolean DEFAULT_SHOW_COMMENTS = true;
+    private static final String TAG = Settings.class.getSimpleName();
+    private static final String KEY_DISPLAY_NAME = "display_name";
+    private static final String DEFAULT_DISPLAY_NAME = null;
+    private static final int DEFAULT_LIST_THUMB_SIZE = 40;
+    private static final String KEY_AVATAR = "avatar";
+    private static final String KEY_REMOVE_IMAGE_FILES = "include_pic";
+    private static final boolean DEFAULT_REMOVE_IMAGE_FILES = true;
+    private static final String KEY_NEED_SIGN_IN = "need_sign_in";
+    private static final boolean DEFAULT_NEED_SIGN_IN = true;
+    private static final String KEY_SELECT_SITE = "select_site";
+    private static final boolean DEFAULT_SELECT_SITE = true;
+    private static final int DEFAULT_THEME = THEME_SYSTEM;
+    private static final int DEFAULT_GALLERY_SITE = 1;
+    private static final String KEY_LAUNCH_PAGE = "launch_page";
+    private static final int DEFAULT_LAUNCH_PAGE = 0;
+    private static final int DEFAULT_LIST_MODE = 0;
+    private static final int DEFAULT_DETAIL_SIZE = 0;
+    private static final int DEFAULT_THUMB_SIZE = 120;
+    private static final int DEFAULT_THUMB_RESOLUTION = 0;
+    private static final boolean DEFAULT_SHOW_JPN_TITLE = false;
+    private static final String KEY_SHOW_GALLERY_PAGES = "show_gallery_pages";
+    private static final boolean DEFAULT_SHOW_GALLERY_PAGES = false;
+    private static final boolean DEFAULT_SHOW_TAG_TRANSLATIONS = false;
+    private static final int DEFAULT_EXCLUDED_TAG_NAMESPACES = 0;
+    private static final String DEFAULT_EXCLUDED_LANGUAGES = null;
+    private static final String KEY_METERED_NETWORK_WARNING = "cellular_network_warning";
+    private static final boolean DEFAULT_METERED_NETWORK_WARNING = false;
+    private static final String KEY_APP_LINK_VERIFY_TIP = "app_link_verify_tip";
+    private static final boolean DEFAULT_APP_LINK_VERIFY_TIP = false;
+    private static final boolean DEFAULT_MEDIA_SCAN = false;
+    private static final String KEY_RECENT_DOWNLOAD_LABEL = "recent_download_label";
+    private static final String DEFAULT_RECENT_DOWNLOAD_LABEL = null;
+    private static final String KEY_HAS_DEFAULT_DOWNLOAD_LABEL = "has_default_download_label";
+    private static final boolean DEFAULT_HAS_DOWNLOAD_LABEL = false;
+    private static final String KEY_DEFAULT_DOWNLOAD_LABEL = "default_download_label";
+    private static final String DEFAULT_DOWNLOAD_LABEL = null;
+    private static final String KEY_MULTI_THREAD_DOWNLOAD = "download_thread";
+    private static final int DEFAULT_MULTI_THREAD_DOWNLOAD = 3;
+    private static final String KEY_PRELOAD_IMAGE = "preload_image";
+    private static final int DEFAULT_PRELOAD_IMAGE = 5;
+    private static final String KEY_DOWNLOAD_ORIGIN_IMAGE = "download_origin_image";
+    private static final boolean DEFAULT_DOWNLOAD_ORIGIN_IMAGE = false;
+    /********************
+     ****** Favorites
+     ********************/
+    private static final String KEY_FAV_CAT_0 = "fav_cat_0";
+    private static final String KEY_FAV_CAT_1 = "fav_cat_1";
+    private static final String KEY_FAV_CAT_2 = "fav_cat_2";
+    private static final String KEY_FAV_CAT_3 = "fav_cat_3";
+    private static final String KEY_FAV_CAT_4 = "fav_cat_4";
+    private static final String KEY_FAV_CAT_5 = "fav_cat_5";
+    private static final String KEY_FAV_CAT_6 = "fav_cat_6";
+    private static final String KEY_FAV_CAT_7 = "fav_cat_7";
+    private static final String KEY_FAV_CAT_8 = "fav_cat_8";
+    private static final String KEY_FAV_CAT_9 = "fav_cat_9";
+    private static final String DEFAULT_FAV_CAT_0 = "Favorites 0";
+    private static final String DEFAULT_FAV_CAT_1 = "Favorites 1";
+    private static final String DEFAULT_FAV_CAT_2 = "Favorites 2";
+    private static final String DEFAULT_FAV_CAT_3 = "Favorites 3";
+    private static final String DEFAULT_FAV_CAT_4 = "Favorites 4";
+    private static final String DEFAULT_FAV_CAT_5 = "Favorites 5";
+    private static final String DEFAULT_FAV_CAT_6 = "Favorites 6";
+    private static final String DEFAULT_FAV_CAT_7 = "Favorites 7";
+    private static final String DEFAULT_FAV_CAT_8 = "Favorites 8";
+    private static final String DEFAULT_FAV_CAT_9 = "Favorites 9";
+    private static final String KEY_FAV_COUNT_0 = "fav_count_0";
+    private static final String KEY_FAV_COUNT_1 = "fav_count_1";
+    private static final String KEY_FAV_COUNT_2 = "fav_count_2";
+    private static final String KEY_FAV_COUNT_3 = "fav_count_3";
+    private static final String KEY_FAV_COUNT_4 = "fav_count_4";
+    private static final String KEY_FAV_COUNT_5 = "fav_count_5";
+    private static final String KEY_FAV_COUNT_6 = "fav_count_6";
+    private static final String KEY_FAV_COUNT_7 = "fav_count_7";
+    private static final String KEY_FAV_COUNT_8 = "fav_count_8";
+    private static final String KEY_FAV_COUNT_9 = "fav_count_9";
+    private static final String KEY_FAV_LOCAL = "fav_local";
+    private static final String KEY_FAV_CLOUD = "fav_cloud";
+    private static final int DEFAULT_FAV_COUNT = 0;
+    private static final String KEY_RECENT_FAV_CAT = "recent_fav_cat";
+    private static final int DEFAULT_RECENT_FAV_CAT = FavListUrlBuilder.FAV_CAT_ALL;
+    // -1 for local, 0 - 9 for cloud favorite, other for no default fav slot
+    private static final String KEY_DEFAULT_FAV_SLOT = "default_favorite_2";
+    private static final int DEFAULT_DEFAULT_FAV_SLOT = INVALID_DEFAULT_FAV_SLOT;
+    private static final boolean DEFAULT_SAVE_PARSE_ERROR_BODY = true;
+    private static final String KEY_SAVE_CRASH_LOG = "save_crash_log";
+    private static final boolean DEFAULT_SAVE_CRASH_LOG = true;
+    private static final boolean DEFAULT_BUILT_IN_HOSTS = false;
+    private static final boolean DEFAULT_FRONTING = false;
+    private static final boolean DEFAULT_BYPASS_VPN = true;
+    private static final String KEY_PROXY_TYPE = "proxy_type";
+    private static final int DEFAULT_PROXY_TYPE = EhProxySelector.TYPE_SYSTEM;
+    private static final String KEY_PROXY_IP = "proxy_ip";
+    private static final String DEFAULT_PROXY_IP = null;
+    private static final String KEY_PROXY_PORT = "proxy_port";
+    private static final int DEFAULT_PROXY_PORT = -1;
+    private static final String KEY_CLIPBOARD_TEXT_HASH_CODE = "clipboard_text_hash_code";
+    private static final int DEFAULT_CLIPBOARD_TEXT_HASH_CODE = 0;
+    private static final String KEY_DOWNLOAD_DELAY = "download_delay";
+    private static final int DEFAULT_DOWNLOAD_DELAY = 0;
+    private static final boolean DEFAULT_REQUEST_NEWS = true;
+    private static final String KEY_ARCHIVE_PASSWDS = "archive_passwds";
+    private static final String KEY_QS_SAVE_PROGRESS = "qs_save_progress";
+    private static final boolean DEFAULT_QS_SAVE_PROGRESS = true;
+    public static boolean LIST_THUMB_SIZE_INITED = false;
+    public static SharedPreferences sSettingsPre;
+    private static int LIST_THUMB_SIZE = 40;
+    private static EhConfig sEhConfig;
+
+    public static void initialize() {
+        sSettingsPre = PreferenceManager.getDefaultSharedPreferences(EhApplication.getApplication());
+        sEhConfig = loadEhConfig();
+        fixDefaultValue();
+    }
+
+    private static void fixDefaultValue() {
+        if ("CN".equals(Locale.getDefault().getCountry())) {
+            // Enable domain fronting if the country is CN
+            if (!sSettingsPre.contains(KEY_BUILT_IN_HOSTS)) {
+                putBuiltInHosts(true);
+            }
+            if (!sSettingsPre.contains(KEY_DOMAIN_FRONTING)) {
+                putDF(true);
+            }
+            // Enable show tag translations if the country is CN
+            if (!sSettingsPre.contains(KEY_SHOW_TAG_TRANSLATIONS)) {
+                putShowTagTranslations(true);
+
+            }
+        }
+    }
+
+    private static EhConfig loadEhConfig() {
+        EhConfig ehConfig = new EhConfig();
+        ehConfig.imageSize = getImageResolution();
+        ehConfig.excludedLanguages = getExcludedLanguages();
+        ehConfig.defaultCategories = getDefaultCategories();
+        ehConfig.excludedNamespaces = getExcludedTagNamespaces();
+        ehConfig.setDirty();
+        return ehConfig;
+    }
+
+    public static boolean getBoolean(String key, boolean defValue) {
+        try {
+            return sSettingsPre.getBoolean(key, defValue);
+        } catch (ClassCastException e) {
+            Log.d(TAG, "Get ClassCastException when get " + key + " value", e);
+            return defValue;
+        }
+    }
+
+    public static void putBoolean(String key, boolean value) {
+        sSettingsPre.edit().putBoolean(key, value).apply();
+    }
+
+    public static int getInt(String key, int defValue) {
+        try {
+            return sSettingsPre.getInt(key, defValue);
+        } catch (ClassCastException e) {
+            Log.d(TAG, "Get ClassCastException when get " + key + " value", e);
+            return defValue;
+        }
+    }
+
+    public static void putInt(String key, int value) {
+        sSettingsPre.edit().putInt(key, value).apply();
+    }
+
+    public static String getString(String key, String defValue) {
+        try {
+            return sSettingsPre.getString(key, defValue);
+        } catch (ClassCastException e) {
+            Log.d(TAG, "Get ClassCastException when get " + key + " value", e);
+            return defValue;
+        }
+    }
+
+    public static void putString(String key, String value) {
+        sSettingsPre.edit().putString(key, value).apply();
+    }
+
+    public static Set<String> getStringSet(String key) {
+        return sSettingsPre.getStringSet(key, null);
+    }
+
+    public static void putStringToStringSet(String key, String value) {
+        Set<String> set = getStringSet(key);
+        if (set == null)
+            set = Set.of(value);
+        else if (set.contains(value))
+            return;
+        else
+            set.add(value);
+        sSettingsPre.edit().putStringSet(key, set).apply();
+    }
+
+    public static int getIntFromStr(String key, int defValue) {
+        try {
+            return NumberUtils.parseIntSafely(sSettingsPre.getString(key, Integer.toString(defValue)), defValue);
+        } catch (ClassCastException e) {
+            Log.d(TAG, "Get ClassCastException when get " + key + " value", e);
+            return defValue;
+        }
+    }
+
+    public static void putIntToStr(String key, int value) {
+        sSettingsPre.edit().putString(key, Integer.toString(value)).apply();
+    }
+
+    @Nullable
+    public static String getDisplayName() {
+        return getString(KEY_DISPLAY_NAME, DEFAULT_DISPLAY_NAME);
+    }
+
+    public static void putDisplayName(String value) {
+        putString(KEY_DISPLAY_NAME, value);
+    }
+
+    public static void putAvatar(String value) {
+        putString(KEY_AVATAR, value);
+    }
+
+    public static boolean getRemoveImageFiles() {
+        return getBoolean(KEY_REMOVE_IMAGE_FILES, DEFAULT_REMOVE_IMAGE_FILES);
+    }
+
+    public static void putRemoveImageFiles(boolean value) {
+        putBoolean(KEY_REMOVE_IMAGE_FILES, value);
+    }
+
+    public static EhConfig getEhConfig() {
+        return sEhConfig;
+    }
+
+    public static boolean getNeedSignIn() {
+        return getBoolean(KEY_NEED_SIGN_IN, DEFAULT_NEED_SIGN_IN);
+    }
+
+    public static void putNeedSignIn(boolean value) {
+        putBoolean(KEY_NEED_SIGN_IN, value);
+    }
+
+    public static boolean getSelectSite() {
+        return getBoolean(KEY_SELECT_SITE, DEFAULT_SELECT_SITE);
+    }
+
+    public static void putSelectSite(boolean value) {
+        putBoolean(KEY_SELECT_SITE, value);
+    }
+
+    public static int getTheme() {
+        return getIntFromStr(KEY_THEME, DEFAULT_THEME);
+    }
+
+    public static int getGallerySite() {
+        return getIntFromStr(KEY_GALLERY_SITE, DEFAULT_GALLERY_SITE);
+    }
+
+    public static void putGallerySite(int value) {
+        putIntToStr(KEY_GALLERY_SITE, value);
+    }
+
+    public static String getLaunchPageGalleryListSceneAction() {
+        int value = getIntFromStr(KEY_LAUNCH_PAGE, DEFAULT_LAUNCH_PAGE);
+        return switch (value) {
+            case 0 -> GalleryListScene.ACTION_HOMEPAGE;
+            case 1 -> GalleryListScene.ACTION_SUBSCRIPTION;
+            case 2 -> GalleryListScene.ACTION_WHATS_HOT;
+            case 3 -> GalleryListScene.ACTION_TOP_LIST;
+            default -> throw new IllegalStateException("Unexpected value: " + value);
+        };
+    }
+
+    public static int getListMode() {
+        return getIntFromStr(KEY_LIST_MODE, DEFAULT_LIST_MODE);
+    }
+
+    public static int getDetailSize() {
+        return getIntFromStr(KEY_DETAIL_SIZE, DEFAULT_DETAIL_SIZE);
+    }
+
+    @DimenRes
+    public static int getDetailSizeResId() {
+        return switch (getDetailSize()) {
+            case 0 -> R.dimen.gallery_list_column_width_long;
+            case 1 -> R.dimen.gallery_list_column_width_short;
+            default -> throw new IllegalStateException("Unexpected value: " + getDetailSize());
+        };
+    }
+
+    public static int getThumbSize() {
+        return dip2px(getInt(KEY_THUMB_SIZE, DEFAULT_THUMB_SIZE));
+    }
+
+    public static int dip2px(int dpValue) {
+        final float scale = EhApplication.getApplication().getResources().getDisplayMetrics().density;
+        return (int) (dpValue * scale + 0.5f);
+    }
+
+    public static int getThumbResolution() {
+        return getIntFromStr(KEY_THUMB_RESOLUTION, DEFAULT_THUMB_RESOLUTION);
+    }
+
+    public static boolean getShowComments() {
+        return getBoolean(KEY_SHOW_COMMENTS, DEFAULT_SHOW_COMMENTS);
+    }
+
+    public static boolean getRequestNews() {
+        return getBoolean(KEY_REQUEST_NEWS, DEFAULT_REQUEST_NEWS);
+    }
+
+    public static boolean getHideHvEvents() {
+        return getBoolean(KEY_HIDE_HV_EVENTS, DEFAULT_HIDE_HV_EVENTS);
+    }
+
+    public static boolean getShowJpnTitle() {
+        return getBoolean(KEY_SHOW_JPN_TITLE, DEFAULT_SHOW_JPN_TITLE);
+    }
+
+    public static boolean getShowGalleryPages() {
+        return getBoolean(KEY_SHOW_GALLERY_PAGES, DEFAULT_SHOW_GALLERY_PAGES);
+    }
+
+    public static boolean getShowTagTranslations() {
+        return getBoolean(KEY_SHOW_TAG_TRANSLATIONS, DEFAULT_SHOW_TAG_TRANSLATIONS);
+    }
+
+    public static void putShowTagTranslations(boolean value) {
+        putBoolean(KEY_SHOW_TAG_TRANSLATIONS, value);
+    }
+
+    public static int getDefaultCategories() {
+        return getInt(KEY_DEFAULT_CATEGORIES, DEFAULT_DEFAULT_CATEGORIES);
+    }
+
+    public static int getExcludedTagNamespaces() {
+        return getInt(KEY_EXCLUDED_TAG_NAMESPACES, DEFAULT_EXCLUDED_TAG_NAMESPACES);
+    }
+
+    public static String getExcludedLanguages() {
+        return getString(KEY_EXCLUDED_LANGUAGES, DEFAULT_EXCLUDED_LANGUAGES);
+    }
+
+    public static boolean getMeteredNetworkWarning() {
+        return getBoolean(KEY_METERED_NETWORK_WARNING, DEFAULT_METERED_NETWORK_WARNING);
+    }
+
+    public static boolean getAppLinkVerifyTip() {
+        return getBoolean(KEY_APP_LINK_VERIFY_TIP, DEFAULT_APP_LINK_VERIFY_TIP);
+    }
+
+    public static void putAppLinkVerifyTip(boolean value) {
+        putBoolean(KEY_APP_LINK_VERIFY_TIP, value);
+    }
+
+    public static boolean getEnabledSecurity() {
+        return getBoolean(KEY_SEC_SECURITY, VALUE_SEC_SECURITY);
+    }
+
+    @Nullable
+    public static UniFile getDownloadLocation() {
+        UniFile dir;
+        Uri.Builder builder = new Uri.Builder();
+        builder.scheme(getString(KEY_DOWNLOAD_SAVE_SCHEME, null));
+        builder.encodedAuthority(getString(KEY_DOWNLOAD_SAVE_AUTHORITY, null));
+        builder.encodedPath(getString(KEY_DOWNLOAD_SAVE_PATH, null));
+        builder.encodedQuery(getString(KEY_DOWNLOAD_SAVE_QUERY, null));
+        builder.encodedFragment(getString(KEY_DOWNLOAD_SAVE_FRAGMENT, null));
+        dir = UniFile.fromUri(EhApplication.getApplication(), builder.build());
+        return dir != null ? dir : UniFile.fromFile(AppConfig.getDefaultDownloadDir());
+    }
+
+    public static void putDownloadLocation(@NonNull UniFile location) {
+        Uri uri = location.getUri();
+        putString(KEY_DOWNLOAD_SAVE_SCHEME, uri.getScheme());
+        putString(KEY_DOWNLOAD_SAVE_AUTHORITY, uri.getEncodedAuthority());
+        putString(KEY_DOWNLOAD_SAVE_PATH, uri.getEncodedPath());
+        putString(KEY_DOWNLOAD_SAVE_QUERY, uri.getEncodedQuery());
+        putString(KEY_DOWNLOAD_SAVE_FRAGMENT, uri.getEncodedFragment());
+
+        if (getMediaScan()) {
+            CommonOperations.removeNoMediaFile(location);
+        } else {
+            CommonOperations.ensureNoMediaFile(location);
+        }
+    }
+
+    public static boolean getMediaScan() {
+        return getBoolean(KEY_MEDIA_SCAN, DEFAULT_MEDIA_SCAN);
+    }
+
+    public static String getRecentDownloadLabel() {
+        return getString(KEY_RECENT_DOWNLOAD_LABEL, DEFAULT_RECENT_DOWNLOAD_LABEL);
+    }
+
+    public static void putRecentDownloadLabel(String value) {
+        putString(KEY_RECENT_DOWNLOAD_LABEL, value);
+    }
+
+    public static boolean getHasDefaultDownloadLabel() {
+        return getBoolean(KEY_HAS_DEFAULT_DOWNLOAD_LABEL, DEFAULT_HAS_DOWNLOAD_LABEL);
+    }
+
+    public static void putHasDefaultDownloadLabel(boolean hasDefaultDownloadLabel) {
+        putBoolean(KEY_HAS_DEFAULT_DOWNLOAD_LABEL, hasDefaultDownloadLabel);
+    }
+
+    public static String getDefaultDownloadLabel() {
+        return getString(KEY_DEFAULT_DOWNLOAD_LABEL, DEFAULT_DOWNLOAD_LABEL);
+    }
+
+    public static void putDefaultDownloadLabel(String value) {
+        putString(KEY_DEFAULT_DOWNLOAD_LABEL, value);
+    }
+
+    public static int getMultiThreadDownload() {
+        return getIntFromStr(KEY_MULTI_THREAD_DOWNLOAD, DEFAULT_MULTI_THREAD_DOWNLOAD);
+    }
+
+    public static int getDownloadDelay() {
+        return getIntFromStr(KEY_DOWNLOAD_DELAY, DEFAULT_DOWNLOAD_DELAY);
+    }
+
+    public static int getPreloadImage() {
+        return getIntFromStr(KEY_PRELOAD_IMAGE, DEFAULT_PRELOAD_IMAGE);
+    }
+
+    public static String getImageResolution() {
+        return getString(KEY_IMAGE_RESOLUTION, DEFAULT_IMAGE_RESOLUTION);
+    }
+
+    public static void putImageResolution(String value) {
+        sEhConfig.imageSize = value;
+        sEhConfig.setDirty();
+        putString(KEY_IMAGE_RESOLUTION, value);
+    }
+
+    public static boolean getDownloadOriginImage() {
+        return getBoolean(KEY_DOWNLOAD_ORIGIN_IMAGE, DEFAULT_DOWNLOAD_ORIGIN_IMAGE);
+    }
+
+    public static String[] getFavCat() {
+        String[] favCat = new String[10];
+        favCat[0] = sSettingsPre.getString(KEY_FAV_CAT_0, DEFAULT_FAV_CAT_0);
+        favCat[1] = sSettingsPre.getString(KEY_FAV_CAT_1, DEFAULT_FAV_CAT_1);
+        favCat[2] = sSettingsPre.getString(KEY_FAV_CAT_2, DEFAULT_FAV_CAT_2);
+        favCat[3] = sSettingsPre.getString(KEY_FAV_CAT_3, DEFAULT_FAV_CAT_3);
+        favCat[4] = sSettingsPre.getString(KEY_FAV_CAT_4, DEFAULT_FAV_CAT_4);
+        favCat[5] = sSettingsPre.getString(KEY_FAV_CAT_5, DEFAULT_FAV_CAT_5);
+        favCat[6] = sSettingsPre.getString(KEY_FAV_CAT_6, DEFAULT_FAV_CAT_6);
+        favCat[7] = sSettingsPre.getString(KEY_FAV_CAT_7, DEFAULT_FAV_CAT_7);
+        favCat[8] = sSettingsPre.getString(KEY_FAV_CAT_8, DEFAULT_FAV_CAT_8);
+        favCat[9] = sSettingsPre.getString(KEY_FAV_CAT_9, DEFAULT_FAV_CAT_9);
+        return favCat;
+    }
+
+    public static void putFavCat(String[] value) {
+        AssertUtils.assertEquals(10, value.length);
+        sSettingsPre.edit()
+                .putString(KEY_FAV_CAT_0, value[0])
+                .putString(KEY_FAV_CAT_1, value[1])
+                .putString(KEY_FAV_CAT_2, value[2])
+                .putString(KEY_FAV_CAT_3, value[3])
+                .putString(KEY_FAV_CAT_4, value[4])
+                .putString(KEY_FAV_CAT_5, value[5])
+                .putString(KEY_FAV_CAT_6, value[6])
+                .putString(KEY_FAV_CAT_7, value[7])
+                .putString(KEY_FAV_CAT_8, value[8])
+                .putString(KEY_FAV_CAT_9, value[9])
+                .apply();
+    }
+
+    public static int[] getFavCount() {
+        int[] favCount = new int[10];
+        favCount[0] = sSettingsPre.getInt(KEY_FAV_COUNT_0, DEFAULT_FAV_COUNT);
+        favCount[1] = sSettingsPre.getInt(KEY_FAV_COUNT_1, DEFAULT_FAV_COUNT);
+        favCount[2] = sSettingsPre.getInt(KEY_FAV_COUNT_2, DEFAULT_FAV_COUNT);
+        favCount[3] = sSettingsPre.getInt(KEY_FAV_COUNT_3, DEFAULT_FAV_COUNT);
+        favCount[4] = sSettingsPre.getInt(KEY_FAV_COUNT_4, DEFAULT_FAV_COUNT);
+        favCount[5] = sSettingsPre.getInt(KEY_FAV_COUNT_5, DEFAULT_FAV_COUNT);
+        favCount[6] = sSettingsPre.getInt(KEY_FAV_COUNT_6, DEFAULT_FAV_COUNT);
+        favCount[7] = sSettingsPre.getInt(KEY_FAV_COUNT_7, DEFAULT_FAV_COUNT);
+        favCount[8] = sSettingsPre.getInt(KEY_FAV_COUNT_8, DEFAULT_FAV_COUNT);
+        favCount[9] = sSettingsPre.getInt(KEY_FAV_COUNT_9, DEFAULT_FAV_COUNT);
+        return favCount;
+    }
+
+    public static void putFavCount(int[] count) {
+        AssertUtils.assertEquals(10, count.length);
+        sSettingsPre.edit()
+                .putInt(KEY_FAV_COUNT_0, count[0])
+                .putInt(KEY_FAV_COUNT_1, count[1])
+                .putInt(KEY_FAV_COUNT_2, count[2])
+                .putInt(KEY_FAV_COUNT_3, count[3])
+                .putInt(KEY_FAV_COUNT_4, count[4])
+                .putInt(KEY_FAV_COUNT_5, count[5])
+                .putInt(KEY_FAV_COUNT_6, count[6])
+                .putInt(KEY_FAV_COUNT_7, count[7])
+                .putInt(KEY_FAV_COUNT_8, count[8])
+                .putInt(KEY_FAV_COUNT_9, count[9])
+                .apply();
+    }
+
+    public static int getFavLocalCount() {
+        return sSettingsPre.getInt(KEY_FAV_LOCAL, DEFAULT_FAV_COUNT);
+    }
+
+    public static void putFavLocalCount(int count) {
+        sSettingsPre.edit().putInt(KEY_FAV_LOCAL, count).apply();
+    }
+
+    public static int getFavCloudCount() {
+        return sSettingsPre.getInt(KEY_FAV_CLOUD, DEFAULT_FAV_COUNT);
+    }
+
+    public static void putFavCloudCount(int count) {
+        sSettingsPre.edit().putInt(KEY_FAV_CLOUD, count).apply();
+    }
+
+    public static int getRecentFavCat() {
+        return getInt(KEY_RECENT_FAV_CAT, DEFAULT_RECENT_FAV_CAT);
+    }
+
+    public static void putRecentFavCat(int value) {
+        putInt(KEY_RECENT_FAV_CAT, value);
+    }
+
+    public static int getDefaultFavSlot() {
+        return getInt(KEY_DEFAULT_FAV_SLOT, DEFAULT_DEFAULT_FAV_SLOT);
+    }
+
+    public static void putDefaultFavSlot(int value) {
+        putInt(KEY_DEFAULT_FAV_SLOT, value);
+    }
+
+    public static boolean getQSSaveProgress() {
+        return getBoolean(KEY_QS_SAVE_PROGRESS, DEFAULT_QS_SAVE_PROGRESS);
+    }
+
+    public static void putQSSaveProgress(boolean value) {
+        putBoolean(KEY_QS_SAVE_PROGRESS, value);
+    }
+
+    public static boolean getSaveParseErrorBody() {
+        return getBoolean(KEY_SAVE_PARSE_ERROR_BODY, DEFAULT_SAVE_PARSE_ERROR_BODY);
+    }
+
+    public static boolean getSaveCrashLog() {
+        return getBoolean(KEY_SAVE_CRASH_LOG, DEFAULT_SAVE_CRASH_LOG);
+    }
+
+    public static boolean getSecurity() {
+        return getBoolean(KEY_SECURITY, false);
+    }
+
+    public static void putSecurity(boolean value) {
+        putBoolean(KEY_SECURITY, value);
+    }
+
+    public static int getSecurityDelay() {
+        return getInt(KEY_SECURITY_DELAY, 0);
+    }
+
+    public static int getReadCacheSize() {
+        return getIntFromStr(KEY_READ_CACHE_SIZE, DEFAULT_READ_CACHE_SIZE);
+    }
+
+    public static boolean getBuiltInHosts() {
+        return getBoolean(KEY_BUILT_IN_HOSTS, DEFAULT_BUILT_IN_HOSTS);
+    }
+
+    public static void putBuiltInHosts(boolean value) {
+        putBoolean(KEY_BUILT_IN_HOSTS, value);
+    }
+
+    public static boolean getDF() {
+        return getBoolean(KEY_DOMAIN_FRONTING, DEFAULT_FRONTING);
+    }
+
+    public static void putDF(boolean value) {
+        putBoolean(KEY_DOMAIN_FRONTING, value);
+    }
+
+    public static boolean getBypassVpn() {
+        return getBoolean(KEY_BYPASS_VPN, DEFAULT_BYPASS_VPN);
+    }
+
+    public static int getProxyType() {
+        return getInt(KEY_PROXY_TYPE, DEFAULT_PROXY_TYPE);
+    }
+
+    public static void putProxyType(int value) {
+        putInt(KEY_PROXY_TYPE, value);
+    }
+
+    public static String getProxyIp() {
+        return getString(KEY_PROXY_IP, DEFAULT_PROXY_IP);
+    }
+
+    public static void putProxyIp(String value) {
+        putString(KEY_PROXY_IP, value);
+    }
+
+    public static int getProxyPort() {
+        return getInt(KEY_PROXY_PORT, DEFAULT_PROXY_PORT);
+    }
+
+    public static void putProxyPort(int value) {
+        putInt(KEY_PROXY_PORT, value);
+    }
+
+    public static int getClipboardTextHashCode() {
+        return getInt(KEY_CLIPBOARD_TEXT_HASH_CODE, DEFAULT_CLIPBOARD_TEXT_HASH_CODE);
+    }
+
+    public static void putClipboardTextHashCode(int value) {
+        putInt(KEY_CLIPBOARD_TEXT_HASH_CODE, value);
+    }
+
+    public static Set<String> getArchivePasswds() {
+        return getStringSet(KEY_ARCHIVE_PASSWDS);
+    }
+
+    public static void putPasswdToArchivePasswds(String value) {
+        putStringToStringSet(KEY_ARCHIVE_PASSWDS, value);
+    }
+
+    public static int getListThumbSize() {
+        if (LIST_THUMB_SIZE_INITED) {
+            return LIST_THUMB_SIZE;
+        }
+        int size = 3 * getInt(KEY_LIST_THUMB_SIZE, DEFAULT_LIST_THUMB_SIZE);
+        LIST_THUMB_SIZE = size;
+        LIST_THUMB_SIZE_INITED = true;
+        return size;
+    }
+
+    public static boolean getNotificationRequired() {
+        return getBoolean(KEY_NOTIFICATION_REQUIRED, false);
+    }
+
+    public static void putNotificationRequired() {
+        putBoolean(KEY_NOTIFICATION_REQUIRED, true);
+    }
+}
@@ -1,641 +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
-
-import android.content.SharedPreferences
-import android.net.Uri
-import android.util.Log
-import androidx.annotation.DimenRes
-import androidx.preference.PreferenceManager
-import com.hippo.ehviewer.EhApplication.Companion.application
-import com.hippo.ehviewer.client.data.FavListUrlBuilder
-import com.hippo.ehviewer.ui.scene.GalleryListScene
-import com.hippo.ehviewer.yorozuya.LayoutUtils.dp2pix
-import com.hippo.ehviewer.yorozuya.NumberUtils
-import com.hippo.unifile.UniFile
-import java.util.Locale
-
-object Settings {
-    /********************
-     * Eh
-     */
-    const val KEY_THEME = "theme"
-    const val KEY_ACCOUNT = "account"
-    const val KEY_IMAGE_LIMITS = "image_limits"
-    const val KEY_U_CONFIG = "uconfig"
-    const val KEY_MY_TAGS = "mytags"
-    const val KEY_BLACK_DARK_THEME = "black_dark_theme"
-    const val DEFAULT_BLACK_DARK_THEME = false
-    const val THEME_SYSTEM = -1
-    const val KEY_GALLERY_SITE = "gallery_site"
-    const val KEY_LIST_MODE = "list_mode"
-    const val KEY_DETAIL_SIZE = "detail_size"
-    const val KEY_THUMB_SIZE = "thumb_size_"
-    const val KEY_THUMB_RESOLUTION = "thumb_resolution"
-    const val KEY_SHOW_JPN_TITLE = "show_jpn_title"
-    const val KEY_SHOW_TAG_TRANSLATIONS = "show_tag_translations"
-    const val KEY_TAG_TRANSLATIONS_SOURCE = "tag_translations_source"
-    const val KEY_REQUEST_NEWS = "request_news"
-    const val KEY_REQUEST_NEWS_TIMER = "request_news_timer"
-    const val KEY_REQUEST_NEWS_TIMER_HOUR = "request_news_timer_hour"
-    const val KEY_REQUEST_NEWS_TIMER_MINUTE = "request_news_timer_minute"
-    const val KEY_HIDE_HV_EVENTS = "hide_hv_events"
-    val SIGN_IN_REQUIRED = arrayOf(
-        KEY_IMAGE_LIMITS,
-        KEY_GALLERY_SITE,
-        KEY_U_CONFIG,
-        KEY_MY_TAGS,
-        KEY_SHOW_JPN_TITLE,
-        KEY_REQUEST_NEWS,
-        KEY_REQUEST_NEWS_TIMER,
-        KEY_HIDE_HV_EVENTS,
-    )
-
-    /********************
-     * Privacy and Security
-     */
-    const val KEY_SEC_SECURITY = "enable_secure"
-    const val VALUE_SEC_SECURITY = false
-
-    /********************
-     * Download
-     */
-    const val KEY_DOWNLOAD_SAVE_SCHEME = "image_scheme"
-    const val KEY_DOWNLOAD_SAVE_AUTHORITY = "image_authority"
-    const val KEY_DOWNLOAD_SAVE_PATH = "image_path"
-    const val KEY_NOTIFICATION_REQUIRED = "notification_required"
-    const val KEY_DOWNLOAD_SAVE_QUERY = "image_query"
-    const val KEY_DOWNLOAD_SAVE_FRAGMENT = "image_fragment"
-    const val KEY_MEDIA_SCAN = "media_scan"
-    const val INVALID_DEFAULT_FAV_SLOT = -2
-
-    /********************
-     * Advanced
-     */
-    const val KEY_SAVE_PARSE_ERROR_BODY = "save_parse_error_body"
-    const val KEY_SECURITY = "require_unlock"
-    const val KEY_SECURITY_DELAY = "require_unlock_delay"
-    const val KEY_READ_CACHE_SIZE = "read_cache_size"
-    const val DEFAULT_READ_CACHE_SIZE = 640
-    const val KEY_BUILT_IN_HOSTS = "built_in_hosts_2"
-    const val KEY_DOMAIN_FRONTING = "domain_fronting"
-    const val KEY_BYPASS_VPN = "bypass_vpn"
-    const val KEY_LIST_THUMB_SIZE = "list_tile_size"
-    private const val KEY_LAST_DAWN_DAY = "last_dawn_day"
-    private const val DEFAULT_HIDE_HV_EVENTS = false
-    private const val KEY_SHOW_COMMENTS = "show_gallery_comments"
-    private const val DEFAULT_SHOW_COMMENTS = true
-    private val TAG = Settings::class.java.simpleName
-    private const val KEY_DISPLAY_NAME = "display_name"
-    private val DEFAULT_DISPLAY_NAME: String? = null
-    private const val DEFAULT_LIST_THUMB_SIZE = 40
-    private const val KEY_AVATAR = "avatar"
-    private const val KEY_REMOVE_IMAGE_FILES = "include_pic"
-    private const val DEFAULT_REMOVE_IMAGE_FILES = true
-    private const val KEY_NEED_SIGN_IN = "need_sign_in"
-    private const val DEFAULT_NEED_SIGN_IN = true
-    private const val KEY_SELECT_SITE = "select_site"
-    private const val DEFAULT_SELECT_SITE = true
-    private const val DEFAULT_THEME = THEME_SYSTEM
-    private const val DEFAULT_GALLERY_SITE = 0
-    private const val KEY_LAUNCH_PAGE = "launch_page"
-    private const val DEFAULT_LAUNCH_PAGE = 0
-    private const val DEFAULT_LIST_MODE = 0
-    private const val DEFAULT_DETAIL_SIZE = 0
-    private const val DEFAULT_THUMB_SIZE = 120
-    private const val DEFAULT_THUMB_RESOLUTION = 0
-    private const val DEFAULT_SHOW_JPN_TITLE = false
-    private const val KEY_SHOW_GALLERY_PAGES = "show_gallery_pages"
-    private const val DEFAULT_SHOW_GALLERY_PAGES = false
-    private const val DEFAULT_SHOW_TAG_TRANSLATIONS = false
-    private const val KEY_METERED_NETWORK_WARNING = "cellular_network_warning"
-    private const val DEFAULT_METERED_NETWORK_WARNING = false
-    private const val KEY_APP_LINK_VERIFY_TIP = "app_link_verify_tip"
-    private const val DEFAULT_APP_LINK_VERIFY_TIP = false
-    private const val DEFAULT_MEDIA_SCAN = false
-    private const val KEY_RECENT_DOWNLOAD_LABEL = "recent_download_label"
-    private val DEFAULT_RECENT_DOWNLOAD_LABEL: String? = null
-    private const val KEY_HAS_DEFAULT_DOWNLOAD_LABEL = "has_default_download_label"
-    private const val DEFAULT_HAS_DOWNLOAD_LABEL = false
-    private const val KEY_DEFAULT_DOWNLOAD_LABEL = "default_download_label"
-    private val DEFAULT_DOWNLOAD_LABEL: String? = null
-    private const val KEY_MULTI_THREAD_DOWNLOAD = "download_thread"
-    private const val DEFAULT_MULTI_THREAD_DOWNLOAD = 3
-    private const val KEY_PRELOAD_IMAGE = "preload_image"
-    private const val DEFAULT_PRELOAD_IMAGE = 5
-    private const val KEY_DOWNLOAD_ORIGIN_IMAGE = "download_origin_image"
-    private const val DEFAULT_DOWNLOAD_ORIGIN_IMAGE = false
-
-    /********************
-     * Favorites
-     */
-    private const val KEY_FAV_CAT_0 = "fav_cat_0"
-    private const val KEY_FAV_CAT_1 = "fav_cat_1"
-    private const val KEY_FAV_CAT_2 = "fav_cat_2"
-    private const val KEY_FAV_CAT_3 = "fav_cat_3"
-    private const val KEY_FAV_CAT_4 = "fav_cat_4"
-    private const val KEY_FAV_CAT_5 = "fav_cat_5"
-    private const val KEY_FAV_CAT_6 = "fav_cat_6"
-    private const val KEY_FAV_CAT_7 = "fav_cat_7"
-    private const val KEY_FAV_CAT_8 = "fav_cat_8"
-    private const val KEY_FAV_CAT_9 = "fav_cat_9"
-    private const val DEFAULT_FAV_CAT_0 = "Favorites 0"
-    private const val DEFAULT_FAV_CAT_1 = "Favorites 1"
-    private const val DEFAULT_FAV_CAT_2 = "Favorites 2"
-    private const val DEFAULT_FAV_CAT_3 = "Favorites 3"
-    private const val DEFAULT_FAV_CAT_4 = "Favorites 4"
-    private const val DEFAULT_FAV_CAT_5 = "Favorites 5"
-    private const val DEFAULT_FAV_CAT_6 = "Favorites 6"
-    private const val DEFAULT_FAV_CAT_7 = "Favorites 7"
-    private const val DEFAULT_FAV_CAT_8 = "Favorites 8"
-    private const val DEFAULT_FAV_CAT_9 = "Favorites 9"
-    private const val KEY_FAV_COUNT_0 = "fav_count_0"
-    private const val KEY_FAV_COUNT_1 = "fav_count_1"
-    private const val KEY_FAV_COUNT_2 = "fav_count_2"
-    private const val KEY_FAV_COUNT_3 = "fav_count_3"
-    private const val KEY_FAV_COUNT_4 = "fav_count_4"
-    private const val KEY_FAV_COUNT_5 = "fav_count_5"
-    private const val KEY_FAV_COUNT_6 = "fav_count_6"
-    private const val KEY_FAV_COUNT_7 = "fav_count_7"
-    private const val KEY_FAV_COUNT_8 = "fav_count_8"
-    private const val KEY_FAV_COUNT_9 = "fav_count_9"
-    private const val KEY_FAV_LOCAL = "fav_local"
-    private const val KEY_FAV_CLOUD = "fav_cloud"
-    private const val DEFAULT_FAV_COUNT = 0
-    private const val KEY_RECENT_FAV_CAT = "recent_fav_cat"
-    private const val DEFAULT_RECENT_FAV_CAT = FavListUrlBuilder.FAV_CAT_ALL
-
-    // -1 for local, 0 - 9 for cloud favorite, other for no default fav slot
-    private const val KEY_DEFAULT_FAV_SLOT = "default_favorite_2"
-    private const val DEFAULT_DEFAULT_FAV_SLOT = INVALID_DEFAULT_FAV_SLOT
-    private const val DEFAULT_SAVE_PARSE_ERROR_BODY = true
-    private const val KEY_SAVE_CRASH_LOG = "save_crash_log"
-    private const val DEFAULT_SAVE_CRASH_LOG = true
-    private const val DEFAULT_BUILT_IN_HOSTS = false
-    private const val DEFAULT_FRONTING = false
-    private const val DEFAULT_BYPASS_VPN = true
-    private const val KEY_PROXY_TYPE = "proxy_type"
-    private const val DEFAULT_PROXY_TYPE = EhProxySelector.TYPE_SYSTEM
-    private const val KEY_PROXY_IP = "proxy_ip"
-    private val DEFAULT_PROXY_IP: String? = null
-    private const val KEY_PROXY_PORT = "proxy_port"
-    private const val DEFAULT_PROXY_PORT = -1
-    private const val KEY_CLIPBOARD_TEXT_HASH_CODE = "clipboard_text_hash_code"
-    private const val DEFAULT_CLIPBOARD_TEXT_HASH_CODE = 0
-    private const val KEY_DOWNLOAD_DELAY = "download_delay"
-    private const val DEFAULT_DOWNLOAD_DELAY = 0
-    private const val DEFAULT_REQUEST_NEWS = false
-    private const val KEY_ARCHIVE_PASSWDS = "archive_passwds"
-    private const val KEY_QS_SAVE_PROGRESS = "qs_save_progress"
-    private const val DEFAULT_QS_SAVE_PROGRESS = true
-    private const val KEY_PRELOAD_THUMB_AGGRESIVELY = "preload_thumb_aggressively"
-    private const val DEFAULT_PRELOAD_THUMB_AGGRESIVELY = false
-    var LIST_THUMB_SIZE_INITED = false
-    private lateinit var sSettingsPre: SharedPreferences
-    private var LIST_THUMB_SIZE = 40
-    fun initialize() {
-        sSettingsPre = PreferenceManager.getDefaultSharedPreferences(application)
-        fixDefaultValue()
-    }
-
-    private fun fixDefaultValue() {
-        if ("CN" == Locale.getDefault().country) {
-            // Enable domain fronting if the country is CN
-            if (!sSettingsPre.contains(KEY_BUILT_IN_HOSTS)) {
-                putBuiltInHosts(true)
-            }
-            if (!sSettingsPre.contains(KEY_DOMAIN_FRONTING)) {
-                putDF(true)
-            }
-            // Enable show tag translations if the country is CN
-            if (!sSettingsPre.contains(KEY_SHOW_TAG_TRANSLATIONS)) {
-                putShowTagTranslations(true)
-            }
-        }
-    }
-
-    private fun getBoolean(key: String, defValue: Boolean): Boolean {
-        return try {
-            sSettingsPre.getBoolean(key, defValue)
-        } catch (e: ClassCastException) {
-            Log.d(TAG, "Get ClassCastException when get $key value", e)
-            defValue
-        }
-    }
-
-    private fun putBoolean(key: String, value: Boolean) {
-        sSettingsPre.edit().putBoolean(key, value).apply()
-    }
-
-    @JvmStatic
-    fun getInt(key: String, defValue: Int): Int {
-        return try {
-            sSettingsPre.getInt(key, defValue)
-        } catch (e: ClassCastException) {
-            Log.d(TAG, "Get ClassCastException when get $key value", e)
-            defValue
-        }
-    }
-
-    @JvmStatic
-    fun putInt(key: String, value: Int) {
-        sSettingsPre.edit().putInt(key, value).apply()
-    }
-
-    private fun getString(key: String, defValue: String?): String? {
-        return try {
-            sSettingsPre.getString(key, defValue)
-        } catch (e: ClassCastException) {
-            Log.d(TAG, "Get ClassCastException when get $key value", e)
-            defValue
-        }
-    }
-
-    private fun putString(key: String, value: String?) {
-        sSettingsPre.edit().putString(key, value).apply()
-    }
-
-    private fun getStringSet(key: String): MutableSet<String>? {
-        return sSettingsPre.getStringSet(key, null)
-    }
-
-    private fun putStringToStringSet(key: String, value: String) {
-        var set = getStringSet(key)
-        if (set == null) {
-            set =
-                mutableSetOf(value)
-        } else if (set.contains(value)) return else set.add(value)
-        sSettingsPre.edit().putStringSet(key, set).apply()
-    }
-
-    private fun getIntFromStr(key: String, defValue: Int): Int {
-        return try {
-            NumberUtils.parseIntSafely(
-                sSettingsPre.getString(key, defValue.toString()),
-                defValue,
-            )
-        } catch (e: ClassCastException) {
-            Log.d(TAG, "Get ClassCastException when get $key value", e)
-            defValue
-        }
-    }
-
-    private fun putIntToStr(key: String, value: Int) {
-        sSettingsPre.edit().putString(key, value.toString()).apply()
-    }
-
-    var lastDawnDay: Long
-        get() = sSettingsPre.getLong(KEY_LAST_DAWN_DAY, 0)
-        set(value) = sSettingsPre.edit().putLong(KEY_LAST_DAWN_DAY, value).apply()
-    val displayName: String?
-        get() = getString(KEY_DISPLAY_NAME, DEFAULT_DISPLAY_NAME)
-
-    fun putDisplayName(value: String?) {
-        putString(KEY_DISPLAY_NAME, value)
-    }
-
-    fun putAvatar(value: String?) {
-        putString(KEY_AVATAR, value)
-    }
-
-    val removeImageFiles: Boolean
-        get() = getBoolean(KEY_REMOVE_IMAGE_FILES, DEFAULT_REMOVE_IMAGE_FILES)
-
-    fun putRemoveImageFiles(value: Boolean) {
-        putBoolean(KEY_REMOVE_IMAGE_FILES, value)
-    }
-
-    val needSignIn: Boolean
-        get() = getBoolean(KEY_NEED_SIGN_IN, DEFAULT_NEED_SIGN_IN)
-
-    fun putNeedSignIn(value: Boolean) {
-        putBoolean(KEY_NEED_SIGN_IN, value)
-    }
-
-    val selectSite: Boolean
-        get() = getBoolean(KEY_SELECT_SITE, DEFAULT_SELECT_SITE)
-
-    fun putSelectSite(value: Boolean) {
-        putBoolean(KEY_SELECT_SITE, value)
-    }
-
-    val theme: Int
-        get() = getIntFromStr(KEY_THEME, DEFAULT_THEME)
-    val blackDarkTheme
-        get() = getBoolean(KEY_BLACK_DARK_THEME, DEFAULT_BLACK_DARK_THEME)
-    val gallerySite: Int
-        get() = getIntFromStr(KEY_GALLERY_SITE, DEFAULT_GALLERY_SITE)
-
-    fun putGallerySite(value: Int) {
-        putIntToStr(KEY_GALLERY_SITE, value)
-    }
-
-    val launchPageGalleryListSceneAction: String
-        get() {
-            return when (val value = getIntFromStr(KEY_LAUNCH_PAGE, DEFAULT_LAUNCH_PAGE)) {
-                0 -> GalleryListScene.ACTION_HOMEPAGE
-                1 -> GalleryListScene.ACTION_SUBSCRIPTION
-                2 -> GalleryListScene.ACTION_WHATS_HOT
-                3 -> GalleryListScene.ACTION_TOP_LIST
-                else -> throw IllegalStateException("Unexpected value: $value")
-            }
-        }
-    val listMode: Int
-        get() = getIntFromStr(KEY_LIST_MODE, DEFAULT_LIST_MODE)
-    private val detailSize: Int
-        get() = getIntFromStr(KEY_DETAIL_SIZE, DEFAULT_DETAIL_SIZE)
-
-    @get:DimenRes
-    val detailSizeResId: Int
-        get() = when (detailSize) {
-            0 -> R.dimen.gallery_list_column_width_long
-            1 -> R.dimen.gallery_list_column_width_short
-            else -> throw IllegalStateException("Unexpected value: $detailSize")
-        }
-    val thumbSize: Int
-        get() = dp2pix(application, thumbSizeDp.toFloat())
-
-    val thumbSizeDp: Int
-        get() = getInt(KEY_THUMB_SIZE, DEFAULT_THUMB_SIZE)
-
-    val thumbResolution: Int
-        get() = getIntFromStr(KEY_THUMB_RESOLUTION, DEFAULT_THUMB_RESOLUTION)
-    val showComments: Boolean
-        get() = getBoolean(KEY_SHOW_COMMENTS, DEFAULT_SHOW_COMMENTS)
-    val requestNews: Boolean
-        get() = getBoolean(KEY_REQUEST_NEWS, DEFAULT_REQUEST_NEWS)
-    val hideHvEvents: Boolean
-        get() = getBoolean(KEY_HIDE_HV_EVENTS, DEFAULT_HIDE_HV_EVENTS)
-    val showJpnTitle: Boolean
-        get() = getBoolean(KEY_SHOW_JPN_TITLE, DEFAULT_SHOW_JPN_TITLE)
-    val showGalleryPages: Boolean
-        get() = getBoolean(KEY_SHOW_GALLERY_PAGES, DEFAULT_SHOW_GALLERY_PAGES)
-    val showTagTranslations: Boolean
-        get() = getBoolean(KEY_SHOW_TAG_TRANSLATIONS, DEFAULT_SHOW_TAG_TRANSLATIONS)
-
-    private fun putShowTagTranslations(value: Boolean) {
-        putBoolean(KEY_SHOW_TAG_TRANSLATIONS, value)
-    }
-
-    val meteredNetworkWarning: Boolean
-        get() = getBoolean(KEY_METERED_NETWORK_WARNING, DEFAULT_METERED_NETWORK_WARNING)
-    val appLinkVerifyTip: Boolean
-        get() = getBoolean(KEY_APP_LINK_VERIFY_TIP, DEFAULT_APP_LINK_VERIFY_TIP)
-
-    fun putAppLinkVerifyTip(value: Boolean) {
-        putBoolean(KEY_APP_LINK_VERIFY_TIP, value)
-    }
-
-    val enabledSecurity: Boolean
-        get() = getBoolean(KEY_SEC_SECURITY, VALUE_SEC_SECURITY)
-    val downloadLocation: UniFile?
-        get() {
-            val dir: UniFile?
-            val builder = Uri.Builder()
-            builder.scheme(getString(KEY_DOWNLOAD_SAVE_SCHEME, null))
-            builder.encodedAuthority(getString(KEY_DOWNLOAD_SAVE_AUTHORITY, null))
-            builder.encodedPath(getString(KEY_DOWNLOAD_SAVE_PATH, null))
-            builder.encodedQuery(getString(KEY_DOWNLOAD_SAVE_QUERY, null))
-            builder.encodedFragment(getString(KEY_DOWNLOAD_SAVE_FRAGMENT, null))
-            dir = UniFile.fromUri(application, builder.build())
-            return dir ?: UniFile.fromFile(AppConfig.getDefaultDownloadDir())
-        }
-
-    fun putDownloadLocation(location: UniFile) {
-        val uri = location.uri
-        putString(KEY_DOWNLOAD_SAVE_SCHEME, uri.scheme)
-        putString(KEY_DOWNLOAD_SAVE_AUTHORITY, uri.encodedAuthority)
-        putString(KEY_DOWNLOAD_SAVE_PATH, uri.encodedPath)
-        putString(KEY_DOWNLOAD_SAVE_QUERY, uri.encodedQuery)
-        putString(KEY_DOWNLOAD_SAVE_FRAGMENT, uri.encodedFragment)
-    }
-
-    val mediaScan: Boolean
-        get() = getBoolean(KEY_MEDIA_SCAN, DEFAULT_MEDIA_SCAN)
-    val recentDownloadLabel: String?
-        get() = getString(KEY_RECENT_DOWNLOAD_LABEL, DEFAULT_RECENT_DOWNLOAD_LABEL)
-
-    fun putRecentDownloadLabel(value: String?) {
-        putString(KEY_RECENT_DOWNLOAD_LABEL, value)
-    }
-
-    val hasDefaultDownloadLabel: Boolean
-        get() = getBoolean(KEY_HAS_DEFAULT_DOWNLOAD_LABEL, DEFAULT_HAS_DOWNLOAD_LABEL)
-
-    fun putHasDefaultDownloadLabel(hasDefaultDownloadLabel: Boolean) {
-        putBoolean(KEY_HAS_DEFAULT_DOWNLOAD_LABEL, hasDefaultDownloadLabel)
-    }
-
-    val defaultDownloadLabel: String?
-        get() = getString(KEY_DEFAULT_DOWNLOAD_LABEL, DEFAULT_DOWNLOAD_LABEL)
-
-    fun putDefaultDownloadLabel(value: String?) {
-        putString(KEY_DEFAULT_DOWNLOAD_LABEL, value)
-    }
-
-    val multiThreadDownload: Int
-        get() = getIntFromStr(KEY_MULTI_THREAD_DOWNLOAD, DEFAULT_MULTI_THREAD_DOWNLOAD)
-    val downloadDelay: Int
-        get() = getIntFromStr(KEY_DOWNLOAD_DELAY, DEFAULT_DOWNLOAD_DELAY)
-    val preloadImage: Int
-        get() = getIntFromStr(KEY_PRELOAD_IMAGE, DEFAULT_PRELOAD_IMAGE)
-    val downloadOriginImage: Boolean
-        get() = getBoolean(KEY_DOWNLOAD_ORIGIN_IMAGE, DEFAULT_DOWNLOAD_ORIGIN_IMAGE)
-    val favCat: Array<String>
-        get() = arrayOf(
-            sSettingsPre.getString(KEY_FAV_CAT_0, DEFAULT_FAV_CAT_0)!!,
-            sSettingsPre.getString(KEY_FAV_CAT_1, DEFAULT_FAV_CAT_1)!!,
-            sSettingsPre.getString(KEY_FAV_CAT_2, DEFAULT_FAV_CAT_2)!!,
-            sSettingsPre.getString(KEY_FAV_CAT_3, DEFAULT_FAV_CAT_3)!!,
-            sSettingsPre.getString(KEY_FAV_CAT_4, DEFAULT_FAV_CAT_4)!!,
-            sSettingsPre.getString(KEY_FAV_CAT_5, DEFAULT_FAV_CAT_5)!!,
-            sSettingsPre.getString(KEY_FAV_CAT_6, DEFAULT_FAV_CAT_6)!!,
-            sSettingsPre.getString(KEY_FAV_CAT_7, DEFAULT_FAV_CAT_7)!!,
-            sSettingsPre.getString(KEY_FAV_CAT_8, DEFAULT_FAV_CAT_8)!!,
-            sSettingsPre.getString(KEY_FAV_CAT_9, DEFAULT_FAV_CAT_9)!!,
-        )
-
-    fun putFavCat(value: Array<String?>) {
-        check(value.size == 10)
-        sSettingsPre.edit()
-            .putString(KEY_FAV_CAT_0, value[0])
-            .putString(KEY_FAV_CAT_1, value[1])
-            .putString(KEY_FAV_CAT_2, value[2])
-            .putString(KEY_FAV_CAT_3, value[3])
-            .putString(KEY_FAV_CAT_4, value[4])
-            .putString(KEY_FAV_CAT_5, value[5])
-            .putString(KEY_FAV_CAT_6, value[6])
-            .putString(KEY_FAV_CAT_7, value[7])
-            .putString(KEY_FAV_CAT_8, value[8])
-            .putString(KEY_FAV_CAT_9, value[9])
-            .apply()
-    }
-
-    val favCount: IntArray
-        get() = intArrayOf(
-            sSettingsPre.getInt(KEY_FAV_COUNT_0, DEFAULT_FAV_COUNT),
-            sSettingsPre.getInt(KEY_FAV_COUNT_1, DEFAULT_FAV_COUNT),
-            sSettingsPre.getInt(KEY_FAV_COUNT_2, DEFAULT_FAV_COUNT),
-            sSettingsPre.getInt(KEY_FAV_COUNT_3, DEFAULT_FAV_COUNT),
-            sSettingsPre.getInt(KEY_FAV_COUNT_4, DEFAULT_FAV_COUNT),
-            sSettingsPre.getInt(KEY_FAV_COUNT_5, DEFAULT_FAV_COUNT),
-            sSettingsPre.getInt(KEY_FAV_COUNT_6, DEFAULT_FAV_COUNT),
-            sSettingsPre.getInt(KEY_FAV_COUNT_7, DEFAULT_FAV_COUNT),
-            sSettingsPre.getInt(KEY_FAV_COUNT_8, DEFAULT_FAV_COUNT),
-            sSettingsPre.getInt(KEY_FAV_COUNT_9, DEFAULT_FAV_COUNT),
-        )
-
-    fun putFavCount(count: IntArray) {
-        check(count.size == 10)
-        sSettingsPre.edit()
-            .putInt(KEY_FAV_COUNT_0, count[0])
-            .putInt(KEY_FAV_COUNT_1, count[1])
-            .putInt(KEY_FAV_COUNT_2, count[2])
-            .putInt(KEY_FAV_COUNT_3, count[3])
-            .putInt(KEY_FAV_COUNT_4, count[4])
-            .putInt(KEY_FAV_COUNT_5, count[5])
-            .putInt(KEY_FAV_COUNT_6, count[6])
-            .putInt(KEY_FAV_COUNT_7, count[7])
-            .putInt(KEY_FAV_COUNT_8, count[8])
-            .putInt(KEY_FAV_COUNT_9, count[9])
-            .apply()
-    }
-
-    val favLocalCount: Int
-        get() = sSettingsPre.getInt(KEY_FAV_LOCAL, DEFAULT_FAV_COUNT)
-
-    fun putFavLocalCount(count: Int) {
-        sSettingsPre.edit().putInt(KEY_FAV_LOCAL, count).apply()
-    }
-
-    val favCloudCount: Int
-        get() = sSettingsPre.getInt(KEY_FAV_CLOUD, DEFAULT_FAV_COUNT)
-
-    fun putFavCloudCount(count: Int) {
-        sSettingsPre.edit().putInt(KEY_FAV_CLOUD, count).apply()
-    }
-
-    val recentFavCat: Int
-        get() = getInt(KEY_RECENT_FAV_CAT, DEFAULT_RECENT_FAV_CAT)
-
-    fun putRecentFavCat(value: Int) {
-        putInt(KEY_RECENT_FAV_CAT, value)
-    }
-
-    val defaultFavSlot: Int
-        get() = getInt(KEY_DEFAULT_FAV_SLOT, DEFAULT_DEFAULT_FAV_SLOT)
-
-    fun putDefaultFavSlot(value: Int) {
-        putInt(KEY_DEFAULT_FAV_SLOT, value)
-    }
-
-    val qSSaveProgress: Boolean
-        get() = getBoolean(KEY_QS_SAVE_PROGRESS, DEFAULT_QS_SAVE_PROGRESS)
-
-    fun putQSSaveProgress(value: Boolean) {
-        putBoolean(KEY_QS_SAVE_PROGRESS, value)
-    }
-
-    val saveParseErrorBody: Boolean
-        get() = getBoolean(KEY_SAVE_PARSE_ERROR_BODY, DEFAULT_SAVE_PARSE_ERROR_BODY)
-    val saveCrashLog: Boolean
-        get() = getBoolean(KEY_SAVE_CRASH_LOG, DEFAULT_SAVE_CRASH_LOG)
-    val security: Boolean
-        get() = getBoolean(KEY_SECURITY, false)
-
-    fun putSecurity(value: Boolean) {
-        putBoolean(KEY_SECURITY, value)
-    }
-
-    val securityDelay: Int
-        get() = getInt(KEY_SECURITY_DELAY, 0)
-    val readCacheSize: Int
-        get() = getIntFromStr(KEY_READ_CACHE_SIZE, DEFAULT_READ_CACHE_SIZE)
-    val builtInHosts: Boolean
-        get() = getBoolean(KEY_BUILT_IN_HOSTS, DEFAULT_BUILT_IN_HOSTS)
-
-    private fun putBuiltInHosts(value: Boolean) {
-        putBoolean(KEY_BUILT_IN_HOSTS, value)
-    }
-
-    val dF: Boolean
-        get() = getBoolean(KEY_DOMAIN_FRONTING, DEFAULT_FRONTING)
-
-    private fun putDF(value: Boolean) {
-        putBoolean(KEY_DOMAIN_FRONTING, value)
-    }
-
-    val bypassVpn: Boolean
-        get() = getBoolean(KEY_BYPASS_VPN, DEFAULT_BYPASS_VPN)
-
-    @JvmStatic
-    val proxyType: Int
-        get() = getInt(KEY_PROXY_TYPE, DEFAULT_PROXY_TYPE)
-
-    fun putProxyType(value: Int) {
-        putInt(KEY_PROXY_TYPE, value)
-    }
-
-    @JvmStatic
-    val proxyIp: String?
-        get() = getString(KEY_PROXY_IP, DEFAULT_PROXY_IP)
-
-    fun putProxyIp(value: String?) {
-        putString(KEY_PROXY_IP, value)
-    }
-
-    @JvmStatic
-    val proxyPort: Int
-        get() = getInt(KEY_PROXY_PORT, DEFAULT_PROXY_PORT)
-
-    fun putProxyPort(value: Int) {
-        putInt(KEY_PROXY_PORT, value)
-    }
-
-    val clipboardTextHashCode: Int
-        get() = getInt(KEY_CLIPBOARD_TEXT_HASH_CODE, DEFAULT_CLIPBOARD_TEXT_HASH_CODE)
-
-    fun putClipboardTextHashCode(value: Int) {
-        putInt(KEY_CLIPBOARD_TEXT_HASH_CODE, value)
-    }
-
-    val archivePasswds: Set<String>?
-        get() = getStringSet(KEY_ARCHIVE_PASSWDS)
-
-    fun putPasswdToArchivePasswds(value: String) {
-        putStringToStringSet(KEY_ARCHIVE_PASSWDS, value)
-    }
-
-    val listThumbSize: Int
-        get() {
-            if (LIST_THUMB_SIZE_INITED) {
-                return LIST_THUMB_SIZE
-            }
-            val size = 3 * getInt(KEY_LIST_THUMB_SIZE, DEFAULT_LIST_THUMB_SIZE)
-            LIST_THUMB_SIZE = size
-            LIST_THUMB_SIZE_INITED = true
-            return size
-        }
-    val notificationRequired: Boolean
-        get() = getBoolean(KEY_NOTIFICATION_REQUIRED, false)
-
-    fun putNotificationRequired() {
-        putBoolean(KEY_NOTIFICATION_REQUIRED, true)
-    }
-
-    val preloadThumbAggressively: Boolean
-        get() = getBoolean(KEY_PRELOAD_THUMB_AGGRESIVELY, DEFAULT_PRELOAD_THUMB_AGGRESIVELY)
-}
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hippo.ehviewer;
+
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.text.TextUtils;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.browser.customtabs.CustomTabsIntent;
+
+import com.hippo.ehviewer.client.data.GalleryDetail;
+import com.hippo.ehviewer.client.parser.GalleryPageUrlParser;
+
+import eu.kanade.tachiyomi.ui.reader.ReaderActivity;
+
+public final class UrlOpener {
+
+    private UrlOpener() {
+    }
+
+    public static void openUrl(@NonNull Context context, String url, boolean ehUrl) {
+        openUrl(context, url, ehUrl, null);
+    }
+
+    public static void openUrl(@NonNull Context context, String url, boolean ehUrl, GalleryDetail galleryDetail) {
+        if (TextUtils.isEmpty(url)) {
+            return;
+        }
+
+        Intent intent;
+        Uri uri = Uri.parse(url);
+
+        if (ehUrl) {
+            if (galleryDetail != null) {
+                GalleryPageUrlParser.Result result = GalleryPageUrlParser.parse(url);
+                if (result != null) {
+                    if (result.gid == galleryDetail.getGid()) {
+                        intent = new Intent(context, ReaderActivity.class);
+                        intent.setAction(ReaderActivity.ACTION_EH);
+                        intent.putExtra(ReaderActivity.KEY_GALLERY_INFO, galleryDetail);
+                        intent.putExtra(ReaderActivity.KEY_PAGE, result.page);
+                        context.startActivity(intent);
+                        return;
+                    }
+                } else if (url.startsWith("#c")) {
+                    try {
+                        intent = new Intent(context, ReaderActivity.class);
+                        intent.setAction(ReaderActivity.ACTION_EH);
+                        intent.putExtra(ReaderActivity.KEY_GALLERY_INFO, galleryDetail);
+                        intent.putExtra(ReaderActivity.KEY_PAGE, Integer.parseInt(url.replace("#c", "")) - 1);
+                        context.startActivity(intent);
+                        return;
+                    } catch (NumberFormatException e) {
+                        //
+                    }
+                }
+            }
+        }
+
+        CustomTabsIntent.Builder customTabsIntent = new CustomTabsIntent.Builder();
+        customTabsIntent.setShowTitle(true);
+        try {
+            customTabsIntent.build().launchUrl(context, uri);
+        } catch (ActivityNotFoundException e) {
+            Toast.makeText(context, R.string.no_browser_installed, Toast.LENGTH_LONG).show();
+        }
+    }
+}
@@ -16,7 +16,7 @@
 * If not, see <https://www.gnu.org/licenses/>.
 */

-package com.hippo.ehviewer.ui.legacy;
+package com.hippo.ehviewer;

 import android.view.View;

@@ -24,7 +24,7 @@ import androidx.annotation.NonNull;
 import androidx.core.view.WindowInsetsAnimationCompat;
 import androidx.core.view.WindowInsetsCompat;

-import com.hippo.ehviewer.yorozuya.MathUtils;
+import com.hippo.yorozuya.MathUtils;

 import java.util.HashMap;
 import java.util.List;
@@ -15,32 +15,8 @@
 */
 package com.hippo.ehviewer.client

-import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.client.data.GalleryPreview
-import com.hippo.ehviewer.client.data.NormalGalleryPreview
-
-// ExHentai Large Preview: https://s.exhentai.org/t/***
-// ExHentai Normal Preview: https://s.exhentai.org/m/***
-// EHentai Normal Preview: https://ehgt.org/m/***
-// EHentai Large Preview: https://ehgt.org/***
-
-private const val URL_PREFIX_THUMB_E = "https://ehgt.org/"
-private const val URL_PREFIX_THUMB_EX = "https://s.exhentai.org/"
-
-fun getImageKey(gid: Long, index: Int): String {
-    return "image:$gid:$index"
-}
-
-fun getThumbKey(url: String): String {
-    return url.removePrefix(URL_PREFIX_THUMB_E).removePrefix(URL_PREFIX_THUMB_EX).removePrefix("t/")
-}
-
-val GalleryPreview.url
-    get() = if (this is NormalGalleryPreview) {
-        if (EhUtils.isExHentai) URL_PREFIX_THUMB_EX + imageKey else URL_PREFIX_THUMB_E + imageKey
-    } else {
-        if (EhUtils.isExHentai) URL_PREFIX_THUMB_EX + "t/" + imageKey else URL_PREFIX_THUMB_E + imageKey
+object EhCacheKeyFactory {
+    fun getImageKey(gid: Long, index: Int): String {
+        return "image:$gid:$index"
    }
-
-val GalleryInfo.thumbUrl
-    get() = if (EhUtils.isExHentai) URL_PREFIX_THUMB_EX + "t/" + thumbKey!! else URL_PREFIX_THUMB_E + thumbKey!!
+}
@@ -0,0 +1,184 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.client
+
+import eu.kanade.tachiyomi.util.lang.launchIO
+import eu.kanade.tachiyomi.util.lang.withUIContext
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineScope
+import java.io.File
+
+object EhClient {
+    internal fun enqueue(request: EhRequest, scope: CoroutineScope) {
+        check(!request.isActive) // Abort if attempt to execute an active request
+        request.job = scope.launchIO {
+            val callback: Callback<Any?>? = request.callback
+            try {
+                val result: Any? = request.run {
+                    if (args == null)
+                        execute(method)
+                    else
+                        execute(method, *args!!)
+                }
+                withUIContext { callback?.onSuccess(result) }
+            } catch (e: Exception) {
+                if (e is CancellationException)
+                    throw e // Don't catch coroutine CancellationException
+                e.printStackTrace()
+                withUIContext { callback?.onFailure(e) }
+            }
+        }
+    }
+
+    suspend fun execute(method: Int, vararg params: Any?): Any? {
+        return when (method) {
+            METHOD_SIGN_IN -> EhEngine.signIn(
+                params[0] as String,
+                params[1] as String
+            )
+
+            METHOD_GET_GALLERY_LIST -> EhEngine.getGalleryList(
+                params[0] as String
+            )
+
+            METHOD_GET_GALLERY_DETAIL -> EhEngine.getGalleryDetail(
+                params[0] as String?
+            )
+
+            METHOD_GET_PREVIEW_SET -> EhEngine.getPreviewSet(
+                params[0] as String?
+            )
+
+            METHOD_GET_RATE_GALLERY -> EhEngine.rateGallery(
+                params[0] as Long,
+                params[1] as String?,
+                params[2] as Long,
+                params[3] as String?,
+                params[4] as Float
+            )
+
+            METHOD_GET_COMMENT_GALLERY -> EhEngine.commentGallery(
+                params[0] as String?,
+                params[1] as String,
+                params[2] as String?
+            )
+
+            METHOD_GET_GALLERY_TOKEN -> EhEngine.getGalleryToken(
+                params[0] as Long,
+                params[1] as String?,
+                params[2] as Int
+            )
+
+            METHOD_GET_FAVORITES -> EhEngine.getFavorites(
+                params[0] as String
+            )
+
+            METHOD_ADD_FAVORITES -> EhEngine.addFavorites(
+                params[0] as Long,
+                params[1] as String?,
+                params[2] as Int,
+                params[3] as String?
+            )
+
+            METHOD_ADD_FAVORITES_RANGE -> @Suppress("UNCHECKED_CAST") EhEngine.addFavoritesRange(
+                params[0] as LongArray,
+                params[1] as Array<String?>,
+                params[2] as Int
+            )
+
+            METHOD_MODIFY_FAVORITES -> EhEngine.modifyFavorites(
+                params[0] as String,
+                params[1] as LongArray,
+                params[2] as Int
+            )
+
+            METHOD_GET_TORRENT_LIST -> EhEngine.getTorrentList(
+                params[0] as String?,
+                params[1] as Long,
+                params[2] as String?
+            )
+
+            METHOD_GET_PROFILE -> EhEngine.getProfile()
+            METHOD_VOTE_COMMENT -> EhEngine.voteComment(
+                params[0] as Long,
+                params[1] as String?,
+                params[2] as Long,
+                params[3] as String?,
+                params[4] as Long,
+                params[5] as Int
+            )
+
+            METHOD_IMAGE_SEARCH -> EhEngine.imageSearch(
+                params[0] as File,
+                params[1] as Boolean,
+                params[2] as Boolean,
+                params[3] as Boolean
+            )
+
+            METHOD_ARCHIVE_LIST -> EhEngine.getArchiveList(
+                params[0] as String?,
+                params[1] as Long,
+                params[2] as String?
+            )
+
+            METHOD_DOWNLOAD_ARCHIVE -> EhEngine.downloadArchive(
+                params[0] as Long,
+                params[1] as String?,
+                params[2] as String?,
+                params[3] as String?,
+                params[4] as Boolean
+            )
+
+            METHOD_VOTE_TAG -> EhEngine.voteTag(
+                params[0] as Long,
+                params[1] as String?,
+                params[2] as Long,
+                params[3] as String?,
+                params[4] as String?,
+                params[5] as Int
+            )
+
+            METHOD_GET_UCONFIG -> EhEngine.getUConfig()
+            else -> throw IllegalStateException("Can't detect method $method")
+        }
+    }
+
+    interface Callback<E> {
+        fun onSuccess(result: E)
+        fun onFailure(e: Exception)
+        fun onCancel()
+    }
+
+    const val METHOD_SIGN_IN = 0
+    const val METHOD_GET_GALLERY_LIST = 1
+    const val METHOD_GET_GALLERY_DETAIL = 3
+    const val METHOD_GET_PREVIEW_SET = 4
+    const val METHOD_GET_RATE_GALLERY = 5
+    const val METHOD_GET_COMMENT_GALLERY = 6
+    const val METHOD_GET_GALLERY_TOKEN = 7
+    const val METHOD_GET_FAVORITES = 8
+    const val METHOD_ADD_FAVORITES = 9
+    const val METHOD_ADD_FAVORITES_RANGE = 10
+    const val METHOD_MODIFY_FAVORITES = 11
+    const val METHOD_GET_TORRENT_LIST = 12
+    const val METHOD_GET_PROFILE = 14
+    const val METHOD_VOTE_COMMENT = 15
+    const val METHOD_IMAGE_SEARCH = 16
+    const val METHOD_ARCHIVE_LIST = 17
+    const val METHOD_DOWNLOAD_ARCHIVE = 18
+    const val METHOD_VOTE_TAG = 19
+    const val METHOD_GET_UCONFIG = 20
+}
@@ -0,0 +1,806 @@
+/*
+ * 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.
+ */
+
+package com.hippo.ehviewer.client;
+
+import com.hippo.network.InetValidator;
+
+/**
+ * Some configurable stuff about EH. It ends up cookie.
+ */
+public class EhConfig implements Cloneable {
+
+    /**
+     * The Cookie key of uconfig
+     */
+    public static final String KEY_UCONFIG = "uconfig";
+    /**
+     * The Cookie key of lofi resolution
+     */
+    public static final String KEY_LOFI_RESOLUTION = "xres";
+    /**
+     * The Cookie key of show warning
+     */
+    public static final String KEY_CONTENT_WARNING = "nw";
+    /**
+     * load images through the Hentai@Home Network
+     */
+    public static final String LOAD_FROM_HAH_YES = "y";
+    /**
+     * do not load images through the Hentai@Home Network
+     */
+    public static final String LOAD_FROM_HAH_NO = "n";
+    /**
+     * Image Size Auto
+     */
+    public static final String IMAGE_SIZE_AUTO = "a";
+    /**
+     * Image Size 780x
+     */
+    public static final String IMAGE_SIZE_780X = "780";
+    /**
+     * Image Size 980x
+     */
+    public static final String IMAGE_SIZE_980X = "980";
+    /**
+     * Image Size 1280x
+     */
+    public static final String IMAGE_SIZE_1280X = "1280";
+    /**
+     * Image Size 1600x
+     */
+    public static final String IMAGE_SIZE_1600X = "1600";
+    /**
+     * Image Size 2400x
+     */
+    public static final String IMAGE_SIZE_2400X = "2400";
+    /**
+     * Manual Accept, Manual Start
+     */
+    public static final String ARCHIVER_DOWNLOAD_MAMS = "0";
+    /**
+     * >Manual Accept, Auto Start
+     */
+    public static final String ARCHIVER_DOWNLOAD_AAMS = "1";
+    /**
+     * Auto Accept, Manual Start
+     */
+    public static final String ARCHIVER_DOWNLOAD_MAAS = "2";
+    /**
+     * Auto Accept, Auto Start
+     */
+    public static final String ARCHIVER_DOWNLOAD_AAAS = "3";
+    /**
+     * List View on the front and search pages
+     */
+    public static final String LAYOUT_MODE_LIST = "l";
+    /**
+     * Thumbnail View on the front and search pages
+     */
+    public static final String LAYOUT_MODE_THUMB = "t";
+    public static final int MISC = 0x1;
+    public static final int DOUJINSHI = 0x2;
+    public static final int MANGA = 0x4;
+    public static final int ARTIST_CG = 0x8;
+    public static final int GAME_CG = 0x10;
+    public static final int IMAGE_SET = 0x20;
+    public static final int COSPLAY = 0x40;
+    public static final int ASIAN_PORN = 0x80;
+    public static final int NON_H = 0x100;
+    public static final int WESTERN = 0x200;
+    public static final int ALL_CATEGORY = 0x3ff;
+    public static final int NAMESPACES_RECLASS = 0x1;
+    public static final int NAMESPACES_LANGUAGE = 0x2;
+    public static final int NAMESPACES_PARODY = 0x4;
+    public static final int NAMESPACES_CHARACTER = 0x8;
+    public static final int NAMESPACES_GROUP = 0x10;
+    public static final int NAMESPACES_ARTIST = 0x20;
+    public static final int NAMESPACES_MALE = 0x40;
+    public static final int NAMESPACES_FEMALE = 0x80;
+    public static final String JAPANESE_ORIGINAL = "0";
+    public static final String JAPANESE_TRANSLATED = "1024";
+    public static final String JAPANESE_REWRITE = "2048";
+    public static final String ENGLISH_ORIGINAL = "1";
+    public static final String ENGLISH_TRANSLATED = "1025";
+    public static final String ENGLISH_REWRITE = "2049";
+    public static final String CHINESE_ORIGINAL = "10";
+    public static final String CHINESE_TRANSLATED = "1034";
+    public static final String CHINESE_REWRITE = "2058";
+    public static final String DUTCH_ORIGINAL = "20";
+    public static final String DUTCH_TRANSLATED = "1044";
+    public static final String DUTCH_REWRITE = "2068";
+    public static final String FRENCH_ORIGINAL = "30";
+    public static final String FRENCH_TRANSLATED = "1054";
+    public static final String FRENCH_REWRITE = "2078";
+    public static final String GERMAN_ORIGINAL = "40";
+    public static final String GERMAN_TRANSLATED = "1064";
+    public static final String GERMAN_REWRITE = "2088";
+    public static final String HUNGARIAN_ORIGINAL = "50";
+    public static final String HUNGARIAN_TRANSLATED = "1074";
+    public static final String HUNGARIAN_REWRITE = "2098";
+    public static final String ITALIAN_ORIGINAL = "60";
+    public static final String ITALIAN_TRANSLATED = "1084";
+    public static final String ITALIAN_REWRITE = "2108";
+    public static final String KOREAN_ORIGINAL = "70";
+    public static final String KOREAN_TRANSLATED = "1094";
+    public static final String KOREAN_REWRITE = "2118";
+    public static final String POLISH_ORIGINAL = "80";
+    public static final String POLISH_TRANSLATED = "1104";
+    public static final String POLISH_REWRITE = "2128";
+    public static final String PORTUGUESE_ORIGINAL = "90";
+    public static final String PORTUGUESE_TRANSLATED = "1114";
+    public static final String PORTUGUESE_REWRITE = "2138";
+    public static final String RUSSIAN_ORIGINAL = "100";
+    public static final String RUSSIAN_TRANSLATED = "1124";
+    public static final String RUSSIAN_REWRITE = "2148";
+    public static final String SPANISH_ORIGINAL = "110";
+    public static final String SPANISH_TRANSLATED = "1134";
+    public static final String SPANISH_REWRITE = "2158";
+    public static final String THAI_ORIGINAL = "120";
+    public static final String THAI_TRANSLATED = "1144";
+    public static final String THAI_REWRITE = "2168";
+    public static final String VIETNAMESE_ORIGINAL = "130";
+    public static final String VIETNAMESE_TRANSLATED = "1154";
+    public static final String VIETNAMESE_REWRITE = "2178";
+    public static final String NA_ORIGINAL = "254";
+    public static final String NA_TRANSLATED = "1278";
+    public static final String NA_REWRITE = "2302";
+    public static final String OTHER_ORIGINAL = "255";
+    public static final String OTHER_TRANSLATED = "1279";
+    public static final String OTHER_REWRITE = "2303";
+    /**
+     * 25 results per page for the index/search page and torrent search pages
+     */
+    public static final String RESULT_COUNT_25 = "0";
+    /**
+     * 50 results per page for the index/search page and torrent search pages
+     */
+    public static final String RESULT_COUNT_50 = "1";
+    /**
+     * 100 results per page for the index/search page and torrent search pages
+     */
+    public static final String RESULT_COUNT_100 = "2";
+    /**
+     * 200 results per page for the index/search page and torrent search pages
+     */
+    public static final String RESULT_COUNT_200 = "3";
+    /**
+     * On mouse-over
+     */
+    public static final String MOUSE_OVER_YES = "m";
+    /**
+     * On page load
+     */
+    public static final String MOUSE_OVER_NO = "p";
+    /**
+     * Preview normal size
+     */
+    public static final String PREVIEW_SIZE_NORMAL = "m";
+    /**
+     * Preview large size
+     */
+    public static final String PREVIEW_SIZE_LARGE = "l";
+    /**
+     * 4 row preview per page
+     */
+    public static final String PREVIEW_ROW_4 = "2";
+    /**
+     * 10 row preview per page
+     */
+    public static final String PREVIEW_ROW_10 = "5";
+    /**
+     * 20 row preview per page
+     */
+    public static final String PREVIEW_ROW_20 = "10";
+    /**
+     * 40 row preview per page
+     */
+    public static final String PREVIEW_ROW_40 = "20";
+    /**
+     * Oldest comments first
+     */
+    public static final String COMMENTS_SORT_OLDEST_FIRST = "a";
+    /**
+     * Recent comments first
+     */
+    public static final String COMMENTS_SORT_RECENT_FIRST = "d";
+    /**
+     * By highest score
+     */
+    public static final String COMMENTS_SORT_HIGHEST_SCORE_FIRST = "s";
+    /**
+     * Show gallery comment votes On score hover or click
+     */
+    public static final String COMMENTS_VOTES_POP = "0";
+    /**
+     * Always show gallery comment votes
+     */
+    public static final String COMMENTS_VOTES_ALWAYS = "1";
+    /**
+     * Sort order for gallery tags alphabetically
+     */
+    public static final String TAGS_SORT_ALPHABETICAL = "a";
+    /**
+     * Sort order for gallery tags by tag power
+     */
+    public static final String TAGS_SORT_POWER = "p";
+    /**
+     * Show gallery page numbers
+     */
+    public static final String SHOW_GALLERY_INDEX_YES = "1";
+    /**
+     * Do not show gallery page numbers
+     */
+    public static final String SHOW_GALLERY_INDEX_NO = "0";
+    /**
+     * Enable Tag Flagging
+     */
+    public static final String ENABLE_TAG_FLAGGING_YES = "y";
+    /**
+     * Do not enable Tag Flagging
+     */
+    public static final String ENABLE_TAG_FLAGGING_NO = "n";
+    /**
+     * Always display the original images
+     */
+    public static final String ALWAYS_ORIGINAL_YES = "y";
+    /**
+     * Do not Always display the original images
+     */
+    public static final String ALWAYS_ORIGINAL_NO = "n";
+    /**
+     * Enable the Multi-Page Viewe
+     */
+    public static final String MULTI_PAGE_YES = "y";
+    /**
+     * Do not enable the Multi-Page Viewe
+     */
+    public static final String MULTI_PAGE_NO = "n";
+    /**
+     * Align left, only scale if image is larger than browser width
+     */
+    public static final String MULTI_PAGE_STYLE_N = "n";
+    /**
+     * Align center, only scale if image is larger than browser width
+     */
+    public static final String MULTI_PAGE_STYLE_C = "c";
+    /**
+     * Align center, Always scale images to fit browser width
+     */
+    public static final String MULTI_PAGE_STYLE_Y = "y";
+    /**
+     * Show Multi-Page Viewer Thumbnail Pane
+     */
+    public static final String MULTI_PAGE_THUMB_SHOW = "n";
+    /**
+     * Hide Multi-Page Viewer Thumbnail Pane
+     */
+    public static final String MULTI_PAGE_THUMB_HIDE = "y";
+    /**
+     * 460x for lofi resolution
+     */
+    public static final String LOFI_RESOLUTION_460X = "1";
+    /**
+     * 780X for lofi resolution
+     */
+    public static final String LOFI_RESOLUTION_780X = "2";
+    /**
+     * 980X for lofi resolution
+     */
+    public static final String LOFI_RESOLUTION_980X = "3";
+    /**
+     * show warning
+     */
+    public static final String CONTENT_WARNING_SHOW = "0";
+    /**
+     * not show warning
+     */
+    public static final String CONTENT_WARNING_NOT_SHOW = "1";
+    /**
+     * The key of load images through the Hentai@Home Network
+     *
+     * @see #LOAD_FROM_HAH_YES
+     * @see #LOAD_FROM_HAH_NO
+     */
+    private static final String KEY_LOAD_FROM_HAH = "uh";
+    /**
+     * The key of Image Size Settings
+     *
+     * @see #IMAGE_SIZE_AUTO
+     * @see #IMAGE_SIZE_780X
+     * @see #IMAGE_SIZE_980X
+     * @see #IMAGE_SIZE_1280X
+     * @see #IMAGE_SIZE_1600X
+     * @see #IMAGE_SIZE_2400X
+     */
+    private static final String KEY_IMAGE_SIZE = "xr";
+    /**
+     * The key of scale images width
+     */
+    private static final String KEY_SCALE_WIDTH = "rx";
+    /**
+     * The key of scale images height
+     */
+    private static final String KEY_SCALE_HEIGHT = "ry";
+    /**
+     * The key of Gallery Name Display
+     *
+     * @see #GALLERY_TITLE_DEFAULT
+     * @see #GALLERY_TITLE_JAPANESE
+     */
+    private static final String KEY_GALLERY_TITLE = "tl";
+    /**
+     * The key of the behavior for downloading archiver
+     *
+     * @see #ARCHIVER_DOWNLOAD_MAMS
+     * @see #ARCHIVER_DOWNLOAD_MAAS
+     * @see #ARCHIVER_DOWNLOAD_AAMS
+     * @see #ARCHIVER_DOWNLOAD_AAAS
+     */
+    private static final String KEY_ARCHIVER_DOWNLOAD = "ar";
+    /**
+     * The key of display mode would you like to use on the front and search pages
+     *
+     * @see #LAYOUT_MODE_LIST
+     * @see #LAYOUT_MODE_THUMB
+     */
+    private static final String KEY_LAYOUT_MODE = "dm";
+    /**
+     * The key for show popular
+     *
+     * @see #POPULAR_YES
+     * @see #POPULAR_NO
+     */
+    private static final String KEY_POPULAR = "prn";
+    /**
+     * The key of categories would you like to view as default on the front page
+     */
+    private static final String KEY_DEFAULT_CATEGORIES = "cats";
+    /**
+     * The key for favorites sort
+     *
+     * @see #FAVORITES_SORT_GALLERY_UPDATE_TIME
+     * @see #FAVORITES_SORT_FAVORITED_TIME
+     */
+    private static final String KEY_FAVORITES_SORT = "fs";
+    /**
+     * The key of exclude certain namespaces from a default tag search
+     */
+    private static final String KEY_EXCLUDED_NAMESPACES = "xns";
+    /**
+     * The key of hide galleries in certain languages from the gallery list and searches
+     */
+    private static final String KEY_EXCLUDED_LANGUAGES = "xl";
+    /**
+     * The key of how many results would you like per page for the index/search page and torrent search pages
+     *
+     * @see #RESULT_COUNT_25
+     * @see #RESULT_COUNT_50
+     * @see #RESULT_COUNT_100
+     * @see #RESULT_COUNT_200
+     */
+    private static final String KEY_RESULT_COUNT = "rc";
+    /**
+     * The key of mouse-over thumb
+     *
+     * @see #MOUSE_OVER_YES
+     * @see #MOUSE_OVER_NO
+     */
+    private static final String KEY_MOUSE_OVER = "lt";
+    /**
+     * The key of preview size
+     *
+     * @see #PREVIEW_SIZE_NORMAL
+     * @see #PREVIEW_SIZE_LARGE
+     */
+    private static final String KEY_PREVIEW_SIZE = "ts";
+    /**
+     * The key of preview row per page
+     *
+     * @see #PREVIEW_ROW_4
+     * @see #PREVIEW_ROW_10
+     * @see #PREVIEW_ROW_20
+     * @see #PREVIEW_ROW_40
+     */
+    private static final String KEY_PREVIEW_ROW = "tr";
+    /**
+     * The key of sort order for gallery comments
+     *
+     * @see #COMMENTS_SORT_OLDEST_FIRST
+     * @see #COMMENTS_SORT_RECENT_FIRST
+     * @see #COMMENTS_SORT_HIGHEST_SCORE_FIRST
+     */
+    private static final String KEY_COMMENTS_SORT = "cs";
+    /**
+     * The key of show gallery comment votes
+     *
+     * @see #COMMENTS_VOTES_POP
+     * @see #COMMENTS_VOTES_ALWAYS
+     */
+    private static final String KEY_COMMENTS_VOTES = "sc";
+    /**
+     * The key of sort order for gallery tags
+     *
+     * @see #TAGS_SORT_ALPHABETICAL
+     * @see #TAGS_SORT_POWER
+     */
+    private static final String KEY_TAGS_SORT = "to";
+    /**
+     * The key of show gallery page numbers
+     *
+     * @see #SHOW_GALLERY_INDEX_NO
+     * @see #SHOW_GALLERY_INDEX_YES
+     */
+    private static final String KEY_SHOW_GALLERY_INDEX = "pn";
+    /**
+     * The key of the IP:Port of a proxy-enabled Hentai@Home Client
+     * to load all images
+     */
+    private static final String KEY_HAH_CLIENT_IP_PORT = "hp";
+    /**
+     * The key of the passkey of a proxy-enabled Hentai@Home Client
+     * to load all images
+     */
+    private static final String KEY_HAH_CLIENT_PASSKEY = "hk";
+    /**
+     * The key of enable Tag Flagging
+     *
+     * @see #ENABLE_TAG_FLAGGING_NO
+     * @see #ENABLE_TAG_FLAGGING_YES
+     */
+    private static final String KEY_ENABLE_TAG_FLAGGING = "tf";
+    /**
+     * The key of always display the original images instead of the resampled versions
+     *
+     * @see #ALWAYS_ORIGINAL_NO
+     * @see #ALWAYS_ORIGINAL_YES
+     */
+    private static final String KEY_ALWAYS_ORIGINAL = "oi";
+    /**
+     * The key of enable the multi-Page Viewer
+     *
+     * @see #MULTI_PAGE_NO
+     * @see #MULTI_PAGE_YES
+     */
+    private static final String KEY_MULTI_PAGE = "qb";
+    /**
+     * The key of multi-Page Viewer Display Style
+     *
+     * @see #MULTI_PAGE_STYLE_C
+     * @see #MULTI_PAGE_STYLE_N
+     * @see #MULTI_PAGE_STYLE_Y
+     */
+    private static final String KEY_MULTI_PAGE_STYLE = "ms";
+    /**
+     * The key of multi-Page Viewer Thumbnail Pane
+     *
+     * @see #MULTI_PAGE_THUMB_HIDE
+     * @see #MULTI_PAGE_THUMB_SHOW
+     */
+    private static final String KEY_MULTI_PAGE_THUMB = "mt";
+    /**
+     * Default gallery title
+     */
+    private static final String GALLERY_TITLE_DEFAULT = "r";
+    /**
+     * Japanese gallery title
+     */
+    private static final String GALLERY_TITLE_JAPANESE = "j";
+    /**
+     * Show popular
+     */
+    private static final String POPULAR_YES = "y";
+    /**
+     * Don't show popular
+     */
+    private static final String POPULAR_NO = "n";
+    /**
+     * Sort favorites by last gallery update time
+     */
+    private static final String FAVORITES_SORT_GALLERY_UPDATE_TIME = "p";
+    /**
+     * Sort favorites by favorited time
+     */
+    private static final String FAVORITES_SORT_FAVORITED_TIME = "f";
+    /**
+     * Load images through the Hentai@Home Network<br/>
+     * key: {@link #KEY_LOAD_FROM_HAH}<br/>
+     * value: {@link #LOAD_FROM_HAH_YES}, {@link #LOAD_FROM_HAH_NO}
+     */
+    public String loadFromHAH = LOAD_FROM_HAH_YES;
+
+    /**
+     * Image Size<br/>
+     * key: {@link #KEY_IMAGE_SIZE}<br/>
+     * value: {@link #IMAGE_SIZE_AUTO}, {@link #IMAGE_SIZE_780X}, {@link #IMAGE_SIZE_980X},
+     * {@link #IMAGE_SIZE_1280X}, {@link #IMAGE_SIZE_1600X}, {@link #IMAGE_SIZE_2400X}
+     */
+    public String imageSize = IMAGE_SIZE_AUTO;
+
+    /**
+     * Scale width<br/>
+     * key: {@link #KEY_SCALE_WIDTH}<br/>
+     * value: 0 for no limit
+     */
+    public int scaleWidth = 0;
+
+    /**
+     * Scale height<br/>
+     * key: {@link #KEY_SCALE_HEIGHT}<br/>
+     * value: 0 for no limit
+     */
+    public int scaleHeight = 0;
+
+    /**
+     * Gallery title<br/>
+     * key: {@link #KEY_GALLERY_TITLE}<br/>
+     * value: {@link #GALLERY_TITLE_DEFAULT}, {@link #GALLERY_TITLE_JAPANESE}
+     */
+    public String galleryTitle = GALLERY_TITLE_DEFAULT;
+
+    /**
+     * The default behavior for downloading an archiver<br/>
+     * key: {@link #KEY_ARCHIVER_DOWNLOAD}<br/>
+     * value: {@link #ARCHIVER_DOWNLOAD_MAMS}, {@link #ARCHIVER_DOWNLOAD_AAMS},
+     * {@link #ARCHIVER_DOWNLOAD_MAAS}, {@link #ARCHIVER_DOWNLOAD_AAAS}
+     */
+    public String archiverDownload = ARCHIVER_DOWNLOAD_MAMS;
+
+    /**
+     * Display mode used on the front and search pages<br/>
+     * false for list, true for thumb<br/>
+     * key: {@link #KEY_LAYOUT_MODE}<br/>
+     * value: {@link #LAYOUT_MODE_LIST}, {@link #LAYOUT_MODE_THUMB}
+     */
+    public String layoutMode = LAYOUT_MODE_LIST;
+
+    /**
+     * Show popular or not<br/>
+     * key: {@link #KEY_POPULAR}<br/>
+     * value: {@link #POPULAR_YES}, {@link #POPULAR_NO}
+     */
+    public String popular = POPULAR_YES;
+
+    /**
+     * Default categories on the front page<br/>
+     * key: {@link #KEY_DEFAULT_CATEGORIES}<br/>
+     * value: the value of categories, for multiple use & operation,
+     * 0 for none
+     */
+    public int defaultCategories = 0;
+
+    /**
+     * <br/>
+     * key: {@link #KEY_FAVORITES_SORT}<br/>
+     * value: {@link #FAVORITES_SORT_GALLERY_UPDATE_TIME}, {@link #FAVORITES_SORT_FAVORITED_TIME}
+     */
+    public String favoritesSort = FAVORITES_SORT_FAVORITED_TIME;
+
+    /**
+     * Certain namespaces excluded from a default tag search<br/>
+     * key: {@link #KEY_EXCLUDED_NAMESPACES}<br/>
+     * value: the value of namespaces, for multiple use & operation,
+     * 0 for none
+     */
+    public int excludedNamespaces = 0;
+
+    /**
+     * Certain languages excluded from list and searches<br/>
+     * key: {@link #KEY_EXCLUDED_LANGUAGES}<br/>
+     * value: {@link #JAPANESE_TRANSLATED}, {@link #JAPANESE_REWRITE} ...
+     * For multiple languages, use <code>x<code/> to combine them, like 1x1024x2048
+     */
+    public String excludedLanguages = "";
+
+    /**
+     * How many results would you like per page for the index/search page
+     * and torrent search pages<br/>
+     * key: {@link #KEY_RESULT_COUNT}<br/>
+     * value: {@link #RESULT_COUNT_25}, {@link #RESULT_COUNT_50},
+     * {@link #RESULT_COUNT_100}, {@link #RESULT_COUNT_200}<br/>
+     * Require <code>Hath Perk:Paging Enlargement</code>
+     */
+    public String resultCount = RESULT_COUNT_25;
+
+    /**
+     * mouse-over thumb<br/>
+     * key: {@link #KEY_MOUSE_OVER}<br/>
+     * value: {@link #MOUSE_OVER_YES}, {@link #MOUSE_OVER_NO}
+     */
+    public String mouseOver = MOUSE_OVER_YES;
+
+    /**
+     * Default preview mode<br/>
+     * key: {@link #KEY_PREVIEW_SIZE}<br/>
+     * value: {@link #PREVIEW_SIZE_NORMAL}, {@link #PREVIEW_SIZE_LARGE}
+     */
+    public String previewSize = PREVIEW_SIZE_LARGE;
+
+    /**
+     * Preview row<br/>
+     * key: {@link #KEY_PREVIEW_ROW}<br/>
+     * value: {@link #PREVIEW_ROW_4}, {@link #PREVIEW_ROW_10},
+     * {@link #PREVIEW_ROW_20}, {@link #PREVIEW_ROW_40}
+     */
+    public String previewRow = PREVIEW_ROW_4;
+
+    /**
+     * Sort order for gallery comments<br/>
+     * key: {@link #KEY_COMMENTS_SORT}<br/>
+     * value: {@link #COMMENTS_SORT_OLDEST_FIRST}, {@link #COMMENTS_SORT_RECENT_FIRST},
+     * {@link #COMMENTS_SORT_HIGHEST_SCORE_FIRST}
+     */
+    public String commentSort = COMMENTS_SORT_OLDEST_FIRST;
+
+    /**
+     * Show gallery comment votes mode<br/>
+     * key: {@link #KEY_COMMENTS_VOTES}<br/>
+     * value: {@link #COMMENTS_VOTES_POP}, {@link #COMMENTS_VOTES_ALWAYS}
+     */
+    public String commentVotes = COMMENTS_VOTES_POP;
+
+
+    /**
+     * Sort order for gallery tags<br/>
+     * key: {@link #KEY_TAGS_SORT}<br/>
+     * value: {@link #TAGS_SORT_ALPHABETICAL}, {@link #TAGS_SORT_POWER}
+     */
+    public String tagSort = TAGS_SORT_ALPHABETICAL;
+
+    /**
+     * Show gallery page numbers<br/>
+     * key: {@link #KEY_SHOW_GALLERY_INDEX}<br/>
+     * value: {@link #SHOW_GALLERY_INDEX_YES}, {@link #SHOW_GALLERY_INDEX_NO}
+     */
+    public String showGalleryIndex = SHOW_GALLERY_INDEX_YES;
+
+    /**
+     * The IP of a proxy-enabled Hentai@Home Client
+     * to load all images<br/>
+     * key: {@link #KEY_HAH_CLIENT_IP_PORT}<br/>
+     */
+    public String hahClientIp = "";
+
+    /**
+     * The PORT of a proxy-enabled Hentai@Home Client
+     * to load all images<br/>
+     * key: {@link #KEY_HAH_CLIENT_IP_PORT}<br/>
+     */
+    public int hahClientPort = -1;
+
+    /**
+     * The passkey of a proxy-enabled Hentai@Home Client
+     * to load all images<br/>
+     * key: {@link #KEY_HAH_CLIENT_PASSKEY}<br/>
+     */
+    public String hahClientPasskey = "";
+
+    /**
+     * Enable tag flagging
+     * key: {@link #KEY_ENABLE_TAG_FLAGGING}<br/>
+     * value: {@link #ENABLE_TAG_FLAGGING_YES}, {@link #ENABLE_TAG_FLAGGING_NO}<br/>
+     * <code>Bronze Star</code> or <code>Hath Perk: Tag Flagging</code> Required
+     */
+    public String enableTagFlagging = ENABLE_TAG_FLAGGING_NO;
+
+    /**
+     * Always display the original images instead of the resampled versions<br/>
+     * key: {@link #KEY_ALWAYS_ORIGINAL}<br/>
+     * value: {@link #ALWAYS_ORIGINAL_YES}, {@link #ALWAYS_ORIGINAL_NO}<br/>
+     * <code>Silver Star</code> or <code>Hath Perk: Source Nexus</code> Required
+     */
+    public String alwaysOriginal = ALWAYS_ORIGINAL_NO;
+
+    /**
+     * Enable the multi-Page Viewer<br/>
+     * key: {@link #KEY_MULTI_PAGE}<br/>
+     * value: {@link #MULTI_PAGE_YES}, {@link #MULTI_PAGE_NO}<br/>
+     * <code>Gold Star</code> or <code>Hath Perk: Multi-Page Viewer</code> Required
+     */
+    public String multiPage = MULTI_PAGE_NO;
+
+    /**
+     * Multi-Page Viewer Display Style<br/>
+     * key: {@link #KEY_MULTI_PAGE_STYLE}<br/>
+     * value: {@link #MULTI_PAGE_STYLE_N}, {@link #MULTI_PAGE_STYLE_C},
+     * {@link #MULTI_PAGE_STYLE_Y}<br/>
+     * <code>Gold Star</code> or <code>Hath Perk: Multi-Page Viewer</code> Required
+     */
+    public String multiPageStyle = MULTI_PAGE_STYLE_N;
+
+    /**
+     * Multi-Page Viewer Thumbnail Pane<br/>
+     * key: {@link #KEY_MULTI_PAGE_THUMB}<br/>
+     * value: {@link #MULTI_PAGE_THUMB_SHOW}, {@link #MULTI_PAGE_THUMB_HIDE}<br/>
+     * <code>Gold Star</code> or <code>Hath Perk: Multi-Page Viewer</code> Required
+     */
+    public String multiPageThumb = MULTI_PAGE_THUMB_SHOW;
+
+    /**
+     * Lofi resolution
+     * key: {@link #KEY_LOFI_RESOLUTION}<br/>
+     * value: {@link #LOFI_RESOLUTION_460X}, {@link #LOFI_RESOLUTION_780X},
+     * {@link #LOFI_RESOLUTION_980X}
+     */
+    public String lofiResolution = LOFI_RESOLUTION_980X;
+
+    /**
+     * Show content warning
+     * key: {@link #KEY_CONTENT_WARNING}<br/>
+     * value: {@link #CONTENT_WARNING_SHOW}, {@link #CONTENT_WARNING_NOT_SHOW}
+     */
+    public String contentWarning = CONTENT_WARNING_NOT_SHOW;
+
+    private String mUconfig;
+
+    private boolean mDirty = true;
+
+    @Override
+    public EhConfig clone() {
+        try {
+            return (EhConfig) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+    public synchronized void setDirty() {
+        mDirty = true;
+    }
+
+    private void updateUconfig() {
+        String hahClientIpPort = (InetValidator.isValidInet4Address(hahClientIp) &&
+                InetValidator.isValidInetPort(hahClientPort)) ?
+                hahClientIp + "%3A" + hahClientPort : "";
+        String hahClientPasskey = null == this.hahClientPasskey ? "" : this.hahClientPasskey;
+        mUconfig = KEY_LOAD_FROM_HAH + "_" + loadFromHAH + "-" +
+                KEY_IMAGE_SIZE + "_" + imageSize + "-" +
+                KEY_SCALE_WIDTH + "_" + scaleWidth + "-" +
+                KEY_SCALE_HEIGHT + "_" + scaleHeight + "-" +
+                KEY_GALLERY_TITLE + "_" + galleryTitle + "-" +
+                KEY_ARCHIVER_DOWNLOAD + "_" + archiverDownload + "-" +
+                KEY_LAYOUT_MODE + "_" + layoutMode + "-" +
+                KEY_POPULAR + "_" + popular + "-" +
+                KEY_DEFAULT_CATEGORIES + "_" + defaultCategories + "-" +
+                KEY_FAVORITES_SORT + "_" + favoritesSort + "-" +
+                KEY_EXCLUDED_NAMESPACES + "_" + excludedNamespaces + "-" +
+                KEY_EXCLUDED_LANGUAGES + "_" + excludedLanguages + "-" +
+                KEY_RESULT_COUNT + "_" + resultCount + "-" +
+                KEY_MOUSE_OVER + "_" + mouseOver + "-" +
+                KEY_PREVIEW_SIZE + "_" + previewSize + "-" +
+                KEY_PREVIEW_ROW + "_" + previewRow + "-" +
+                KEY_COMMENTS_SORT + "_" + commentSort + "-" +
+                KEY_COMMENTS_VOTES + "_" + commentVotes + "-" +
+                KEY_TAGS_SORT + "_" + tagSort + "-" +
+                KEY_SHOW_GALLERY_INDEX + "_" + showGalleryIndex + "-" +
+                KEY_HAH_CLIENT_IP_PORT + "_" + hahClientIpPort + "-" +
+                KEY_HAH_CLIENT_PASSKEY + "_" + hahClientPasskey + "-" +
+                KEY_ENABLE_TAG_FLAGGING + "_" + enableTagFlagging + "-" +
+                KEY_ALWAYS_ORIGINAL + "_" + alwaysOriginal + "-" +
+                KEY_MULTI_PAGE + "_" + multiPage + "-" +
+                KEY_MULTI_PAGE_STYLE + "_" + multiPageStyle + "-" +
+                KEY_MULTI_PAGE_THUMB + "_" + multiPageThumb;
+    }
+
+    public synchronized String uconfig() {
+        if (mDirty) {
+            mDirty = false;
+            updateUconfig();
+        }
+
+        return mUconfig;
+    }
+}
@@ -16,9 +16,8 @@
 package com.hippo.ehviewer.client

 import com.hippo.ehviewer.EhApplication
-import com.hippo.ehviewer.network.CookieDatabase
-import com.hippo.ehviewer.network.CookieSet
-import eu.kanade.tachiyomi.util.lang.launchIO
+import com.hippo.network.CookieDatabase
+import com.hippo.network.CookieSet
 import okhttp3.Cookie
 import okhttp3.CookieJar
 import okhttp3.HttpUrl
@@ -27,7 +26,7 @@ import java.util.Collections
 import java.util.regex.Pattern

 object EhCookieStore : CookieJar {
-    private val db: CookieDatabase = CookieDatabase(EhApplication.application)
+    private val db: CookieDatabase = CookieDatabase(EhApplication.application, "okhttp3-cookie.db")
    private val map: MutableMap<String, CookieSet> = db.allCookies

    fun signOut() {
@@ -37,30 +36,23 @@ object EhCookieStore : CookieJar {
    fun hasSignedIn(): Boolean {
        val url = EhUrl.HOST_E.toHttpUrl()
        return contains(url, KEY_IPB_MEMBER_ID) &&
-            contains(url, KEY_IPB_PASS_HASH)
+                contains(url, KEY_IPB_PASS_HASH)
    }

    const val KEY_IPB_MEMBER_ID = "ipb_member_id"
    const val KEY_IPB_PASS_HASH = "ipb_pass_hash"
    const val KEY_IGNEOUS = "igneous"
-    const val KEY_SETTINGS_PROFILE = "sp"
-    const val KEY_STAR = "star"
-    private const val KEY_CONTENT_WARNING = "nw"
-    private const val CONTENT_WARNING_NOT_SHOW = "1"
    private val sTipsCookie: Cookie = Cookie.Builder()
-        .name(KEY_CONTENT_WARNING)
-        .value(CONTENT_WARNING_NOT_SHOW)
+        .name(EhConfig.KEY_CONTENT_WARNING)
+        .value(EhConfig.CONTENT_WARNING_NOT_SHOW)
        .domain(EhUrl.DOMAIN_E)
        .path("/")
        .expiresAt(Long.MAX_VALUE)
        .build()

    fun newCookie(
-        cookie: Cookie,
-        newDomain: String,
-        forcePersistent: Boolean = false,
-        forceLongLive: Boolean = false,
-        forceNotHostOnly: Boolean = false,
+        cookie: Cookie, newDomain: String, forcePersistent: Boolean,
+        forceLongLive: Boolean, forceNotHostOnly: Boolean
    ): Cookie {
        val builder = Cookie.Builder()
        builder.name(cookie.name)
@@ -87,21 +79,6 @@ object EhCookieStore : CookieJar {
        return builder.build()
    }

-    fun copyCookie(domain: String, newDomain: String, name: String, path: String = "/") {
-        val cookie = map[domain]?.get(name, domain, path)
-        cookie?.let { addCookie(newCookie(it, newDomain)) }
-    }
-
-    fun deleteCookie(url: HttpUrl, name: String) {
-        val deletedCookie = Cookie.Builder()
-            .name(name)
-            .value("deleted")
-            .domain(url.host)
-            .expiresAt(0)
-            .build()
-        addCookie(deletedCookie)
-    }
-
    @Synchronized
    fun addCookie(cookie: Cookie) {
        // For cookie database
@@ -196,17 +173,17 @@ object EhCookieStore : CookieJar {
    @Synchronized
    fun clear() {
        map.clear()
-        launchIO {
-            db.clear()
-        }
+        db.clear()
+    }
+
+    @Synchronized
+    fun close() {
+        db.close()
    }

    override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>) {
        for (cookie in cookies) {
-            // See https://github.com/Ehviewer-Overhauled/Ehviewer/issues/873
-            if (cookie.name != "__utmp") {
-                addCookie(cookie)
-            }
+            addCookie(cookie)
        }
    }

@@ -237,12 +214,10 @@ object EhCookieStore : CookieJar {
        val urlHost = url.host
        return if (urlHost == domain) {
            true // As in 'example.com' matching 'example.com'.
-        } else {
-            urlHost.endsWith(domain!!) &&
-                urlHost[urlHost.length - domain.length - 1] == '.' && !verifyAsIpAddress(
-                    urlHost,
-                )
-        }
+        } else urlHost.endsWith(domain!!)
+                && urlHost[urlHost.length - domain.length - 1] == '.' && !verifyAsIpAddress(
+            urlHost
+        )
        // As in 'example.com' matching 'www.example.com'.
    }

@@ -254,7 +229,10 @@ object EhCookieStore : CookieJar {
            // Add all but skip some
            for (cookie in cookies) {
                val name = cookie.name
-                if (KEY_CONTENT_WARNING == name) {
+                if (EhConfig.KEY_CONTENT_WARNING == name) {
+                    continue
+                }
+                if (EhConfig.KEY_UCONFIG == name) {
                    continue
                }
                result.add(cookie)
@@ -266,4 +244,4 @@ object EhCookieStore : CookieJar {
            cookies
        }
    }
-}
+}
@@ -27,7 +27,7 @@ object EhDns : Dns {
    private val builtInHosts: MutableMap<String, List<InetAddress>> = mutableMapOf()

    init {
-        // Pair(ip: String!, blockedByCCP: Boolean!)
+        /* Pair(ip: String!, blockedByCCP: Boolean!) */
        val ehgtHosts = arrayOf(
            Pair("37.48.89.44", false),
            Pair("81.171.10.48", false),
@@ -56,13 +56,6 @@ object EhDns : Dns {
            Pair("178.175.132.20", false),
            Pair("178.175.132.22", false),
        )
-        put(
-            builtInHosts,
-            "s.exhentai.org",
-            Pair("178.175.129.254", false),
-            Pair("178.175.128.254", false),
-            Pair("178.175.132.22", false),
-        )
        put(
            builtInHosts,
            "repo.e-hentai.org",
@@ -77,27 +70,27 @@ object EhDns : Dns {
        put(
            builtInHosts,
            "ehgt.org",
-            *ehgtHosts,
+            *ehgtHosts
        )
        put(
            builtInHosts,
            "gt0.ehgt.org",
-            *ehgtHosts,
+            *ehgtHosts
        )
        put(
            builtInHosts,
            "gt1.ehgt.org",
-            *ehgtHosts,
+            *ehgtHosts
        )
        put(
            builtInHosts,
            "gt2.ehgt.org",
-            *ehgtHosts,
+            *ehgtHosts
        )
        put(
            builtInHosts,
            "gt3.ehgt.org",
-            *ehgtHosts,
+            *ehgtHosts
        )
        put(
            builtInHosts,
@@ -118,20 +111,20 @@ object EhDns : Dns {
    private fun put(
        map: MutableMap<String, List<InetAddress>>,
        host: String,
-        vararg ips: Pair<String, Boolean>,
+        vararg ips: Pair<String, Boolean>
    ) {
        map[host] = ips.mapNotNull { pair ->
-            Hosts.toInetAddress(host, pair.first).takeUnless { Settings.dF && pair.second }
+            Hosts.toInetAddress(host, pair.first).takeUnless { Settings.getDF() && pair.second }
        }
    }

    @Throws(UnknownHostException::class)
    override fun lookup(hostname: String): List<InetAddress> {
-        return hosts[hostname] ?: builtInHosts[hostname].takeIf { Settings.builtInHosts }
-            ?: Dns.SYSTEM.lookup(hostname)
+        return hosts[hostname] ?: builtInHosts[hostname].takeIf { Settings.getBuiltInHosts() }
+        ?: Dns.SYSTEM.lookup(hostname)
    }

    fun isInHosts(hostname: String): Boolean {
-        return hosts.contains(hostname) || (builtInHosts.contains(hostname) && Settings.builtInHosts)
+        return hosts.contains(hostname) || (builtInHosts.contains(hostname) && Settings.getBuiltInHosts())
    }
 }
@@ -16,20 +16,19 @@
 package com.hippo.ehviewer.client

 import android.util.Log
-import arrow.core.memoize
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.dao.Filter
-
-private val regex = { p: Filter -> Regex(p.text!!) }.memoize()
+import java.util.Locale
+import java.util.regex.Pattern

 object EhFilter {
-    val titleFilterList = mutableListOf<Filter>()
-    val uploaderFilterList = mutableListOf<Filter>()
-    val tagFilterList = mutableListOf<Filter>()
-    val tagNamespaceFilterList = mutableListOf<Filter>()
-    val commenterFilterList = mutableListOf<Filter>()
-    val commentFilterList = mutableListOf<Filter>()
+    private val mTitleFilterList: MutableList<Filter> = ArrayList()
+    private val mUploaderFilterList: MutableList<Filter> = ArrayList()
+    private val mTagFilterList: MutableList<Filter> = ArrayList()
+    private val mTagNamespaceFilterList: MutableList<Filter> = ArrayList()
+    private val mCommenterFilterList: MutableList<Filter> = ArrayList()
+    private val mCommentFilterList: MutableList<Filter> = ArrayList()

    const val MODE_TITLE = 0
    const val MODE_UPLOADER = 1
@@ -37,44 +36,83 @@ object EhFilter {
    const val MODE_TAG_NAMESPACE = 3
    const val MODE_COMMENTER = 4
    const val MODE_COMMENT = 5
-    private const val TAG = "EhFilter"
+    private val TAG = EhFilter::class.java.simpleName

-    init { EhDB.allFilter.forEach(::memorizeFilter) }
+    init {
+        val list = EhDB.getAllFilter()
+        var i = 0
+        val n = list.size
+        while (i < n) {
+            val filter = list[i]
+            when (filter.mode) {
+                MODE_TITLE -> {
+                    filter.text = filter.text!!.lowercase(Locale.getDefault())
+                    mTitleFilterList.add(filter)
+                }

-    private fun memorizeFilter(filter: Filter) {
-        when (filter.mode) {
-            MODE_TITLE -> {
-                filter.text = filter.text!!.lowercase()
-                titleFilterList.add(filter)
+                MODE_TAG -> {
+                    filter.text = filter.text!!.lowercase(Locale.getDefault())
+                    mTagFilterList.add(filter)
+                }
+
+                MODE_TAG_NAMESPACE -> {
+                    filter.text = filter.text!!.lowercase(Locale.getDefault())
+                    mTagNamespaceFilterList.add(filter)
+                }
+
+                MODE_UPLOADER -> mUploaderFilterList.add(filter)
+                MODE_COMMENTER -> mCommenterFilterList.add(filter)
+                MODE_COMMENT -> mCommentFilterList.add(filter)
+                else -> Log.d(TAG, "Unknown mode: " + filter.mode)
            }
-
-            MODE_TAG -> {
-                filter.text = filter.text!!.lowercase()
-                tagFilterList.add(filter)
-            }
-
-            MODE_TAG_NAMESPACE -> {
-                filter.text = filter.text!!.lowercase()
-                tagNamespaceFilterList.add(filter)
-            }
-
-            MODE_UPLOADER -> uploaderFilterList.add(filter)
-            MODE_COMMENTER -> commenterFilterList.add(filter)
-            MODE_COMMENT -> commentFilterList.add(filter)
-            else -> Log.d(TAG, "Unknown mode: " + filter.mode)
+            i++
        }
    }

+    val titleFilterList: List<Filter>
+        get() = mTitleFilterList
+    val uploaderFilterList: List<Filter>
+        get() = mUploaderFilterList
+    val tagFilterList: List<Filter>
+        get() = mTagFilterList
+    val tagNamespaceFilterList: List<Filter>
+        get() = mTagNamespaceFilterList
+    val commenterFilterList: List<Filter>
+        get() = mCommenterFilterList
+    val commentFilterList: List<Filter>
+        get() = mCommentFilterList
+
    @Synchronized
    fun addFilter(filter: Filter): Boolean {
+        // enable filter by default before it is added to database
        filter.enable = true
        if (!EhDB.addFilter(filter)) return false
-        memorizeFilter(filter)
+        when (filter.mode) {
+            MODE_TITLE -> {
+                filter.text = filter.text!!.lowercase(Locale.getDefault())
+                mTitleFilterList.add(filter)
+            }
+
+            MODE_TAG -> {
+                filter.text = filter.text!!.lowercase(Locale.getDefault())
+                mTagFilterList.add(filter)
+            }
+
+            MODE_TAG_NAMESPACE -> {
+                filter.text = filter.text!!.lowercase(Locale.getDefault())
+                mTagNamespaceFilterList.add(filter)
+            }
+
+            MODE_UPLOADER -> mUploaderFilterList.add(filter)
+            MODE_COMMENTER -> mCommenterFilterList.add(filter)
+            MODE_COMMENT -> mCommentFilterList.add(filter)
+            else -> Log.d(TAG, "Unknown mode: " + filter.mode)
+        }
        return true
    }

    @Synchronized
-    fun triggerFilter(filter: Filter) {
+    fun triggerFilter(filter: Filter?) {
        EhDB.triggerFilter(filter)
    }

@@ -82,72 +120,196 @@ object EhFilter {
    fun deleteFilter(filter: Filter) {
        EhDB.deleteFilter(filter)
        when (filter.mode) {
-            MODE_TITLE -> titleFilterList.remove(filter)
-            MODE_TAG -> tagFilterList.remove(filter)
-            MODE_TAG_NAMESPACE -> tagNamespaceFilterList.remove(filter)
-            MODE_UPLOADER -> uploaderFilterList.remove(filter)
-            MODE_COMMENTER -> commenterFilterList.remove(filter)
-            MODE_COMMENT -> commentFilterList.remove(filter)
+            MODE_TITLE -> mTitleFilterList.remove(filter)
+            MODE_TAG -> mTagFilterList.remove(filter)
+            MODE_TAG_NAMESPACE -> mTagNamespaceFilterList.remove(filter)
+            MODE_UPLOADER -> mUploaderFilterList.remove(filter)
+            MODE_COMMENTER -> mCommenterFilterList.remove(filter)
+            MODE_COMMENT -> mCommentFilterList.remove(filter)
            else -> Log.d(TAG, "Unknown mode: " + filter.mode)
        }
    }

    @Synchronized
    fun needTags(): Boolean {
-        return 0 != tagFilterList.size || 0 != tagNamespaceFilterList.size
+        return 0 != mTagFilterList.size || 0 != mTagNamespaceFilterList.size
    }

    @Synchronized
-    fun filterTitle(info: GalleryInfo): Boolean {
-        val title = info.title ?: return false
-        return titleFilterList.any { it.enable!! && it.text!! in title.lowercase() }
+    fun filterTitle(info: GalleryInfo?): Boolean {
+        if (null == info) {
+            return false
+        }
+
+        // Title
+        val title = info.title
+        val filters: List<Filter> = mTitleFilterList
+        if (null != title && filters.isNotEmpty()) {
+            var i = 0
+            val n = filters.size
+            while (i < n) {
+                if (filters[i].enable!! && title.lowercase(Locale.getDefault()).contains(
+                        filters[i].text!!
+                    )
+                ) {
+                    return false
+                }
+                i++
+            }
+        }
+        return true
    }

    @Synchronized
-    fun filterUploader(info: GalleryInfo): Boolean {
-        val uploader = info.uploader ?: return false
-        return uploaderFilterList.any { it.enable!! && it.text == uploader }
+    fun filterUploader(info: GalleryInfo?): Boolean {
+        if (null == info) {
+            return false
+        }
+
+        // Uploader
+        val uploader = info.uploader
+        val filters: List<Filter> = mUploaderFilterList
+        if (null != uploader && filters.isNotEmpty()) {
+            var i = 0
+            val n = filters.size
+            while (i < n) {
+                if (filters[i].enable!! && uploader == filters[i].text) {
+                    return false
+                }
+                i++
+            }
+        }
+        return true
    }

-    private fun spiltTag(tag: String) = tag.run {
-        val index = indexOf(':')
-        if (index < 0) null to this else substring(0, index) to substring(index + 1)
-    }
-
-    private fun matchTag(tag: String, filter: String): Boolean {
-        val (tagNamespace, tagName) = spiltTag(tag)
-        val (filterNamespace, filterName) = spiltTag(filter)
-        return if (null != tagNamespace && null != filterNamespace && tagNamespace != filterNamespace) {
-            false
+    private fun matchTag(tag: String?, filter: String?): Boolean {
+        if (null == tag || null == filter) {
+            return false
+        }
+        val tagNamespace: String?
+        val tagName: String
+        val filterNamespace: String?
+        val filterName: String
+        var index = tag.indexOf(':')
+        if (index < 0) {
+            tagNamespace = null
+            tagName = tag
        } else {
-            tagName == filterName
+            tagNamespace = tag.substring(0, index)
+            tagName = tag.substring(index + 1)
+        }
+        index = filter.indexOf(':')
+        if (index < 0) {
+            filterNamespace = null
+            filterName = filter
+        } else {
+            filterNamespace = filter.substring(0, index)
+            filterName = filter.substring(index + 1)
+        }
+        return if (null != tagNamespace && null != filterNamespace &&
+            tagNamespace != filterNamespace
+        ) {
+            false
+        } else tagName == filterName
+    }
+
+    @Synchronized
+    fun filterTag(info: GalleryInfo?): Boolean {
+        if (null == info) {
+            return false
+        }
+
+        // Tag
+        val tags = info.simpleTags
+        val filters: List<Filter> = mTagFilterList
+        if (null != tags && filters.isNotEmpty()) {
+            for (tag in tags) {
+                var i = 0
+                val n = filters.size
+                while (i < n) {
+                    if (filters[i].enable!! && matchTag(tag, filters[i].text)) {
+                        return false
+                    }
+                    i++
+                }
+            }
+        }
+        return true
+    }
+
+    private fun matchTagNamespace(tag: String?, filter: String?): Boolean {
+        if (null == tag || null == filter) {
+            return false
+        }
+        val tagNamespace: String
+        val index = tag.indexOf(':')
+        return if (index >= 0) {
+            tagNamespace = tag.substring(0, index)
+            tagNamespace == filter
+        } else {
+            false
        }
    }

    @Synchronized
-    fun filterTag(info: GalleryInfo): Boolean {
-        val tags = info.simpleTags ?: return false
-        return tags.any { tag -> tagFilterList.any { it.enable!! && matchTag(tag, it.text!!) } }
-    }
-
-    private fun matchTagNamespace(tag: String, filter: String): Boolean {
-        val (nameSpace, _) = spiltTag(tag)
-        return nameSpace == filter
+    fun filterTagNamespace(info: GalleryInfo?): Boolean {
+        if (null == info) {
+            return false
+        }
+        val tags = info.simpleTags
+        val filters: List<Filter> = mTagNamespaceFilterList
+        if (null != tags && filters.isNotEmpty()) {
+            for (tag in tags) {
+                var i = 0
+                val n = filters.size
+                while (i < n) {
+                    if (filters[i].enable!! && matchTagNamespace(tag, filters[i].text)) {
+                        return false
+                    }
+                    i++
+                }
+            }
+        }
+        return true
    }

    @Synchronized
-    fun filterTagNamespace(info: GalleryInfo): Boolean {
-        val tags = info.simpleTags ?: return false
-        return tags.any { tag -> tagNamespaceFilterList.any { it.enable!! && matchTagNamespace(tag, it.text!!) } }
+    fun filterCommenter(commenter: String?): Boolean {
+        if (null == commenter) {
+            return false
+        }
+        val filters: List<Filter> = mCommenterFilterList
+        if (filters.isNotEmpty()) {
+            var i = 0
+            val n = filters.size
+            while (i < n) {
+                if (filters[i].enable!! && commenter == filters[i].text) {
+                    return false
+                }
+                i++
+            }
+        }
+        return true
    }

    @Synchronized
-    fun filterCommenter(commenter: String): Boolean {
-        return commenterFilterList.any { it.enable!! && it.text == commenter }
+    fun filterComment(comment: String?): Boolean {
+        if (null == comment) {
+            return false
+        }
+        val filters: List<Filter> = mCommentFilterList
+        if (filters.isNotEmpty()) {
+            var i = 0
+            val n = filters.size
+            while (i < n) {
+                if (filters[i].enable!!) {
+                    val p = Pattern.compile(filters[i].text!!)
+                    val m = p.matcher(comment)
+                    if (m.find()) return false
+                }
+                i++
+            }
+        }
+        return true
    }
-
-    @Synchronized
-    fun filterComment(comment: String): Boolean {
-        return commentFilterList.any { it.enable!! && regex(it).containsMatchIn(comment) }
-    }
-}
+}
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.client
+
+import android.app.Activity
+import androidx.annotation.MainThread
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.Job
+
+class EhRequest {
+    internal var job: Job? = null
+    val isActive
+        get() = job?.isActive ?: false
+    var method = 0
+        private set
+    var args: Array<out Any?>? = null
+        private set
+    var callback: EhClient.Callback<Any?>? = null
+        private set
+
+    fun setMethod(method: Int): EhRequest {
+        this.method = method
+        return this
+    }
+
+    fun setArgs(vararg args: Any?): EhRequest {
+        this.args = args
+        return this
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    fun setCallback(callback: EhClient.Callback<*>?): EhRequest {
+        this.callback = callback as EhClient.Callback<Any?>?
+        return this
+    }
+
+    fun enqueue(scope: CoroutineScope) {
+        EhClient.enqueue(this, scope)
+    }
+
+    @DelicateCoroutinesApi
+    fun enqueue() {
+        EhClient.enqueue(this, GlobalScope)
+    }
+
+    fun enqueue(fragment: Fragment) {
+        enqueue(fragment.viewLifecycleOwner.lifecycleScope)
+    }
+
+    fun enqueue(activity: Activity) {
+        check(activity is FragmentActivity)
+        enqueue(activity.lifecycleScope)
+    }
+
+    @MainThread
+    fun cancel() {
+        if (isActive) {
+            job?.cancel()
+            callback?.onCancel()
+        }
+    }
+}
@@ -15,55 +15,15 @@
 */
 package com.hippo.ehviewer.client

-import com.hippo.ehviewer.EhApplication.Companion.nonCacheOkHttpClient
-import com.hippo.ehviewer.EhApplication.Companion.okHttpClient
-import okhttp3.FormBody
-import okhttp3.MediaType
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.MultipartBody
-import okhttp3.Request
-import okhttp3.RequestBody.Companion.toRequestBody
-import okhttp3.Response
-import okhttp3.executeAsync
-import org.json.JSONArray
-import org.json.JSONObject
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
+import com.hippo.okhttp.ChromeRequestBuilder

-inline fun ehRequest(url: String, referer: String? = null, origin: String? = null, builder: Request.Builder.() -> Unit = {}) = Request.Builder().url(url).apply {
-    addHeader("User-Agent", CHROME_USER_AGENT)
-    addHeader("Accept", CHROME_ACCEPT)
-    addHeader("Accept-Language", CHROME_ACCEPT_LANGUAGE)
-    referer?.let { addHeader("Referer", it) }
-    origin?.let { addHeader("Origin", it) }
-}.apply(builder).build()
-
-inline fun Request.Builder.formBody(builder: FormBody.Builder.() -> Unit) = post(FormBody.Builder().apply(builder).build())
-
-inline fun Request.Builder.multipartBody(builder: MultipartBody.Builder.() -> Unit) = post(MultipartBody.Builder().apply(builder).build())
-
-val MEDIA_TYPE_JSON: MediaType = "application/json; charset=utf-8".toMediaType()
-
-inline fun JSONObject.array(name: String, builder: JSONArray.() -> Unit): JSONObject = put(name, JSONArray().apply(builder))
-
-fun jsonArrayOf(vararg element: Any?) = JSONArray().apply { element.forEach { put(it) } } // Should ensure it is inlined
-
-inline fun Request.Builder.jsonBody(builder: JSONObject.() -> Unit) = post(JSONObject().apply(builder).toString().toRequestBody(MEDIA_TYPE_JSON))
-
-suspend inline fun <R> Request.execute(block: Response.() -> R): R {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
+class EhRequestBuilder @JvmOverloads constructor(
+    url: String,
+    referer: String?,
+    origin: String? = null
+) : ChromeRequestBuilder(url) {
+    init {
+        referer?.let { addHeader("Referer", it) }
+        origin?.let { addHeader("Origin", it) }
    }
-    return okHttpClient.newCall(this).executeAsync().use(block)
 }
-
-suspend inline fun <R> Request.executeNonCache(block: Response.() -> R): R {
-    contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-    }
-    return nonCacheOkHttpClient.newCall(this).executeAsync().use(block)
-}
-
-const val CHROME_USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.77 Safari/537.36"
-const val CHROME_ACCEPT = "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9"
-const val CHROME_ACCEPT_LANGUAGE = "en-US,en;q=0.5"
@@ -39,7 +39,7 @@ object EhSSLSocketFactory : SSLSocketFactory() {
        val sslSession = socket.session
        Log.d(
            "EhSSLSocketFactory",
-            "Host: " + host + " Address: " + address + " Protocol:" + sslSession.protocol + " CipherSuite:" + sslSession.cipherSuite,
+            "Host: " + host + " Address: " + address + " Protocol:" + sslSession.protocol + " CipherSuite:" + sslSession.cipherSuite
        )
        return socket
    }
@@ -52,7 +52,7 @@ object EhSSLSocketFactory : SSLSocketFactory() {
        host: String,
        port: Int,
        localHost: InetAddress,
-        localPort: Int,
+        localPort: Int
    ): Socket {
        return sslSocketFactory.createSocket(host, port, localHost, localPort)
    }
@@ -65,7 +65,7 @@ object EhSSLSocketFactory : SSLSocketFactory() {
        address: InetAddress,
        port: Int,
        localAddress: InetAddress,
-        localPort: Int,
+        localPort: Int
    ): Socket {
        return sslSocketFactory.createSocket(address, port, localAddress, localPort)
    }
@@ -18,39 +18,37 @@ package com.hippo.ehviewer.client
 import android.content.Context
 import com.hippo.ehviewer.AppConfig
 import com.hippo.ehviewer.EhApplication
-import com.hippo.ehviewer.EhApplication.Companion.nonCacheOkHttpClient
+import com.hippo.ehviewer.EhApplication.Companion.okHttpClient
 import com.hippo.ehviewer.R
-import com.hippo.ehviewer.yorozuya.FileUtils
-import com.hippo.ehviewer.yorozuya.copyToFile
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
+import com.hippo.util.ExceptionUtils
+import com.hippo.util.HashCodeUtils
+import com.hippo.yorozuya.FileUtils
+import com.hippo.yorozuya.IOUtils
+import eu.kanade.tachiyomi.util.lang.launchIO
+import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import moe.tarsin.coroutines.runSuspendCatching
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import okhttp3.executeAsync
-import okio.HashingSink.Companion.sha1
-import okio.blackholeSink
+import okio.BufferedSource
 import okio.buffer
 import okio.source
+import org.json.JSONException
 import org.json.JSONObject
 import java.io.File
+import java.io.FileInputStream
+import java.io.FileOutputStream
+import java.io.IOException
 import java.nio.charset.StandardCharsets
+import java.security.MessageDigest
+import java.security.NoSuchAlgorithmException

 private typealias TagGroup = Map<String, String>
 private typealias TagGroups = Map<String, TagGroup>

-object EhTagDatabase : CoroutineScope {
+object EhTagDatabase {
    private const val NAMESPACE_PREFIX = "n"
    private lateinit var tagGroups: TagGroups
-    private val updateLock = Mutex()
-    private val dbLock = Mutex()
-    override val coroutineContext = Dispatchers.IO + Job()

    fun isInitialized(): Boolean {
        return this::tagGroups.isInitialized
@@ -62,6 +60,14 @@ object EhTagDatabase : CoroutineScope {
    private fun JSONObject.toTagGroup(): TagGroup =
        keys().asSequence().associateWith { getString(it) }

+    private fun updateData(source: BufferedSource) {
+        try {
+            tagGroups = JSONObject(source.readString(StandardCharsets.UTF_8)).toTagGroups()
+        } catch (e: JSONException) {
+            e.printStackTrace()
+        }
+    }
+
    fun getTranslation(prefix: String? = NAMESPACE_PREFIX, tag: String?): String? {
        return tagGroups[prefix]?.get(tag)?.trim()?.takeIf { it.isNotEmpty() }
    }
@@ -70,7 +76,7 @@ object EhTagDatabase : CoroutineScope {
        tags: Map<String, String>,
        keyword: String,
        translate: Boolean,
-        exactly: Boolean,
+        exactly: Boolean
    ): Flow<Pair<String?, String>> = flow {
        if (exactly) {
            tags[keyword]?.let {
@@ -95,11 +101,11 @@ object EhTagDatabase : CoroutineScope {
        }
    }

-    // Construct a cold flow for tag database suggestions
+    /* Construct a cold flow for tag database suggestions */
    fun suggestFlow(
        keyword: String,
        translate: Boolean,
-        exactly: Boolean = false,
+        exactly: Boolean = false
    ): Flow<Pair<String?, String>> = flow {
        val keywordPrefix = keyword.substringBefore(':')
        val keywordTag = keyword.drop(keywordPrefix.length + 1)
@@ -127,6 +133,7 @@ object EhTagDatabase : CoroutineScope {
    private fun String.containsIgnoreSpace(other: String, ignoreCase: Boolean = true): Boolean =
        removeSpace().contains(other.removeSpace(), ignoreCase)

+
    private val NAMESPACE_TO_PREFIX = HashMap<String, String>().also {
        it["artist"] = "a"
        it["cosplayer"] = "cos"
@@ -156,74 +163,68 @@ object EhTagDatabase : CoroutineScope {
    }

    private fun getFileContent(file: File): String? {
-        return runCatching {
-            file.source().buffer().use { it.readString(StandardCharsets.UTF_8) }
-        }.getOrNull()
+        try {
+            file.source().buffer().use { return it.readString(StandardCharsets.UTF_8) }
+        } catch (e: IOException) {
+            return null
+        }
    }

    private fun getFileSha1(file: File): String? {
-        return runCatching {
-            file.source().buffer().use { source ->
-                sha1(blackholeSink()).use {
-                    source.readAll(it)
-                    it.hash.hex()
+        try {
+            FileInputStream(file).use { stream ->
+                val digest = MessageDigest.getInstance("SHA-1")
+                var n: Int
+                val buffer = ByteArray(4 * 1024)
+                while (stream.read(buffer).also { n = it } != -1) {
+                    digest.update(buffer, 0, n)
                }
+                return HashCodeUtils.bytesToHexString(digest.digest())
            }
-        }.getOrNull()
+        } catch (e: IOException) {
+            return null
+        } catch (e: NoSuchAlgorithmException) {
+            return null
+        }
    }

-    private fun checkData(sha1: String?, data: File): Boolean {
-        return sha1 != null && sha1 == getFileSha1(data)
+    private fun checkData(sha1File: File, dataFile: File): Boolean {
+        val s1 = getFileContent(sha1File) ?: return false
+        val s2 = getFileSha1(dataFile) ?: return false
+        return s1 == s2
    }

-    private suspend fun save(client: OkHttpClient, url: String, file: File): Boolean {
+    private fun save(client: OkHttpClient, url: String, file: File): Boolean {
        val request: Request = Request.Builder().url(url).build()
        val call = client.newCall(request)
-        runCatching {
-            call.executeAsync().use { response ->
+        try {
+            call.execute().use { response ->
                if (!response.isSuccessful) {
                    return false
                }
-                response.body.use {
-                    it.copyToFile(file)
-                }
+                val body = response.body
+                body.byteStream()
+                    .use { ins -> FileOutputStream(file).use { os -> IOUtils.copy(ins, os) } }
                return true
            }
-        }.onFailure {
-            file.delete()
-            it.printStackTrace()
+        } catch (t: Throwable) {
+            FileUtils.delete(file)
+            t.printStackTrace()
+            ExceptionUtils.throwIfFatal(t)
+            return false
        }
-        return false
    }

-    suspend fun update() {
-        updateLock.withLock {
+    @OptIn(DelicateCoroutinesApi::class)
+    @JvmStatic
+    fun update() {
+        launchIO {
            updateInternal()
        }
    }

-    private suspend fun issueUpdateInMemoryData() {
-        dbLock.withLock {
-            getMetadata(EhApplication.application)?.let { urls ->
-                val dataName = urls[2]
-                val dir = AppConfig.getFilesDir("tag-translations")
-                val dataFile = File(dir, dataName).takeIf { it.exists() } ?: return
-                runSuspendCatching {
-                    tagGroups = JSONObject(dataFile.source().buffer().readString(StandardCharsets.UTF_8)).toTagGroups()
-                }.onFailure {
-                    it.printStackTrace()
-                }
-            }
-        }
-    }
-
-    init {
-        launch {
-            issueUpdateInMemoryData()
-        }
-    }
-
-    private suspend fun updateInternal() {
+    @Synchronized
+    private fun updateInternal() {
        val urls = getMetadata(EhApplication.application)
        urls?.let {
            val sha1Name = urls[0]
@@ -231,31 +232,38 @@ object EhTagDatabase : CoroutineScope {
            val dataName = urls[2]
            val dataUrl = urls[3]

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

-            runCatching {
                // Check current sha1 and current data
-                val sha1 = getFileContent(sha1File)
-                if (!checkData(sha1, dataFile)) {
+                val sha1File = File(dir, sha1Name)
+                val dataFile = File(dir, dataName)
+                if (!checkData(sha1File, dataFile)) {
                    FileUtils.delete(sha1File)
                    FileUtils.delete(dataFile)
                }

-                val client = nonCacheOkHttpClient
+                // Read current EhTagDatabase
+                if (!isInitialized() && dataFile.exists()) {
+                    try {
+                        dataFile.source().buffer().use { updateData(it) }
+                    } catch (e: IOException) {
+                        FileUtils.delete(sha1File)
+                        FileUtils.delete(dataFile)
+                    }
+                }
+                val client = okHttpClient

                // Save new sha1
                val tempSha1File = File(dir, "$sha1Name.tmp")
                check(save(client, sha1Url, tempSha1File))
-                val tempSha1 = getFileContent(tempSha1File)

-                // Check new sha1 and current sha1
-                if (tempSha1 == sha1) {
+                // Check new sha1 and current data
+                if (checkData(tempSha1File, dataFile)) {
                    // The data is the same
                    FileUtils.delete(tempSha1File)
-                    return@runCatching
+                    return
                }

                // Save new data
@@ -263,10 +271,10 @@ object EhTagDatabase : CoroutineScope {
                check(save(client, dataUrl, tempDataFile))

                // Check new sha1 and new data
-                if (!checkData(tempSha1, tempDataFile)) {
+                if (!checkData(tempSha1File, tempDataFile)) {
                    FileUtils.delete(tempSha1File)
                    FileUtils.delete(tempDataFile)
-                    return@runCatching
+                    return
                }

                // Replace current sha1 and current data with new sha1 and new data
@@ -276,10 +284,13 @@ object EhTagDatabase : CoroutineScope {
                tempDataFile.renameTo(dataFile)

                // Read new EhTagDatabase
-                issueUpdateInMemoryData()
-            }.onFailure {
-                it.printStackTrace()
+                try {
+                    dataFile.source().buffer().use { updateData(it) }
+                } catch (_: IOException) {
+                }
+            } catch (e: Throwable) {
+                e.printStackTrace()
            }
        }
    }
-}
+}
@@ -16,7 +16,7 @@
 package com.hippo.ehviewer.client

 import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.network.UrlBuilder
+import com.hippo.network.UrlBuilder

 object EhUrl {
    const val SITE_E = 0
@@ -46,28 +46,29 @@ object EhUrl {
    const val URL_FORUMS = "https://forums.e-hentai.org/"
    const val URL_FUNDS = HOST_E + "exchange.php?t=gp"
    const val URL_HOME = HOST_E + "home.php"
-    const val URL_NEWS = HOST_E + "news.php"
    const val REFERER_EX = "https://$DOMAIN_EX"
    const val ORIGIN_EX = REFERER_EX
    const val REFERER_E = "https://$DOMAIN_E"
    const val ORIGIN_E = REFERER_E
+    const val URL_PREFIX_THUMB_E = "https://ehgt.org/"
+    const val URL_PREFIX_THUMB_EX = "https://exhentai.org/t/"

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

    val favoritesUrl: String
-        get() = when (Settings.gallerySite) {
+        get() = when (Settings.getGallerySite()) {
            SITE_E -> URL_FAVORITES_E
            SITE_EX -> URL_FAVORITES_EX
            else -> URL_FAVORITES_E
        }

    val apiUrl: String
-        get() = when (Settings.gallerySite) {
+        get() = when (Settings.getGallerySite()) {
            SITE_E -> API_E
            SITE_EX -> API_EX
            else -> API_E
@@ -75,14 +76,14 @@ object EhUrl {

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

    val origin: String
-        get() = when (Settings.gallerySite) {
+        get() = when (Settings.getGallerySite()) {
            SITE_E -> ORIGIN_E
            SITE_EX -> ORIGIN_EX
            else -> ORIGIN_E
@@ -90,7 +91,7 @@ object EhUrl {

    @JvmStatic
    val uConfigUrl: String
-        get() = when (Settings.gallerySite) {
+        get() = when (Settings.getGallerySite()) {
            SITE_E -> URL_UCONFIG_E
            SITE_EX -> URL_UCONFIG_EX
            else -> URL_UCONFIG_E
@@ -98,28 +99,28 @@ object EhUrl {

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

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

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

    val watchedUrl: String
-        get() = when (Settings.gallerySite) {
+        get() = when (Settings.getGallerySite()) {
            SITE_E -> URL_WATCHED_E
            SITE_EX -> URL_WATCHED_EX
            else -> URL_WATCHED_E
@@ -163,4 +164,12 @@ object EhUrl {
    fun getTagDefinitionUrl(tag: String): String {
        return "https://ehwiki.org/wiki/" + tag.replace(' ', '_')
    }
-}
+
+    fun getThumbUrlPrefix(): String {
+        return when (Settings.getGallerySite()) {
+            SITE_E -> URL_PREFIX_THUMB_E
+            SITE_EX -> URL_PREFIX_THUMB_EX
+            else -> URL_PREFIX_THUMB_E
+        }
+    }
+}
@@ -16,23 +16,13 @@
 package com.hippo.ehviewer.client

 import android.text.TextUtils
+import com.hippo.ehviewer.EhApplication.Companion.ehCookieStore
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.data.GalleryInfo
 import java.util.regex.Pattern

 object EhUtils {
    const val NONE = -1 // Use it for homepage
-    const val MISC = 0x1
-    const val DOUJINSHI = 0x2
-    const val MANGA = 0x4
-    const val ARTIST_CG = 0x8
-    const val GAME_CG = 0x10
-    const val IMAGE_SET = 0x20
-    const val COSPLAY = 0x40
-    const val ASIAN_PORN = 0x80
-    const val NON_H = 0x100
-    const val WESTERN = 0x200
-    const val ALL_CATEGORY = 0x3ff
    const val PRIVATE = 0x400
    const val UNKNOWN = 0x800

@@ -51,41 +41,40 @@ object EhUtils {

    // Remove [XXX], (XXX), {XXX}, ~XXX~ stuff
    private val PATTERN_TITLE_PREFIX = Pattern.compile(
-        "^(?:\\([^)]*\\)|\\[[^]]*]|\\{[^}]*\\}|~[^~]*~|\\s+)*",
+        "^(?:\\([^)]*\\)|\\[[^]]*]|\\{[^}]*\\}|~[^~]*~|\\s+)*"
    )

    // Remove [XXX], (XXX), {XXX}, ~XXX~ stuff and something like ch. 1-23
    private val PATTERN_TITLE_SUFFIX = Pattern.compile(
        "(?:\\s+ch.[\\s\\d-]+)?(?:\\([^)]*\\)|\\[[^]]*]|\\{[^}]*\\}|~[^~]*~|\\s+)*$",
-        Pattern.CASE_INSENSITIVE,
+        Pattern.CASE_INSENSITIVE
    )

    private val CATEGORY_VALUES = hashMapOf(
-        MISC to arrayOf("misc"),
-        DOUJINSHI to arrayOf("doujinshi"),
-        MANGA to arrayOf("manga"),
-        ARTIST_CG to arrayOf("artistcg", "Artist CG Sets", "Artist CG"),
-        GAME_CG to arrayOf("gamecg", "Game CG Sets", "Game CG"),
-        IMAGE_SET to arrayOf("imageset", "Image Sets", "Image Set"),
-        COSPLAY to arrayOf("cosplay"),
-        ASIAN_PORN to arrayOf("asianporn", "Asian Porn"),
-        NON_H to arrayOf("non-h"),
-        WESTERN to arrayOf("western"),
+        EhConfig.MISC to arrayOf("misc"),
+        EhConfig.DOUJINSHI to arrayOf("doujinshi"),
+        EhConfig.MANGA to arrayOf("manga"),
+        EhConfig.ARTIST_CG to arrayOf("artistcg", "Artist CG Sets", "Artist CG"),
+        EhConfig.GAME_CG to arrayOf("gamecg", "Game CG Sets", "Game CG"),
+        EhConfig.IMAGE_SET to arrayOf("imageset", "Image Sets", "Image Set"),
+        EhConfig.COSPLAY to arrayOf("cosplay"),
+        EhConfig.ASIAN_PORN to arrayOf("asianporn", "Asian Porn"),
+        EhConfig.NON_H to arrayOf("non-h"),
+        EhConfig.WESTERN to arrayOf("western"),
        PRIVATE to arrayOf("private"),
-        UNKNOWN to arrayOf("unknown"),
+        UNKNOWN to arrayOf("unknown")
    )
    private val CATEGORY_STRINGS = CATEGORY_VALUES.entries.map { (k, v) -> v to k }

    val isExHentai: Boolean
-        get() = Settings.gallerySite == EhUrl.SITE_EX
+        get() = Settings.getGallerySite() == EhUrl.SITE_EX

    @JvmStatic
    fun getCategory(type: String?): Int {
        for (entry in CATEGORY_STRINGS) {
            for (str in entry.first)
-                if (str.equals(type, ignoreCase = true)) {
+                if (str.equals(type, ignoreCase = true))
                    return entry.second
-                }
        }
        return UNKNOWN
    }
@@ -96,22 +85,22 @@ object EhUtils {

    fun getCategoryColor(category: Int): Int {
        return when (category) {
-            DOUJINSHI -> BG_COLOR_DOUJINSHI
-            MANGA -> BG_COLOR_MANGA
-            ARTIST_CG -> BG_COLOR_ARTIST_CG
-            GAME_CG -> BG_COLOR_GAME_CG
-            WESTERN -> BG_COLOR_WESTERN
-            NON_H -> BG_COLOR_NON_H
-            IMAGE_SET -> BG_COLOR_IMAGE_SET
-            COSPLAY -> BG_COLOR_COSPLAY
-            ASIAN_PORN -> BG_COLOR_ASIAN_PORN
-            MISC -> BG_COLOR_MISC
+            EhConfig.DOUJINSHI -> BG_COLOR_DOUJINSHI
+            EhConfig.MANGA -> BG_COLOR_MANGA
+            EhConfig.ARTIST_CG -> BG_COLOR_ARTIST_CG
+            EhConfig.GAME_CG -> BG_COLOR_GAME_CG
+            EhConfig.WESTERN -> BG_COLOR_WESTERN
+            EhConfig.NON_H -> BG_COLOR_NON_H
+            EhConfig.IMAGE_SET -> BG_COLOR_IMAGE_SET
+            EhConfig.COSPLAY -> BG_COLOR_COSPLAY
+            EhConfig.ASIAN_PORN -> BG_COLOR_ASIAN_PORN
+            EhConfig.MISC -> BG_COLOR_MISC
            else -> BG_COLOR_UNKNOWN
        }.toInt()
    }

    fun signOut() {
-        EhCookieStore.signOut()
+        ehCookieStore.signOut()
        Settings.putAvatar(null)
        Settings.putDisplayName(null)
        Settings.putGallerySite(EhUrl.SITE_E)
@@ -120,12 +109,12 @@ object EhUtils {
    }

    fun needSignedIn(): Boolean {
-        return Settings.needSignIn
+        return Settings.getNeedSignIn() && !ehCookieStore.hasSignedIn()
    }

    @JvmStatic
    fun getSuitableTitle(gi: GalleryInfo): String {
-        return if (Settings.showJpnTitle) {
+        return if (Settings.getShowJpnTitle()) {
            if (TextUtils.isEmpty(gi.titleJpn)) gi.title else gi.titleJpn
        } else {
            if (TextUtils.isEmpty(gi.title)) gi.titleJpn else gi.title
@@ -146,12 +135,17 @@ object EhUtils {
        return title.ifEmpty { null }
    }

+    fun fixThumbUrl(url: String): String {
+        return EhUrl.getThumbUrlPrefix() +
+                url.removePrefix(EhUrl.URL_PREFIX_THUMB_E).removePrefix(EhUrl.URL_PREFIX_THUMB_EX)
+    }
+
    @JvmStatic
    fun handleThumbUrlResolution(url: String?): String? {
        if (null == url) {
            return null
        }
-        val resolution = when (Settings.thumbResolution) {
+        val resolution = when (Settings.getThumbResolution()) {
            0 -> return url
            1 -> "250"
            2 -> "300"
@@ -165,4 +159,4 @@ object EhUtils {
            url
        }
    }
-}
+}
@@ -5,7 +5,7 @@ interface AbstractGalleryInfo {
    var token: String?
    var title: String?
    var titleJpn: String?
-    var thumbKey: String?
+    var thumb: String?
    var category: Int
    var posted: String?
    var uploader: String?
@@ -22,4 +22,4 @@ interface AbstractGalleryInfo {
    var simpleLanguage: String?
    var favoriteSlot: Int
    var favoriteName: String?
-}
+}
@@ -36,7 +36,7 @@ open class BaseGalleryInfo(
    override var titleJpn: String? = null,

    @ColumnInfo(name = "THUMB")
-    override var thumbKey: String? = null,
+    override var thumb: String? = null,

    @ColumnInfo(name = "CATEGORY")
    override var category: Int = 0,
@@ -84,6 +84,6 @@ open class BaseGalleryInfo(
    override var favoriteSlot: Int = -2,

    @Ignore
-    override var favoriteName: String? = null,
+    override var favoriteName: String? = null

-) : GalleryInfo
+) : GalleryInfo
@@ -17,8 +17,8 @@ package com.hippo.ehviewer.client.data

 import android.os.Parcelable
 import com.hippo.ehviewer.client.EhUrl
-import com.hippo.ehviewer.network.UrlBuilder
-import com.hippo.ehviewer.util.encodeUTF8
+import com.hippo.network.UrlBuilder
+import com.hippo.util.encodeUTF8
 import kotlinx.parcelize.Parcelize

@Parcelize
@@ -55,4 +55,4 @@ class FavListUrlBuilder(
            return favCat in 0..9
        }
    }
-}
+}
@@ -34,5 +34,5 @@ class GalleryApiInfo(
    var expunged: Boolean = false,
    var rating: Float = 0f,
    var torrentcount: Int = 0,
-    var tags: Array<String>?,
-) : Parcelable
+    var tags: Array<String>?
+) : Parcelable
@@ -46,5 +46,5 @@ class GalleryComment(
    @JvmField
    var comment: String? = null,
    @JvmField
-    var lastEdited: Long = 0,
-) : Parcelable
+    var lastEdited: Long = 0
+) : Parcelable
@@ -20,6 +20,8 @@ import kotlinx.parcelize.Parcelize

@Parcelize
 class GalleryCommentList(
-    var comments: Array<GalleryComment>,
-    val hasMore: Boolean,
-) : Parcelable
+    @JvmField
+    var comments: Array<GalleryComment>?,
+    @JvmField
+    var hasMore: Boolean
+) : Parcelable
@@ -16,48 +16,89 @@
 package com.hippo.ehviewer.client.data

 import com.hippo.ehviewer.client.data.GalleryInfo.Companion.S_LANGS
+import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize

-private val LANGUAGES = arrayOf(
-    "English",
-    "Chinese",
-    "Spanish",
-    "Korean",
-    "Russian",
-    "French",
-    "Portuguese",
-    "Thai",
-    "German",
-    "Italian",
-    "Vietnamese",
-    "Polish",
-    "Hungarian",
-    "Dutch",
-)
-
@Parcelize
 class GalleryDetail(
+    @JvmField
    val galleryInfo: GalleryInfo = BaseGalleryInfo(),
+
+    @JvmField
    var apiUid: Long = -1L,
+
+    @JvmField
    var apiKey: String? = null,
+
+    @JvmField
    var torrentCount: Int = 0,
+
+    @JvmField
    var torrentUrl: String? = null,
+
+    @JvmField
    var archiveUrl: String? = null,
+
+    @JvmField
    var parent: String? = null,
+
+    @JvmField
    var newerVersions: ArrayList<GalleryInfo> = ArrayList(),
+
+    @JvmField
    var visible: String? = null,
+
+    @JvmField
    var language: String? = null,
+
+    @JvmField
    var size: String? = null,
+
+    @JvmField
    var favoriteCount: Int = 0,
+
+    @JvmField
    var isFavorited: Boolean = false,
+
+    @JvmField
    var ratingCount: Int = 0,
-    val tags: Array<GalleryTagGroup>,
-    var comments: GalleryCommentList,
-    val previewPages: Int,
-    val previewList: List<GalleryPreview>,
+
+    @JvmField
+    var tags: Array<GalleryTagGroup>? = null,
+
+    @JvmField
+    var comments: GalleryCommentList? = null,
+
+    @JvmField
+    var previewPages: Int = 0,
+
+    @IgnoredOnParcel
+    @JvmField
+    var previewSet: PreviewSet? = null,
 ) : AbstractGalleryInfo by galleryInfo, GalleryInfo {
    override fun generateSLang() {
        val index = LANGUAGES.indexOf(language)
-        if (index != -1) simpleLanguage = S_LANGS[index]
+        if (index != -1) {
+            simpleLanguage = S_LANGS[index]
+        }
+    }
+
+    companion object {
+        private val LANGUAGES = arrayOf(
+            "English",
+            "Chinese",
+            "Spanish",
+            "Korean",
+            "Russian",
+            "French",
+            "Portuguese",
+            "Thai",
+            "German",
+            "Italian",
+            "Vietnamese",
+            "Polish",
+            "Hungarian",
+            "Dutch"
+        )
    }
 }
@@ -78,20 +78,20 @@ interface GalleryInfo : AbstractGalleryInfo, Parcelable {
            S_LANG_VI,
            S_LANG_PL,
            S_LANG_HU,
-            S_LANG_NL,
+            S_LANG_NL
        )
        val S_LANG_PATTERNS = arrayOf(
            Pattern.compile(
                "[(\\[]eng(?:lish)?[)\\]]|英訳",
-                Pattern.CASE_INSENSITIVE,
-            ), // [(（\[]ch(?:inese)?[)）\]]|[汉漢]化|中[国國][语語]|中文|中国翻訳
+                Pattern.CASE_INSENSITIVE
+            ),  // [(（\[]ch(?:inese)?[)）\]]|[汉漢]化|中[国國][语語]|中文|中国翻訳
            Pattern.compile(
                "[(\uFF08\\[]ch(?:inese)?[)\uFF09\\]]|[汉漢]化|中[国國][语語]|中文|中国翻訳",
-                Pattern.CASE_INSENSITIVE,
+                Pattern.CASE_INSENSITIVE
            ),
            Pattern.compile(
                "[(\\[]spanish[)\\]]|[(\\[]Español[)\\]]|スペイン翻訳",
-                Pattern.CASE_INSENSITIVE,
+                Pattern.CASE_INSENSITIVE
            ),
            Pattern.compile("[(\\[]korean?[)\\]]|韓国翻訳", Pattern.CASE_INSENSITIVE),
            Pattern.compile("[(\\[]rus(?:sian)?[)\\]]|ロシア翻訳", Pattern.CASE_INSENSITIVE),
@@ -99,17 +99,17 @@ interface GalleryInfo : AbstractGalleryInfo, Parcelable {
            Pattern.compile("[(\\[]portuguese|ポルトガル翻訳", Pattern.CASE_INSENSITIVE),
            Pattern.compile(
                "[(\\[]thai(?: ภาษาไทย)?[)\\]]|แปลไทย|タイ翻訳",
-                Pattern.CASE_INSENSITIVE,
+                Pattern.CASE_INSENSITIVE
            ),
            Pattern.compile("[(\\[]german[)\\]]|ドイツ翻訳", Pattern.CASE_INSENSITIVE),
            Pattern.compile("[(\\[]italiano?[)\\]]|イタリア翻訳", Pattern.CASE_INSENSITIVE),
            Pattern.compile(
                "[(\\[]vietnamese(?: Tiếng Việt)?[)\\]]|ベトナム翻訳",
-                Pattern.CASE_INSENSITIVE,
+                Pattern.CASE_INSENSITIVE
            ),
            Pattern.compile("[(\\[]polish[)\\]]|ポーランド翻訳", Pattern.CASE_INSENSITIVE),
            Pattern.compile("[(\\[]hun(?:garian)?[)\\]]|ハンガリー翻訳", Pattern.CASE_INSENSITIVE),
-            Pattern.compile("[(\\[]dutch[)\\]]|オランダ翻訳", Pattern.CASE_INSENSITIVE),
+            Pattern.compile("[(\\[]dutch[)\\]]|オランダ翻訳", Pattern.CASE_INSENSITIVE)
        )
        val S_LANG_TAGS = arrayOf(
            "language:english",
@@ -125,7 +125,7 @@ interface GalleryInfo : AbstractGalleryInfo, Parcelable {
            "language:vietnamese",
            "language:polish",
            "language:hungarian",
-            "language:dutch",
+            "language:dutch"
        )
    }
-}
+}
@@ -16,24 +16,28 @@
 package com.hippo.ehviewer.client.data

 import android.os.Parcelable
+import com.hippo.widget.LoadImageView
 import kotlinx.parcelize.Parcelize

-interface GalleryPreview : Parcelable {
-    val imageKey: String
-    val position: Int
-}
-
@Parcelize
-data class LargeGalleryPreview(
-    override val imageKey: String,
-    override val position: Int,
-) : GalleryPreview
-
-@Parcelize
-data class NormalGalleryPreview(
-    override val imageKey: String,
-    override val position: Int,
-    val offsetX: Int,
-    val clipWidth: Int,
-    val clipHeight: Int,
-) : GalleryPreview
+class GalleryPreview(
+    @JvmField
+    var imageUrl: String? = null,
+    @JvmField
+    var pageUrl: String? = null,
+    @JvmField
+    var position: Int = 0,
+    @JvmField
+    var offsetX: Int = Int.MIN_VALUE,
+    @JvmField
+    var offsetY: Int = Int.MIN_VALUE,
+    @JvmField
+    var clipWidth: Int = Int.MIN_VALUE,
+    @JvmField
+    var clipHeight: Int = Int.MIN_VALUE,
+) : Parcelable {
+    fun load(view: LoadImageView) {
+        view.setClip(offsetX, offsetY, clipWidth, clipHeight)
+        view.load(imageUrl!!)
+    }
+}
@@ -22,5 +22,5 @@ import kotlinx.parcelize.Parcelize
 class GalleryTagGroup(
    private val mTagList: ArrayList<String> = arrayListOf(),
    @JvmField
-    var groupName: String? = null,
-) : Parcelable, MutableList<String> by mTagList
+    var groupName: String? = null
+) : Parcelable, MutableList<String> by mTagList
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.client.data
+
+import com.hippo.widget.LoadImageView
+import com.hippo.yorozuya.collect.IntList
+
+class LargePreviewSet(
+    private val mPositionList: IntList = IntList(),
+    private val mImageUrlList: ArrayList<String> = ArrayList(),
+    private val mPageUrlList: ArrayList<String> = ArrayList()
+) : PreviewSet() {
+
+    fun addItem(index: Int, imageUrl: String, pageUrl: String) {
+        mPositionList.add(index)
+        mImageUrlList.add(imageUrl)
+        mPageUrlList.add(pageUrl)
+    }
+
+    override fun size(): Int {
+        return mImageUrlList.size
+    }
+
+    override fun getPosition(index: Int): Int {
+        return mPositionList[index]
+    }
+
+    override fun getPageUrlAt(index: Int): String {
+        return mPageUrlList[index]
+    }
+
+    override fun getGalleryPreview(gid: Long, index: Int): GalleryPreview {
+        val galleryPreview = GalleryPreview()
+        galleryPreview.position = mPositionList[index]
+        galleryPreview.imageUrl = mImageUrlList[index]
+        galleryPreview.pageUrl = mPageUrlList[index]
+        return galleryPreview
+    }
+
+    override fun load(view: LoadImageView, gid: Long, index: Int) {
+        view.resetClip()
+        view.load(
+            mImageUrlList[index]
+        )
+    }
+}
@@ -18,22 +18,22 @@ package com.hippo.ehviewer.client.data
 import android.os.Parcelable
 import android.text.TextUtils
 import androidx.annotation.IntDef
+import com.hippo.ehviewer.client.EhConfig
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.dao.QuickSearch
-import com.hippo.ehviewer.network.UrlBuilder
-import com.hippo.ehviewer.ui.legacy.AdvanceSearchTable
-import com.hippo.ehviewer.util.encodeUTF8
-import com.hippo.ehviewer.yorozuya.NumberUtils
-import com.hippo.ehviewer.yorozuya.StringUtils
+import com.hippo.ehviewer.widget.AdvanceSearchTable
+import com.hippo.network.UrlBuilder
+import com.hippo.util.encodeUTF8
+import com.hippo.yorozuya.NumberUtils
+import com.hippo.yorozuya.StringUtils
 import kotlinx.parcelize.Parcelize
 import java.io.UnsupportedEncodingException
 import java.net.URLDecoder

@Parcelize
 data class ListUrlBuilder(
-    @get:Mode @Mode
-    var mode: Int = MODE_NORMAL,
+    @get:Mode @Mode var mode: Int = MODE_NORMAL,
    private var mPrev: String? = null,
    private var mNext: String? = null,
    private var mJumpTo: String? = null,
@@ -47,6 +47,7 @@ data class ListUrlBuilder(
    var imagePath: String? = null,
    var isUseSimilarityScan: Boolean = false,
    var isOnlySearchCovers: Boolean = false,
+    var isShowExpunged: Boolean = false,
 ) : Parcelable {

    fun reset() {
@@ -63,6 +64,7 @@ data class ListUrlBuilder(
        imagePath = null
        isUseSimilarityScan = false
        isOnlySearchCovers = false
+        isShowExpunged = false
        mSHash = null
    }

@@ -92,6 +94,7 @@ data class ListUrlBuilder(
        imagePath = null
        isUseSimilarityScan = false
        isOnlySearchCovers = false
+        isShowExpunged = false
    }

    fun toQuickSearch(): QuickSearch {
@@ -127,9 +130,7 @@ data class ListUrlBuilder(
        }
        return if (q.pageFrom != pageFrom) {
            false
-        } else {
-            q.pageTo == pageTo
-        }
+        } else q.pageTo == pageTo
    }

    /**
@@ -160,48 +161,48 @@ data class ListUrlBuilder(
            val value = str.substring(index + 1)
            when (key) {
                "f_cats" -> {
-                    val cats = NumberUtils.parseIntSafely(value, EhUtils.ALL_CATEGORY)
-                    category = category or (cats.inv() and EhUtils.ALL_CATEGORY)
+                    val cats = NumberUtils.parseIntSafely(value, EhConfig.ALL_CATEGORY)
+                    category = category or (cats.inv() and EhConfig.ALL_CATEGORY)
                }

                "f_doujinshi" -> if ("1" == value) {
-                    category = category or EhUtils.DOUJINSHI
+                    category = category or EhConfig.DOUJINSHI
                }

                "f_manga" -> if ("1" == value) {
-                    category = category or EhUtils.MANGA
+                    category = category or EhConfig.MANGA
                }

                "f_artistcg" -> if ("1" == value) {
-                    category = category or EhUtils.ARTIST_CG
+                    category = category or EhConfig.ARTIST_CG
                }

                "f_gamecg" -> if ("1" == value) {
-                    category = category or EhUtils.GAME_CG
+                    category = category or EhConfig.GAME_CG
                }

                "f_western" -> if ("1" == value) {
-                    category = category or EhUtils.WESTERN
+                    category = category or EhConfig.WESTERN
                }

                "f_non-h" -> if ("1" == value) {
-                    category = category or EhUtils.NON_H
+                    category = category or EhConfig.NON_H
                }

                "f_imageset" -> if ("1" == value) {
-                    category = category or EhUtils.IMAGE_SET
+                    category = category or EhConfig.IMAGE_SET
                }

                "f_cosplay" -> if ("1" == value) {
-                    category = category or EhUtils.COSPLAY
+                    category = category or EhConfig.COSPLAY
                }

                "f_asianporn" -> if ("1" == value) {
-                    category = category or EhUtils.ASIAN_PORN
+                    category = category or EhConfig.ASIAN_PORN
                }

                "f_misc" -> if ("1" == value) {
-                    category = category or EhUtils.MISC
+                    category = category or EhConfig.MISC
                }

                "f_search" -> try {
@@ -280,7 +281,7 @@ data class ListUrlBuilder(
                }
                val ub = UrlBuilder(url)
                if (this.category != EhUtils.NONE) {
-                    ub.addQuery("f_cats", category.inv() and EhUtils.ALL_CATEGORY)
+                    ub.addQuery("f_cats", category.inv() and EhConfig.ALL_CATEGORY)
                }
                mSHash?.let {
                    ub.addQuery("f_shash", it)
@@ -294,7 +295,7 @@ data class ListUrlBuilder(
                mNext?.let {
                    ub.addQuery("next", it)
                }
-                // Search key
+                // Search key 
                // the settings of ub:UrlBuilder may be overwritten by following Advance search
                StringUtils.split(mKeyword, '|')?.forEachIndexed { idx, keyword ->
                    val keyword = keyword.trim { it <= ' ' }
@@ -391,7 +392,7 @@ data class ListUrlBuilder(
        MODE_WHATS_HOT,
        MODE_IMAGE_SEARCH,
        MODE_SUBSCRIPTION,
-        MODE_TOPLIST,
+        MODE_TOPLIST
    )
    @Retention(AnnotationRetention.SOURCE)
    private annotation class Mode
@@ -404,4 +405,4 @@ data class ListUrlBuilder(
        const val MODE_SUBSCRIPTION = 0x5
        const val MODE_TOPLIST = 0x6
    }
-}
+}
Author	SHA1	Message	Date
tarsin	ce823e9b20	Release 1.8.6.2 Releases / Build (push) Has been cancelled Details	2023-02-20 19:06:59 +08:00
FooIbar	0caa5b1a3b	Fix 509 detection false positive	2023-02-20 19:06:13 +08:00
FooIbar	9edea5d584	Clean up unfinished download files	2023-02-20 18:48:49 +08:00
FooIbar	9a773aeb39	Workaround for del tag parsing in comments	2023-02-20 18:48:40 +08:00
FooIbar	9fd3196bb1	Use initializer instead of getter for coroutineContext	2023-02-20 18:48:34 +08:00
FooIbar	7580572874	Temporarily disable vpn bypass on login	2023-02-20 18:48:27 +08:00
tarsin	06acc620f4	Resolve #842	2023-02-20 18:48:19 +08:00
FooIbar	367358d277	Resolve #789	2023-02-20 18:48:13 +08:00
tarsin	d61df599e8	Release 1.8.6.1 Releases / Build (push) Has been cancelled Details	2023-02-18 10:38:33 +08:00
tarsin	989a0a01c1	Fix quicksearch progress	2023-02-18 10:37:57 +08:00
tarsin	12108645e9	Fix a stupid memleak	2023-02-18 10:37:45 +08:00
FooIbar	4910ec194d	Fix search keyword in tag mode	2023-02-18 10:37:29 +08:00
FooIbar	f730f43945	Fix comment last edited time parsing	2023-02-18 10:37:14 +08:00