Release 1.8.8.3

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -135,7 +135,10 @@ body:
       - label: 如果您有足够的时间和能力，并愿意为此提交 PR ，请勾上此复选框 / Pull request is welcome. Check this if you want to start a pull request
         required: false
 
-      - label: 您已搜索过 [Issue Tracker](https://github.com/FooIbar/EhViewer/issues)，没有找到类似内容 / I have searched on [Issue Tracker](https://github.com/FooIbar/EhViewer/issues), No duplicate or related open issue has been found
+      - label: 您已仔细查看并知情 [Q&A](https://github.com/Ehviewer-Overhauled/Ehviewer/issues/61) 中的内容 / You have checked [Q&A](https://github.com/Ehviewer-Overhauled/Ehviewer/issues/61) carefully
+        required: true
+
+      - label: 您已搜索过 [Issue Tracker](https://github.com/Ehviewer-Overhauled/Ehviewer/issues)，没有找到类似内容 / I have searched on [Issue Tracker](https://github.com/Ehviewer-Overhauled/Ehviewer/issues), No duplicate or related open issue has been found
         required: true
 
       - label: 您确保这个 Issue 只提及一个问题。如果您有多个问题报告，烦请发起多个 Issue / Ensure there is only one bug report in this issue. Please make mutiply issue for mutiply bugs

.github/ISSUE_TEMPLATE/config.yml

@@ -1 +1,5 @@
-blank_issues_enabled: false
+blank_issues_enabled: false
+contact_links:
+ - name: 所有其他问题 / All other questions
+   url: https://github.com/Ehviewer-Overhauled/Ehviewer/discussions
+   about: 转到 Discussions / Turn to discussions

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -0,0 +1,94 @@
+name: 功能请求 / Feature request
+description: 提出一个功能建议 / Suggest an idea
+labels:
+  - "enhancement"
+body:
+  - type: markdown
+    attributes:
+      value: |
+        感谢您愿意为 Ehviewer-Overhauled 做出贡献！
+        提交功能建议前，还请首先完成文末的自查步骤
+
+        Thanks for your contribution on Ehviewer-Overhauled Project!
+        Please finish verify steps which list in the end first before suggest an idea
+
+  - type: textarea
+    id: request
+    attributes:
+      label: 需求 / Requirement
+      description: |
+        在此处描述您的需求。这通常会是一个您想要的功能
+        Ddescribe what you need here.
+      placeholder: |
+          我需要 XXX 功能 ...
+          I want ABC feature ...
+    validations:
+      required: true
+
+  - type: textarea
+    id: impl
+    attributes:
+      label: 建议实现 / Suggested implements
+      description: |
+        在此处表述您建议的实现方式。如有可能，UI 类功能请求还请尽量附上图示
+        Describe your suggested implements here, It's recommend to add a photo if you are making a UI feature request.
+      placeholder: |
+          建议在 XX 处添加 XX ...
+          I recommend add ABC feature to DEF...
+          图片（如果有）/ Photos (if exists)
+    validations:
+      required: true
+
+  - type: textarea
+    id: more
+    attributes:
+      label: 备注 / Addition details
+      description: |
+        在此处写下其他您想说的内容
+        Describe addition details here
+      placeholder: |
+        其他有用的信息与附件
+        Additional details and attachments
+    validations:
+      required: false
+
+  - type: input
+    id: version
+    attributes:
+      label: EhViewer 版本号 / EhViewer version code
+      description: 您可以在设置 - 关于处找到版本号 / You can get version code in Settings - About
+      placeholder: 1.6.9.13
+    validations:
+      required: true
+
+  - type: input
+    id: ci
+    attributes:
+      label: EhViewer CI 版本 / EhViewer CI Version
+      description: 位于设置 - 关于中的版本号后 / Next to the version code in Settings - About
+      placeholder: 26f05a0
+    validations:
+      required: true
+
+  - type: checkboxes
+    id: check
+    attributes:
+      label: 自查步骤 / Verify steps
+      description: |
+        请确认您已经遵守所有必选项
+        Please ensure you have obtained all needed options
+      options:
+      - label: 如果您有足够的时间和能力，并愿意为此提交 PR ，请勾上此复选框 / Pull request is welcome. Check this if you want to start a pull request
+        required: false
+
+      - label: 您已仔细查看并知情 [Q&A](https://github.com/Ehviewer-Overhauled/Ehviewer/issues/61) 中的内容 / You have checked [Q&A](https://github.com/Ehviewer-Overhauled/Ehviewer/issues/61) carefully
+        required: true
+
+      - label: 您已搜索过 [Issue Tracker](https://github.com/Ehviewer-Overhauled/Ehviewer/issues)，没有找到类似内容 / I have searched on [Issue Tracker](https://github.com/Ehviewer-Overhauled/Ehviewer/issues), No duplicate or related open issue has been found
+        required: true
+
+      - label: 您确保这个 Issue 只提及一个功能。如果您有多个功能请求，烦请发起多个 Issue / Ensure there is only one feature request in this issue. Please make mutiply issue for mutiply feature request
+        required: true
+
+      - label: 您确保已使用最新 CI 版本测试，并且该功能在最新 CI 版本中并未按照预期实现 / This feature don't implement correctly in latest CI version
+        required: true

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+        uses: actions/checkout@v3
         with:
           submodules: 'recursive'
 
@@ -25,18 +25,7 @@ jobs:
 
       - name: Install NDK
         run: |
-          echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;26.0.10636728" --channel=1 --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
-
-      - name: Install Rust Toolchain
-        run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android && rustup component add rustfmt clippy
-
-      - name: Rustfmt Check
-        working-directory: ./app/src/main/rust
-        run: cargo fmt --all -- --check
-
-      - name: Clippy Check
-        working-directory: ./app/src/main/rust
-        run: cargo clippy --all-targets --all-features -- -D warnings
+          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

.github/workflows/pull_request.yml

@@ -1,6 +1,6 @@
 name: Pull Request Check
 
-on: [ pull_request ]
+on: [pull_request]
 
 jobs:
   linux:
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+        uses: actions/checkout@v3
         with:
           submodules: 'recursive'
 
@@ -20,18 +20,7 @@ jobs:
 
       - name: Install NDK
         run: |
-          echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;26.0.10636728" --channel=1 --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
-
-      - name: Install Rust Toolchain
-        run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android && rustup component add rustfmt clippy
-
-      - name: Rustfmt Check
-        working-directory: ./app/src/main/rust
-        run: cargo fmt --all -- --check
-
-      - name: Clippy Check
-        working-directory: ./app/src/main/rust
-        run: cargo clippy --all-targets --all-features -- -D warnings
+          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

.github/workflows/releases.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+        uses: actions/checkout@v3
         with:
           submodules: 'recursive'
 
@@ -23,10 +23,7 @@ jobs:
 
       - name: Install NDK
         run: |
-          echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;26.0.10636728" --channel=1 --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
-
-      - name: Install Rust Toolchain
-        run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android
+          echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;25.2.9519653" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
 
       - name: Gradle Build
         uses: gradle/gradle-build-action@v2
@@ -45,6 +42,7 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           body: Bump Version
+          discussion_category_name: Announcements
           files: |
             app/build/outputs/apk/release/EhViewer-universal.apk
             app/build/outputs/apk/release/EhViewer-arm64-v8a.apk
@@ -52,3 +50,24 @@ jobs:
             app/build/outputs/apk/release/EhViewer-x86.apk
             app/build/outputs/apk/release/EhViewer-armeabi-v7a.apk
             app/build/outputs/mapping/release/mapping.txt
+
+      - name: Collect Apks
+        run: |
+          mkdir app/build/outputs/apk/release/fdroid
+          cp app/build/outputs/apk/release/app-arm64-v8a-release.apk app/build/outputs/apk/release/fdroid/EhViewer-v$GITHUB_REF_NAME.apk
+          cp app/build/outputs/apk/release/app-armeabi-v7a-release.apk app/build/outputs/apk/release/fdroid/EhViewer-v$GITHUB_REF_NAME-armv7.apk
+
+      - name: Push Apks
+        uses: Ehviewer-Overhauled/github-action-push-to-another-repository@main
+        env:
+         SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
+        with:
+          source-directory: app/build/outputs/apk/release/fdroid
+          destination-github-username: Ehviewer-Overhauled
+          destination-repository-name: fdroid-repo
+          user-name: 'github-actions[bot]'
+          user-email: 'github-actions[bot]@users.noreply.github.com'
+          target-branch: deploy
+          create-target-branch: true
+          commit-message: Add apks from $GITHUB_REF
+          target-directory: fdroid/tmp-apks

README.md

@@ -1,7 +1,3 @@
-# Maintenance Mode
-
-The project is in maintenance mode, will only receive bugfixes.
-
 <p align="right">
   <strong>English</strong>
   <span> | </span>

app/build.gradle.kts

@@ -1,33 +1,27 @@
-import com.mikepenz.aboutlibraries.plugin.DuplicateMode.MERGE
-import com.mikepenz.aboutlibraries.plugin.DuplicateRule.GROUP
+import java.io.ByteArrayOutputStream
 import java.time.Instant
 import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
 
-val isRelease: Boolean
-    get() = gradle.startParameter.taskNames.any { it.contains("Release") }
-
 plugins {
     id("com.android.application")
     kotlin("android")
     id("kotlin-parcelize")
     kotlin("plugin.serialization")
     id("com.google.devtools.ksp")
-    id("com.mikepenz.aboutlibraries.plugin")
-    id("org.mozilla.rust-android-gradle.rust-android")
-    id("dev.shreyaspatil.compose-compiler-report-generator")
 }
 
 android {
-    compileSdk = 34
-    buildToolsVersion = "34.0.0"
-    ndkVersion = "26.0.10636728"
+    compileSdk = 33
+    buildToolsVersion = "33.0.2"
+    ndkVersion = "25.2.9519653"
+    androidResources.generateLocaleConfig = true
 
     splits {
         abi {
             isEnable = true
             reset()
-            if (isRelease) {
+            if (gradle.startParameter.taskNames.any { it.contains("Release") }) {
                 include("arm64-v8a", "x86_64", "armeabi-v7a", "x86")
                 isUniversalApk = true
             } else {
@@ -45,26 +39,26 @@ android {
         enableV4Signing = true
     }
 
-    val commitSha = providers.exec {
-        commandLine = "git rev-parse --short=7 HEAD".split(' ')
-    }.standardOutput.asText.get().trim()
+    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())
     }
 
-    val repoName = providers.exec {
-        commandLine = "git remote get-url origin".split(' ')
-    }.standardOutput.asText.get().trim().removePrefix("https://github.com/").removePrefix("git@github.com:")
-        .removeSuffix(".git")
-
     defaultConfig {
         applicationId = "moe.tarsin.ehviewer"
         minSdk = 28
-        targetSdk = 34
-        versionCode = 180043
-        versionName = "1.8.9.5"
+        targetSdk = 33
+        versionCode = 180042
+        versionName = "1.8.8.3"
         resourceConfigurations.addAll(
             listOf(
                 "zh",
@@ -83,7 +77,6 @@ android {
         )
         buildConfigField("String", "COMMIT_SHA", "\"$commitSha\"")
         buildConfigField("String", "BUILD_TIME", "\"$buildTime\"")
-        buildConfigField("String", "REPO_NAME", "\"$repoName\"")
     }
 
     externalNativeBuild {
@@ -104,7 +97,6 @@ android {
             "-progressive",
             "-Xjvm-default=all",
             "-Xlambdas=indy",
-            "-XXLanguage:+BreakContinueInInlineLambdas",
 
             "-opt-in=coil.annotation.ExperimentalCoilApi",
             "-opt-in=androidx.compose.foundation.layout.ExperimentalLayoutApi",
@@ -117,9 +109,8 @@ android {
             "-opt-in=kotlin.contracts.ExperimentalContracts",
             "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
             "-opt-in=kotlinx.coroutines.FlowPreview",
+            "-opt-in=kotlinx.coroutines.InternalCoroutinesApi",
             "-opt-in=kotlinx.serialization.ExperimentalSerializationApi",
-            "-opt-in=splitties.experimental.ExperimentalSplittiesApi",
-            "-opt-in=splitties.preferences.DataStorePreferencesPreview",
         )
     }
 
@@ -159,7 +150,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.3"
+        kotlinCompilerExtensionVersion = "1.4.7"
     }
 
     namespace = "com.hippo.ehviewer"
@@ -167,43 +158,41 @@ android {
 
 dependencies {
     // https://developer.android.com/jetpack/androidx/releases/activity
-    implementation("androidx.activity:activity-compose:1.8.0-beta01")
+    implementation("androidx.activity:activity-compose:1.7.2")
     implementation("androidx.appcompat:appcompat:1.6.1")
     implementation("androidx.biometric:biometric-ktx:1.2.0-alpha05")
-    implementation("androidx.browser:browser:1.6.0")
-    implementation("androidx.collection:collection-ktx:1.3.0-rc01")
+    implementation("androidx.browser:browser:1.5.0")
+    implementation("androidx.collection:collection-ktx:1.3.0-alpha04")
 
     // https://developer.android.com/jetpack/androidx/releases/compose-material3
     // api(platform("androidx.compose:compose-bom:2023.05.00"))
-    api(platform("dev.chrisbanes.compose:compose-bom:2023.07.00-alpha02"))
+    api(platform("dev.chrisbanes.compose:compose-bom:2023.04.00-beta01"))
     implementation("androidx.compose.material:material-icons-extended")
     implementation("androidx.compose.material3:material3")
     implementation("androidx.compose.material3:material3-window-size-class")
-    implementation("androidx.compose.ui:ui-util")
 
-    implementation("androidx.core:core-ktx:1.12.0")
+    implementation("androidx.core:core-ktx:1.11.0-beta01")
 
-    implementation("androidx.constraintlayout:constraintlayout-compose:1.1.0-alpha12")
+    implementation("androidx.constraintlayout:constraintlayout-compose:1.1.0-alpha10")
     implementation("androidx.coordinatorlayout:coordinatorlayout:1.2.0")
-    implementation("androidx.fragment:fragment-ktx:1.7.0-alpha04")
+    implementation("androidx.drawerlayout:drawerlayout:1.2.0")
     // https://developer.android.com/jetpack/androidx/releases/lifecycle
-    implementation("androidx.lifecycle:lifecycle-process:2.6.2")
+    implementation("androidx.lifecycle:lifecycle-process:2.6.1")
 
     // https://developer.android.com/jetpack/androidx/releases/navigation
-    val nav_version = "2.7.2"
+    val nav_version = "2.5.3"
     implementation("androidx.navigation:navigation-fragment-ktx:$nav_version")
     implementation("androidx.navigation:navigation-ui-ktx:$nav_version")
     implementation("androidx.navigation:navigation-compose:$nav_version")
 
     // https://developer.android.com/jetpack/androidx/releases/paging
-    val paging = "3.2.1"
-    implementation("androidx.paging:paging-compose:$paging")
-    implementation("androidx.paging:paging-runtime-ktx:$paging")
-    implementation("androidx.recyclerview:recyclerview:1.3.1")
-    implementation("androidx.recyclerview:recyclerview-selection:1.2.0-alpha01")
+    implementation("androidx.paging:paging-common-ktx:3.2.0-alpha06")
+    implementation("androidx.paging:paging-compose:1.0.0-alpha20")
+    implementation("androidx.preference:preference-ktx:1.2.0")
+    implementation("androidx.recyclerview:recyclerview:1.3.0")
 
     // https://developer.android.com/jetpack/androidx/releases/room
-    val room_version = "2.6.0-beta01"
+    val room_version = "2.6.0-alpha01"
     ksp("androidx.room:room-compiler:$room_version")
     implementation("androidx.room:room-paging:$room_version")
 
@@ -212,33 +201,25 @@ dependencies {
     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
-    val accompanist_version = "0.32.0"
-    implementation("com.google.accompanist:accompanist-themeadapter-material3:$accompanist_version")
-    implementation("com.google.accompanist:accompanist-webview:$accompanist_version")
-    implementation("com.google.android.material:material:1.11.0-alpha02")
-
-    val splitties = "3.0.0"
-    implementation("com.louiscad.splitties:splitties-appctx:$splitties")
-    implementation("com.louiscad.splitties:splitties-systemservices:$splitties")
-    implementation("com.louiscad.splitties:splitties-preferences:$splitties")
-    implementation("com.louiscad.splitties:splitties-arch-room:$splitties")
+    implementation("com.google.accompanist:accompanist-themeadapter-material3:0.30.1")
+    implementation("com.google.android.material:material:1.9.0")
 
     // https://square.github.io/okhttp/changelogs/changelog/
     implementation(platform("com.squareup.okhttp3:okhttp-bom:5.0.0-alpha.11"))
-    implementation("com.squareup.okhttp3:okhttp-android")
     implementation("com.squareup.okhttp3:okhttp-coroutines")
 
-    implementation("com.squareup.okio:okio-jvm:3.5.0")
-
-    implementation("com.mikepenz:aboutlibraries-core:10.8.3")
+    implementation("com.squareup.okio:okio-jvm:3.3.0")
 
     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.preference:simplemenu-preference:1.0.3")
+    implementation("dev.rikka.rikkax.material:material-preference:2.0.0")
 
-    implementation(platform("io.arrow-kt:arrow-stack:1.2.1"))
+    implementation(platform("io.arrow-kt:arrow-stack:1.2.0-RC"))
     implementation("io.arrow-kt:arrow-fx-coroutines")
 
     // https://coil-kt.github.io/coil/changelog/
@@ -246,56 +227,17 @@ dependencies {
     implementation("io.coil-kt:coil-compose")
     implementation("io.coil-kt:coil-gif")
 
-    val ktor = "2.3.4"
-    implementation("io.ktor:ktor-io-jvm:$ktor")
-    implementation("io.ktor:ktor-utils-jvm:$ktor")
-
-    val serialization = "1.6.0"
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-cbor:$serialization")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json-okio:$serialization")
-
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
+    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")
+}
 
-    val chunker = "4.0.0"
-    debugImplementation("com.github.chuckerteam.chucker:library:$chunker")
-    releaseImplementation("com.github.chuckerteam.chucker:library-no-op:$chunker")
-
-    debugImplementation("com.squareup.leakcanary:leakcanary-android:2.12")
+configurations.all {
+    exclude("dev.rikka.rikkax.appcompat", "appcompat")
+    exclude("dev.rikka.rikkax.material", "material")
 }
 
 ksp {
     arg("room.schemaLocation", "$projectDir/schemas")
     arg("room.generateKotlin", "true")
 }
-
-aboutLibraries {
-    duplicationMode = MERGE
-    duplicationRule = GROUP
-    exclusionPatterns = listOf(
-        "androidx\\..*".toPattern(),
-        ".*annotations".toPattern(),
-        "com\\.google\\.code\\..*".toPattern(),
-        "com\\.google\\.guava:listenablefuture".toPattern(),
-        "com\\.google\\.protobuf:protobuf-javalite".toPattern(),
-        "org\\.checkerframework:checker-qual".toPattern(),
-        "org\\.chromium\\.net:cronet-embedded".toPattern(),
-        "org\\.slf4j:slf4j-api".toPattern(),
-    )
-}
-
-cargo {
-    module = "src/main/rust"
-    libname = "ehviewer_rust"
-    targets = if (isRelease) listOf("arm", "x86", "arm64", "x86_64") else listOf("arm64")
-    if (isRelease) profile = "release"
-}
-
-tasks.configureEach {
-    if ((name == "mergeDebugJniLibFolders" || name == "mergeReleaseJniLibFolders")) {
-        dependsOn("cargoBuild")
-        // fix mergeDebugJniLibFolders  UP-TO-DATE
-        inputs.dir(layout.buildDirectory.dir("rustJniLibs/android"))
-    }
-}

app/proguard-rules.pro

@@ -13,15 +13,6 @@
 
 -keep class androidx.viewpager.widget.ViewPager$LayoutParams { int position; }
 
--keep class com.hippo.ehviewer.client.parser.Torrent { *; }
--keep class com.hippo.ehviewer.client.parser.GalleryListResult { *; }
--keep class com.hippo.ehviewer.client.parser.Limits { *; }
--keep class com.hippo.ehviewer.client.data.BaseGalleryInfo { *; }
--keep class com.hippo.ehviewer.ui.scene.SearchBarScene { getBinding(); }
-
-# Ktor logger
--dontwarn org.slf4j.impl.StaticLoggerBinder
-
 -keepattributes LineNumberTable,SourceFile
 -renamesourcefileattribute SourceFile
 

app/schemas/com.hippo.ehviewer.dao.EhDatabase/10.json

@@ -1,448 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 10,
-    "identityHash": "613604f93bf815adeb87f03e2166e983",
-    "entities": [
-      {
-        "tableName": "DOWNLOADS",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`STATE` INTEGER NOT NULL, `LEGACY` INTEGER NOT NULL, `TIME` INTEGER NOT NULL, `LABEL` TEXT, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "state",
-            "columnName": "STATE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "legacy",
-            "columnName": "LEGACY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "label",
-            "columnName": "LABEL",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "DOWNLOAD_LABELS",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`LABEL` TEXT NOT NULL, `TIME` INTEGER NOT NULL, `_id` INTEGER, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "label",
-            "columnName": "LABEL",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "DOWNLOAD_DIRNAME",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `DIRNAME` TEXT NOT NULL, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dirname",
-            "columnName": "DIRNAME",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "FILTER",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`MODE` INTEGER NOT NULL, `TEXT` TEXT NOT NULL, `ENABLE` INTEGER NOT NULL, `_id` INTEGER, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "mode",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "text",
-            "columnName": "TEXT",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "enable",
-            "columnName": "ENABLE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "HISTORY",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`TIME` INTEGER NOT NULL, `FAVORITE_SLOT` INTEGER NOT NULL, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "favoriteSlot",
-            "columnName": "FAVORITE_SLOT",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "LOCAL_FAVORITES",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`TIME` INTEGER NOT NULL, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "QUICK_SEARCH",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER, `NAME` TEXT NOT NULL, `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, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "NAME",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "mode",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "keyword",
-            "columnName": "KEYWORD",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "advanceSearch",
-            "columnName": "ADVANCE_SEARCH",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "minRating",
-            "columnName": "MIN_RATING",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pageFrom",
-            "columnName": "PAGE_FROM",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pageTo",
-            "columnName": "PAGE_TO",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "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, '613604f93bf815adeb87f03e2166e983')"
-    ]
-  }
-}

app/schemas/com.hippo.ehviewer.dao.EhDatabase/11.json

@@ -1,469 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 11,
-    "identityHash": "92915e937cb7ccc536d352fda5cf287f",
-    "entities": [
-      {
-        "tableName": "DOWNLOADS",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`STATE` INTEGER NOT NULL, `LEGACY` INTEGER NOT NULL, `TIME` INTEGER NOT NULL, `LABEL` TEXT, `POSITION` INTEGER NOT NULL DEFAULT 0, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "state",
-            "columnName": "STATE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "legacy",
-            "columnName": "LEGACY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "label",
-            "columnName": "LABEL",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "position",
-            "columnName": "POSITION",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "DOWNLOAD_LABELS",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`LABEL` TEXT NOT NULL, `TIME` INTEGER NOT NULL, `POSITION` INTEGER NOT NULL DEFAULT 0, `_id` INTEGER, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "label",
-            "columnName": "LABEL",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "position",
-            "columnName": "POSITION",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "DOWNLOAD_DIRNAME",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `DIRNAME` TEXT NOT NULL, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dirname",
-            "columnName": "DIRNAME",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "FILTER",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`MODE` INTEGER NOT NULL, `TEXT` TEXT NOT NULL, `ENABLE` INTEGER NOT NULL, `_id` INTEGER, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "mode",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "text",
-            "columnName": "TEXT",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "enable",
-            "columnName": "ENABLE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "HISTORY",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`TIME` INTEGER NOT NULL, `FAVORITE_SLOT` INTEGER NOT NULL, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "favoriteSlot",
-            "columnName": "FAVORITE_SLOT",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "LOCAL_FAVORITES",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`TIME` INTEGER NOT NULL, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "QUICK_SEARCH",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER, `NAME` TEXT NOT NULL, `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, `POSITION` INTEGER NOT NULL DEFAULT 0, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "NAME",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "mode",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "keyword",
-            "columnName": "KEYWORD",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "advanceSearch",
-            "columnName": "ADVANCE_SEARCH",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "minRating",
-            "columnName": "MIN_RATING",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pageFrom",
-            "columnName": "PAGE_FROM",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pageTo",
-            "columnName": "PAGE_TO",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "position",
-            "columnName": "POSITION",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          }
-        ],
-        "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, '92915e937cb7ccc536d352fda5cf287f')"
-    ]
-  }
-}

app/schemas/com.hippo.ehviewer.dao.EhDatabase/12.json

@@ -1,454 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 12,
-    "identityHash": "d40b38b0ba3b1c53b773728cdee328c8",
-    "entities": [
-      {
-        "tableName": "DOWNLOADS",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`STATE` INTEGER NOT NULL, `LEGACY` INTEGER NOT NULL, `TIME` INTEGER NOT NULL, `LABEL` TEXT, `POSITION` INTEGER NOT NULL, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "state",
-            "columnName": "STATE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "legacy",
-            "columnName": "LEGACY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "label",
-            "columnName": "LABEL",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "position",
-            "columnName": "POSITION",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "DOWNLOAD_LABELS",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`LABEL` TEXT NOT NULL, `POSITION` INTEGER NOT NULL, `_id` INTEGER, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "label",
-            "columnName": "LABEL",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "position",
-            "columnName": "POSITION",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "DOWNLOAD_DIRNAME",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `DIRNAME` TEXT NOT NULL, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dirname",
-            "columnName": "DIRNAME",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "FILTER",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`MODE` INTEGER NOT NULL, `TEXT` TEXT NOT NULL, `ENABLE` INTEGER NOT NULL, `_id` INTEGER, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "mode",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "text",
-            "columnName": "TEXT",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "enable",
-            "columnName": "ENABLE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "HISTORY",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`TIME` INTEGER NOT NULL, `FAVORITE_SLOT` INTEGER NOT NULL, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "favoriteSlot",
-            "columnName": "FAVORITE_SLOT",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "LOCAL_FAVORITES",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`TIME` INTEGER NOT NULL, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "QUICK_SEARCH",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER, `NAME` TEXT NOT NULL, `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, `POSITION` INTEGER NOT NULL, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "NAME",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "mode",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "keyword",
-            "columnName": "KEYWORD",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "advanceSearch",
-            "columnName": "ADVANCE_SEARCH",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "minRating",
-            "columnName": "MIN_RATING",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pageFrom",
-            "columnName": "PAGE_FROM",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pageTo",
-            "columnName": "PAGE_TO",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "position",
-            "columnName": "POSITION",
-            "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, 'd40b38b0ba3b1c53b773728cdee328c8')"
-    ]
-  }
-}

app/schemas/com.hippo.ehviewer.dao.EhDatabase/13.json

@@ -1,534 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 13,
-    "identityHash": "df15d8f70f45047a738c8911212ea73c",
-    "entities": [
-      {
-        "tableName": "GALLERIES",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, `FAVORITE_SLOT` INTEGER NOT NULL, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "favoriteSlot",
-            "columnName": "FAVORITE_SLOT",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "DOWNLOADS",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`STATE` INTEGER NOT NULL, `LEGACY` INTEGER NOT NULL, `TIME` INTEGER NOT NULL, `LABEL` TEXT, `POSITION` INTEGER NOT NULL, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "state",
-            "columnName": "STATE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "legacy",
-            "columnName": "LEGACY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "label",
-            "columnName": "LABEL",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "position",
-            "columnName": "POSITION",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "DOWNLOAD_LABELS",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`LABEL` TEXT NOT NULL, `POSITION` INTEGER NOT NULL, `_id` INTEGER, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "label",
-            "columnName": "LABEL",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "position",
-            "columnName": "POSITION",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "DOWNLOAD_DIRNAME",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `DIRNAME` TEXT NOT NULL, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dirname",
-            "columnName": "DIRNAME",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "FILTER",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`MODE` INTEGER NOT NULL, `TEXT` TEXT NOT NULL, `ENABLE` INTEGER NOT NULL, `_id` INTEGER, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "mode",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "text",
-            "columnName": "TEXT",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "enable",
-            "columnName": "ENABLE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "HISTORY",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`TIME` INTEGER NOT NULL, `FAVORITE_SLOT` INTEGER NOT NULL, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "favoriteSlot",
-            "columnName": "FAVORITE_SLOT",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "LOCAL_FAVORITES",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`TIME` INTEGER NOT NULL, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "QUICK_SEARCH",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER, `NAME` TEXT NOT NULL, `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, `POSITION` INTEGER NOT NULL, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "NAME",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "mode",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "keyword",
-            "columnName": "KEYWORD",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "advanceSearch",
-            "columnName": "ADVANCE_SEARCH",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "minRating",
-            "columnName": "MIN_RATING",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pageFrom",
-            "columnName": "PAGE_FROM",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pageTo",
-            "columnName": "PAGE_TO",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "position",
-            "columnName": "POSITION",
-            "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, 'df15d8f70f45047a738c8911212ea73c')"
-    ]
-  }
-}

app/schemas/com.hippo.ehviewer.dao.EhDatabase/14.json

@@ -1,402 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 14,
-    "identityHash": "54e4f2704cc47c5a6a2f4b96de978cce",
-    "entities": [
-      {
-        "tableName": "GALLERIES",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, `FAVORITE_SLOT` INTEGER NOT NULL, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "favoriteSlot",
-            "columnName": "FAVORITE_SLOT",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "DOWNLOADS",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `STATE` INTEGER NOT NULL, `LEGACY` INTEGER NOT NULL, `TIME` INTEGER NOT NULL, `LABEL` TEXT, `POSITION` INTEGER NOT NULL, PRIMARY KEY(`GID`), FOREIGN KEY(`GID`) REFERENCES `GALLERIES`(`GID`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "state",
-            "columnName": "STATE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "legacy",
-            "columnName": "LEGACY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "label",
-            "columnName": "LABEL",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "position",
-            "columnName": "POSITION",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "GALLERIES",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "GID"
-            ],
-            "referencedColumns": [
-              "GID"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "DOWNLOAD_LABELS",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`LABEL` TEXT NOT NULL, `POSITION` INTEGER NOT NULL, `_id` INTEGER, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "label",
-            "columnName": "LABEL",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "position",
-            "columnName": "POSITION",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "DOWNLOAD_DIRNAME",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `DIRNAME` TEXT NOT NULL, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dirname",
-            "columnName": "DIRNAME",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "FILTER",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`MODE` INTEGER NOT NULL, `TEXT` TEXT NOT NULL, `ENABLE` INTEGER NOT NULL, `_id` INTEGER, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "mode",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "text",
-            "columnName": "TEXT",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "enable",
-            "columnName": "ENABLE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "HISTORY",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `TIME` INTEGER NOT NULL, PRIMARY KEY(`GID`), FOREIGN KEY(`GID`) REFERENCES `GALLERIES`(`GID`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "GALLERIES",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "GID"
-            ],
-            "referencedColumns": [
-              "GID"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "LOCAL_FAVORITES",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `TIME` INTEGER NOT NULL, PRIMARY KEY(`GID`), FOREIGN KEY(`GID`) REFERENCES `GALLERIES`(`GID`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "GALLERIES",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "GID"
-            ],
-            "referencedColumns": [
-              "GID"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "QUICK_SEARCH",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER, `NAME` TEXT NOT NULL, `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, `POSITION` INTEGER NOT NULL, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "NAME",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "mode",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "keyword",
-            "columnName": "KEYWORD",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "advanceSearch",
-            "columnName": "ADVANCE_SEARCH",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "minRating",
-            "columnName": "MIN_RATING",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pageFrom",
-            "columnName": "PAGE_FROM",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pageTo",
-            "columnName": "PAGE_TO",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "position",
-            "columnName": "POSITION",
-            "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, '54e4f2704cc47c5a6a2f4b96de978cce')"
-    ]
-  }
-}

app/schemas/com.hippo.ehviewer.dao.EhDatabase/15.json

@@ -1,412 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 15,
-    "identityHash": "991a3a3ddc4fe8d4dbcb39b975ab73b8",
-    "entities": [
-      {
-        "tableName": "GALLERIES",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, `FAVORITE_SLOT` INTEGER NOT NULL, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "favoriteSlot",
-            "columnName": "FAVORITE_SLOT",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "DOWNLOADS",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `STATE` INTEGER NOT NULL, `LEGACY` INTEGER NOT NULL, `TIME` INTEGER NOT NULL, `LABEL` TEXT, `POSITION` INTEGER NOT NULL, PRIMARY KEY(`GID`), FOREIGN KEY(`GID`) REFERENCES `GALLERIES`(`GID`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "state",
-            "columnName": "STATE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "legacy",
-            "columnName": "LEGACY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "label",
-            "columnName": "LABEL",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "position",
-            "columnName": "POSITION",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "GALLERIES",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "GID"
-            ],
-            "referencedColumns": [
-              "GID"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "DOWNLOAD_LABELS",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`LABEL` TEXT NOT NULL, `POSITION` INTEGER NOT NULL, `_id` INTEGER, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "label",
-            "columnName": "LABEL",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "position",
-            "columnName": "POSITION",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "_id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_DOWNLOAD_LABELS_LABEL",
-            "unique": true,
-            "columnNames": [
-              "LABEL"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_DOWNLOAD_LABELS_LABEL` ON `${TABLE_NAME}` (`LABEL`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "DOWNLOAD_DIRNAME",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `DIRNAME` TEXT NOT NULL, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dirname",
-            "columnName": "DIRNAME",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "FILTER",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`MODE` INTEGER NOT NULL, `TEXT` TEXT NOT NULL, `ENABLE` INTEGER NOT NULL, `_id` INTEGER, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "mode",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "text",
-            "columnName": "TEXT",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "enable",
-            "columnName": "ENABLE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "HISTORY",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `TIME` INTEGER NOT NULL, PRIMARY KEY(`GID`), FOREIGN KEY(`GID`) REFERENCES `GALLERIES`(`GID`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "GALLERIES",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "GID"
-            ],
-            "referencedColumns": [
-              "GID"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "LOCAL_FAVORITES",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `TIME` INTEGER NOT NULL, PRIMARY KEY(`GID`), FOREIGN KEY(`GID`) REFERENCES `GALLERIES`(`GID`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "GALLERIES",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "GID"
-            ],
-            "referencedColumns": [
-              "GID"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "QUICK_SEARCH",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER, `NAME` TEXT NOT NULL, `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, `POSITION` INTEGER NOT NULL, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "NAME",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "mode",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "keyword",
-            "columnName": "KEYWORD",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "advanceSearch",
-            "columnName": "ADVANCE_SEARCH",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "minRating",
-            "columnName": "MIN_RATING",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pageFrom",
-            "columnName": "PAGE_FROM",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pageTo",
-            "columnName": "PAGE_TO",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "position",
-            "columnName": "POSITION",
-            "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, '991a3a3ddc4fe8d4dbcb39b975ab73b8')"
-    ]
-  }
-}

app/schemas/com.hippo.ehviewer.dao.EhDatabase/16.json

@@ -1,433 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 16,
-    "identityHash": "06e5ff8fd6797d5801e86753fa5831b2",
-    "entities": [
-      {
-        "tableName": "GALLERIES",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, `FAVORITE_SLOT` INTEGER NOT NULL, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "favoriteSlot",
-            "columnName": "FAVORITE_SLOT",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "DOWNLOAD_LABELS",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`LABEL` TEXT NOT NULL, `POSITION` INTEGER NOT NULL, `_id` INTEGER, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "label",
-            "columnName": "LABEL",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "position",
-            "columnName": "POSITION",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "_id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_DOWNLOAD_LABELS_LABEL",
-            "unique": true,
-            "columnNames": [
-              "LABEL"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_DOWNLOAD_LABELS_LABEL` ON `${TABLE_NAME}` (`LABEL`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "DOWNLOADS",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `STATE` INTEGER NOT NULL, `LEGACY` INTEGER NOT NULL, `TIME` INTEGER NOT NULL, `LABEL` TEXT, `POSITION` INTEGER NOT NULL, PRIMARY KEY(`GID`), FOREIGN KEY(`GID`) REFERENCES `GALLERIES`(`GID`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`LABEL`) REFERENCES `DOWNLOAD_LABELS`(`LABEL`) ON UPDATE CASCADE ON DELETE SET NULL )",
-        "fields": [
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "state",
-            "columnName": "STATE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "legacy",
-            "columnName": "LEGACY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "label",
-            "columnName": "LABEL",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "position",
-            "columnName": "POSITION",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_DOWNLOADS_LABEL",
-            "unique": false,
-            "columnNames": [
-              "LABEL"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_DOWNLOADS_LABEL` ON `${TABLE_NAME}` (`LABEL`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "GALLERIES",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "GID"
-            ],
-            "referencedColumns": [
-              "GID"
-            ]
-          },
-          {
-            "table": "DOWNLOAD_LABELS",
-            "onDelete": "SET NULL",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "LABEL"
-            ],
-            "referencedColumns": [
-              "LABEL"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "DOWNLOAD_DIRNAME",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `DIRNAME` TEXT NOT NULL, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dirname",
-            "columnName": "DIRNAME",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "FILTER",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`MODE` INTEGER NOT NULL, `TEXT` TEXT NOT NULL, `ENABLE` INTEGER NOT NULL, `_id` INTEGER, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "mode",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "text",
-            "columnName": "TEXT",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "enable",
-            "columnName": "ENABLE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "HISTORY",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `TIME` INTEGER NOT NULL, PRIMARY KEY(`GID`), FOREIGN KEY(`GID`) REFERENCES `GALLERIES`(`GID`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "GALLERIES",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "GID"
-            ],
-            "referencedColumns": [
-              "GID"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "LOCAL_FAVORITES",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `TIME` INTEGER NOT NULL, PRIMARY KEY(`GID`), FOREIGN KEY(`GID`) REFERENCES `GALLERIES`(`GID`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "GALLERIES",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "GID"
-            ],
-            "referencedColumns": [
-              "GID"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "QUICK_SEARCH",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER, `NAME` TEXT NOT NULL, `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, `POSITION` INTEGER NOT NULL, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "NAME",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "mode",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "keyword",
-            "columnName": "KEYWORD",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "advanceSearch",
-            "columnName": "ADVANCE_SEARCH",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "minRating",
-            "columnName": "MIN_RATING",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pageFrom",
-            "columnName": "PAGE_FROM",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pageTo",
-            "columnName": "PAGE_TO",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "position",
-            "columnName": "POSITION",
-            "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, '06e5ff8fd6797d5801e86753fa5831b2')"
-    ]
-  }
-}

app/schemas/com.hippo.ehviewer.dao.EhDatabase/4.json

@@ -1,534 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 4,
-    "identityHash": "f5752deda842dccabded1cdbf1c78384",
-    "entities": [
-      {
-        "tableName": "BOOKMARKS",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`PAGE` INTEGER NOT NULL, `TIME` INTEGER NOT NULL, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "page",
-            "columnName": "PAGE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumb",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "DOWNLOADS",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`STATE` INTEGER NOT NULL, `LEGACY` INTEGER NOT NULL, `TIME` INTEGER NOT NULL, `LABEL` TEXT, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "state",
-            "columnName": "STATE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "legacy",
-            "columnName": "LEGACY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "label",
-            "columnName": "LABEL",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumb",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "DOWNLOAD_LABELS",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER, `LABEL` TEXT, `TIME` INTEGER NOT NULL, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "label",
-            "columnName": "LABEL",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "DOWNLOAD_DIRNAME",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `DIRNAME` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dirname",
-            "columnName": "DIRNAME",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "FILTER",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`MODE` INTEGER NOT NULL, `TEXT` TEXT, `ENABLE` INTEGER, `_id` INTEGER, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "mode",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "text",
-            "columnName": "TEXT",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "enable",
-            "columnName": "ENABLE",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "HISTORY",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`TIME` INTEGER NOT NULL, `MODE` INTEGER NOT NULL, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "favoriteSlotBackingField",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumb",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "LOCAL_FAVORITES",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`TIME` INTEGER NOT NULL, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumb",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "QUICK_SEARCH",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER, `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, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "NAME",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mode",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "keyword",
-            "columnName": "KEYWORD",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "advanceSearch",
-            "columnName": "ADVANCE_SEARCH",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "minRating",
-            "columnName": "MIN_RATING",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pageFrom",
-            "columnName": "PAGE_FROM",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pageTo",
-            "columnName": "PAGE_TO",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "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, 'f5752deda842dccabded1cdbf1c78384')"
-    ]
-  }
-}

app/schemas/com.hippo.ehviewer.dao.EhDatabase/5.json

@@ -1,534 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 5,
-    "identityHash": "f5752deda842dccabded1cdbf1c78384",
-    "entities": [
-      {
-        "tableName": "BOOKMARKS",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`PAGE` INTEGER NOT NULL, `TIME` INTEGER NOT NULL, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "page",
-            "columnName": "PAGE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "DOWNLOADS",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`STATE` INTEGER NOT NULL, `LEGACY` INTEGER NOT NULL, `TIME` INTEGER NOT NULL, `LABEL` TEXT, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "state",
-            "columnName": "STATE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "legacy",
-            "columnName": "LEGACY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "label",
-            "columnName": "LABEL",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "DOWNLOAD_LABELS",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER, `LABEL` TEXT, `TIME` INTEGER NOT NULL, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "label",
-            "columnName": "LABEL",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "DOWNLOAD_DIRNAME",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `DIRNAME` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dirname",
-            "columnName": "DIRNAME",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "FILTER",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`MODE` INTEGER NOT NULL, `TEXT` TEXT, `ENABLE` INTEGER, `_id` INTEGER, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "mode",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "text",
-            "columnName": "TEXT",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "enable",
-            "columnName": "ENABLE",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "HISTORY",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`TIME` INTEGER NOT NULL, `MODE` INTEGER NOT NULL, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "favoriteSlotBackingField",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "LOCAL_FAVORITES",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`TIME` INTEGER NOT NULL, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "QUICK_SEARCH",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER, `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, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "NAME",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mode",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "keyword",
-            "columnName": "KEYWORD",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "advanceSearch",
-            "columnName": "ADVANCE_SEARCH",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "minRating",
-            "columnName": "MIN_RATING",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pageFrom",
-            "columnName": "PAGE_FROM",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pageTo",
-            "columnName": "PAGE_TO",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "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, 'f5752deda842dccabded1cdbf1c78384')"
-    ]
-  }
-}

app/schemas/com.hippo.ehviewer.dao.EhDatabase/6.json

@@ -1,534 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 6,
-    "identityHash": "e45f4380ef769c127604cb2a502a942b",
-    "entities": [
-      {
-        "tableName": "BOOKMARKS",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`PAGE` INTEGER NOT NULL, `TIME` INTEGER NOT NULL, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "page",
-            "columnName": "PAGE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "DOWNLOADS",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`STATE` INTEGER NOT NULL, `LEGACY` INTEGER NOT NULL, `TIME` INTEGER NOT NULL, `LABEL` TEXT, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "state",
-            "columnName": "STATE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "legacy",
-            "columnName": "LEGACY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "label",
-            "columnName": "LABEL",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "DOWNLOAD_LABELS",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER, `LABEL` TEXT, `TIME` INTEGER NOT NULL, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "label",
-            "columnName": "LABEL",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "DOWNLOAD_DIRNAME",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `DIRNAME` TEXT NOT NULL, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dirname",
-            "columnName": "DIRNAME",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "FILTER",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`MODE` INTEGER NOT NULL, `TEXT` TEXT, `ENABLE` INTEGER, `_id` INTEGER, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "mode",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "text",
-            "columnName": "TEXT",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "enable",
-            "columnName": "ENABLE",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "HISTORY",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`TIME` INTEGER NOT NULL, `MODE` INTEGER NOT NULL, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "favoriteSlotBackingField",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "LOCAL_FAVORITES",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`TIME` INTEGER NOT NULL, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "QUICK_SEARCH",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER, `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, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "NAME",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mode",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "keyword",
-            "columnName": "KEYWORD",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "advanceSearch",
-            "columnName": "ADVANCE_SEARCH",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "minRating",
-            "columnName": "MIN_RATING",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pageFrom",
-            "columnName": "PAGE_FROM",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pageTo",
-            "columnName": "PAGE_TO",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "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, 'e45f4380ef769c127604cb2a502a942b')"
-    ]
-  }
-}

app/schemas/com.hippo.ehviewer.dao.EhDatabase/7.json

@@ -1,448 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 7,
-    "identityHash": "9563c2017be4341dc1bada115426df77",
-    "entities": [
-      {
-        "tableName": "DOWNLOADS",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`STATE` INTEGER NOT NULL, `LEGACY` INTEGER NOT NULL, `TIME` INTEGER NOT NULL, `LABEL` TEXT, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "state",
-            "columnName": "STATE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "legacy",
-            "columnName": "LEGACY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "label",
-            "columnName": "LABEL",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "DOWNLOAD_LABELS",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER, `LABEL` TEXT, `TIME` INTEGER NOT NULL, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "label",
-            "columnName": "LABEL",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "DOWNLOAD_DIRNAME",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `DIRNAME` TEXT NOT NULL, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dirname",
-            "columnName": "DIRNAME",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "FILTER",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`MODE` INTEGER NOT NULL, `TEXT` TEXT, `ENABLE` INTEGER, `_id` INTEGER, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "mode",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "text",
-            "columnName": "TEXT",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "enable",
-            "columnName": "ENABLE",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "HISTORY",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`TIME` INTEGER NOT NULL, `MODE` INTEGER NOT NULL, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "favoriteSlotBackingField",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "LOCAL_FAVORITES",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`TIME` INTEGER NOT NULL, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "QUICK_SEARCH",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER, `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, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "NAME",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mode",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "keyword",
-            "columnName": "KEYWORD",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "advanceSearch",
-            "columnName": "ADVANCE_SEARCH",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "minRating",
-            "columnName": "MIN_RATING",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pageFrom",
-            "columnName": "PAGE_FROM",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pageTo",
-            "columnName": "PAGE_TO",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "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, '9563c2017be4341dc1bada115426df77')"
-    ]
-  }
-}

app/schemas/com.hippo.ehviewer.dao.EhDatabase/8.json

@@ -1,448 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 8,
-    "identityHash": "f09bae277bbdab54ecbb0d698c83e734",
-    "entities": [
-      {
-        "tableName": "DOWNLOADS",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`STATE` INTEGER NOT NULL, `LEGACY` INTEGER NOT NULL, `TIME` INTEGER NOT NULL, `LABEL` TEXT, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "state",
-            "columnName": "STATE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "legacy",
-            "columnName": "LEGACY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "label",
-            "columnName": "LABEL",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "DOWNLOAD_LABELS",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER, `LABEL` TEXT, `TIME` INTEGER NOT NULL, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "label",
-            "columnName": "LABEL",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "DOWNLOAD_DIRNAME",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `DIRNAME` TEXT NOT NULL, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dirname",
-            "columnName": "DIRNAME",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "FILTER",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`MODE` INTEGER NOT NULL, `TEXT` TEXT NOT NULL, `ENABLE` INTEGER NOT NULL, `_id` INTEGER, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "mode",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "text",
-            "columnName": "TEXT",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "enable",
-            "columnName": "ENABLE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "HISTORY",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`TIME` INTEGER NOT NULL, `MODE` INTEGER NOT NULL, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "favoriteSlotBackingField",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "LOCAL_FAVORITES",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`TIME` INTEGER NOT NULL, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "QUICK_SEARCH",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER, `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, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "NAME",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mode",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "keyword",
-            "columnName": "KEYWORD",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "advanceSearch",
-            "columnName": "ADVANCE_SEARCH",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "minRating",
-            "columnName": "MIN_RATING",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pageFrom",
-            "columnName": "PAGE_FROM",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pageTo",
-            "columnName": "PAGE_TO",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "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, 'f09bae277bbdab54ecbb0d698c83e734')"
-    ]
-  }
-}

app/schemas/com.hippo.ehviewer.dao.EhDatabase/9.json

@@ -1,448 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 9,
-    "identityHash": "64f51a531e13d2b0b971f3d8da0876b0",
-    "entities": [
-      {
-        "tableName": "DOWNLOADS",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`STATE` INTEGER NOT NULL, `LEGACY` INTEGER NOT NULL, `TIME` INTEGER NOT NULL, `LABEL` TEXT, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "state",
-            "columnName": "STATE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "legacy",
-            "columnName": "LEGACY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "label",
-            "columnName": "LABEL",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "DOWNLOAD_LABELS",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`LABEL` TEXT NOT NULL, `TIME` INTEGER NOT NULL, `_id` INTEGER, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "label",
-            "columnName": "LABEL",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "DOWNLOAD_DIRNAME",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`GID` INTEGER NOT NULL, `DIRNAME` TEXT NOT NULL, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "dirname",
-            "columnName": "DIRNAME",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "FILTER",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`MODE` INTEGER NOT NULL, `TEXT` TEXT NOT NULL, `ENABLE` INTEGER NOT NULL, `_id` INTEGER, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "mode",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "text",
-            "columnName": "TEXT",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "enable",
-            "columnName": "ENABLE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "HISTORY",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`TIME` INTEGER NOT NULL, `MODE` INTEGER NOT NULL, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "favoriteSlotBackingField",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "LOCAL_FAVORITES",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`TIME` INTEGER NOT NULL, `GID` INTEGER NOT NULL, `TOKEN` TEXT, `TITLE` TEXT, `TITLE_JPN` TEXT, `THUMB` TEXT, `CATEGORY` INTEGER NOT NULL, `POSTED` TEXT, `UPLOADER` TEXT, `RATING` REAL NOT NULL, `SIMPLE_LANGUAGE` TEXT, PRIMARY KEY(`GID`))",
-        "fields": [
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gid",
-            "columnName": "GID",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "token",
-            "columnName": "TOKEN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "TITLE",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleJpn",
-            "columnName": "TITLE_JPN",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbKey",
-            "columnName": "THUMB",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "posted",
-            "columnName": "POSTED",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "UPLOADER",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "rating",
-            "columnName": "RATING",
-            "affinity": "REAL",
-            "notNull": true
-          },
-          {
-            "fieldPath": "simpleLanguage",
-            "columnName": "SIMPLE_LANGUAGE",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "GID"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "QUICK_SEARCH",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER, `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, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "NAME",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "mode",
-            "columnName": "MODE",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "category",
-            "columnName": "CATEGORY",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "keyword",
-            "columnName": "KEYWORD",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "advanceSearch",
-            "columnName": "ADVANCE_SEARCH",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "minRating",
-            "columnName": "MIN_RATING",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pageFrom",
-            "columnName": "PAGE_FROM",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pageTo",
-            "columnName": "PAGE_TO",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "time",
-            "columnName": "TIME",
-            "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, '64f51a531e13d2b0b971f3d8da0876b0')"
-    ]
-  }
-}

app/schemas/com.hippo.ehviewer.dao.SearchDatabase/1.json

@@ -1,46 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 1,
-    "identityHash": "69230710633494b4b331e10dae436fb7",
-    "entities": [
-      {
-        "tableName": "suggestions",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER, `date` LONG, `query` TEXT, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "LONG",
-            "notNull": false
-          },
-          {
-            "fieldPath": "query",
-            "columnName": "query",
-            "affinity": "TEXT",
-            "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, '69230710633494b4b331e10dae436fb7')"
-    ]
-  }
-}

app/schemas/com.hippo.ehviewer.dao.SearchDatabase/2.json

@@ -1,46 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 2,
-    "identityHash": "bf4a5b5f3cb9bc7383488bae14f5d4bd",
-    "entities": [
-      {
-        "tableName": "suggestions",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`date` INTEGER NOT NULL, `query` TEXT NOT NULL, `_id` INTEGER, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "query",
-            "columnName": "query",
-            "affinity": "TEXT",
-            "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, 'bf4a5b5f3cb9bc7383488bae14f5d4bd')"
-    ]
-  }
-}

app/src/main/AndroidManifest.xml

@@ -12,8 +12,7 @@
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="28" />
@@ -23,21 +22,21 @@
         android:allowBackup="true"
         android:appCategory="image"
         android:dataExtractionRules="@xml/data_extraction_rules"
+        android:enableOnBackInvokedCallback="true"
         android:fullBackupContent="@xml/backup_scheme"
         android:hasFragileUserData="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:localeConfig="@xml/locale_config"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:targetApi="tiramisu">
         <activity
-            android:name=".ui.ConfigureActivity"
+            android:name=".ui.login.LoginActivity"
             android:exported="false"
             android:launchMode="singleTask"
-            android:windowSoftInputMode="adjustResize" />
+            android:windowSoftInputMode="adjustResize"/>
         <activity
             android:name=".ui.MainActivity"
             android:banner="@mipmap/ic_leanback_banner"
@@ -70,6 +69,8 @@
                 <data android:scheme="https" />
                 <data android:host="exhentai.org" />
                 <data android:host="e-hentai.org" />
+                <data android:host="g.e-hentai.org" />
+                <data android:host="lofi.e-hentai.org" />
             </intent-filter>
             <intent-filter android:label="@string/keyword_search">
                 <action android:name="android.intent.action.SEND" />
@@ -124,18 +125,22 @@
                 <data android:mimeType="application/x-xz-compressed-tar" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".ui.SettingsActivity"
+            android:configChanges="screenSize"
+            android:label="@string/settings"
+            android:theme="@style/AppTheme" />
         <activity
             android:name=".ui.SecurityActivity"
             android:configChanges="screenSize"
-            android:label="@string/settings" />
+            android:label="@string/settings"
+            android:theme="@style/AppTheme" />
         <activity
             android:name=".shortcuts.ShortcutsActivity"
             android:excludeFromRecents="true"
             android:launchMode="singleTask"
             android:taskAffinity=""
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
-        <activity
-            android:name=".ui.WebViewActivity" />
 
         <service
             android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"

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

@@ -1,6 +1,6 @@
-From 2bda36800a5424c44378bbc0cc8bb5d26a0f34fa Mon Sep 17 00:00:00 2001
+From fc9fb0ea245259e346ab46c334f03b557fe63b6b Mon Sep 17 00:00:00 2001
 From: tarsin <yuanqingxiang233@163.com>
-Date: Sat, 22 Jul 2023 08:30:20 +0800
+Date: Tue, 22 Nov 2022 12:37:12 +0800
 Subject: [PATCH] Don't build other binarys
 
 ---
@@ -8,19 +8,19 @@ Subject: [PATCH] Don't build other binarys
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 55cd358..52b57aa 100644
+index 01c73cd..b461e68 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -962,7 +962,7 @@ check_symbol_exists(getopt_long getopt.h HAVE_GETOPT_LONG)
+@@ -592,7 +592,7 @@ check_symbol_exists(getopt_long getopt.h HAVE_GETOPT_LONG)
  # xzdec
  #############################################################################
  
--if(HAVE_GETOPT_LONG AND HAVE_DECODERS)
+-if(HAVE_GETOPT_LONG)
 +if(0)
      add_executable(xzdec
          src/common/sysdefs.h
          src/common/tuklib_common.h
-@@ -1008,7 +1008,7 @@ endif()
+@@ -630,7 +630,7 @@ endif()
  # xz
  #############################################################################
  
@@ -30,5 +30,5 @@ index 55cd358..52b57aa 100644
          src/common/mythread.h
          src/common/sysdefs.h
 -- 
-2.41.0
+2.39.2
 

app/src/main/cpp/0001-Don-t-build-shared-lib.patch

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

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

@@ -1,29 +0,0 @@
-From 57da49f9b0ed8538573f6cfe289f835ee0078eec Mon Sep 17 00:00:00 2001
-From: tarsin <yuanqingxiang233@163.com>
-Date: Sat, 22 Jul 2023 17:50:08 +0800
-Subject: [PATCH] Hide symbols
-
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 646484b7..67a71272 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2060,10 +2060,10 @@ SET(OLD_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
- SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fvisibility=hidden -Werror")
- CHECK_C_SOURCE_COMPILES("void __attribute__((visibility(\"default\"))) foo(void);
- int main() { return 0; }" HAVE_VISIBILITY_ATTR)
--IF (HAVE_VISIBILITY_ATTR)
-+IF (0)
-   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
-   ADD_DEFINITIONS(-D__LIBARCHIVE_ENABLE_VISIBILITY)
--ENDIF(HAVE_VISIBILITY_ATTR)
-+ENDIF(0)
- SET(CMAKE_REQUIRED_FLAGS "${OLD_CMAKE_REQUIRED_FLAGS}")
- 
- # Generate "config.h" from "build/cmake/config.h.in"
--- 
-2.41.0
-

app/src/main/cpp/CMakeLists.txt

@@ -3,7 +3,7 @@ project(ehviewer C ASM)
 include(FetchContent)
 
 if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Ofast -fvisibility=hidden -fvisibility-inlines-hidden -funroll-loops -flto \
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Ofast -fvisibility=hidden -fvisibility-inlines-hidden -funroll-loops -flto=thin \
            -mllvm -polly \
            -mllvm -polly-run-dce \
            -mllvm -polly-run-inliner \
@@ -20,11 +20,9 @@ endif (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
 get_filename_component(deps "../_deps" REALPATH BASE_DIR "${CMAKE_BINARY_DIR}")
 set(FETCHCONTENT_BASE_DIR ${deps})
 
-set(BUILD_TESTING 0)
-
 FetchContent_Declare(liblzma
         GIT_REPOSITORY https://git.tukaani.org/xz.git
-        GIT_TAG v5.4.3
+        GIT_TAG v5.4.1
         PATCH_COMMAND git apply ${CMAKE_CURRENT_LIST_DIR}/0001-Don-t-build-other-binarys.patch || cd .
         )
 
@@ -52,19 +50,13 @@ SET(HAVE_LZMA_STREAM_ENCODER_MT 1)
 SET(HAVE_LZMADEC_H 1)
 SET(HAVE_LIBLZMADEC 1)
 
-option(ENABLE_TAR OFF)
-option(ENABLE_CPIO OFF)
-option(ENABLE_CAT OFF)
-option(ENABLE_UNZIP OFF)
-option(ENABLE_TEST OFF)
-
 # Configure libarchive link's static lib
 SET(LIBARCHIVE_CUSTOM_LIBS "nettle" "liblzma")
 
 FetchContent_Declare(libarchive
         GIT_REPOSITORY https://github.com/libarchive/libarchive
-        GIT_TAG v3.7.0
-        PATCH_COMMAND git apply ${CMAKE_CURRENT_LIST_DIR}/0001-Hide-symbols.patch ${CMAKE_CURRENT_LIST_DIR}/0002-Insert-link-libs.patch || cd .
+        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)

app/src/main/java/androidx/navigation/ui/NavigationUI.kt

@@ -1,6 +1,5 @@
 package androidx.navigation.ui
 
-import android.annotation.SuppressLint
 import android.view.MenuItem
 import androidx.annotation.IdRes
 import androidx.navigation.ActivityNavigator
@@ -9,8 +8,8 @@ import androidx.navigation.NavDestination
 import androidx.navigation.NavDestination.Companion.hierarchy
 import androidx.navigation.NavOptions
 
-@SuppressLint("PrivateResource")
 fun onNavDestinationSelected2(item: MenuItem, navController: NavController): Boolean {
+    if (navController.currentDestination?.matchDestination(item.itemId) == true) return true
     val builder = NavOptions.Builder().setLaunchSingleTop(true)
     if (
         navController.currentDestination!!.parent!!.findNode(item.itemId)
@@ -21,10 +20,10 @@ fun onNavDestinationSelected2(item: MenuItem, navController: NavController): Boo
             .setPopEnterAnim(R.anim.nav_default_pop_enter_anim)
             .setPopExitAnim(R.anim.nav_default_pop_exit_anim)
     } else {
-        builder.setEnterAnim(androidx.fragment.R.animator.fragment_open_enter)
-            .setExitAnim(androidx.fragment.R.animator.fragment_open_exit)
-            .setPopEnterAnim(androidx.fragment.R.animator.fragment_close_enter)
-            .setPopExitAnim(androidx.fragment.R.animator.fragment_close_exit)
+        builder.setEnterAnim(com.hippo.ehviewer.R.anim.scene_open_enter)
+            .setExitAnim(com.hippo.ehviewer.R.anim.scene_open_exit)
+            .setPopEnterAnim(com.hippo.ehviewer.R.anim.scene_close_enter)
+            .setPopExitAnim(com.hippo.ehviewer.R.anim.scene_close_exit)
     }
     val options = builder.build()
     return try {

app/src/main/java/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.kt

@@ -22,7 +22,7 @@ import androidx.annotation.IntDef
 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.setting.ReaderPreferences
+import eu.kanade.tachiyomi.ui.reader.ReaderActivity
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -31,6 +31,7 @@ import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import java.util.ArrayList
 import java.util.Locale
 import java.util.concurrent.locks.ReadWriteLock
 import java.util.concurrent.locks.ReentrantReadWriteLock
@@ -441,8 +442,8 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
         detector = GestureDetector(
             context,
             object : GestureDetector.SimpleOnGestureListener() {
-                override fun onFling(e1: MotionEvent?, e2: MotionEvent, velocityX: Float, velocityY: Float): Boolean {
-                    if (panEnabled && isReady && vTranslate != null && e1 != null && (abs(e1.x - e2.x) > 50 || abs(e1.y - e2.y) > 50) && (abs(velocityX) > 500 || abs(velocityY) > 500) && !isZooming) {
+                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
@@ -462,7 +463,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
                 }
 
                 override fun onDoubleTap(e: MotionEvent): Boolean {
-                    if (!ReaderPreferences.doubleTapToZoom().get()) return false
+                    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.
@@ -1712,6 +1713,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
      * @param sTarget target object for result. The same instance is also returned.
      * @return a coordinate representing the corresponding source coordinate. This is the same instance passed to the sTarget param.
      */
+    @JvmOverloads
     fun viewToSourceCoord(vx: Float, vy: Float, sTarget: PointF = PointF()): PointF? {
         if (vTranslate == null) {
             return null
@@ -1763,6 +1765,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
      * @param vTarget target object for result. The same instance is also returned.
      * @return view coordinates. This is the same instance passed to the vTarget param.
      */
+    @JvmOverloads
     fun sourceToViewCoord(sx: Float, sy: Float, vTarget: PointF = PointF()): PointF? {
         if (vTranslate == null) {
             return null

app/src/main/java/com/davemorrissey/labs/subscaleview/decoder/Decoder.kt

@@ -5,6 +5,8 @@ import android.graphics.Bitmap
 import android.graphics.Point
 import android.graphics.Rect
 import com.davemorrissey.labs.subscaleview.provider.InputProvider
+import java.lang.Exception
+import kotlin.Throws
 
 /**
  * Interface for image decoding classes.
@@ -19,6 +21,7 @@ interface Decoder {
      * @return Dimensions of the image.
      * @throws Exception if initialisation fails.
      */
+    @Throws(Exception::class)
     fun init(context: Context, provider: InputProvider): Point
 
     /**

app/src/main/java/com/davemorrissey/labs/subscaleview/decoder/ImageDecoder.kt

@@ -7,7 +7,10 @@ import android.graphics.Rect
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
 import com.davemorrissey.labs.subscaleview.provider.InputProvider
 
-class ImageDecoder(private val cropBorders: Boolean, bitmapConfig: Bitmap.Config? = null) : Decoder {
+class ImageDecoder @JvmOverloads constructor(
+    private val cropBorders: Boolean,
+    bitmapConfig: Bitmap.Config? = null,
+) : Decoder {
     init {
         val globalBitmapConfig = SubsamplingScaleImageView.preferredBitmapConfig
     }
@@ -21,6 +24,7 @@ class ImageDecoder(private val cropBorders: Boolean, bitmapConfig: Bitmap.Config
      * @return Dimensions of the image.
      * @throws Exception if initialisation fails.
      */
+    @Throws(Exception::class)
     override fun init(context: Context, provider: InputProvider): Point {
         TODO()
     }

app/src/main/java/com/hippo/ehviewer/AppConfig.java

@@ -0,0 +1,177 @@
+/*
+ * 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.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 java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+
+public class AppConfig {
+
+    public static final String APP_DIRNAME = "EhViewer";
+
+    private static final String DOWNLOAD = "download";
+    private static final String TEMP = "temp";
+    private static final String PARSE_ERROR = "parse_error";
+    private static final String CRASH = "crash";
+
+    @SuppressLint("StaticFieldLeak")
+    private static Context sContext;
+
+    public static void initialize(Context context) {
+        sContext = context.getApplicationContext();
+    }
+
+    @Nullable
+    public static File getExternalAppDir() {
+        if (Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) {
+            File dir = sContext.getExternalFilesDir(null);
+            return FileUtils.ensureDirectory(dir) ? dir : null;
+        }
+        return null;
+    }
+
+    /**
+     * mkdirs and get
+     */
+    @Nullable
+    public static File getDirInExternalAppDir(String filename) {
+        File appFolder = getExternalAppDir();
+        if (appFolder != null) {
+            File dir = new File(appFolder, filename);
+            return FileUtils.ensureDirectory(dir) ? dir : null;
+        }
+        return null;
+    }
+
+    @Nullable
+    public static File getFileInExternalAppDir(String filename) {
+        File appFolder = getExternalAppDir();
+        if (appFolder != null) {
+            File file = new File(appFolder, filename);
+            return FileUtils.ensureFile(file) ? file : null;
+        }
+        return null;
+    }
+
+    @Nullable
+    public static File getDefaultDownloadDir() {
+        return getDirInExternalAppDir(DOWNLOAD);
+    }
+
+    @Nullable
+    public static File getExternalTempDir() {
+        File dir = sContext.getExternalCacheDir();
+        File file;
+        if (null != dir && FileUtils.ensureDirectory(file = new File(dir, TEMP))) {
+            return file;
+        } else {
+            return null;
+        }
+    }
+
+    @Nullable
+    public static File getExternalCopyTempDir() {
+        File dir = sContext.getExternalCacheDir();
+        File file;
+        if (null != dir && FileUtils.ensureDirectory(file = new File(dir, "copy"))) {
+            return file;
+        } else {
+            return null;
+        }
+    }
+
+    @Nullable
+    public static File getExternalParseErrorDir() {
+        return getDirInExternalAppDir(PARSE_ERROR);
+    }
+
+    @Nullable
+    public static File getExternalCrashDir() {
+        return getDirInExternalAppDir(CRASH);
+    }
+
+    @Nullable
+    public static File getTempDir() {
+        File dir = sContext.getCacheDir();
+        File file;
+        if (null != dir && FileUtils.ensureDirectory(file = new File(dir, TEMP))) {
+            return file;
+        } else {
+            return null;
+        }
+    }
+
+    @Nullable
+    public static File createTempFile() {
+        return FileUtils.createTempFile(getTempDir(), null);
+    }
+
+    public static void saveParseErrorBody(@NonNull ParseException e) {
+        File dir = getExternalParseErrorDir();
+        if (null == dir) {
+            return;
+        }
+
+        File file = new File(dir, ReadableTime.getFilenamableTime(System.currentTimeMillis()) + ".txt");
+        OutputStream os = null;
+        try {
+            os = new FileOutputStream(file);
+            String message = e.getMessage();
+            String body = e.getBody();
+            if (null != message) {
+                os.write(message.getBytes(StandardCharsets.UTF_8));
+                os.write('\n');
+            }
+            os.write(body.getBytes(StandardCharsets.UTF_8));
+            os.flush();
+        } catch (IOException e1) {
+            // Ignore
+        } finally {
+            IOUtils.closeQuietly(os);
+        }
+    }
+
+    @Nullable
+    public static File getFilesDir(String name) {
+        File dir = sContext.getFilesDir();
+        if (dir == null) {
+            return null;
+        }
+
+        dir = new File(dir, name);
+        if (dir.isDirectory() || dir.mkdirs()) {
+            return dir;
+        } else {
+            return null;
+        }
+    }
+}

app/src/main/java/com/hippo/ehviewer/Crash.kt

@@ -1,8 +1,25 @@
-package com.hippo.ehviewer.util
+/*
+ * 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.BuildConfig
+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
@@ -32,16 +49,16 @@ object Crash {
         fw.write("${collectClassStaticInfo(Build::class.java)}\n")
         fw.write("${collectClassStaticInfo(Build.VERSION::class.java)}\n")
         fw.write("MEMORY=")
-        fw.write(FileUtils.humanReadableByteCount(OSUtils.appAllocatedMemory, false))
+        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.appMaxMemory, false))
+        fw.write(FileUtils.humanReadableByteCount(OSUtils.getAppMaxMemory(), false))
         fw.write("\n")
         fw.write("MEMORY_TOTAL=")
-        fw.write(FileUtils.humanReadableByteCount(OSUtils.totalMemory, false))
+        fw.write(FileUtils.humanReadableByteCount(OSUtils.getTotalMemory(), false))
         fw.write("\n")
         fw.write("\n")
     }
@@ -57,7 +74,7 @@ object Crash {
     }
 
     fun saveCrashLog(t: Throwable) {
-        val dir = AppConfig.externalCrashDir ?: return
+        val dir = AppConfig.getExternalCrashDir() ?: return
         val nowString = ReadableTime.getFilenamableTime(System.currentTimeMillis())
         val fileName = "crash-$nowString.log"
         val file = File(dir, fileName)

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

@@ -20,52 +20,45 @@ import android.app.Application
 import android.content.ComponentCallbacks2
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.collection.LruCache
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.ProcessLifecycleOwner
-import androidx.lifecycle.coroutineScope
+import coil.ImageLoader
 import coil.ImageLoaderFactory
 import coil.decode.ImageDecoderDecoder
 import coil.util.DebugLogger
 import com.hippo.ehviewer.client.EhCookieStore
+import com.hippo.ehviewer.client.EhDns
+import com.hippo.ehviewer.client.EhSSLSocketFactory
 import com.hippo.ehviewer.client.EhTagDatabase
 import com.hippo.ehviewer.client.data.GalleryDetail
 import com.hippo.ehviewer.coil.MergeInterceptor
-import com.hippo.ehviewer.coil.installCronetHttpUriFetcher
+import com.hippo.ehviewer.coil.diskCache
 import com.hippo.ehviewer.dailycheck.checkDawn
-import com.hippo.ehviewer.dao.SearchDatabase
+import com.hippo.ehviewer.dao.buildMainDB
 import com.hippo.ehviewer.download.DownloadManager
-import com.hippo.ehviewer.ktbuilder.cache
-import com.hippo.ehviewer.ktbuilder.chunker
-import com.hippo.ehviewer.ktbuilder.diskCache
-import com.hippo.ehviewer.ktbuilder.httpClient
-import com.hippo.ehviewer.ktbuilder.imageLoader
 import com.hippo.ehviewer.legacy.cleanObsoleteCache
-import com.hippo.ehviewer.legacy.migrateCookies
 import com.hippo.ehviewer.ui.keepNoMediaFileStatus
-import com.hippo.ehviewer.ui.lockObserver
-import com.hippo.ehviewer.util.AppConfig
-import com.hippo.ehviewer.util.Crash
-import com.hippo.ehviewer.util.FavouriteStatusRouter
-import com.hippo.ehviewer.util.FileUtils
 import com.hippo.ehviewer.util.ReadableTime
-import com.hippo.ehviewer.util.isAtLeastQ
-import com.hippo.ehviewer.util.isCronetSupported
-import eu.kanade.tachiyomi.network.interceptor.CloudflareInterceptor
+import com.hippo.ehviewer.yorozuya.FileUtils
+import eu.kanade.tachiyomi.core.preference.AndroidPreferenceStore
+import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences
 import eu.kanade.tachiyomi.util.lang.launchIO
-import eu.kanade.tachiyomi.util.lang.withUIContext
-import kotlinx.coroutines.launch
-import moe.tarsin.kt.unreachable
-import okhttp3.AsyncDns
-import okhttp3.android.AndroidAsyncDns
+import kotlinx.coroutines.DelicateCoroutinesApi
+import okhttp3.Cache
+import okhttp3.OkHttpClient
+import okio.FileSystem
 import okio.Path.Companion.toOkioPath
-import splitties.arch.room.roomDb
-import splitties.init.appCtx
+import java.net.Proxy
+import java.security.KeyStore
+import javax.net.ssl.TrustManagerFactory
+import javax.net.ssl.X509TrustManager
 
-private val lifecycle = ProcessLifecycleOwner.get().lifecycle
-private val lifecycleScope = lifecycle.coroutineScope
-
-class EhApplication : Application(), ImageLoaderFactory {
+class EhApplication : Application(), DefaultLifecycleObserver, ImageLoaderFactory {
+    @OptIn(DelicateCoroutinesApi::class)
     override fun onCreate() {
-        lifecycle.addObserver(lockObserver)
+        ProcessLifecycleOwner.get().lifecycle.addObserver(this)
+        application = this
         val handler = Thread.getDefaultUncaughtExceptionHandler()
         Thread.setDefaultUncaughtExceptionHandler { t, e ->
             try {
@@ -76,25 +69,18 @@ class EhApplication : Application(), ImageLoaderFactory {
             }
             handler?.uncaughtException(t, e)
         }
-        super.onCreate()
+        super<Application>.onCreate()
         System.loadLibrary("ehviewer")
-        System.loadLibrary("ehviewer_rust")
+        Settings.initialize()
         ReadableTime.initialize(this)
-        lifecycleScope.launchIO {
-            val theme = Settings.theme
-            withUIContext {
-                AppCompatDelegate.setDefaultNightMode(theme)
-            }
-        }
-        lifecycleScope.launchIO {
-            launchIO {
-                migrateCookies()
-            }
+        AppConfig.initialize(this)
+        AppCompatDelegate.setDefaultNightMode(Settings.theme)
+        launchIO {
             launchIO {
                 EhTagDatabase.update()
             }
             launchIO {
-                EhDB
+                ehDatabase
             }
             launchIO {
                 DownloadManager.isIdle
@@ -125,11 +111,11 @@ class EhApplication : Application(), ImageLoaderFactory {
     }
 
     private fun clearTempDir() {
-        var dir = AppConfig.tempDir
+        var dir = AppConfig.getTempDir()
         if (null != dir) {
             FileUtils.deleteContent(dir)
         }
-        dir = AppConfig.externalTempDir
+        dir = AppConfig.getExternalTempDir()
         if (null != dir) {
             FileUtils.deleteContent(dir)
         }
@@ -142,67 +128,85 @@ class EhApplication : Application(), ImageLoaderFactory {
         }
     }
 
-    override fun newImageLoader() = imageLoader {
-        components {
-            if (isCronetSupported) {
-                callFactory { unreachable() }
-                installCronetHttpUriFetcher()
-            } else {
-                callFactory(baseOkHttpClient)
-            }
-            add { result, options, _ -> ImageDecoderDecoder(result.source, options, false) }
-            add(MergeInterceptor)
+    override fun onPause(owner: LifecycleOwner) {
+        if (!locked) {
+            locked_last_leave_time = System.currentTimeMillis() / 1000
         }
-        diskCache(imageCache)
-        crossfade(300)
-        error(R.drawable.image_failed)
-        if (BuildConfig.DEBUG) logger(DebugLogger())
-        respectCacheHeaders(false)
+        locked = true
+    }
+
+    override fun newImageLoader(): ImageLoader {
+        return ImageLoader.Builder(this).apply {
+            okHttpClient(nonCacheOkHttpClient)
+            components {
+                add { result, options, _ -> ImageDecoderDecoder(result.source, options, false) }
+                add(MergeInterceptor)
+            }
+            diskCache(imageCache)
+            crossfade(300)
+            error(R.drawable.image_failed)
+            if (BuildConfig.DEBUG) logger(DebugLogger())
+        }.build()
     }
 
     companion object {
-        val baseOkHttpClient by lazy {
-            httpClient {
-                cookieJar(EhCookieStore)
-                if (isAtLeastQ) {
-                    dns(AsyncDns.toDns(AndroidAsyncDns.IPv4, AndroidAsyncDns.IPv6))
-                }
-                chunker { alwaysReadResponseBody(false) }
-                addInterceptor(CloudflareInterceptor(appCtx))
-            }
-        }
+        var locked = true
+        var locked_last_leave_time: Long = 0
 
-        val noRedirectOkHttpClient by lazy {
-            httpClient(baseOkHttpClient) {
-                followRedirects(false)
-            }
+        lateinit var application: EhApplication
+            private set
+
+        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!!!
         val okHttpClient by lazy {
-            httpClient(baseOkHttpClient) {
-                cache(
-                    appCtx.cacheDir.toOkioPath() / "http_cache",
+            nonCacheOkHttpClient.newBuilder().cache(
+                Cache(
+                    application.cacheDir.toOkioPath() / "http_cache",
                     20L * 1024L * 1024L,
-                )
-            }
+                    FileSystem.SYSTEM,
+                ),
+            ).build()
         }
 
         val galleryDetailCache by lazy {
             LruCache<Long, GalleryDetail>(25).also {
-                lifecycleScope.launch {
-                    FavouriteStatusRouter.globalFlow.collect { (gid, slot) -> it[gid]?.favoriteSlot = slot }
+                favouriteStatusRouter.addListener { gid, slot ->
+                    it[gid]?.favoriteSlot = slot
                 }
             }
         }
 
+        val hosts by lazy { Hosts(application, "hosts.db") }
+
+        val favouriteStatusRouter by lazy { FavouriteStatusRouter() }
+
+        val readerPreferences by lazy { ReaderPreferences(AndroidPreferenceStore(application)) }
+
+        val ehDatabase by lazy { buildMainDB(application) }
+
         val imageCache by lazy {
             diskCache {
-                directory(appCtx.cacheDir.toOkioPath() / "image_cache")
+                directory(application.cacheDir.toOkioPath() / "image_cache")
                 maxSizeBytes(Settings.readCacheSize.coerceIn(320, 5120).toLong() * 1024 * 1024)
             }
         }
-
-        val searchDatabase by lazy { roomDb<SearchDatabase>("search_database.db") }
     }
 }

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

@@ -19,12 +19,15 @@ import android.content.Context
 import android.net.Uri
 import android.os.ParcelFileDescriptor
 import android.os.ParcelFileDescriptor.MODE_READ_ONLY
-import arrow.fx.coroutines.release
-import arrow.fx.coroutines.resource
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
+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
@@ -32,76 +35,90 @@ import com.hippo.ehviewer.dao.LocalFavoriteInfo
 import com.hippo.ehviewer.dao.QuickSearch
 import com.hippo.ehviewer.download.DownloadManager
 import com.hippo.ehviewer.util.sendTo
-import kotlinx.coroutines.flow.Flow
-import splitties.arch.room.roomDb
 
 object EhDB {
-    private val db = roomDb<EhDatabase>("eh.db")
+    private const val CUR_DB_VER = 4
+    private val db = ehDatabase
 
-    private suspend fun putGalleryInfo(galleryInfo: BaseGalleryInfo) {
-        db.galleryDao().upsert(galleryInfo)
+    // 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)
     }
 
-    private suspend fun deleteGalleryInfo(galleryInfo: BaseGalleryInfo) {
-        runCatching { db.galleryDao().delete(galleryInfo) }
-    }
-
-    suspend fun getAllDownloadInfo() = db.downloadsDao().joinList().onEach {
-        if (it.state == DownloadInfo.STATE_WAIT || it.state == DownloadInfo.STATE_DOWNLOAD) {
-            it.state = DownloadInfo.STATE_NONE
+    @Synchronized
+    fun putDownloadInfo(downloadInfo: DownloadInfo) {
+        db.downloadsDao().run {
+            if (load(downloadInfo.gid) != null) {
+                update(downloadInfo)
+            } else {
+                insert(downloadInfo)
+            }
         }
     }
 
-    suspend fun updateDownloadInfo(downloadInfo: List<DownloadInfo>) {
-        val dao = db.downloadsDao()
-        dao.update(downloadInfo.map(DownloadInfo::downloadInfo))
+    @Synchronized
+    fun removeDownloadInfo(downloadInfo: DownloadInfo) {
+        db.downloadsDao().delete(downloadInfo)
     }
 
-    suspend fun putDownloadInfo(downloadInfo: DownloadInfo) {
-        putGalleryInfo(downloadInfo.galleryInfo)
-        db.downloadsDao().upsert(downloadInfo.downloadInfo)
-    }
-
-    suspend fun removeDownloadInfo(downloadInfo: DownloadInfo) {
-        val dao = db.downloadsDao()
-        dao.delete(downloadInfo.downloadInfo)
-        dao.fill(downloadInfo.position)
-        deleteGalleryInfo(downloadInfo.galleryInfo)
-    }
-
-    suspend fun removeDownloadInfo(downloadInfo: List<DownloadInfo>) {
-        val dao = db.downloadsDao()
-        downloadInfo.forEach {
-            dao.delete(it.downloadInfo)
-            deleteGalleryInfo(it.galleryInfo)
-        }
-        dao.fill(downloadInfo.first().position, downloadInfo.size)
-    }
-
-    suspend fun getDownloadDirname(gid: Long): String? {
+    @Synchronized
+    fun getDownloadDirname(gid: Long): String? {
         val dao = db.downloadDirnameDao()
         val raw = dao.load(gid)
         return raw?.dirname
     }
 
-    suspend fun putDownloadDirname(gid: Long, dirname: String) {
+    @Synchronized
+    fun putDownloadDirname(gid: Long, dirname: String?) {
         val dao = db.downloadDirnameDao()
-        dao.upsert(DownloadDirname(gid, dirname))
+        var raw = dao.load(gid)
+        if (raw != null) {
+            raw.dirname = dirname
+            dao.update(raw)
+        } else {
+            raw = DownloadDirname(gid, dirname)
+            dao.insert(raw)
+        }
     }
 
-    suspend fun removeDownloadDirname(gid: Long) {
+    @Synchronized
+    fun removeDownloadDirname(gid: Long) {
         val dao = db.downloadDirnameDao()
         dao.deleteByKey(gid)
     }
 
-    private suspend fun importDownloadDirname(downloadDirnameList: List<DownloadDirname>) {
+    @Synchronized
+    fun clearDownloadDirname() {
         val dao = db.downloadDirnameDao()
-        dao.insertOrIgnore(downloadDirnameList)
+        dao.deleteAll()
     }
 
-    suspend fun getAllDownloadLabelList() = db.downloadLabelDao().list()
+    @get:Synchronized
+    val allDownloadLabelList: List<DownloadLabel>
+        get() = db.downloadLabelDao().list()
 
-    suspend fun addDownloadLabel(raw: DownloadLabel): DownloadLabel {
+    @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()
@@ -109,122 +126,221 @@ object EhDB {
         return raw
     }
 
-    suspend fun updateDownloadLabel(raw: DownloadLabel) {
+    @Synchronized
+    fun updateDownloadLabel(raw: DownloadLabel?) {
         val dao = db.downloadLabelDao()
-        dao.update(raw)
+        dao.update(raw!!)
     }
 
-    suspend fun updateDownloadLabel(downloadLabels: List<DownloadLabel>) {
+    @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()
-        dao.update(downloadLabels)
+        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)
     }
 
-    suspend fun removeDownloadLabel(raw: DownloadLabel) {
+    @Synchronized
+    fun removeDownloadLabel(raw: DownloadLabel?) {
         val dao = db.downloadLabelDao()
-        dao.delete(raw)
-        dao.fill(raw.position)
+        dao.delete(raw!!)
     }
 
-    suspend fun removeLocalFavorites(galleryInfo: BaseGalleryInfo) {
-        db.localFavoritesDao().deleteByKey(galleryInfo.gid)
-        deleteGalleryInfo(galleryInfo)
+    @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)
     }
 
-    suspend fun removeLocalFavorites(galleryInfoList: List<BaseGalleryInfo>) {
-        galleryInfoList.forEach {
-            removeLocalFavorites(it)
+    @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)
         }
     }
 
-    suspend fun containLocalFavorites(gid: Long): Boolean {
+    @JvmStatic
+    @Synchronized
+    fun containLocalFavorites(gid: Long): Boolean {
         val dao = db.localFavoritesDao()
         return dao.contains(gid)
     }
 
-    suspend fun putLocalFavorites(galleryInfo: BaseGalleryInfo) {
-        putGalleryInfo(galleryInfo)
-        db.localFavoritesDao().upsert(LocalFavoriteInfo(galleryInfo.gid))
-    }
-
-    suspend fun putLocalFavorites(galleryInfoList: List<BaseGalleryInfo>) {
-        galleryInfoList.forEach {
-            putLocalFavorites(it)
+    @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)
         }
     }
 
-    private suspend fun importLocalFavorites(localFavorites: List<LocalFavoriteInfo>) {
-        db.localFavoritesDao().insertOrIgnore(localFavorites)
+    @Synchronized
+    fun putLocalFavorites(galleryInfoList: List<GalleryInfo>) {
+        for (gi in galleryInfoList) {
+            putLocalFavorites(gi)
+        }
     }
 
-    suspend fun getAllQuickSearch() = db.quickSearchDao().list()
+    @get:Synchronized
+    val allQuickSearch: List<QuickSearch>
+        get() {
+            val dao = db.quickSearchDao()
+            return dao.list()
+        }
 
-    suspend fun insertQuickSearch(quickSearch: QuickSearch) {
+    @Synchronized
+    fun insertQuickSearch(quickSearch: QuickSearch) {
         val dao = db.quickSearchDao()
+        quickSearch.id = null
+        quickSearch.time = System.currentTimeMillis()
         quickSearch.id = dao.insert(quickSearch)
     }
 
-    private suspend fun importQuickSearch(quickSearchList: List<QuickSearch>) {
+    @Synchronized
+    fun importQuickSearch(quickSearchList: List<QuickSearch?>) {
         val dao = db.quickSearchDao()
-        dao.insert(quickSearchList)
-    }
-
-    suspend fun deleteQuickSearch(quickSearch: QuickSearch) {
-        val dao = db.quickSearchDao()
-        dao.delete(quickSearch)
-        dao.fill(quickSearch.position)
-    }
-
-    suspend fun updateQuickSearch(quickSearchList: List<QuickSearch>) {
-        val dao = db.quickSearchDao()
-        dao.update(quickSearchList)
-    }
-
-    val historyLazyList
-        get() = db.historyDao().joinListLazy()
-
-    val localFavLazyList
-        get() = db.localFavoritesDao().joinListLazy()
-
-    val localFavCount: Flow<Int>
-        get() = db.localFavoritesDao().count()
-
-    fun searchLocalFav(keyword: String) = db.localFavoritesDao().joinListLazy("%$keyword%")
-
-    suspend fun putHistoryInfo(galleryInfo: BaseGalleryInfo) {
-        putGalleryInfo(galleryInfo)
-        db.historyDao().upsert(HistoryInfo(galleryInfo.gid))
-    }
-
-    suspend fun modifyHistoryInfoFavslotNonRefresh(gid: Long, slot: Int) {
-        val dao = db.galleryDao()
-        dao.load(gid)?.let {
-            it.favoriteSlot = slot
-            dao.update(it)
+        for (quickSearch in quickSearchList) {
+            dao.insert(quickSearch!!)
         }
     }
 
-    private suspend fun importHistoryInfo(historyInfoList: List<HistoryInfo>) {
-        val dao = db.historyDao()
-        dao.insertOrIgnore(historyInfoList)
+    @Synchronized
+    fun deleteQuickSearch(quickSearch: QuickSearch?) {
+        val dao = db.quickSearchDao()
+        if (quickSearch != null) {
+            dao.delete(quickSearch)
+        }
     }
 
-    suspend fun deleteHistoryInfo(galleryInfo: BaseGalleryInfo) {
-        val dao = db.historyDao()
-        dao.deleteByKey(galleryInfo.gid)
-        deleteGalleryInfo(galleryInfo)
+    @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)
     }
 
-    suspend fun clearHistoryInfo() {
+    @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()
-        val historyList = dao.list()
         dao.deleteAll()
-        historyList.forEach { runCatching { db.galleryDao().deleteByKey(it.gid) } }
     }
 
-    suspend fun getAllFilter() = db.filterDao().list()
+    @get:Synchronized
+    val allFilter: List<Filter>
+        get() = db.filterDao().list()
 
-    suspend fun addFilter(filter: Filter): Boolean {
-        val existFilter = runCatching { db.filterDao().load(filter.text, filter.mode.field) }.getOrNull()
+    @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)
@@ -234,31 +350,35 @@ object EhDB {
         }
     }
 
-    suspend fun deleteFilter(filter: Filter) {
+    @Synchronized
+    fun deleteFilter(filter: Filter) {
         db.filterDao().delete(filter)
     }
 
-    suspend fun updateFilter(filter: Filter) {
+    @Synchronized
+    fun triggerFilter(filter: Filter) {
+        filter.enable = filter.enable?.not() ?: false
         db.filterDao().update(filter)
     }
 
-    suspend fun exportDB(context: Context, uri: Uri) {
+    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"
-        resource {
+        runCatching {
             context.deleteDatabase(ehExportName)
-            roomDb<EhDatabase>(ehExportName)
-        } release {
-            it.close()
-            context.deleteDatabase(ehExportName)
-        } use { newDb ->
-            db.galleryDao().list().let { newDb.galleryDao().insertOrIgnore(it) }
-            db.downloadLabelDao().list().let { newDb.downloadLabelDao().insert(it) }
-            db.downloadDirnameDao().list().let { newDb.downloadDirnameDao().insertOrIgnore(it) }
-            db.downloadsDao().list().let { newDb.downloadsDao().insert(it) }
-            db.historyDao().list().let { newDb.historyDao().insertOrIgnore(it) }
-            db.quickSearchDao().list().let { newDb.quickSearchDao().insert(it) }
-            db.localFavoritesDao().list().let { newDb.localFavoritesDao().insertOrIgnore(it) }
-            db.filterDao().list().let { newDb.filterDao().insert(it) }
+            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 ->
@@ -266,52 +386,68 @@ object EhDB {
                     fromFd sendTo toFd
                 }
             }
+            return true
+        }.onFailure {
+            it.printStackTrace()
         }
+        return false
     }
 
-    suspend fun importDB(context: Context, uri: Uri) {
-        val tempDBName = "tmp.db"
-        resource {
-            context.deleteDatabase(tempDBName)
-            roomDb<EhDatabase>(tempDBName) { createFromInputStream { context.contentResolver.openInputStream(uri) } }
-        } release {
-            it.close()
-            context.deleteDatabase(tempDBName)
-        } use { oldDB ->
-            runCatching {
-                db.galleryDao().insertOrIgnore(oldDB.galleryDao().list())
-            }
+    /**
+     * @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()
-                DownloadManager.addDownloadLabel(downloadLabelList)
+                manager.addDownloadLabel(downloadLabelList)
             }
+
+            // Downloads
             runCatching {
-                oldDB.downloadDirnameDao().list().let {
-                    importDownloadDirname(it)
+                val downloadInfoList = oldDB.downloadsDao().list()
+                manager.addDownload(downloadInfoList, false)
+            }
+
+            // Download dirname
+            runCatching {
+                oldDB.downloadDirnameDao().list().forEach {
+                    putDownloadDirname(it.gid, it.dirname)
                 }
             }
-            runCatching {
-                val downloadInfoList = oldDB.downloadsDao().joinList().asReversed()
-                DownloadManager.addDownload(downloadInfoList, false)
-            }
+
+            // History
             runCatching {
                 val historyInfoList = oldDB.historyDao().list()
-                importHistoryInfo(historyInfoList)
+                putHistoryInfo(historyInfoList)
             }
+
+            // QuickSearch
             runCatching {
                 val quickSearchList = oldDB.quickSearchDao().list()
                 val currentQuickSearchList = db.quickSearchDao().list()
-                val offset = currentQuickSearchList.size
-                val importList = quickSearchList.filter { newQS ->
-                    currentQuickSearchList.none { it.name == newQS.name }
-                }.onEachIndexed { index, q -> q.position = index + offset }
+                val importList = quickSearchList.mapNotNull { newQS ->
+                    newQS.takeIf { currentQuickSearchList.find { it.name == newQS.name } == null }
+                }
                 importQuickSearch(importList)
             }
+
+            // LocalFavorites
             runCatching {
-                oldDB.localFavoritesDao().list().let {
-                    importLocalFavorites(it)
+                oldDB.localFavoritesDao().list().forEach {
+                    putLocalFavorites(it)
                 }
             }
+
+            // Filter
             runCatching {
                 val filterList = oldDB.filterDao().list()
                 val currentFilterList = db.filterDao().list()
@@ -319,6 +455,11 @@ object EhDB {
                     if (it !in currentFilterList) addFilter(it)
                 }
             }
+            oldDB.close()
+        }.onFailure {
+            it.printStackTrace()
+            return context.getString(R.string.cant_read_the_file)
         }
+        return null
     }
 }

app/src/main/java/com/hippo/ehviewer/EhProxySelector.kt

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

app/src/main/java/com/hippo/ehviewer/FavouriteStatusRouter.java

@@ -0,0 +1,74 @@
+/*
+ * 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.annotation.SuppressLint;
+
+import com.hippo.ehviewer.client.data.GalleryInfo;
+import com.hippo.ehviewer.yorozuya.IntIdGenerator;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class FavouriteStatusRouter {
+
+    private static final String KEY_DATA_MAP_NEXT_ID = "data_map_next_id";
+
+    private final IntIdGenerator idGenerator = new IntIdGenerator(Settings.getInt(KEY_DATA_MAP_NEXT_ID, 0));
+    @SuppressLint("UseSparseArrays")
+    private final HashMap<Integer, Map<Long, GalleryInfo>> maps = new HashMap<>();
+
+    private final List<Listener> listeners = new ArrayList<>();
+
+    public int saveDataMap(Map<Long, GalleryInfo> map) {
+        int id = idGenerator.nextId();
+        maps.put(id, map);
+        Settings.putInt(KEY_DATA_MAP_NEXT_ID, idGenerator.nextId());
+        return id;
+    }
+
+    public Map<Long, GalleryInfo> restoreDataMap(int id) {
+        return maps.remove(id);
+    }
+
+    public void modifyFavourites(long gid, int slot) {
+        for (Map<Long, GalleryInfo> map : maps.values()) {
+            GalleryInfo info = map.get(gid);
+            if (info != null) {
+                info.setFavoriteSlot(slot);
+            }
+        }
+
+        for (Listener listener : listeners) {
+            listener.onModifyFavourites(gid, slot);
+        }
+    }
+
+    public void addListener(Listener listener) {
+        listeners.add(listener);
+    }
+
+    public void removeListener(Listener listener) {
+        listeners.remove(listener);
+    }
+
+    public interface Listener {
+        void onModifyFavourites(long gid, int slot);
+    }
+}

app/src/main/java/com/hippo/ehviewer/GetText.kt

@@ -13,17 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hippo.ehviewer.client.parser
+package com.hippo.ehviewer
 
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import androidx.annotation.StringRes
 
-@Serializable
-data class VoteCommentResult(
-    @SerialName("comment_id")
-    val id: Long,
-    @SerialName("comment_score")
-    val score: Int,
-    @SerialName("comment_vote")
-    val vote: Int,
-)
+object GetText {
+    fun getString(@StringRes id: Int): String {
+        return EhApplication.application.getString(id)
+    }
+
+    fun getString(@StringRes id: Int, vararg formatArgs: Any?): String {
+        return EhApplication.application.getString(id, *formatArgs)
+    }
+}

app/src/main/java/com/hippo/ehviewer/Hosts.java

@@ -0,0 +1,343 @@
+/*
+ * Copyright 2018 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hippo.ehviewer;
+
+/*
+ * Created by Hippo on 2018/3/21.
+ */
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.util.Pair;
+
+import androidx.annotation.Nullable;
+
+import com.hippo.ehviewer.database.MSQLiteBuilder;
+import com.hippo.ehviewer.util.SqlUtils;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Hosts {
+
+    private static final int VERSION_1 = 1;
+    private static final String TABLE_HOSTS = "HOSTS";
+    private static final String COLUMN_HOST = "HOST";
+    private static final String COLUMN_IP = "IP";
+
+    private static final int DB_VERSION = VERSION_1;
+
+    private final SQLiteDatabase db;
+
+    public Hosts(Context context, String name) {
+        SQLiteOpenHelper helper = new MSQLiteBuilder()
+                .version(VERSION_1)
+                .createTable(TABLE_HOSTS)
+                .insertColumn(TABLE_HOSTS, COLUMN_HOST, String.class)
+                .insertColumn(TABLE_HOSTS, COLUMN_IP, String.class)
+                .build(context, name, DB_VERSION);
+        db = helper.getWritableDatabase();
+    }
+
+    @Nullable
+    public static InetAddress toInetAddress(String host, String ip) {
+        if (!isValidHost(host)) {
+            return null;
+        }
+
+        if (ip == null) {
+            return null;
+        }
+
+        byte[] bytes = parseV4(ip);
+        if (bytes == null) {
+            bytes = parseV6(ip);
+        }
+        if (bytes == null) {
+            return null;
+        }
+
+        try {
+            return InetAddress.getByAddress(host, bytes);
+        } catch (UnknownHostException e) {
+            return null;
+        }
+    }
+
+    /**
+     * Returns true if the host is valid.
+     */
+    public static boolean isValidHost(String host) {
+        if (host == null) {
+            return false;
+        }
+
+        if (host.length() > 253) {
+            return false;
+        }
+
+        int labelLength = 0;
+        for (int i = 0, n = host.length(); i < n; i++) {
+            char ch = host.charAt(i);
+
+            if (ch == '.') {
+                if (labelLength < 1 || labelLength > 63) {
+                    return false;
+                }
+                labelLength = 0;
+            } else {
+                labelLength++;
+            }
+
+            if ((ch < 'a' || ch > 'z') && (ch < '0' || ch > '9') && ch != '-' && ch != '.') {
+                return false;
+            }
+        }
+
+        return labelLength >= 1 && labelLength <= 63;
+    }
+
+    /**
+     * Returns true if ips are valid.
+     */
+    public static boolean isValidIp(String ips) {
+        if (ips == null) {
+            return false;
+        }
+        String[] list = ips.split("\\+");
+        for (String ip : list) {
+            if (parseV4(ip) == null && parseV6(ip) == null) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    // org.xbill.DNS.Address.parseV4
+    @Nullable
+    private static byte[] parseV4(String s) {
+        int numDigits;
+        int currentOctet;
+        byte[] values = new byte[4];
+        int currentValue;
+        int length = s.length();
+
+        currentOctet = 0;
+        currentValue = 0;
+        numDigits = 0;
+        for (int i = 0; i < length; i++) {
+            char c = s.charAt(i);
+            if (c >= '0' && c <= '9') {
+                /* Can't have more than 3 digits per octet. */
+                if (numDigits == 3)
+                    return null;
+                /* Octets shouldn't start with 0, unless they are 0. */
+                if (numDigits > 0 && currentValue == 0)
+                    return null;
+                numDigits++;
+                currentValue *= 10;
+                currentValue += (c - '0');
+                /* 255 is the maximum value for an octet. */
+                if (currentValue > 255)
+                    return null;
+            } else if (c == '.') {
+                /* Can't have more than 3 dots. */
+                if (currentOctet == 3)
+                    return null;
+                /* Two consecutive dots are bad. */
+                if (numDigits == 0)
+                    return null;
+                values[currentOctet++] = (byte) currentValue;
+                currentValue = 0;
+                numDigits = 0;
+            } else
+                return null;
+        }
+        /* Must have 4 octets. */
+        if (currentOctet != 3)
+            return null;
+        /* The fourth octet can't be empty. */
+        if (numDigits == 0)
+            return null;
+        values[currentOctet] = (byte) currentValue;
+        return values;
+    }
+
+    // org.xbill.DNS.Address.parseV6
+    @Nullable
+    private static byte[] parseV6(String s) {
+        int range = -1;
+        byte[] data = new byte[16];
+
+        String[] tokens = s.split(":", -1);
+
+        int first = 0;
+        int last = tokens.length - 1;
+
+        if (tokens[0].length() == 0) {
+            // If the first two tokens are empty, it means the string
+            // started with ::, which is fine.  If only the first is
+            // empty, the string started with :, which is bad.
+            if (last - first > 0 && tokens[1].length() == 0)
+                first++;
+            else
+                return null;
+        }
+
+        if (tokens[last].length() == 0) {
+            // If the last two tokens are empty, it means the string
+            // ended with ::, which is fine.  If only the last is
+            // empty, the string ended with :, which is bad.
+            if (last - first > 0 && tokens[last - 1].length() == 0)
+                last--;
+            else
+                return null;
+        }
+
+        if (last - first + 1 > 8)
+            return null;
+
+        int i, j;
+        for (i = first, j = 0; i <= last; i++) {
+            if (tokens[i].length() == 0) {
+                if (range >= 0)
+                    return null;
+                range = j;
+                continue;
+            }
+
+            if (tokens[i].indexOf('.') >= 0) {
+                // An IPv4 address must be the last component
+                if (i < last)
+                    return null;
+                // There can't have been more than 6 components.
+                if (i > 6)
+                    return null;
+                byte[] v4addr = parseV4(tokens[i]);
+                if (v4addr == null)
+                    return null;
+                for (int k = 0; k < 4; k++)
+                    data[j++] = v4addr[k];
+                break;
+            }
+
+            try {
+                for (int k = 0; k < tokens[i].length(); k++) {
+                    char c = tokens[i].charAt(k);
+                    if (Character.digit(c, 16) < 0)
+                        return null;
+                }
+                int x = Integer.parseInt(tokens[i], 16);
+                if (x > 0xFFFF || x < 0)
+                    return null;
+                data[j++] = (byte) (x >>> 8);
+                data[j++] = (byte) (x & 0xFF);
+            } catch (NumberFormatException e) {
+                return null;
+            }
+        }
+
+        if (j < 16 && range < 0)
+            return null;
+
+        if (range >= 0) {
+            int empty = 16 - j;
+            System.arraycopy(data, range, data, range + empty, j - range);
+            for (i = range; i < range + empty; i++)
+                data[i] = 0;
+        }
+
+        return data;
+    }
+
+    /**
+     * Gets a InetAddress with the host.
+     */
+    @Nullable
+    public List<InetAddress> get(String host) {
+        if (!isValidHost(host)) {
+            return null;
+        }
+        try (Cursor cursor = db.rawQuery("SELECT * FROM " + TABLE_HOSTS + " WHERE " + COLUMN_HOST + " = ?;", new String[]{host})) {
+            if (cursor.moveToNext()) {
+                String[] ips = SqlUtils.getString(cursor, COLUMN_IP, null).split("\\+");
+                List<InetAddress> addresses = new ArrayList<>();
+                for (String ip : ips) {
+                    addresses.add(toInetAddress(host, ip));
+                }
+                return addresses;
+            } else {
+                return null;
+            }
+        }
+    }
+
+    public boolean contains(String host) {
+        try (Cursor cursor = db.rawQuery("SELECT * FROM " + TABLE_HOSTS + " WHERE " + COLUMN_HOST + " = ?;", new String[]{host})) {
+            return cursor.moveToNext();
+        }
+    }
+
+    /**
+     * Puts the host-ip pair into this hosts.
+     */
+    public boolean put(String host, String ip) {
+        if (!isValidHost(host) || !isValidIp(ip)) {
+            return false;
+        }
+
+        ContentValues values = new ContentValues();
+        values.put(COLUMN_HOST, host);
+        values.put(COLUMN_IP, ip);
+
+        if (contains(host)) {
+            db.update(TABLE_HOSTS, values, COLUMN_HOST + " = ?", new String[]{host});
+        } else {
+            db.insert(TABLE_HOSTS, null, values);
+        }
+
+        return true;
+    }
+
+    /**
+     * Puts delete the entry with the host.
+     */
+    public void delete(String host) {
+        db.delete(TABLE_HOSTS, COLUMN_HOST + " = ?", new String[]{host});
+    }
+
+    /**
+     * Get all data from this host.
+     */
+    public List<Pair<String, String>> getAll() {
+        List<Pair<String, String>> result = new ArrayList<>();
+
+        try (Cursor cursor = db.rawQuery("SELECT * FROM " + TABLE_HOSTS + ";", null)) {
+            while (cursor.moveToNext()) {
+                String host = SqlUtils.getString(cursor, COLUMN_HOST, null);
+                String ip = SqlUtils.getString(cursor, COLUMN_IP, null);
+                result.add(new Pair<>(host, ip));
+            }
+        }
+        return result;
+    }
+}

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

@@ -1,116 +1,641 @@
-@file:Suppress("SameParameterValue")
-
+/*
+ * 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 com.hippo.ehviewer.client.EhUtils
+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 kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.asFlow
-import kotlinx.coroutines.flow.conflate
-import kotlinx.coroutines.flow.debounce
-import kotlinx.coroutines.flow.flatMapMerge
-import splitties.preferences.DataStorePreferences
-import splitties.preferences.edit
+import 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
-import kotlin.reflect.KProperty
 
-object Settings : DataStorePreferences(null) {
-    private const val KEY_SHOW_TAG_TRANSLATIONS = "show_tag_translations"
+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,
+    )
 
-    private val _favFlow = MutableSharedFlow<Unit>()
-    val favChangesFlow = _favFlow.debounce(1000)
-    var favCat by stringArrayPref("fav_cat", 10, "Favorites").emitTo(_favFlow)
-    var favCount by intArrayPref("fav_count", 10).emitTo(_favFlow)
-    var favCloudCount by intPref("fav_cloud", 0).emitTo(_favFlow)
+    /********************
+     * Privacy and Security
+     */
+    const val KEY_SEC_SECURITY = "enable_secure"
+    const val VALUE_SEC_SECURITY = false
 
-    var downloadScheme by stringOrNullPref("image_scheme", null)
-    var downloadAuthority by stringOrNullPref("image_authority", null)
-    var downloadPath by stringOrNullPref("image_path", null)
-    var downloadQuery by stringOrNullPref("image_query", null)
-    var downloadFragment by stringOrNullPref("image_fragment", null)
-    var archivePasswds by stringSetOrNullPref("archive_passwds")
-    var downloadDelay by intPref("download_delay_2", 0)
-    var gallerySite by intPref("gallery_site_2", 0).observed { updateWhenGallerySiteChanges() }
-    var multiThreadDownload by intPref("download_thread_2", 3)
-    var preloadImage by intPref("preload_image_2", 5)
-    var theme by intPref("theme_2", -1).observed { updateWhenThemeChanges() }
-    var listMode by intPref("list_mode_2", 0)
-    var detailSize by intPref("detail_size_2", 0)
-    var thumbResolution by intPref("thumb_resolution_2", 0)
-    var readCacheSize by intPref("read_cache_size_2", 640)
-    var launchPage by intPref("launch_page_2", 0)
-    var forceEhThumb by boolPref("force_eh_thumb", false)
-    var showComments by boolPref("show_gallery_comments", true)
-    var requestNews by boolPref("request_news", false).observed { updateWhenRequestNewsChanges() }
-    var hideHvEvents by boolPref("hide_hv_events", false)
-    var showJpnTitle by boolPref("show_jpn_title", false)
-    var showGalleryPages by boolPref("show_gallery_pages", false)
-    var showTagTranslations by boolPref(KEY_SHOW_TAG_TRANSLATIONS, false).observed { updateWhenTagTranslationChanges() }
-    var meteredNetworkWarning by boolPref("cellular_network_warning", false)
-    var appLinkVerifyTip by boolPref("app_link_verify_tip", false)
-    var enabledSecurity by boolPref("enable_secure", false)
-    var useCIUpdateChannel by boolPref("ci_update_channel", false)
-    var mediaScan by boolPref("media_scan", false).observed { updateWhenKeepMediaStatusChanges() }
-    var hasDefaultDownloadLabel by boolPref("has_default_download_label", false)
-    var qSSaveProgress by boolPref("qs_save_progress", true)
-    var saveParseErrorBody by boolPref("save_parse_error_body", true)
-    var saveCrashLog by boolPref("save_crash_log", true)
-    var security by boolPref("require_unlock", false)
-    var removeImageFiles by boolPref("include_pic", true)
-    var needSignIn by boolPref("need_sign_in", true)
-    var blackDarkTheme by boolPref("black_dark_theme", false).observed { updateWhenAmoledModeChanges() }
-    var preloadThumbAggressively by boolPref("preload_thumb_aggressively", false)
-    var downloadOriginImage by boolPref("download_origin_image", false)
-    var thumbSizeDp by intPref("thumb_size_", 120)
-    var recentFavCat by intPref("recent_fav_cat", FavListUrlBuilder.FAV_CAT_LOCAL)
-    var defaultFavSlot by intPref("default_favorite_slot", -2)
-    var securityDelay by intPref("require_unlock_delay", 0)
-    var clipboardTextHashCode by intPref("clipboard_text_hash_code", 0)
-    var listThumbSize by intPref("list_tile_size", 40)
-    var searchCategory by intPref("search_pref", EhUtils.ALL_CATEGORY)
-    var requestNewsTimerHour by intPref("request_news_timer_hour", -1)
-    var requestNewsTimerMinute by intPref("request_news_timer_minute", -1)
-    var updateIntervalDays by intPref("update_interval_days", 0)
-    var recentDownloadLabel by stringOrNullPref("recent_download_label", null)
-    var defaultDownloadLabel by stringOrNullPref("default_download_label", null)
-    var displayName by stringOrNullPref("display_name", null)
-    var avatar by stringOrNullPref("avatar", null)
-    var language by stringPref("app_language", "system").observed { updateWhenLocaleChanges() }
-    var lastDawnDay by longPref("last_dawn_day", 0)
-    var lastUpdateDay by longPref("last_update_day", 0)
+    /********************
+     * 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
 
-    init {
+    /********************
+     * 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) {
-            edit {
-                if (KEY_SHOW_TAG_TRANSLATIONS !in prefs) showTagTranslations = true
+            // 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)
             }
         }
     }
 
-    interface Delegate<R> {
-        val flowGetter: () -> Flow<Unit>
-        operator fun getValue(thisRef: Any?, prop: KProperty<*>?): R
-        operator fun setValue(thisRef: Any?, prop: KProperty<*>?, value: R)
-    }
-
-    private fun intArrayPref(key: String, count: Int) = object : Delegate<IntArray> {
-        override val flowGetter: () -> Flow<Unit> = { _value.asFlow().flatMapMerge { it.changesFlow() }.conflate() }
-        private var _value = (0 until count).map { intPref("${key}_$it", 0) }.toTypedArray()
-        override fun getValue(thisRef: Any?, prop: KProperty<*>?): IntArray = _value.map { it.value }.toIntArray()
-        override fun setValue(thisRef: Any?, prop: KProperty<*>?, value: IntArray) {
-            check(value.size == count)
-            edit { value.zip(_value) { v, d -> d.value = v } }
+    private fun 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 stringArrayPref(key: String, count: Int, defMetaValue: String) = object : Delegate<Array<String>> {
-        override val flowGetter: () -> Flow<Unit> = { _value.asFlow().flatMapMerge { it.changesFlow() }.conflate() }
-        private var _value = (0 until count).map { stringPref("${key}_$it", "$defMetaValue $it") }.toTypedArray()
-        override fun getValue(thisRef: Any?, prop: KProperty<*>?): Array<String> = _value.map { it.value }.toTypedArray()
-        override fun setValue(thisRef: Any?, prop: KProperty<*>?, value: Array<String>) {
-            check(value.size == count)
-            edit { value.zip(_value) { v, d -> d.value = v } }
+    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)
 }

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

@@ -1,83 +0,0 @@
-package com.hippo.ehviewer
-
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY
-import androidx.core.os.LocaleListCompat
-import com.hippo.ehviewer.client.EhCookieStore
-import com.hippo.ehviewer.client.EhEngine
-import com.hippo.ehviewer.client.EhTagDatabase
-import com.hippo.ehviewer.dailycheck.updateDailyCheckWork
-import com.hippo.ehviewer.ui.keepNoMediaFileStatus
-import eu.kanade.tachiyomi.util.lang.launchIO
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.launch
-import splitties.init.appCtx
-import splitties.preferences.PrefDelegate
-
-private val collectScope = CoroutineScope(Dispatchers.Main + SupervisorJob())
-fun <T, R : PrefDelegate<T>> R.observed(func: (Unit) -> Unit) = apply { collectScope.launch { changesFlow().collect(func) } }
-fun <T, R : Settings.Delegate<T>> R.observed(func: (Unit) -> Unit) = apply { collectScope.launch { flowGetter().collect(func) } }
-fun <T, R : Settings.Delegate<T>> R.emitTo(flow: MutableSharedFlow<Unit>) = apply { collectScope.launch { flowGetter().collect { flow.emit(Unit) } } }
-fun <T, R : PrefDelegate<T>> R.emitTo(flow: MutableSharedFlow<Unit>) = apply { collectScope.launch { changesFlow().collect { flow.emit(Unit) } } }
-
-fun updateWhenLocaleChanges() {
-    val newValue = Settings.language
-    if ("system" == newValue) {
-        AppCompatDelegate.setApplicationLocales(LocaleListCompat.getEmptyLocaleList())
-    } else {
-        AppCompatDelegate.setApplicationLocales(LocaleListCompat.forLanguageTags(newValue))
-    }
-}
-
-fun updateWhenKeepMediaStatusChanges() {
-    collectScope.launchIO {
-        runCatching {
-            keepNoMediaFileStatus()
-        }
-    }
-}
-
-fun updateWhenThemeChanges() {
-    collectScope.launch {
-        delay(100) // Avoid recompose being cancelled
-        AppCompatDelegate.setDefaultNightMode(Settings.theme)
-    }
-}
-
-fun updateWhenAmoledModeChanges() {
-    collectScope.launch {
-        delay(100) // Avoid recompose being cancelled
-        AppCompatDelegate.setDefaultNightMode(MODE_NIGHT_AUTO_BATTERY)
-        AppCompatDelegate.setDefaultNightMode(Settings.theme)
-    }
-}
-
-fun updateWhenRequestNewsChanges() {
-    updateDailyCheckWork(appCtx)
-}
-
-fun updateWhenGallerySiteChanges() {
-    if (!Settings.needSignIn && EhCookieStore.hasSignedIn()) {
-        collectScope.launchIO {
-            runCatching {
-                EhEngine.getUConfig()
-            }.onFailure {
-                it.printStackTrace()
-            }
-        }
-    }
-}
-
-fun updateWhenTagTranslationChanges() {
-    collectScope.launchIO {
-        runCatching {
-            EhTagDatabase.update()
-        }.onFailure {
-            it.printStackTrace()
-        }
-    }
-}

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

@@ -15,7 +15,6 @@
  */
 package com.hippo.ehviewer.client
 
-import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.client.data.GalleryPreview
 import com.hippo.ehviewer.client.data.NormalGalleryPreview
@@ -27,24 +26,21 @@ import com.hippo.ehviewer.client.data.NormalGalleryPreview
 
 private const val URL_PREFIX_THUMB_E = "https://ehgt.org/"
 private const val URL_PREFIX_THUMB_EX = "https://s.exhentai.org/"
-private const val URL_PREFIX_LARGE_THUMB_EX = URL_PREFIX_THUMB_EX + "t/"
 
 fun getImageKey(gid: Long, index: Int): String {
     return "image:$gid:$index"
 }
 
 fun getThumbKey(url: String): String {
-    return url.removePrefix(URL_PREFIX_THUMB_E).removePrefix(URL_PREFIX_LARGE_THUMB_EX).removePrefix(URL_PREFIX_THUMB_EX)
+    return url.removePrefix(URL_PREFIX_THUMB_E).removePrefix(URL_PREFIX_THUMB_EX).removePrefix("t/")
 }
 
 val GalleryPreview.url
-    get() = if (exThumb) {
-        if (this is NormalGalleryPreview) URL_PREFIX_THUMB_EX else URL_PREFIX_LARGE_THUMB_EX
+    get() = if (this is NormalGalleryPreview) {
+        if (EhUtils.isExHentai) URL_PREFIX_THUMB_EX + imageKey else URL_PREFIX_THUMB_E + imageKey
     } else {
-        URL_PREFIX_THUMB_E
-    } + imageKey
+        if (EhUtils.isExHentai) URL_PREFIX_THUMB_EX + "t/" + imageKey else URL_PREFIX_THUMB_E + imageKey
+    }
 
 val GalleryInfo.thumbUrl
-    get() = (if (exThumb) URL_PREFIX_LARGE_THUMB_EX else URL_PREFIX_THUMB_E) + thumbKey!!
-
-val exThumb get() = EhUtils.isExHentai && !Settings.forceEhThumb
+    get() = if (EhUtils.isExHentai) URL_PREFIX_THUMB_EX + "t/" + thumbKey!! else URL_PREFIX_THUMB_E + thumbKey!!

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

@@ -15,65 +15,136 @@
  */
 package com.hippo.ehviewer.client
 
-import android.webkit.CookieManager
+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 okhttp3.Cookie
 import okhttp3.CookieJar
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
+import java.util.Collections
+import java.util.regex.Pattern
 
 object EhCookieStore : CookieJar {
-    private val manager = CookieManager.getInstance()
-    fun signOut() = manager.removeAllCookies(null)
-    fun contains(url: HttpUrl, name: String) = get(url).any { it.name == name }
+    private val db: CookieDatabase = CookieDatabase(EhApplication.application)
+    private val map: MutableMap<String, CookieSet> = db.allCookies
 
-    fun get(url: HttpUrl): List<Cookie> {
-        val cookies = manager.getCookie(url.toString())
-
-        return if (cookies != null && cookies.isNotEmpty()) {
-            cookies.split(";").mapNotNull { Cookie.parse(url, it) }.filterNot { it.name == KEY_UTMP_NAME }
-        } else {
-            emptyList()
-        }
+    fun signOut() {
+        clear()
     }
 
     fun hasSignedIn(): Boolean {
         val url = EhUrl.HOST_E.toHttpUrl()
-        return contains(url, KEY_IPB_MEMBER_ID) && contains(url, KEY_IPB_PASS_HASH)
+        return contains(url, KEY_IPB_MEMBER_ID) &&
+            contains(url, KEY_IPB_PASS_HASH)
     }
 
     const val KEY_IPB_MEMBER_ID = "ipb_member_id"
     const val KEY_IPB_PASS_HASH = "ipb_pass_hash"
     const val KEY_IGNEOUS = "igneous"
-    private const val KEY_STAR = "star"
+    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 const val KEY_UTMP_NAME = "__utmp"
-    private val sTipsCookie = Cookie.Builder().apply {
-        name(KEY_CONTENT_WARNING)
-        value(CONTENT_WARNING_NOT_SHOW)
-        domain(EhUrl.DOMAIN_E)
-        path("/")
-        expiresAt(Long.MAX_VALUE)
-    }.build()
+    private val sTipsCookie: Cookie = Cookie.Builder()
+        .name(KEY_CONTENT_WARNING)
+        .value(CONTENT_WARNING_NOT_SHOW)
+        .domain(EhUrl.DOMAIN_E)
+        .path("/")
+        .expiresAt(Long.MAX_VALUE)
+        .build()
 
-    fun copyNecessaryCookies() {
-        val cookie = get(EhUrl.HOST_E.toHttpUrl()).filter { it.name == KEY_STAR || it.name == KEY_IPB_MEMBER_ID || it.name == KEY_IPB_PASS_HASH || it.name == KEY_IGNEOUS }
-        cookie.forEach { manager.setCookie(EhUrl.HOST_EX, it.toString()) }
-        flush()
+    fun newCookie(
+        cookie: Cookie,
+        newDomain: String,
+        forcePersistent: Boolean = false,
+        forceLongLive: Boolean = false,
+        forceNotHostOnly: Boolean = false,
+    ): Cookie {
+        val builder = Cookie.Builder()
+        builder.name(cookie.name)
+        builder.value(cookie.value)
+        if (forceLongLive) {
+            builder.expiresAt(Long.MAX_VALUE)
+        } else if (cookie.persistent) {
+            builder.expiresAt(cookie.expiresAt)
+        } else if (forcePersistent) {
+            builder.expiresAt(Long.MAX_VALUE)
+        }
+        if (cookie.hostOnly && !forceNotHostOnly) {
+            builder.hostOnlyDomain(newDomain)
+        } else {
+            builder.domain(newDomain)
+        }
+        builder.path(cookie.path)
+        if (cookie.secure) {
+            builder.secure()
+        }
+        if (cookie.httpOnly) {
+            builder.httpOnly()
+        }
+        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) {
-        manager.setCookie(url.toString(), "$name=;Max-Age=0")
+        val deletedCookie = Cookie.Builder()
+            .name(name)
+            .value("deleted")
+            .domain(url.host)
+            .expiresAt(0)
+            .build()
+        addCookie(deletedCookie)
     }
 
+    @Synchronized
     fun addCookie(cookie: Cookie) {
-        if (EhUrl.DOMAIN_E in cookie.domain) manager.setCookie(EhUrl.HOST_E, cookie.toString()) else manager.setCookie(EhUrl.DOMAIN_EX, cookie.toString())
+        // For cookie database
+        var toAdd: Cookie? = null
+        var toUpdate: Cookie? = null
+        var toRemove: Cookie? = null
+        var set = map[cookie.domain]
+        if (set == null) {
+            set = CookieSet()
+            map[cookie.domain] = set
+        }
+        if (cookie.expiresAt <= System.currentTimeMillis()) {
+            toRemove = set.remove(cookie)
+            // If the cookie is not persistent, it's not in database
+            if (toRemove != null && !toRemove.persistent) {
+                toRemove = null
+            }
+        } else {
+            toAdd = cookie
+            toUpdate = set.add(cookie)
+            // If the cookie is not persistent, it's not in database
+            if (!toAdd.persistent) toAdd = null
+            if (toUpdate != null && !toUpdate.persistent) toUpdate = null
+            // Remove the cookie if it updates to null
+            if (toAdd == null && toUpdate != null) {
+                toRemove = toUpdate
+                toUpdate = null
+            }
+        }
+        if (toRemove != null) {
+            db.remove(toRemove)
+        }
+        if (toAdd != null) {
+            if (toUpdate != null) {
+                db.update(toUpdate, toAdd)
+            } else {
+                db.add(toAdd)
+            }
+        }
     }
 
-    fun flush() = manager.flush()
-
     fun getCookieHeader(url: HttpUrl): String {
-        val cookies = loadForRequest(url)
+        val cookies = getCookies(url)
         val cookieHeader = StringBuilder()
         var i = 0
         val size = cookies.size
@@ -88,17 +159,111 @@ object EhCookieStore : CookieJar {
         return cookieHeader.toString()
     }
 
-    // See https://github.com/Ehviewer-Overhauled/Ehviewer/issues/873
-    override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>) = cookies.filterNot { it.name == KEY_UTMP_NAME }.forEach { manager.setCookie(url.toString(), it.toString()) }.also { flush() }
+    @Synchronized
+    fun getCookies(url: HttpUrl): List<Cookie> {
+        val accepted: MutableList<Cookie> = ArrayList()
+        val expired: MutableList<Cookie> = ArrayList()
+        for ((domain, cookieSet) in map) {
+            if (domainMatch(url, domain)) {
+                cookieSet[url, accepted, expired]
+            }
+        }
+        for (cookie in expired) {
+            if (cookie.persistent) {
+                db.remove(cookie)
+            }
+        }
 
-    override fun loadForRequest(url: HttpUrl): List<Cookie> {
-        val checkTips = EhUrl.DOMAIN_E in url.host
-        return get(url).run {
-            if (checkTips) {
-                filterNot { it.name == KEY_CONTENT_WARNING }.toMutableList().apply { add(sTipsCookie) }
-            } else {
-                this
+        // RFC 6265 Section-5.4 step 2, sort the cookie-list
+        // Cookies with longer paths are listed before cookies with shorter paths.
+        // Ignore creation-time, we don't store them.
+        accepted.sortWith { o1: Cookie, o2: Cookie -> o2.path.length - o1.path.length }
+        return accepted
+    }
+
+    fun contains(url: HttpUrl, name: String?): Boolean {
+        for (cookie in getCookies(url)) {
+            if (cookie.name == name) {
+                return true
+            }
+        }
+        return false
+    }
+
+    /**
+     * Remove all cookies in this `CookieRepository`.
+     */
+    @Synchronized
+    fun clear() {
+        map.clear()
+        launchIO {
+            db.clear()
+        }
+    }
+
+    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)
             }
         }
     }
+
+    /**
+     * Quick and dirty pattern to differentiate IP addresses from hostnames. This is an approximation
+     * of Android's private InetAddress#isNumeric API.
+     *
+     *
+     * This matches IPv6 addresses as a hex string containing at least one colon, and possibly
+     * including dots after the first colon. It matches IPv4 addresses as strings containing only
+     * decimal digits and dots. This pattern matches strings like "a:.23" and "54" that are neither IP
+     * addresses nor hostnames; they will be verified as IP addresses (which is a more strict
+     * verification).
+     */
+    private val VERIFY_AS_IP_ADDRESS =
+        Pattern.compile("([0-9a-fA-F]*:[0-9a-fA-F:.]*)|([\\d.]+)")
+
+    /**
+     * Returns true if `host` is not a host name and might be an IP address.
+     */
+    private fun verifyAsIpAddress(host: String): Boolean {
+        return VERIFY_AS_IP_ADDRESS.matcher(host).matches()
+    }
+
+    // okhttp3.Cookie.domainMatch(HttpUrl, String)
+    @JvmStatic
+    fun domainMatch(url: HttpUrl, domain: String?): Boolean {
+        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,
+                )
+        }
+        // As in 'example.com' matching 'www.example.com'.
+    }
+
+    override fun loadForRequest(url: HttpUrl): List<Cookie> {
+        val cookies = getCookies(url)
+        val checkTips = domainMatch(url, EhUrl.DOMAIN_E)
+        return if (checkTips) {
+            val result: MutableList<Cookie> = ArrayList(cookies.size + 1)
+            // Add all but skip some
+            for (cookie in cookies) {
+                val name = cookie.name
+                if (KEY_CONTENT_WARNING == name) {
+                    continue
+                }
+                result.add(cookie)
+            }
+            // Add some
+            result.add(sTipsCookie)
+            Collections.unmodifiableList(result)
+        } else {
+            cookies
+        }
+    }
 }

app/src/main/java/com/hippo/ehviewer/client/EhDns.kt

@@ -0,0 +1,137 @@
+/*
+ * Copyright 2018 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.client
+
+import com.hippo.ehviewer.EhApplication
+import com.hippo.ehviewer.Hosts
+import com.hippo.ehviewer.Settings
+import okhttp3.Dns
+import java.net.InetAddress
+import java.net.UnknownHostException
+
+object EhDns : Dns {
+    private val hosts = EhApplication.hosts
+    private val builtInHosts: MutableMap<String, List<InetAddress>> = mutableMapOf()
+
+    init {
+        // Pair(ip: String!, blockedByCCP: Boolean!)
+        val ehgtHosts = arrayOf(
+            Pair("37.48.89.44", false),
+            Pair("81.171.10.48", false),
+            Pair("178.162.139.24", false),
+            Pair("178.162.140.212", false),
+            Pair("2001:1af8:4700:a062:8::47de", false),
+            Pair("2001:1af8:4700:a062:9::47de", true),
+            Pair("2001:1af8:4700:a0c9:4::47de", false),
+            Pair("2001:1af8:4700:a0c9:3::47de", true),
+        )
+
+        put(
+            builtInHosts,
+            "e-hentai.org",
+            Pair("104.20.134.21", false),
+            Pair("104.20.135.21", false),
+            Pair("172.67.0.127", false),
+        )
+        put(
+            builtInHosts,
+            "exhentai.org",
+            Pair("178.175.128.252", false),
+            Pair("178.175.129.252", false),
+            Pair("178.175.129.254", false),
+            Pair("178.175.128.254", false),
+            Pair("178.175.132.20", false),
+            Pair("178.175.132.22", false),
+        )
+        put(
+            builtInHosts,
+            "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",
+            Pair("94.100.28.57", true),
+            Pair("94.100.29.73", true),
+        )
+        put(
+            builtInHosts,
+            "forums.e-hentai.org",
+            Pair("94.100.18.243", false),
+        )
+        put(
+            builtInHosts,
+            "ehgt.org",
+            *ehgtHosts,
+        )
+        put(
+            builtInHosts,
+            "gt0.ehgt.org",
+            *ehgtHosts,
+        )
+        put(
+            builtInHosts,
+            "gt1.ehgt.org",
+            *ehgtHosts,
+        )
+        put(
+            builtInHosts,
+            "gt2.ehgt.org",
+            *ehgtHosts,
+        )
+        put(
+            builtInHosts,
+            "gt3.ehgt.org",
+            *ehgtHosts,
+        )
+        put(
+            builtInHosts,
+            "ul.ehgt.org",
+            Pair("94.100.24.82", true),
+            Pair("94.100.24.72", true),
+        )
+        put(
+            builtInHosts,
+            "raw.githubusercontent.com",
+            Pair("151.101.0.133", false),
+            Pair("151.101.64.133", false),
+            Pair("151.101.128.133", false),
+            Pair("151.101.192.133", false),
+        )
+    }
+
+    private fun put(
+        map: MutableMap<String, List<InetAddress>>,
+        host: String,
+        vararg ips: Pair<String, Boolean>,
+    ) {
+        map[host] = ips.mapNotNull { pair ->
+            Hosts.toInetAddress(host, pair.first).takeUnless { Settings.dF && pair.second }
+        }
+    }
+
+    @Throws(UnknownHostException::class)
+    override fun lookup(hostname: String): List<InetAddress> {
+        return hosts[hostname] ?: builtInHosts[hostname].takeIf { Settings.builtInHosts }
+            ?: Dns.SYSTEM.lookup(hostname)
+    }
+
+    fun isInHosts(hostname: String): Boolean {
+        return hosts.contains(hostname) || (builtInHosts.contains(hostname) && Settings.builtInHosts)
+    }
+}

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

@@ -18,13 +18,12 @@ package com.hippo.ehviewer.client
 import android.util.Log
 import arrow.fx.coroutines.parMap
 import arrow.fx.coroutines.parZip
+import com.hippo.ehviewer.AppConfig
+import com.hippo.ehviewer.GetText
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
-import com.hippo.ehviewer.client.data.BaseGalleryInfo
 import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.client.exception.EhException
-import com.hippo.ehviewer.client.exception.InsufficientFundsException
-import com.hippo.ehviewer.client.exception.NotLoggedInException
 import com.hippo.ehviewer.client.exception.ParseException
 import com.hippo.ehviewer.client.parser.ArchiveParser
 import com.hippo.ehviewer.client.parser.EventPaneParser
@@ -39,27 +38,16 @@ import com.hippo.ehviewer.client.parser.GalleryPageParser
 import com.hippo.ehviewer.client.parser.GalleryTokenApiParser
 import com.hippo.ehviewer.client.parser.HomeParser
 import com.hippo.ehviewer.client.parser.ProfileParser
-import com.hippo.ehviewer.client.parser.RateGalleryResult
+import com.hippo.ehviewer.client.parser.RateGalleryParser
 import com.hippo.ehviewer.client.parser.SignInParser
 import com.hippo.ehviewer.client.parser.TorrentParser
-import com.hippo.ehviewer.client.parser.TorrentResult
-import com.hippo.ehviewer.client.parser.VoteCommentResult
+import com.hippo.ehviewer.client.parser.VoteCommentParser
 import com.hippo.ehviewer.client.parser.VoteTagParser
-import com.hippo.ehviewer.cronet.awaitBodyFully
-import com.hippo.ehviewer.cronet.cronetRequest
-import com.hippo.ehviewer.cronet.execute
 import com.hippo.ehviewer.dailycheck.showEventNotification
 import com.hippo.ehviewer.dailycheck.today
-import com.hippo.ehviewer.util.AppConfig
-import com.hippo.ehviewer.util.StatusCodeException
-import com.hippo.ehviewer.util.isCronetSupported
-import io.ktor.utils.io.pool.DirectByteBufferPool
+import com.hippo.ehviewer.network.StatusCodeException
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.delay
-import kotlinx.serialization.json.add
-import kotlinx.serialization.json.addJsonArray
-import kotlinx.serialization.json.put
-import moe.tarsin.coroutines.removeAllSuspend
 import moe.tarsin.coroutines.runSuspendCatching
 import okhttp3.Headers
 import okhttp3.MediaType
@@ -67,10 +55,9 @@ import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.MultipartBody
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.asRequestBody
+import org.json.JSONArray
 import org.jsoup.Jsoup
-import splitties.init.appCtx
 import java.io.File
-import java.nio.ByteBuffer
 import kotlin.math.ceil
 
 private const val TAG = "EhEngine"
@@ -98,7 +85,7 @@ private fun rethrowExactly(code: Int, headers: Headers, body: String, e: Throwab
 
     // Check kokomade
     if (body.contains(KOKOMADE_URL)) {
-        throw EhException("今回はここまで ${appCtx.getString(R.string.kokomade_tip)}".trimIndent())
+        throw EhException("今回はここまで ${GetText.getString(R.string.kokomade_tip)}".trimIndent())
     }
 
     // Check Gallery Not Available
@@ -116,12 +103,12 @@ private fun rethrowExactly(code: Int, headers: Headers, body: String, e: Throwab
 
     if (e is ParseException) {
         if (body.isEmpty()) {
-            throw EhException(appCtx.getString(R.string.error_empty_html))
+            throw EhException(GetText.getString(R.string.error_empty_html))
         } else if ("<" !in body) {
             throw EhException(body)
         } else {
-            if (Settings.saveParseErrorBody) AppConfig.saveParseErrorBody(e, body)
-            throw EhException(appCtx.getString(R.string.error_parse_error), e)
+            if (Settings.saveParseErrorBody) AppConfig.saveParseErrorBody(e)
+            throw EhException(GetText.getString(R.string.error_parse_error))
         }
     }
 
@@ -129,40 +116,7 @@ private fun rethrowExactly(code: Int, headers: Headers, body: String, e: Throwab
     throw e
 }
 
-val httpContentPool = DirectByteBufferPool(16, 16384)
-
-suspend inline fun <T> fetchCompat(url: String, referer: String? = null, crossinline parser: (ByteBuffer) -> T): T {
-    return if (isCronetSupported) {
-        cronetRequest(url, referer).execute {
-            val buffer = httpContentPool.borrow()
-            try {
-                awaitBodyFully {
-                    buffer.put(it)
-                }
-                buffer.flip()
-                parser(buffer)
-            } finally {
-                httpContentPool.recycle(buffer)
-            }
-        }
-    } else {
-        ehRequest(url, referer).execute {
-            val buffer = httpContentPool.borrow()
-            try {
-                while (true) {
-                    if (body.source().read(buffer) == -1) break
-                }
-                buffer.flip()
-                parser(buffer)
-            } finally {
-                httpContentPool.recycle(buffer)
-            }
-        }
-    }
-}
-
-@Suppress("REDUNDANT_INLINE_SUSPEND_FUNCTION_TYPE")
-private suspend inline fun <T> Request.executeAndParsingWith(block: suspend String.() -> T): T {
+private suspend inline fun <T> Request.executeAndParsingWith(block: String.() -> T): T {
     Log.d(TAG, url.toString())
     return execute {
         val body = body.string()
@@ -175,20 +129,9 @@ private suspend inline fun <T> Request.executeAndParsingWith(block: suspend Stri
 }
 
 object EhEngine {
-    suspend fun getOriginalImageUrl(url: String, referer: String?): String {
-        Log.d(TAG, url)
-        return ehRequest(url, referer).executeNoRedirect {
-            header("Location")?.apply {
-                if (contains("bounce_login")) {
-                    throw NotLoggedInException()
-                }
-            } ?: throw InsufficientFundsException()
-        }
-    }
-
-    suspend fun getTorrentList(url: String, gid: Long, token: String?): TorrentResult {
+    suspend fun getTorrentList(url: String, gid: Long, token: String?): List<TorrentParser.Result> {
         val referer = EhUrl.getGalleryDetailUrl(gid, token)
-        return fetchCompat(url, referer, TorrentParser::parse)
+        return ehRequest(url, referer).executeAndParsingWith(TorrentParser::parse)
     }
 
     suspend fun getArchiveList(url: String, gid: Long, token: String?) = ehRequest(url, EhUrl.getGalleryDetailUrl(gid, token))
@@ -196,7 +139,7 @@ object EhEngine {
         .apply { funds = funds ?: ehRequest(EhUrl.URL_FUNDS).executeAndParsingWith(HomeParser::parseFunds) }
 
     suspend fun getImageLimits() = parZip(
-        { fetchCompat(EhUrl.URL_HOME, parser = HomeParser::parse) },
+        { ehRequest(EhUrl.URL_HOME).executeAndParsingWith(HomeParser::parse) },
         { ehRequest(EhUrl.URL_FUNDS).executeAndParsingWith(HomeParser::parseFunds) },
         { limits, funds -> HomeParser.Result(limits, funds) },
     )
@@ -211,12 +154,12 @@ object EhEngine {
 
     suspend fun getUConfig(url: String = EhUrl.uConfigUrl) {
         runSuspendCatching {
-            ehRequest(url).executeAndParsingWith { check(contains(U_CONFIG_TEXT)) { "Unable to load config from $url!" } }
+            ehRequest(url).executeAndParsingWith { check(contains(U_CONFIG_TEXT)) { "U_CONFIG_TEXT not found!" } }
         }.onFailure {
             // It may get redirected when accessing ex for the first time
-            if (url == EhUrl.URL_UCONFIG_EX) {
+            if (EhUtils.isExHentai) {
                 it.printStackTrace()
-                ehRequest(url).executeAndParsingWith { check(contains(U_CONFIG_TEXT)) { "Unable to load config from $url!" } }
+                ehRequest(url).executeAndParsingWith { check(contains(U_CONFIG_TEXT)) { "U_CONFIG_TEXT not found!" } }
             } else {
                 throw it
             }
@@ -290,11 +233,11 @@ object EhEngine {
      * @param dstCat -1 for delete, 0 - 9 for cloud favorite, others throw Exception
      * @param note   max 250 characters
      */
-    suspend fun modifyFavorites(
+    suspend fun addFavorites(
         gid: Long,
         token: String?,
-        dstCat: Int = -1,
-        note: String = "",
+        dstCat: Int,
+        note: String?,
     ) {
         val catStr: String = when (dstCat) {
             -1 -> "favdel"
@@ -305,9 +248,9 @@ object EhEngine {
         return ehRequest(url, url, EhUrl.origin) {
             formBody {
                 add("favcat", catStr)
-                add("favnote", note)
-                // apply=Add+to+Favorites is not necessary, just use apply=Apply+Changes all the time
-                add("apply", "Apply Changes")
+                add("favnote", note ?: "")
+                // submit=Add+to+Favorites is not necessary, just use submit=Apply+Changes all the time
+                add("submit", "Apply Changes")
                 add("update", "1")
             }
         }.executeAndParsingWith { }
@@ -357,11 +300,14 @@ object EhEngine {
         return null
     }
 
-    suspend fun resetImageLimits() = ehRequest(EhUrl.URL_HOME) {
-        formBody {
-            add("reset_imagelimit", "Reset Limit")
-        }
-    }.executeAndParsingWith(HomeParser::parseResetLimits)
+    suspend fun resetImageLimits(): HomeParser.Limits? {
+        return ehRequest(EhUrl.URL_HOME) {
+            formBody {
+                add("act", "limits")
+                add("reset", "Reset Limit")
+            }
+        }.executeAndParsingWith(HomeParser::parseResetLimits)
+    }
 
     suspend fun modifyFavorites(url: String, gidArray: LongArray, dstCat: Int): FavoritesParser.Result {
         val catStr: String = when (dstCat) {
@@ -373,6 +319,7 @@ object EhEngine {
             formBody {
                 add("ddact", catStr)
                 gidArray.forEach { add("modifygids[]", it.toString()) }
+                add("apply", "Apply")
             }
         }.executeAndParsingWith(FavoritesParser::parse).apply { fillGalleryList(galleryInfoList, url, false) }
     }
@@ -396,13 +343,7 @@ object EhEngine {
         }.executeAndParsingWith(GalleryPageApiParser::parse)
     }
 
-    suspend fun rateGallery(
-        apiUid: Long,
-        apiKey: String?,
-        gid: Long,
-        token: String?,
-        rating: Float,
-    ): RateGalleryResult = ehRequest(EhUrl.apiUrl, EhUrl.getGalleryDetailUrl(gid, token), EhUrl.origin) {
+    suspend fun rateGallery(apiUid: Long, apiKey: String?, gid: Long, token: String?, rating: Float) = ehRequest(EhUrl.apiUrl, EhUrl.getGalleryDetailUrl(gid, token), EhUrl.origin) {
         jsonBody {
             put("method", "rategallery")
             put("apiuid", apiUid)
@@ -411,20 +352,13 @@ object EhEngine {
             put("token", token)
             put("rating", ceil((rating * 2).toDouble()).toInt())
         }
-    }.executeAndParsingWith(String::parseAs)
+    }.executeAndParsingWith(RateGalleryParser::parse)
 
     suspend fun fillGalleryListByApi(galleryInfoList: List<GalleryInfo>, referer: String) = galleryInfoList.chunked(MAX_REQUEST_SIZE).parMap {
         ehRequest(EhUrl.apiUrl, referer, EhUrl.origin) {
             jsonBody {
                 put("method", "gdata")
-                array("gidlist") {
-                    it.forEach {
-                        addJsonArray {
-                            add(it.gid)
-                            add(it.token)
-                        }
-                    }
-                }
+                array("gidlist") { it.forEach { put(jsonArrayOf(it.gid, it.token)) } }
                 put("namespace", 1)
             }
         }.executeAndParsingWith { GalleryApiParser.parse(this, it) }
@@ -437,7 +371,7 @@ object EhEngine {
         token: String?,
         commentId: Long,
         commentVote: Int,
-    ): VoteCommentResult = ehRequest(EhUrl.apiUrl, EhUrl.referer, EhUrl.origin) {
+    ) = ehRequest(EhUrl.apiUrl, EhUrl.referer, EhUrl.origin) {
         jsonBody {
             put("method", "votecomment")
             put("apiuid", apiUid)
@@ -447,7 +381,7 @@ object EhEngine {
             put("comment_id", commentId)
             put("comment_vote", commentVote)
         }
-    }.executeAndParsingWith(String::parseAs)
+    }.executeAndParsingWith { VoteCommentParser.parse(this, commentVote) }
 
     suspend fun voteTag(
         apiUid: Long,
@@ -471,13 +405,7 @@ object EhEngine {
     suspend fun getGalleryToken(gid: Long, gtoken: String?, page: Int) = ehRequest(EhUrl.apiUrl, EhUrl.referer, EhUrl.origin) {
         jsonBody {
             put("method", "gtoken")
-            array("pagelist") {
-                addJsonArray {
-                    add(gid)
-                    add(gtoken)
-                    add(page + 1)
-                }
-            }
+            put("pagelist", JSONArray().put(JSONArray().put(gid).put(gtoken).put(page + 1)))
         }
     }.executeAndParsingWith(GalleryTokenApiParser::parse)
 
@@ -494,9 +422,9 @@ object EhEngine {
         }
     }.executeAndParsingWith(GalleryListParser::parse).apply { fillGalleryList(galleryInfoList, EhUrl.imageSearchUrl, true) }
 
-    private suspend fun fillGalleryList(list: MutableList<BaseGalleryInfo>, url: String, filter: Boolean) {
+    private suspend fun fillGalleryList(list: MutableList<GalleryInfo>, url: String, filter: Boolean) {
         // Filter title and uploader
-        if (filter) list.removeAllSuspend { EhFilter.filterTitle(it) || EhFilter.filterUploader(it) }
+        if (filter) list.removeAll { EhFilter.filterTitle(it) || EhFilter.filterUploader(it) }
 
         var hasTags = false
         var hasPages = false
@@ -516,10 +444,11 @@ object EhEngine {
         if (needApi) fillGalleryListByApi(list, url)
 
         // Filter tag, thumbnail mode need filter uploader again
-        if (filter) list.removeAllSuspend { EhFilter.filterUploader(it) || EhFilter.filterTag(it) || EhFilter.filterTagNamespace(it) }
+        if (filter) list.removeAll { EhFilter.filterUploader(it) || EhFilter.filterTag(it) || EhFilter.filterTagNamespace(it) }
     }
 
-    suspend fun modifyFavoritesRange(galleryList: List<Pair<Long, String>>, dstCat: Int) {
-        galleryList.forEach { (gid, token) -> modifyFavorites(gid, token, dstCat) }
+    suspend fun addFavoritesRange(gidArray: LongArray, tokenArray: Array<String?>, dstCat: Int) {
+        require(gidArray.size == tokenArray.size)
+        gidArray.forEachIndexed { index, gid -> addFavorites(gid, tokenArray[index], dstCat, null) }
     }
 }

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

@@ -1,35 +1,112 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.hippo.ehviewer.client
 
+import android.util.Log
 import arrow.core.memoize
 import com.hippo.ehviewer.EhDB
 import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.dao.Filter
-import com.hippo.ehviewer.dao.FilterMode
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.launch
 
-private val regex = { p: Filter -> Regex(p.text) }.memoize()
+private val regex = { p: Filter -> Regex(p.text!!) }.memoize()
 
-object EhFilter : CoroutineScope {
-    override val coroutineContext = Dispatchers.IO.limitedParallelism(1)
-    val filters = async { EhDB.getAllFilter() as MutableList }
-    private suspend inline fun anyActive(mode: FilterMode, predicate: (Filter) -> Boolean) = filters.await().any { it.mode == mode && it.enable && predicate(it) }
-    private fun <R> Filter.launchOps(
-        callback: ((R) -> Unit)? = null,
-        ops: suspend Filter.() -> R,
-    ) = launch { ops().let { callback?.invoke(it) } }
-    fun Filter.remember(callback: ((Boolean) -> Unit)? = null) = launchOps(callback) {
-        EhDB.addFilter(this).also { if (it) filters.await().add(this) }
+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>()
+
+    const val MODE_TITLE = 0
+    const val MODE_UPLOADER = 1
+    const val MODE_TAG = 2
+    const val MODE_TAG_NAMESPACE = 3
+    const val MODE_COMMENTER = 4
+    const val MODE_COMMENT = 5
+    private const val TAG = "EhFilter"
+
+    init { EhDB.allFilter.forEach(::memorizeFilter) }
+
+    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()
+                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)
+        }
     }
-    fun Filter.trigger(callback: ((Unit) -> Unit)? = null) = launchOps(callback) {
-        enable = !enable
-        EhDB.updateFilter(this)
+
+    @Synchronized
+    fun addFilter(filter: Filter): Boolean {
+        filter.enable = true
+        if (!EhDB.addFilter(filter)) return false
+        memorizeFilter(filter)
+        return true
     }
-    fun Filter.forget(callback: ((Unit) -> Unit)? = null) = launchOps(callback) {
-        EhDB.deleteFilter(this)
-        filters.await().remove(this)
+
+    @Synchronized
+    fun triggerFilter(filter: Filter) {
+        EhDB.triggerFilter(filter)
+    }
+
+    @Synchronized
+    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)
+            else -> Log.d(TAG, "Unknown mode: " + filter.mode)
+        }
+    }
+
+    @Synchronized
+    fun needTags(): Boolean {
+        return 0 != tagFilterList.size || 0 != tagNamespaceFilterList.size
+    }
+
+    @Synchronized
+    fun filterTitle(info: GalleryInfo): Boolean {
+        val title = info.title ?: return false
+        return titleFilterList.any { it.enable!! && it.text!! in title.lowercase() }
+    }
+
+    @Synchronized
+    fun filterUploader(info: GalleryInfo): Boolean {
+        val uploader = info.uploader ?: return false
+        return uploaderFilterList.any { it.enable!! && it.text == uploader }
     }
 
     private fun spiltTag(tag: String) = tag.run {
@@ -47,16 +124,30 @@ object EhFilter : CoroutineScope {
         }
     }
 
+    @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
     }
 
-    suspend fun needTags() = filters.await().any { it.enable && (it.mode == FilterMode.TAG || it.mode == FilterMode.TAG_NAMESPACE) }
-    suspend fun filterTitle(info: GalleryInfo) = anyActive(FilterMode.TITLE) { info.title.orEmpty().contains(it.text, true) }
-    suspend fun filterUploader(info: GalleryInfo) = anyActive(FilterMode.UPLOADER) { it.text == info.uploader }
-    suspend fun filterTag(info: GalleryInfo) = info.simpleTags?.any { tag -> anyActive(FilterMode.TAG) { matchTag(tag, it.text.lowercase()) } } ?: false
-    suspend fun filterTagNamespace(info: GalleryInfo) = info.simpleTags?.any { tag -> anyActive(FilterMode.TAG_NAMESPACE) { matchTagNamespace(tag, it.text.lowercase()) } } ?: false
-    suspend fun filterCommenter(commenter: String) = anyActive(FilterMode.COMMENTER) { it.text == commenter }
-    suspend fun filterComment(comment: String) = anyActive(FilterMode.COMMENT) { regex(it).containsMatchIn(comment) }
+    @Synchronized
+    fun filterTagNamespace(info: GalleryInfo): Boolean {
+        val tags = info.simpleTags ?: return false
+        return tags.any { tag -> tagNamespaceFilterList.any { it.enable!! && matchTagNamespace(tag, it.text!!) } }
+    }
+
+    @Synchronized
+    fun filterCommenter(commenter: String): Boolean {
+        return commenterFilterList.any { it.enable!! && it.text == commenter }
+    }
+
+    @Synchronized
+    fun filterComment(comment: String): Boolean {
+        return commentFilterList.any { it.enable!! && regex(it).containsMatchIn(comment) }
+    }
 }

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

@@ -15,20 +15,8 @@
  */
 package com.hippo.ehviewer.client
 
-import android.util.Log
-import com.hippo.ehviewer.EhApplication.Companion.baseOkHttpClient
-import com.hippo.ehviewer.EhApplication.Companion.noRedirectOkHttpClient
+import com.hippo.ehviewer.EhApplication.Companion.nonCacheOkHttpClient
 import com.hippo.ehviewer.EhApplication.Companion.okHttpClient
-import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.suspendCancellableCoroutine
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonArrayBuilder
-import kotlinx.serialization.json.JsonObjectBuilder
-import kotlinx.serialization.json.buildJsonArray
-import kotlinx.serialization.json.buildJsonObject
-import kotlinx.serialization.json.okio.decodeFromBufferedSource
-import okhttp3.Call
 import okhttp3.FormBody
 import okhttp3.MediaType
 import okhttp3.MediaType.Companion.toMediaType
@@ -37,11 +25,10 @@ import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import okhttp3.executeAsync
-import okio.BufferedSource
+import org.json.JSONArray
+import org.json.JSONObject
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
 
 inline fun ehRequest(url: String, referer: String? = null, origin: String? = null, builder: Request.Builder.() -> Unit = {}) = Request.Builder().url(url).apply {
     addHeader("User-Agent", CHROME_USER_AGENT)
@@ -57,54 +44,11 @@ inline fun Request.Builder.multipartBody(builder: MultipartBody.Builder.() -> Un
 
 val MEDIA_TYPE_JSON: MediaType = "application/json; charset=utf-8".toMediaType()
 
-inline fun JsonObjectBuilder.array(name: String, builder: JsonArrayBuilder.() -> Unit) = put(name, buildJsonArray(builder))
+inline fun JSONObject.array(name: String, builder: JSONArray.() -> Unit): JSONObject = put(name, JSONArray().apply(builder))
 
-inline fun Request.Builder.jsonBody(builder: JsonObjectBuilder.() -> Unit) = post(buildJsonObject(builder).toString().toRequestBody(MEDIA_TYPE_JSON))
+fun jsonArrayOf(vararg element: Any?) = JSONArray().apply { element.forEach { put(it) } } // Should ensure it is inlined
 
-const val TAG_CALL = "CancellableCallReadingScope"
-
-// This scoped response reading scope suspend function aimed at cancelling the call immediately once coroutine is cancelled.
-// i.e., bind a call with a suspended coroutine, and launch another coroutine to execute reading
-// Once origin coroutine is cancelled, then call cancelled, socket is closed, the reading coroutine will encounter [IOException]
-// Since Okio is not suspendable/cancellable, also okhttp, [executeAsync] only make [Request -> Response] cancellable, reading a Response is still not cancellable
-// Considering interrupting is not safe and performant, See https://github.com/Kotlin/kotlinx.coroutines/issues/3551#issuecomment-1353245978, we have such [usingCancellable]
-// TODO: Remove logging after this function stable
-suspend inline fun <R> Call.usingCancellable(crossinline block: suspend Response.() -> R): R = executeAsync().use {
-    val call = this
-    Log.d(TAG_CALL, "Got response of call$call")
-    coroutineScope {
-        suspendCancellableCoroutine<R> { cont ->
-            launch {
-                val r = runCatching {
-                    Log.d(TAG_CALL, "Reading response of call$call")
-                    block(it)
-                }
-                if (!isCanceled() && cont.isActive) {
-                    r.exceptionOrNull()?.let {
-                        Log.e(TAG_CALL, "Reading response of call$call failed!")
-                        cont.resumeWithException(it)
-                    }
-                    r.getOrNull()?.let {
-                        Log.d(TAG_CALL, "Reading response of call$call succeed!")
-                        cont.resume(it)
-                    }
-                } else if (isCanceled() && cont.isActive) {
-                    Log.e(TAG_CALL, "call$call cancelled but coroutine is Active!")
-                } else if (!isCanceled() && !cont.isActive) {
-                    Log.e(TAG_CALL, "call$call not cancelled but coroutine is Dead!")
-                } else {
-                    Log.d(TAG_CALL, "Reading response of call$call cancelled")
-                }
-            }
-            cont.invokeOnCancellation {
-                Log.d(TAG_CALL, "Cancelling call$call")
-                cancel()
-            }
-        }
-    }.apply {
-        Log.d(TAG_CALL, "Reading response of call$call finished!")
-    }
-}
+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 {
@@ -112,17 +56,14 @@ suspend inline fun <R> Request.execute(block: Response.() -> R): R {
     }
     return okHttpClient.newCall(this).executeAsync().use(block)
 }
-suspend inline fun <R> Request.executeNonCache(crossinline block: suspend Response.() -> R) = baseOkHttpClient.newCall(this).usingCancellable(block)
-suspend inline fun <R> Request.executeNoRedirect(block: Response.() -> R) = noRedirectOkHttpClient.newCall(this).executeAsync().use(block)
 
-suspend inline fun <reified T> Request.executeAndParseAs() = execute { parseAs<T>() }
+suspend inline fun <R> Request.executeNonCache(block: Response.() -> R): R {
+    contract {
+        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
+    }
+    return nonCacheOkHttpClient.newCall(this).executeAsync().use(block)
+}
 
-inline fun <reified T> Response.parseAs(): T = body.source().parseAs()
-inline fun <reified T> BufferedSource.parseAs(): T = json.decodeFromBufferedSource(this)
-inline fun <reified T> String.parseAs(): T = json.decodeFromString(this)
-
-val json = Json { ignoreUnknownKeys = true }
-
-const val CHROME_USER_AGENT = "Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/115.0.0.0 Mobile Safari/537.36"
+const val CHROME_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"

app/src/main/java/com/hippo/ehviewer/client/EhSSLSocketFactory.kt

@@ -0,0 +1,74 @@
+/*
+ * Copyright 2022 Tarsin Norbin
+ *
+ * This file is part of EhViewer
+ *
+ * EhViewer is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * EhViewer is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with EhViewer.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.hippo.ehviewer.client
+
+import android.util.Log
+import java.net.InetAddress
+import java.net.Socket
+import javax.net.ssl.SSLSocket
+import javax.net.ssl.SSLSocketFactory
+
+private const val EXCEPTIONAL_DOMAIN = "hath.network"
+
+object EhSSLSocketFactory : SSLSocketFactory() {
+    private val sslSocketFactory = getDefault() as SSLSocketFactory
+    override fun getDefaultCipherSuites(): Array<String> {
+        return sslSocketFactory.defaultCipherSuites
+    }
+
+    override fun getSupportedCipherSuites(): Array<String> {
+        return sslSocketFactory.supportedCipherSuites
+    }
+
+    override fun createSocket(s: Socket, host: String, port: Int, autoClose: Boolean): Socket {
+        val address = s.inetAddress.hostAddress.takeIf { EhDns.isInHosts(host) || EXCEPTIONAL_DOMAIN in host }
+        val socket = sslSocketFactory.createSocket(s, address ?: host, port, autoClose) as SSLSocket
+        val sslSession = socket.session
+        Log.d(
+            "EhSSLSocketFactory",
+            "Host: " + host + " Address: " + address + " Protocol:" + sslSession.protocol + " CipherSuite:" + sslSession.cipherSuite,
+        )
+        return socket
+    }
+
+    override fun createSocket(host: String, port: Int): Socket {
+        return sslSocketFactory.createSocket(host, port)
+    }
+
+    override fun createSocket(
+        host: String,
+        port: Int,
+        localHost: InetAddress,
+        localPort: Int,
+    ): Socket {
+        return sslSocketFactory.createSocket(host, port, localHost, localPort)
+    }
+
+    override fun createSocket(host: InetAddress, port: Int): Socket {
+        return sslSocketFactory.createSocket(host, port)
+    }
+
+    override fun createSocket(
+        address: InetAddress,
+        port: Int,
+        localAddress: InetAddress,
+        localPort: Int,
+    ): Socket {
+        return sslSocketFactory.createSocket(address, port, localAddress, localPort)
+    }
+}

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

@@ -16,14 +16,12 @@
 package com.hippo.ehviewer.client
 
 import android.content.Context
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.setValue
-import com.hippo.ehviewer.EhApplication.Companion.baseOkHttpClient
+import com.hippo.ehviewer.AppConfig
+import com.hippo.ehviewer.EhApplication
+import com.hippo.ehviewer.EhApplication.Companion.nonCacheOkHttpClient
 import com.hippo.ehviewer.R
-import com.hippo.ehviewer.util.AppConfig
-import com.hippo.ehviewer.util.FileUtils
-import com.hippo.ehviewer.util.copyToFile
+import com.hippo.ehviewer.yorozuya.FileUtils
+import com.hippo.ehviewer.yorozuya.copyToFile
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -36,29 +34,33 @@ import moe.tarsin.coroutines.runSuspendCatching
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.executeAsync
-import okio.BufferedSource
 import okio.HashingSink.Companion.sha1
 import okio.blackholeSink
 import okio.buffer
 import okio.source
-import splitties.init.appCtx
+import org.json.JSONObject
 import java.io.File
 import java.nio.charset.StandardCharsets
 
+private typealias TagGroup = Map<String, String>
+private typealias TagGroups = Map<String, TagGroup>
+
 object EhTagDatabase : CoroutineScope {
     private const val NAMESPACE_PREFIX = "n"
-    private val PREFIXES = arrayOf(
-        "-",
-        "~",
-        "tag:",
-        "weak:",
-    )
-    private lateinit var tagGroups: Map<String, Map<String, String>>
+    private lateinit var tagGroups: TagGroups
     private val updateLock = Mutex()
     private val dbLock = Mutex()
     override val coroutineContext = Dispatchers.IO + Job()
 
-    var initialized by mutableStateOf(false)
+    fun isInitialized(): Boolean {
+        return this::tagGroups.isInitialized
+    }
+
+    private fun JSONObject.toTagGroups(): TagGroups =
+        keys().asSequence().associateWith { getJSONObject(it).toTagGroup() }
+
+    private fun JSONObject.toTagGroup(): TagGroup =
+        keys().asSequence().associateWith { getString(it) }
 
     fun getTranslation(prefix: String? = NAMESPACE_PREFIX, tag: String?): String? {
         return tagGroups[prefix]?.get(tag)?.trim()?.takeIf { it.isNotEmpty() }
@@ -99,25 +101,22 @@ object EhTagDatabase : CoroutineScope {
         translate: Boolean,
         exactly: Boolean = false,
     ): Flow<Pair<String?, String>> = flow {
-        var mKeyword = keyword
-        PREFIXES.forEach { mKeyword = mKeyword.removePrefix(it) }
-        val prefix = keyword.dropLast(mKeyword.length)
-        val namespace = mKeyword.substringBefore(':')
-        val tagKeyword = mKeyword.drop(namespace.length + 1)
-        val namespacePrefix = namespaceToPrefix(namespace) ?: namespace
-        val tags = tagGroups[namespacePrefix.takeIf { tagKeyword.isNotEmpty() && it != NAMESPACE_PREFIX }]
+        val keywordPrefix = keyword.substringBefore(':')
+        val keywordTag = keyword.drop(keywordPrefix.length + 1)
+        val prefix = namespaceToPrefix(keywordPrefix) ?: keywordPrefix
+        val tags = tagGroups[prefix.takeIf { keywordTag.isNotEmpty() && it != NAMESPACE_PREFIX }]
         tags?.let {
-            internalSuggestFlow(it, tagKeyword, translate, exactly).collect { (hint, tag) ->
-                emit(Pair(hint, "$prefix$namespacePrefix:$tag"))
+            internalSuggestFlow(it, keywordTag, translate, exactly).collect { (hint, tag) ->
+                emit(Pair(hint, "$prefix:$tag"))
             }
-        } ?: tagGroups.forEach { (namespacePrefix, tags) ->
-            if (namespacePrefix != NAMESPACE_PREFIX) {
-                internalSuggestFlow(tags, mKeyword, translate, exactly).collect { (hint, tag) ->
-                    emit(Pair(hint, "$prefix$namespacePrefix:$tag"))
+        } ?: tagGroups.forEach { (prefix, tags) ->
+            if (prefix != NAMESPACE_PREFIX) {
+                internalSuggestFlow(tags, keyword, translate, exactly).collect { (hint, tag) ->
+                    emit(Pair(hint, "$prefix:$tag"))
                 }
             } else {
-                internalSuggestFlow(tags, mKeyword, translate, exactly).collect { (hint, namespacePrefix) ->
-                    emit(Pair(hint, "$prefix$namespacePrefix:"))
+                internalSuggestFlow(tags, keyword, translate, exactly).collect { (hint, tag) ->
+                    emit(Pair(hint, "$tag:"))
                 }
             }
         }
@@ -142,6 +141,7 @@ object EhTagDatabase : CoroutineScope {
         it["reclass"] = "r"
     }
 
+    @JvmStatic
     fun namespaceToPrefix(namespace: String): String? {
         return NAMESPACE_TO_PREFIX[namespace]
     }
@@ -204,13 +204,12 @@ object EhTagDatabase : CoroutineScope {
 
     private suspend fun issueUpdateInMemoryData() {
         dbLock.withLock {
-            getMetadata(appCtx)?.let { urls ->
+            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 = dataFile.source().buffer().use(BufferedSource::parseAs)
-                    initialized = true
+                    tagGroups = JSONObject(dataFile.source().buffer().readString(StandardCharsets.UTF_8)).toTagGroups()
                 }.onFailure {
                     it.printStackTrace()
                 }
@@ -225,7 +224,7 @@ object EhTagDatabase : CoroutineScope {
     }
 
     private suspend fun updateInternal() {
-        val urls = getMetadata(appCtx)
+        val urls = getMetadata(EhApplication.application)
         urls?.let {
             val sha1Name = urls[0]
             val sha1Url = urls[1]
@@ -245,9 +244,11 @@ object EhTagDatabase : CoroutineScope {
                     FileUtils.delete(dataFile)
                 }
 
+                val client = nonCacheOkHttpClient
+
                 // Save new sha1
                 val tempSha1File = File(dir, "$sha1Name.tmp")
-                check(save(baseOkHttpClient, sha1Url, tempSha1File))
+                check(save(client, sha1Url, tempSha1File))
                 val tempSha1 = getFileContent(tempSha1File)
 
                 // Check new sha1 and current sha1
@@ -259,7 +260,7 @@ object EhTagDatabase : CoroutineScope {
 
                 // Save new data
                 val tempDataFile = File(dir, "$dataName.tmp")
-                check(save(baseOkHttpClient, dataUrl, tempDataFile))
+                check(save(client, dataUrl, tempDataFile))
 
                 // Check new sha1 and new data
                 if (!checkData(tempSha1, tempDataFile)) {

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

@@ -16,23 +16,26 @@
 package com.hippo.ehviewer.client
 
 import com.hippo.ehviewer.Settings
-import okhttp3.HttpUrl
+import com.hippo.ehviewer.network.UrlBuilder
 
 object EhUrl {
     const val SITE_E = 0
     const val SITE_EX = 1
     const val DOMAIN_EX = "exhentai.org"
     const val DOMAIN_E = "e-hentai.org"
+    const val DOMAIN_LOFI = "lofi.e-hentai.org"
     const val HOST_EX = "https://$DOMAIN_EX/"
     const val API_EX = HOST_EX + "api.php"
-    const val FAV_PATH = "favorites.php"
-    const val WATCHED_PATH = "watched"
+    const val URL_FAVORITES_EX = HOST_EX + "favorites.php"
     const val URL_UCONFIG_EX = HOST_EX + "uconfig.php"
     const val URL_MY_TAGS_EX = HOST_EX + "mytags"
+    const val URL_WATCHED_EX = HOST_EX + "watched"
     const val HOST_E = "https://$DOMAIN_E/"
     const val API_E = HOST_E + "api.php"
+    const val URL_FAVORITES_E = HOST_E + "favorites.php"
     const val URL_UCONFIG_E = HOST_E + "uconfig.php"
     const val URL_MY_TAGS_E = HOST_E + "mytags"
+    const val URL_WATCHED_E = HOST_E + "watched"
     const val API_SIGN_IN = "https://forums.e-hentai.org/index.php?act=Login&CODE=01"
     const val URL_POPULAR_E = "https://e-hentai.org/popular"
     const val URL_POPULAR_EX = "https://exhentai.org/popular"
@@ -56,11 +59,11 @@ object EhUrl {
             else -> HOST_E
         }
 
-    val domain: String
+    val favoritesUrl: String
         get() = when (Settings.gallerySite) {
-            SITE_E -> DOMAIN_E
-            SITE_EX -> DOMAIN_EX
-            else -> HOST_E
+            SITE_E -> URL_FAVORITES_E
+            SITE_EX -> URL_FAVORITES_EX
+            else -> URL_FAVORITES_E
         }
 
     val apiUrl: String
@@ -70,6 +73,7 @@ object EhUrl {
             else -> API_E
         }
 
+    @JvmStatic
     val referer: String
         get() = when (Settings.gallerySite) {
             SITE_E -> REFERER_E
@@ -84,6 +88,7 @@ object EhUrl {
             else -> ORIGIN_E
         }
 
+    @JvmStatic
     val uConfigUrl: String
         get() = when (Settings.gallerySite) {
             SITE_E -> URL_UCONFIG_E
@@ -91,6 +96,7 @@ object EhUrl {
             else -> URL_UCONFIG_E
         }
 
+    @JvmStatic
     val myTagsUrl: String
         get() = when (Settings.gallerySite) {
             SITE_E -> URL_MY_TAGS_E
@@ -112,20 +118,36 @@ object EhUrl {
             else -> URL_IMAGE_SEARCH_E
         }
 
+    val watchedUrl: String
+        get() = when (Settings.gallerySite) {
+            SITE_E -> URL_WATCHED_E
+            SITE_EX -> URL_WATCHED_EX
+            else -> URL_WATCHED_E
+        }
+
     fun getGalleryDetailUrl(gid: Long, token: String?): String {
         return getGalleryDetailUrl(gid, token, 0, false)
     }
 
-    fun getGalleryDetailUrl(gid: Long, token: String?, index: Int, allComment: Boolean) = ehUrl {
-        addPathSegments("g/$gid/$token/")
-        if (index != 0) addQueryParameter("p", "$index")
-        if (allComment) addQueryParameter("hc", "1")
-    }.toString()
+    @JvmStatic
+    fun getGalleryDetailUrl(gid: Long, token: String?, index: Int, allComment: Boolean): String {
+        val builder = UrlBuilder(host + "g/" + gid + '/' + token + '/')
+        if (index != 0) {
+            builder.addQuery("p", index)
+        }
+        if (allComment) {
+            builder.addQuery("hc", 1)
+        }
+        return builder.build()
+    }
 
-    fun getGalleryMultiPageViewerUrl(gid: Long, token: String) = ehUrl {
-        addPathSegments("mpv/$gid/$token/")
-    }.toString()
+    @JvmStatic
+    fun getGalleryMultiPageViewerUrl(gid: Long, token: String): String {
+        val builder = UrlBuilder(host + "mpv/" + gid + '/' + token + '/')
+        return builder.build()
+    }
 
+    @JvmStatic
     fun getPageUrl(gid: Long, index: Int, pToken: String): String {
         return host + "s/" + pToken + '/' + gid + '-' + (index + 1)
     }
@@ -142,9 +164,3 @@ object EhUrl {
         return "https://ehwiki.org/wiki/" + tag.replace(' ', '_')
     }
 }
-
-inline fun httpsUrl(builder: HttpUrl.Builder.() -> Unit) = HttpUrl.Builder().apply(builder).scheme("https").build()
-inline fun ehUrl(builder: HttpUrl.Builder.() -> Unit) = httpsUrl { apply(builder).host(EhUrl.domain) }
-fun HttpUrl.Builder.addQueryParameterIfNotBlank(name: String, value: String?) = apply {
-    if (!value.isNullOrBlank()) addQueryParameter(name, value)
-}

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

@@ -15,15 +15,7 @@
  */
 package com.hippo.ehviewer.client
 
-import android.annotation.SuppressLint
-import android.content.Context
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-import com.google.android.material.R
-import com.google.android.material.color.MaterialColors
-import com.google.android.material.color.utilities.Hct
-import com.google.android.material.color.utilities.MathUtils
+import android.text.TextUtils
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.data.GalleryInfo
 import java.util.regex.Pattern
@@ -87,6 +79,7 @@ object EhUtils {
     val isExHentai: Boolean
         get() = Settings.gallerySite == EhUrl.SITE_EX
 
+    @JvmStatic
     fun getCategory(type: String?): Int {
         for (entry in CATEGORY_STRINGS) {
             for (str in entry.first)
@@ -101,19 +94,8 @@ object EhUtils {
         return CATEGORY_VALUES.getOrDefault(type, CATEGORY_VALUES[UNKNOWN])!![0]
     }
 
-    @SuppressLint("RestrictedApi")
-    fun harmonizeWithRole(context: Context, src: Int): Int {
-        val primary = MaterialColors.getColor(context, R.attr.colorPrimaryContainer, "EhUtils")
-        val fromHct = Hct.fromInt(src)
-        val toHct = Hct.fromInt(primary)
-        val differenceDegrees = MathUtils.differenceDegrees(fromHct.hue, toHct.hue)
-        val rotationDegrees = minOf(differenceDegrees * 0.5, 15.0)
-        val outputHue = MathUtils.sanitizeDegreesDouble(fromHct.hue + rotationDegrees * MathUtils.rotationDirection(fromHct.hue, toHct.hue))
-        return Hct.from(outputHue, toHct.chroma, toHct.tone).toInt()
-    }
-
-    private fun getCategoryColor(context: Context, category: Int): Int {
-        val primary = when (category) {
+    fun getCategoryColor(category: Int): Int {
+        return when (category) {
             DOUJINSHI -> BG_COLOR_DOUJINSHI
             MANGA -> BG_COLOR_MANGA
             ARTIST_CG -> BG_COLOR_ARTIST_CG
@@ -126,29 +108,27 @@ object EhUtils {
             MISC -> BG_COLOR_MISC
             else -> BG_COLOR_UNKNOWN
         }.toInt()
-        return harmonizeWithRole(context, primary)
     }
 
-    @Composable
-    fun getCategoryColor(category: Int) = Color(getCategoryColor(LocalContext.current, category))
-
     fun signOut() {
         EhCookieStore.signOut()
-        Settings.avatar = null
-        Settings.displayName = null
-        Settings.gallerySite = EhUrl.SITE_E
-        Settings.needSignIn = true
+        Settings.putAvatar(null)
+        Settings.putDisplayName(null)
+        Settings.putGallerySite(EhUrl.SITE_E)
+        Settings.putNeedSignIn(true)
+        Settings.putSelectSite(true)
     }
 
     fun needSignedIn(): Boolean {
         return Settings.needSignIn
     }
 
+    @JvmStatic
     fun getSuitableTitle(gi: GalleryInfo): String {
         return if (Settings.showJpnTitle) {
-            if (gi.titleJpn.isNullOrEmpty()) gi.title else gi.titleJpn
+            if (TextUtils.isEmpty(gi.titleJpn)) gi.title else gi.titleJpn
         } else {
-            if (gi.title.isNullOrEmpty()) gi.titleJpn else gi.title
+            if (TextUtils.isEmpty(gi.title)) gi.titleJpn else gi.title
         }.orEmpty()
     }
 
@@ -166,6 +146,7 @@ object EhUtils {
         return title.ifEmpty { null }
     }
 
+    @JvmStatic
     fun handleThumbUrlResolution(url: String?): String? {
         if (null == url) {
             return null

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

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

app/src/main/java/com/hippo/ehviewer/client/data/AbstractGalleryInfo.kt

@@ -0,0 +1,25 @@
+package com.hippo.ehviewer.client.data
+
+interface AbstractGalleryInfo {
+    var gid: Long
+    var token: String?
+    var title: String?
+    var titleJpn: String?
+    var thumbKey: String?
+    var category: Int
+    var posted: String?
+    var uploader: String?
+    var disowned: Boolean
+    var rating: Float
+    var rated: Boolean
+    var simpleTags: Array<String>?
+    var pages: Int
+    var thumbWidth: Int
+    var thumbHeight: Int
+    var spanSize: Int
+    var spanIndex: Int
+    var spanGroupIndex: Int
+    var simpleLanguage: String?
+    var favoriteSlot: Int
+    var favoriteName: String?
+}

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

@@ -15,16 +15,12 @@
  */
 package com.hippo.ehviewer.client.data
 
-import android.os.Parcelable
 import androidx.room.ColumnInfo
-import androidx.room.Entity
 import androidx.room.Ignore
 import androidx.room.PrimaryKey
-import com.hippo.ehviewer.client.data.GalleryInfo.Companion.NOT_FAVORITED
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@Entity(tableName = "GALLERIES")
 open class BaseGalleryInfo(
     @PrimaryKey
     @ColumnInfo(name = "GID")
@@ -61,7 +57,7 @@ open class BaseGalleryInfo(
     override var rated: Boolean = false,
 
     @Ignore
-    override var simpleTags: ArrayList<String>? = null,
+    override var simpleTags: Array<String>? = null,
 
     @Ignore
     override var pages: Int = 0,
@@ -72,17 +68,22 @@ open class BaseGalleryInfo(
     @Ignore
     override var thumbHeight: Int = 0,
 
+    @Ignore
+    override var spanSize: Int = 0,
+
+    @Ignore
+    override var spanIndex: Int = 0,
+
+    @Ignore
+    override var spanGroupIndex: Int = 0,
+
     @ColumnInfo(name = "SIMPLE_LANGUAGE")
     override var simpleLanguage: String? = null,
 
-    @ColumnInfo(name = "FAVORITE_SLOT")
-    override var favoriteSlot: Int = NOT_FAVORITED,
+    @Ignore
+    override var favoriteSlot: Int = -2,
 
     @Ignore
     override var favoriteName: String? = null,
 
-    @Ignore
-    override var favoriteNote: String? = null,
-) : GalleryInfo, Parcelable {
-    constructor() : this(0)
-}
+) : GalleryInfo

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

@@ -17,14 +17,14 @@ package com.hippo.ehviewer.client.data
 
 import android.os.Parcelable
 import com.hippo.ehviewer.client.EhUrl
-import com.hippo.ehviewer.client.addQueryParameterIfNotBlank
-import com.hippo.ehviewer.client.ehUrl
+import com.hippo.ehviewer.network.UrlBuilder
+import com.hippo.ehviewer.util.encodeUTF8
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
 class FavListUrlBuilder(
-    var mPrev: String? = null,
-    var mNext: String? = null,
+    private var mPrev: String? = null,
+    private var mNext: String? = null,
     var jumpTo: String? = null,
     var keyword: String? = null,
     var favCat: Int = FAV_CAT_ALL,
@@ -34,18 +34,19 @@ class FavListUrlBuilder(
         mPrev = index.takeUnless { isNext }
     }
 
-    fun build() = ehUrl {
-        addPathSegment(EhUrl.FAV_PATH)
+    fun build(): String {
+        val ub = UrlBuilder(EhUrl.favoritesUrl)
         if (isValidFavCat(favCat)) {
-            addQueryParameter("favcat", "$favCat")
+            ub.addQuery("favcat", favCat.toString())
         } else if (favCat == FAV_CAT_ALL) {
-            addQueryParameter("favcat", "all")
+            ub.addQuery("favcat", "all")
         }
-        addQueryParameterIfNotBlank("f_search", keyword)
-        addQueryParameterIfNotBlank("prev", mPrev)
-        addQueryParameterIfNotBlank("next", mNext)
-        addQueryParameterIfNotBlank("seek", jumpTo)
-    }.toString()
+        keyword?.takeIf { it.isNotBlank() }?.let { ub.addQuery("f_search", encodeUTF8(it)) }
+        mPrev?.takeIf { it.isNotEmpty() }?.let { ub.addQuery("prev", it) }
+        mNext?.takeIf { it.isNotEmpty() }?.let { ub.addQuery("next", it) }
+        jumpTo?.takeIf { it.isNotEmpty() }?.let { ub.addQuery("seek", it) }
+        return ub.build()
+    }
 
     companion object {
         const val FAV_CAT_ALL = -1

app/src/main/java/com/hippo/ehviewer/client/data/GalleryComment.kt

@@ -21,17 +21,30 @@ import kotlinx.parcelize.Parcelize
 @Parcelize
 class GalleryComment(
     // 0 for uploader comment. can't vote
+    @JvmField
     var id: Long = 0,
+    @JvmField
     var score: Int = 0,
+    @JvmField
     var editable: Boolean = false,
+    @JvmField
     var voteUpAble: Boolean = false,
+    @JvmField
     var voteUpEd: Boolean = false,
+    @JvmField
     var voteDownAble: Boolean = false,
+    @JvmField
     var voteDownEd: Boolean = false,
+    @JvmField
     var uploader: Boolean = false,
+    @JvmField
     var voteState: String? = null,
+    @JvmField
     var time: Long = 0,
+    @JvmField
     var user: String? = null,
+    @JvmField
     var comment: String? = null,
+    @JvmField
     var lastEdited: Long = 0,
 ) : Parcelable

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

@@ -15,7 +15,6 @@
  */
 package com.hippo.ehviewer.client.data
 
-import android.os.Parcelable
 import com.hippo.ehviewer.client.data.GalleryInfo.Companion.S_LANGS
 import kotlinx.parcelize.Parcelize
 
@@ -38,24 +37,25 @@ private val LANGUAGES = arrayOf(
 
 @Parcelize
 class GalleryDetail(
-    val galleryInfo: BaseGalleryInfo = BaseGalleryInfo(),
+    val galleryInfo: GalleryInfo = BaseGalleryInfo(),
     var apiUid: Long = -1L,
     var apiKey: String? = null,
     var torrentCount: Int = 0,
     var torrentUrl: String? = null,
     var archiveUrl: String? = null,
     var parent: String? = null,
-    var newerVersions: ArrayList<BaseGalleryInfo> = ArrayList(),
+    var newerVersions: ArrayList<GalleryInfo> = ArrayList(),
     var visible: String? = null,
     var language: String? = null,
     var size: String? = null,
     var favoriteCount: Int = 0,
+    var isFavorited: Boolean = false,
     var ratingCount: Int = 0,
     val tags: Array<GalleryTagGroup>,
     var comments: GalleryCommentList,
     val previewPages: Int,
     val previewList: List<GalleryPreview>,
-) : GalleryInfo by galleryInfo, Parcelable {
+) : AbstractGalleryInfo by galleryInfo, GalleryInfo {
     override fun generateSLang() {
         val index = LANGUAGES.indexOf(language)
         if (index != -1) simpleLanguage = S_LANGS[index]

app/src/main/java/com/hippo/ehviewer/client/data/GalleryInfo.kt

@@ -15,35 +15,16 @@
  */
 package com.hippo.ehviewer.client.data
 
+import android.os.Parcelable
 import java.util.regex.Pattern
 
-interface GalleryInfo {
-    var gid: Long
-    var token: String?
-    var title: String?
-    var titleJpn: String?
-    var thumbKey: String?
-    var category: Int
-    var posted: String?
-    var uploader: String?
-    var disowned: Boolean
-    var rating: Float
-    var rated: Boolean
-    var simpleTags: ArrayList<String>?
-    var pages: Int
-    var thumbWidth: Int
-    var thumbHeight: Int
-    var simpleLanguage: String?
-    var favoriteSlot: Int
-    var favoriteName: String?
-    var favoriteNote: String?
-
+interface GalleryInfo : AbstractGalleryInfo, Parcelable {
     fun generateSLang() {
         simpleLanguage = simpleTags?.let { generateSLangFromTags(it) }
             ?: title?.let { generateSLangFromTitle(it) }
     }
 
-    private fun generateSLangFromTags(simpleTags: List<String>): String? {
+    private fun generateSLangFromTags(simpleTags: Array<String>): String? {
         for (tag in simpleTags) {
             for (i in S_LANGS.indices) {
                 if (S_LANG_TAGS[i] == tag) {
@@ -146,8 +127,5 @@ interface GalleryInfo {
             "language:hungarian",
             "language:dutch",
         )
-
-        const val NOT_FAVORITED = -2
-        const val LOCAL_FAVORITED = -1
     }
 }

app/src/main/java/com/hippo/ehviewer/client/data/GalleryTagGroup.kt

@@ -20,6 +20,7 @@ import kotlinx.parcelize.Parcelize
 
 @Parcelize
 class GalleryTagGroup(
-    val groupName: String,
-    private val mTagList: MutableList<String> = mutableListOf(),
+    private val mTagList: ArrayList<String> = arrayListOf(),
+    @JvmField
+    var groupName: String? = null,
 ) : Parcelable, MutableList<String> by mTagList

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

@@ -16,15 +16,16 @@
 package com.hippo.ehviewer.client.data
 
 import android.os.Parcelable
+import android.text.TextUtils
 import androidx.annotation.IntDef
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.client.addQueryParameterIfNotBlank
-import com.hippo.ehviewer.client.ehUrl
 import com.hippo.ehviewer.dao.QuickSearch
-import com.hippo.ehviewer.ui.main.AdvanceTable
+import com.hippo.ehviewer.network.UrlBuilder
+import com.hippo.ehviewer.ui.legacy.AdvanceSearchTable
 import com.hippo.ehviewer.util.encodeUTF8
-import com.hippo.ehviewer.util.toIntOrDefault
+import com.hippo.ehviewer.yorozuya.NumberUtils
+import com.hippo.ehviewer.yorozuya.StringUtils
 import kotlinx.parcelize.Parcelize
 import java.io.UnsupportedEncodingException
 import java.net.URLDecoder
@@ -34,11 +35,11 @@ data class ListUrlBuilder(
     @get:Mode @Mode
     var mode: Int = MODE_NORMAL,
     private var mPrev: String? = null,
-    var mNext: String? = null,
-    var mJumpTo: String? = null,
+    private var mNext: String? = null,
+    private var mJumpTo: String? = null,
     var category: Int = EhUtils.NONE,
     private var mKeyword: String? = null,
-    var hash: String? = null,
+    private var mSHash: String? = null,
     var advanceSearch: Int = -1,
     var minRating: Int = -1,
     var pageFrom: Int = -1,
@@ -62,7 +63,7 @@ data class ListUrlBuilder(
         imagePath = null
         isUseSimilarityScan = false
         isOnlySearchCovers = false
-        hash = null
+        mSHash = null
     }
 
     fun setIndex(index: String?, isNext: Boolean = true) {
@@ -70,8 +71,8 @@ data class ListUrlBuilder(
         mPrev = index?.takeUnless { isNext }
     }
 
-    fun setJumpTo(jumpTo: Int) {
-        mJumpTo = jumpTo.takeUnless { it == 0 }?.toString()
+    fun setJumpTo(jumpTo: String?) {
+        mJumpTo = jumpTo
     }
 
     var keyword: String?
@@ -81,7 +82,6 @@ data class ListUrlBuilder(
         }
 
     fun set(q: QuickSearch) {
-        reset()
         mode = q.mode
         this.category = q.category
         mKeyword = q.keyword
@@ -89,20 +89,21 @@ data class ListUrlBuilder(
         minRating = q.minRating
         pageFrom = q.pageFrom
         pageTo = q.pageTo
-        mNext = q.name.substringAfterLast('@', "").takeIf { it.isNotEmpty() }
+        imagePath = null
+        isUseSimilarityScan = false
+        isOnlySearchCovers = false
     }
 
-    fun toQuickSearch(name: String): QuickSearch {
-        return QuickSearch(
-            name = name,
-            mode = mode,
-            category = category,
-            keyword = mKeyword,
-            advanceSearch = advanceSearch,
-            minRating = minRating,
-            pageFrom = pageFrom,
-            pageTo = pageTo,
-        )
+    fun toQuickSearch(): QuickSearch {
+        val q = QuickSearch()
+        q.mode = mode
+        q.category = this.category
+        q.keyword = mKeyword
+        q.advanceSearch = advanceSearch
+        q.minRating = minRating
+        q.pageFrom = pageFrom
+        q.pageTo = pageTo
+        return q
     }
 
     fun equalsQuickSearch(q: QuickSearch?): Boolean {
@@ -115,7 +116,7 @@ data class ListUrlBuilder(
         if (q.category != this.category) {
             return false
         }
-        if (q.keyword != mKeyword) {
+        if (!StringUtils.equals(q.keyword, mKeyword)) {
             return false
         }
         if (q.advanceSearch != advanceSearch) {
@@ -137,10 +138,10 @@ data class ListUrlBuilder(
     // TODO page
     fun setQuery(query: String?) {
         reset()
-        if (query.isNullOrEmpty()) {
+        if (TextUtils.isEmpty(query)) {
             return
         }
-        val queries = query.split('&')
+        val queries = StringUtils.split(query, '&')
         var category = 0
         var keyword: String? = null
         var enableAdvanceSearch = false
@@ -159,7 +160,7 @@ data class ListUrlBuilder(
             val value = str.substring(index + 1)
             when (key) {
                 "f_cats" -> {
-                    val cats = value.toIntOrDefault(EhUtils.ALL_CATEGORY)
+                    val cats = NumberUtils.parseIntSafely(value, EhUtils.ALL_CATEGORY)
                     category = category or (cats.inv() and EhUtils.ALL_CATEGORY)
                 }
 
@@ -215,37 +216,37 @@ data class ListUrlBuilder(
                 }
 
                 "f_sh" -> if ("on" == value) {
-                    advanceSearch = advanceSearch or AdvanceTable.SH
+                    advanceSearch = advanceSearch or AdvanceSearchTable.SH
                 }
 
                 "f_sto" -> if ("on" == value) {
-                    advanceSearch = advanceSearch or AdvanceTable.STO
+                    advanceSearch = advanceSearch or AdvanceSearchTable.STO
                 }
 
                 "f_sfl" -> if ("on" == value) {
-                    advanceSearch = advanceSearch or AdvanceTable.SFL
+                    advanceSearch = advanceSearch or AdvanceSearchTable.SFL
                 }
 
                 "f_sfu" -> if ("on" == value) {
-                    advanceSearch = advanceSearch or AdvanceTable.SFU
+                    advanceSearch = advanceSearch or AdvanceSearchTable.SFU
                 }
 
                 "f_sft" -> if ("on" == value) {
-                    advanceSearch = advanceSearch or AdvanceTable.SFT
+                    advanceSearch = advanceSearch or AdvanceSearchTable.SFT
                 }
 
                 "f_sr" -> if ("on" == value) {
                     enableMinRating = true
                 }
 
-                "f_srdd" -> minRating = value.toIntOrDefault(-1)
+                "f_srdd" -> minRating = NumberUtils.parseIntSafely(value, -1)
                 "f_sp" -> if ("on" == value) {
                     enablePage = true
                 }
 
-                "f_spf" -> pageFrom = value.toIntOrDefault(-1)
-                "f_spt" -> pageTo = value.toIntOrDefault(-1)
-                "f_shash" -> hash = value
+                "f_spf" -> pageFrom = NumberUtils.parseIntSafely(value, -1)
+                "f_spt" -> pageTo = NumberUtils.parseIntSafely(value, -1)
+                "f_shash" -> mSHash = value
             }
         }
         this.category = category
@@ -271,66 +272,63 @@ data class ListUrlBuilder(
 
     fun build(): String {
         return when (mode) {
-            MODE_NORMAL, MODE_SUBSCRIPTION -> ehUrl {
-                if (mode == MODE_SUBSCRIPTION) addPathSegment(EhUrl.WATCHED_PATH)
-                if (category != EhUtils.NONE) {
-                    addEncodedQueryParameter("f_cats", (category.inv() and EhUtils.ALL_CATEGORY).toString())
+            MODE_NORMAL, MODE_SUBSCRIPTION -> {
+                val url: String = if (mode == MODE_NORMAL) {
+                    EhUrl.host
+                } else {
+                    EhUrl.watchedUrl
+                }
+                val ub = UrlBuilder(url)
+                if (this.category != EhUtils.NONE) {
+                    ub.addQuery("f_cats", category.inv() and EhUtils.ALL_CATEGORY)
+                }
+                mSHash?.let {
+                    ub.addQuery("f_shash", it)
+                }
+                mJumpTo?.let {
+                    ub.addQuery("seek", it)
+                }
+                mPrev?.let {
+                    ub.addQuery("prev", it)
+                }
+                mNext?.let {
+                    ub.addQuery("next", it)
                 }
-                addQueryParameterIfNotBlank("f_shash", hash)
-                addQueryParameterIfNotBlank("prev", mPrev)
-                addQueryParameterIfNotBlank("next", mNext)
-                addQueryParameterIfNotBlank("seek", mJumpTo)
                 // Search key
                 // the settings of ub:UrlBuilder may be overwritten by following Advance search
-                mKeyword?.split('|')?.forEachIndexed { idx, kwd ->
-                    val keyword = kwd.trim { it <= ' ' }
+                StringUtils.split(mKeyword, '|')?.forEachIndexed { idx, keyword ->
+                    val keyword = keyword.trim { it <= ' ' }
                     when (idx) {
-                        0 -> addQueryParameterIfNotBlank("f_search", keyword)
-
+                        0 -> keyword.takeIf { it.isNotEmpty() }?.let { ub.addQuery("f_search", encodeUTF8(it)) }
                         else -> keyword.indexOf(':').takeIf { it >= 0 }?.run {
                             val key = keyword.substring(0, this).trim { it <= ' ' }
                             val value = keyword.substring(this + 1).trim { it <= ' ' }
-                            addQueryParameterIfNotBlank(key, value)
+                            ub.addQuery(key, encodeUTF8(value))
                         }
                     }
                 }
                 // Advance search
                 if (advanceSearch != -1) {
-                    addQueryParameter("advsearch", "1")
-                    if (advanceSearch and AdvanceTable.SH != 0) {
-                        addQueryParameter("f_sh", "on")
-                    }
-                    if (advanceSearch and AdvanceTable.STO != 0) {
-                        addQueryParameter("f_sto", "on")
-                    }
-                    if (advanceSearch and AdvanceTable.SFL != 0) {
-                        addQueryParameter("f_sfl", "on")
-                    }
-                    if (advanceSearch and AdvanceTable.SFU != 0) {
-                        addQueryParameter("f_sfu", "on")
-                    }
-                    if (advanceSearch and AdvanceTable.SFT != 0) {
-                        addQueryParameter("f_sft", "on")
-                    }
+                    ub.addQuery("advsearch", "1")
+                    if (advanceSearch and AdvanceSearchTable.SH != 0) ub.addQuery("f_sh", "on")
+                    if (advanceSearch and AdvanceSearchTable.STO != 0) ub.addQuery("f_sto", "on")
+                    if (advanceSearch and AdvanceSearchTable.SFL != 0) ub.addQuery("f_sfl", "on")
+                    if (advanceSearch and AdvanceSearchTable.SFU != 0) ub.addQuery("f_sfu", "on")
+                    if (advanceSearch and AdvanceSearchTable.SFT != 0) ub.addQuery("f_sft", "on")
                     // Set min star
                     if (minRating != -1) {
-                        addQueryParameter("f_sr", "on")
-                        addQueryParameter("f_srdd", "$minRating")
+                        ub.addQuery("f_sr", "on")
+                        ub.addQuery("f_srdd", minRating)
                     }
                     // Pages
                     if (pageFrom != -1 || pageTo != -1) {
-                        addQueryParameter("f_sp", "on")
-                        addQueryParameter(
-                            "f_spf",
-                            (if (pageFrom != -1) pageFrom.toString() else "").toString(),
-                        )
-                        addQueryParameter(
-                            "f_spt",
-                            (if (pageTo != -1) pageTo.toString() else "").toString(),
-                        )
+                        ub.addQuery("f_sp", "on")
+                        ub.addQuery("f_spf", if (pageFrom != -1) pageFrom.toString() else "")
+                        ub.addQuery("f_spt", if (pageTo != -1) pageTo.toString() else "")
                     }
                 }
-            }.toString()
+                ub.build()
+            }
 
             MODE_UPLOADER -> {
                 val sb = StringBuilder(EhUrl.host)

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

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

app/src/main/java/com/hippo/ehviewer/client/exception/EhException.kt

@@ -15,11 +15,7 @@
  */
 package com.hippo.ehviewer.client.exception
 
-import androidx.annotation.StringRes
-import splitties.init.appCtx
-
 open class EhException : Exception {
     constructor(detailMessage: String?) : super(detailMessage)
     constructor(detailMessage: String?, cause: Throwable?) : super(detailMessage, cause)
-    constructor(@StringRes message: Int) : super(appCtx.getString(message))
 }

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

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

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

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

app/src/main/java/com/hippo/ehviewer/client/exception/OffensiveException.kt

@@ -16,6 +16,6 @@
 package com.hippo.ehviewer.client.exception
 
 /**
- * It is an exception for get offensive tip for e-hentai.org
+ * It is an exception for get offensive tip for g.e-hentai.org
  */
 class OffensiveException : EhException("OFFENSIVE")

app/src/main/java/com/hippo/ehviewer/client/exception/ParseException.kt

@@ -16,7 +16,16 @@
 package com.hippo.ehviewer.client.exception
 
 class ParseException : EhException {
-    constructor(detailMessage: String?) : super(detailMessage)
+    val body: String
 
-    constructor(detailMessage: String?, cause: Throwable?) : super(detailMessage, cause)
+    constructor(detailMessage: String?, body: String) : super(detailMessage) {
+        this.body = body
+    }
+
+    constructor(detailMessage: String?, body: String, cause: Throwable?) : super(
+        detailMessage,
+        cause,
+    ) {
+        this.body = body
+    }
 }

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

@@ -15,7 +15,6 @@
  */
 package com.hippo.ehviewer.client.parser
 
-import com.hippo.ehviewer.client.exception.InsufficientFundsException
 import com.hippo.ehviewer.client.exception.NoHAtHClientException
 import org.jsoup.Jsoup
 
@@ -28,10 +27,8 @@ object ArchiveParser {
         Regex("<form id=\"hathdl_form\" action=\"[^\"]*?or=([^=\"]*?)\" method=\"post\">")
     private val PATTERN_HATH_ARCHIVE =
         Regex("<p><a href=\"[^\"]*\" onclick=\"return do_hathdl\\('([0-9]+|org)'\\)\">([^<]+)</a></p>\\s*<p>([\\w. ]+)</p>\\s*<p>([\\w. ]+)</p>")
-    private const val ERROR_NEED_HATH_CLIENT =
-        "You must have a H@H client assigned to your account to use this feature."
-    private const val ERROR_INSUFFICIENT_FUNDS =
-        "You do not have enough funds to download this archive."
+    private val PATTERN_NEED_HATH_CLIENT =
+        Regex("You must have a H@H client assigned to your account to use this feature\\.")
 
     fun parse(body: String): Result {
         val m = PATTERN_HATH_FORM.find(body)!!
@@ -68,12 +65,9 @@ object ArchiveParser {
         return result
     }
 
+    @Throws(NoHAtHClientException::class)
     fun parseArchiveUrl(body: String): String? {
-        if (body.contains(ERROR_NEED_HATH_CLIENT)) {
-            throw NoHAtHClientException("No H@H client")
-        } else if (body.contains(ERROR_INSUFFICIENT_FUNDS)) {
-            throw InsufficientFundsException()
-        }
+        if (PATTERN_NEED_HATH_CLIENT.containsMatchIn(body)) throw NoHAtHClientException("No H@H client")
         return Jsoup.parse(body).selectFirst("#continue>a[href]")
             ?.let { it.attr("href") + "?start=1" }
         // TODO: Check more errors

app/src/main/java/com/hippo/ehviewer/client/parser/Error.kt

@@ -1,6 +0,0 @@
-package com.hippo.ehviewer.client.parser
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class Error(val error: String)

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

@@ -1,31 +1,62 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.hippo.ehviewer.client.parser
 
+import com.hippo.ehviewer.GetText.getString
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.client.exception.EhException
 import com.hippo.ehviewer.client.exception.ParseException
-import splitties.init.appCtx
+import com.hippo.ehviewer.util.ExceptionUtils
+import com.hippo.ehviewer.util.JsoupUtils
+import org.jsoup.Jsoup
 
 object FavoritesParser {
-    suspend fun parse(body: String): Result {
+    fun parse(body: String): Result {
         if (body.contains("This page requires you to log on.</p>")) {
-            throw EhException(appCtx.getString(R.string.need_sign_in))
+            throw EhException(getString(R.string.need_sign_in))
         }
         val catArray = arrayOfNulls<String>(10)
-        val countArray = parseFav(body, catArray)
-        if (countArray.isEmpty()) throw ParseException("Parse favorites error")
-        val result = GalleryListParser.parse(body)
-        return Result(catArray.requireNoNulls(), countArray, result)
+        val countArray = IntArray(10)
+        val d = Jsoup.parse(body)
+        runCatching {
+            val ido = JsoupUtils.getElementByClass(d, "ido")
+            val fps = ido!!.getElementsByClass("fp")
+            // Last one is "fp fps"
+            check(fps.size == 11)
+            for (i in 0..9) {
+                val fp = fps[i]
+                countArray[i] = ParserUtils.parseInt(fp.child(0).text(), 0)
+                catArray[i] = ParserUtils.trim(fp.child(2).text())
+            }
+        }.onFailure {
+            ExceptionUtils.throwIfFatal(it)
+            it.printStackTrace()
+            throw ParseException("Parse favorites error", body)
+        }
+        val result = GalleryListParser.parse(d, body)
+        return Result(catArray, countArray, result)
     }
 
     class Result(
-        val catArray: Array<String>,
+        val catArray: Array<String?>,
         val countArray: IntArray,
-        galleryListResult: GalleryListResult,
+        galleryListResult: GalleryListParser.Result,
     ) {
         val prev = galleryListResult.prev
         val next = galleryListResult.next
         val galleryInfoList = galleryListResult.galleryInfoList
     }
 }
-
-private external fun parseFav(body: String, favCat: Array<String?>): IntArray

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

@@ -16,7 +16,7 @@
 package com.hippo.ehviewer.client.parser
 
 import com.hippo.ehviewer.client.EhUrl
-import com.hippo.ehviewer.client.exception.NotLoggedInException
+import com.hippo.ehviewer.client.exception.EhException
 import com.hippo.ehviewer.util.ExceptionUtils
 import org.jsoup.Jsoup
 
@@ -29,7 +29,7 @@ object ForumsParser {
             child.attr("href")
         }.getOrElse {
             ExceptionUtils.throwIfFatal(it)
-            throw NotLoggedInException()
+            throw EhException("Not logged in")
         }
     }
 }

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

@@ -19,46 +19,30 @@ import com.hippo.ehviewer.client.EhUtils.getCategory
 import com.hippo.ehviewer.client.EhUtils.handleThumbUrlResolution
 import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.client.getThumbKey
-import com.hippo.ehviewer.client.parseAs
-import com.hippo.ehviewer.util.unescapeXml
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import com.hippo.ehviewer.yorozuya.NumberUtils
+import org.json.JSONObject
 
 object GalleryApiParser {
     fun parse(body: String, galleryInfoList: List<GalleryInfo>) {
-        body.parseAs<Result>().items.forEach { item ->
-            val gi = galleryInfoList.find { it.gid == item.gid } ?: return@forEach
-            gi.apply {
-                title = item.title.unescapeXml()
-                titleJpn = item.titleJpn.unescapeXml()
-                category = getCategory(item.category)
-                thumbKey = getThumbKey(handleThumbUrlResolution(item.thumb)!!)
-                uploader = item.uploader.unescapeXml()
-                posted = ParserUtils.formatDate(item.posted * 1000)
-                rating = item.rating
-                simpleTags = item.tags
-                pages = item.pages
-                generateSLang()
-            }
+        val jo = JSONObject(body)
+        val ja = jo.getJSONArray("gmetadata")
+        for (i in 0 until ja.length()) {
+            val g = ja.getJSONObject(i)
+            val gid = g.getLong("gid")
+            val gi = galleryInfoList.find { it.gid == gid } ?: continue
+            gi.title = ParserUtils.trim(g.getString("title"))
+            gi.titleJpn = ParserUtils.trim(g.getString("title_jpn"))
+            gi.category = getCategory(g.getString("category"))
+            gi.thumbKey = getThumbKey(handleThumbUrlResolution(g.getString("thumb"))!!)
+            gi.uploader = g.getString("uploader")
+            gi.posted =
+                ParserUtils.formatDate(ParserUtils.parseLong(g.getString("posted"), 0) * 1000)
+            gi.rating = NumberUtils.parseFloatSafely(g.getString("rating"), 0.0f)
+            // tags
+            val tagJa = g.getJSONArray("tags")
+            gi.simpleTags = (0 until tagJa.length()).map { tagJa.getString(it) }.toTypedArray()
+            gi.pages = NumberUtils.parseIntSafely(g.getString("filecount"), 0)
+            gi.generateSLang()
         }
     }
-
-    @Serializable
-    data class Result(@SerialName("gmetadata") val items: List<Item>)
-
-    @Serializable
-    data class Item(
-        val gid: Long,
-        val title: String,
-        @SerialName("title_jpn")
-        val titleJpn: String,
-        val category: String,
-        val thumb: String,
-        val uploader: String,
-        val posted: Long,
-        @SerialName("filecount")
-        val pages: Int,
-        val rating: Float,
-        val tags: ArrayList<String>,
-    )
 }

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

@@ -25,8 +25,6 @@ import com.hippo.ehviewer.client.data.BaseGalleryInfo
 import com.hippo.ehviewer.client.data.GalleryComment
 import com.hippo.ehviewer.client.data.GalleryCommentList
 import com.hippo.ehviewer.client.data.GalleryDetail
-import com.hippo.ehviewer.client.data.GalleryInfo.Companion.LOCAL_FAVORITED
-import com.hippo.ehviewer.client.data.GalleryInfo.Companion.NOT_FAVORITED
 import com.hippo.ehviewer.client.data.GalleryPreview
 import com.hippo.ehviewer.client.data.GalleryTagGroup
 import com.hippo.ehviewer.client.data.LargeGalleryPreview
@@ -37,10 +35,11 @@ import com.hippo.ehviewer.client.exception.ParseException
 import com.hippo.ehviewer.client.exception.PiningException
 import com.hippo.ehviewer.client.getThumbKey
 import com.hippo.ehviewer.util.ExceptionUtils
-import com.hippo.ehviewer.util.toFloatOrDefault
-import com.hippo.ehviewer.util.toIntOrDefault
-import com.hippo.ehviewer.util.trimAnd
-import com.hippo.ehviewer.util.unescapeXml
+import com.hippo.ehviewer.util.JsoupUtils
+import com.hippo.ehviewer.yorozuya.NumberUtils
+import com.hippo.ehviewer.yorozuya.StringUtils
+import com.hippo.ehviewer.yorozuya.trimAnd
+import com.hippo.ehviewer.yorozuya.unescapeXml
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
@@ -83,7 +82,8 @@ object GalleryDetailParser {
         "<p>(And if you choose to ignore this warning, you lose all rights to complain about it in the future.)</p>"
     private const val PINING_STRING = "<p>This gallery is pining for the fjords.</p>"
 
-    suspend fun parse(body: String): GalleryDetail {
+    @Throws(EhException::class)
+    fun parse(body: String): GalleryDetail {
         if (body.contains(OFFENSIVE_STRING)) {
             throw OffensiveException()
         }
@@ -108,15 +108,16 @@ object GalleryDetailParser {
         return galleryDetail
     }
 
-    private suspend fun parseDetail(gd: GalleryDetail, d: Document, body: String) {
+    @Throws(ParseException::class)
+    private fun parseDetail(gd: GalleryDetail, d: Document, body: String) {
         PATTERN_DETAIL.find(body)?.apply {
             gd.gid = groupValues[1].toLongOrNull() ?: -1L
             gd.token = groupValues[2]
             gd.apiUid = groupValues[3].toLongOrNull() ?: -1L
             gd.apiKey = groupValues[4]
-        } ?: throw ParseException("Can't parse gallery detail")
+        } ?: throw ParseException("Can't parse gallery detail", body)
         if (gd.gid == -1L) {
-            throw ParseException("Can't parse gallery detail")
+            throw ParseException("Can't parse gallery detail", body)
         }
         PATTERN_TORRENT.find(body)?.run {
             gd.torrentUrl = groupValues[1].trim().unescapeXml()
@@ -140,11 +141,11 @@ object GalleryDetailParser {
             gd.titleJpn = gm.getElementById("gj")?.text()?.trim()
 
             // Category
+            val gdc = gm.getElementById("gdc")
             try {
-                val gdc = gm.getElementById("gdc")!!
-                var ce = gdc.getElementsByClass("cn").first()
+                var ce = JsoupUtils.getElementByClass(gdc, "cn")
                 if (ce == null) {
-                    ce = gdc.getElementsByClass("cs").first()
+                    ce = JsoupUtils.getElementByClass(gdc, "cs")
                 }
                 gd.category = getCategory(ce!!.text())
             } catch (e: Throwable) {
@@ -156,7 +157,7 @@ object GalleryDetailParser {
             val gdn = gm.getElementById("gdn")
             if (null != gdn) {
                 gd.disowned = gdn.attr("style").contains("opacity:0.5")
-                gd.uploader = gdn.text().trim()
+                gd.uploader = StringUtils.trim(gdn.text())
             } else {
                 gd.uploader = ""
             }
@@ -175,7 +176,10 @@ object GalleryDetailParser {
             // Rating count
             val ratingCount = gm.getElementById("rating_count")
             if (null != ratingCount) {
-                gd.ratingCount = ratingCount.text().trim().toIntOrDefault(0)
+                gd.ratingCount = NumberUtils.parseIntSafely(
+                    StringUtils.trim(ratingCount.text()),
+                    0,
+                )
             } else {
                 gd.ratingCount = 0
             }
@@ -183,7 +187,7 @@ object GalleryDetailParser {
             // Rating
             val ratingLabel = gm.getElementById("rating_label")
             if (null != ratingLabel) {
-                val ratingStr = ratingLabel.text().trim()
+                val ratingStr = StringUtils.trim(ratingLabel.text())
                 if ("Not Yet Rated" == ratingStr) {
                     gd.rating = -1.0f
                 } else {
@@ -191,7 +195,7 @@ object GalleryDetailParser {
                     if (index == -1 || index >= ratingStr.length) {
                         gd.rating = 0f
                     } else {
-                        gd.rating = ratingStr.substring(index + 1).toFloatOrDefault(0f)
+                        gd.rating = NumberUtils.parseFloatSafely(ratingStr.substring(index + 1), 0f)
                     }
                 }
             } else {
@@ -200,21 +204,25 @@ object GalleryDetailParser {
 
             // isFavorited
             val gdf = gm.getElementById("gdf")
+            gd.isFavorited = false
             if (gdf != null) {
-                val favoriteName = gdf.text().trim()
-                if (favoriteName != "Add to Favorites") {
-                    gd.favoriteName = gdf.text().trim()
+                val favoriteName = StringUtils.trim(gdf.text())
+                if (favoriteName == "Add to Favorites") {
+                    gd.favoriteName = null
+                } else {
+                    gd.isFavorited = true
+                    gd.favoriteName = StringUtils.trim(gdf.text())
                     PATTERN_FAVORITE_SLOT.find(body)?.run {
                         gd.favoriteSlot = ((groupValues[1].toIntOrNull() ?: 2) - 2) / 19
                     }
                 }
             }
-            if (gd.favoriteSlot == NOT_FAVORITED && EhDB.containLocalFavorites(gd.gid)) {
-                gd.favoriteSlot = LOCAL_FAVORITED
+            if (gd.favoriteSlot == -2 && EhDB.containLocalFavorites(gd.gid)) {
+                gd.favoriteSlot = -1
             }
         } catch (e: Throwable) {
             ExceptionUtils.throwIfFatal(e)
-            throw ParseException("Can't parse gallery detail")
+            throw ParseException("Can't parse gallery detail", body)
         }
 
         // newer version
@@ -226,7 +234,7 @@ object GalleryDetailParser {
                 if (result != null) {
                     gi.gid = result.gid
                     gi.token = result.token
-                    gi.title = element.text().trim()
+                    gi.title = StringUtils.trim(element.text())
                     gi.posted = dates[index]
                     gd.newerVersions.add(gi)
                 }
@@ -239,8 +247,8 @@ object GalleryDetailParser {
         if (es.size < 2) {
             return
         }
-        val key = es[0].text().trim()
-        val value = es[1].ownText().trim()
+        val key = StringUtils.trim(es[0].text())
+        val value = StringUtils.trim(es[1].ownText())
         if (key.startsWith("Posted")) {
             gd.posted = value
         } else if (key.startsWith("Parent")) {
@@ -257,7 +265,7 @@ object GalleryDetailParser {
         } else if (key.startsWith("Length")) {
             val index = value.indexOf(' ')
             if (index >= 0) {
-                gd.pages = value.substring(0, index).toIntOrDefault(1)
+                gd.pages = NumberUtils.parseIntSafely(value.substring(0, index), 1)
             } else {
                 gd.pages = 1
             }
@@ -270,7 +278,7 @@ object GalleryDetailParser {
                     if (index == -1) {
                         gd.favoriteCount = 0
                     } else {
-                        gd.favoriteCount = value.substring(0, index).toIntOrDefault(0)
+                        gd.favoriteCount = NumberUtils.parseIntSafely(value.substring(0, index), 0)
                     }
                 }
             }
@@ -279,10 +287,11 @@ object GalleryDetailParser {
 
     private fun parseTagGroup(element: Element): GalleryTagGroup? {
         return try {
+            val group = GalleryTagGroup()
             var nameSpace = element.child(0).text()
             // Remove last ':'
             nameSpace = nameSpace.substring(0, nameSpace.length - 1)
-            val group = GalleryTagGroup(nameSpace)
+            group.groupName = nameSpace
             val tags = element.child(1).children()
             tags.forEach {
                 var tag = it.text()
@@ -329,7 +338,7 @@ object GalleryDetailParser {
         }
     }
 
-    private suspend fun parseComment(element: Element): GalleryComment? {
+    private fun parseComment(element: Element): GalleryComment? {
         return try {
             val comment = GalleryComment()
             // Id
@@ -337,7 +346,7 @@ object GalleryDetailParser {
             val name = a!!.attr("name")
             comment.id = name trimAnd { substring(1).toInt().toLong() }
             // Editable, vote up and vote down
-            val c4 = element.getElementsByClass("c4").first()
+            val c4 = JsoupUtils.getElementByClass(element, "c4")
             if (null != c4) {
                 if ("Uploader Comment" == c4.text()) {
                     comment.uploader = true
@@ -346,12 +355,12 @@ object GalleryDetailParser {
                     when (e.text()) {
                         "Vote+" -> {
                             comment.voteUpAble = true
-                            comment.voteUpEd = e.attr("style").trim().isNotEmpty()
+                            comment.voteUpEd = StringUtils.trim(e.attr("style")).isNotEmpty()
                         }
 
                         "Vote-" -> {
                             comment.voteDownAble = true
-                            comment.voteDownEd = e.attr("style").trim().isNotEmpty()
+                            comment.voteDownEd = StringUtils.trim(e.attr("style")).isNotEmpty()
                         }
 
                         "Edit" -> comment.editable = true
@@ -359,20 +368,23 @@ object GalleryDetailParser {
                 }
             }
             // Vote state
-            val c7 = element.getElementsByClass("c7").first()
+            val c7 = JsoupUtils.getElementByClass(element, "c7")
             if (null != c7) {
-                comment.voteState = c7.text().trim()
+                comment.voteState = StringUtils.trim(c7.text())
             }
             // Score
-            val c5 = element.getElementsByClass("c5").first()
+            val c5 = JsoupUtils.getElementByClass(element, "c5")
             if (null != c5) {
                 val es = c5.children()
                 if (!es.isEmpty()) {
-                    comment.score = es[0].text().trim().toIntOrDefault(0)
+                    comment.score = NumberUtils.parseIntSafely(
+                        StringUtils.trim(es[0].text()),
+                        0,
+                    )
                 }
             }
             // time
-            val c3 = element.getElementsByClass("c3").first()
+            val c3 = JsoupUtils.getElementByClass(element, "c3")
             val temp = c3!!.ownText()
             val time = if (temp.endsWith(':')) {
                 // user
@@ -383,7 +395,7 @@ object GalleryDetailParser {
             }
             comment.time = Instant.from(WEB_COMMENT_DATE_FORMAT.parse(time)).toEpochMilli()
             // comment
-            val c6 = element.getElementsByClass("c6").first()
+            val c6 = JsoupUtils.getElementByClass(element, "c6")
             // fix underline support
             for (e in c6!!.children()) {
                 if ("span" == e.tagName() && "text-decoration:underline;" == e.attr("style")) {
@@ -399,7 +411,7 @@ object GalleryDetailParser {
                 }
             }
             // last edited
-            val c8 = element.getElementsByClass("c8").first()
+            val c8 = JsoupUtils.getElementByClass(element, "c8")
             if (c8 != null) {
                 val e = c8.children().first()
                 if (e != null) {
@@ -418,7 +430,7 @@ object GalleryDetailParser {
     /**
      * Parse comments with html parser
      */
-    suspend fun parseComments(document: Document): GalleryCommentList {
+    fun parseComments(document: Document): GalleryCommentList {
         return try {
             val cdiv = document.getElementById("cdiv")!!
             val c1s = cdiv.getElementsByClass("c1")
@@ -448,17 +460,19 @@ object GalleryDetailParser {
     /**
      * Parse preview pages with regular expressions
      */
+    @Throws(ParseException::class)
     fun parsePreviewPages(body: String): Int {
         return PATTERN_PREVIEW_PAGES.find(body)?.groupValues?.get(1)?.toIntOrNull()
-            ?: throw ParseException("Parse preview page count error")
+            ?: throw ParseException("Parse preview page count error", body)
     }
 
     /**
      * Parse pages with regular expressions
      */
+    @Throws(ParseException::class)
     fun parsePages(body: String): Int {
         return PATTERN_PAGES.find(body)?.groupValues?.get(1)?.toIntOrNull()
-            ?: throw ParseException("Parse pages error")
+            ?: throw ParseException("Parse pages error", body)
     }
 
     fun parsePreviewList(body: String): Pair<List<GalleryPreview>, List<String>> {

app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailUrlParser.kt

@@ -16,7 +16,7 @@
 package com.hippo.ehviewer.client.parser
 
 import com.hippo.ehviewer.client.EhUrl
-import com.hippo.ehviewer.util.toLongOrDefault
+import com.hippo.ehviewer.yorozuya.NumberUtils
 import java.util.regex.Pattern
 
 /**
@@ -24,7 +24,7 @@ import java.util.regex.Pattern
  */
 object GalleryDetailUrlParser {
     private val URL_STRICT_PATTERN = Pattern.compile(
-        "https?://(?:${EhUrl.DOMAIN_EX}|${EhUrl.DOMAIN_E}(?:/lofi)?)/(?:g|mpv)/(\\d+)/([0-9a-f]{10})",
+        "https?://(?:" + EhUrl.DOMAIN_EX + "|" + EhUrl.DOMAIN_E + "|" + EhUrl.DOMAIN_LOFI + ")/(?:g|mpv)/(\\d+)/([0-9a-f]{10})",
     )
     private val URL_PATTERN = Pattern.compile("(\\d+)/([0-9a-f]{10})(?:[^0-9a-f]|$)")
 
@@ -33,7 +33,7 @@ object GalleryDetailUrlParser {
         val pattern = if (strict) URL_STRICT_PATTERN else URL_PATTERN
         val m = pattern.matcher(url)
         return if (m.find()) {
-            val gid = m.group(1)!!.toLongOrDefault(0).takeIf { it > 0 }
+            val gid = NumberUtils.parseLongSafely(m.group(1), 0).takeIf { it > 0 }
             gid?.let { Result(it, m.group(2)!!) }
         } else {
             null

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

@@ -1,38 +1,343 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.hippo.ehviewer.client.parser
 
+import android.util.Log
 import com.hippo.ehviewer.EhDB
-import com.hippo.ehviewer.R
+import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.client.data.BaseGalleryInfo
-import com.hippo.ehviewer.client.data.GalleryInfo.Companion.LOCAL_FAVORITED
-import com.hippo.ehviewer.client.data.GalleryInfo.Companion.NOT_FAVORITED
-import com.hippo.ehviewer.client.exception.EhException
+import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.client.exception.ParseException
+import com.hippo.ehviewer.client.getThumbKey
+import com.hippo.ehviewer.util.ExceptionUtils
+import com.hippo.ehviewer.util.JsoupUtils
+import com.hippo.ehviewer.yorozuya.NumberUtils
+import org.jsoup.Jsoup
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+import java.util.regex.Pattern
 
 object GalleryListParser {
-    suspend fun parse(body: String) = runCatching {
-        parseGalleryInfoList(body).apply {
-            galleryInfoList.onEach {
-                if (it.favoriteSlot == NOT_FAVORITED && EhDB.containLocalFavorites(it.gid)) {
-                    it.favoriteSlot = LOCAL_FAVORITED
+    private val TAG = GalleryListParser::class.java.simpleName
+    private const val NO_UNFILTERED_TEXT =
+        "No unfiltered results in this page range. You either requested an invalid page or used too aggressive filters."
+    private val PATTERN_RATING = Pattern.compile("\\d+px")
+    private val PATTERN_THUMB_SIZE = Pattern.compile("height:(\\d+)px;width:(\\d+)px")
+    private val PATTERN_FAVORITE_SLOT =
+        Pattern.compile("background-color:rgba\\((\\d+),(\\d+),(\\d+),")
+    private val PATTERN_PAGES = Pattern.compile("(\\d+) page")
+    private val PATTERN_NEXT_PAGE = Pattern.compile("p=(\\d+)")
+    private val PATTERN_PREV = Pattern.compile("prev=(\\d+(-\\d+)?)")
+    private val PATTERN_NEXT = Pattern.compile("next=(\\d+(-\\d+)?)")
+    private val FAVORITE_SLOT_RGB = arrayOf(
+        Triple("0", "0", "0"),
+        Triple("240", "0", "0"),
+        Triple("240", "160", "0"),
+        Triple("208", "208", "0"),
+        Triple("0", "128", "0"),
+        Triple("144", "240", "64"),
+        Triple("64", "176", "240"),
+        Triple("0", "0", "240"),
+        Triple("80", "0", "128"),
+        Triple("224", "128", "224"),
+    )
+
+    private fun parseRating(ratingStyle: String): String? {
+        val m = PATTERN_RATING.matcher(ratingStyle)
+        var num1 = Int.MIN_VALUE
+        var num2 = Int.MIN_VALUE
+        var rate = 5
+        if (m.find()) {
+            num1 = ParserUtils.parseInt(m.group().replace("px", ""), Int.MIN_VALUE)
+        }
+        if (m.find()) {
+            num2 = ParserUtils.parseInt(m.group().replace("px", ""), Int.MIN_VALUE)
+        }
+        if (num1 == Int.MIN_VALUE || num2 == Int.MIN_VALUE) {
+            return null
+        }
+        rate -= num1 / 16
+        return if (num2 == 21) {
+            "${rate - 1}.5"
+        } else {
+            rate.toString()
+        }
+    }
+
+    private fun parseFavoriteSlot(style: String): Int {
+        val m = PATTERN_FAVORITE_SLOT.matcher(style)
+        if (m.find()) {
+            val r = m.group(1)!!
+            val g = m.group(2)!!
+            val b = m.group(3)!!
+            return FAVORITE_SLOT_RGB.indexOf(Triple(r, g, b))
+        }
+        return -2
+    }
+
+    private fun parseGalleryInfo(e: Element): GalleryInfo? {
+        val gi: GalleryInfo = BaseGalleryInfo()
+
+        // Title, gid, token (required), tags
+        val glname = JsoupUtils.getElementByClass(e, "glname")
+        if (glname != null) {
+            var a = JsoupUtils.getElementByTag(glname, "a")
+            if (a == null) {
+                val parent = glname.parent()
+                if (parent != null && "a" == parent.tagName()) {
+                    a = parent
+                }
+            }
+            if (a != null) {
+                val result = GalleryDetailUrlParser.parse(a.attr("href"))
+                if (result != null) {
+                    gi.gid = result.gid
+                    gi.token = result.token
+                }
+            }
+            var child: Element = glname
+            var children = glname.children()
+            while (children.size != 0) {
+                child = children[0]
+                children = child.children()
+            }
+            gi.title = child.text().trim { it <= ' ' }
+        }
+        if (gi.title == null) {
+            return null
+        }
+
+        // Tags
+        val gts = e.select(".gt, .gtl")
+        if (gts.size != 0) {
+            val tags = ArrayList<String>()
+            for (gt in gts) {
+                tags.add(gt.attr("title"))
+            }
+            gi.simpleTags = tags.toTypedArray()
+        }
+
+        // Category
+        gi.category = EhUtils.UNKNOWN
+        var ce = JsoupUtils.getElementByClass(e, "cn")
+        if (ce == null) {
+            ce = JsoupUtils.getElementByClass(e, "cs")
+        }
+        if (ce != null) {
+            gi.category = EhUtils.getCategory(ce.text())
+        }
+
+        // Thumb
+        var thumbUrl: String? = null
+        val glthumb = JsoupUtils.getElementByClass(e, "glthumb")
+        if (glthumb != null) {
+            val img = glthumb.select("div:nth-child(1)>img").first()
+            if (img != null) {
+                // Thumb size
+                val m = PATTERN_THUMB_SIZE.matcher(img.attr("style"))
+                if (m.find()) {
+                    gi.thumbWidth = NumberUtils.parseIntSafely(m.group(2), 0)
+                    gi.thumbHeight = NumberUtils.parseIntSafely(m.group(1), 0)
+                } else {
+                    Log.w(TAG, "Can't parse gallery info thumb size")
+                    gi.thumbWidth = 0
+                    gi.thumbHeight = 0
+                }
+                // Thumb url
+                var url = img.attr("data-src")
+                if (url.isEmpty()) {
+                    url = img.attr("src")
+                }
+                if (url.isNotEmpty()) {
+                    thumbUrl = EhUtils.handleThumbUrlResolution(url)!!
+                }
+            }
+
+            // Pages
+            val div = glthumb.select("div:nth-child(2)>div:nth-child(2)>div:nth-child(2)").first()
+            if (div != null) {
+                val matcher = PATTERN_PAGES.matcher(div.text())
+                if (matcher.find()) {
+                    gi.pages = NumberUtils.parseIntSafely(matcher.group(1), 0)
                 }
-                it.generateSLang()
             }
         }
-    }.getOrElse {
-        if (body.contains("<p>You do not have any watched tags")) {
-            throw EhException(R.string.gallery_list_empty_hit_subscription)
+        // Try extended and thumbnail version
+        if (thumbUrl == null) {
+            var gl = JsoupUtils.getElementByClass(e, "gl1e")
+            if (gl == null) {
+                gl = JsoupUtils.getElementByClass(e, "gl3t")
+            }
+            if (gl != null) {
+                val img = JsoupUtils.getElementByTag(gl, "img")
+                if (img != null) {
+                    // Thumb size
+                    val m = PATTERN_THUMB_SIZE.matcher(img.attr("style"))
+                    if (m.find()) {
+                        gi.thumbWidth = NumberUtils.parseIntSafely(m.group(2), 0)
+                        gi.thumbHeight = NumberUtils.parseIntSafely(m.group(1), 0)
+                    } else {
+                        Log.w(TAG, "Can't parse gallery info thumb size")
+                        gi.thumbWidth = 0
+                        gi.thumbHeight = 0
+                    }
+                    thumbUrl = EhUtils.handleThumbUrlResolution(img.attr("src"))
+                }
+            }
         }
-        if (body.contains("No hits found</p>")) {
-            throw EhException(R.string.gallery_list_empty_hit)
+
+        gi.thumbKey = getThumbKey(thumbUrl!!)
+
+        // Posted
+        val posted = e.getElementById("posted_" + gi.gid)
+        if (posted != null) {
+            gi.posted = posted.text().trim { it <= ' ' }
+            gi.favoriteSlot = parseFavoriteSlot(posted.attr("style"))
         }
-        throw ParseException("Can't parse gallery list", it)
+        if (gi.favoriteSlot < 0) {
+            gi.favoriteSlot = if (EhDB.containLocalFavorites(gi.gid)) -1 else -2
+        }
+
+        // Rating
+        val ir = JsoupUtils.getElementByClass(e, "ir")
+        if (ir != null) {
+            gi.rating = NumberUtils.parseFloatSafely(parseRating(ir.attr("style")), -1.0f)
+            // TODO The gallery may be rated even if it doesn't has one of these classes
+            gi.rated = ir.hasClass("irr") || ir.hasClass("irg") || ir.hasClass("irb")
+        }
+
+        // Uploader and pages
+        var gl = JsoupUtils.getElementByClass(e, "glhide")
+        var uploaderIndex = 0
+        var pagesIndex = 1
+        if (gl == null) {
+            // For extended
+            gl = JsoupUtils.getElementByClass(e, "gl3e")
+            uploaderIndex = 3
+            pagesIndex = 4
+        }
+        if (gl != null) {
+            val children = gl.children()
+            if (children.size > uploaderIndex) {
+                val div = children[uploaderIndex]
+                if (div != null) {
+                    gi.disowned = div.attr("style").contains("opacity:0.5")
+                    val a = div.children().first()
+                    gi.uploader = a?.text()?.trim { it <= ' ' } ?: div.text().trim { it <= ' ' }
+                }
+            }
+            if (children.size > pagesIndex) {
+                val matcher = PATTERN_PAGES.matcher(children[pagesIndex].text())
+                if (matcher.find()) {
+                    gi.pages = NumberUtils.parseIntSafely(matcher.group(1), 0)
+                }
+            }
+        }
+        // For thumbnail
+        val gl5t = JsoupUtils.getElementByClass(e, "gl5t")
+        if (gl5t != null) {
+            val div = gl5t.select("div:nth-child(2)>div:nth-child(2)").first()
+            if (div != null) {
+                val matcher = PATTERN_PAGES.matcher(div.text())
+                if (matcher.find()) {
+                    gi.pages = NumberUtils.parseIntSafely(matcher.group(1), 0)
+                }
+            }
+        }
+        gi.generateSLang()
+        return gi
+    }
+
+    fun parse(body: String): Result {
+        val d = Jsoup.parse(body)
+        return parse(d, body)
+    }
+
+    fun parse(d: Document, body: String): Result {
+        val result = Result()
+        try {
+            val prev = d.getElementById("uprev")
+            val next = d.getElementById("unext")
+            assert(prev != null)
+            assert(next != null)
+            val matcherPrev = PATTERN_PREV.matcher(prev!!.attr("href"))
+            val matcherNext = PATTERN_NEXT.matcher(next!!.attr("href"))
+            if (matcherPrev.find()) result.prev = matcherPrev.group(1)
+            if (matcherNext.find()) result.next = matcherNext.group(1)
+        } catch (e: Throwable) {
+            ExceptionUtils.throwIfFatal(e)
+            result.noWatchedTags = body.contains("<p>You do not have any watched tags")
+            if (body.contains("No hits found</p>")) {
+                return result
+            }
+        }
+        try { // For toplists
+            val ptt = d.getElementsByClass("ptt").first()
+            if (ptt != null) {
+                val es = ptt.child(0).child(0).children()
+                result.pages = es[es.size - 2].text().trim { it <= ' ' }.toInt()
+                var e = es[es.size - 1]
+                if (e != null) {
+                    e = e.children().first()
+                    if (e != null) {
+                        val href = e.attr("href")
+                        val matcher = PATTERN_NEXT_PAGE.matcher(href)
+                        if (matcher.find()) {
+                            result.nextPage = NumberUtils.parseIntSafely(matcher.group(1), 0)
+                        }
+                    }
+                }
+            }
+        } catch (e: Throwable) {
+            e.printStackTrace()
+        }
+        try {
+            val itg = d.getElementsByClass("itg").first()
+            val es = if ("table".equals(itg!!.tagName(), ignoreCase = true)) {
+                itg.child(0).children()
+            } else {
+                itg.children()
+            }
+            val list = result.galleryInfoList
+            // First one is table header, skip it
+            for (i in es.indices) {
+                val gi = parseGalleryInfo(es[i])
+                if (null != gi) {
+                    list.add(gi)
+                }
+            }
+            if (list.isEmpty()) {
+                if (es.size < 2 || NO_UNFILTERED_TEXT != es[1].text()) {
+                    Log.d(TAG, "No gallery found")
+                }
+            }
+        } catch (e: Throwable) {
+            ExceptionUtils.throwIfFatal(e)
+            e.printStackTrace()
+            throw ParseException("Can't parse gallery list", body)
+        }
+        return result
+    }
+
+    class Result {
+        var pages = 0
+        var nextPage = 0
+        var prev: String? = null
+        var next: String? = null
+        var noWatchedTags = false
+        val galleryInfoList = mutableListOf<GalleryInfo>()
     }
 }
-
-class GalleryListResult(
-    val prev: String?,
-    val next: String?,
-    val galleryInfoList: ArrayList<BaseGalleryInfo>,
-)
-
-private external fun parseGalleryInfoList(e: String): GalleryListResult

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

@@ -17,8 +17,10 @@ package com.hippo.ehviewer.client.parser
 
 import android.net.Uri
 import android.os.Build
+import android.text.TextUtils
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.data.ListUrlBuilder
+import com.hippo.ehviewer.yorozuya.Utilities
 import java.io.UnsupportedEncodingException
 import java.net.MalformedURLException
 import java.net.URL
@@ -26,7 +28,7 @@ import java.net.URLDecoder
 import java.nio.charset.StandardCharsets
 
 object GalleryListUrlParser {
-    private val VALID_HOSTS = arrayOf(EhUrl.DOMAIN_EX, EhUrl.DOMAIN_E)
+    private val VALID_HOSTS = arrayOf(EhUrl.DOMAIN_EX, EhUrl.DOMAIN_E, EhUrl.DOMAIN_LOFI)
     private const val PATH_NORMAL = "/"
     private const val PATH_UPLOADER = "/uploader/"
     private const val PATH_TAG = "/tag/"
@@ -37,7 +39,7 @@ object GalleryListUrlParser {
         } catch (e: MalformedURLException) {
             return null
         }
-        if (url.host !in VALID_HOSTS) {
+        if (!Utilities.contain(VALID_HOSTS, url.host)) {
             return null
         }
         val path = url.path ?: return null
@@ -86,7 +88,7 @@ object GalleryListUrlParser {
                 return null
             }
         }
-        if (uploader.isNullOrEmpty()) {
+        if (TextUtils.isEmpty(uploader)) {
             return null
         }
         val builder = ListUrlBuilder()
@@ -115,7 +117,7 @@ object GalleryListUrlParser {
                 return null
             }
         }
-        if (tag.isNullOrEmpty()) {
+        if (TextUtils.isEmpty(tag)) {
             return null
         }
         val builder = ListUrlBuilder()
@@ -127,7 +129,7 @@ object GalleryListUrlParser {
     // TODO get page
     private fun parseToplist(path: String): ListUrlBuilder? {
         val uri = Uri.parse(path)
-        if (uri == null || uri.getQueryParameter("tl").isNullOrEmpty()) {
+        if (uri == null || TextUtils.isEmpty(uri.getQueryParameter("tl"))) {
             return null
         }
         val tl = uri.getQueryParameter("tl")!!.toInt()

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

@@ -17,26 +17,22 @@
  */
 package com.hippo.ehviewer.client.parser
 
-import com.hippo.ehviewer.client.exception.ParseException
-import com.hippo.ehviewer.client.parseAs
+import com.hippo.ehviewer.client.exception.EhException
 import com.hippo.ehviewer.util.ExceptionUtils
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import org.json.JSONArray
 
 object GalleryMultiPageViewerPTokenParser {
-    private const val IMAGE_LIST_STRING = "var imagelist = "
-
     fun parse(body: String): List<String> {
-        val index = body.indexOf(IMAGE_LIST_STRING)
-        val imagelist = body.substring(index + IMAGE_LIST_STRING.length, body.indexOf(";", index))
+        val imagelist = body.substring(
+            body.indexOf("var imagelist = ") + 16,
+            body.indexOf(";", body.indexOf("var imagelist = ")),
+        )
         return runCatching {
-            imagelist.parseAs<List<Item>>().map(Item::token)
+            val ja = JSONArray(imagelist)
+            (0 until ja.length()).map { ja.getJSONObject(it).getString("k") }
         }.getOrElse {
             ExceptionUtils.throwIfFatal(it)
-            throw ParseException("Parse pToken from MPV error", it)
+            throw EhException(body)
         }
     }
-
-    @Serializable
-    data class Item(@SerialName("k") val token: String)
 }

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

@@ -18,13 +18,15 @@
 package com.hippo.ehviewer.client.parser
 
 import com.hippo.ehviewer.util.ExceptionUtils
+import com.hippo.ehviewer.util.JsoupUtils
 import org.jsoup.Jsoup
 
 object GalleryNotAvailableParser {
     fun parse(body: String): String? {
         return runCatching {
-            val e = Jsoup.parse(body).getElementsByClass("d").first()
-            e!!.child(0).html().replace("<br>", "\n")
+            val document = Jsoup.parse(body)
+            val d = JsoupUtils.getElementByClass(document, "d")
+            d!!.child(0).html().replace("<br>", "\n")
         }.getOrElse {
             ExceptionUtils.throwIfFatal(it)
             it.printStackTrace()

app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageApiParser.kt

@@ -16,44 +16,56 @@
 package com.hippo.ehviewer.client.parser
 
 import com.hippo.ehviewer.client.exception.ParseException
-import com.hippo.ehviewer.client.parseAs
-import com.hippo.ehviewer.util.unescapeXml
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import com.hippo.ehviewer.yorozuya.StringUtils
+import org.json.JSONException
+import org.json.JSONObject
+import java.util.regex.Matcher
+import java.util.regex.Pattern
 
 object GalleryPageApiParser {
-    private val PATTERN_IMAGE_URL = Regex("<img[^>]*src=\"([^\"]+)\" style")
-    private val PATTERN_SKIP_HATH_KEY = Regex("onclick=\"return nl\\('([^)]+)'\\)")
-    private val PATTERN_ORIGIN_IMAGE_URL = Regex("<a href=\"([^\"]+)fullimg.php([^\"]+)\">")
+    private val PATTERN_IMAGE_URL = Pattern.compile("<img[^>]*src=\"([^\"]+)\" style")
+    private val PATTERN_SKIP_HATH_KEY = Pattern.compile("onclick=\"return nl\\('([^)]+)'\\)")
+    private val PATTERN_ORIGIN_IMAGE_URL =
+        Pattern.compile("<a href=\"([^\"]+)fullimg.php([^\"]+)\">")
 
     fun parse(body: String): Result {
-        runCatching { body.parseAs<Error>() }.onSuccess { throw ParseException(it.error) }
-        val res = body.parseAs<JsonResult>()
-        val imageUrl = PATTERN_IMAGE_URL.find(res.imageUrl)?.run {
-            groupValues[1].trim().unescapeXml()
-        }
-        val skipHathKey = PATTERN_SKIP_HATH_KEY.find(res.skipHathKey)?.run {
-            groupValues[1].trim().unescapeXml()
-        }
-        val originImageUrl = PATTERN_ORIGIN_IMAGE_URL.find(res.originImageUrl)?.run {
-            groupValues[1].unescapeXml() + "fullimg.php" + groupValues[2].unescapeXml()
-        }
-        if (!imageUrl.isNullOrEmpty()) {
-            return Result(imageUrl, skipHathKey, originImageUrl)
-        } else {
-            throw ParseException("Parse image url and skip hath key error")
+        return try {
+            var m: Matcher
+            val jo = JSONObject(body)
+            if (jo.has("error")) {
+                throw ParseException(jo.getString("error"), body)
+            }
+            val i3 = jo.getString("i3")
+            m = PATTERN_IMAGE_URL.matcher(i3)
+            val imageUrl = if (m.find()) {
+                StringUtils.unescapeXml(StringUtils.trim(m.group(1)))
+            } else {
+                null
+            }
+            val i6 = jo.getString("i6")
+            m = PATTERN_SKIP_HATH_KEY.matcher(i6)
+            val skipHathKey = if (m.find()) {
+                StringUtils.unescapeXml(StringUtils.trim(m.group(1)))
+            } else {
+                null
+            }
+            val i7 = jo.getString("i7")
+            m = PATTERN_ORIGIN_IMAGE_URL.matcher(i7)
+            val originImageUrl = if (m.find()) {
+                StringUtils.unescapeXml(m.group(1)) + "fullimg.php" +
+                    StringUtils.unescapeXml(m.group(2))
+            } else {
+                null
+            }
+            if (!imageUrl.isNullOrEmpty()) {
+                Result(imageUrl, skipHathKey, originImageUrl)
+            } else {
+                throw ParseException("Parse image url and skip hath key error", body)
+            }
+        } catch (e: JSONException) {
+            throw ParseException("Can't parse json", body, e)
         }
     }
 
-    @Serializable
-    private data class JsonResult(
-        @SerialName("i3")
-        val imageUrl: String,
-        @SerialName("i6")
-        val skipHathKey: String,
-        @SerialName("i7")
-        val originImageUrl: String,
-    )
-
     class Result(val imageUrl: String, val skipHathKey: String?, val originImageUrl: String?)
 }

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

@@ -16,7 +16,7 @@
 package com.hippo.ehviewer.client.parser
 
 import com.hippo.ehviewer.client.exception.ParseException
-import com.hippo.ehviewer.util.unescapeXml
+import com.hippo.ehviewer.yorozuya.StringUtils
 import java.util.regex.Pattern
 
 object GalleryPageParser {
@@ -31,19 +31,20 @@ object GalleryPageParser {
     fun parse(body: String): Result {
         var m = PATTERN_IMAGE_URL.matcher(body)
         val imageUrl = if (m.find()) {
-            m.group(1)!!.trim().unescapeXml()
+            StringUtils.unescapeXml(StringUtils.trim(m.group(1)))
         } else {
             null
         }
         m = PATTERN_SKIP_HATH_KEY.matcher(body)
         val skipHathKey = if (m.find()) {
-            m.group(1)!!.trim().unescapeXml()
+            StringUtils.unescapeXml(StringUtils.trim(m.group(1)))
         } else {
             null
         }
         m = PATTERN_ORIGIN_IMAGE_URL.matcher(body)
         val originImageUrl = if (m.find()) {
-            m.group(1)!!.unescapeXml() + "fullimg.php" + m.group(2)!!.unescapeXml()
+            StringUtils.unescapeXml(m.group(1)) + "fullimg.php" +
+                StringUtils.unescapeXml(m.group(2))
         } else {
             null
         }
@@ -56,7 +57,7 @@ object GalleryPageParser {
         return if (!imageUrl.isNullOrEmpty() && !showKey.isNullOrEmpty()) {
             Result(imageUrl, skipHathKey, originImageUrl, showKey)
         } else {
-            throw ParseException("Parse image url and show error")
+            throw ParseException("Parse image url and show error", body)
         }
     }
 

app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageUrlParser.kt

@@ -16,8 +16,7 @@
 package com.hippo.ehviewer.client.parser
 
 import com.hippo.ehviewer.client.EhUrl
-import com.hippo.ehviewer.util.toIntOrDefault
-import com.hippo.ehviewer.util.toLongOrDefault
+import com.hippo.ehviewer.yorozuya.NumberUtils
 import java.util.regex.Pattern
 
 /**
@@ -25,7 +24,7 @@ import java.util.regex.Pattern
  */
 object GalleryPageUrlParser {
     private val URL_STRICT_PATTERN = Pattern.compile(
-        "https?://(?:${EhUrl.DOMAIN_EX}|${EhUrl.DOMAIN_E}(?:/lofi)?)/s/([0-9a-f]{10})/(\\d+)-(\\d+)",
+        "https?://(?:" + EhUrl.DOMAIN_EX + "|" + EhUrl.DOMAIN_E + "|" + EhUrl.DOMAIN_LOFI + ")/s/([0-9a-f]{10})/(\\d+)-(\\d+)",
     )
     private val URL_PATTERN = Pattern.compile("([0-9a-f]{10})/(\\d+)-(\\d+)")
 
@@ -34,9 +33,9 @@ object GalleryPageUrlParser {
         val pattern = if (strict) URL_STRICT_PATTERN else URL_PATTERN
         val m = pattern.matcher(url)
         return if (m.find()) {
-            val gid = m.group(2)!!.toLongOrDefault(-1L)
+            val gid = NumberUtils.parseLongSafely(m.group(2), -1L)
             val pToken = m.group(1)!!
-            val page = m.group(3)!!.toIntOrDefault(0) - 1
+            val page = NumberUtils.parseIntSafely(m.group(3), 0) - 1
             if (gid < 0 || page < 0) {
                 null
             } else {

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

@@ -16,10 +16,8 @@
 package com.hippo.ehviewer.client.parser
 
 import com.hippo.ehviewer.client.exception.EhException
-import com.hippo.ehviewer.client.parseAs
 import com.hippo.ehviewer.util.ExceptionUtils
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import org.json.JSONObject
 
 object GalleryTokenApiParser {
     /**
@@ -33,17 +31,12 @@ object GalleryTokenApiParser {
      * }
      */
     fun parse(body: String): String {
+        val jo = JSONObject(body).getJSONArray("tokenlist").getJSONObject(0)
         return runCatching {
-            body.parseAs<Result>().tokenList[0].token
+            jo.getString("token")
         }.getOrElse {
             ExceptionUtils.throwIfFatal(it)
-            throw EhException(body.parseAs<Error>().error)
+            throw EhException(jo.getString("error"))
         }
     }
-
-    @Serializable
-    data class Result(@SerialName("tokenlist") val tokenList: List<Item>)
-
-    @Serializable
-    data class Item(val gid: Long, val token: String)
 }

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

@@ -1,20 +1,31 @@
 package com.hippo.ehviewer.client.parser
 
-import android.os.Parcelable
-import com.hippo.ehviewer.client.exception.InsufficientFundsException
 import com.hippo.ehviewer.client.exception.ParseException
-import kotlinx.parcelize.Parcelize
-import java.nio.ByteBuffer
+import org.jsoup.Jsoup
 
 object HomeParser {
-    private val PATTERN_FUNDS = Regex("Available: ([\\d,]+) Credits.*Available: ([\\d,]+) kGP", RegexOption.DOT_MATCHES_ALL)
-    private const val INSUFFICIENT_FUNDS = "Insufficient funds."
+    private val PATTERN_FUNDS =
+        Regex("Available: ([\\d,]+) Credits.*Available: ([\\d,]+) kGP", RegexOption.DOT_MATCHES_ALL)
+    private const val RESET_SUCCEED = "Image limit was successfully reset."
 
-    fun parse(body: ByteBuffer) = parseLimit(body)
+    fun parse(body: String): Limits {
+        Jsoup.parse(body).selectFirst("div.homebox")?.let {
+            val es = it.select("p > strong")
+            if (es.size == 3) {
+                val current = ParserUtils.parseInt(es[0].text(), 0)
+                val maximum = ParserUtils.parseInt(es[1].text(), 0)
+                val resetCost = ParserUtils.parseInt(es[2].text(), 0)
+                return Limits(current, maximum, resetCost)
+            }
+        }
+        throw ParseException("Parse image limits error", body)
+    }
 
-    fun parseResetLimits(body: String) {
-        if (body.contains(INSUFFICIENT_FUNDS)) {
-            throw InsufficientFundsException()
+    fun parseResetLimits(body: String): Limits? {
+        return if (body.contains(RESET_SUCCEED)) {
+            null
+        } else {
+            parse(body)
         }
     }
 
@@ -24,15 +35,10 @@ object HomeParser {
             val fundsGP = ParserUtils.parseInt(get(2), 0) * 1000
             return Funds(fundsGP, fundsC)
         }
-        throw ParseException("Parse funds error")
+        throw ParseException("Parse funds error", body)
     }
 
-    @Parcelize
-    data class Funds(val fundsGP: Int, val fundsC: Int) : Parcelable
+    data class Limits(val current: Int = 0, val maximum: Int, val resetCost: Int = 0)
+    data class Funds(val fundsGP: Int, val fundsC: Int)
     class Result(val limits: Limits, val funds: Funds)
 }
-
-@Parcelize
-data class Limits(val current: Int, val maximum: Int, val resetCost: Int) : Parcelable
-
-private external fun parseLimit(body: ByteBuffer, limit: Int = body.limit()): Limits

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

@@ -15,9 +15,8 @@
  */
 package com.hippo.ehviewer.client.parser
 
-import com.hippo.ehviewer.util.toIntOrDefault
-import com.hippo.ehviewer.util.toLongOrDefault
-import com.hippo.ehviewer.util.unescapeXml
+import com.hippo.ehviewer.yorozuya.NumberUtils
+import com.hippo.ehviewer.yorozuya.StringUtils
 import java.time.Instant
 import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
@@ -33,14 +32,14 @@ object ParserUtils {
     }
 
     fun trim(str: String?): String {
-        return str?.unescapeXml()?.trim() ?: ""
+        return str?.let { StringUtils.unescapeXml(it).trim() } ?: ""
     }
 
     fun parseInt(str: String?, defValue: Int): Int {
-        return trim(str).replace(",", "").toIntOrDefault(defValue)
+        return NumberUtils.parseIntSafely(trim(str).replace(",", ""), defValue)
     }
 
     fun parseLong(str: String?, defValue: Long): Long {
-        return trim(str).replace(",", "").toLongOrDefault(defValue)
+        return NumberUtils.parseLongSafely(trim(str).replace(",", ""), defValue)
     }
 }

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

@@ -46,7 +46,7 @@ object ProfileParser {
             Result(displayName, avatar)
         }.getOrElse {
             ExceptionUtils.throwIfFatal(it)
-            throw ParseException("Parse forums error")
+            throw ParseException("Parse forums error", body)
         }
     }
 

app/src/main/java/com/hippo/ehviewer/client/parser/RateGalleryParser.kt

@@ -0,0 +1,35 @@
+/*
+ * 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.parser
+
+import com.hippo.ehviewer.client.exception.ParseException
+import org.json.JSONException
+import org.json.JSONObject
+
+object RateGalleryParser {
+    fun parse(body: String): Result {
+        return try {
+            val jsonObject = JSONObject(body)
+            val rating = jsonObject.getDouble("rating_avg").toFloat()
+            val ratingCount = jsonObject.getInt("rating_cnt")
+            Result(rating, ratingCount)
+        } catch (e: JSONException) {
+            throw ParseException("Can't parse rate gallery", body, e)
+        }
+    }
+
+    class Result(val rating: Float, val ratingCount: Int)
+}

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

@@ -35,7 +35,7 @@ object SignInParser {
             if (m.find()) {
                 throw EhException(m.group(1) ?: m.group(2))
             } else {
-                throw ParseException("Can't parse sign in")
+                throw ParseException("Can't parse sign in", body)
             }
         }
     }

app/src/main/java/com/hippo/ehviewer/client/parser/TorrentParser.kt

@@ -1,26 +1,56 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.hippo.ehviewer.client.parser
 
-import com.hippo.ehviewer.client.exception.ParseException
-import java.nio.ByteBuffer
+import org.jsoup.Jsoup
+import java.util.regex.Pattern
 
 object TorrentParser {
-    fun parse(body: ByteBuffer) = runCatching {
-        parseTorrent(body)
-    }.getOrElse { throw ParseException("Can't parse torrent list", it) }
+    private val PATTERN_TORRENT =
+        Pattern.compile("</span> ([0-9-]+) [0-9:]+</td>[\\s\\S]+</span> ([0-9.]+ [KMGT]B)</td>[\\s\\S]+</span> ([0-9]+)</td>[\\s\\S]+</span> ([0-9]+)</td>[\\s\\S]+</span> ([0-9]+)</td>[\\s\\S]+</span>([^<]+)</td>[\\s\\S]+onclick=\"document.location='([^\"]+)'[^<]+>([^<]+)</a>")
+
+    fun parse(body: String): List<Result> {
+        val torrentList = ArrayList<Result>()
+        val d = Jsoup.parse(body)
+        val es = d.select("form>div>table")
+        for (e in es) {
+            val m = PATTERN_TORRENT.matcher(e.html())
+            if (m.find()) {
+                val posted = m.group(1)!!
+                val size = m.group(2)!!
+                val seeds = m.group(3)!!.toInt()
+                val peers = m.group(4)!!.toInt()
+                val downloads = m.group(5)!!.toInt()
+                val url = ParserUtils.trim(m.group(7))
+                val name = ParserUtils.trim(m.group(8))
+                torrentList.add(Result(posted, size, seeds, peers, downloads, url, name))
+            }
+        }
+        return torrentList
+    }
+
+    class Result(
+        private val posted: String,
+        private val size: String,
+        private val seeds: Int,
+        private val peers: Int,
+        private val downloads: Int,
+        val url: String,
+        val name: String,
+    ) {
+        fun format() = "[$posted] $name [$size] [↑$seeds ↓$peers ✓$downloads]"
+    }
 }
-
-class Torrent(
-    val posted: String,
-    val size: String,
-    val seeds: Int,
-    val peers: Int,
-    val downloads: Int,
-    val url: String,
-    val name: String,
-)
-
-fun Torrent.format() = "[$posted] $name [$size] [↑$seeds ↓$peers ✓$downloads]"
-
-typealias TorrentResult = ArrayList<Torrent>
-
-private external fun parseTorrent(body: ByteBuffer, size: Int = body.limit()): ArrayList<Torrent>

app/src/main/java/com/hippo/ehviewer/client/parser/VoteCommentParser.kt

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2016 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.hippo.ehviewer.client.parser
+
+import org.json.JSONObject
+
+object VoteCommentParser {
+    // {"comment_id":1253922,"comment_score":-19,"comment_vote":0}
+    fun parse(body: String, expectVote: Int): Result {
+        val jo = JSONObject(body)
+        val id = jo.getLong("comment_id")
+        val score = jo.getInt("comment_score")
+        val vote = jo.getInt("comment_vote")
+        return Result(id, score, vote, expectVote)
+    }
+
+    class Result(val id: Long, val score: Int, val vote: Int, val expectVote: Int)
+}

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

@@ -17,11 +17,11 @@
  */
 package com.hippo.ehviewer.client.parser
 
-import com.hippo.ehviewer.client.parseAs
+import org.json.JSONObject
 
 object VoteTagParser {
     // {"error":"The tag \"neko\" is not allowed. Use character:neko or artist:neko"}
-    fun parse(body: String): String? {
-        return runCatching { body.parseAs<Error>().error }.getOrNull()
+    fun parse(body: String): String {
+        return JSONObject(body).optString("error")
     }
 }

app/src/main/java/com/hippo/ehviewer/coil/CronetHttpUriFetcher.kt

@@ -1,68 +0,0 @@
-@file:Suppress("BlockingMethodInNonBlockingContext")
-@file:RequiresExtension(extension = Build.VERSION_CODES.S, version = 7)
-
-package com.hippo.ehviewer.coil
-
-import android.net.Uri
-import android.os.Build
-import android.webkit.MimeTypeMap
-import androidx.annotation.RequiresExtension
-import coil.ComponentRegistry
-import coil.ImageLoader
-import coil.decode.DataSource
-import coil.decode.ImageSource
-import coil.fetch.FetchResult
-import coil.fetch.Fetcher
-import coil.fetch.SourceResult
-import coil.request.Options
-import com.hippo.ehviewer.cronet.copyToChannel
-import com.hippo.ehviewer.cronet.cronetRequest
-import com.hippo.ehviewer.cronet.execute
-import java.io.RandomAccessFile
-
-/**
- * A HttpUriFetcher impl use Cronet for jvmheapless IO
- * cacheHeader is never respected | recorded since thumb is immutable
- */
-class CronetHttpUriFetcher(private val data: String, private val options: Options, private val imageLoader: ImageLoader) : Fetcher {
-    override suspend fun fetch(): FetchResult {
-        val diskCacheKey = options.diskCacheKey ?: data
-        val diskCache = requireNotNull(imageLoader.diskCache)
-        val snapshot = diskCache.openSnapshot(diskCacheKey) ?: run {
-            val success = cronetRequest(data) {
-                setCacheDisabled(true)
-            }.execute {
-                diskCache.suspendEdit(diskCacheKey) {
-                    RandomAccessFile(data.toFile(), "rw").use {
-                        copyToChannel(it.channel)
-                    }
-                }
-            }
-            check(success)
-            // diskcache snapshot MUST exist here
-            requireNotNull(diskCache.openSnapshot(diskCacheKey))
-        }
-        return SourceResult(
-            source = ImageSource(snapshot.data, diskCache.fileSystem, diskCacheKey, snapshot),
-            mimeType = getMimeType(data),
-            dataSource = DataSource.DISK,
-        )
-    }
-}
-
-fun ComponentRegistry.Builder.installCronetHttpUriFetcher() = add { data: Uri, options, loader ->
-    if (data.scheme != "http" && data.scheme != "https") return@add null
-    CronetHttpUriFetcher(data.toString(), options, loader)
-}
-
-private fun getMimeType(url: String) = MimeTypeMap.getSingleton().getMimeTypeFromUrl(url)
-
-private fun MimeTypeMap.getMimeTypeFromUrl(url: String?): String? {
-    if (url.isNullOrBlank()) return null
-    val extension = url
-        .substringBeforeLast('#') // Strip the fragment.
-        .substringBeforeLast('?') // Strip the query.
-        .substringAfterLast('/') // Get the last path segment.
-        .substringAfterLast('.', missingDelimiterValue = "") // Get the file extension.
-    return getMimeTypeFromExtension(extension)
-}

app/src/main/java/com/hippo/ehviewer/coil/DiskCacheScoped.kt

@@ -2,20 +2,7 @@ package com.hippo.ehviewer.coil
 
 import coil.disk.DiskCache
 
-inline fun DiskCache.edit(key: String, crossinline block: DiskCache.Editor.() -> Unit): Boolean {
-    val editor = openEditor(key) ?: return false
-    editor.runCatching {
-        block(this)
-    }.onFailure {
-        editor.abort()
-        throw it
-    }.onSuccess {
-        editor.commit()
-    }
-    return true
-}
-
-suspend inline fun DiskCache.suspendEdit(key: String, crossinline block: suspend DiskCache.Editor.() -> Unit): Boolean {
+suspend inline fun DiskCache.edit(key: String, crossinline block: suspend DiskCache.Editor.() -> Unit): Boolean {
     val editor = openEditor(key) ?: return false
     editor.runCatching {
         block(this)

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

@@ -1,9 +1,11 @@
 package com.hippo.ehviewer.coil
 
+import android.content.Context
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import coil.decode.DecodeResult
 import coil.decode.Decoder
+import coil.disk.DiskCache
 import coil.request.CachePolicy
 import coil.request.ImageRequest
 import coil.size.Size
@@ -34,3 +36,8 @@ fun ImageRequest.Builder.justDownload() = apply {
     memoryCachePolicy(CachePolicy.DISABLED)
     decoderFactory { _, _, _ -> stubFactory }
 }
+
+inline fun Context.imageRequest(preview: GalleryPreview, builder: ImageRequest.Builder.() -> Unit = {}) = ImageRequest.Builder(this).ehPreview(preview).apply(builder).build()
+inline fun Context.imageRequest(info: GalleryInfo, builder: ImageRequest.Builder.() -> Unit = {}) = ImageRequest.Builder(this).ehUrl(info).apply(builder).build()
+inline fun Context.imageRequest(builder: ImageRequest.Builder.() -> Unit = {}) = ImageRequest.Builder(this).apply(builder).build()
+inline fun diskCache(builder: DiskCache.Builder.() -> Unit) = DiskCache.Builder().apply(builder).build()

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

@@ -1,81 +1,79 @@
 package com.hippo.ehviewer.coil
 
 import coil.intercept.Interceptor
+import coil.request.ImageRequest
 import coil.request.ImageResult
-import com.hippo.ehviewer.Settings
-import kotlinx.coroutines.CancellableContinuation
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
+import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
 
 object MergeInterceptor : Interceptor {
-    private val pendingContinuationMap: HashMap<String, MutableList<CancellableContinuation<Unit>>> = hashMapOf()
-    private val pendingContinuationMapLock = Any()
+    private val pendingContinuationMap: HashMap<String, MutableList<Continuation<Unit>>> = hashMapOf()
+    private val pendingContinuationMapLock = Mutex()
     private val notifyScope = CoroutineScope(Dispatchers.IO + SupervisorJob())
-    private val EMPTY_LIST = mutableListOf<CancellableContinuation<Unit>>()
-
-    private fun triggerSuccessor(key: String) {
-        notifyScope.launch {
-            synchronized(pendingContinuationMapLock) {
-                // Wake up a pending continuation to continue executing task
-                val successor = pendingContinuationMap[key]?.removeFirstOrNull()?.apply { resume(Unit) { triggerSuccessor(key) } }
-                // If no successor, delete this entry from hashmap
-                successor ?: pendingContinuationMap.remove(key)
-            }
-        }
-    }
-
-    private fun triggerFailure(key: String, e: Throwable) {
-        notifyScope.launch {
-            synchronized(pendingContinuationMapLock) {
-                pendingContinuationMap.remove(key)?.forEach { it.resumeWithException(e) }
-            }
-        }
-    }
-
+    private val EMPTY_LIST = mutableListOf<Continuation<Unit>>()
     override suspend fun intercept(chain: Interceptor.Chain): ImageResult {
-        val req = chain.request
-        val key = req.memoryCacheKey?.key?.takeIf { it.startsWith("m/") || Settings.preloadThumbAggressively } ?: return withContext(req.interceptorDispatcher) { chain.proceed(req) }
+        val originRequest = chain.request
+        val originListener = originRequest.listener
+        val key = originRequest.data as String
+        val newRequest = ImageRequest.Builder(originRequest).listener(
+            { originListener?.onStart(it) },
+            { originListener?.onCancel(it) },
+            { request, result ->
+                originListener?.onError(request, result)
+                // Wake all pending continuations since this request is to be failed
+                notifyScope.launch {
+                    pendingContinuationMapLock.withLock {
+                        pendingContinuationMap.remove(key)?.forEach { it.resume(Unit) }
+                    }
+                }
+            },
+            { request, result ->
+                originListener?.onSuccess(request, result)
+                // Wake all pending continuations shared with the same memory key since we have written it to memory cache
+                notifyScope.launch {
+                    pendingContinuationMapLock.withLock {
+                        pendingContinuationMap.remove(key)?.forEach { it.resume(Unit) }
+                    }
+                }
+            },
+        ).build()
 
-        suspendCancellableCoroutine { continuation ->
-            synchronized(pendingContinuationMapLock) {
-                val existPendingContinuations = pendingContinuationMap[key]
-                if (existPendingContinuations == null) {
-                    pendingContinuationMap[key] = EMPTY_LIST
-                    continuation.resume(Unit) {
-                        triggerSuccessor(key)
-                    }
-                } else {
-                    if (existPendingContinuations === EMPTY_LIST) pendingContinuationMap[key] = mutableListOf()
-                    pendingContinuationMap[key]!!.apply {
-                        add(continuation)
-                        continuation.invokeOnCancellation { remove(continuation) }
-                    }
+        pendingContinuationMapLock.lock()
+        val existPendingContinuations = pendingContinuationMap[key]
+        if (existPendingContinuations == null) {
+            pendingContinuationMap[key] = EMPTY_LIST
+            pendingContinuationMapLock.unlock()
+        } else {
+            if (existPendingContinuations === EMPTY_LIST) pendingContinuationMap[key] = mutableListOf()
+            pendingContinuationMap[key]!!.apply {
+                suspendCancellableCoroutine { continuation ->
+                    add(continuation)
+                    pendingContinuationMapLock.unlock()
+                    continuation.invokeOnCancellation { remove(continuation) }
                 }
             }
         }
 
         try {
-            return withContext(req.interceptorDispatcher) { chain.proceed(req) }.apply {
-                // Wake all pending continuations shared with the same memory key since we have written it to memory cache
-                notifyScope.launch {
-                    synchronized(pendingContinuationMapLock) {
-                        pendingContinuationMap.remove(key)?.forEach { it.resume(Unit) }
-                    }
+            return withContext(originRequest.interceptorDispatcher) { chain.proceed(newRequest) }
+        } catch (e: CancellationException) {
+            notifyScope.launch {
+                pendingContinuationMapLock.withLock {
+                    // Wake up a pending continuation to continue executing task
+                    val successor = pendingContinuationMap[key]?.removeFirstOrNull()?.apply { resume(Unit) }
+                    // If no successor, delete this entry from hashmap
+                    successor ?: pendingContinuationMap.remove(key)
                 }
             }
-        } catch (e: CancellationException) {
-            triggerSuccessor(key)
-            throw e
-        } catch (e: Throwable) {
-            // Wake all pending continuations since this request is to be failed
-            triggerFailure(key, e)
             throw e
         }
     }

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

@@ -1,124 +0,0 @@
-@file:RequiresExtension(extension = Build.VERSION_CODES.S, version = 7)
-
-package com.hippo.ehviewer.cronet
-
-import android.net.http.HttpEngine
-import android.net.http.HttpException
-import android.net.http.UrlRequest
-import android.net.http.UrlResponseInfo
-import android.os.Build
-import androidx.annotation.RequiresExtension
-import com.hippo.ehviewer.EhApplication
-import com.hippo.ehviewer.client.CHROME_ACCEPT
-import com.hippo.ehviewer.client.CHROME_ACCEPT_LANGUAGE
-import com.hippo.ehviewer.client.CHROME_USER_AGENT
-import com.hippo.ehviewer.client.EhCookieStore
-import eu.kanade.tachiyomi.util.system.logcat
-import io.ktor.utils.io.pool.DirectByteBufferPool
-import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.suspendCancellableCoroutine
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import okio.Path.Companion.toOkioPath
-import splitties.init.appCtx
-import java.nio.ByteBuffer
-import java.nio.channels.FileChannel
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-import kotlin.coroutines.Continuation
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
-
-private const val TAG = "CronetRequest"
-val pool = DirectByteBufferPool(32)
-
-val cronetHttpClient: HttpEngine = HttpEngine.Builder(appCtx).apply {
-    setEnableBrotli(true)
-    val cache = (appCtx.cacheDir.toOkioPath() / "http_cache").toFile().apply { mkdirs() }
-    setStoragePath(cache.absolutePath)
-    setEnableHttpCache(HttpEngine.Builder.HTTP_CACHE_DISK_NO_HTTP, 100 * 1024)
-    setUserAgent(CHROME_USER_AGENT)
-}.build()
-
-val cronetHttpClientExecutor = EhApplication.baseOkHttpClient.dispatcher.executorService
-
-class CronetRequest {
-    lateinit var consumer: (ByteBuffer) -> Unit
-    lateinit var onResponse: CronetRequest.(UrlResponseInfo) -> Unit
-    lateinit var request: UrlRequest
-    lateinit var onError: (Throwable) -> Unit
-    lateinit var readerCont: Continuation<Unit>
-    val callback = object : UrlRequest.Callback {
-        override fun onRedirectReceived(req: UrlRequest, info: UrlResponseInfo, url: String) {
-            logcat(tag = TAG) { "Redirected to $url" }
-            req.followRedirect()
-        }
-
-        override fun onResponseStarted(req: UrlRequest, info: UrlResponseInfo) {
-            onResponse(info)
-        }
-
-        override fun onReadCompleted(req: UrlRequest, info: UrlResponseInfo, data: ByteBuffer) {
-            data.flip()
-            consumer(data)
-        }
-
-        override fun onSucceeded(req: UrlRequest, info: UrlResponseInfo) {
-            readerCont.resume(Unit)
-        }
-
-        override fun onFailed(req: UrlRequest, info: UrlResponseInfo?, e: HttpException) {
-            onError(e)
-        }
-
-        override fun onCanceled(req: UrlRequest, info: UrlResponseInfo?) {
-            // No-op
-        }
-    }
-}
-
-inline fun cronetRequest(url: String, referer: String? = null, conf: UrlRequest.Builder.() -> Unit = {}) = CronetRequest().apply {
-    request = cronetHttpClient.newUrlRequestBuilder(url, cronetHttpClientExecutor, callback).apply {
-        addHeader("Cookie", EhCookieStore.getCookieHeader(url.toHttpUrl()))
-        addHeader("Accept", CHROME_ACCEPT)
-        addHeader("Accept-Language", CHROME_ACCEPT_LANGUAGE)
-        referer?.let { addHeader("Referer", it) }
-    }.apply(conf).build()
-}
-
-suspend inline fun CronetRequest.awaitBodyFully(crossinline callback: (ByteBuffer) -> Unit) {
-    val buffer = pool.borrow()
-    return try {
-        suspendCancellableCoroutine { cont ->
-            consumer = {
-                callback(it)
-                buffer.clear()
-                request.read(buffer)
-            }
-            onError = { readerCont.resumeWithException(it) }
-            readerCont = cont
-            request.read(buffer)
-        }
-    } finally {
-        pool.recycle(buffer)
-    }
-}
-
-suspend inline fun CronetRequest.copyToChannel(chan: FileChannel, crossinline listener: ((Int) -> Unit) = {}) = awaitBodyFully {
-    val bytes = chan.write(it)
-    listener(bytes)
-}
-
-suspend inline fun <R> CronetRequest.execute(crossinline callback: suspend CronetRequest.(UrlResponseInfo) -> R): R {
-    contract {
-        callsInPlace(callback, InvocationKind.EXACTLY_ONCE)
-    }
-    return coroutineScope {
-        suspendCancellableCoroutine { cont ->
-            onResponse = { launch { cont.resume(callback(it)) } }
-            cont.invokeOnCancellation { request.cancel() }
-            onError = { cont.resumeWithException(it) }
-            request.start()
-        }
-    }
-}

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

@@ -2,15 +2,10 @@ package com.hippo.ehviewer.dailycheck
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.text.style.URLSpan
+import android.text.Html
 import androidx.core.app.NotificationChannelCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
-import androidx.core.app.PendingIntentCompat
-import androidx.core.text.getSpans
-import androidx.core.text.parseAsHtml
 import androidx.work.Constraints
 import androidx.work.CoroutineWorker
 import androidx.work.ExistingPeriodicWorkPolicy
@@ -19,12 +14,12 @@ import androidx.work.PeriodicWorkRequest
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.WorkerParameters
+import com.hippo.ehviewer.EhApplication
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhCookieStore
 import com.hippo.ehviewer.client.EhEngine
 import eu.kanade.tachiyomi.util.lang.withIOContext
-import splitties.init.appCtx
 import java.time.Duration
 import java.time.Instant
 import java.time.LocalDateTime
@@ -46,15 +41,15 @@ class DailyCheckWork(context: Context, workerParams: WorkerParameters) :
 }
 
 val schedHour
-    get() = Settings.requestNewsTimerHour.takeUnless { it == -1 } ?: 0
+    get() = Settings.getInt(Settings.KEY_REQUEST_NEWS_TIMER_HOUR, -1).takeUnless { it == -1 }
 
 val schedMinute
-    get() = Settings.requestNewsTimerMinute.takeUnless { it == -1 } ?: 0
+    get() = Settings.getInt(Settings.KEY_REQUEST_NEWS_TIMER_MINUTE, -1).takeUnless { it == -1 }
 
 private val whenToWork
     get() = LocalDateTime.now()
-        .run { withHour(schedHour) }
-        .run { withMinute(schedMinute) }
+        .run { withHour(schedHour ?: hour) }
+        .run { withMinute(schedMinute ?: minute) }
 
 private val initialDelay
     get() = Duration.between(LocalDateTime.now(), whenToWork)
@@ -103,26 +98,20 @@ fun showEventNotification(html: String) {
     if (Settings.hideHvEvents && html.contains("You have encountered a monster!")) {
         return
     }
-    val notificationManager = NotificationManagerCompat.from(appCtx)
+    val context = EhApplication.application
+    val notificationManager = NotificationManagerCompat.from(context)
     val chan = NotificationChannelCompat
         .Builder(CHANNEL_ID, NotificationManagerCompat.IMPORTANCE_LOW)
         .setName(CHANNEL_ID)
         .build()
     notificationManager.createNotificationChannel(chan)
-    val text = html.parseAsHtml()
-    val msg = NotificationCompat.Builder(appCtx, CHANNEL_ID)
-        .setAutoCancel(true)
+    val msg = NotificationCompat.Builder(context, CHANNEL_ID)
         .setSmallIcon(R.drawable.ic_launcher_monochrome)
-        .setContentText(text)
+        .setContentText(Html.fromHtml(html, Html.FROM_HTML_MODE_LEGACY))
         .setStyle(NotificationCompat.BigTextStyle())
-    val urls = text.getSpans<URLSpan>(0, text.length)
-    if (urls.isNotEmpty()) {
-        val intent = Intent(Intent.ACTION_VIEW, Uri.parse(urls.first().url))
-        val pi = PendingIntentCompat.getActivity(appCtx, 0, intent, 0, false)
-        msg.setContentIntent(pi)
-    }
+        .build()
     runCatching {
-        notificationManager.notify(1, msg.build())
+        notificationManager.notify(1, msg)
     }.onFailure {
         it.printStackTrace()
     }

app/src/main/java/com/hippo/ehviewer/dao/BasicDao.kt

@@ -0,0 +1,6 @@
+package com.hippo.ehviewer.dao
+
+interface BasicDao<T> {
+    fun list(): List<T>
+    fun insert(t: T): Long
+}

app/src/main/java/com/hippo/ehviewer/dao/BookmarkInfo.kt

@@ -0,0 +1,16 @@
+package com.hippo.ehviewer.dao
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import com.hippo.ehviewer.client.data.BaseGalleryInfo
+
+@Entity(tableName = "BOOKMARKS")
+class BookmarkInfo : BaseGalleryInfo() {
+    @JvmField
+    @ColumnInfo(name = "PAGE")
+    var page = 0
+
+    @JvmField
+    @ColumnInfo(name = "TIME")
+    var time: Long = 0
+}

app/src/main/java/com/hippo/ehviewer/dao/BookmarksDao.kt

@@ -0,0 +1,18 @@
+package com.hippo.ehviewer.dao
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.Query
+
+@Dao
+interface BookmarksDao : BasicDao<BookmarkInfo> {
+    @Insert
+    override fun insert(t: BookmarkInfo): Long
+
+    @Delete
+    fun delete(bookmark: BookmarkInfo)
+
+    @Query("SELECT * FROM BOOKMARKS ORDER BY TIME DESC")
+    override fun list(): List<BookmarkInfo>
+}