Release 1.8.9.0-gms

Reland after #1322 resolved

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -18,7 +18,9 @@ body:
       label: 复现步骤 / Step to reproduce
       description: |
         请从全新安装应用开始，在此处写下复现的方式。请尽量附带录屏
+        如果不能稳定复现，请在下方上传应用日志
         Describe how to reproduce here with fresh installation, with screen recording if possible.
+        If you can't reproduce it consistently, please upload app logs below
       placeholder: |
         0. 重新安装应用 / Fresh install
         1.
@@ -55,6 +57,15 @@ body:
     validations:
       required: true
 
+  - type: textarea
+    id: log
+    attributes:
+      label: 应用日志 / App logs
+      description: 您可以通过设置-高级-导出日志来获得日志文件 / You can get logs file in Settings - Advanced - Dump logcat
+      placeholder: 06-15 17:44:53.704 23382 23382 E ...
+    validations:
+      required: false
+
   - type: textarea
     id: more
     attributes:
@@ -81,8 +92,8 @@ body:
     id: ci
     attributes:
       label: EhViewer CI 版本 / EhViewer CI Version
-      description: 直接将对应 GitHub Action CI 下载页面网址填入即可 / Simply drop GitHub Action CI download page url here
-      placeholder: https://github.com/Ehviewer-Overhauled/Ehviewer/actions/runs/XXXXXXXXXX
+      description: 位于设置 - 关于中的版本号后 / Next to the version code in Settings - About
+      placeholder: 26f05a0
     validations:
       required: true
 

.github/ISSUE_TEMPLATE/feature-request.yml

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

.github/workflows/ci.yml

@@ -17,15 +17,29 @@ jobs:
         with:
           submodules: 'recursive'
 
-      - name: Setup Java 19
+      - name: Setup Java 17
         uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 19
+          java-version: 17
 
       - name: Install NDK
         run: |
-          echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;25.2.9519653" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
+          echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;26.0.10404224" --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
+
+      - name: Ktlint Check
+        run: ./gradlew ktlintCheck
 
       - name: Gradle Build
         uses: gradle/gradle-build-action@v2

.github/workflows/pull_request.yml

@@ -1,6 +1,6 @@
 name: Pull Request Check
 
-on: [pull_request]
+on: [ pull_request ]
 
 jobs:
   linux:
@@ -12,15 +12,29 @@ jobs:
         with:
           submodules: 'recursive'
 
-      - name: Setup Java 19
+      - name: Setup Java 17
         uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 19
+          java-version: 17
 
       - name: Install NDK
         run: |
-          echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;25.2.9519653" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
+          echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;26.0.10404224" --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
+
+      - name: Ktlint Check
+        run: ./gradlew ktlintCheck
 
       - name: Gradle Build
         uses: gradle/gradle-build-action@v2

.github/workflows/releases.yml

@@ -15,15 +15,18 @@ jobs:
         with:
           submodules: 'recursive'
 
-      - name: Setup Java 19
+      - name: Setup Java 17
         uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 19
+          java-version: 17
 
       - name: Install NDK
         run: |
-          echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;25.2.9519653" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
+          echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;26.0.10404224" --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
 
       - name: Gradle Build
         uses: gradle/gradle-build-action@v2
@@ -42,7 +45,6 @@ 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
@@ -50,24 +52,3 @@ 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

@@ -25,6 +25,9 @@
   <a href="https://www.codefactor.io/repository/github/Ehviewer-Overhauled/ehviewer">
     <img src="https://www.codefactor.io/repository/github/Ehviewer-Overhauled/ehviewer/badge" alt="CodeFactor">
   </a>
+  <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/releases">
+    <img src="https://img.shields.io/github/downloads/Ehviewer-Overhauled/EhViewer/total.svg" alt="Downloads">
+  </a>
   <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/releases">
     <img src="https://img.shields.io/github/v/release/Ehviewer-Overhauled/ehviewer?include_prereleases" alt="Release">
   </a>
@@ -57,12 +60,12 @@
   </h3>
 </div>
 
-
 # Description
 
 EhViewer fork dedicated to lightweight and high-performance
 
-with Material Design 3 and Dynamic Color Support
+with [Material Design 3](https://m3.material.io/)
+and [Dynamic Color](https://m3.material.io/styles/color/dynamic-color/overview) Support
 
 # Download
 
@@ -77,18 +80,19 @@ with Material Design 3 and Dynamic Color Support
 
 Here is the libraries
 
+- [Arrow](https://arrow-kt.io/)
 - [AOSP & AndroidX](http://source.android.com/)
-- [Coil](https://coil-kt.github.io/coil/)
+- [Kotlin & KotlinX](https://kotlinlang.org/)
 - [FullDraggableDrawer](https://github.com/PureWriter/FullDraggableDrawer)
-- [GnuTLS](https://gnutls.org/)
-- [material-components-android](https://github.com/material-components/material-components-android)
+- [MCA](https://github.com/material-components/material-components-android)
 - [material-design-icons](https://github.com/google/material-design-icons)
-- [jsoup](https://github.com/jhy/jsoup)
-- [okhttp](https://github.com/square/okhttp)
+- [Okhttp](https://square.github.io/okhttp/)
 - [RikkaX](https://github.com/RikkaApps/RikkaX)
-- [libarchive](http://www.libarchive.org/)
-- [XZ Utils](https://tukaani.org/xz/)
+- [Libarchive](http://www.libarchive.org/)
+- [Coil](https://coil-kt.github.io/coil/)
+- [Jsoup](https://jsoup.org/)
 
+Specially thanks [Tachiyomi](https://tachiyomi.org/) for its reader implementation!
 
 # License
 

app/build.gradle.kts

@@ -1,27 +1,38 @@
-import java.io.ByteArrayOutputStream
+import com.mikepenz.aboutlibraries.plugin.DuplicateMode.MERGE
+import com.mikepenz.aboutlibraries.plugin.DuplicateRule.GROUP
 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 = 33
-    buildToolsVersion = "33.0.2"
-    ndkVersion = "25.2.9519653"
+    compileSdk = 34
+    buildToolsVersion = "34.0.0"
+    ndkVersion = "26.0.10404224"
 
     splits {
         abi {
             isEnable = true
             reset()
-            include("arm64-v8a", "x86_64", "armeabi-v7a", "x86")
-            isUniversalApk = true
+            if (isRelease) {
+                include("arm64-v8a", "x86_64", "armeabi-v7a", "x86")
+                isUniversalApk = true
+            } else {
+                include("arm64-v8a")
+            }
         }
     }
 
@@ -30,31 +41,30 @@ android {
         storePassword = "000000"
         keyAlias = "key0"
         keyPassword = "000000"
-
         enableV3Signing = true
         enableV4Signing = true
     }
 
-    val commitSha by lazy {
-        val stdout = ByteArrayOutputStream()
-        exec {
-            commandLine = "git rev-parse --short=7 HEAD".split(' ')
-            standardOutput = stdout
-        }
-        stdout.toString().trim()
-    }
+    val commitSha = providers.exec {
+        commandLine = "git rev-parse --short=7 HEAD".split(' ')
+    }.standardOutput.asText.get().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 = 33
-        versionCode = 180035
-        versionName = "1.8.7.0"
+        targetSdk = 34
+        versionCode = 180043
+        versionName = "1.8.9.0-gms"
         resourceConfigurations.addAll(
             listOf(
                 "zh",
@@ -68,11 +78,12 @@ android {
                 "de",
                 "th",
                 "tr",
-                "nb-rNO"
-            )
+                "nb-rNO",
+            ),
         )
         buildConfigField("String", "COMMIT_SHA", "\"$commitSha\"")
         buildConfigField("String", "BUILD_TIME", "\"$buildTime\"")
+        buildConfigField("String", "REPO_NAME", "\"$repoName\"")
     }
 
     externalNativeBuild {
@@ -82,27 +93,33 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_19
-        targetCompatibility = JavaVersion.VERSION_19
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = "19"
+        jvmTarget = "17"
         freeCompilerArgs = listOf(
             // https://kotlinlang.org/docs/compiler-reference.html#progressive
             "-progressive",
+            "-Xjvm-default=all",
+            "-Xlambdas=indy",
+            "-XXLanguage:+BreakContinueInInlineLambdas",
 
             "-opt-in=coil.annotation.ExperimentalCoilApi",
             "-opt-in=androidx.compose.foundation.layout.ExperimentalLayoutApi",
             "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api",
+            "-opt-in=androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi",
             "-opt-in=androidx.compose.ui.ExperimentalComposeUiApi",
             "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi",
             "-opt-in=androidx.compose.animation.ExperimentalAnimationApi",
+            "-opt-in=androidx.paging.ExperimentalPagingApi",
             "-opt-in=kotlin.contracts.ExperimentalContracts",
             "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
             "-opt-in=kotlinx.coroutines.FlowPreview",
-            "-opt-in=kotlinx.coroutines.InternalCoroutinesApi",
             "-opt-in=kotlinx.serialization.ExperimentalSerializationApi",
+            "-opt-in=splitties.experimental.ExperimentalSplittiesApi",
+            "-opt-in=splitties.preferences.DataStorePreferencesPreview",
         )
     }
 
@@ -114,8 +131,7 @@ android {
 
     packaging {
         resources {
-            excludes += "/META-INF/CHANGES"
-            excludes += "/META-INF/README.md"
+            excludes += "/META-INF/**"
             excludes += "/kotlin/**"
             excludes += "**.txt"
             excludes += "**.bin"
@@ -143,7 +159,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.3"
+        kotlinCompilerExtensionVersion = "1.5.1"
     }
 
     namespace = "com.hippo.ehviewer"
@@ -151,74 +167,138 @@ android {
 
 dependencies {
     // https://developer.android.com/jetpack/androidx/releases/activity
-    implementation("androidx.activity:activity-compose:1.6.1")
+    implementation("androidx.activity:activity-compose:1.8.0-alpha06")
     implementation("androidx.appcompat:appcompat:1.6.1")
     implementation("androidx.biometric:biometric-ktx:1.2.0-alpha05")
-    implementation("androidx.browser:browser:1.5.0")
-    implementation("androidx.collection:collection-ktx:1.3.0-alpha02")
+    implementation("androidx.browser:browser:1.6.0")
+    implementation("androidx.collection:collection-ktx:1.3.0-beta01")
 
     // https://developer.android.com/jetpack/androidx/releases/compose-material3
-    implementation(platform("androidx.compose:compose-bom:2023.01.00"))
+    // api(platform("androidx.compose:compose-bom:2023.05.00"))
+    api(platform("dev.chrisbanes.compose:compose-bom:2023.07.00-alpha02"))
     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.10.0-beta01")
+    implementation("androidx.core:core-ktx:1.12.0-rc01")
 
-    implementation("androidx.constraintlayout:constraintlayout:2.2.0-alpha07")
+    implementation("androidx.constraintlayout:constraintlayout-compose:1.1.0-alpha12")
     implementation("androidx.coordinatorlayout:coordinatorlayout:1.2.0")
+    implementation("androidx.fragment:fragment-ktx:1.7.0-alpha02")
     // https://developer.android.com/jetpack/androidx/releases/lifecycle
-    implementation("androidx.lifecycle:lifecycle-process:2.5.1")
+    implementation("androidx.lifecycle:lifecycle-process:2.6.1")
 
     // https://developer.android.com/jetpack/androidx/releases/navigation
-    val nav_version = "2.5.3"
+    val nav_version = "2.7.0"
     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
-    implementation("androidx.paging:paging-runtime-ktx:3.2.0-alpha04")
-    implementation("androidx.paging:paging-compose:1.0.0-alpha18")
-    implementation("androidx.preference:preference-ktx:1.2.0")
-    implementation("androidx.recyclerview:recyclerview:1.3.0-rc01")
+    val paging = "3.2.0"
+    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")
 
     // https://developer.android.com/jetpack/androidx/releases/room
-    val room_version = "2.5.0"
+    val room_version = "2.6.0-alpha03"
     ksp("androidx.room:room-compiler:$room_version")
     implementation("androidx.room:room-paging:$room_version")
 
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01")
-    implementation("androidx.work:work-runtime-ktx:2.8.0")
+    implementation("androidx.work:work-runtime-ktx:2.8.1")
     implementation("com.drakeet.drawer:drawer:1.0.3")
     implementation("com.github.chrisbanes:PhotoView:2.3.0") // Dead Dependency
     implementation("com.github.tachiyomiorg:DirectionalViewPager:1.0.0") // Dead Dependency
     // https://github.com/google/accompanist/releases
-    implementation("com.google.accompanist:accompanist-themeadapter-material3:0.28.0")
-    implementation("com.google.android.material:material:1.8.0")
+    val accompanist_version = "0.31.6-rc"
+    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-alpha01")
+
+    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")
 
     // https://square.github.io/okhttp/changelogs/changelog/
-    implementation("com.squareup.okhttp3:okhttp-bom:5.0.0-alpha.11")
+    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.3.0")
+    implementation("com.squareup.okio:okio-jvm:3.5.0")
+
+    implementation("com.mikepenz:aboutlibraries-core:10.8.3")
 
     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.2.0")
-    implementation("dev.rikka.rikkax.preference:simplemenu-preference:1.0.3")
-    implementation("dev.rikka.rikkax.material:material-preference:2.0.0")
+    implementation("dev.rikka.rikkax.layoutinflater:layoutinflater:1.3.0")
+
+    implementation(platform("io.arrow-kt:arrow-stack:1.2.0"))
+    implementation("io.arrow-kt:arrow-fx-coroutines")
+
     // https://coil-kt.github.io/coil/changelog/
-    implementation("io.coil-kt:coil-compose:2.2.2")
+    implementation(platform("io.coil-kt:coil-bom:2.4.0"))
+    implementation("io.coil-kt:coil-compose")
+    implementation("io.coil-kt:coil-gif")
 
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-cbor:1.5.0")
-    implementation("org.jsoup:jsoup:1.15.4")
+    val ktor = "2.3.3"
+    implementation("io.ktor:ktor-io-jvm:$ktor")
+    implementation("io.ktor:ktor-utils-jvm:$ktor")
+
+    implementation("org.chromium.net:cronet-api:113.5672.61")
+    implementation("com.google.android.gms:play-services-cronet:18.0.1")
+
+    val serialization = "1.5.1"
+    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.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")
-    exclude("org.jetbrains.kotlin", "kotlin-android-extensions-runtime")
-    exclude("org.jetbrains.kotlin", "kotlin-stdlib-jdk7")
-    exclude("org.jetbrains.kotlin", "kotlin-stdlib-jdk8")
+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(buildDir.resolve("rustJniLibs/android"))
+    }
 }

app/proguard-rules.pro

@@ -13,6 +13,11 @@
 
 -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 { *; }
+
 # Ktor logger
 -dontwarn org.slf4j.impl.StaticLoggerBinder
 

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

@@ -0,0 +1,88 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 1,
+    "identityHash": "c801ee62729ba20a203b150211234d5c",
+    "entities": [
+      {
+        "tableName": "OK_HTTP_3_COOKIE",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`NAME` TEXT, `VALUE` TEXT, `EXPIRES_AT` INTEGER NOT NULL, `DOMAIN` TEXT, `PATH` TEXT, `SECURE` INTEGER NOT NULL, `HTTP_ONLY` INTEGER NOT NULL, `PERSISTENT` INTEGER NOT NULL, `HOST_ONLY` INTEGER NOT NULL, `_id` INTEGER NOT NULL, PRIMARY KEY(`_id`))",
+        "fields": [
+          {
+            "fieldPath": "name",
+            "columnName": "NAME",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "VALUE",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "expiresAt",
+            "columnName": "EXPIRES_AT",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "domain",
+            "columnName": "DOMAIN",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "path",
+            "columnName": "PATH",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secure",
+            "columnName": "SECURE",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "httpOnly",
+            "columnName": "HTTP_ONLY",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "persistent",
+            "columnName": "PERSISTENT",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hostOnly",
+            "columnName": "HOST_ONLY",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'c801ee62729ba20a203b150211234d5c')"
+    ]
+  }
+}

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

@@ -0,0 +1,88 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 2,
+    "identityHash": "1b80cd29939b0f43934721f1289ba94d",
+    "entities": [
+      {
+        "tableName": "OK_HTTP_3_COOKIE",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`NAME` TEXT NOT NULL, `VALUE` TEXT NOT NULL, `EXPIRES_AT` INTEGER NOT NULL, `DOMAIN` TEXT NOT NULL, `PATH` TEXT NOT NULL, `SECURE` INTEGER NOT NULL, `HTTP_ONLY` INTEGER NOT NULL, `PERSISTENT` INTEGER NOT NULL, `HOST_ONLY` INTEGER NOT NULL, `_id` INTEGER, PRIMARY KEY(`_id`))",
+        "fields": [
+          {
+            "fieldPath": "name",
+            "columnName": "NAME",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "VALUE",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "expiresAt",
+            "columnName": "EXPIRES_AT",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "domain",
+            "columnName": "DOMAIN",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "path",
+            "columnName": "PATH",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "secure",
+            "columnName": "SECURE",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "httpOnly",
+            "columnName": "HTTP_ONLY",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "persistent",
+            "columnName": "PERSISTENT",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hostOnly",
+            "columnName": "HOST_ONLY",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '1b80cd29939b0f43934721f1289ba94d')"
+    ]
+  }
+}

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

@@ -0,0 +1,448 @@
+{
+  "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

@@ -0,0 +1,469 @@
+{
+  "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

@@ -0,0 +1,454 @@
+{
+  "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

@@ -0,0 +1,534 @@
+{
+  "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

@@ -0,0 +1,402 @@
+{
+  "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

@@ -0,0 +1,412 @@
+{
+  "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

@@ -0,0 +1,433 @@
+{
+  "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

@@ -0,0 +1,534 @@
+{
+  "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

@@ -0,0 +1,534 @@
+{
+  "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

@@ -0,0 +1,534 @@
+{
+  "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

@@ -0,0 +1,448 @@
+{
+  "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

@@ -0,0 +1,448 @@
+{
+  "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

@@ -0,0 +1,448 @@
+{
+  "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

@@ -0,0 +1,46 @@
+{
+  "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

@@ -0,0 +1,46 @@
+{
+  "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,7 +12,8 @@
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="28" />
@@ -22,22 +23,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/locales_config"
+        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.login.LoginActivity"
+            android:name=".ui.ConfigureActivity"
             android:exported="false"
             android:launchMode="singleTask"
-            android:windowSoftInputMode="adjustResize"/>
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.MainActivity"
             android:banner="@mipmap/ic_leanback_banner"
@@ -70,8 +70,6 @@
                 <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" />
@@ -126,22 +124,18 @@
                 <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:theme="@style/AppTheme" />
+            android:label="@string/settings" />
         <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 fc9fb0ea245259e346ab46c334f03b557fe63b6b Mon Sep 17 00:00:00 2001
+From 2bda36800a5424c44378bbc0cc8bb5d26a0f34fa Mon Sep 17 00:00:00 2001
 From: tarsin <yuanqingxiang233@163.com>
-Date: Tue, 22 Nov 2022 12:37:12 +0800
+Date: Sat, 22 Jul 2023 08:30:20 +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 01c73cd..b461e68 100644
+index 55cd358..52b57aa 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -592,7 +592,7 @@ check_symbol_exists(getopt_long getopt.h HAVE_GETOPT_LONG)
+@@ -962,7 +962,7 @@ check_symbol_exists(getopt_long getopt.h HAVE_GETOPT_LONG)
  # xzdec
  #############################################################################
  
--if(HAVE_GETOPT_LONG)
+-if(HAVE_GETOPT_LONG AND HAVE_DECODERS)
 +if(0)
      add_executable(xzdec
          src/common/sysdefs.h
          src/common/tuklib_common.h
-@@ -630,7 +630,7 @@ endif()
+@@ -1008,7 +1008,7 @@ endif()
  # xz
  #############################################################################
  
@@ -30,5 +30,5 @@ index 01c73cd..b461e68 100644
          src/common/mythread.h
          src/common/sysdefs.h
 -- 
-2.39.2
+2.41.0
 

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

@@ -1,38 +0,0 @@
-From 2a67861e6f06794f3671c4988bac12330d8422e3 Mon Sep 17 00:00:00 2001
-From: tarsin <yuanqingxiang233@163.com>
-Date: Fri, 27 May 2022 23:21:20 +0800
-Subject: [PATCH 1/2] Don't build shared lib
-
----
- libarchive/CMakeLists.txt | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt
-index ff7ade00..00c2e170 100644
---- a/libarchive/CMakeLists.txt
-+++ b/libarchive/CMakeLists.txt
-@@ -242,12 +242,6 @@ ELSEIF(ARCHIVE_ACL_SUNOS)
-   LIST(APPEND libarchive_SOURCES archive_disk_acl_sunos.c)
- ENDIF()
- 
--# Libarchive is a shared library
--ADD_LIBRARY(archive SHARED ${libarchive_SOURCES} ${include_HEADERS})
--TARGET_INCLUDE_DIRECTORIES(archive PUBLIC .)
--TARGET_LINK_LIBRARIES(archive ${ADDITIONAL_LIBS})
--SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION})
--
- # archive_static is a static library
- ADD_LIBRARY(archive_static STATIC ${libarchive_SOURCES} ${include_HEADERS})
- TARGET_LINK_LIBRARIES(archive_static ${ADDITIONAL_LIBS})
-@@ -260,7 +254,7 @@ ENDIF(NOT WIN32 OR CYGWIN)
- 
- IF(ENABLE_INSTALL)
-   # How to install the libraries
--  INSTALL(TARGETS archive archive_static
-+  INSTALL(TARGETS archive_static
-           RUNTIME DESTINATION bin
-           LIBRARY DESTINATION lib
-           ARCHIVE DESTINATION lib)
--- 
-2.39.2
-

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

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

@@ -1,9 +1,9 @@
 cmake_minimum_required(VERSION 3.14)
-project(ehviewer C)
+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=thin \
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Ofast -fvisibility=hidden -fvisibility-inlines-hidden -funroll-loops -flto \
            -mllvm -polly \
            -mllvm -polly-run-dce \
            -mllvm -polly-run-inliner \
@@ -20,10 +20,12 @@ 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.1
-        PATCH_COMMAND   git apply ${CMAKE_CURRENT_LIST_DIR}/0001-Don-t-build-other-binarys.patch || true
+        GIT_REPOSITORY https://git.tukaani.org/xz.git
+        GIT_TAG v5.4.3
+        PATCH_COMMAND git apply ${CMAKE_CURRENT_LIST_DIR}/0001-Don-t-build-other-binarys.patch || cd .
         )
 
 FetchContent_MakeAvailable(liblzma)
@@ -50,18 +52,24 @@ 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.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 || true
+        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 .
         )
 
 FetchContent_MakeAvailable(libarchive)
 include_directories(${libarchive_SOURCE_DIR}/libarchive)
 
 # Build and link our app's native lib
-add_library(${PROJECT_NAME} SHARED archive.c fdutils.c gifutils.c natsort/strnatcmp.c)
+add_library(${PROJECT_NAME} SHARED archive.c gifutils.c natsort/strnatcmp.c)
 target_link_libraries(${PROJECT_NAME} archive_static log)

app/src/main/cpp/archive.c

@@ -34,6 +34,7 @@
 
 #include "natsort/strnatcmp.h"
 #include "ehviewer.h"
+#include "spinlock.h"
 
 typedef struct {
     int using;
@@ -48,7 +49,7 @@ typedef struct {
     size_t size;
 } entry;
 
-pthread_mutex_t ctx_lock;
+_Atomic mcs_lock ctx_lock;
 static archive_ctx **ctx_pool;
 #define CTX_POOL_SIZE 20
 
@@ -71,7 +72,7 @@ static size_t archiveSize = 0;
 static entry *entries = NULL;
 static size_t entryCount = 0;
 
-const char supportExt[9][6] = {
+const char supportExt[10][6] = {
         "jpeg",
         "jpg",
         "png",
@@ -80,7 +81,8 @@ const char supportExt[9][6] = {
         "bmp",
         "ico",
         "wbmp",
-        "heif"
+        "heif",
+        "avif"
 };
 
 static inline int filename_is_playable_file(const char *name) {
@@ -88,7 +90,7 @@ static inline int filename_is_playable_file(const char *name) {
     if (!dotptr++)
         return false;
     int i;
-    for (i = 0; i < 9; i++)
+    for (i = 0; i < 10; i++)
         if (strcmp(dotptr, supportExt[i]) == 0)
             return true;
     return false;
@@ -222,7 +224,8 @@ static int archive_skip_to_index(archive_ctx *ctx, int index) {
 static int archive_get_ctx(archive_ctx **ctxptr, int idx) {
     int ret;
     archive_ctx *ctx = NULL;
-    pthread_mutex_lock(&ctx_lock);
+    mcs_lock_t local_lock;
+    lock_mcs(&ctx_lock, &local_lock);
     for (int i = 0; i < CTX_POOL_SIZE; i++) {
         if (!ctx_pool[i])
             continue;
@@ -237,7 +240,7 @@ static int archive_get_ctx(archive_ctx **ctxptr, int idx) {
     }
     if (ctx)
         ctx->using = 1;
-    pthread_mutex_unlock(&ctx_lock);
+    unlock_mcs(&ctx_lock, &local_lock);
 
     if (!ctx) {
         archive_ctx *victimCtx = NULL;
@@ -246,7 +249,7 @@ static int archive_get_ctx(archive_ctx **ctxptr, int idx) {
         ret = archive_alloc_ctx(&ctx);
         if (ret)
             return ret;
-        pthread_mutex_lock(&ctx_lock);
+        lock_mcs(&ctx_lock, &local_lock);
         for (int i = 0; i < CTX_POOL_SIZE; i++) {
             if (!ctx_pool[i]) {
                 ctx_pool[i] = ctx;
@@ -260,11 +263,9 @@ static int archive_get_ctx(archive_ctx **ctxptr, int idx) {
                 victimIdx = i;
             }
         }
-        if (replace) {
-            archive_release_ctx(victimCtx);
-            ctx_pool[victimIdx] = ctx;
-        }
-        pthread_mutex_unlock(&ctx_lock);
+        if (replace) ctx_pool[victimIdx] = ctx;
+        unlock_mcs(&ctx_lock, &local_lock);
+        if (replace) archive_release_ctx(victimCtx);
     }
     ret = archive_skip_to_index(ctx, idx);
     if (ret != idx) {
@@ -278,7 +279,8 @@ static int archive_get_ctx(archive_ctx **ctxptr, int idx) {
 }
 
 JNIEXPORT jint JNICALL
-Java_com_hippo_UriArchiveAccessor_openArchive(JNIEnv *env, jobject thiz, jint fd, jlong size) {
+Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_openArchive(JNIEnv *env, jclass thiz, jint fd,
+                                                                jlong size) {
     EH_UNUSED(env);
     EH_UNUSED(thiz);
     archive_ctx *ctx = NULL;
@@ -290,7 +292,6 @@ Java_com_hippo_UriArchiveAccessor_openArchive(JNIEnv *env, jobject thiz, jint fd
     }
     archiveSize = size;
     madvise_log_if_error(archiveAddr, archiveSize, MADV_WILLNEED);
-    pthread_mutex_init(&ctx_lock, 0);
     ctx_pool = calloc(CTX_POOL_SIZE, sizeof(archive_ctx **));
     if (!ctx_pool) {
         LOGE("Allocate archive ctx pool failed:ENOMEM");
@@ -358,7 +359,8 @@ Java_com_hippo_UriArchiveAccessor_openArchive(JNIEnv *env, jobject thiz, jint fd
 #pragma ide diagnostic ignored "UnreachableCode"
 
 JNIEXPORT jobject JNICALL
-Java_com_hippo_UriArchiveAccessor_extractToByteBuffer(JNIEnv *env, jobject thiz, jint index) {
+Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_extractToByteBuffer(JNIEnv *env, jclass thiz,
+                                                                        jint index) {
     EH_UNUSED(env);
     EH_UNUSED(thiz);
     void *addr = MEMPOOL_ADDR_BY_SORTED_IDX(index);
@@ -387,14 +389,13 @@ Java_com_hippo_UriArchiveAccessor_extractToByteBuffer(JNIEnv *env, jobject thiz,
 #pragma clang diagnostic pop
 
 JNIEXPORT void JNICALL
-Java_com_hippo_UriArchiveAccessor_closeArchive(JNIEnv *env, jobject thiz) {
+Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_closeArchive(JNIEnv *env, jclass thiz) {
     EH_UNUSED(env);
     EH_UNUSED(thiz);
     for (int i = 0; i < CTX_POOL_SIZE; i++)
         archive_release_ctx(ctx_pool[i]);
     free(passwd);
     free(ctx_pool);
-    pthread_mutex_destroy(&ctx_lock);
     passwd = NULL;
     need_encrypt = false;
     munmap(archiveAddr, archiveSize);
@@ -407,14 +408,15 @@ Java_com_hippo_UriArchiveAccessor_closeArchive(JNIEnv *env, jobject thiz) {
 }
 
 JNIEXPORT jboolean JNICALL
-Java_com_hippo_UriArchiveAccessor_needPassword(JNIEnv *env, jobject thiz) {
+Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_needPassword(JNIEnv *env, jclass thiz) {
     EH_UNUSED(env);
     EH_UNUSED(thiz);
     return need_encrypt;
 }
 
 JNIEXPORT jboolean JNICALL
-Java_com_hippo_UriArchiveAccessor_providePassword(JNIEnv *env, jobject thiz, jstring str) {
+Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_providePassword(JNIEnv *env, jclass thiz,
+                                                                    jstring str) {
     EH_UNUSED(thiz);
     struct archive_entry *entry;
     archive_ctx *ctx;
@@ -444,7 +446,8 @@ Java_com_hippo_UriArchiveAccessor_providePassword(JNIEnv *env, jobject thiz, jst
 }
 
 JNIEXPORT jstring JNICALL
-Java_com_hippo_UriArchiveAccessor_getFilename(JNIEnv *env, jobject thiz, jint index) {
+Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_getFilename(JNIEnv *env, jclass thiz,
+                                                                jint index) {
     EH_UNUSED(env);
     EH_UNUSED(thiz);
     index = entries[index].index;
@@ -459,7 +462,8 @@ Java_com_hippo_UriArchiveAccessor_getFilename(JNIEnv *env, jobject thiz, jint in
 }
 
 JNIEXPORT void JNICALL
-Java_com_hippo_UriArchiveAccessor_extractToFd(JNIEnv *env, jobject thiz, jint index, jint fd) {
+Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_extractToFd(JNIEnv *env, jclass thiz,
+                                                                jint index, jint fd) {
     EH_UNUSED(env);
     EH_UNUSED(thiz);
     index = entries[index].index;
@@ -473,7 +477,8 @@ Java_com_hippo_UriArchiveAccessor_extractToFd(JNIEnv *env, jobject thiz, jint in
 }
 
 JNIEXPORT void JNICALL
-Java_com_hippo_UriArchiveAccessor_releaseByteBuffer(JNIEnv *env, jobject thiz, jobject buffer) {
+Java_com_hippo_ehviewer_gallery_ArchivePageLoaderKt_releaseByteBuffer(JNIEnv *env, jclass thiz,
+                                                                      jobject buffer) {
     EH_UNUSED(thiz);
     void *addr = (*env)->GetDirectBufferAddress(env, buffer);
     size_t size = (*env)->GetDirectBufferCapacity(env, buffer);

app/src/main/cpp/fdutils.c

@@ -1,36 +0,0 @@
-#include <jni.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/sendfile.h>
-
-#include <android/log.h>
-#include <string.h>
-#include <errno.h>
-
-#define LOG_TAG "mmap_utils"
-
-#include "ehviewer.h"
-
-// TODO: Replace it with AFileDescriptor_getFd when minsdk 31
-// https://developer.android.com/ndk/reference/group/file-descriptor
-JNIEXPORT jint JNICALL
-Java_com_hippo_Native_getFd(JNIEnv *env, jclass clazz, jobject fileDescriptor) {
-    jint fd = -1;
-    jclass fdClass = (*env)->FindClass(env, "java/io/FileDescriptor");
-
-    if (fdClass != NULL) {
-        jfieldID fdClassDescriptorFieldID = (*env)->GetFieldID(env, fdClass, "descriptor", "I");
-        if (fdClassDescriptorFieldID != NULL && fileDescriptor != NULL) {
-            fd = (*env)->GetIntField(env, fileDescriptor, fdClassDescriptorFieldID);
-        }
-    }
-
-    return fd;
-}
-
-JNIEXPORT void JNICALL
-Java_com_hippo_Native_sendfile(JNIEnv *env, jclass clazz, jint from, jint to) {
-    struct stat st;
-    fstat(from, &st);
-    sendfile(to, from, 0, st.st_size);
-}

app/src/main/cpp/gifutils.c

@@ -2,6 +2,8 @@
 #include <string.h>
 #include <stdbool.h>
 #include <android/log.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
 
 #define LOG_TAG "gifUtils"
 
@@ -22,10 +24,7 @@ static inline bool isGif(void *addr) {
     return !memcmp(addr, GIF_HEADER_87A, 6) || !memcmp(addr, GIF_HEADER_89A, 6);
 }
 
-JNIEXPORT void JNICALL
-Java_com_hippo_image_Image_rewriteGifSource(JNIEnv *env, jclass clazz, jobject buffer) {
-    byte *addr = (*env)->GetDirectBufferAddress(env, buffer);
-    size_t size = (*env)->GetDirectBufferCapacity(env, buffer);
+static void doRewrite(byte *addr, size_t size) {
     if (size < 7 || !isGif(addr)) return;
     for (size_t i = 0; i < size - 8; i++) {
         // TODO: Optimize this hex find with SIMD?
@@ -42,3 +41,21 @@ Java_com_hippo_image_Image_rewriteGifSource(JNIEnv *env, jclass clazz, jobject b
         }
     }
 }
+
+JNIEXPORT void JNICALL
+Java_com_hippo_ehviewer_image_ImageKt_rewriteGifSource(JNIEnv *env, jclass clazz, jobject buffer) {
+    byte *addr = (*env)->GetDirectBufferAddress(env, buffer);
+    size_t size = (*env)->GetDirectBufferCapacity(env, buffer);
+    doRewrite(addr, size);
+}
+
+JNIEXPORT void JNICALL
+Java_com_hippo_ehviewer_image_ImageKt_rewriteGifSource2(JNIEnv *env, jclass clazz, jint fd) {
+    struct stat64 st;
+    fstat64(fd, &st);
+    size_t size = st.st_size;
+    byte *addr = mmap64(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
+    if (addr == MAP_FAILED) return;
+    doRewrite(addr, size);
+    munmap(addr, size);
+}

app/src/main/cpp/spinlock.h

@@ -0,0 +1,44 @@
+#ifndef EHVIEWER_SPINLOCK_H
+#define EHVIEWER_SPINLOCK_H
+
+#include <stddef.h>
+#include <stdatomic.h>
+
+#define cmpxchg(P, O, N) __sync_val_compare_and_swap((P), (O), (N))
+
+#define barrier() __asm__ __volatile__("":::"memory")
+
+#if defined(__aarch64__) || defined(__arm__)
+#define cpu_relax() __asm__ volatile ("wfe");
+#else
+#define cpu_relax() __asm__ volatile ("pause" ::: "memory");
+#endif
+
+typedef struct mcs_lock_t mcs_lock_t;
+struct mcs_lock_t {
+    mcs_lock_t *next;
+    int spin;
+};
+typedef struct mcs_lock_t *mcs_lock;
+
+static inline void lock_mcs(_Atomic mcs_lock *m, mcs_lock_t *me) {
+    mcs_lock_t *tail;
+    me->next = NULL;
+    me->spin = 0;
+    tail = atomic_exchange(m, me);
+    if (!tail) return;
+    tail->next = me;
+    barrier();
+    while (!me->spin) cpu_relax();
+    return;
+}
+
+static inline void unlock_mcs(mcs_lock *m, mcs_lock_t *me) {
+    if (!me->next) {
+        if (cmpxchg(m, me, NULL) == me) return;
+        while (!me->next) cpu_relax();
+    }
+    me->next->spin = 1;
+}
+
+#endif //EHVIEWER_SPINLOCK_H

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

@@ -1,5 +1,6 @@
 package androidx.navigation.ui
 
+import android.annotation.SuppressLint
 import android.view.MenuItem
 import androidx.annotation.IdRes
 import androidx.navigation.ActivityNavigator
@@ -8,22 +9,23 @@ 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)
-                is ActivityNavigator.Destination
+        is ActivityNavigator.Destination
     ) {
         builder.setEnterAnim(R.anim.nav_default_enter_anim)
             .setExitAnim(R.anim.nav_default_exit_anim)
             .setPopEnterAnim(R.anim.nav_default_pop_enter_anim)
             .setPopExitAnim(R.anim.nav_default_pop_exit_anim)
     } else {
-        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)
+        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)
     }
     val options = builder.build()
     return try {
@@ -37,4 +39,4 @@ fun onNavDestinationSelected2(item: MenuItem, navController: NavController): Boo
 }
 
 fun NavDestination.matchDestination(@IdRes destId: Int): Boolean =
-    hierarchy.any { it.id == destId }
+    hierarchy.any { it.id == destId }

app/src/main/java/androidx/swiperefreshlayout/widget/ThemedSwipeRefreshLayout.kt

@@ -7,10 +7,10 @@ import android.util.AttributeSet
 import androidx.core.graphics.ColorUtils
 import rikka.core.res.resolveColor
 
-
 @SuppressLint("PrivateResource")
 class ThemedSwipeRefreshLayout @JvmOverloads constructor(
-    context: Context, attrs: AttributeSet? = null
+    context: Context,
+    attrs: AttributeSet? = null,
 ) : SwipeRefreshLayout(context, attrs) {
 
     init {
@@ -22,4 +22,4 @@ class ThemedSwipeRefreshLayout @JvmOverloads constructor(
         (mCircleView.background as ShapeDrawable).paint.color = backgroundColor
         setColorSchemeColors(context.theme.resolveColor(com.google.android.material.R.attr.colorAccent))
     }
-}
+}

app/src/main/java/coil/decode/DecodeUtils.kt

@@ -1,66 +0,0 @@
-@file:JvmName("GifDecodeUtils")
-
-package coil.decode
-
-import kotlin.experimental.and
-import okio.BufferedSource
-import okio.ByteString.Companion.encodeUtf8
-
-// https://www.matthewflickinger.com/lab/whatsinagif/bits_and_bytes.asp
-private val GIF_HEADER_87A = "GIF87a".encodeUtf8()
-private val GIF_HEADER_89A = "GIF89a".encodeUtf8()
-
-// https://developers.google.com/speed/webp/docs/riff_container
-private val WEBP_HEADER_RIFF = "RIFF".encodeUtf8()
-private val WEBP_HEADER_WEBP = "WEBP".encodeUtf8()
-private val WEBP_HEADER_VPX8 = "VP8X".encodeUtf8()
-
-// https://nokiatech.github.io/heif/technical.html
-private val HEIF_HEADER_FTYP = "ftyp".encodeUtf8()
-private val HEIF_HEADER_MSF1 = "msf1".encodeUtf8()
-private val HEIF_HEADER_HEVC = "hevc".encodeUtf8()
-private val HEIF_HEADER_HEVX = "hevx".encodeUtf8()
-
-/**
- * Return 'true' if the [source] contains a GIF image. The [source] is not consumed.
- */
-fun DecodeUtils.isGif(source: BufferedSource): Boolean {
-    return source.rangeEquals(0, GIF_HEADER_89A) ||
-        source.rangeEquals(0, GIF_HEADER_87A)
-}
-
-/**
- * Return 'true' if the [source] contains a WebP image. The [source] is not consumed.
- */
-fun DecodeUtils.isWebP(source: BufferedSource): Boolean {
-    return source.rangeEquals(0, WEBP_HEADER_RIFF) &&
-        source.rangeEquals(8, WEBP_HEADER_WEBP)
-}
-
-/**
- * Return 'true' if the [source] contains an animated WebP image. The [source] is not consumed.
- */
-fun DecodeUtils.isAnimatedWebP(source: BufferedSource): Boolean {
-    return isWebP(source) &&
-        source.rangeEquals(12, WEBP_HEADER_VPX8) &&
-        source.request(17) &&
-        (source.buffer[16] and 0b00000010) > 0
-}
-
-/**
- * Return 'true' if the [source] contains an HEIF image. The [source] is not consumed.
- */
-fun DecodeUtils.isHeif(source: BufferedSource): Boolean {
-    return source.rangeEquals(4, HEIF_HEADER_FTYP)
-}
-
-/**
- * Return 'true' if the [source] contains an animated HEIF image sequence. The [source] is not
- * consumed.
- */
-fun DecodeUtils.isAnimatedHeif(source: BufferedSource): Boolean {
-    return isHeif(source) &&
-        (source.rangeEquals(8, HEIF_HEADER_MSF1) ||
-            source.rangeEquals(8, HEIF_HEADER_HEVC) ||
-            source.rangeEquals(8, HEIF_HEADER_HEVX))
-}

app/src/main/java/coil/decode/FrameDelayRewritingSource.kt

@@ -1,88 +0,0 @@
-@file:Suppress("SameParameterValue")
-
-package coil.decode
-
-import okio.Buffer
-import okio.ByteString
-import okio.ByteString.Companion.decodeHex
-import okio.ForwardingSource
-import okio.Source
-
-/**
- * A [ForwardingSource] that rewrites the GIF frame delay in every graphics control block if it's
- * below a threshold.
- */
-internal class FrameDelayRewritingSource(delegate: Source) : ForwardingSource(delegate) {
-
-    // An intermediary buffer so we can read and alter the data before it's written to the destination.
-    private val buffer = Buffer()
-
-    override fun read(sink: Buffer, byteCount: Long): Long {
-        // Ensure our buffer has enough bytes to satisfy this read.
-        request(byteCount)
-
-        // Short circuit if there are no bytes in the buffer.
-        if (buffer.size == 0L) {
-            return if (byteCount == 0L) 0L else -1L
-        }
-
-        // Search through the buffer and rewrite any frame delays below the threshold.
-        var bytesWritten = 0L
-        while (true) {
-            val index = indexOf(FRAME_DELAY_START_MARKER)
-            if (index == -1L) break
-
-            // Write up until the end of the frame delay start marker.
-            bytesWritten += write(sink, index + FRAME_DELAY_START_MARKER_SIZE_BYTES)
-
-            // Check for the end of the graphics control extension block.
-            if (!request(5) || buffer[4] != 0.toByte()) continue
-
-            // Rewrite the frame delay if it is below the threshold.
-            // The frame delay is stored as two unsigned bytes in reverse order
-            // (i.e. the most significant bits are in the byte that's read second).
-            val frameDelay = (buffer[2].toUByte().toInt() shl 8) or buffer[1].toUByte().toInt()
-            if (frameDelay < MINIMUM_FRAME_DELAY) {
-                sink.writeByte(buffer[0].toInt())
-                sink.writeByte(DEFAULT_FRAME_DELAY)
-                sink.writeByte(0)
-                buffer.skip(3)
-            }
-        }
-
-        // Write anything left in the source.
-        if (bytesWritten < byteCount) {
-            bytesWritten += write(sink, byteCount - bytesWritten)
-        }
-        return if (bytesWritten == 0L) -1 else bytesWritten
-    }
-
-    private fun indexOf(bytes: ByteString): Long {
-        var index = -1L
-        while (true) {
-            index = buffer.indexOf(bytes[0], index + 1)
-            if (index == -1L) break
-            if (request(bytes.size.toLong()) && buffer.rangeEquals(index, bytes)) break
-        }
-        return index
-    }
-
-    private fun write(sink: Buffer, byteCount: Long): Long {
-        return buffer.read(sink, byteCount).coerceAtLeast(0)
-    }
-
-    private fun request(byteCount: Long): Boolean {
-        if (buffer.size >= byteCount) return true
-        val toRead = byteCount - buffer.size
-        return super.read(buffer, toRead) == toRead
-    }
-
-    private companion object {
-        // https://www.matthewflickinger.com/lab/whatsinagif/bits_and_bytes.asp
-        // See: "Graphics Control Extension"
-        private val FRAME_DELAY_START_MARKER = "0021F904".decodeHex()
-        private const val FRAME_DELAY_START_MARKER_SIZE_BYTES = 4
-        private const val MINIMUM_FRAME_DELAY = 2
-        private const val DEFAULT_FRAME_DELAY = 10
-    }
-}

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

@@ -22,6 +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 kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -30,7 +31,6 @@ 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
@@ -62,7 +62,7 @@ import kotlin.math.sqrt
 @Suppress("unused")
 open class SubsamplingScaleImageView @JvmOverloads constructor(
     context: Context,
-    attr: AttributeSet? = null
+    attr: AttributeSet? = null,
 ) : View(context, attr) {
     private val decoderLock: ReadWriteLock = ReentrantReadWriteLock(true)
 
@@ -78,7 +78,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
     private val srcArray = FloatArray(8)
     private val dstArray = FloatArray(8)
 
-    //The logical density of the display
+    // The logical density of the display
     private val density: Float = resources.displayMetrics.density
 
     // Bitmap (preview or full image)
@@ -139,6 +139,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
 
     // Double tap zoom behaviour
     private var doubleTapZoomScale = 1F
+
     @ZoomStyle private var doubleTapZoomStyle = ZOOM_FOCUS_FIXED
     private var doubleTapZoomDuration = 500
 
@@ -331,8 +332,9 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
                     imageSource.sRegion.left,
                     imageSource.sRegion.top,
                     imageSource.sRegion.width(),
-                    imageSource.sRegion.height()
-                ), false
+                    imageSource.sRegion.height(),
+                ),
+                false,
             )
         } else if (imageSource.bitmap != null) {
             onImageLoaded(imageSource.bitmap, imageSource.isCached)
@@ -436,64 +438,71 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
     }
 
     private fun setGestureDetector(context: Context) {
-        detector = GestureDetector(context, object : GestureDetector.SimpleOnGestureListener() {
-            override fun onFling(e1: MotionEvent, e2: MotionEvent, velocityX: Float, velocityY: Float): Boolean {
-                if (panEnabled && isReady && vTranslate != null && (abs(e1.x - e2.x) > 50 || abs(e1.y - e2.y) > 50) && (abs(velocityX) > 500 || abs(velocityY) > 500) && !isZooming) {
-                    val vTranslateEnd = PointF(vTranslate!!.x + velocityX * 0.25F, vTranslate!!.y + velocityY * 0.25F)
-                    val sCenterXEnd = (width / 2 - vTranslateEnd.x) / scale
-                    val sCenterYEnd = (height / 2 - vTranslateEnd.y) / scale
-                    AnimationBuilder(PointF(sCenterXEnd, sCenterYEnd))
-                        .withEasing(EASE_OUT_QUAD)
-                        .withPanLimited(false)
-                        .withOrigin(ORIGIN_FLING)
-                        .start()
+        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) {
+                        val vTranslateEnd = PointF(vTranslate!!.x + velocityX * 0.25F, vTranslate!!.y + velocityY * 0.25F)
+                        val sCenterXEnd = (width / 2 - vTranslateEnd.x) / scale
+                        val sCenterYEnd = (height / 2 - vTranslateEnd.y) / scale
+                        AnimationBuilder(PointF(sCenterXEnd, sCenterYEnd))
+                            .withEasing(EASE_OUT_QUAD)
+                            .withPanLimited(false)
+                            .withOrigin(ORIGIN_FLING)
+                            .start()
+                        return true
+                    }
+                    return super.onFling(e1, e2, velocityX, velocityY)
+                }
+
+                override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
+                    performClick()
                     return true
                 }
-                return super.onFling(e1, e2, velocityX, velocityY)
-            }
 
-            override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
-                performClick()
-                return true
-            }
-
-            override fun onDoubleTap(e: MotionEvent): Boolean {
-                if (isZoomEnabled && isReady && vTranslate != null) {
-                    // Hacky solution for #15 - after a double tap the GestureDetector gets in a state
-                    // where the next fling is ignored, so here we replace it with a new one.
-                    setGestureDetector(context)
-                    return if (isQuickScaleEnabled) {
-                        // Store quick scale params. This will become either a double tap zoom or a
-                        // quick scale depending on whether the user swipes.
-                        vCenterStart = PointF(e.x, e.y)
-                        vTranslateStart = PointF(vTranslate!!.x, vTranslate!!.y)
-                        scaleStart = scale
-                        isQuickScaling = true
-                        isZooming = true
-                        quickScaleLastDistance = -1F
-                        quickScaleSCenter = viewToSourceCoord(vCenterStart!!)
-                        quickScaleVStart = PointF(e.x, e.y)
-                        quickScaleVLastPoint = PointF(quickScaleSCenter!!.x, quickScaleSCenter!!.y)
-                        quickScaleMoved = false
-                        // We need to get events in onTouchEvent after this.
-                        false
-                    } else {
-                        // Start double tap zoom animation.
-                        viewToSourceCoord(PointF(e.x, e.y))?.let { center ->
-                            doubleTapZoom(center, PointF(e.x, e.y))
+                override fun onDoubleTap(e: MotionEvent): Boolean {
+                    if (!ReaderPreferences.doubleTapToZoom().get()) return false
+                    if (isZoomEnabled && isReady && vTranslate != null) {
+                        // Hacky solution for #15 - after a double tap the GestureDetector gets in a state
+                        // where the next fling is ignored, so here we replace it with a new one.
+                        setGestureDetector(context)
+                        return if (isQuickScaleEnabled) {
+                            // Store quick scale params. This will become either a double tap zoom or a
+                            // quick scale depending on whether the user swipes.
+                            vCenterStart = PointF(e.x, e.y)
+                            vTranslateStart = PointF(vTranslate!!.x, vTranslate!!.y)
+                            scaleStart = scale
+                            isQuickScaling = true
+                            isZooming = true
+                            quickScaleLastDistance = -1F
+                            quickScaleSCenter = viewToSourceCoord(vCenterStart!!)
+                            quickScaleVStart = PointF(e.x, e.y)
+                            quickScaleVLastPoint = PointF(quickScaleSCenter!!.x, quickScaleSCenter!!.y)
+                            quickScaleMoved = false
+                            // We need to get events in onTouchEvent after this.
+                            false
+                        } else {
+                            // Start double tap zoom animation.
+                            viewToSourceCoord(PointF(e.x, e.y))?.let { center ->
+                                doubleTapZoom(center, PointF(e.x, e.y))
+                            }
+                            true
                         }
-                        true
                     }
+                    return super.onDoubleTapEvent(e)
                 }
-                return super.onDoubleTapEvent(e)
-            }
-        })
-        singleDetector = GestureDetector(context, object : GestureDetector.SimpleOnGestureListener() {
-            override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
-                performClick()
-                return true
-            }
-        })
+            },
+        )
+        singleDetector = GestureDetector(
+            context,
+            object : GestureDetector.SimpleOnGestureListener() {
+                override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
+                    performClick()
+                    return true
+                }
+            },
+        )
     }
 
     override fun onDetachedFromWindow() {
@@ -730,7 +739,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
                         val dx = abs(event.x - vCenterStart!!.x)
                         val dy = abs(event.y - vCenterStart!!.y)
 
-                        //On the Samsung S6 long click event does not work, because the dx > 5 usually true
+                        // On the Samsung S6 long click event does not work, because the dx > 5 usually true
                         val offset = density * 5
                         if (dx > offset || dy > offset || isPanning) {
                             consumed = true
@@ -894,7 +903,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
                 scaleElapsed,
                 anim!!.scaleStart,
                 anim!!.scaleEnd - anim!!.scaleStart,
-                anim!!.duration
+                anim!!.duration,
             )
 
             // Apply required animation to the focal point
@@ -903,14 +912,14 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
                 scaleElapsed,
                 anim!!.vFocusStart!!.x,
                 anim!!.vFocusEnd.x - anim!!.vFocusStart!!.x,
-                anim!!.duration
+                anim!!.duration,
             )
             val vFocusNowY = ease(
                 anim!!.easing,
                 scaleElapsed,
                 anim!!.vFocusStart!!.y,
                 anim!!.vFocusEnd.y - anim!!.vFocusStart!!.y,
-                anim!!.duration
+                anim!!.duration,
             )
             // Find out where the focal point is at this scale and adjust its position to follow the animation path
             vTranslate!!.x -= sourceToViewX(anim!!.sCenterEnd.x) - vFocusNowX
@@ -967,7 +976,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
                                 tileWidth,
                                 tileHeight,
                                 0F,
-                                tileHeight
+                                tileHeight,
                             )
                             setMatrixArray(
                                 dstArray,
@@ -978,7 +987,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
                                 tile.vRect.right.toFloat(),
                                 tile.vRect.bottom.toFloat(),
                                 tile.vRect.left.toFloat(),
-                                tile.vRect.bottom.toFloat()
+                                tile.vRect.bottom.toFloat(),
                             )
                             mtrx.setPolyToPoly(srcArray, 0, dstArray, 0, 4)
                             canvas.drawBitmap(tile.bitmap!!, mtrx, bitmapPaint)
@@ -990,7 +999,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
                                 "LOADING",
                                 (tile.vRect.left + px(5)).toFloat(),
                                 (tile.vRect.top + px(35)).toFloat(),
-                                debugTextPaint
+                                debugTextPaint,
                             )
                         }
                         if (tile.visible && debug) {
@@ -998,7 +1007,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
                                 "ISS " + tile.sampleSize + " RECT " + tile.sRect.top + "," + tile.sRect.left + "," + tile.sRect.bottom + "," + tile.sRect.right,
                                 (tile.vRect.left + px(5)).toFloat(),
                                 (tile.vRect.top + px(15)).toFloat(),
-                                debugTextPaint
+                                debugTextPaint,
                             )
                         }
                     }
@@ -1023,21 +1032,36 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
                 "Scale: " + String.format(Locale.ENGLISH, "%.2f", scale) + " (" + String.format(
                     Locale.ENGLISH,
                     "%.2f",
-                    minScale()
+                    minScale(),
                 ) + " - " + String.format(
-                    Locale.ENGLISH, "%.2f", maxScale
-                ) + ")", px(5).toFloat(), px(15).toFloat(), debugTextPaint
+                    Locale.ENGLISH,
+                    "%.2f",
+                    maxScale,
+                ) + ")",
+                px(5).toFloat(),
+                px(15).toFloat(),
+                debugTextPaint,
             )
             canvas.drawText(
                 "Translate: " + String.format(Locale.ENGLISH, "%.2f", vTranslate!!.x) + ":" + String.format(
-                    Locale.ENGLISH, "%.2f", vTranslate!!.y
-                ), px(5).toFloat(), px(30).toFloat(), debugTextPaint
+                    Locale.ENGLISH,
+                    "%.2f",
+                    vTranslate!!.y,
+                ),
+                px(5).toFloat(),
+                px(30).toFloat(),
+                debugTextPaint,
             )
             val center = center
             canvas.drawText(
                 "Source center: " + String.format(Locale.ENGLISH, "%.2f", center!!.x) + ":" + String.format(
-                    Locale.ENGLISH, "%.2f", center.y
-                ), px(5).toFloat(), px(45).toFloat(), debugTextPaint
+                    Locale.ENGLISH,
+                    "%.2f",
+                    center.y,
+                ),
+                px(5).toFloat(),
+                px(45).toFloat(),
+                debugTextPaint,
             )
             if (anim != null) {
                 val vCenterStart = sourceToViewCoord(anim!!.sCenterStart)
@@ -1061,7 +1085,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
                     sourceToViewX(quickScaleSCenter!!.x),
                     sourceToViewY(quickScaleSCenter!!.y),
                     px(35).toFloat(),
-                    debugLinePaint
+                    debugLinePaint,
                 )
             }
             if (quickScaleVStart != null && isQuickScaling) {
@@ -1084,7 +1108,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
         f4: Float,
         f5: Float,
         f6: Float,
-        f7: Float
+        f7: Float,
     ) {
         array[0] = f0
         array[1] = f1
@@ -1158,7 +1182,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
             debug(
                 "loadTile, tile.sRect=%s, tile.sampleSize=%d",
                 tile.sRect,
-                tile.sampleSize
+                tile.sampleSize,
             )
             decoderLock.readLock().lock()
             try {
@@ -1429,13 +1453,13 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
                         x * sTileWidth,
                         y * sTileHeight,
                         if (x == xTiles - 1) sWidth else (x + 1) * sTileWidth,
-                        if (y == yTiles - 1) sHeight else (y + 1) * sTileHeight
+                        if (y == yTiles - 1) sHeight else (y + 1) * sTileHeight,
                     )
                     val tile = Tile(
                         sRect = sRect,
                         sampleSize = sampleSize,
                         vRect = Rect(0, 0, 0, 0),
-                        fileSRect = Rect(sRect)
+                        fileSRect = Rect(sRect),
                     )
                     tileGrid.add(tile)
                 }
@@ -1564,7 +1588,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
     private fun getMaxBitmapDimensions(canvas: Canvas): Point {
         return Point(
             canvas.maximumBitmapWidth.coerceAtMost(maxTileWidth),
-            canvas.maximumBitmapHeight.coerceAtMost(maxTileHeight)
+            canvas.maximumBitmapHeight.coerceAtMost(maxTileHeight),
         )
     }
 
@@ -1629,15 +1653,15 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
         if (vTranslate == null || !isReady) return
 
         fRect[
-                viewToSourceX(vRect.left.toFloat()).toInt(),
-                viewToSourceY(vRect.top.toFloat()).toInt(),
-                viewToSourceX(vRect.right.toFloat()).toInt()
+            viewToSourceX(vRect.left.toFloat()).toInt(),
+            viewToSourceY(vRect.top.toFloat()).toInt(),
+            viewToSourceX(vRect.right.toFloat()).toInt(),
         ] = viewToSourceY(vRect.bottom.toFloat()).toInt()
         fileSRect(fRect, fRect)
         fRect[
-                fRect.left.coerceAtLeast(0),
-                fRect.top.coerceAtLeast(0),
-                fRect.right.coerceAtLeast(sWidth)
+            fRect.left.coerceAtLeast(0),
+            fRect.top.coerceAtLeast(0),
+            fRect.right.coerceAtLeast(sWidth),
         ] = fRect.bottom.coerceAtLeast(sHeight)
         if (!sRegion.isEmpty) {
             fRect.offset(sRegion.left, sRegion.top)
@@ -1688,7 +1712,6 @@ 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
@@ -1740,7 +1763,6 @@ 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
@@ -1754,9 +1776,9 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
      */
     private fun sourceToViewRect(sRect: Rect, vTarget: Rect) {
         vTarget[
-                sourceToViewX(sRect.left.toFloat()).toInt(),
-                sourceToViewY(sRect.top.toFloat()).toInt(),
-                sourceToViewX(sRect.right.toFloat()).toInt()
+            sourceToViewX(sRect.left.toFloat()).toInt(),
+            sourceToViewY(sRect.top.toFloat()).toInt(),
+            sourceToViewX(sRect.right.toFloat()).toInt(),
         ] = sourceToViewY(sRect.bottom.toFloat()).toInt()
     }
 
@@ -1803,11 +1825,11 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
         return when (minimumScaleType) {
             SCALE_TYPE_CENTER_INSIDE -> min(
                 (width - hPadding) / sWidth.toFloat(),
-                (height - vPadding) / sHeight.toFloat()
+                (height - vPadding) / sHeight.toFloat(),
             )
             SCALE_TYPE_CENTER_CROP -> max(
                 (width - hPadding) / sWidth.toFloat(),
-                (height - vPadding) / sHeight.toFloat()
+                (height - vPadding) / sHeight.toFloat(),
             )
             SCALE_TYPE_FIT_WIDTH -> (width - hPadding) / sWidth.toFloat()
             SCALE_TYPE_FIT_HEIGHT -> (height - vPadding) / sHeight.toFloat()
@@ -2111,7 +2133,9 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
     val state: ImageViewState?
         get() = if (vTranslate != null && sWidth > 0 && sHeight > 0) {
             ImageViewState(scale, center!!)
-        } else null
+        } else {
+            null
+        }
 
     /**
      * Returns true if pan gesture detection is enabled.
@@ -2397,7 +2421,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
         val sRect: Rect,
         val sampleSize: Int,
         val vRect: Rect,
-        val fileSRect: Rect
+        val fileSRect: Rect,
     ) {
         var bitmap: Bitmap? = null
         var loading = false
@@ -2432,7 +2456,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
         val easing: Int,
         val origin: Int,
         val time: Long = System.currentTimeMillis(),
-        val listener: OnAnimationEventListener?
+        val listener: OnAnimationEventListener?,
     )
 
     private data class ScaleAndTranslate(var scale: Float, val vTranslate: PointF)
@@ -2578,12 +2602,16 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
             val vxCenter = paddingLeft + (width - paddingRight - paddingLeft) / 2
             val vyCenter = paddingTop + (height - paddingBottom - paddingTop) / 2
             val targetScale = limitedScale(targetScale)
-            val targetSCenter = if (panLimited) limitedSCenter(
-                targetSCenter!!.x,
-                targetSCenter.y,
-                targetScale,
-                PointF()
-            ) else targetSCenter!!
+            val targetSCenter = if (panLimited) {
+                limitedSCenter(
+                    targetSCenter!!.x,
+                    targetSCenter.y,
+                    targetScale,
+                    PointF(),
+                )
+            } else {
+                targetSCenter!!
+            }
             anim = Anim(
                 scaleStart = scale,
                 scaleEnd = targetScale,
@@ -2593,13 +2621,13 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
                 vFocusStart = sourceToViewCoord(targetSCenter),
                 vFocusEnd = PointF(
                     vxCenter.toFloat(),
-                    vyCenter.toFloat()
+                    vyCenter.toFloat(),
                 ),
                 duration = duration,
                 interruptible = interruptible,
                 easing = easing,
                 origin = origin,
-                listener = listener
+                listener = listener,
             )
             if (vFocus != null) {
                 // Calculate where translation will be at the end of the anim
@@ -2611,7 +2639,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
                 // Adjust the position of the focus point at end so image will be in bounds
                 anim!!.vFocusEnd.set(
                     vFocus.x + (satEnd.vTranslate.x - vTranslateXEnd),
-                    vFocus.y + (satEnd.vTranslate.y - vTranslateYEnd)
+                    vFocus.y + (satEnd.vTranslate.y - vTranslateYEnd),
                 )
             }
             invalidate()
@@ -2623,7 +2651,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
         @IntDef(
             ZOOM_FOCUS_FIXED,
             ZOOM_FOCUS_CENTER,
-            ZOOM_FOCUS_CENTER_IMMEDIATE
+            ZOOM_FOCUS_CENTER_IMMEDIATE,
         )
         annotation class ZoomStyle
 
@@ -2645,7 +2673,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
         @Retention(AnnotationRetention.SOURCE)
         @IntDef(
             EASE_IN_OUT_QUAD,
-            EASE_OUT_QUAD
+            EASE_OUT_QUAD,
         )
         annotation class EasingStyle
 
@@ -2663,7 +2691,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
         @IntDef(
             PAN_LIMIT_INSIDE,
             PAN_LIMIT_OUTSIDE,
-            PAN_LIMIT_CENTER
+            PAN_LIMIT_CENTER,
         )
         annotation class PanLimit
 
@@ -2690,7 +2718,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
             SCALE_TYPE_FIT_HEIGHT,
             SCALE_TYPE_ORIGINAL_SIZE,
             SCALE_TYPE_SMART_FIT,
-            SCALE_TYPE_CUSTOM
+            SCALE_TYPE_CUSTOM,
         )
         annotation class ScaleType
 

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

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

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

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

app/src/main/java/com/hippo/UriArchiveAccessor.kt

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

app/src/main/java/com/hippo/app/HapticSlider.kt

@@ -1,14 +0,0 @@
-package com.hippo.app
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.HapticFeedbackConstants
-import com.google.android.material.slider.Slider
-
-class HapticSlider @JvmOverloads constructor(
-    context: Context, attrs: AttributeSet? = null
-) : Slider(context, attrs) {
-    init {
-        addOnChangeListener { _, _, _ -> performHapticFeedback(HapticFeedbackConstants.CLOCK_TICK) }
-    }
-}

app/src/main/java/com/hippo/database/MSQLiteBuilder.kt

@@ -1,124 +0,0 @@
-/*
- * Copyright 2017 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.database
-
-import android.content.Context
-import android.database.sqlite.SQLiteOpenHelper
-import android.util.SparseArray
-
-class MSQLiteBuilder {
-    companion object {
-        const val COLUMN_ID = "_id"
-        private val JAVA_TYPE_TO_SQLITE_TYPE: MutableMap<Class<*>?, String> = HashMap()
-        private fun javaTypeToSQLiteType(clazz: Class<*>?): String {
-            return JAVA_TYPE_TO_SQLITE_TYPE[clazz]
-                ?: throw IllegalStateException("Unknown type: $clazz")
-        }
-
-        init {
-            JAVA_TYPE_TO_SQLITE_TYPE[Boolean::class.javaPrimitiveType] =
-                "INTEGER NOT NULL DEFAULT 0"
-            JAVA_TYPE_TO_SQLITE_TYPE[Byte::class.javaPrimitiveType] =
-                "INTEGER NOT NULL DEFAULT 0"
-            JAVA_TYPE_TO_SQLITE_TYPE[Short::class.javaPrimitiveType] =
-                "INTEGER NOT NULL DEFAULT 0"
-            JAVA_TYPE_TO_SQLITE_TYPE[Int::class.javaPrimitiveType] = "INTEGER NOT NULL DEFAULT 0"
-            JAVA_TYPE_TO_SQLITE_TYPE[Long::class.javaPrimitiveType] =
-                "INTEGER NOT NULL DEFAULT 0"
-            JAVA_TYPE_TO_SQLITE_TYPE[Float::class.javaPrimitiveType] =
-                "REAL NOT NULL DEFAULT 0"
-            JAVA_TYPE_TO_SQLITE_TYPE[Double::class.javaPrimitiveType] = "REAL NOT NULL DEFAULT 0"
-            JAVA_TYPE_TO_SQLITE_TYPE[String::class.java] = "TEXT"
-        }
-    }
-
-    private val statementsMap = SparseArray<List<String>?>()
-    private var version = 0
-    private var statements: MutableList<String>? = null
-
-    /**
-     * Bump database version.
-     */
-    fun version(version: Int): MSQLiteBuilder {
-        check(version > this.version) {
-            ("New version must be bigger than current version. "
-                    + "current version: " + this.version + ", new version: " + version + ".")
-        }
-        this.version = version
-        statements = ArrayList()
-        statementsMap.put(version, statements)
-        return this
-    }
-    /**
-     * Creates a table.
-     */
-    /**
-     * Creates a table with int [.COLUMN_ID] primary key.
-     */
-    @JvmOverloads
-    fun createTable(
-        table: String,
-        column: String = COLUMN_ID,
-        clazz: Class<*>? = Int::class.javaPrimitiveType
-    ): MSQLiteBuilder {
-        return statement("CREATE TABLE " + table + " (" + column + " " + javaTypeToSQLiteType(clazz) + " PRIMARY KEY);")
-    }
-
-    /**
-     * Drops a table.
-     */
-    fun dropTable(table: String): MSQLiteBuilder {
-        return statement("DROP TABLE $table;")
-    }
-
-    /**
-     * Inserts a column to the table.
-     */
-    fun insertColumn(table: String, column: String, clazz: Class<*>?): MSQLiteBuilder {
-        return statement(
-            "ALTER TABLE $table ADD COLUMN $column " + javaTypeToSQLiteType(
-                clazz
-            ) + ";"
-        )
-    }
-
-    /**
-     * Add a statement.
-     */
-    fun statement(statement: String): MSQLiteBuilder {
-        check(!(version == 0 || statements == null)) { "Call version() first!" }
-        statements!!.add(statement)
-        return this
-    }
-
-    /**
-     * Build a SQLiteOpenHelper from it.
-     */
-    fun build(context: Context?, name: String?, version: Int): SQLiteOpenHelper {
-        return MSQLiteOpenHelper(context, name, version, this)
-    }
-
-    fun getStatements(oldVersion: Int, newVersion: Int): List<String> {
-        val result: MutableList<String> = ArrayList()
-        for (i in oldVersion + 1..newVersion) {
-            val list = statementsMap[i]
-            if (list != null) {
-                result.addAll(list)
-            }
-        }
-        return result
-    }
-}

app/src/main/java/com/hippo/database/MSQLiteOpenHelper.kt

@@ -1,43 +0,0 @@
-/*
- * Copyright 2017 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.database
-
-import android.content.Context
-import android.database.sqlite.SQLiteDatabase
-import android.database.sqlite.SQLiteOpenHelper
-import com.hippo.util.SqlUtils
-
-internal class MSQLiteOpenHelper(
-    context: Context?,
-    name: String?,
-    private val version: Int,
-    private val builder: MSQLiteBuilder
-) : SQLiteOpenHelper(context, name, null, version) {
-    override fun onCreate(db: SQLiteDatabase) {
-        onUpgrade(db, 0, version)
-    }
-
-    override fun onUpgrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
-        for (command in builder.getStatements(oldVersion, newVersion)) {
-            db.execSQL(command)
-        }
-    }
-
-    override fun onDowngrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
-        SqlUtils.dropAllTable(db)
-        onCreate(db)
-    }
-}

app/src/main/java/com/hippo/drawable/AddDeleteDrawable.java

@@ -1,166 +0,0 @@
-/*
- * Copyright (C) 2015 Hippo Seven
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hippo.drawable;
-
-import android.animation.ObjectAnimator;
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.Paint;
-import android.graphics.Path;
-import android.graphics.PixelFormat;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-
-import androidx.annotation.Keep;
-
-import com.hippo.ehviewer.R;
-import com.hippo.yorozuya.MathUtils;
-
-public class AddDeleteDrawable extends Drawable {
-
-    private final Paint mPaint = new Paint();
-    private final Path mPath = new Path();
-
-    private final int mSize;
-
-    private float mProgress;
-
-    private boolean mAutoUpdateMirror = false;
-    private boolean mVerticalMirror = false;
-
-    /**
-     * @param context used to get the configuration for the drawable from
-     */
-    public AddDeleteDrawable(Context context, int color) {
-        Resources resources = context.getResources();
-
-        mSize = resources.getDimensionPixelSize(R.dimen.add_size);
-        float barThickness = Math.round(resources.getDimension(R.dimen.add_thickness));
-
-        mPaint.setColor(color);
-        mPaint.setStyle(Paint.Style.STROKE);
-        mPaint.setStrokeJoin(Paint.Join.MITER);
-        mPaint.setStrokeCap(Paint.Cap.BUTT);
-        mPaint.setStrokeWidth(barThickness);
-
-        float halfSize = mSize / 2;
-        mPath.moveTo(0f, -halfSize);
-        mPath.lineTo(0, halfSize);
-        mPath.moveTo(-halfSize, 0);
-        mPath.lineTo(halfSize, 0);
-    }
-
-    @Override
-    public void draw(Canvas canvas) {
-        Rect bounds = getBounds();
-        float canvasRotate;
-        if (mVerticalMirror) {
-            canvasRotate = MathUtils.lerp(270, 135f, mProgress);
-        } else {
-            canvasRotate = MathUtils.lerp(0f, 135f, mProgress);
-        }
-
-        canvas.save();
-        canvas.translate(bounds.centerX(), bounds.centerY());
-        canvas.rotate(canvasRotate);
-        canvas.drawPath(mPath, mPaint);
-        canvas.restore();
-    }
-
-    public void setColor(int color) {
-        mPaint.setColor(color);
-        invalidateSelf();
-    }
-
-    @Override
-    public void setAlpha(int alpha) {
-        mPaint.setAlpha(alpha);
-    }
-
-    @Override
-    public void setColorFilter(ColorFilter cf) {
-        mPaint.setColorFilter(cf);
-    }
-
-    @Override
-    public int getIntrinsicHeight() {
-        return mSize * 6 / 5;
-    }
-
-    @Override
-    public int getIntrinsicWidth() {
-        return mSize * 6 / 5;
-    }
-
-    /**
-     * If set, canvas is flipped when progress reached to end and going back to start.
-     */
-    protected void setVerticalMirror(boolean verticalMirror) {
-        mVerticalMirror = verticalMirror;
-    }
-
-    public void setAutoUpdateMirror(boolean autoUpdateMirror) {
-        mAutoUpdateMirror = autoUpdateMirror;
-    }
-
-    @Keep
-    public float getProgress() {
-        return mProgress;
-    }
-
-    @Keep
-    public void setProgress(float progress) {
-        if (mAutoUpdateMirror) {
-            if (progress == 1f) {
-                setVerticalMirror(true);
-            } else if (progress == 0f) {
-                setVerticalMirror(false);
-            }
-        }
-        mProgress = progress;
-        invalidateSelf();
-    }
-
-    public void setAdd(long duration) {
-        setShape(false, duration);
-    }
-
-    public void setDelete(long duration) {
-        setShape(true, duration);
-    }
-
-    public void setShape(boolean delete, long duration) {
-        if (!((!delete && mProgress == 0f) || (delete && mProgress == 1f))) {
-            float endProgress = delete ? 1f : 0f;
-            if (duration <= 0) {
-                setProgress(endProgress);
-            } else {
-                ObjectAnimator oa = ObjectAnimator.ofFloat(this, "progress", endProgress);
-                oa.setDuration(duration);
-                oa.setAutoCancel(true);
-                oa.start();
-            }
-        }
-    }
-
-    @Override
-    public int getOpacity() {
-        return PixelFormat.TRANSLUCENT;
-    }
-}

app/src/main/java/com/hippo/drawable/PreciselyClipDrawable.kt

@@ -1,68 +0,0 @@
-/*
- * Copyright 2016 Hippo Seven
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.hippo.drawable
-
-import android.graphics.Canvas
-import android.graphics.Rect
-import android.graphics.RectF
-import android.graphics.drawable.Drawable
-import android.graphics.drawable.DrawableWrapper
-import androidx.core.graphics.withClip
-
-/**
- * Show a part of the original drawable
- */
-class PreciselyClipDrawable(
-    drawable: Drawable,
-    offsetX: Int,
-    offsetY: Int,
-    width: Int,
-    height: Int
-) : DrawableWrapper(drawable) {
-    private val mScale: RectF
-    private val mTemp = Rect()
-
-    init {
-        val originWidth = drawable.intrinsicWidth.toFloat()
-        val originHeight = drawable.intrinsicHeight.toFloat()
-        mScale = RectF(
-            (offsetX / originWidth).coerceIn(0.0f, 1.0f),
-            (offsetY / originHeight).coerceIn(0.0f, 1.0f),
-            ((offsetX + width) / originWidth).coerceIn(0.0f, 1.0f),
-            ((offsetY + height) / originHeight).coerceIn(0.0f, 1.0f),
-        )
-    }
-
-    override fun onBoundsChange(bounds: Rect) {
-        mTemp.left = ((mScale.left * bounds.right - mScale.right * bounds.left) / (mScale.left * (1 - mScale.right) - mScale.right * (1 - mScale.left))).toInt()
-        mTemp.right = (((1 - mScale.right) * bounds.left - (1 - mScale.left) * bounds.right) / (mScale.left * (1 - mScale.right) - mScale.right * (1 - mScale.left))).toInt()
-        mTemp.top = ((mScale.top * bounds.bottom - mScale.bottom * bounds.top) / (mScale.top * (1 - mScale.bottom) - mScale.bottom * (1 - mScale.top))).toInt()
-        mTemp.bottom = (((1 - mScale.bottom) * bounds.top - (1 - mScale.top) * bounds.bottom) / (mScale.top * (1 - mScale.bottom) - mScale.bottom * (1 - mScale.top))).toInt()
-        super.onBoundsChange(mTemp)
-    }
-
-    override fun getIntrinsicWidth(): Int {
-        return (super.getIntrinsicWidth() * mScale.width()).toInt()
-    }
-
-    override fun getIntrinsicHeight(): Int {
-        return (super.getIntrinsicHeight() * mScale.height()).toInt()
-    }
-
-    override fun draw(canvas: Canvas) {
-        canvas.withClip(bounds) { super.draw(canvas) }
-    }
-}

app/src/main/java/com/hippo/drawable/TriangleDrawable.java

@@ -1,72 +0,0 @@
-/*
- * Copyright 2016 Hippo Seven
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hippo.drawable;
-
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.Paint;
-import android.graphics.Path;
-import android.graphics.PixelFormat;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-
-public class TriangleDrawable extends Drawable {
-
-    private final Paint mPaint;
-    private final Path mPath;
-
-    public TriangleDrawable(int color) {
-        mPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.DITHER_FLAG);
-        mPaint.setColor(color);
-        mPath = new Path();
-    }
-
-    public void setColor(int color) {
-        mPaint.setColor(color);
-        invalidateSelf();
-    }
-
-    @Override
-    protected void onBoundsChange(Rect bounds) {
-        super.onBoundsChange(bounds);
-        mPath.reset();
-        mPath.moveTo(bounds.left, bounds.top);
-        mPath.lineTo(bounds.right, bounds.top);
-        mPath.lineTo(bounds.right, bounds.bottom);
-        mPath.close();
-    }
-
-    @Override
-    public void draw(Canvas canvas) {
-        canvas.drawPath(mPath, mPaint);
-    }
-
-    @Override
-    public void setAlpha(int alpha) {
-        mPaint.setAlpha(alpha);
-    }
-
-    @Override
-    public void setColorFilter(ColorFilter colorFilter) {
-        mPaint.setColorFilter(colorFilter);
-    }
-
-    @Override
-    public int getOpacity() {
-        return PixelFormat.OPAQUE;
-    }
-}

app/src/main/java/com/hippo/drawable/UnikeryDrawable.java

@@ -1,104 +0,0 @@
-/*
- * Copyright 2015 Hippo Seven
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hippo.drawable;
-
-import android.graphics.drawable.AnimatedImageDrawable;
-import android.graphics.drawable.Drawable;
-
-import com.hippo.widget.ObservedTextView;
-
-import coil.Coil;
-import coil.request.Disposable;
-import coil.request.ImageRequest;
-
-public class UnikeryDrawable extends WrapDrawable implements ObservedTextView.OnWindowAttachListener {
-
-    private static final String TAG = UnikeryDrawable.class.getSimpleName();
-    private final ObservedTextView mTextView;
-    private String mUrl;
-    private Disposable task;
-
-    public UnikeryDrawable(ObservedTextView textView) {
-        mTextView = textView;
-        mTextView.setOnWindowAttachListener(this);
-    }
-
-    @Override
-    public void onAttachedToWindow() {
-        load(mUrl);
-    }
-
-    @Override
-    public void onDetachedFromWindow() {
-        if (task != null && !task.isDisposed())
-            task.dispose();
-        clearDrawable();
-    }
-
-    public void load(String url) {
-        if (url != null) {
-            mUrl = url;
-            var imageLoader = Coil.imageLoader(mTextView.getContext());
-            var request = new ImageRequest.Builder(mTextView.getContext()).data(url).memoryCacheKey(url).diskCacheKey(url).target(
-                    drawable -> null,
-                    drawable -> null,
-                    drawable -> {
-                        onGetValue(drawable);
-                        return null;
-                    }
-            ).build();
-            task = imageLoader.enqueue(request);
-        }
-    }
-
-    private void clearDrawable() {
-        setDrawable(null);
-    }
-
-    @Override
-    public void setDrawable(Drawable drawable) {
-        // Remove old callback
-        Drawable oldDrawable = getDrawable();
-        if (oldDrawable != null) {
-            oldDrawable.setCallback(null);
-        }
-
-        super.setDrawable(drawable);
-
-        if (drawable != null) {
-            drawable.setCallback(mTextView);
-        }
-
-        updateBounds();
-        if (drawable != null) {
-            invalidateSelf();
-        }
-    }
-
-    @Override
-    public void invalidateSelf() {
-        CharSequence cs = mTextView.getText();
-        mTextView.setText(cs);
-    }
-
-    public void onGetValue(Drawable drawable) {
-        clearDrawable();
-        setDrawable(drawable);
-        if (drawable instanceof AnimatedImageDrawable animatedImageDrawable)
-            animatedImageDrawable.start();
-    }
-}

app/src/main/java/com/hippo/drawable/WrapDrawable.java

@@ -1,143 +0,0 @@
-/*
- * Copyright 2015 Hippo Seven
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hippo.drawable;
-
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.PixelFormat;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-
-public class WrapDrawable extends Drawable {
-
-    private Drawable mDrawable;
-
-    public Drawable getDrawable() {
-        return mDrawable;
-    }
-
-    public void setDrawable(Drawable drawable) {
-        mDrawable = drawable;
-    }
-
-    public void updateBounds() {
-        setBounds(0, 0, getIntrinsicWidth(), getIntrinsicHeight());
-    }
-
-    @Override
-    public void draw(Canvas canvas) {
-        if (mDrawable != null) {
-            mDrawable.draw(canvas);
-        }
-    }
-
-    @Override
-    public void setBounds(int left, int top, int right, int bottom) {
-        super.setBounds(left, top, right, bottom);
-
-        if (mDrawable != null) {
-            mDrawable.setBounds(left, top, right, bottom);
-        }
-    }
-
-    @Override
-    public void setBounds(Rect bounds) {
-        super.setBounds(bounds);
-
-        if (mDrawable != null) {
-            mDrawable.setBounds(bounds);
-        }
-    }
-
-    @Override
-    public int getChangingConfigurations() {
-        if (mDrawable != null) {
-            return mDrawable.getChangingConfigurations();
-        } else {
-            return super.getChangingConfigurations();
-        }
-    }
-
-    @Override
-    public void setChangingConfigurations(int configs) {
-        super.setChangingConfigurations(configs);
-
-        if (mDrawable != null) {
-            mDrawable.setChangingConfigurations(configs);
-        }
-    }
-
-    @Override
-    public void setDither(boolean dither) {
-        super.setDither(dither);
-
-        if (mDrawable != null) {
-            mDrawable.setDither(dither);
-        }
-    }
-
-    @Override
-    public void setFilterBitmap(boolean filter) {
-        super.setFilterBitmap(filter);
-
-        if (mDrawable != null) {
-            mDrawable.setFilterBitmap(filter);
-        }
-    }
-
-
-    @Override
-    public void setAlpha(int alpha) {
-        if (mDrawable != null) {
-            mDrawable.setAlpha(alpha);
-        }
-    }
-
-    @Override
-    public void setColorFilter(ColorFilter cf) {
-        if (mDrawable != null) {
-            mDrawable.setColorFilter(cf);
-        }
-    }
-
-    @Override
-    public int getOpacity() {
-        if (mDrawable != null) {
-            return mDrawable.getOpacity();
-        } else {
-            return PixelFormat.UNKNOWN;
-        }
-    }
-
-    @Override
-    public int getIntrinsicWidth() {
-        if (mDrawable != null) {
-            return mDrawable.getIntrinsicWidth();
-        } else {
-            return super.getIntrinsicWidth();
-        }
-    }
-
-    @Override
-    public int getIntrinsicHeight() {
-        if (mDrawable != null) {
-            return mDrawable.getIntrinsicHeight();
-        } else {
-            return super.getIntrinsicHeight();
-        }
-    }
-}

app/src/main/java/com/hippo/easyrecyclerview/EasyRecyclerView.java

@@ -1,675 +0,0 @@
-/*
- * Copyright (C) 2015 Hippo Seven
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hippo.easyrecyclerview;
-
-import android.content.Context;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.util.AttributeSet;
-import android.util.SparseBooleanArray;
-import android.view.ActionMode;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.Checkable;
-
-import androidx.annotation.NonNull;
-import androidx.collection.LongSparseArray;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.hippo.yorozuya.NumberUtils;
-
-/**
- * Add setChoiceMode for RecyclerView
- */
-// Get some code from twoway-view and AbsListView.
-public class EasyRecyclerView extends RecyclerView {
-
-    /**
-     * Normal list that does not indicate choices
-     */
-    public static final int CHOICE_MODE_NONE = 0;
-
-    /**
-     * The list allows up to one choice
-     */
-    public static final int CHOICE_MODE_SINGLE = 1;
-
-    /**
-     * The list allows multiple choices
-     */
-    public static final int CHOICE_MODE_MULTIPLE = 2;
-
-    /**
-     * The list allows multiple choices in a modal selection mode
-     */
-    public static final int CHOICE_MODE_MULTIPLE_MODAL = 3;
-
-    /**
-     * The list allows multiple choices in custom action
-     */
-    public static final int CHOICE_MODE_MULTIPLE_CUSTOM = 4;
-    // Fling friction
-    public float pageScrollThreshold;
-    /**
-     * Wrapper for the multiple choice mode callback; AbsListView needs to perform
-     * a few extra actions around what application code does.
-     */
-    MultiChoiceModeWrapper mMultiChoiceModeCallback;
-    /**
-     * Controls if/how the user may choose/check items in the list
-     */
-    private int mChoiceMode = CHOICE_MODE_NONE;
-    /**
-     * Controls CHOICE_MODE_MULTIPLE_MODAL. null when inactive.
-     */
-    private ActionMode mChoiceActionMode;
-    /**
-     * Listener for custom multiple choices
-     */
-    private CustomChoiceListener mCustomChoiceListener;
-
-    private boolean mCustomChoice = false;
-
-    /**
-     * A lock, avoid OutOfCustomChoiceMode when doing OutOfCustomChoiceMode
-     */
-    private boolean mOutOfCustomChoiceModing = false;
-
-    private SparseBooleanArray mTempCheckStates;
-
-    /**
-     * Running count of how many items are currently checked
-     */
-    private int mCheckedItemCount;
-
-    /**
-     * Running state of which positions are currently checked
-     */
-    private SparseBooleanArray mCheckStates;
-
-    /**
-     * Running state of which IDs are currently checked.
-     * If there is a value for a given key, the checked state for that ID is true
-     * and the value holds the last known position in the adapter for that id.
-     */
-    private LongSparseArray<Integer> mCheckedIdStates;
-
-    private Adapter<?> mAdapter;
-
-    public EasyRecyclerView(Context context) {
-        super(context);
-        EasyRecyclerView.this.init(context);
-    }
-
-    public EasyRecyclerView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        EasyRecyclerView.this.init(context);
-    }
-
-    public EasyRecyclerView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        EasyRecyclerView.this.init(context);
-    }
-
-    public static void setViewChecked(View view, boolean checked) {
-        if (view instanceof Checkable) {
-            ((Checkable) view).setChecked(checked);
-        } else {
-            view.setActivated(checked);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setAdapter(RecyclerView.Adapter adapter) {
-
-        super.setAdapter(adapter);
-
-        mAdapter = adapter;
-        if (adapter != null) {
-            if (mChoiceMode != CHOICE_MODE_NONE && adapter.hasStableIds() &&
-                    mCheckedIdStates == null) {
-                mCheckedIdStates = new LongSparseArray<>();
-            }
-        }
-
-        if (mCheckStates != null) {
-            mCheckStates.clear();
-        }
-
-        if (mCheckedIdStates != null) {
-            mCheckedIdStates.clear();
-        }
-    }
-
-    @Override
-    public void onChildAttachedToWindow(@NonNull View child) {
-        super.onChildAttachedToWindow(child);
-
-        if (mCheckStates != null) {
-            int position = getChildAdapterPosition(child);
-            if (position >= 0) {
-                setViewChecked(child, mCheckStates.get(position));
-            }
-        }
-    }
-
-
-    public int getCheckedItemCount() {
-        return mCheckedItemCount;
-    }
-
-    /**
-     * Returns the checked state of the specified position. The result is only
-     * valid if the choice mode has been set to {@link #CHOICE_MODE_SINGLE}
-     * or {@link #CHOICE_MODE_MULTIPLE}.
-     *
-     * @param position The item whose checked state to return
-     * @return The item's checked state or <code>false</code> if choice mode
-     * is invalid
-     * @see #setChoiceMode(int)
-     */
-    public boolean isItemChecked(int position) {
-        //noinspection SimplifiableIfStatement
-        if (mChoiceMode != CHOICE_MODE_NONE && mCheckStates != null) {
-            return mCheckStates.get(position);
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns the set of checked items in the list. The result is only valid if
-     * the choice mode has not been set to {@link #CHOICE_MODE_NONE}.
-     *
-     * @return A SparseBooleanArray which will return true for each call to
-     * get(int position) where position is a checked position in the
-     * list and false otherwise, or <code>null</code> if the choice
-     * mode is set to {@link #CHOICE_MODE_NONE}.
-     */
-    public SparseBooleanArray getCheckedItemPositions() {
-        if (mChoiceMode != CHOICE_MODE_NONE) {
-            return mCheckStates;
-        }
-        return null;
-    }
-
-    public boolean isInCustomChoice() {
-        return mCustomChoice;
-    }
-
-    public void intoCustomChoiceMode() {
-        if (mChoiceMode == CHOICE_MODE_MULTIPLE_CUSTOM && !mCustomChoice) {
-            mCustomChoice = true;
-
-            mCustomChoiceListener.onIntoCustomChoice(this);
-        }
-    }
-
-    public void outOfCustomChoiceMode() {
-        if (mChoiceMode == CHOICE_MODE_MULTIPLE_CUSTOM && mCustomChoice && !mOutOfCustomChoiceModing) {
-            mOutOfCustomChoiceModing = true;
-
-            // Copy mCheckStates
-            mTempCheckStates.clear();
-            for (int i = 0, n = mCheckStates.size(); i < n; i++) {
-                mTempCheckStates.put(mCheckStates.keyAt(i), mCheckStates.valueAt(i));
-            }
-            // Uncheck remain checked items
-            for (int i = 0, n = mTempCheckStates.size(); i < n; i++) {
-                if (mTempCheckStates.valueAt(i)) {
-                    setItemChecked(mTempCheckStates.keyAt(i), false);
-                }
-            }
-
-            mCustomChoice = false;
-            mCustomChoiceListener.onOutOfCustomChoice(this);
-
-            mOutOfCustomChoiceModing = false;
-        }
-    }
-
-    /**
-     * Clear any choices previously set
-     */
-    private void clearChoices() {
-        if (mCheckStates != null) {
-            mCheckStates.clear();
-        }
-        if (mCheckedIdStates != null) {
-            mCheckedIdStates.clear();
-        }
-        mCheckedItemCount = 0;
-        updateOnScreenCheckedViews();
-    }
-
-    /**
-     * Sets all items checked.
-     */
-    public void checkAll() {
-        if (mChoiceMode == CHOICE_MODE_NONE || mChoiceMode == CHOICE_MODE_SINGLE) {
-            return;
-        }
-
-        // Check is intoCheckMode
-        if (mChoiceMode == CHOICE_MODE_MULTIPLE_CUSTOM && !mCustomChoice) {
-            throw new IllegalStateException("Call intoCheckMode first");
-        }
-
-        // Start selection mode if needed. We don't need to if we're unchecking something.
-        if (mChoiceMode == CHOICE_MODE_MULTIPLE_MODAL && mChoiceActionMode == null) {
-            if (mMultiChoiceModeCallback == null ||
-                    !mMultiChoiceModeCallback.hasWrappedCallback()) {
-                throw new IllegalStateException("EasyRecyclerView: attempted to start selection mode " +
-                        "for CHOICE_MODE_MULTIPLE_MODAL but no choice mode callback was " +
-                        "supplied. Call setMultiChoiceModeListener to set a callback.");
-            }
-            mChoiceActionMode = startActionMode(mMultiChoiceModeCallback);
-        }
-
-        for (int i = 0, n = mAdapter.getItemCount(); i < n; i++) {
-            boolean oldValue = mCheckStates.get(i);
-            mCheckStates.put(i, true);
-            if (mCheckedIdStates != null && mAdapter.hasStableIds()) {
-                mCheckedIdStates.put(mAdapter.getItemId(i), i);
-            }
-            if (!oldValue) {
-                mCheckedItemCount++;
-            }
-            if (mChoiceActionMode != null) {
-                final long id = mAdapter.getItemId(i);
-                mMultiChoiceModeCallback.onItemCheckedStateChanged(mChoiceActionMode, i, id, true);
-            }
-            if (mChoiceMode == CHOICE_MODE_MULTIPLE_CUSTOM) {
-                final long id = mAdapter.getItemId(i);
-                mCustomChoiceListener.onItemCheckedStateChanged(this, i, id, true);
-            }
-        }
-
-        updateOnScreenCheckedViews();
-    }
-
-    public void toggleItemChecked(int position) {
-        if (mCheckStates != null) {
-            setItemChecked(position, !mCheckStates.get(position));
-        }
-    }
-
-    /**
-     * Sets the checked state of the specified position. The is only valid if
-     * the choice mode has been set to {@link #CHOICE_MODE_SINGLE} or
-     * {@link #CHOICE_MODE_MULTIPLE}.
-     *
-     * @param position The item whose checked state is to be checked
-     * @param value    The new checked state for the item
-     */
-    public void setItemChecked(int position, boolean value) {
-        if (mChoiceMode == CHOICE_MODE_NONE) {
-            return;
-        }
-
-        // Check is intoCheckMode
-        if (mChoiceMode == CHOICE_MODE_MULTIPLE_CUSTOM && !mCustomChoice) {
-            throw new IllegalStateException("Call intoCheckMode first");
-        }
-
-        // Start selection mode if needed. We don't need to if we're unchecking something.
-        if (value && mChoiceMode == CHOICE_MODE_MULTIPLE_MODAL && mChoiceActionMode == null) {
-            if (mMultiChoiceModeCallback == null ||
-                    !mMultiChoiceModeCallback.hasWrappedCallback()) {
-                throw new IllegalStateException("EasyRecyclerView: attempted to start selection mode " +
-                        "for CHOICE_MODE_MULTIPLE_MODAL but no choice mode callback was " +
-                        "supplied. Call setMultiChoiceModeListener to set a callback.");
-            }
-            mChoiceActionMode = startActionMode(mMultiChoiceModeCallback);
-        }
-
-        if (mChoiceMode == CHOICE_MODE_MULTIPLE || mChoiceMode == CHOICE_MODE_MULTIPLE_MODAL || mChoiceMode == CHOICE_MODE_MULTIPLE_CUSTOM) {
-            boolean oldValue = mCheckStates.get(position);
-            mCheckStates.put(position, value);
-            if (mCheckedIdStates != null && mAdapter.hasStableIds()) {
-                if (value) {
-                    mCheckedIdStates.put(mAdapter.getItemId(position), position);
-                } else {
-                    mCheckedIdStates.remove(mAdapter.getItemId(position));
-                }
-            }
-            if (oldValue != value) {
-                if (value) {
-                    mCheckedItemCount++;
-                } else {
-                    mCheckedItemCount--;
-                }
-            }
-            if (mChoiceActionMode != null) {
-                final long id = mAdapter.getItemId(position);
-                mMultiChoiceModeCallback.onItemCheckedStateChanged(mChoiceActionMode,
-                        position, id, value);
-            }
-            if (mChoiceMode == CHOICE_MODE_MULTIPLE_CUSTOM) {
-                final long id = mAdapter.getItemId(position);
-                mCustomChoiceListener.onItemCheckedStateChanged(this, position, id, value);
-            }
-        } else {
-            boolean updateIds = mCheckedIdStates != null && mAdapter.hasStableIds();
-            // Clear all values if we're checking something, or unchecking the currently
-            // selected item
-            if (value || isItemChecked(position)) {
-                mCheckStates.clear();
-                if (updateIds) {
-                    mCheckedIdStates.clear();
-                }
-            }
-            // this may end up selecting the value we just cleared but this way
-            // we ensure length of mCheckStates is 1, a fact getCheckedItemPosition relies on
-            if (value) {
-                mCheckStates.put(position, true);
-                if (updateIds) {
-                    mCheckedIdStates.put(mAdapter.getItemId(position), position);
-                }
-                mCheckedItemCount = 1;
-            } else if (mCheckStates.size() == 0 || !mCheckStates.valueAt(0)) {
-                mCheckedItemCount = 0;
-            }
-        }
-
-        updateOnScreenCheckedViews();
-    }
-
-    /**
-     * Defines the choice behavior for the List. By default, Lists do not have any choice behavior
-     * ({@link #CHOICE_MODE_NONE}). By setting the choiceMode to {@link #CHOICE_MODE_SINGLE}, the
-     * List allows up to one item to  be in a chosen state. By setting the choiceMode to
-     * {@link #CHOICE_MODE_MULTIPLE}, the list allows any number of items to be chosen.
-     *
-     * @param choiceMode One of {@link #CHOICE_MODE_NONE}, {@link #CHOICE_MODE_SINGLE}, or
-     *                   {@link #CHOICE_MODE_MULTIPLE}
-     */
-    public void setChoiceMode(int choiceMode) {
-        mChoiceMode = choiceMode;
-        if (mChoiceActionMode != null) {
-            mChoiceActionMode.finish();
-            mChoiceActionMode = null;
-        }
-        if (mChoiceMode != CHOICE_MODE_NONE) {
-            if (mCheckStates == null) {
-                mCheckStates = new SparseBooleanArray(0);
-            }
-            if (mCheckedIdStates == null && mAdapter != null && mAdapter.hasStableIds()) {
-                mCheckedIdStates = new LongSparseArray<>(0);
-            }
-            // Modal multi-choice mode only has choices when the mode is active. Clear them.
-            if (mChoiceMode == CHOICE_MODE_MULTIPLE_MODAL) {
-                clearChoices();
-                setLongClickable(true);
-            } else if (mChoiceMode == CHOICE_MODE_MULTIPLE_CUSTOM) {
-                if (mTempCheckStates == null) {
-                    mTempCheckStates = new SparseBooleanArray(0);
-                }
-                clearChoices();
-            }
-        }
-    }
-
-    public void setCustomCheckedListener(CustomChoiceListener listener) {
-        mCustomChoiceListener = listener;
-    }
-
-    /**
-     * Perform a quick, in-place update of the checked or activated state
-     * on all visible item views. This should only be called when a valid
-     * choice mode is active.
-     */
-    private void updateOnScreenCheckedViews() {
-        final int count = getChildCount();
-        for (int i = 0; i < count; i++) {
-            final View child = getChildAt(i);
-            final int position = getChildAdapterPosition(child);
-            setViewChecked(child, mCheckStates.get(position));
-        }
-    }
-
-    private void init(Context context) {
-        float scale = context.getResources().getDisplayMetrics().density;
-        // g (m/s^2)
-        // inch/meter
-        // A context-specific coefficient adjusted to physical values.
-        // look and feel tuning
-        pageScrollThreshold = scale * 80;
-    }
-
-    @Override
-    public Parcelable onSaveInstanceState() {
-        final SavedState ss = new SavedState(super.onSaveInstanceState());
-
-        ss.choiceMode = mChoiceMode;
-        ss.customChoice = mCustomChoice;
-        ss.checkedItemCount = mCheckedItemCount;
-        ss.checkState = mCheckStates;
-        ss.checkIdState = mCheckedIdStates;
-
-        return ss;
-    }
-
-    @Override
-    public void onRestoreInstanceState(Parcelable state) {
-        SavedState ss = (SavedState) state;
-        super.onRestoreInstanceState(ss.getSuperState());
-
-        setChoiceMode(ss.choiceMode);
-        mCustomChoice = ss.customChoice;
-        mCheckedItemCount = ss.checkedItemCount;
-        if (ss.checkState != null) {
-            mCheckStates = ss.checkState;
-        }
-        if (ss.checkIdState != null) {
-            mCheckedIdStates = ss.checkIdState;
-        }
-
-        if (mChoiceMode == CHOICE_MODE_MULTIPLE_MODAL && mCheckedItemCount > 0) {
-            mChoiceActionMode = startActionMode(mMultiChoiceModeCallback);
-        }
-        updateOnScreenCheckedViews();
-    }
-
-    /**
-     * A MultiChoiceModeListener receives events for {@link android.widget.AbsListView#CHOICE_MODE_MULTIPLE_MODAL}.
-     * It acts as the {@link android.view.ActionMode.Callback} for the selection mode and also receives
-     * {@link #onItemCheckedStateChanged(android.view.ActionMode, int, long, boolean)} events when the user
-     * selects and deselects list items.
-     */
-    public interface MultiChoiceModeListener extends ActionMode.Callback {
-        /**
-         * Called when an item is checked or unchecked during selection mode.
-         *
-         * @param mode     The {@link android.view.ActionMode} providing the selection mode
-         * @param position Adapter position of the item that was checked or unchecked
-         * @param id       Adapter ID of the item that was checked or unchecked
-         * @param checked  <code>true</code> if the item is now checked, <code>false</code>
-         *                 if the item is now unchecked.
-         */
-        void onItemCheckedStateChanged(ActionMode mode,
-                                       int position, long id, boolean checked);
-    }
-
-    /**
-     * Custom checked
-     */
-    public interface CustomChoiceListener {
-
-        void onIntoCustomChoice(EasyRecyclerView view);
-
-        void onOutOfCustomChoice(EasyRecyclerView view);
-
-        void onItemCheckedStateChanged(EasyRecyclerView view, int position, long id, boolean checked);
-    }
-
-    /**
-     * This saved state class is a Parcelable and should not extend
-     * {@link android.view.View.BaseSavedState} nor {@link android.view.AbsSavedState}
-     * because its super class AbsSavedState's constructor
-     * currently passes null
-     * as a class loader to read its superstate from Parcelable.
-     * This causes {@link android.os.BadParcelableException} when restoring saved states.
-     * <p/>
-     * The super class "RecyclerView" is a part of the support library,
-     * and restoring its saved state requires the class loader that loaded the RecyclerView.
-     * It seems that the class loader is not required when restoring from RecyclerView itself,
-     * but it is required when restoring from RecyclerView's subclasses.
-     */
-    static class SavedState implements Parcelable {
-
-        public static final SavedState EMPTY_STATE = new SavedState() {
-        };
-        public static final Parcelable.Creator<SavedState> CREATOR
-                = new Parcelable.Creator<SavedState>() {
-            @Override
-            public SavedState createFromParcel(Parcel in) {
-                return new SavedState(in);
-            }
-
-            @Override
-            public SavedState[] newArray(int size) {
-                return new SavedState[size];
-            }
-        };
-        int choiceMode;
-        boolean customChoice;
-        int checkedItemCount;
-        SparseBooleanArray checkState;
-        LongSparseArray<Integer> checkIdState;
-        // This keeps the parent(RecyclerView)'s state
-        Parcelable mSuperState;
-
-        SavedState() {
-            mSuperState = null;
-        }
-
-        /**
-         * Constructor called from {@link #onSaveInstanceState()}
-         */
-        SavedState(Parcelable superState) {
-            mSuperState = superState != EMPTY_STATE ? superState : null;
-        }
-
-        /**
-         * Constructor called from {@link #CREATOR}
-         */
-        private SavedState(Parcel in) {
-            // Parcel 'in' has its parent(RecyclerView)'s saved state.
-            // To restore it, class loader that loaded RecyclerView is required.
-            Parcelable superState = in.readParcelable(RecyclerView.class.getClassLoader());
-            mSuperState = superState != null ? superState : EMPTY_STATE;
-
-            choiceMode = in.readInt();
-            customChoice = NumberUtils.int2boolean(in.readInt());
-            checkedItemCount = in.readInt();
-            checkState = in.readSparseBooleanArray();
-            final int N = in.readInt();
-            if (N > 0) {
-                checkIdState = new LongSparseArray<>();
-                for (int i = 0; i < N; i++) {
-                    final long key = in.readLong();
-                    final int value = in.readInt();
-                    checkIdState.put(key, value);
-                }
-            }
-        }
-
-        @Override
-        public int describeContents() {
-            return 0;
-        }
-
-        @Override
-        public void writeToParcel(@NonNull Parcel out, int flags) {
-            out.writeParcelable(mSuperState, flags);
-
-            out.writeInt(choiceMode);
-            out.writeInt(NumberUtils.boolean2int(customChoice));
-            out.writeInt(checkedItemCount);
-            out.writeSparseBooleanArray(checkState);
-            final int N = checkIdState != null ? checkIdState.size() : 0;
-            out.writeInt(N);
-            for (int i = 0; i < N; i++) {
-                out.writeLong(checkIdState.keyAt(i));
-                out.writeInt(checkIdState.valueAt(i));
-            }
-        }
-
-        public Parcelable getSuperState() {
-            return mSuperState;
-        }
-    }
-
-    class MultiChoiceModeWrapper implements MultiChoiceModeListener {
-        private MultiChoiceModeListener mWrapped;
-
-
-        @SuppressWarnings("BooleanMethodIsAlwaysInverted")
-        public boolean hasWrappedCallback() {
-            return mWrapped != null;
-        }
-
-        @Override
-        public boolean onCreateActionMode(ActionMode mode, Menu menu) {
-            if (mWrapped.onCreateActionMode(mode, menu)) {
-                // Initialize checked graphic state?
-                setLongClickable(false);
-                return true;
-            }
-            return false;
-        }
-
-        @Override
-        public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
-            return mWrapped.onPrepareActionMode(mode, menu);
-        }
-
-        @Override
-        public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
-            return mWrapped.onActionItemClicked(mode, item);
-        }
-
-        @Override
-        public void onDestroyActionMode(ActionMode mode) {
-            mWrapped.onDestroyActionMode(mode);
-            mChoiceActionMode = null;
-
-            // Ending selection mode means deselecting everything.
-            clearChoices();
-
-            requestLayout();
-
-            setLongClickable(true);
-        }
-
-        @Override
-        public void onItemCheckedStateChanged(ActionMode mode,
-                                              int position, long id, boolean checked) {
-            mWrapped.onItemCheckedStateChanged(mode, position, id, checked);
-
-            // If there are no items selected we no longer need the selection mode.
-            if (getCheckedItemCount() == 0) {
-                mode.finish();
-            }
-        }
-    }
-}

app/src/main/java/com/hippo/easyrecyclerview/FastScroller.java

@@ -1,404 +0,0 @@
-/*
- * 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.easyrecyclerview;
-
-import android.animation.Animator;
-import android.animation.ObjectAnimator;
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.drawable.Drawable;
-import android.os.Handler;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewConfiguration;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.hippo.ehviewer.R;
-import com.hippo.yorozuya.AnimationUtils;
-import com.hippo.yorozuya.LayoutUtils;
-import com.hippo.yorozuya.MathUtils;
-import com.hippo.yorozuya.SimpleAnimatorListener;
-import com.hippo.yorozuya.SimpleHandler;
-
-public class FastScroller extends View {
-
-    private static final int INVALID = -1;
-
-    private static final int SCROLL_BAR_FADE_DURATION = 500;
-    private static final int SCROLL_BAR_DELAY = 1000;
-
-    private static final int MIN_HANDLER_HEIGHT_DP = 32;
-
-    private Handler mSimpleHandler;
-
-    private boolean mDraggable;
-
-    private int mMinHandlerHeight;
-
-    private RecyclerView mRecyclerView;
-    private RecyclerView.OnScrollListener mOnScrollChangeListener;
-    private RecyclerView.Adapter<?> mAdapter;
-    private RecyclerView.AdapterDataObserver mAdapterDataObserver;
-
-    private Drawable mHandler;
-    private int mHandlerOffset = INVALID;
-    private int mHandlerHeight = INVALID;
-
-    private float mDownX = INVALID;
-    private float mDownY = INVALID;
-
-    private float mLastMotionY = INVALID;
-
-    private boolean mDragged = false;
-
-    private boolean mCantDrag = false;
-
-    private int mTouchSlop;
-
-    private OnDragHandlerListener mListener;
-
-    private ObjectAnimator mShowAnimator;
-    private ObjectAnimator mHideAnimator;
-
-    private final Runnable mHideRunnable = new Runnable() {
-        @Override
-        public void run() {
-            mHideAnimator.start();
-        }
-    };
-
-    public FastScroller(Context context) {
-        super(context);
-        init(context, null, 0);
-    }
-
-    public FastScroller(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init(context, attrs, 0);
-    }
-
-    public FastScroller(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        init(context, attrs, defStyleAttr);
-    }
-
-    private void init(Context context, AttributeSet attrs, int defStyleAttr) {
-        mSimpleHandler = SimpleHandler.getInstance();
-
-        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.FastScroller, defStyleAttr, 0);
-        mHandler = a.getDrawable(R.styleable.FastScroller_handler);
-        mDraggable = a.getBoolean(R.styleable.FastScroller_draggable, true);
-        a.recycle();
-
-        setAlpha(0.0f);
-        setVisibility(INVISIBLE);
-
-        mMinHandlerHeight = LayoutUtils.dp2pix(context, MIN_HANDLER_HEIGHT_DP);
-        mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
-
-        mShowAnimator = ObjectAnimator.ofFloat(this, "alpha", 1.0f);
-        mShowAnimator.setInterpolator(AnimationUtils.FAST_SLOW_INTERPOLATOR);
-        mShowAnimator.setDuration(SCROLL_BAR_FADE_DURATION);
-
-        mHideAnimator = ObjectAnimator.ofFloat(this, "alpha", 0.0f);
-        mHideAnimator.setInterpolator(AnimationUtils.SLOW_FAST_INTERPOLATOR);
-        mHideAnimator.setDuration(SCROLL_BAR_FADE_DURATION);
-        mHideAnimator.addListener(new SimpleAnimatorListener() {
-
-            private boolean mCancel;
-
-            @Override
-            public void onAnimationCancel(Animator animation) {
-                mCancel = true;
-            }
-
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                if (mCancel) {
-                    mCancel = false;
-                } else {
-                    setVisibility(INVISIBLE);
-                }
-            }
-        });
-    }
-
-    public void setOnDragHandlerListener(OnDragHandlerListener listener) {
-        mListener = listener;
-    }
-
-    private void updatePosition(boolean show) {
-        if (mRecyclerView == null) {
-            return;
-        }
-
-        int paddingTop = getPaddingTop();
-        int paddingBottom = getPaddingBottom();
-        int height = getHeight() - paddingTop - paddingBottom;
-        int offset = mRecyclerView.computeVerticalScrollOffset();
-        int extent = mRecyclerView.computeVerticalScrollExtent();
-        int range = mRecyclerView.computeVerticalScrollRange();
-
-        if (height <= 0 || extent >= range || extent <= 0) {
-            return;
-        }
-
-        int endOffset = height * offset / range;
-        int endHeight = height * extent / range;
-
-        endHeight = Math.max(endHeight, mMinHandlerHeight);
-        endOffset = Math.min(endOffset, height - endHeight);
-
-        mHandlerOffset = endOffset + paddingTop;
-        mHandlerHeight = endHeight;
-
-        if (show) {
-            if (mHideAnimator.isRunning()) {
-                mHideAnimator.cancel();
-                mShowAnimator.start();
-            } else if (getVisibility() != VISIBLE && !mShowAnimator.isRunning()) {
-                setVisibility(VISIBLE);
-                mShowAnimator.start();
-            }
-
-            Handler handler = mSimpleHandler;
-            handler.removeCallbacks(mHideRunnable);
-
-            if (!mDragged) {
-                handler.postDelayed(mHideRunnable, SCROLL_BAR_DELAY);
-            }
-        }
-    }
-
-    public void setHandlerDrawable(Drawable drawable) {
-        mHandler = drawable;
-        invalidate();
-    }
-
-    public boolean isDraggable() {
-        return mDraggable;
-    }
-
-    public void setDraggable(boolean draggable) {
-        mDraggable = draggable;
-        if (mDragged) {
-            mDragged = false;
-        }
-        mSimpleHandler.removeCallbacks(mHideRunnable);
-        mHideRunnable.run();
-    }
-
-    public boolean isAttached() {
-        return mRecyclerView != null;
-    }
-
-    public void attachToRecyclerView(RecyclerView recyclerView) {
-        if (recyclerView == null) {
-            return;
-        }
-
-        if (mRecyclerView != null) {
-            throw new IllegalStateException("The FastScroller is already attached to a RecyclerView, " +
-                    "call detachedFromRecyclerView first");
-        }
-
-        mRecyclerView = recyclerView;
-        mOnScrollChangeListener = new RecyclerView.OnScrollListener() {
-
-            @Override
-            public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
-            }
-
-            @Override
-            public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
-                updatePosition(true);
-                invalidate();
-            }
-        };
-
-        recyclerView.addOnScrollListener(mOnScrollChangeListener);
-
-        mAdapter = recyclerView.getAdapter();
-        if (mAdapter != null) {
-            mAdapterDataObserver = new RecyclerView.AdapterDataObserver() {
-                @Override
-                public void onItemRangeChanged(int positionStart, int itemCount) {
-                    super.onItemRangeChanged(positionStart, itemCount);
-                    updatePosition(false);
-                    invalidate();
-                }
-
-                @Override
-                public void onItemRangeChanged(int positionStart, int itemCount, Object payload) {
-                    super.onItemRangeChanged(positionStart, itemCount, payload);
-                    updatePosition(false);
-                    invalidate();
-                }
-
-                @Override
-                public void onItemRangeInserted(int positionStart, int itemCount) {
-                    super.onItemRangeInserted(positionStart, itemCount);
-                    updatePosition(false);
-                    invalidate();
-                }
-
-                @Override
-                public void onItemRangeRemoved(int positionStart, int itemCount) {
-                    super.onItemRangeRemoved(positionStart, itemCount);
-                    updatePosition(false);
-                    invalidate();
-                }
-
-                @Override
-                public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) {
-                    super.onItemRangeMoved(fromPosition, toPosition, itemCount);
-                    updatePosition(false);
-                    invalidate();
-                }
-            };
-            mAdapter.registerAdapterDataObserver(mAdapterDataObserver);
-        }
-    }
-
-    public void detachedFromRecyclerView() {
-        if (mRecyclerView != null && mOnScrollChangeListener != null) {
-            mRecyclerView.removeOnScrollListener(mOnScrollChangeListener);
-        }
-        mRecyclerView = null;
-        mOnScrollChangeListener = null;
-
-        if (mAdapter != null && mAdapterDataObserver != null) {
-            mAdapter.unregisterAdapterDataObserver(mAdapterDataObserver);
-        }
-        mAdapter = null;
-        mAdapterDataObserver = null;
-
-        setAlpha(0.0f);
-        setVisibility(INVISIBLE);
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        if (mRecyclerView == null || mHandler == null) {
-            return;
-        }
-        if (mHandlerHeight == INVALID) {
-            updatePosition(false);
-        }
-        if (mHandlerHeight == INVALID) {
-            return;
-        }
-
-        int paddingLeft = getPaddingLeft();
-        int saved = canvas.save();
-        canvas.translate(paddingLeft, mHandlerOffset);
-        mHandler.setBounds(0, 0, getWidth() - paddingLeft - getPaddingRight(), mHandlerHeight);
-        mHandler.draw(canvas);
-        canvas.restoreToCount(saved);
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        if (!mDraggable || getVisibility() != VISIBLE || mRecyclerView == null || mHandlerHeight == INVALID) {
-            return false;
-        }
-
-        int action = event.getAction();
-        if (action == MotionEvent.ACTION_DOWN) {
-            mCantDrag = false;
-        }
-
-        if (mCantDrag) {
-            return false;
-        }
-
-        switch (action) {
-            case MotionEvent.ACTION_DOWN: {
-                mDragged = false;
-                mDownX = event.getX();
-                mDownY = event.getY();
-                if (mDownY < mHandlerOffset || mDownY > mHandlerOffset + mHandlerHeight) {
-                    mCantDrag = true;
-                    return false;
-                }
-                break;
-            }
-            case MotionEvent.ACTION_MOVE: {
-                if (!mDragged) {
-                    float x = event.getX();
-                    float y = event.getY();
-                    // Check touch slop
-                    if (MathUtils.dist(x, y, mDownX, mDownY) < mTouchSlop) {
-                        return true;
-                    }
-                    if (Math.abs(x - mDownX) > Math.abs(y - mDownY) ||
-                            y < mHandlerOffset || y > mHandlerOffset + mHandlerHeight) {
-                        mCantDrag = true;
-                        return false;
-                    } else {
-                        mDragged = true;
-                        mSimpleHandler.removeCallbacks(mHideRunnable);
-                        // Update mLastMotionY
-                        if (mDownY < mHandlerOffset || mDownY >= mHandlerOffset + mHandlerHeight) {
-                            // the point out of handler, make the point in handler center
-                            mLastMotionY = mHandlerOffset + mHandlerHeight / 2;
-                        } else {
-                            mLastMotionY = mDownY;
-                        }
-                        // Notify
-                        if (mListener != null) {
-                            mListener.onStartDragHandler();
-                        }
-                    }
-                }
-
-                int range = mRecyclerView.computeVerticalScrollRange();
-                if (range <= 0) {
-                    break;
-                }
-                float y = event.getY();
-                int scroll = (int) (range * (y - mLastMotionY) / (getHeight() - getPaddingTop() - getPaddingBottom()));
-                mRecyclerView.scrollBy(0, scroll);
-                mLastMotionY = y;
-                break;
-            }
-            case MotionEvent.ACTION_UP:
-            case MotionEvent.ACTION_CANCEL:
-                // Notify
-                if (mDragged && mListener != null) {
-                    mListener.onEndDragHandler();
-                }
-                mDragged = false;
-                mSimpleHandler.postDelayed(mHideRunnable, SCROLL_BAR_DELAY);
-                break;
-        }
-
-        return true;
-    }
-
-    public interface OnDragHandlerListener {
-        void onStartDragHandler();
-
-        void onEndDragHandler();
-    }
-}

app/src/main/java/com/hippo/easyrecyclerview/HandlerDrawable.java

@@ -1,86 +0,0 @@
-/*
- * 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.easyrecyclerview;
-
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.ColorFilter;
-import android.graphics.Paint;
-import android.graphics.PixelFormat;
-import android.graphics.RectF;
-import android.graphics.drawable.Drawable;
-
-import androidx.annotation.NonNull;
-
-public class HandlerDrawable extends Drawable {
-
-    private final Paint mPaint;
-    private final RectF mTemp = new RectF();
-    private int mColor = Color.BLACK;
-
-    public HandlerDrawable() {
-        mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-        mPaint.setColor(mColor);
-        mPaint.setStyle(Paint.Style.FILL);
-    }
-
-    @Override
-    public void draw(@NonNull Canvas canvas) {
-        int width = getBounds().width();
-        int height = getBounds().height();
-
-        if (width > height) {
-            canvas.drawRect(0, 0, width, height, mPaint);
-        } else {
-            mTemp.set(0, 0, width, width);
-            canvas.drawArc(mTemp, -180, 180, true, mPaint);
-            mTemp.set(0, height - width, width, height);
-            canvas.drawArc(mTemp, 0, 180, true, mPaint);
-            float halfWidth = (float) width / 2.0f;
-            canvas.drawRect(0, halfWidth, width, height - halfWidth, mPaint);
-        }
-    }
-
-    public void setColor(int color) {
-        if (mColor != color) {
-            mColor = color;
-            mPaint.setColor(color);
-        }
-    }
-
-    @Override
-    public void setAlpha(int alpha) {
-        mPaint.setAlpha(alpha);
-    }
-
-    @Override
-    public void setColorFilter(ColorFilter colorFilter) {
-        mPaint.setColorFilter(colorFilter);
-    }
-
-    @Override
-    public int getOpacity() {
-        int alpha = Color.alpha(mColor);
-        if (alpha == 0xff) {
-            return PixelFormat.OPAQUE;
-        } else if (alpha == 0x00) {
-            return PixelFormat.TRANSPARENT;
-        } else {
-            return PixelFormat.TRANSLUCENT;
-        }
-    }
-}

app/src/main/java/com/hippo/easyrecyclerview/LayoutManagerUtils.java

@@ -1,151 +0,0 @@
-/*
- * 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.easyrecyclerview;
-
-import android.content.Context;
-import android.graphics.PointF;
-
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.StaggeredGridLayoutManager;
-
-import com.hippo.yorozuya.MathUtils;
-import com.hippo.yorozuya.SimpleHandler;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-public final class LayoutManagerUtils {
-
-    private static Method sCsdfp = null;
-
-    static {
-        try {
-            sCsdfp = StaggeredGridLayoutManager.class.getDeclaredMethod("calculateScrollDirectionForPosition", int.class);
-            sCsdfp.setAccessible(true);
-        } catch (NoSuchMethodException e) {
-            // Ignore
-            e.printStackTrace();
-        }
-    }
-
-    public static void scrollToPositionWithOffset(
-            RecyclerView.LayoutManager layoutManager, int position, int offset) {
-        if (layoutManager instanceof LinearLayoutManager) {
-            ((LinearLayoutManager) layoutManager).scrollToPositionWithOffset(position, offset);
-        } else if (layoutManager instanceof StaggeredGridLayoutManager) {
-            ((StaggeredGridLayoutManager) layoutManager).scrollToPositionWithOffset(position, offset);
-        } else {
-            throw new IllegalStateException("Can't do scrollToPositionWithOffset for " +
-                    layoutManager.getClass().getName());
-        }
-    }
-
-    public static void smoothScrollToPosition(
-            RecyclerView.LayoutManager layoutManager, Context context, int position) {
-        smoothScrollToPosition(layoutManager, context, position, -1);
-    }
-
-    public static void smoothScrollToPosition(
-            RecyclerView.LayoutManager layoutManager, Context context, int position,
-            int millisecondsPerInch) {
-        SimpleSmoothScroller smoothScroller;
-        if (layoutManager instanceof final LinearLayoutManager linearLayoutManager) {
-            smoothScroller = new SimpleSmoothScroller(context, millisecondsPerInch) {
-                @Override
-                public PointF computeScrollVectorForPosition(int targetPosition) {
-                    return linearLayoutManager.computeScrollVectorForPosition(targetPosition);
-                }
-            };
-
-        } else if (layoutManager instanceof final StaggeredGridLayoutManager staggeredGridLayoutManager) {
-            smoothScroller = new SimpleSmoothScroller(context, millisecondsPerInch) {
-                @Override
-                public PointF computeScrollVectorForPosition(int targetPosition) {
-                    int direction = 0;
-                    try {
-                        direction = (Integer) sCsdfp.invoke(staggeredGridLayoutManager, targetPosition);
-                    } catch (IllegalAccessException | InvocationTargetException e) {
-                        e.printStackTrace();
-                    }
-
-                    if (direction == 0) {
-                        return null;
-                    }
-                    if (staggeredGridLayoutManager.getOrientation() == StaggeredGridLayoutManager.HORIZONTAL) {
-                        return new PointF(direction, 0);
-                    } else {
-                        return new PointF(0, direction);
-                    }
-                }
-            };
-
-        } else {
-            throw new IllegalStateException("Can't do smoothScrollToPosition for " +
-                    layoutManager.getClass().getName());
-        }
-        smoothScroller.setTargetPosition(position);
-        layoutManager.startSmoothScroll(smoothScroller);
-    }
-
-    public static void scrollToPositionProperly(final RecyclerView.LayoutManager layoutManager,
-                                                final Context context, final int position, final OnScrollToPositionListener listener) {
-        SimpleHandler.getInstance().postDelayed(() -> {
-            int first = getFirstVisibleItemPosition(layoutManager);
-            int last = getLastVisibleItemPosition(layoutManager);
-            int offset = Math.abs(position - first);
-            int max = last - first;
-            if (offset < max && max > 0) {
-                smoothScrollToPosition(layoutManager, context, position,
-                        MathUtils.lerp(100, 25, (offset / max)));
-            } else {
-                scrollToPositionWithOffset(layoutManager, position, 0);
-                if (listener != null) {
-                    listener.onScrollToPosition(position);
-                }
-            }
-        }, 200);
-    }
-
-    public static int getFirstVisibleItemPosition(RecyclerView.LayoutManager layoutManager) {
-        if (layoutManager instanceof LinearLayoutManager) {
-            return ((LinearLayoutManager) layoutManager).findFirstVisibleItemPosition();
-        } else if (layoutManager instanceof StaggeredGridLayoutManager) {
-            int[] positions = ((StaggeredGridLayoutManager) layoutManager).findFirstVisibleItemPositions(null);
-            return MathUtils.min(positions);
-        } else {
-            throw new IllegalStateException("Can't do getFirstVisibleItemPosition for " +
-                    layoutManager.getClass().getName());
-        }
-    }
-
-    public static int getLastVisibleItemPosition(RecyclerView.LayoutManager layoutManager) {
-        if (layoutManager instanceof LinearLayoutManager) {
-            return ((LinearLayoutManager) layoutManager).findLastVisibleItemPosition();
-        } else if (layoutManager instanceof StaggeredGridLayoutManager) {
-            int[] positions = ((StaggeredGridLayoutManager) layoutManager).findLastVisibleItemPositions(null);
-            return MathUtils.max(positions);
-        } else {
-            throw new IllegalStateException("Can't do getLastVisibleItemPosition for " +
-                    layoutManager.getClass().getName());
-        }
-    }
-
-    public interface OnScrollToPositionListener {
-        void onScrollToPosition(int position);
-    }
-}

app/src/main/java/com/hippo/easyrecyclerview/MarginItemDecoration.java

@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2015 Hippo Seven
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hippo.easyrecyclerview;
-
-import android.graphics.Rect;
-import android.view.View;
-
-import androidx.recyclerview.widget.RecyclerView;
-
-public class MarginItemDecoration extends RecyclerView.ItemDecoration {
-
-    private int mMargin;
-    private int mPaddingLeft;
-    private int mPaddingTop;
-    private int mPaddingRight;
-    private int mPaddingBottom;
-
-    public MarginItemDecoration(int margin, int paddingLeft, int paddingTop,
-                                int paddingRight, int paddingBottom) {
-        setMargin(margin, paddingLeft, paddingTop, paddingRight, paddingBottom);
-    }
-
-    @Override
-    public void getItemOffsets(Rect outRect, View view,
-                               RecyclerView parent, RecyclerView.State state) {
-        outRect.set(mMargin, mMargin, mMargin, mMargin);
-    }
-
-    /**
-     * @param margin        gap between two item
-     * @param paddingLeft   gap between RecyclerView left and left item left
-     * @param paddingTop    gap between RecyclerView top and top item top
-     * @param paddingRight  gap between RecyclerView right and right item right
-     * @param paddingBottom gap between RecyclerView bottom and bottom item bottom
-     */
-    public void setMargin(int margin, int paddingLeft, int paddingTop,
-                          int paddingRight, int paddingBottom) {
-        int halfMargin = margin / 2;
-        mMargin = halfMargin;
-        mPaddingLeft = paddingLeft - halfMargin;
-        mPaddingTop = paddingTop - halfMargin;
-        mPaddingRight = paddingRight - halfMargin;
-        mPaddingBottom = paddingBottom - halfMargin;
-    }
-
-    public void applyPaddings(View view) {
-        view.setPadding(mPaddingLeft, mPaddingTop, mPaddingRight, mPaddingBottom);
-    }
-}

app/src/main/java/com/hippo/easyrecyclerview/SimpleSmoothScroller.java

@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2015 Hippo Seven
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hippo.easyrecyclerview;
-
-import android.content.Context;
-
-import androidx.recyclerview.widget.LinearSmoothScroller;
-
-public abstract class SimpleSmoothScroller extends LinearSmoothScroller {
-
-    private final float mMillisecondsPerPx;
-
-    public SimpleSmoothScroller(Context context, float millisecondsPerInch) {
-        super(context);
-        mMillisecondsPerPx = millisecondsPerInch / context.getResources().getDisplayMetrics().densityDpi;
-    }
-
-    @Override
-    protected int calculateTimeForScrolling(int dx) {
-        if (mMillisecondsPerPx <= 0) {
-            return super.calculateTimeForScrolling(dx);
-        } else {
-            return (int) Math.ceil(Math.abs(dx) * mMillisecondsPerPx);
-        }
-    }
-}

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

@@ -1,178 +0,0 @@
-/*
- * Copyright 2016 Hippo Seven
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hippo.ehviewer;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.os.Environment;
-
-import androidx.annotation.Nullable;
-
-import com.hippo.ehviewer.client.exception.ParseException;
-import com.hippo.util.ReadableTime;
-import com.hippo.yorozuya.FileUtils;
-import com.hippo.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(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');
-            }
-            if (null != body) {
-                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,173 +0,0 @@
-/*
- * Copyright 2019 Hippo Seven
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.hippo.ehviewer
-
-import android.os.Build
-import android.os.Debug
-import com.hippo.util.ReadableTime
-import com.hippo.yorozuya.FileUtils
-import com.hippo.yorozuya.IOUtils
-import com.hippo.yorozuya.OSUtils
-import java.io.File
-import java.io.FileWriter
-import java.io.IOException
-import java.io.PrintWriter
-import java.util.Arrays
-
-object Crash {
-
-    @Throws(IOException::class)
-    private fun collectInfo(fw: FileWriter) {
-        fw.write("======== PackageInfo ========\r\n")
-        fw.write("PackageName=")
-        fw.write(BuildConfig.APPLICATION_ID)
-        fw.write("\r\n")
-        fw.write("VersionName=")
-        fw.write(BuildConfig.VERSION_NAME)
-        fw.write("\r\n")
-        fw.write("VersionCode=")
-        fw.write(BuildConfig.VERSION_CODE)
-        fw.write("\r\n")
-        fw.write("CommitSha=")
-        fw.write(BuildConfig.COMMIT_SHA)
-        fw.write("\r\n")
-        fw.write("BuildTime=")
-        fw.write(BuildConfig.BUILD_TIME)
-        fw.write("\r\n")
-        fw.write("\r\n")
-
-        // Runtime
-        val topActivityClazzName = EhApplication.application.topActivity?.javaClass?.name
-        fw.write("======== Runtime ========\r\n")
-        fw.write("TopActivity=")
-        fw.write(topActivityClazzName ?: "null")
-        fw.write("\r\n")
-        fw.write("\r\n")
-        fw.write("\r\n")
-
-        // Device info
-        fw.write("======== DeviceInfo ========\r\n")
-        fw.write("BOARD=")
-        fw.write(Build.BOARD)
-        fw.write("\r\n")
-        fw.write("BOOTLOADER=")
-        fw.write(Build.BOOTLOADER)
-        fw.write("\r\n")
-        fw.write("SUPPORTED_ABIS=")
-        fw.write(Arrays.toString(Build.SUPPORTED_ABIS))
-        fw.write("\r\n")
-        fw.write("DEVICE=")
-        fw.write(Build.DEVICE)
-        fw.write("\r\n")
-        fw.write("DISPLAY=")
-        fw.write(Build.DISPLAY)
-        fw.write("\r\n")
-        fw.write("FINGERPRINT=")
-        fw.write(Build.FINGERPRINT)
-        fw.write("\r\n")
-        fw.write("HARDWARE=")
-        fw.write(Build.HARDWARE)
-        fw.write("\r\n")
-        fw.write("HOST=")
-        fw.write(Build.HOST)
-        fw.write("\r\n")
-        fw.write("ID=")
-        fw.write(Build.ID)
-        fw.write("\r\n")
-        fw.write("MANUFACTURER=")
-        fw.write(Build.MANUFACTURER)
-        fw.write("\r\n")
-        fw.write("MODEL=")
-        fw.write(Build.MODEL)
-        fw.write("\r\n")
-        fw.write("PRODUCT=")
-        fw.write(Build.PRODUCT)
-        fw.write("\r\n")
-        fw.write("RADIO=")
-        fw.write(Build.getRadioVersion())
-        fw.write("\r\n")
-        fw.write("TAGS=")
-        fw.write(Build.TAGS)
-        fw.write("\r\n")
-        fw.write("TYPE=")
-        fw.write(Build.TYPE)
-        fw.write("\r\n")
-        fw.write("USER=")
-        fw.write(Build.USER)
-        fw.write("\r\n")
-        fw.write("CODENAME=")
-        fw.write(Build.VERSION.CODENAME)
-        fw.write("\r\n")
-        fw.write("INCREMENTAL=")
-        fw.write(Build.VERSION.INCREMENTAL)
-        fw.write("\r\n")
-        fw.write("RELEASE=")
-        fw.write(Build.VERSION.RELEASE)
-        fw.write("\r\n")
-        fw.write("SDK=")
-        fw.write(Build.VERSION.SDK_INT.toString())
-        fw.write("\r\n")
-        fw.write("MEMORY=")
-        fw.write(
-            FileUtils.humanReadableByteCount(OSUtils.getAppAllocatedMemory(), false)
-        )
-        fw.write("\r\n")
-        fw.write("MEMORY_NATIVE=")
-        fw.write(FileUtils.humanReadableByteCount(Debug.getNativeHeapAllocatedSize(), false))
-        fw.write("\r\n")
-        fw.write("MEMORY_MAX=")
-        fw.write(FileUtils.humanReadableByteCount(OSUtils.getAppMaxMemory(), false))
-        fw.write("\r\n")
-        fw.write("MEMORY_TOTAL=")
-        fw.write(FileUtils.humanReadableByteCount(OSUtils.getTotalMemory(), false))
-        fw.write("\r\n")
-        fw.write("\r\n")
-    }
-
-    private fun getThrowableInfo(t: Throwable, fw: FileWriter) {
-        val printWriter = PrintWriter(fw)
-        t.printStackTrace(printWriter)
-        var cause = t.cause
-        while (cause != null) {
-            cause.printStackTrace(printWriter)
-            cause = cause.cause
-        }
-    }
-
-    fun saveCrashLog(t: Throwable) {
-        val dir = AppConfig.getExternalCrashDir() ?: return
-        val nowString = ReadableTime.getFilenamableTime(System.currentTimeMillis())
-        val fileName = "crash-$nowString.log"
-        val file = File(dir, fileName)
-        var fw: FileWriter? = null
-        try {
-            fw = FileWriter(file)
-            fw.write("TIME=")
-            fw.write(nowString)
-            fw.write("\r\n")
-            fw.write("\r\n")
-            collectInfo(fw)
-            fw.write("======== CrashInfo ========\r\n")
-            getThrowableInfo(t, fw)
-            fw.write("\r\n")
-            fw.flush()
-        } catch (e: Exception) {
-            file.delete()
-        } finally {
-            IOUtils.closeQuietly(fw)
-        }
-    }
-}

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

@@ -16,84 +16,87 @@
 
 package com.hippo.ehviewer
 
-import android.annotation.SuppressLint
-import android.app.Activity
 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 coil.ImageLoader
+import androidx.lifecycle.coroutineScope
 import coil.ImageLoaderFactory
+import coil.decode.ImageDecoderDecoder
 import coil.util.DebugLogger
-import com.hippo.Native
+import com.google.android.gms.net.CronetProviderInstaller
 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.dao.buildMainDB
+import com.hippo.ehviewer.coil.installCronetHttpUriFetcher
+import com.hippo.ehviewer.dailycheck.checkDawn
+import com.hippo.ehviewer.dao.SearchDatabase
 import com.hippo.ehviewer.download.DownloadManager
-import com.hippo.ehviewer.ui.CommonOperations
-import com.hippo.ehviewer.ui.EhActivity
-import com.hippo.util.ExceptionUtils
-import com.hippo.util.ReadableTime
-import com.hippo.yorozuya.FileUtils
-import com.hippo.yorozuya.IntIdGenerator
-import eu.kanade.tachiyomi.core.preference.AndroidPreferenceStore
-import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences
+import 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 eu.kanade.tachiyomi.util.lang.launchIO
-import kotlinx.coroutines.DelicateCoroutinesApi
-import okhttp3.OkHttpClient
-import java.net.Proxy
-import java.security.KeyStore
-import javax.net.ssl.TrustManagerFactory
-import javax.net.ssl.X509TrustManager
+import eu.kanade.tachiyomi.util.lang.withUIContext
+import kotlinx.coroutines.launch
+import moe.tarsin.kt.unreachable
+import okhttp3.AsyncDns
+import okhttp3.android.AndroidAsyncDns
+import okio.Path.Companion.toOkioPath
+import splitties.arch.room.roomDb
+import splitties.init.appCtx
 
-class EhApplication : Application(), DefaultLifecycleObserver, ImageLoaderFactory {
-    private val mIdGenerator = IntIdGenerator()
-    private val mGlobalStuffMap = HashMap<Int, Any>()
-    private val mActivityList = ArrayList<Activity>()
-    val topActivity: EhActivity?
-        get() = if (mActivityList.isNotEmpty()) {
-            mActivityList[mActivityList.size - 1] as EhActivity
-        } else {
-            null
-        }
+private val lifecycle = ProcessLifecycleOwner.get().lifecycle
+private val lifecycleScope = lifecycle.coroutineScope
 
-    fun recreateAllActivity() {
-        mActivityList.forEach { it.recreate() }
-    }
-
-    @OptIn(DelicateCoroutinesApi::class)
-    @SuppressLint("StaticFieldLeak")
+class EhApplication : Application(), ImageLoaderFactory {
     override fun onCreate() {
-        ProcessLifecycleOwner.get().lifecycle.addObserver(this)
-        application = this
+        lifecycle.addObserver(lockObserver)
         val handler = Thread.getDefaultUncaughtExceptionHandler()
         Thread.setDefaultUncaughtExceptionHandler { t, e ->
             try {
-                if (Settings.getSaveCrashLog()) {
+                if (Settings.saveCrashLog) {
                     Crash.saveCrashLog(e)
                 }
             } catch (ignored: Throwable) {
             }
             handler?.uncaughtException(t, e)
         }
-        super<Application>.onCreate()
-        Native.initialize()
-        GetText.initialize(this)
-        Settings.initialize()
+        super.onCreate()
+        CronetProviderInstaller.installProvider(appCtx)
+        System.loadLibrary("ehviewer")
+        System.loadLibrary("ehviewer_rust")
         ReadableTime.initialize(this)
-        AppConfig.initialize(this)
-        EhTagDatabase.update()
-        AppCompatDelegate.setDefaultNightMode(Settings.getTheme())
-        launchIO {
+        lifecycleScope.launchIO {
+            val theme = Settings.theme
+            withUIContext {
+                AppCompatDelegate.setDefaultNightMode(theme)
+            }
+        }
+        lifecycleScope.launchIO {
             launchIO {
-                ehDatabase
+                migrateCookies()
+            }
+            launchIO {
+                EhTagDatabase.update()
+            }
+            launchIO {
+                EhDB
             }
             launchIO {
                 DownloadManager.isIdle
@@ -101,38 +104,34 @@ class EhApplication : Application(), DefaultLifecycleObserver, ImageLoaderFactor
             launchIO {
                 cleanupDownload()
             }
+            if (Settings.requestNews) {
+                launchIO {
+                    checkDawn()
+                }
+            }
         }
-        mIdGenerator.setNextId(Settings.getInt(KEY_GLOBAL_STUFF_NEXT_ID, 0))
+        cleanObsoleteCache(this)
     }
 
-    private fun cleanupDownload() {
-        try {
-            val downloadLocation = Settings.getDownloadLocation()
-            if (Settings.getMediaScan()) {
-                CommonOperations.removeNoMediaFile(downloadLocation)
-            } else {
-                CommonOperations.ensureNoMediaFile(downloadLocation)
-            }
-        } catch (t: Throwable) {
-            t.printStackTrace()
-            ExceptionUtils.throwIfFatal(t)
+    private suspend fun cleanupDownload() {
+        runCatching {
+            keepNoMediaFileStatus()
+        }.onFailure {
+            it.printStackTrace()
         }
-
-        // Clear temp files
-        try {
+        runCatching {
             clearTempDir()
-        } catch (t: Throwable) {
-            t.printStackTrace()
-            ExceptionUtils.throwIfFatal(t)
+        }.onFailure {
+            it.printStackTrace()
         }
     }
 
     private fun clearTempDir() {
-        var dir = AppConfig.getTempDir()
+        var dir = AppConfig.tempDir
         if (null != dir) {
             FileUtils.deleteContent(dir)
         }
-        dir = AppConfig.getExternalTempDir()
+        dir = AppConfig.externalTempDir
         if (null != dir) {
             FileUtils.deleteContent(dir)
         }
@@ -145,106 +144,67 @@ class EhApplication : Application(), DefaultLifecycleObserver, ImageLoaderFactor
         }
     }
 
-    fun putGlobalStuff(o: Any): Int {
-        val id = mIdGenerator.nextId()
-        mGlobalStuffMap[id] = o
-        Settings.putInt(KEY_GLOBAL_STUFF_NEXT_ID, mIdGenerator.nextId())
-        return id
-    }
-
-    fun containGlobalStuff(id: Int): Boolean {
-        return mGlobalStuffMap.containsKey(id)
-    }
-
-    fun getGlobalStuff(id: Int): Any? {
-        return mGlobalStuffMap[id]
-    }
-
-    fun removeGlobalStuff(id: Int): Any? {
-        return mGlobalStuffMap.remove(id)
-    }
-
-    fun removeGlobalStuff(o: Any) {
-        mGlobalStuffMap.values.removeAll(setOf(o))
-    }
-
-    fun registerActivity(activity: Activity) {
-        mActivityList.add(activity)
-    }
-
-    fun unregisterActivity(activity: Activity) {
-        mActivityList.remove(activity)
-    }
-
-    override fun onPause(owner: LifecycleOwner) {
-        if (!locked)
-            locked_last_leave_time = System.currentTimeMillis() / 1000
-        locked = true
-    }
-
-    override fun newImageLoader(): ImageLoader {
-        return ImageLoader.Builder(this).apply {
-            okHttpClient(okHttpClient)
-            components { add(MergeInterceptor) }
-            crossfade(300)
-            if (BuildConfig.DEBUG) logger(DebugLogger())
-        }.build()
+    override fun newImageLoader() = imageLoader {
+        components {
+            if (isCronetSupported) {
+                callFactory { unreachable() }
+                installCronetHttpUriFetcher()
+            } else {
+                callFactory(baseOkHttpClient)
+            }
+            add { result, options, _ -> ImageDecoderDecoder(result.source, options, false) }
+            add(MergeInterceptor)
+        }
+        diskCache(imageCache)
+        crossfade(300)
+        error(R.drawable.image_failed)
+        if (BuildConfig.DEBUG) logger(DebugLogger())
+        respectCacheHeaders(false)
     }
 
     companion object {
-        private const val KEY_GLOBAL_STUFF_NEXT_ID = "global_stuff_next_id"
-        var locked = true
-        var locked_last_leave_time: Long = 0
+        val baseOkHttpClient by lazy {
+            httpClient {
+                cookieJar(EhCookieStore)
+                if (isAtLeastQ) {
+                    dns(AsyncDns.toDns(AndroidAsyncDns.IPv4, AndroidAsyncDns.IPv6))
+                }
+                chunker { alwaysReadResponseBody(false) }
+                addInterceptor(CloudflareInterceptor(appCtx))
+            }
+        }
 
-        @JvmStatic
-        lateinit var application: EhApplication
-            private set
+        val noRedirectOkHttpClient by lazy {
+            httpClient(baseOkHttpClient) {
+                followRedirects(false)
+            }
+        }
 
-        @JvmStatic
-        val ehCookieStore by lazy { EhCookieStore }
-
-        @JvmStatic
-        val ehProxySelector by lazy { EhProxySelector() }
-
-        @JvmStatic
+        // Never use this okhttp client to download large blobs!!!
         val okHttpClient by lazy {
-            val builder = OkHttpClient.Builder()
-                .cookieJar(ehCookieStore)
-                .dns(EhDns)
-                .proxySelector(ehProxySelector)
-
-            if (Settings.getDF()) {
-                val factory =
-                    TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())!!
-                factory.init(null as KeyStore?)
-                val manager = factory.trustManagers!!
-
-                val trustManager = manager.filterIsInstance<X509TrustManager>().first()
-                builder.sslSocketFactory(EhSSLSocketFactory, trustManager)
-                builder.proxy(Proxy.NO_PROXY)
+            httpClient(baseOkHttpClient) {
+                cache(
+                    appCtx.cacheDir.toOkioPath() / "http_cache",
+                    20L * 1024L * 1024L,
+                )
             }
-            builder.build()
         }
 
-        @JvmStatic
         val galleryDetailCache by lazy {
             LruCache<Long, GalleryDetail>(25).also {
-                favouriteStatusRouter.addListener { gid, slot ->
-                    it[gid]?.favoriteSlot = slot
+                lifecycleScope.launch {
+                    FavouriteStatusRouter.globalFlow.collect { (gid, slot) -> it[gid]?.favoriteSlot = slot }
                 }
             }
         }
 
-        @JvmStatic
-        val hosts by lazy { Hosts(application, "hosts.db") }
+        val imageCache by lazy {
+            diskCache {
+                directory(appCtx.cacheDir.toOkioPath() / "image_cache")
+                maxSizeBytes(Settings.readCacheSize.coerceIn(320, 5120).toLong() * 1024 * 1024)
+            }
+        }
 
-        @JvmStatic
-        val favouriteStatusRouter by lazy { FavouriteStatusRouter() }
-
-        @JvmStatic
-        val readerPreferences by lazy { ReaderPreferences(AndroidPreferenceStore(application)) }
-
-        @JvmStatic
-        val ehDatabase by lazy { buildMainDB(application) }
+        val searchDatabase by lazy { roomDb<SearchDatabase>("search_database.db") }
     }
 }

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

@@ -19,12 +19,9 @@ import android.content.Context
 import android.net.Uri
 import android.os.ParcelFileDescriptor
 import android.os.ParcelFileDescriptor.MODE_READ_ONLY
-import androidx.paging.PagingSource
-import androidx.room.Room.databaseBuilder
-import com.hippo.Native
-import com.hippo.ehviewer.EhApplication.Companion.ehDatabase
-import com.hippo.ehviewer.client.data.GalleryInfo
-import com.hippo.ehviewer.dao.BasicDao
+import arrow.fx.coroutines.release
+import arrow.fx.coroutines.resource
+import com.hippo.ehviewer.client.data.BaseGalleryInfo
 import com.hippo.ehviewer.dao.DownloadDirname
 import com.hippo.ehviewer.dao.DownloadInfo
 import com.hippo.ehviewer.dao.DownloadLabel
@@ -34,90 +31,77 @@ import com.hippo.ehviewer.dao.HistoryInfo
 import com.hippo.ehviewer.dao.LocalFavoriteInfo
 import com.hippo.ehviewer.dao.QuickSearch
 import com.hippo.ehviewer.download.DownloadManager
+import com.hippo.ehviewer.util.sendTo
+import kotlinx.coroutines.flow.Flow
+import splitties.arch.room.roomDb
 
 object EhDB {
-    private const val CUR_DB_VER = 4
-    private val db = ehDatabase
+    private val db = roomDb<EhDatabase>("eh.db")
 
-    // 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
-            }
+    private suspend fun putGalleryInfo(galleryInfo: BaseGalleryInfo) {
+        db.galleryDao().upsert(galleryInfo)
+    }
+
+    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 updateDownloadInfo(downloadInfos: List<DownloadInfo>) {
+    suspend fun updateDownloadInfo(downloadInfo: List<DownloadInfo>) {
         val dao = db.downloadsDao()
-        dao.update(downloadInfos)
+        dao.update(downloadInfo.map(DownloadInfo::downloadInfo))
     }
 
-    @Synchronized
-    fun putDownloadInfo(downloadInfo: DownloadInfo) {
-        db.downloadsDao().run {
-            if (load(downloadInfo.gid) != null) {
-                update(downloadInfo)
-            } else {
-                insert(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)
     }
 
-    @Synchronized
-    fun removeDownloadInfo(downloadInfo: DownloadInfo) {
-        db.downloadsDao().delete(downloadInfo)
-    }
-
-    @Synchronized
-    fun getDownloadDirname(gid: Long): String? {
+    suspend fun getDownloadDirname(gid: Long): String? {
         val dao = db.downloadDirnameDao()
         val raw = dao.load(gid)
         return raw?.dirname
     }
 
-    @Synchronized
-    fun putDownloadDirname(gid: Long, dirname: String?) {
+    suspend fun putDownloadDirname(gid: Long, dirname: String) {
         val dao = db.downloadDirnameDao()
-        var raw = dao.load(gid)
-        if (raw != null) {
-            raw.dirname = dirname
-            dao.update(raw)
-        } else {
-            raw = DownloadDirname(gid, dirname)
-            dao.insert(raw)
-        }
+        dao.upsert(DownloadDirname(gid, dirname))
     }
 
-    @Synchronized
-    fun removeDownloadDirname(gid: Long) {
+    suspend fun removeDownloadDirname(gid: Long) {
         val dao = db.downloadDirnameDao()
         dao.deleteByKey(gid)
     }
 
-    @Synchronized
-    fun clearDownloadDirname() {
+    private suspend fun importDownloadDirname(downloadDirnameList: List<DownloadDirname>) {
         val dao = db.downloadDirnameDao()
-        dao.deleteAll()
+        dao.insertOrIgnore(downloadDirnameList)
     }
 
-    @get:Synchronized
-    val allDownloadLabelList: List<DownloadLabel>
-        get() = db.downloadLabelDao().list()
+    suspend fun getAllDownloadLabelList() = db.downloadLabelDao().list()
 
-    @Synchronized
-    fun addDownloadLabel(label: String): DownloadLabel {
-        val dao = db.downloadLabelDao()
-        val raw = DownloadLabel()
-        raw.label = label
-        raw.time = System.currentTimeMillis()
-        raw.id = dao.insert(raw)
-        return raw
-    }
-
-    @Synchronized
-    fun addDownloadLabel(raw: DownloadLabel): DownloadLabel {
+    suspend fun addDownloadLabel(raw: DownloadLabel): DownloadLabel {
         // Reset id
         raw.id = null
         val dao = db.downloadLabelDao()
@@ -125,219 +109,122 @@ object EhDB {
         return raw
     }
 
-    @Synchronized
-    fun updateDownloadLabel(raw: DownloadLabel?) {
+    suspend fun updateDownloadLabel(raw: DownloadLabel) {
         val dao = db.downloadLabelDao()
-        dao.update(raw!!)
+        dao.update(raw)
     }
 
-    @Synchronized
-    fun moveDownloadLabel(fromPosition: Int, toPosition: Int) {
-        if (fromPosition == toPosition) {
-            return
-        }
-        val reverse = fromPosition > toPosition
-        val offset = if (reverse) toPosition else fromPosition
-        val limit = if (reverse) fromPosition - toPosition + 1 else toPosition - fromPosition + 1
+    suspend fun updateDownloadLabel(downloadLabels: List<DownloadLabel>) {
         val dao = db.downloadLabelDao()
-        val list = dao.list(offset, limit)
-        val step = if (reverse) 1 else -1
-        val start = if (reverse) limit - 1 else 0
-        val end = if (reverse) 0 else limit - 1
-        val toTime = list[end].time
-        var i = end
-        while (if (reverse) i < start else i > start) {
-            list[i].time = list[i + step].time
-            i += step
-        }
-        list[start].time = toTime
-        dao.update(list)
+        dao.update(downloadLabels)
     }
 
-    @Synchronized
-    fun removeDownloadLabel(raw: DownloadLabel?) {
+    suspend fun removeDownloadLabel(raw: DownloadLabel) {
         val dao = db.downloadLabelDao()
-        dao.delete(raw!!)
+        dao.delete(raw)
+        dao.fill(raw.position)
     }
 
-    @get:Synchronized
-    val allLocalFavorites: List<GalleryInfo>
-        get() {
-            val dao = db.localFavoritesDao()
-            val list = dao.list()
-            return ArrayList<GalleryInfo>(list)
-        }
+    suspend fun removeLocalFavorites(galleryInfo: BaseGalleryInfo) {
+        db.localFavoritesDao().deleteByKey(galleryInfo.gid)
+        deleteGalleryInfo(galleryInfo)
+    }
 
-    @Synchronized
-    fun searchLocalFavorites(query: String): List<GalleryInfo> {
+    suspend fun removeLocalFavorites(galleryInfoList: List<BaseGalleryInfo>) {
+        galleryInfoList.forEach {
+            removeLocalFavorites(it)
+        }
+    }
+
+    suspend fun containLocalFavorites(gid: Long): Boolean {
         val dao = db.localFavoritesDao()
-        val list = dao.list("%$query%")
-        return ArrayList<GalleryInfo>(list)
+        return dao.contains(gid)
     }
 
-    @Synchronized
-    fun removeLocalFavorites(gid: Long) {
-        db.localFavoritesDao().deleteByKey(gid)
+    suspend fun putLocalFavorites(galleryInfo: BaseGalleryInfo) {
+        putGalleryInfo(galleryInfo)
+        db.localFavoritesDao().upsert(LocalFavoriteInfo(galleryInfo.gid))
     }
 
-    @Synchronized
-    fun removeLocalFavorites(gidArray: LongArray) {
-        val dao = db.localFavoritesDao()
-        for (gid in gidArray) {
-            dao.deleteByKey(gid)
+    suspend fun putLocalFavorites(galleryInfoList: List<BaseGalleryInfo>) {
+        galleryInfoList.forEach {
+            putLocalFavorites(it)
         }
     }
 
-    @JvmStatic
-    @Synchronized
-    fun containLocalFavorites(gid: Long): Boolean {
-        val dao = db.localFavoritesDao()
-        return null != dao.load(gid)
+    private suspend fun importLocalFavorites(localFavorites: List<LocalFavoriteInfo>) {
+        db.localFavoritesDao().insertOrIgnore(localFavorites)
     }
 
-    @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)
-        }
-    }
+    suspend fun getAllQuickSearch() = db.quickSearchDao().list()
 
-    @Synchronized
-    fun putLocalFavorites(galleryInfoList: List<GalleryInfo>) {
-        for (gi in galleryInfoList) {
-            putLocalFavorites(gi)
-        }
-    }
-
-    @get:Synchronized
-    val allQuickSearch: List<QuickSearch>
-        get() {
-            val dao = db.quickSearchDao()
-            return dao.list()
-        }
-
-    @Synchronized
-    fun insertQuickSearch(quickSearch: QuickSearch) {
+    suspend fun insertQuickSearch(quickSearch: QuickSearch) {
         val dao = db.quickSearchDao()
-        quickSearch.id = null
-        quickSearch.time = System.currentTimeMillis()
         quickSearch.id = dao.insert(quickSearch)
     }
 
-    @Synchronized
-    fun importQuickSearch(quickSearchList: List<QuickSearch?>) {
+    private suspend fun importQuickSearch(quickSearchList: List<QuickSearch>) {
         val dao = db.quickSearchDao()
-        for (quickSearch in quickSearchList) {
-            dao.insert(quickSearch!!)
-        }
+        dao.insert(quickSearchList)
     }
 
-    @Synchronized
-    fun deleteQuickSearch(quickSearch: QuickSearch?) {
+    suspend fun deleteQuickSearch(quickSearch: QuickSearch) {
         val dao = db.quickSearchDao()
         dao.delete(quickSearch)
+        dao.fill(quickSearch.position)
     }
 
-    @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
+    suspend fun updateQuickSearch(quickSearchList: List<QuickSearch>) {
         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)
+        dao.update(quickSearchList)
     }
 
-    @get:Synchronized
-    val historyLazyList: PagingSource<Int, HistoryInfo>
-        get() = db.historyDao().listLazy()
+    val historyLazyList
+        get() = db.historyDao().joinListLazy()
 
-    @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)
+    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)
         }
     }
 
-    @Synchronized
-    fun putHistoryInfoNonRefresh(info: GalleryInfo) {
+    private suspend fun importHistoryInfo(historyInfoList: List<HistoryInfo>) {
         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)
-        }
+        dao.insertOrIgnore(historyInfoList)
     }
 
-    @Synchronized
-    fun putHistoryInfo(historyInfoList: List<HistoryInfo>) {
+    suspend fun deleteHistoryInfo(galleryInfo: BaseGalleryInfo) {
         val dao = db.historyDao()
-        for (info in historyInfoList) {
-            if (null == dao.load(info.gid)) {
-                dao.insert(info)
-            }
-        }
+        dao.deleteByKey(galleryInfo.gid)
+        deleteGalleryInfo(galleryInfo)
     }
 
-    @Synchronized
-    fun deleteHistoryInfo(info: HistoryInfo?) {
-        val dao = db.historyDao()
-        dao.delete(info!!)
-    }
-
-    @Synchronized
-    fun clearHistoryInfo() {
+    suspend fun clearHistoryInfo() {
         val dao = db.historyDao()
+        val historyList = dao.list()
         dao.deleteAll()
+        historyList.forEach { runCatching { db.galleryDao().deleteByKey(it.gid) } }
     }
 
-    @get:Synchronized
-    val allFilter: List<Filter>
-        get() = db.filterDao().list()
+    suspend fun getAllFilter() = db.filterDao().list()
 
-    @Synchronized
-    fun addFilter(filter: Filter): Boolean {
-        val existFilter: Filter? = try {
-            db.filterDao().load(filter.text!!, filter.mode)
-        } catch (e: Exception) {
-            null
-        }
+    suspend fun addFilter(filter: Filter): Boolean {
+        val existFilter = runCatching { db.filterDao().load(filter.text, filter.mode.field) }.getOrNull()
         return if (existFilter == null) {
             filter.id = null
             filter.id = db.filterDao().insert(filter)
@@ -347,101 +234,84 @@ object EhDB {
         }
     }
 
-    @Synchronized
-    fun deleteFilter(filter: Filter) {
+    suspend fun deleteFilter(filter: Filter) {
         db.filterDao().delete(filter)
     }
 
-    @Synchronized
-    fun triggerFilter(filter: Filter) {
-        filter.enable = filter.enable?.not() ?: false
+    suspend fun updateFilter(filter: Filter) {
         db.filterDao().update(filter)
     }
 
-    private fun <T> copyDao(from: BasicDao<T>, to: BasicDao<T>) {
-        val list = from.list()
-        for (item in list) to.insert(item)
-    }
-
-    @Synchronized
-    fun exportDB(context: Context, uri: Uri): Boolean {
+    suspend fun exportDB(context: Context, uri: Uri) {
         val ehExportName = "eh.export.db"
-        runCatching {
+        resource {
             context.deleteDatabase(ehExportName)
-            val newDb = databaseBuilder(context, EhDatabase::class.java, ehExportName).build()
-            copyDao(db.downloadsDao(), newDb.downloadsDao())
-            copyDao(db.downloadLabelDao(), newDb.downloadLabelDao())
-            copyDao(db.downloadDirnameDao(), newDb.downloadDirnameDao())
-            copyDao(db.historyDao(), newDb.historyDao())
-            copyDao(db.quickSearchDao(), newDb.quickSearchDao())
-            copyDao(db.localFavoritesDao(), newDb.localFavoritesDao())
-            copyDao(db.filterDao(), newDb.filterDao())
+            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) }
+            newDb.close()
             val dbFile = context.getDatabasePath(ehExportName)
             context.contentResolver.openFileDescriptor(uri, "rw")!!.use { toFd ->
                 ParcelFileDescriptor.open(dbFile, MODE_READ_ONLY).use { fromFd ->
-                    Native.sendfile(fromFd.fd, toFd.fd)
+                    fromFd sendTo toFd
                 }
             }
-            return true
-        }.onFailure {
-            it.printStackTrace()
         }
-        return false
     }
 
-    /**
-     * @return error string, null for no error
-     */
-    @Synchronized
-    fun importDB(context: Context, uri: Uri): String? {
-        runCatching {
-            val oldDB = databaseBuilder(context, EhDatabase::class.java, "tmp.db")
-                .createFromInputStream { context.contentResolver.openInputStream(uri) }.build()
-
-            // Download label
-            val manager = DownloadManager
+    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())
+            }
             runCatching {
                 val downloadLabelList = oldDB.downloadLabelDao().list()
-                manager.addDownloadLabel(downloadLabelList)
+                DownloadManager.addDownloadLabel(downloadLabelList)
             }
-
-            // Downloads
             runCatching {
-                val downloadInfoList = oldDB.downloadsDao().list()
-                manager.addDownload(downloadInfoList, false)
-            }
-
-            // Download dirname
-            runCatching {
-                oldDB.downloadDirnameDao().list().forEach {
-                    putDownloadDirname(it.gid, it.dirname)
+                oldDB.downloadDirnameDao().list().let {
+                    importDownloadDirname(it)
                 }
             }
-
-            // History
+            runCatching {
+                val downloadInfoList = oldDB.downloadsDao().joinList().asReversed()
+                DownloadManager.addDownload(downloadInfoList, false)
+            }
             runCatching {
                 val historyInfoList = oldDB.historyDao().list()
-                putHistoryInfo(historyInfoList)
+                importHistoryInfo(historyInfoList)
             }
-
-            // QuickSearch
             runCatching {
                 val quickSearchList = oldDB.quickSearchDao().list()
                 val currentQuickSearchList = db.quickSearchDao().list()
-                val importList = quickSearchList.mapNotNull { newQS ->
-                    newQS.takeIf { currentQuickSearchList.find { it.name == newQS.name } == null }
-                }
+                val offset = currentQuickSearchList.size
+                val importList = quickSearchList.filter { newQS ->
+                    currentQuickSearchList.none { it.name == newQS.name }
+                }.onEachIndexed { index, q -> q.position = index + offset }
                 importQuickSearch(importList)
             }
-
-            // LocalFavorites
             runCatching {
-                oldDB.localFavoritesDao().list().forEach {
-                    putLocalFavorites(it)
+                oldDB.localFavoritesDao().list().let {
+                    importLocalFavorites(it)
                 }
             }
-
-            // Filter
             runCatching {
                 val filterList = oldDB.filterDao().list()
                 val currentFilterList = db.filterDao().list()
@@ -449,11 +319,6 @@ 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.java

@@ -1,110 +0,0 @@
-/*
- * Copyright 2019 Hippo Seven
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hippo.ehviewer;
-
-import android.text.TextUtils;
-
-import com.hippo.network.InetValidator;
-import com.hippo.util.ExceptionUtils;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Proxy;
-import java.net.ProxySelector;
-import java.net.SocketAddress;
-import java.net.URI;
-import java.util.Collections;
-import java.util.List;
-
-public class EhProxySelector extends ProxySelector {
-
-    public static final int TYPE_DIRECT = 0;
-    public static final int TYPE_SYSTEM = 1;
-    public static final int TYPE_HTTP = 2;
-    public static final int TYPE_SOCKS = 3;
-
-    private ProxySelector delegation;
-    private ProxySelector alternative;
-
-    EhProxySelector() {
-        alternative = ProxySelector.getDefault();
-        if (alternative == null) {
-            alternative = new NullProxySelector();
-        }
-
-        updateProxy();
-    }
-
-    public void updateProxy() {
-        switch (Settings.getProxyType()) {
-            case TYPE_DIRECT:
-                delegation = new NullProxySelector();
-                break;
-            default:
-            case TYPE_SYSTEM:
-                delegation = alternative;
-                break;
-            case TYPE_HTTP:
-            case TYPE_SOCKS:
-                delegation = null;
-                break;
-        }
-    }
-
-    @Override
-    public List<Proxy> select(URI uri) {
-        int type = Settings.getProxyType();
-        if (type == TYPE_HTTP || type == TYPE_SOCKS) {
-            try {
-                String ip = Settings.getProxyIp();
-                int port = Settings.getProxyPort();
-                if (!TextUtils.isEmpty(ip) && InetValidator.isValidInetPort(port)) {
-                    InetAddress inetAddress = InetAddress.getByName(ip);
-                    SocketAddress socketAddress = new InetSocketAddress(inetAddress, port);
-                    return Collections.singletonList(new Proxy(type == TYPE_HTTP ? Proxy.Type.HTTP : Proxy.Type.SOCKS, socketAddress));
-                }
-            } catch (Throwable t) {
-                ExceptionUtils.throwIfFatal(t);
-            }
-        }
-
-        if (delegation != null) {
-            return delegation.select(uri);
-        }
-
-        return alternative.select(uri);
-    }
-
-    @Override
-    public void connectFailed(URI uri, SocketAddress sa, IOException ioe) {
-        if (delegation != null) {
-            delegation.select(uri);
-        }
-    }
-
-    private static class NullProxySelector extends ProxySelector {
-        @Override
-        public List<Proxy> select(URI uri) {
-            return Collections.singletonList(Proxy.NO_PROXY);
-        }
-
-        @Override
-        public void connectFailed(URI uri, SocketAddress sa, IOException ioe) {
-        }
-    }
-}

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

@@ -1,74 +0,0 @@
-/*
- * Copyright 2019 Hippo Seven
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hippo.ehviewer;
-
-import android.annotation.SuppressLint;
-
-import com.hippo.ehviewer.client.data.GalleryInfo;
-import com.hippo.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.java

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

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

@@ -1,343 +0,0 @@
-/*
- * Copyright 2018 Hippo Seven
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hippo.ehviewer;
-
-/*
- * 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.database.MSQLiteBuilder;
-import com.hippo.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.java

@@ -1,756 +0,0 @@
-/*
- * Copyright 2016 Hippo Seven
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hippo.ehviewer;
-
-import android.content.SharedPreferences;
-import android.net.Uri;
-import android.util.Log;
-
-import androidx.annotation.DimenRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.preference.PreferenceManager;
-
-import com.hippo.ehviewer.client.EhConfig;
-import com.hippo.ehviewer.client.data.FavListUrlBuilder;
-import com.hippo.ehviewer.ui.CommonOperations;
-import com.hippo.ehviewer.ui.scene.GalleryListScene;
-import com.hippo.unifile.UniFile;
-import com.hippo.yorozuya.AssertUtilsKt;
-import com.hippo.yorozuya.NumberUtils;
-
-import java.util.Locale;
-import java.util.Set;
-
-public class Settings {
-
-    /********************
-     ****** Eh
-     ********************/
-
-    public static final String KEY_THEME = "theme";
-
-    public static final String KEY_ACCOUNT = "account";
-    public static final String KEY_IMAGE_LIMITS = "image_limits";
-    public static final String KEY_U_CONFIG = "uconfig";
-    public static final String KEY_MY_TAGS = "mytags";
-    public static final String KEY_BLACK_DARK_THEME = "black_dark_theme";
-    public static final int THEME_SYSTEM = -1;
-    public static final String KEY_GALLERY_SITE = "gallery_site";
-    public static final String KEY_LIST_MODE = "list_mode";
-    public static final String KEY_DETAIL_SIZE = "detail_size";
-    public static final String KEY_THUMB_SIZE = "thumb_size_";
-    public static final String KEY_THUMB_RESOLUTION = "thumb_resolution";
-    public static final String KEY_SHOW_JPN_TITLE = "show_jpn_title";
-    public static final String KEY_SHOW_TAG_TRANSLATIONS = "show_tag_translations";
-    public static final String KEY_TAG_TRANSLATIONS_SOURCE = "tag_translations_source";
-    public static final String KEY_DEFAULT_CATEGORIES = "default_categories";
-    public static final int DEFAULT_DEFAULT_CATEGORIES = EhConfig.ALL_CATEGORY;
-    public static final String KEY_EXCLUDED_TAG_NAMESPACES = "excluded_tag_namespaces";
-    public static final String KEY_EXCLUDED_LANGUAGES = "excluded_languages";
-    public static final String KEY_REQUEST_NEWS = "request_news";
-    public static final String KEY_REQUEST_NEWS_TIMER = "request_news_timer";
-    public static final String KEY_REQUEST_NEWS_TIMER_HOUR = "request_news_timer_hour";
-    public static final String KEY_REQUEST_NEWS_TIMER_MINUTE = "request_news_timer_minute";
-    public static final String KEY_HIDE_HV_EVENTS = "hide_hv_events";
-    public static final String[] SIGN_IN_REQUIRED = {
-            KEY_IMAGE_LIMITS,
-            KEY_GALLERY_SITE,
-            KEY_U_CONFIG,
-            KEY_MY_TAGS,
-            KEY_SHOW_JPN_TITLE,
-            KEY_REQUEST_NEWS,
-            KEY_REQUEST_NEWS_TIMER,
-            KEY_HIDE_HV_EVENTS
-    };
-    /********************
-     ****** Privacy and Security
-     ********************/
-    public static final String KEY_SEC_SECURITY = "enable_secure";
-    public static final boolean VALUE_SEC_SECURITY = false;
-    /********************
-     ****** Download
-     ********************/
-    public static final String KEY_DOWNLOAD_SAVE_SCHEME = "image_scheme";
-    public static final String KEY_DOWNLOAD_SAVE_AUTHORITY = "image_authority";
-    public static final String KEY_DOWNLOAD_SAVE_PATH = "image_path";
-    public static final String KEY_NOTIFICATION_REQUIRED = "notification_required";
-    public static final String KEY_DOWNLOAD_SAVE_QUERY = "image_query";
-    public static final String KEY_DOWNLOAD_SAVE_FRAGMENT = "image_fragment";
-    public static final String KEY_MEDIA_SCAN = "media_scan";
-    public static final String KEY_IMAGE_RESOLUTION = "image_size";
-    public static final String DEFAULT_IMAGE_RESOLUTION = EhConfig.IMAGE_SIZE_AUTO;
-    public static final int INVALID_DEFAULT_FAV_SLOT = -2;
-    /********************
-     ****** Advanced
-     ********************/
-    public static final String KEY_SAVE_PARSE_ERROR_BODY = "save_parse_error_body";
-    public static final String KEY_SECURITY = "require_unlock";
-    public static final String KEY_SECURITY_DELAY = "require_unlock_delay";
-    public static final String KEY_READ_CACHE_SIZE = "read_cache_size";
-    public static final int DEFAULT_READ_CACHE_SIZE = 320;
-    public static final String KEY_BUILT_IN_HOSTS = "built_in_hosts_2";
-    public static final String KEY_DOMAIN_FRONTING = "domain_fronting";
-    public static final String KEY_BYPASS_VPN = "bypass_vpn";
-    public static final String KEY_LIST_THUMB_SIZE = "list_tile_size";
-    private static final boolean DEFAULT_HIDE_HV_EVENTS = false;
-    private static final String KEY_SHOW_COMMENTS = "show_gallery_comments";
-    private static final boolean DEFAULT_SHOW_COMMENTS = true;
-    private static final String TAG = Settings.class.getSimpleName();
-    private static final String KEY_DISPLAY_NAME = "display_name";
-    private static final String DEFAULT_DISPLAY_NAME = null;
-    private static final int DEFAULT_LIST_THUMB_SIZE = 40;
-    private static final String KEY_AVATAR = "avatar";
-    private static final String KEY_REMOVE_IMAGE_FILES = "include_pic";
-    private static final boolean DEFAULT_REMOVE_IMAGE_FILES = true;
-    private static final String KEY_NEED_SIGN_IN = "need_sign_in";
-    private static final boolean DEFAULT_NEED_SIGN_IN = true;
-    private static final String KEY_SELECT_SITE = "select_site";
-    private static final boolean DEFAULT_SELECT_SITE = true;
-    private static final int DEFAULT_THEME = THEME_SYSTEM;
-    private static final int DEFAULT_GALLERY_SITE = 1;
-    private static final String KEY_LAUNCH_PAGE = "launch_page";
-    private static final int DEFAULT_LAUNCH_PAGE = 0;
-    private static final int DEFAULT_LIST_MODE = 0;
-    private static final int DEFAULT_DETAIL_SIZE = 0;
-    private static final int DEFAULT_THUMB_SIZE = 120;
-    private static final int DEFAULT_THUMB_RESOLUTION = 0;
-    private static final boolean DEFAULT_SHOW_JPN_TITLE = false;
-    private static final String KEY_SHOW_GALLERY_PAGES = "show_gallery_pages";
-    private static final boolean DEFAULT_SHOW_GALLERY_PAGES = false;
-    private static final boolean DEFAULT_SHOW_TAG_TRANSLATIONS = false;
-    private static final int DEFAULT_EXCLUDED_TAG_NAMESPACES = 0;
-    private static final String DEFAULT_EXCLUDED_LANGUAGES = null;
-    private static final String KEY_METERED_NETWORK_WARNING = "cellular_network_warning";
-    private static final boolean DEFAULT_METERED_NETWORK_WARNING = false;
-    private static final String KEY_APP_LINK_VERIFY_TIP = "app_link_verify_tip";
-    private static final boolean DEFAULT_APP_LINK_VERIFY_TIP = false;
-    private static final boolean DEFAULT_MEDIA_SCAN = false;
-    private static final String KEY_RECENT_DOWNLOAD_LABEL = "recent_download_label";
-    private static final String DEFAULT_RECENT_DOWNLOAD_LABEL = null;
-    private static final String KEY_HAS_DEFAULT_DOWNLOAD_LABEL = "has_default_download_label";
-    private static final boolean DEFAULT_HAS_DOWNLOAD_LABEL = false;
-    private static final String KEY_DEFAULT_DOWNLOAD_LABEL = "default_download_label";
-    private static final String DEFAULT_DOWNLOAD_LABEL = null;
-    private static final String KEY_MULTI_THREAD_DOWNLOAD = "download_thread";
-    private static final int DEFAULT_MULTI_THREAD_DOWNLOAD = 3;
-    private static final String KEY_PRELOAD_IMAGE = "preload_image";
-    private static final int DEFAULT_PRELOAD_IMAGE = 5;
-    private static final String KEY_DOWNLOAD_ORIGIN_IMAGE = "download_origin_image";
-    private static final boolean DEFAULT_DOWNLOAD_ORIGIN_IMAGE = false;
-    /********************
-     ****** Favorites
-     ********************/
-    private static final String KEY_FAV_CAT_0 = "fav_cat_0";
-    private static final String KEY_FAV_CAT_1 = "fav_cat_1";
-    private static final String KEY_FAV_CAT_2 = "fav_cat_2";
-    private static final String KEY_FAV_CAT_3 = "fav_cat_3";
-    private static final String KEY_FAV_CAT_4 = "fav_cat_4";
-    private static final String KEY_FAV_CAT_5 = "fav_cat_5";
-    private static final String KEY_FAV_CAT_6 = "fav_cat_6";
-    private static final String KEY_FAV_CAT_7 = "fav_cat_7";
-    private static final String KEY_FAV_CAT_8 = "fav_cat_8";
-    private static final String KEY_FAV_CAT_9 = "fav_cat_9";
-    private static final String DEFAULT_FAV_CAT_0 = "Favorites 0";
-    private static final String DEFAULT_FAV_CAT_1 = "Favorites 1";
-    private static final String DEFAULT_FAV_CAT_2 = "Favorites 2";
-    private static final String DEFAULT_FAV_CAT_3 = "Favorites 3";
-    private static final String DEFAULT_FAV_CAT_4 = "Favorites 4";
-    private static final String DEFAULT_FAV_CAT_5 = "Favorites 5";
-    private static final String DEFAULT_FAV_CAT_6 = "Favorites 6";
-    private static final String DEFAULT_FAV_CAT_7 = "Favorites 7";
-    private static final String DEFAULT_FAV_CAT_8 = "Favorites 8";
-    private static final String DEFAULT_FAV_CAT_9 = "Favorites 9";
-    private static final String KEY_FAV_COUNT_0 = "fav_count_0";
-    private static final String KEY_FAV_COUNT_1 = "fav_count_1";
-    private static final String KEY_FAV_COUNT_2 = "fav_count_2";
-    private static final String KEY_FAV_COUNT_3 = "fav_count_3";
-    private static final String KEY_FAV_COUNT_4 = "fav_count_4";
-    private static final String KEY_FAV_COUNT_5 = "fav_count_5";
-    private static final String KEY_FAV_COUNT_6 = "fav_count_6";
-    private static final String KEY_FAV_COUNT_7 = "fav_count_7";
-    private static final String KEY_FAV_COUNT_8 = "fav_count_8";
-    private static final String KEY_FAV_COUNT_9 = "fav_count_9";
-    private static final String KEY_FAV_LOCAL = "fav_local";
-    private static final String KEY_FAV_CLOUD = "fav_cloud";
-    private static final int DEFAULT_FAV_COUNT = 0;
-    private static final String KEY_RECENT_FAV_CAT = "recent_fav_cat";
-    private static final int DEFAULT_RECENT_FAV_CAT = FavListUrlBuilder.FAV_CAT_ALL;
-    // -1 for local, 0 - 9 for cloud favorite, other for no default fav slot
-    private static final String KEY_DEFAULT_FAV_SLOT = "default_favorite_2";
-    private static final int DEFAULT_DEFAULT_FAV_SLOT = INVALID_DEFAULT_FAV_SLOT;
-    private static final boolean DEFAULT_SAVE_PARSE_ERROR_BODY = true;
-    private static final String KEY_SAVE_CRASH_LOG = "save_crash_log";
-    private static final boolean DEFAULT_SAVE_CRASH_LOG = true;
-    private static final boolean DEFAULT_BUILT_IN_HOSTS = false;
-    private static final boolean DEFAULT_FRONTING = false;
-    private static final boolean DEFAULT_BYPASS_VPN = true;
-    private static final String KEY_PROXY_TYPE = "proxy_type";
-    private static final int DEFAULT_PROXY_TYPE = EhProxySelector.TYPE_SYSTEM;
-    private static final String KEY_PROXY_IP = "proxy_ip";
-    private static final String DEFAULT_PROXY_IP = null;
-    private static final String KEY_PROXY_PORT = "proxy_port";
-    private static final int DEFAULT_PROXY_PORT = -1;
-    private static final String KEY_CLIPBOARD_TEXT_HASH_CODE = "clipboard_text_hash_code";
-    private static final int DEFAULT_CLIPBOARD_TEXT_HASH_CODE = 0;
-    private static final String KEY_DOWNLOAD_DELAY = "download_delay";
-    private static final int DEFAULT_DOWNLOAD_DELAY = 0;
-    private static final boolean DEFAULT_REQUEST_NEWS = false;
-    private static final String KEY_ARCHIVE_PASSWDS = "archive_passwds";
-    private static final String KEY_QS_SAVE_PROGRESS = "qs_save_progress";
-    private static final boolean DEFAULT_QS_SAVE_PROGRESS = true;
-    public static boolean LIST_THUMB_SIZE_INITED = false;
-    public static SharedPreferences sSettingsPre;
-    private static int LIST_THUMB_SIZE = 40;
-    private static EhConfig sEhConfig;
-
-    public static void initialize() {
-        sSettingsPre = PreferenceManager.getDefaultSharedPreferences(EhApplication.getApplication());
-        sEhConfig = loadEhConfig();
-        fixDefaultValue();
-    }
-
-    private static void fixDefaultValue() {
-        if ("CN".equals(Locale.getDefault().getCountry())) {
-            // Enable domain fronting if the country is CN
-            if (!sSettingsPre.contains(KEY_BUILT_IN_HOSTS)) {
-                putBuiltInHosts(true);
-            }
-            if (!sSettingsPre.contains(KEY_DOMAIN_FRONTING)) {
-                putDF(true);
-            }
-            // Enable show tag translations if the country is CN
-            if (!sSettingsPre.contains(KEY_SHOW_TAG_TRANSLATIONS)) {
-                putShowTagTranslations(true);
-
-            }
-        }
-    }
-
-    private static EhConfig loadEhConfig() {
-        EhConfig ehConfig = new EhConfig();
-        ehConfig.imageSize = getImageResolution();
-        ehConfig.excludedLanguages = getExcludedLanguages();
-        ehConfig.defaultCategories = getDefaultCategories();
-        ehConfig.excludedNamespaces = getExcludedTagNamespaces();
-        ehConfig.setDirty();
-        return ehConfig;
-    }
-
-    public static boolean getBoolean(String key, boolean defValue) {
-        try {
-            return sSettingsPre.getBoolean(key, defValue);
-        } catch (ClassCastException e) {
-            Log.d(TAG, "Get ClassCastException when get " + key + " value", e);
-            return defValue;
-        }
-    }
-
-    public static void putBoolean(String key, boolean value) {
-        sSettingsPre.edit().putBoolean(key, value).apply();
-    }
-
-    public static int getInt(String key, int defValue) {
-        try {
-            return sSettingsPre.getInt(key, defValue);
-        } catch (ClassCastException e) {
-            Log.d(TAG, "Get ClassCastException when get " + key + " value", e);
-            return defValue;
-        }
-    }
-
-    public static void putInt(String key, int value) {
-        sSettingsPre.edit().putInt(key, value).apply();
-    }
-
-    public static String getString(String key, String defValue) {
-        try {
-            return sSettingsPre.getString(key, defValue);
-        } catch (ClassCastException e) {
-            Log.d(TAG, "Get ClassCastException when get " + key + " value", e);
-            return defValue;
-        }
-    }
-
-    public static void putString(String key, String value) {
-        sSettingsPre.edit().putString(key, value).apply();
-    }
-
-    public static Set<String> getStringSet(String key) {
-        return sSettingsPre.getStringSet(key, null);
-    }
-
-    public static void putStringToStringSet(String key, String value) {
-        Set<String> set = getStringSet(key);
-        if (set == null)
-            set = Set.of(value);
-        else if (set.contains(value))
-            return;
-        else
-            set.add(value);
-        sSettingsPre.edit().putStringSet(key, set).apply();
-    }
-
-    public static int getIntFromStr(String key, int defValue) {
-        try {
-            return NumberUtils.parseIntSafely(sSettingsPre.getString(key, Integer.toString(defValue)), defValue);
-        } catch (ClassCastException e) {
-            Log.d(TAG, "Get ClassCastException when get " + key + " value", e);
-            return defValue;
-        }
-    }
-
-    public static void putIntToStr(String key, int value) {
-        sSettingsPre.edit().putString(key, Integer.toString(value)).apply();
-    }
-
-    @Nullable
-    public static String getDisplayName() {
-        return getString(KEY_DISPLAY_NAME, DEFAULT_DISPLAY_NAME);
-    }
-
-    public static void putDisplayName(String value) {
-        putString(KEY_DISPLAY_NAME, value);
-    }
-
-    public static void putAvatar(String value) {
-        putString(KEY_AVATAR, value);
-    }
-
-    public static boolean getRemoveImageFiles() {
-        return getBoolean(KEY_REMOVE_IMAGE_FILES, DEFAULT_REMOVE_IMAGE_FILES);
-    }
-
-    public static void putRemoveImageFiles(boolean value) {
-        putBoolean(KEY_REMOVE_IMAGE_FILES, value);
-    }
-
-    public static EhConfig getEhConfig() {
-        return sEhConfig;
-    }
-
-    public static boolean getNeedSignIn() {
-        return getBoolean(KEY_NEED_SIGN_IN, DEFAULT_NEED_SIGN_IN);
-    }
-
-    public static void putNeedSignIn(boolean value) {
-        putBoolean(KEY_NEED_SIGN_IN, value);
-    }
-
-    public static boolean getSelectSite() {
-        return getBoolean(KEY_SELECT_SITE, DEFAULT_SELECT_SITE);
-    }
-
-    public static void putSelectSite(boolean value) {
-        putBoolean(KEY_SELECT_SITE, value);
-    }
-
-    public static int getTheme() {
-        return getIntFromStr(KEY_THEME, DEFAULT_THEME);
-    }
-
-    public static int getGallerySite() {
-        return getIntFromStr(KEY_GALLERY_SITE, DEFAULT_GALLERY_SITE);
-    }
-
-    public static void putGallerySite(int value) {
-        putIntToStr(KEY_GALLERY_SITE, value);
-    }
-
-    public static String getLaunchPageGalleryListSceneAction() {
-        int value = getIntFromStr(KEY_LAUNCH_PAGE, DEFAULT_LAUNCH_PAGE);
-        return switch (value) {
-            case 0 -> GalleryListScene.ACTION_HOMEPAGE;
-            case 1 -> GalleryListScene.ACTION_SUBSCRIPTION;
-            case 2 -> GalleryListScene.ACTION_WHATS_HOT;
-            case 3 -> GalleryListScene.ACTION_TOP_LIST;
-            default -> throw new IllegalStateException("Unexpected value: " + value);
-        };
-    }
-
-    public static int getListMode() {
-        return getIntFromStr(KEY_LIST_MODE, DEFAULT_LIST_MODE);
-    }
-
-    public static int getDetailSize() {
-        return getIntFromStr(KEY_DETAIL_SIZE, DEFAULT_DETAIL_SIZE);
-    }
-
-    @DimenRes
-    public static int getDetailSizeResId() {
-        return switch (getDetailSize()) {
-            case 0 -> R.dimen.gallery_list_column_width_long;
-            case 1 -> R.dimen.gallery_list_column_width_short;
-            default -> throw new IllegalStateException("Unexpected value: " + getDetailSize());
-        };
-    }
-
-    public static int getThumbSize() {
-        return dip2px(getInt(KEY_THUMB_SIZE, DEFAULT_THUMB_SIZE));
-    }
-
-    public static int dip2px(int dpValue) {
-        final float scale = EhApplication.getApplication().getResources().getDisplayMetrics().density;
-        return (int) (dpValue * scale + 0.5f);
-    }
-
-    public static int getThumbResolution() {
-        return getIntFromStr(KEY_THUMB_RESOLUTION, DEFAULT_THUMB_RESOLUTION);
-    }
-
-    public static boolean getShowComments() {
-        return getBoolean(KEY_SHOW_COMMENTS, DEFAULT_SHOW_COMMENTS);
-    }
-
-    public static boolean getRequestNews() {
-        return getBoolean(KEY_REQUEST_NEWS, DEFAULT_REQUEST_NEWS);
-    }
-
-    public static boolean getHideHvEvents() {
-        return getBoolean(KEY_HIDE_HV_EVENTS, DEFAULT_HIDE_HV_EVENTS);
-    }
-
-    public static boolean getShowJpnTitle() {
-        return getBoolean(KEY_SHOW_JPN_TITLE, DEFAULT_SHOW_JPN_TITLE);
-    }
-
-    public static boolean getShowGalleryPages() {
-        return getBoolean(KEY_SHOW_GALLERY_PAGES, DEFAULT_SHOW_GALLERY_PAGES);
-    }
-
-    public static boolean getShowTagTranslations() {
-        return getBoolean(KEY_SHOW_TAG_TRANSLATIONS, DEFAULT_SHOW_TAG_TRANSLATIONS);
-    }
-
-    public static void putShowTagTranslations(boolean value) {
-        putBoolean(KEY_SHOW_TAG_TRANSLATIONS, value);
-    }
-
-    public static int getDefaultCategories() {
-        return getInt(KEY_DEFAULT_CATEGORIES, DEFAULT_DEFAULT_CATEGORIES);
-    }
-
-    public static int getExcludedTagNamespaces() {
-        return getInt(KEY_EXCLUDED_TAG_NAMESPACES, DEFAULT_EXCLUDED_TAG_NAMESPACES);
-    }
-
-    public static String getExcludedLanguages() {
-        return getString(KEY_EXCLUDED_LANGUAGES, DEFAULT_EXCLUDED_LANGUAGES);
-    }
-
-    public static boolean getMeteredNetworkWarning() {
-        return getBoolean(KEY_METERED_NETWORK_WARNING, DEFAULT_METERED_NETWORK_WARNING);
-    }
-
-    public static boolean getAppLinkVerifyTip() {
-        return getBoolean(KEY_APP_LINK_VERIFY_TIP, DEFAULT_APP_LINK_VERIFY_TIP);
-    }
-
-    public static void putAppLinkVerifyTip(boolean value) {
-        putBoolean(KEY_APP_LINK_VERIFY_TIP, value);
-    }
-
-    public static boolean getEnabledSecurity() {
-        return getBoolean(KEY_SEC_SECURITY, VALUE_SEC_SECURITY);
-    }
-
-    @Nullable
-    public static UniFile getDownloadLocation() {
-        UniFile dir;
-        Uri.Builder builder = new Uri.Builder();
-        builder.scheme(getString(KEY_DOWNLOAD_SAVE_SCHEME, null));
-        builder.encodedAuthority(getString(KEY_DOWNLOAD_SAVE_AUTHORITY, null));
-        builder.encodedPath(getString(KEY_DOWNLOAD_SAVE_PATH, null));
-        builder.encodedQuery(getString(KEY_DOWNLOAD_SAVE_QUERY, null));
-        builder.encodedFragment(getString(KEY_DOWNLOAD_SAVE_FRAGMENT, null));
-        dir = UniFile.fromUri(EhApplication.getApplication(), builder.build());
-        return dir != null ? dir : UniFile.fromFile(AppConfig.getDefaultDownloadDir());
-    }
-
-    public static void putDownloadLocation(@NonNull UniFile location) {
-        Uri uri = location.getUri();
-        putString(KEY_DOWNLOAD_SAVE_SCHEME, uri.getScheme());
-        putString(KEY_DOWNLOAD_SAVE_AUTHORITY, uri.getEncodedAuthority());
-        putString(KEY_DOWNLOAD_SAVE_PATH, uri.getEncodedPath());
-        putString(KEY_DOWNLOAD_SAVE_QUERY, uri.getEncodedQuery());
-        putString(KEY_DOWNLOAD_SAVE_FRAGMENT, uri.getEncodedFragment());
-
-        if (getMediaScan()) {
-            CommonOperations.removeNoMediaFile(location);
-        } else {
-            CommonOperations.ensureNoMediaFile(location);
-        }
-    }
-
-    public static boolean getMediaScan() {
-        return getBoolean(KEY_MEDIA_SCAN, DEFAULT_MEDIA_SCAN);
-    }
-
-    public static String getRecentDownloadLabel() {
-        return getString(KEY_RECENT_DOWNLOAD_LABEL, DEFAULT_RECENT_DOWNLOAD_LABEL);
-    }
-
-    public static void putRecentDownloadLabel(String value) {
-        putString(KEY_RECENT_DOWNLOAD_LABEL, value);
-    }
-
-    public static boolean getHasDefaultDownloadLabel() {
-        return getBoolean(KEY_HAS_DEFAULT_DOWNLOAD_LABEL, DEFAULT_HAS_DOWNLOAD_LABEL);
-    }
-
-    public static void putHasDefaultDownloadLabel(boolean hasDefaultDownloadLabel) {
-        putBoolean(KEY_HAS_DEFAULT_DOWNLOAD_LABEL, hasDefaultDownloadLabel);
-    }
-
-    public static String getDefaultDownloadLabel() {
-        return getString(KEY_DEFAULT_DOWNLOAD_LABEL, DEFAULT_DOWNLOAD_LABEL);
-    }
-
-    public static void putDefaultDownloadLabel(String value) {
-        putString(KEY_DEFAULT_DOWNLOAD_LABEL, value);
-    }
-
-    public static int getMultiThreadDownload() {
-        return getIntFromStr(KEY_MULTI_THREAD_DOWNLOAD, DEFAULT_MULTI_THREAD_DOWNLOAD);
-    }
-
-    public static int getDownloadDelay() {
-        return getIntFromStr(KEY_DOWNLOAD_DELAY, DEFAULT_DOWNLOAD_DELAY);
-    }
-
-    public static int getPreloadImage() {
-        return getIntFromStr(KEY_PRELOAD_IMAGE, DEFAULT_PRELOAD_IMAGE);
-    }
-
-    public static String getImageResolution() {
-        return getString(KEY_IMAGE_RESOLUTION, DEFAULT_IMAGE_RESOLUTION);
-    }
-
-    public static void putImageResolution(String value) {
-        sEhConfig.imageSize = value;
-        sEhConfig.setDirty();
-        putString(KEY_IMAGE_RESOLUTION, value);
-    }
-
-    public static boolean getDownloadOriginImage() {
-        return getBoolean(KEY_DOWNLOAD_ORIGIN_IMAGE, DEFAULT_DOWNLOAD_ORIGIN_IMAGE);
-    }
-
-    public static String[] getFavCat() {
-        String[] favCat = new String[10];
-        favCat[0] = sSettingsPre.getString(KEY_FAV_CAT_0, DEFAULT_FAV_CAT_0);
-        favCat[1] = sSettingsPre.getString(KEY_FAV_CAT_1, DEFAULT_FAV_CAT_1);
-        favCat[2] = sSettingsPre.getString(KEY_FAV_CAT_2, DEFAULT_FAV_CAT_2);
-        favCat[3] = sSettingsPre.getString(KEY_FAV_CAT_3, DEFAULT_FAV_CAT_3);
-        favCat[4] = sSettingsPre.getString(KEY_FAV_CAT_4, DEFAULT_FAV_CAT_4);
-        favCat[5] = sSettingsPre.getString(KEY_FAV_CAT_5, DEFAULT_FAV_CAT_5);
-        favCat[6] = sSettingsPre.getString(KEY_FAV_CAT_6, DEFAULT_FAV_CAT_6);
-        favCat[7] = sSettingsPre.getString(KEY_FAV_CAT_7, DEFAULT_FAV_CAT_7);
-        favCat[8] = sSettingsPre.getString(KEY_FAV_CAT_8, DEFAULT_FAV_CAT_8);
-        favCat[9] = sSettingsPre.getString(KEY_FAV_CAT_9, DEFAULT_FAV_CAT_9);
-        return favCat;
-    }
-
-    public static void putFavCat(String[] value) {
-        AssertUtilsKt.assertEquals(10, value.length);
-        sSettingsPre.edit()
-                .putString(KEY_FAV_CAT_0, value[0])
-                .putString(KEY_FAV_CAT_1, value[1])
-                .putString(KEY_FAV_CAT_2, value[2])
-                .putString(KEY_FAV_CAT_3, value[3])
-                .putString(KEY_FAV_CAT_4, value[4])
-                .putString(KEY_FAV_CAT_5, value[5])
-                .putString(KEY_FAV_CAT_6, value[6])
-                .putString(KEY_FAV_CAT_7, value[7])
-                .putString(KEY_FAV_CAT_8, value[8])
-                .putString(KEY_FAV_CAT_9, value[9])
-                .apply();
-    }
-
-    public static int[] getFavCount() {
-        int[] favCount = new int[10];
-        favCount[0] = sSettingsPre.getInt(KEY_FAV_COUNT_0, DEFAULT_FAV_COUNT);
-        favCount[1] = sSettingsPre.getInt(KEY_FAV_COUNT_1, DEFAULT_FAV_COUNT);
-        favCount[2] = sSettingsPre.getInt(KEY_FAV_COUNT_2, DEFAULT_FAV_COUNT);
-        favCount[3] = sSettingsPre.getInt(KEY_FAV_COUNT_3, DEFAULT_FAV_COUNT);
-        favCount[4] = sSettingsPre.getInt(KEY_FAV_COUNT_4, DEFAULT_FAV_COUNT);
-        favCount[5] = sSettingsPre.getInt(KEY_FAV_COUNT_5, DEFAULT_FAV_COUNT);
-        favCount[6] = sSettingsPre.getInt(KEY_FAV_COUNT_6, DEFAULT_FAV_COUNT);
-        favCount[7] = sSettingsPre.getInt(KEY_FAV_COUNT_7, DEFAULT_FAV_COUNT);
-        favCount[8] = sSettingsPre.getInt(KEY_FAV_COUNT_8, DEFAULT_FAV_COUNT);
-        favCount[9] = sSettingsPre.getInt(KEY_FAV_COUNT_9, DEFAULT_FAV_COUNT);
-        return favCount;
-    }
-
-    public static void putFavCount(int[] count) {
-        AssertUtilsKt.assertEquals(10, count.length);
-        sSettingsPre.edit()
-                .putInt(KEY_FAV_COUNT_0, count[0])
-                .putInt(KEY_FAV_COUNT_1, count[1])
-                .putInt(KEY_FAV_COUNT_2, count[2])
-                .putInt(KEY_FAV_COUNT_3, count[3])
-                .putInt(KEY_FAV_COUNT_4, count[4])
-                .putInt(KEY_FAV_COUNT_5, count[5])
-                .putInt(KEY_FAV_COUNT_6, count[6])
-                .putInt(KEY_FAV_COUNT_7, count[7])
-                .putInt(KEY_FAV_COUNT_8, count[8])
-                .putInt(KEY_FAV_COUNT_9, count[9])
-                .apply();
-    }
-
-    public static int getFavLocalCount() {
-        return sSettingsPre.getInt(KEY_FAV_LOCAL, DEFAULT_FAV_COUNT);
-    }
-
-    public static void putFavLocalCount(int count) {
-        sSettingsPre.edit().putInt(KEY_FAV_LOCAL, count).apply();
-    }
-
-    public static int getFavCloudCount() {
-        return sSettingsPre.getInt(KEY_FAV_CLOUD, DEFAULT_FAV_COUNT);
-    }
-
-    public static void putFavCloudCount(int count) {
-        sSettingsPre.edit().putInt(KEY_FAV_CLOUD, count).apply();
-    }
-
-    public static int getRecentFavCat() {
-        return getInt(KEY_RECENT_FAV_CAT, DEFAULT_RECENT_FAV_CAT);
-    }
-
-    public static void putRecentFavCat(int value) {
-        putInt(KEY_RECENT_FAV_CAT, value);
-    }
-
-    public static int getDefaultFavSlot() {
-        return getInt(KEY_DEFAULT_FAV_SLOT, DEFAULT_DEFAULT_FAV_SLOT);
-    }
-
-    public static void putDefaultFavSlot(int value) {
-        putInt(KEY_DEFAULT_FAV_SLOT, value);
-    }
-
-    public static boolean getQSSaveProgress() {
-        return getBoolean(KEY_QS_SAVE_PROGRESS, DEFAULT_QS_SAVE_PROGRESS);
-    }
-
-    public static void putQSSaveProgress(boolean value) {
-        putBoolean(KEY_QS_SAVE_PROGRESS, value);
-    }
-
-    public static boolean getSaveParseErrorBody() {
-        return getBoolean(KEY_SAVE_PARSE_ERROR_BODY, DEFAULT_SAVE_PARSE_ERROR_BODY);
-    }
-
-    public static boolean getSaveCrashLog() {
-        return getBoolean(KEY_SAVE_CRASH_LOG, DEFAULT_SAVE_CRASH_LOG);
-    }
-
-    public static boolean getSecurity() {
-        return getBoolean(KEY_SECURITY, false);
-    }
-
-    public static void putSecurity(boolean value) {
-        putBoolean(KEY_SECURITY, value);
-    }
-
-    public static int getSecurityDelay() {
-        return getInt(KEY_SECURITY_DELAY, 0);
-    }
-
-    public static int getReadCacheSize() {
-        return getIntFromStr(KEY_READ_CACHE_SIZE, DEFAULT_READ_CACHE_SIZE);
-    }
-
-    public static boolean getBuiltInHosts() {
-        return getBoolean(KEY_BUILT_IN_HOSTS, DEFAULT_BUILT_IN_HOSTS);
-    }
-
-    public static void putBuiltInHosts(boolean value) {
-        putBoolean(KEY_BUILT_IN_HOSTS, value);
-    }
-
-    public static boolean getDF() {
-        return getBoolean(KEY_DOMAIN_FRONTING, DEFAULT_FRONTING);
-    }
-
-    public static void putDF(boolean value) {
-        putBoolean(KEY_DOMAIN_FRONTING, value);
-    }
-
-    public static boolean getBypassVpn() {
-        return getBoolean(KEY_BYPASS_VPN, DEFAULT_BYPASS_VPN);
-    }
-
-    public static int getProxyType() {
-        return getInt(KEY_PROXY_TYPE, DEFAULT_PROXY_TYPE);
-    }
-
-    public static void putProxyType(int value) {
-        putInt(KEY_PROXY_TYPE, value);
-    }
-
-    public static String getProxyIp() {
-        return getString(KEY_PROXY_IP, DEFAULT_PROXY_IP);
-    }
-
-    public static void putProxyIp(String value) {
-        putString(KEY_PROXY_IP, value);
-    }
-
-    public static int getProxyPort() {
-        return getInt(KEY_PROXY_PORT, DEFAULT_PROXY_PORT);
-    }
-
-    public static void putProxyPort(int value) {
-        putInt(KEY_PROXY_PORT, value);
-    }
-
-    public static int getClipboardTextHashCode() {
-        return getInt(KEY_CLIPBOARD_TEXT_HASH_CODE, DEFAULT_CLIPBOARD_TEXT_HASH_CODE);
-    }
-
-    public static void putClipboardTextHashCode(int value) {
-        putInt(KEY_CLIPBOARD_TEXT_HASH_CODE, value);
-    }
-
-    public static Set<String> getArchivePasswds() {
-        return getStringSet(KEY_ARCHIVE_PASSWDS);
-    }
-
-    public static void putPasswdToArchivePasswds(String value) {
-        putStringToStringSet(KEY_ARCHIVE_PASSWDS, value);
-    }
-
-    public static int getListThumbSize() {
-        if (LIST_THUMB_SIZE_INITED) {
-            return LIST_THUMB_SIZE;
-        }
-        int size = 3 * getInt(KEY_LIST_THUMB_SIZE, DEFAULT_LIST_THUMB_SIZE);
-        LIST_THUMB_SIZE = size;
-        LIST_THUMB_SIZE_INITED = true;
-        return size;
-    }
-
-    public static boolean getNotificationRequired() {
-        return getBoolean(KEY_NOTIFICATION_REQUIRED, false);
-    }
-
-    public static void putNotificationRequired() {
-        putBoolean(KEY_NOTIFICATION_REQUIRED, true);
-    }
-}

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

@@ -0,0 +1,124 @@
+@file:Suppress("SameParameterValue")
+
+package com.hippo.ehviewer
+
+import com.hippo.ehviewer.client.EhUtils
+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 java.util.Locale
+import kotlin.reflect.KProperty
+
+object Settings : DataStorePreferences(null) {
+    private const val KEY_SHOW_TAG_TRANSLATIONS = "show_tag_translations"
+
+    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)
+
+    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 intFromStrPref("download_delay", 0)
+    var gallerySite by intFromStrPref("gallery_site", 0).observed { updateWhenGallerySiteChanges() }
+    var multiThreadDownload by intFromStrPref("download_thread", 3)
+    var preloadImage by intFromStrPref("preload_image", 5)
+    var theme by intFromStrPref("theme", -1).observed { updateWhenThemeChanges() }
+    var listMode by intFromStrPref("list_mode", 0)
+    var detailSize by intFromStrPref("detail_size", 0)
+    var thumbResolution by intFromStrPref("thumb_resolution", 0)
+    var readCacheSize by intFromStrPref("read_cache_size", 640)
+    var launchPage by intFromStrPref("launch_page", 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 enableQuic by boolPref("enable_quic", true)
+    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)
+
+    init {
+        if ("CN" == Locale.getDefault().country) {
+            edit {
+                if (KEY_SHOW_TAG_TRANSLATIONS !in prefs) showTagTranslations = 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 intFromStrPref(key: String, defValue: Int) = object : Delegate<Int> {
+        override val flowGetter: () -> Flow<Unit>
+        private var _value by stringPref(key, defValue.toString()).also { flowGetter = { it.changesFlow() } }
+        override fun getValue(thisRef: Any?, prop: KProperty<*>?) = _value.toIntOrNull() ?: defValue
+        override fun setValue(thisRef: Any?, prop: KProperty<*>?, value: Int) { _value = value.toString() }
+    }
+
+    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 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 } }
+        }
+    }
+}

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

@@ -0,0 +1,83 @@
+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/UrlOpener.java

@@ -1,86 +0,0 @@
-/*
- * Copyright 2016 Hippo Seven
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hippo.ehviewer;
-
-import android.content.ActivityNotFoundException;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.text.TextUtils;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.browser.customtabs.CustomTabsIntent;
-
-import com.hippo.ehviewer.client.data.GalleryDetail;
-import com.hippo.ehviewer.client.parser.GalleryPageUrlParser;
-
-import eu.kanade.tachiyomi.ui.reader.ReaderActivity;
-
-public final class UrlOpener {
-
-    private UrlOpener() {
-    }
-
-    public static void openUrl(@NonNull Context context, String url, boolean ehUrl) {
-        openUrl(context, url, ehUrl, null);
-    }
-
-    public static void openUrl(@NonNull Context context, String url, boolean ehUrl, GalleryDetail galleryDetail) {
-        if (TextUtils.isEmpty(url)) {
-            return;
-        }
-
-        Intent intent;
-        Uri uri = Uri.parse(url);
-
-        if (ehUrl) {
-            if (galleryDetail != null) {
-                GalleryPageUrlParser.Result result = GalleryPageUrlParser.parse(url);
-                if (result != null) {
-                    if (result.gid == galleryDetail.getGid()) {
-                        intent = new Intent(context, ReaderActivity.class);
-                        intent.setAction(ReaderActivity.ACTION_EH);
-                        intent.putExtra(ReaderActivity.KEY_GALLERY_INFO, galleryDetail);
-                        intent.putExtra(ReaderActivity.KEY_PAGE, result.page);
-                        context.startActivity(intent);
-                        return;
-                    }
-                } else if (url.startsWith("#c")) {
-                    try {
-                        intent = new Intent(context, ReaderActivity.class);
-                        intent.setAction(ReaderActivity.ACTION_EH);
-                        intent.putExtra(ReaderActivity.KEY_GALLERY_INFO, galleryDetail);
-                        intent.putExtra(ReaderActivity.KEY_PAGE, Integer.parseInt(url.replace("#c", "")) - 1);
-                        context.startActivity(intent);
-                        return;
-                    } catch (NumberFormatException e) {
-                        //
-                    }
-                }
-            }
-        }
-
-        CustomTabsIntent.Builder customTabsIntent = new CustomTabsIntent.Builder();
-        customTabsIntent.setShowTitle(true);
-        try {
-            customTabsIntent.build().launchUrl(context, uri);
-        } catch (ActivityNotFoundException e) {
-            Toast.makeText(context, R.string.no_browser_installed, Toast.LENGTH_LONG).show();
-        }
-    }
-}

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

@@ -1,109 +0,0 @@
-/*
- * Copyright 2022 Tarsin Norbin
- *
- * This file is part of EhViewer
- *
- * EhViewer is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * EhViewer is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with EhViewer.
- * If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.hippo.ehviewer;
-
-import android.view.View;
-
-import androidx.annotation.NonNull;
-import androidx.core.view.WindowInsetsAnimationCompat;
-import androidx.core.view.WindowInsetsCompat;
-
-import com.hippo.yorozuya.MathUtils;
-
-import java.util.HashMap;
-import java.util.List;
-
-public class WindowInsetsAnimationHelper extends WindowInsetsAnimationCompat.Callback {
-    private final View[] views;
-    private final HashMap<View, Integer> startPaddings = new HashMap<>();
-    private final HashMap<View, Integer> endPaddings = new HashMap<>();
-    WindowInsetsAnimationCompat animation;
-
-    public WindowInsetsAnimationHelper(int dispatchMode, View... views) {
-        super(dispatchMode);
-        this.views = views;
-    }
-
-    @Override
-    public void onPrepare(@NonNull WindowInsetsAnimationCompat animation) {
-        super.onPrepare(animation);
-        this.animation = animation;
-        for (View view : views) {
-            if (view == null) {
-                continue;
-            }
-            startPaddings.put(view, view.getPaddingBottom());
-        }
-    }
-
-    @NonNull
-    @Override
-    public WindowInsetsAnimationCompat.BoundsCompat onStart(@NonNull WindowInsetsAnimationCompat animation, @NonNull WindowInsetsAnimationCompat.BoundsCompat bounds) {
-        this.animation = animation;
-        for (View view : views) {
-            if (view == null) {
-                continue;
-            }
-            endPaddings.put(view, view.getPaddingBottom());
-            int startPadding = startPaddings.containsKey(view) ? startPaddings.get(view) : 0;
-            view.setTranslationY(-(startPadding - view.getPaddingBottom()));
-        }
-        return bounds;
-    }
-
-    @NonNull
-    @Override
-    public WindowInsetsCompat onProgress(@NonNull WindowInsetsCompat insets, @NonNull List<WindowInsetsAnimationCompat> runningAnimations) {
-        if (animation == null) {
-            return insets;
-        }
-        WindowInsetsAnimationCompat imeAnimation = null;
-        for (WindowInsetsAnimationCompat animation : runningAnimations) {
-            if ((animation.getTypeMask() & WindowInsetsCompat.Type.ime()) != 0) {
-                imeAnimation = animation;
-                break;
-            }
-        }
-        if (imeAnimation != null) {
-            for (View view : views) {
-                if (view == null) {
-                    continue;
-                }
-                int startPadding = startPaddings.containsKey(view) ? startPaddings.get(view) : 0;
-                int endPadding = endPaddings.containsKey(view) ? endPaddings.get(view) : 0;
-                view.setTranslationY(MathUtils.lerp(endPadding - startPadding, 0, animation.getInterpolatedFraction()));
-            }
-        }
-        return insets;
-    }
-
-    @Override
-    public void onEnd(@NonNull WindowInsetsAnimationCompat animation) {
-        super.onEnd(animation);
-        startPaddings.clear();
-        endPaddings.clear();
-        this.animation = null;
-        for (View view : views) {
-            if (view == null) {
-                continue;
-            }
-            view.setTranslationY(0);
-        }
-    }
-}

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

@@ -15,8 +15,36 @@
  */
 package com.hippo.ehviewer.client
 
-object EhCacheKeyFactory {
-    fun getImageKey(gid: Long, index: Int): String {
-        return "image:$gid:$index"
-    }
-}
+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
+
+// ExHentai Large Preview: https://s.exhentai.org/t/***
+// ExHentai Normal Preview: https://s.exhentai.org/m/***
+// EHentai Normal Preview: https://ehgt.org/m/***
+// EHentai Large Preview: https://ehgt.org/***
+
+private const val URL_PREFIX_THUMB_E = "https://ehgt.org/"
+private const val URL_PREFIX_THUMB_EX = "https://s.exhentai.org/"
+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)
+}
+
+val GalleryPreview.url
+    get() = if (exThumb) {
+        if (this is NormalGalleryPreview) URL_PREFIX_THUMB_EX else URL_PREFIX_LARGE_THUMB_EX
+    } else {
+        URL_PREFIX_THUMB_E
+    } + imageKey
+
+val GalleryInfo.thumbUrl
+    get() = (if (exThumb) URL_PREFIX_LARGE_THUMB_EX else URL_PREFIX_THUMB_E) + thumbKey!!
+
+val exThumb get() = EhUtils.isExHentai && !Settings.forceEhThumb

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

@@ -1,184 +0,0 @@
-/*
- * Copyright 2016 Hippo Seven
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.hippo.ehviewer.client
-
-import eu.kanade.tachiyomi.util.lang.launchIO
-import eu.kanade.tachiyomi.util.lang.withUIContext
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.CoroutineScope
-import java.io.File
-
-object EhClient {
-    internal fun enqueue(request: EhRequest, scope: CoroutineScope) {
-        check(!request.isActive) // Abort if attempt to execute an active request
-        request.job = scope.launchIO {
-            val callback: Callback<Any?>? = request.callback
-            try {
-                val result: Any? = request.run {
-                    if (args == null)
-                        execute(method)
-                    else
-                        execute(method, *args!!)
-                }
-                withUIContext { callback?.onSuccess(result) }
-            } catch (e: Exception) {
-                if (e is CancellationException)
-                    throw e // Don't catch coroutine CancellationException
-                e.printStackTrace()
-                withUIContext { callback?.onFailure(e) }
-            }
-        }
-    }
-
-    suspend fun execute(method: Int, vararg params: Any?): Any? {
-        return when (method) {
-            METHOD_SIGN_IN -> EhEngine.signIn(
-                params[0] as String,
-                params[1] as String
-            )
-
-            METHOD_GET_GALLERY_LIST -> EhEngine.getGalleryList(
-                params[0] as String
-            )
-
-            METHOD_GET_GALLERY_DETAIL -> EhEngine.getGalleryDetail(
-                params[0] as String?
-            )
-
-            METHOD_GET_PREVIEW_SET -> EhEngine.getPreviewSet(
-                params[0] as String?
-            )
-
-            METHOD_GET_RATE_GALLERY -> EhEngine.rateGallery(
-                params[0] as Long,
-                params[1] as String?,
-                params[2] as Long,
-                params[3] as String?,
-                params[4] as Float
-            )
-
-            METHOD_GET_COMMENT_GALLERY -> EhEngine.commentGallery(
-                params[0] as String?,
-                params[1] as String,
-                params[2] as String?
-            )
-
-            METHOD_GET_GALLERY_TOKEN -> EhEngine.getGalleryToken(
-                params[0] as Long,
-                params[1] as String?,
-                params[2] as Int
-            )
-
-            METHOD_GET_FAVORITES -> EhEngine.getFavorites(
-                params[0] as String
-            )
-
-            METHOD_ADD_FAVORITES -> EhEngine.addFavorites(
-                params[0] as Long,
-                params[1] as String?,
-                params[2] as Int,
-                params[3] as String?
-            )
-
-            METHOD_ADD_FAVORITES_RANGE -> @Suppress("UNCHECKED_CAST") EhEngine.addFavoritesRange(
-                params[0] as LongArray,
-                params[1] as Array<String?>,
-                params[2] as Int
-            )
-
-            METHOD_MODIFY_FAVORITES -> EhEngine.modifyFavorites(
-                params[0] as String,
-                params[1] as LongArray,
-                params[2] as Int
-            )
-
-            METHOD_GET_TORRENT_LIST -> EhEngine.getTorrentList(
-                params[0] as String?,
-                params[1] as Long,
-                params[2] as String?
-            )
-
-            METHOD_GET_PROFILE -> EhEngine.getProfile()
-            METHOD_VOTE_COMMENT -> EhEngine.voteComment(
-                params[0] as Long,
-                params[1] as String?,
-                params[2] as Long,
-                params[3] as String?,
-                params[4] as Long,
-                params[5] as Int
-            )
-
-            METHOD_IMAGE_SEARCH -> EhEngine.imageSearch(
-                params[0] as File,
-                params[1] as Boolean,
-                params[2] as Boolean,
-                params[3] as Boolean
-            )
-
-            METHOD_ARCHIVE_LIST -> EhEngine.getArchiveList(
-                params[0] as String?,
-                params[1] as Long,
-                params[2] as String?
-            )
-
-            METHOD_DOWNLOAD_ARCHIVE -> EhEngine.downloadArchive(
-                params[0] as Long,
-                params[1] as String?,
-                params[2] as String?,
-                params[3] as String?,
-                params[4] as Boolean
-            )
-
-            METHOD_VOTE_TAG -> EhEngine.voteTag(
-                params[0] as Long,
-                params[1] as String?,
-                params[2] as Long,
-                params[3] as String?,
-                params[4] as String?,
-                params[5] as Int
-            )
-
-            METHOD_GET_UCONFIG -> EhEngine.getUConfig()
-            else -> throw IllegalStateException("Can't detect method $method")
-        }
-    }
-
-    interface Callback<E> {
-        fun onSuccess(result: E)
-        fun onFailure(e: Exception)
-        fun onCancel()
-    }
-
-    const val METHOD_SIGN_IN = 0
-    const val METHOD_GET_GALLERY_LIST = 1
-    const val METHOD_GET_GALLERY_DETAIL = 3
-    const val METHOD_GET_PREVIEW_SET = 4
-    const val METHOD_GET_RATE_GALLERY = 5
-    const val METHOD_GET_COMMENT_GALLERY = 6
-    const val METHOD_GET_GALLERY_TOKEN = 7
-    const val METHOD_GET_FAVORITES = 8
-    const val METHOD_ADD_FAVORITES = 9
-    const val METHOD_ADD_FAVORITES_RANGE = 10
-    const val METHOD_MODIFY_FAVORITES = 11
-    const val METHOD_GET_TORRENT_LIST = 12
-    const val METHOD_GET_PROFILE = 14
-    const val METHOD_VOTE_COMMENT = 15
-    const val METHOD_IMAGE_SEARCH = 16
-    const val METHOD_ARCHIVE_LIST = 17
-    const val METHOD_DOWNLOAD_ARCHIVE = 18
-    const val METHOD_VOTE_TAG = 19
-    const val METHOD_GET_UCONFIG = 20
-}

app/src/main/java/com/hippo/ehviewer/client/EhConfig.java

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

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

@@ -15,113 +15,65 @@
  */
 package com.hippo.ehviewer.client
 
-import com.hippo.ehviewer.EhApplication
-import com.hippo.network.CookieDatabase
-import com.hippo.network.CookieSet
+import android.webkit.CookieManager
 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 db: CookieDatabase = CookieDatabase(EhApplication.application, "okhttp3-cookie.db")
-    private val map: MutableMap<String, CookieSet> = db.allCookies
+    private val manager = CookieManager.getInstance()
+    fun signOut() = manager.removeAllCookies(null)
+    fun contains(url: HttpUrl, name: String) = get(url).any { it.name == name }
 
-    fun signOut() {
-        clear()
+    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 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 val sTipsCookie: Cookie = Cookie.Builder()
-        .name(EhConfig.KEY_CONTENT_WARNING)
-        .value(EhConfig.CONTENT_WARNING_NOT_SHOW)
-        .domain(EhUrl.DOMAIN_E)
-        .path("/")
-        .expiresAt(Long.MAX_VALUE)
-        .build()
+    private 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()
 
-    fun newCookie(
-        cookie: Cookie, newDomain: String, forcePersistent: Boolean,
-        forceLongLive: Boolean, forceNotHostOnly: Boolean
-    ): 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 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 deleteCookie(url: HttpUrl, name: String) {
+        manager.setCookie(url.toString(), "$name=;Max-Age=0")
     }
 
-    @Synchronized
     fun addCookie(cookie: Cookie) {
-        // 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)
-            }
-        }
+        if (EhUrl.DOMAIN_E in cookie.domain) manager.setCookie(EhUrl.HOST_E, cookie.toString()) else manager.setCookie(EhUrl.DOMAIN_EX, cookie.toString())
     }
 
+    fun flush() = manager.flush()
+
     fun getCookieHeader(url: HttpUrl): String {
-        val cookies = getCookies(url)
+        val cookies = loadForRequest(url)
         val cookieHeader = StringBuilder()
         var i = 0
         val size = cookies.size
@@ -136,115 +88,17 @@ object EhCookieStore : CookieJar {
         return cookieHeader.toString()
     }
 
-    @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)
-            }
-        }
-
-        // 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()
-        db.clear()
-    }
-
-    @Synchronized
-    fun close() {
-        db.close()
-    }
-
-    override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>) {
-        for (cookie in cookies) {
-            // See https://github.com/Ehviewer-Overhauled/Ehviewer/issues/873
-            if (cookie.name != "__utmp") {
-                addCookie(cookie)
-            }
-        }
-    }
-
-    /**
-     * 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'.
-    }
+    // 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() }
 
     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 (EhConfig.KEY_CONTENT_WARNING == name) {
-                    continue
-                }
-                if (EhConfig.KEY_UCONFIG == name) {
-                    continue
-                }
-                result.add(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
             }
-            // Add some
-            result.add(sTipsCookie)
-            Collections.unmodifiableList(result)
-        } else {
-            cookies
         }
     }
-}
+}

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

@@ -1,130 +0,0 @@
-/*
- * Copyright 2018 Hippo Seven
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.hippo.ehviewer.client
-
-import 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,
-            "repo.e-hentai.org",
-            Pair("94.100.28.57", true),
-            Pair("94.100.29.73", true),
-        )
-        put(
-            builtInHosts,
-            "forums.e-hentai.org",
-            Pair("94.100.18.243", false),
-        )
-        put(
-            builtInHosts,
-            "ehgt.org",
-            *ehgtHosts
-        )
-        put(
-            builtInHosts,
-            "gt0.ehgt.org",
-            *ehgtHosts
-        )
-        put(
-            builtInHosts,
-            "gt1.ehgt.org",
-            *ehgtHosts
-        )
-        put(
-            builtInHosts,
-            "gt2.ehgt.org",
-            *ehgtHosts
-        )
-        put(
-            builtInHosts,
-            "gt3.ehgt.org",
-            *ehgtHosts
-        )
-        put(
-            builtInHosts,
-            "ul.ehgt.org",
-            Pair("94.100.24.82", true),
-            Pair("94.100.24.72", true),
-        )
-        put(
-            builtInHosts,
-            "raw.githubusercontent.com",
-            Pair("151.101.0.133", false),
-            Pair("151.101.64.133", false),
-            Pair("151.101.128.133", false),
-            Pair("151.101.192.133", false),
-        )
-    }
-
-    private fun put(
-        map: MutableMap<String, List<InetAddress>>,
-        host: String,
-        vararg ips: Pair<String, Boolean>
-    ) {
-        map[host] = ips.mapNotNull { pair ->
-            Hosts.toInetAddress(host, pair.first).takeUnless { Settings.getDF() && pair.second }
-        }
-    }
-
-    @Throws(UnknownHostException::class)
-    override fun lookup(hostname: String): List<InetAddress> {
-        return hosts[hostname] ?: builtInHosts[hostname].takeIf { Settings.getBuiltInHosts() }
-        ?: Dns.SYSTEM.lookup(hostname)
-    }
-
-    fun isInHosts(hostname: String): Boolean {
-        return hosts.contains(hostname) || (builtInHosts.contains(hostname) && Settings.getBuiltInHosts())
-    }
-}

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

@@ -1,315 +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
 
-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 java.util.Locale
-import java.util.regex.Pattern
+import com.hippo.ehviewer.dao.FilterMode
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.launch
 
-object EhFilter {
-    private val mTitleFilterList: MutableList<Filter> = ArrayList()
-    private val mUploaderFilterList: MutableList<Filter> = ArrayList()
-    private val mTagFilterList: MutableList<Filter> = ArrayList()
-    private val mTagNamespaceFilterList: MutableList<Filter> = ArrayList()
-    private val mCommenterFilterList: MutableList<Filter> = ArrayList()
-    private val mCommentFilterList: MutableList<Filter> = ArrayList()
+private val regex = { p: Filter -> Regex(p.text) }.memoize()
 
-    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 val TAG = EhFilter::class.java.simpleName
-
-    init {
-        val list = EhDB.allFilter
-        var i = 0
-        val n = list.size
-        while (i < n) {
-            val filter = list[i]
-            when (filter.mode) {
-                MODE_TITLE -> {
-                    filter.text = filter.text!!.lowercase(Locale.getDefault())
-                    mTitleFilterList.add(filter)
-                }
-
-                MODE_TAG -> {
-                    filter.text = filter.text!!.lowercase(Locale.getDefault())
-                    mTagFilterList.add(filter)
-                }
-
-                MODE_TAG_NAMESPACE -> {
-                    filter.text = filter.text!!.lowercase(Locale.getDefault())
-                    mTagNamespaceFilterList.add(filter)
-                }
-
-                MODE_UPLOADER -> mUploaderFilterList.add(filter)
-                MODE_COMMENTER -> mCommenterFilterList.add(filter)
-                MODE_COMMENT -> mCommentFilterList.add(filter)
-                else -> Log.d(TAG, "Unknown mode: " + filter.mode)
-            }
-            i++
-        }
+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) }
+    }
+    fun Filter.trigger(callback: ((Unit) -> Unit)? = null) = launchOps(callback) {
+        enable = !enable
+        EhDB.updateFilter(this)
+    }
+    fun Filter.forget(callback: ((Unit) -> Unit)? = null) = launchOps(callback) {
+        EhDB.deleteFilter(this)
+        filters.await().remove(this)
     }
 
-    val titleFilterList: List<Filter>
-        get() = mTitleFilterList
-    val uploaderFilterList: List<Filter>
-        get() = mUploaderFilterList
-    val tagFilterList: List<Filter>
-        get() = mTagFilterList
-    val tagNamespaceFilterList: List<Filter>
-        get() = mTagNamespaceFilterList
-    val commenterFilterList: List<Filter>
-        get() = mCommenterFilterList
-    val commentFilterList: List<Filter>
-        get() = mCommentFilterList
-
-    @Synchronized
-    fun addFilter(filter: Filter): Boolean {
-        // enable filter by default before it is added to database
-        filter.enable = true
-        if (!EhDB.addFilter(filter)) return false
-        when (filter.mode) {
-            MODE_TITLE -> {
-                filter.text = filter.text!!.lowercase(Locale.getDefault())
-                mTitleFilterList.add(filter)
-            }
-
-            MODE_TAG -> {
-                filter.text = filter.text!!.lowercase(Locale.getDefault())
-                mTagFilterList.add(filter)
-            }
-
-            MODE_TAG_NAMESPACE -> {
-                filter.text = filter.text!!.lowercase(Locale.getDefault())
-                mTagNamespaceFilterList.add(filter)
-            }
-
-            MODE_UPLOADER -> mUploaderFilterList.add(filter)
-            MODE_COMMENTER -> mCommenterFilterList.add(filter)
-            MODE_COMMENT -> mCommentFilterList.add(filter)
-            else -> Log.d(TAG, "Unknown mode: " + filter.mode)
-        }
-        return true
+    private fun spiltTag(tag: String) = tag.run {
+        val index = indexOf(':')
+        if (index < 0) null to this else substring(0, index) to substring(index + 1)
     }
 
-    @Synchronized
-    fun triggerFilter(filter: Filter) {
-        EhDB.triggerFilter(filter)
-    }
-
-    @Synchronized
-    fun deleteFilter(filter: Filter) {
-        EhDB.deleteFilter(filter)
-        when (filter.mode) {
-            MODE_TITLE -> mTitleFilterList.remove(filter)
-            MODE_TAG -> mTagFilterList.remove(filter)
-            MODE_TAG_NAMESPACE -> mTagNamespaceFilterList.remove(filter)
-            MODE_UPLOADER -> mUploaderFilterList.remove(filter)
-            MODE_COMMENTER -> mCommenterFilterList.remove(filter)
-            MODE_COMMENT -> mCommentFilterList.remove(filter)
-            else -> Log.d(TAG, "Unknown mode: " + filter.mode)
-        }
-    }
-
-    @Synchronized
-    fun needTags(): Boolean {
-        return 0 != mTagFilterList.size || 0 != mTagNamespaceFilterList.size
-    }
-
-    @Synchronized
-    fun filterTitle(info: GalleryInfo?): Boolean {
-        if (null == info) {
-            return false
-        }
-
-        // Title
-        val title = info.title
-        val filters: List<Filter> = mTitleFilterList
-        if (null != title && filters.isNotEmpty()) {
-            var i = 0
-            val n = filters.size
-            while (i < n) {
-                if (filters[i].enable!! && title.lowercase(Locale.getDefault()).contains(
-                        filters[i].text!!
-                    )
-                ) {
-                    return false
-                }
-                i++
-            }
-        }
-        return true
-    }
-
-    @Synchronized
-    fun filterUploader(info: GalleryInfo?): Boolean {
-        if (null == info) {
-            return false
-        }
-
-        // Uploader
-        val uploader = info.uploader
-        val filters: List<Filter> = mUploaderFilterList
-        if (null != uploader && filters.isNotEmpty()) {
-            var i = 0
-            val n = filters.size
-            while (i < n) {
-                if (filters[i].enable!! && uploader == filters[i].text) {
-                    return false
-                }
-                i++
-            }
-        }
-        return true
-    }
-
-    private fun matchTag(tag: String?, filter: String?): Boolean {
-        if (null == tag || null == filter) {
-            return false
-        }
-        val tagNamespace: String?
-        val tagName: String
-        val filterNamespace: String?
-        val filterName: String
-        var index = tag.indexOf(':')
-        if (index < 0) {
-            tagNamespace = null
-            tagName = tag
-        } else {
-            tagNamespace = tag.substring(0, index)
-            tagName = tag.substring(index + 1)
-        }
-        index = filter.indexOf(':')
-        if (index < 0) {
-            filterNamespace = null
-            filterName = filter
-        } else {
-            filterNamespace = filter.substring(0, index)
-            filterName = filter.substring(index + 1)
-        }
-        return if (null != tagNamespace && null != filterNamespace &&
-            tagNamespace != filterNamespace
-        ) {
+    private fun matchTag(tag: String, filter: String): Boolean {
+        val (tagNamespace, tagName) = spiltTag(tag)
+        val (filterNamespace, filterName) = spiltTag(filter)
+        return if (null != tagNamespace && null != filterNamespace && tagNamespace != filterNamespace) {
             false
-        } else tagName == filterName
-    }
-
-    @Synchronized
-    fun filterTag(info: GalleryInfo?): Boolean {
-        if (null == info) {
-            return false
-        }
-
-        // Tag
-        val tags = info.simpleTags
-        val filters: List<Filter> = mTagFilterList
-        if (null != tags && filters.isNotEmpty()) {
-            for (tag in tags) {
-                var i = 0
-                val n = filters.size
-                while (i < n) {
-                    if (filters[i].enable!! && matchTag(tag, filters[i].text)) {
-                        return false
-                    }
-                    i++
-                }
-            }
-        }
-        return true
-    }
-
-    private fun matchTagNamespace(tag: String?, filter: String?): Boolean {
-        if (null == tag || null == filter) {
-            return false
-        }
-        val tagNamespace: String
-        val index = tag.indexOf(':')
-        return if (index >= 0) {
-            tagNamespace = tag.substring(0, index)
-            tagNamespace == filter
         } else {
-            false
+            tagName == filterName
         }
     }
 
-    @Synchronized
-    fun filterTagNamespace(info: GalleryInfo?): Boolean {
-        if (null == info) {
-            return false
-        }
-        val tags = info.simpleTags
-        val filters: List<Filter> = mTagNamespaceFilterList
-        if (null != tags && filters.isNotEmpty()) {
-            for (tag in tags) {
-                var i = 0
-                val n = filters.size
-                while (i < n) {
-                    if (filters[i].enable!! && matchTagNamespace(tag, filters[i].text)) {
-                        return false
-                    }
-                    i++
-                }
-            }
-        }
-        return true
+    private fun matchTagNamespace(tag: String, filter: String): Boolean {
+        val (nameSpace, _) = spiltTag(tag)
+        return nameSpace == filter
     }
 
-    @Synchronized
-    fun filterCommenter(commenter: String?): Boolean {
-        if (null == commenter) {
-            return false
-        }
-        val filters: List<Filter> = mCommenterFilterList
-        if (filters.isNotEmpty()) {
-            var i = 0
-            val n = filters.size
-            while (i < n) {
-                if (filters[i].enable!! && commenter == filters[i].text) {
-                    return false
-                }
-                i++
-            }
-        }
-        return true
-    }
-
-    @Synchronized
-    fun filterComment(comment: String?): Boolean {
-        if (null == comment) {
-            return false
-        }
-        val filters: List<Filter> = mCommentFilterList
-        if (filters.isNotEmpty()) {
-            var i = 0
-            val n = filters.size
-            while (i < n) {
-                if (filters[i].enable!!) {
-                    val p = Pattern.compile(filters[i].text!!)
-                    val m = p.matcher(comment)
-                    if (m.find()) return false
-                }
-                i++
-            }
-        }
-        return true
-    }
-}
+    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) }
+}

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

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

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

@@ -15,15 +15,114 @@
  */
 package com.hippo.ehviewer.client
 
-import com.hippo.okhttp.ChromeRequestBuilder
+import android.util.Log
+import com.hippo.ehviewer.EhApplication.Companion.baseOkHttpClient
+import com.hippo.ehviewer.EhApplication.Companion.noRedirectOkHttpClient
+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
+import okhttp3.MultipartBody
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
+import okhttp3.Response
+import okhttp3.executeAsync
+import okio.BufferedSource
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
 
-class EhRequestBuilder @JvmOverloads constructor(
-    url: String,
-    referer: String?,
-    origin: String? = null
-) : ChromeRequestBuilder(url) {
-    init {
-        referer?.let { addHeader("Referer", it) }
-        origin?.let { addHeader("Origin", it) }
+inline fun ehRequest(url: String, referer: String? = null, origin: String? = null, builder: Request.Builder.() -> Unit = {}) = Request.Builder().url(url).apply {
+    addHeader("User-Agent", CHROME_USER_AGENT)
+    addHeader("Accept", CHROME_ACCEPT)
+    addHeader("Accept-Language", CHROME_ACCEPT_LANGUAGE)
+    referer?.let { addHeader("Referer", it) }
+    origin?.let { addHeader("Origin", it) }
+}.apply(builder).build()
+
+inline fun Request.Builder.formBody(builder: FormBody.Builder.() -> Unit) = post(FormBody.Builder().apply(builder).build())
+
+inline fun Request.Builder.multipartBody(builder: MultipartBody.Builder.() -> Unit) = post(MultipartBody.Builder().apply(builder).build())
+
+val MEDIA_TYPE_JSON: MediaType = "application/json; charset=utf-8".toMediaType()
+
+inline fun JsonObjectBuilder.array(name: String, builder: JsonArrayBuilder.() -> Unit) = put(name, buildJsonArray(builder))
+
+inline fun Request.Builder.jsonBody(builder: JsonObjectBuilder.() -> Unit) = post(buildJsonObject(builder).toString().toRequestBody(MEDIA_TYPE_JSON))
+
+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!")
     }
 }
+
+suspend inline fun <R> Request.execute(block: Response.() -> R): R {
+    contract {
+        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
+    }
+    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>() }
+
+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_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

@@ -1,72 +0,0 @@
-/*
- * Copyright 2022 Tarsin Norbin
- *
- * This file is part of EhViewer
- *
- * EhViewer is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * EhViewer is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with EhViewer.
- * If not, see <https://www.gnu.org/licenses/>.
- */
-package com.hippo.ehviewer.client
-
-import android.util.Log
-import java.net.InetAddress
-import java.net.Socket
-import javax.net.ssl.SSLSocket
-import javax.net.ssl.SSLSocketFactory
-
-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) }
-        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,55 +16,49 @@
 package com.hippo.ehviewer.client
 
 import android.content.Context
-import com.hippo.ehviewer.AppConfig
-import com.hippo.ehviewer.EhApplication
-import com.hippo.ehviewer.EhApplication.Companion.okHttpClient
+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.R
-import com.hippo.util.HashCodeUtils
-import com.hippo.yorozuya.FileUtils
-import com.hippo.yorozuya.copyToFile
-import eu.kanade.tachiyomi.util.lang.launchIO
-import kotlinx.coroutines.DelicateCoroutinesApi
+import com.hippo.ehviewer.util.AppConfig
+import com.hippo.ehviewer.util.FileUtils
+import com.hippo.ehviewer.util.copyToFile
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import 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 org.json.JSONException
-import org.json.JSONObject
+import splitties.init.appCtx
 import java.io.File
-import java.io.FileInputStream
-import java.io.IOException
 import java.nio.charset.StandardCharsets
-import java.security.MessageDigest
-import java.security.NoSuchAlgorithmException
 
-private typealias TagGroup = Map<String, String>
-private typealias TagGroups = Map<String, TagGroup>
-
-object EhTagDatabase {
+object EhTagDatabase : CoroutineScope {
     private const val NAMESPACE_PREFIX = "n"
-    private lateinit var tagGroups: TagGroups
+    private val PREFIXES = arrayOf(
+        "-",
+        "~",
+        "tag:",
+        "weak:",
+    )
+    private lateinit var tagGroups: Map<String, Map<String, String>>
+    private val updateLock = Mutex()
+    private val dbLock = Mutex()
+    override val coroutineContext = Dispatchers.IO + Job()
 
-    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) }
-
-    private fun updateData(source: BufferedSource) {
-        try {
-            tagGroups = JSONObject(source.readString(StandardCharsets.UTF_8)).toTagGroups()
-        } catch (e: JSONException) {
-            e.printStackTrace()
-        }
-    }
+    var initialized by mutableStateOf(false)
 
     fun getTranslation(prefix: String? = NAMESPACE_PREFIX, tag: String?): String? {
         return tagGroups[prefix]?.get(tag)?.trim()?.takeIf { it.isNotEmpty() }
@@ -74,7 +68,7 @@ object EhTagDatabase {
         tags: Map<String, String>,
         keyword: String,
         translate: Boolean,
-        exactly: Boolean
+        exactly: Boolean,
     ): Flow<Pair<String?, String>> = flow {
         if (exactly) {
             tags[keyword]?.let {
@@ -99,28 +93,31 @@ object EhTagDatabase {
         }
     }
 
-    /* Construct a cold flow for tag database suggestions */
+    // Construct a cold flow for tag database suggestions
     fun suggestFlow(
         keyword: String,
         translate: Boolean,
-        exactly: Boolean = false
+        exactly: Boolean = false,
     ): Flow<Pair<String?, String>> = flow {
-        val keywordPrefix = keyword.substringBefore(':')
-        val keywordTag = keyword.drop(keywordPrefix.length + 1)
-        val prefix = namespaceToPrefix(keywordPrefix) ?: keywordPrefix
-        val tags = tagGroups[prefix.takeIf { keywordTag.isNotEmpty() && it != NAMESPACE_PREFIX }]
+        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 }]
         tags?.let {
-            internalSuggestFlow(it, keywordTag, translate, exactly).collect { (hint, tag) ->
-                emit(Pair(hint, "$prefix:$tag"))
+            internalSuggestFlow(it, tagKeyword, 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"))
+        } ?: tagGroups.forEach { (namespacePrefix, tags) ->
+            if (namespacePrefix != NAMESPACE_PREFIX) {
+                internalSuggestFlow(tags, mKeyword, translate, exactly).collect { (hint, tag) ->
+                    emit(Pair(hint, "$prefix$namespacePrefix:$tag"))
                 }
             } else {
-                internalSuggestFlow(tags, keyword, translate, exactly).collect { (hint, tag) ->
-                    emit(Pair(hint, "$tag:"))
+                internalSuggestFlow(tags, mKeyword, translate, exactly).collect { (hint, namespacePrefix) ->
+                    emit(Pair(hint, "$prefix$namespacePrefix:"))
                 }
             }
         }
@@ -131,7 +128,6 @@ object EhTagDatabase {
     private fun String.containsIgnoreSpace(other: String, ignoreCase: Boolean = true): Boolean =
         removeSpace().contains(other.removeSpace(), ignoreCase)
 
-
     private val NAMESPACE_TO_PREFIX = HashMap<String, String>().also {
         it["artist"] = "a"
         it["cosplayer"] = "cos"
@@ -146,7 +142,6 @@ object EhTagDatabase {
         it["reclass"] = "r"
     }
 
-    @JvmStatic
     fun namespaceToPrefix(namespace: String): String? {
         return NAMESPACE_TO_PREFIX[namespace]
     }
@@ -161,42 +156,31 @@ object EhTagDatabase {
     }
 
     private fun getFileContent(file: File): String? {
-        try {
-            file.source().buffer().use { return it.readString(StandardCharsets.UTF_8) }
-        } catch (e: IOException) {
-            return null
-        }
+        return runCatching {
+            file.source().buffer().use { it.readString(StandardCharsets.UTF_8) }
+        }.getOrNull()
     }
 
     private fun getFileSha1(file: File): String? {
-        try {
-            FileInputStream(file).use { stream ->
-                val digest = MessageDigest.getInstance("SHA-1")
-                var n: Int
-                val buffer = ByteArray(4 * 1024)
-                while (stream.read(buffer).also { n = it } != -1) {
-                    digest.update(buffer, 0, n)
+        return runCatching {
+            file.source().buffer().use { source ->
+                sha1(blackholeSink()).use {
+                    source.readAll(it)
+                    it.hash.hex()
                 }
-                return HashCodeUtils.bytesToHexString(digest.digest())
             }
-        } catch (e: IOException) {
-            return null
-        } catch (e: NoSuchAlgorithmException) {
-            return null
-        }
+        }.getOrNull()
     }
 
-    private fun checkData(sha1File: File, dataFile: File): Boolean {
-        val s1 = getFileContent(sha1File) ?: return false
-        val s2 = getFileSha1(dataFile) ?: return false
-        return s1 == s2
+    private fun checkData(sha1: String?, data: File): Boolean {
+        return sha1 != null && sha1 == getFileSha1(data)
     }
 
-    private fun save(client: OkHttpClient, url: String, file: File): Boolean {
+    private suspend fun save(client: OkHttpClient, url: String, file: File): Boolean {
         val request: Request = Request.Builder().url(url).build()
         val call = client.newCall(request)
         runCatching {
-            call.execute().use { response ->
+            call.executeAsync().use { response ->
                 if (!response.isSuccessful) {
                     return false
                 }
@@ -212,66 +196,76 @@ object EhTagDatabase {
         return false
     }
 
-    @OptIn(DelicateCoroutinesApi::class)
-    @JvmStatic
-    fun update() {
-        launchIO {
+    suspend fun update() {
+        updateLock.withLock {
             updateInternal()
         }
     }
 
-    @Synchronized
-    private fun updateInternal() {
-        val urls = getMetadata(EhApplication.application)
+    private suspend fun issueUpdateInMemoryData() {
+        dbLock.withLock {
+            getMetadata(appCtx)?.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
+                }.onFailure {
+                    it.printStackTrace()
+                }
+            }
+        }
+    }
+
+    init {
+        launch {
+            issueUpdateInMemoryData()
+        }
+    }
+
+    private suspend fun updateInternal() {
+        val urls = getMetadata(appCtx)
         urls?.let {
             val sha1Name = urls[0]
             val sha1Url = urls[1]
             val dataName = urls[2]
             val dataUrl = urls[3]
 
-            try {
-                val dir = AppConfig.getFilesDir("tag-translations")
-                checkNotNull(dir)
+            val dir = AppConfig.getFilesDir("tag-translations")
+            checkNotNull(dir)
+            val sha1File = File(dir, sha1Name)
+            val dataFile = File(dir, dataName)
 
+            runCatching {
                 // Check current sha1 and current data
-                val sha1File = File(dir, sha1Name)
-                val dataFile = File(dir, dataName)
-                if (!checkData(sha1File, dataFile)) {
+                val sha1 = getFileContent(sha1File)
+                if (!checkData(sha1, dataFile)) {
                     FileUtils.delete(sha1File)
                     FileUtils.delete(dataFile)
                 }
 
-                // Read current EhTagDatabase
-                if (!isInitialized() && dataFile.exists()) {
-                    try {
-                        dataFile.source().buffer().use { updateData(it) }
-                    } catch (e: IOException) {
-                        FileUtils.delete(sha1File)
-                        FileUtils.delete(dataFile)
-                    }
-                }
-                val client = okHttpClient
-
                 // Save new sha1
                 val tempSha1File = File(dir, "$sha1Name.tmp")
-                check(save(client, sha1Url, tempSha1File))
+                check(save(baseOkHttpClient, sha1Url, tempSha1File))
+                val tempSha1 = getFileContent(tempSha1File)
 
-                // Check new sha1 and current data
-                if (checkData(tempSha1File, dataFile)) {
+                // Check new sha1 and current sha1
+                if (tempSha1 == sha1) {
                     // The data is the same
                     FileUtils.delete(tempSha1File)
-                    return
+                    return@runCatching
                 }
 
                 // Save new data
                 val tempDataFile = File(dir, "$dataName.tmp")
-                check(save(client, dataUrl, tempDataFile))
+                check(save(baseOkHttpClient, dataUrl, tempDataFile))
 
                 // Check new sha1 and new data
-                if (!checkData(tempSha1File, tempDataFile)) {
+                if (!checkData(tempSha1, tempDataFile)) {
                     FileUtils.delete(tempSha1File)
                     FileUtils.delete(tempDataFile)
-                    return
+                    return@runCatching
                 }
 
                 // Replace current sha1 and current data with new sha1 and new data
@@ -281,13 +275,10 @@ object EhTagDatabase {
                 tempDataFile.renameTo(dataFile)
 
                 // Read new EhTagDatabase
-                try {
-                    dataFile.source().buffer().use { updateData(it) }
-                } catch (_: IOException) {
-                }
-            } catch (e: Throwable) {
-                e.printStackTrace()
+                issueUpdateInMemoryData()
+            }.onFailure {
+                it.printStackTrace()
             }
         }
     }
-}
+}

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

@@ -16,26 +16,23 @@
 package com.hippo.ehviewer.client
 
 import com.hippo.ehviewer.Settings
-import com.hippo.network.UrlBuilder
+import okhttp3.HttpUrl
 
 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 URL_FAVORITES_EX = HOST_EX + "favorites.php"
+    const val FAV_PATH = "favorites.php"
+    const val WATCHED_PATH = "watched"
     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"
@@ -51,105 +48,84 @@ object EhUrl {
     const val ORIGIN_EX = REFERER_EX
     const val REFERER_E = "https://$DOMAIN_E"
     const val ORIGIN_E = REFERER_E
-    const val URL_PREFIX_THUMB_E = "https://ehgt.org/"
-    const val URL_PREFIX_THUMB_EX = "https://exhentai.org/t/"
 
     val host: String
-        get() = when (Settings.getGallerySite()) {
+        get() = when (Settings.gallerySite) {
             SITE_E -> HOST_E
             SITE_EX -> HOST_EX
             else -> HOST_E
         }
 
-    val favoritesUrl: String
-        get() = when (Settings.getGallerySite()) {
-            SITE_E -> URL_FAVORITES_E
-            SITE_EX -> URL_FAVORITES_EX
-            else -> URL_FAVORITES_E
+    val domain: String
+        get() = when (Settings.gallerySite) {
+            SITE_E -> DOMAIN_E
+            SITE_EX -> DOMAIN_EX
+            else -> HOST_E
         }
 
     val apiUrl: String
-        get() = when (Settings.getGallerySite()) {
+        get() = when (Settings.gallerySite) {
             SITE_E -> API_E
             SITE_EX -> API_EX
             else -> API_E
         }
 
-    @JvmStatic
     val referer: String
-        get() = when (Settings.getGallerySite()) {
+        get() = when (Settings.gallerySite) {
             SITE_E -> REFERER_E
             SITE_EX -> REFERER_EX
             else -> REFERER_E
         }
 
     val origin: String
-        get() = when (Settings.getGallerySite()) {
+        get() = when (Settings.gallerySite) {
             SITE_E -> ORIGIN_E
             SITE_EX -> ORIGIN_EX
             else -> ORIGIN_E
         }
 
-    @JvmStatic
     val uConfigUrl: String
-        get() = when (Settings.getGallerySite()) {
+        get() = when (Settings.gallerySite) {
             SITE_E -> URL_UCONFIG_E
             SITE_EX -> URL_UCONFIG_EX
             else -> URL_UCONFIG_E
         }
 
-    @JvmStatic
     val myTagsUrl: String
-        get() = when (Settings.getGallerySite()) {
+        get() = when (Settings.gallerySite) {
             SITE_E -> URL_MY_TAGS_E
             SITE_EX -> URL_MY_TAGS_EX
             else -> URL_MY_TAGS_E
         }
 
     val popularUrl: String
-        get() = when (Settings.getGallerySite()) {
+        get() = when (Settings.gallerySite) {
             SITE_E -> URL_POPULAR_E
             SITE_EX -> URL_POPULAR_EX
             else -> URL_POPULAR_E
         }
 
     val imageSearchUrl: String
-        get() = when (Settings.getGallerySite()) {
+        get() = when (Settings.gallerySite) {
             SITE_E -> URL_IMAGE_SEARCH_E
             SITE_EX -> URL_IMAGE_SEARCH_EX
             else -> URL_IMAGE_SEARCH_E
         }
 
-    val watchedUrl: String
-        get() = when (Settings.getGallerySite()) {
-            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)
     }
 
-    @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 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 getGalleryMultiPageViewerUrl(gid: Long, token: String): String {
-        val builder = UrlBuilder(host + "mpv/" + gid + '/' + token + '/')
-        return builder.build()
-    }
+    fun getGalleryMultiPageViewerUrl(gid: Long, token: String) = ehUrl {
+        addPathSegments("mpv/$gid/$token/")
+    }.toString()
 
-    @JvmStatic
     fun getPageUrl(gid: Long, index: Int, pToken: String): String {
         return host + "s/" + pToken + '/' + gid + '-' + (index + 1)
     }
@@ -165,12 +141,10 @@ object EhUrl {
     fun getTagDefinitionUrl(tag: String): String {
         return "https://ehwiki.org/wiki/" + tag.replace(' ', '_')
     }
+}
 
-    fun getThumbUrlPrefix(): String {
-        return when (Settings.getGallerySite()) {
-            SITE_E -> URL_PREFIX_THUMB_E
-            SITE_EX -> URL_PREFIX_THUMB_EX
-            else -> URL_PREFIX_THUMB_E
-        }
-    }
-}
+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,14 +15,32 @@
  */
 package com.hippo.ehviewer.client
 
-import android.text.TextUtils
-import com.hippo.ehviewer.EhApplication.Companion.ehCookieStore
+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 com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.data.GalleryInfo
 import java.util.regex.Pattern
 
 object EhUtils {
     const val NONE = -1 // Use it for homepage
+    const val MISC = 0x1
+    const val DOUJINSHI = 0x2
+    const val MANGA = 0x4
+    const val ARTIST_CG = 0x8
+    const val GAME_CG = 0x10
+    const val IMAGE_SET = 0x20
+    const val COSPLAY = 0x40
+    const val ASIAN_PORN = 0x80
+    const val NON_H = 0x100
+    const val WESTERN = 0x200
+    const val ALL_CATEGORY = 0x3ff
     const val PRIVATE = 0x400
     const val UNKNOWN = 0x800
 
@@ -41,40 +59,40 @@ object EhUtils {
 
     // Remove [XXX], (XXX), {XXX}, ~XXX~ stuff
     private val PATTERN_TITLE_PREFIX = Pattern.compile(
-        "^(?:\\([^)]*\\)|\\[[^]]*]|\\{[^}]*\\}|~[^~]*~|\\s+)*"
+        "^(?:\\([^)]*\\)|\\[[^]]*]|\\{[^}]*\\}|~[^~]*~|\\s+)*",
     )
 
     // Remove [XXX], (XXX), {XXX}, ~XXX~ stuff and something like ch. 1-23
     private val PATTERN_TITLE_SUFFIX = Pattern.compile(
         "(?:\\s+ch.[\\s\\d-]+)?(?:\\([^)]*\\)|\\[[^]]*]|\\{[^}]*\\}|~[^~]*~|\\s+)*$",
-        Pattern.CASE_INSENSITIVE
+        Pattern.CASE_INSENSITIVE,
     )
 
     private val CATEGORY_VALUES = hashMapOf(
-        EhConfig.MISC to arrayOf("misc"),
-        EhConfig.DOUJINSHI to arrayOf("doujinshi"),
-        EhConfig.MANGA to arrayOf("manga"),
-        EhConfig.ARTIST_CG to arrayOf("artistcg", "Artist CG Sets", "Artist CG"),
-        EhConfig.GAME_CG to arrayOf("gamecg", "Game CG Sets", "Game CG"),
-        EhConfig.IMAGE_SET to arrayOf("imageset", "Image Sets", "Image Set"),
-        EhConfig.COSPLAY to arrayOf("cosplay"),
-        EhConfig.ASIAN_PORN to arrayOf("asianporn", "Asian Porn"),
-        EhConfig.NON_H to arrayOf("non-h"),
-        EhConfig.WESTERN to arrayOf("western"),
+        MISC to arrayOf("misc"),
+        DOUJINSHI to arrayOf("doujinshi"),
+        MANGA to arrayOf("manga"),
+        ARTIST_CG to arrayOf("artistcg", "Artist CG Sets", "Artist CG"),
+        GAME_CG to arrayOf("gamecg", "Game CG Sets", "Game CG"),
+        IMAGE_SET to arrayOf("imageset", "Image Sets", "Image Set"),
+        COSPLAY to arrayOf("cosplay"),
+        ASIAN_PORN to arrayOf("asianporn", "Asian Porn"),
+        NON_H to arrayOf("non-h"),
+        WESTERN to arrayOf("western"),
         PRIVATE to arrayOf("private"),
-        UNKNOWN to arrayOf("unknown")
+        UNKNOWN to arrayOf("unknown"),
     )
     private val CATEGORY_STRINGS = CATEGORY_VALUES.entries.map { (k, v) -> v to k }
 
     val isExHentai: Boolean
-        get() = Settings.getGallerySite() == EhUrl.SITE_EX
+        get() = Settings.gallerySite == EhUrl.SITE_EX
 
-    @JvmStatic
     fun getCategory(type: String?): Int {
         for (entry in CATEGORY_STRINGS) {
             for (str in entry.first)
-                if (str.equals(type, ignoreCase = true))
+                if (str.equals(type, ignoreCase = true)) {
                     return entry.second
+                }
         }
         return UNKNOWN
     }
@@ -83,41 +101,54 @@ object EhUtils {
         return CATEGORY_VALUES.getOrDefault(type, CATEGORY_VALUES[UNKNOWN])!![0]
     }
 
-    fun getCategoryColor(category: Int): Int {
-        return when (category) {
-            EhConfig.DOUJINSHI -> BG_COLOR_DOUJINSHI
-            EhConfig.MANGA -> BG_COLOR_MANGA
-            EhConfig.ARTIST_CG -> BG_COLOR_ARTIST_CG
-            EhConfig.GAME_CG -> BG_COLOR_GAME_CG
-            EhConfig.WESTERN -> BG_COLOR_WESTERN
-            EhConfig.NON_H -> BG_COLOR_NON_H
-            EhConfig.IMAGE_SET -> BG_COLOR_IMAGE_SET
-            EhConfig.COSPLAY -> BG_COLOR_COSPLAY
-            EhConfig.ASIAN_PORN -> BG_COLOR_ASIAN_PORN
-            EhConfig.MISC -> BG_COLOR_MISC
-            else -> BG_COLOR_UNKNOWN
-        }.toInt()
+    @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) {
+            DOUJINSHI -> BG_COLOR_DOUJINSHI
+            MANGA -> BG_COLOR_MANGA
+            ARTIST_CG -> BG_COLOR_ARTIST_CG
+            GAME_CG -> BG_COLOR_GAME_CG
+            WESTERN -> BG_COLOR_WESTERN
+            NON_H -> BG_COLOR_NON_H
+            IMAGE_SET -> BG_COLOR_IMAGE_SET
+            COSPLAY -> BG_COLOR_COSPLAY
+            ASIAN_PORN -> BG_COLOR_ASIAN_PORN
+            MISC -> BG_COLOR_MISC
+            else -> BG_COLOR_UNKNOWN
+        }.toInt()
+        return harmonizeWithRole(context, primary)
+    }
+
+    @Composable
+    fun getCategoryColor(category: Int) = Color(getCategoryColor(LocalContext.current, category))
+
     fun signOut() {
-        ehCookieStore.signOut()
-        Settings.putAvatar(null)
-        Settings.putDisplayName(null)
-        Settings.putGallerySite(EhUrl.SITE_E)
-        Settings.putNeedSignIn(true)
-        Settings.putSelectSite(true)
+        EhCookieStore.signOut()
+        Settings.avatar = null
+        Settings.displayName = null
+        Settings.gallerySite = EhUrl.SITE_E
+        Settings.needSignIn = true
     }
 
     fun needSignedIn(): Boolean {
-        return Settings.getNeedSignIn() && !ehCookieStore.hasSignedIn()
+        return Settings.needSignIn
     }
 
-    @JvmStatic
     fun getSuitableTitle(gi: GalleryInfo): String {
-        return if (Settings.getShowJpnTitle()) {
-            if (TextUtils.isEmpty(gi.titleJpn)) gi.title else gi.titleJpn
+        return if (Settings.showJpnTitle) {
+            if (gi.titleJpn.isNullOrEmpty()) gi.title else gi.titleJpn
         } else {
-            if (TextUtils.isEmpty(gi.title)) gi.titleJpn else gi.title
+            if (gi.title.isNullOrEmpty()) gi.titleJpn else gi.title
         }.orEmpty()
     }
 
@@ -135,17 +166,11 @@ object EhUtils {
         return title.ifEmpty { null }
     }
 
-    fun fixThumbUrl(url: String): String {
-        return EhUrl.getThumbUrlPrefix() +
-                url.removePrefix(EhUrl.URL_PREFIX_THUMB_E).removePrefix(EhUrl.URL_PREFIX_THUMB_EX)
-    }
-
-    @JvmStatic
     fun handleThumbUrlResolution(url: String?): String? {
         if (null == url) {
             return null
         }
-        val resolution = when (Settings.getThumbResolution()) {
+        val resolution = when (Settings.thumbResolution) {
             0 -> return url
             1 -> "250"
             2 -> "300"
@@ -159,4 +184,4 @@ object EhUtils {
             url
         }
     }
-}
+}

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

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

@@ -1,25 +0,0 @@
-package com.hippo.ehviewer.client.data
-
-interface AbstractGalleryInfo {
-    var gid: Long
-    var token: String?
-    var title: String?
-    var titleJpn: String?
-    var thumb: 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,12 +15,16 @@
  */
 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")
@@ -36,7 +40,7 @@ open class BaseGalleryInfo(
     override var titleJpn: String? = null,
 
     @ColumnInfo(name = "THUMB")
-    override var thumb: String? = null,
+    override var thumbKey: String? = null,
 
     @ColumnInfo(name = "CATEGORY")
     override var category: Int = 0,
@@ -57,7 +61,7 @@ open class BaseGalleryInfo(
     override var rated: Boolean = false,
 
     @Ignore
-    override var simpleTags: Array<String>? = null,
+    override var simpleTags: ArrayList<String>? = null,
 
     @Ignore
     override var pages: Int = 0,
@@ -68,22 +72,17 @@ 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,
 
-    @Ignore
-    override var favoriteSlot: Int = -2,
+    @ColumnInfo(name = "FAVORITE_SLOT")
+    override var favoriteSlot: Int = NOT_FAVORITED,
 
     @Ignore
-    override var favoriteName: String? = null
+    override var favoriteName: String? = null,
 
-) : GalleryInfo
+    @Ignore
+    override var favoriteNote: String? = null,
+) : GalleryInfo, Parcelable {
+    constructor() : this(0)
+}

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.network.UrlBuilder
-import com.hippo.util.encodeUTF8
+import com.hippo.ehviewer.client.addQueryParameterIfNotBlank
+import com.hippo.ehviewer.client.ehUrl
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
 class FavListUrlBuilder(
-    private var mPrev: String? = null,
-    private var mNext: String? = null,
+    var mPrev: String? = null,
+    var mNext: String? = null,
     var jumpTo: String? = null,
     var keyword: String? = null,
     var favCat: Int = FAV_CAT_ALL,
@@ -34,19 +34,18 @@ class FavListUrlBuilder(
         mPrev = index.takeUnless { isNext }
     }
 
-    fun build(): String {
-        val ub = UrlBuilder(EhUrl.favoritesUrl)
+    fun build() = ehUrl {
+        addPathSegment(EhUrl.FAV_PATH)
         if (isValidFavCat(favCat)) {
-            ub.addQuery("favcat", favCat.toString())
+            addQueryParameter("favcat", "$favCat")
         } else if (favCat == FAV_CAT_ALL) {
-            ub.addQuery("favcat", "all")
+            addQueryParameter("favcat", "all")
         }
-        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()
-    }
+        addQueryParameterIfNotBlank("f_search", keyword)
+        addQueryParameterIfNotBlank("prev", mPrev)
+        addQueryParameterIfNotBlank("next", mNext)
+        addQueryParameterIfNotBlank("seek", jumpTo)
+    }.toString()
 
     companion object {
         const val FAV_CAT_ALL = -1
@@ -55,4 +54,4 @@ class FavListUrlBuilder(
             return favCat in 0..9
         }
     }
-}
+}

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

@@ -34,5 +34,5 @@ class GalleryApiInfo(
     var expunged: Boolean = false,
     var rating: Float = 0f,
     var torrentcount: Int = 0,
-    var tags: Array<String>?
-) : Parcelable
+    var tags: Array<String>?,
+) : Parcelable

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

@@ -21,30 +21,17 @@ 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
+    var lastEdited: Long = 0,
+) : Parcelable

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

@@ -20,8 +20,6 @@ import kotlinx.parcelize.Parcelize
 
 @Parcelize
 class GalleryCommentList(
-    @JvmField
-    var comments: Array<GalleryComment>?,
-    @JvmField
-    var hasMore: Boolean
-) : Parcelable
+    var comments: Array<GalleryComment>,
+    val hasMore: Boolean,
+) : Parcelable

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

@@ -15,90 +15,49 @@
  */
 package com.hippo.ehviewer.client.data
 
+import android.os.Parcelable
 import com.hippo.ehviewer.client.data.GalleryInfo.Companion.S_LANGS
-import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 
+private val LANGUAGES = arrayOf(
+    "English",
+    "Chinese",
+    "Spanish",
+    "Korean",
+    "Russian",
+    "French",
+    "Portuguese",
+    "Thai",
+    "German",
+    "Italian",
+    "Vietnamese",
+    "Polish",
+    "Hungarian",
+    "Dutch",
+)
+
 @Parcelize
 class GalleryDetail(
-    @JvmField
-    val galleryInfo: GalleryInfo = BaseGalleryInfo(),
-
-    @JvmField
+    val galleryInfo: BaseGalleryInfo = BaseGalleryInfo(),
     var apiUid: Long = -1L,
-
-    @JvmField
     var apiKey: String? = null,
-
-    @JvmField
     var torrentCount: Int = 0,
-
-    @JvmField
     var torrentUrl: String? = null,
-
-    @JvmField
     var archiveUrl: String? = null,
-
-    @JvmField
     var parent: String? = null,
-
-    @JvmField
-    var newerVersions: ArrayList<GalleryInfo> = ArrayList(),
-
-    @JvmField
+    var newerVersions: ArrayList<BaseGalleryInfo> = ArrayList(),
     var visible: String? = null,
-
-    @JvmField
     var language: String? = null,
-
-    @JvmField
     var size: String? = null,
-
-    @JvmField
     var favoriteCount: Int = 0,
-
-    @JvmField
-    var isFavorited: Boolean = false,
-
-    @JvmField
     var ratingCount: Int = 0,
-
-    @JvmField
-    var tags: Array<GalleryTagGroup>? = null,
-
-    @JvmField
-    var comments: GalleryCommentList? = null,
-
-    @JvmField
-    var previewPages: Int = 0,
-
-    @IgnoredOnParcel
-    @JvmField
-    var previewSet: PreviewSet? = null,
-) : AbstractGalleryInfo by galleryInfo, GalleryInfo {
+    val tags: Array<GalleryTagGroup>,
+    var comments: GalleryCommentList,
+    val previewPages: Int,
+    val previewList: List<GalleryPreview>,
+) : GalleryInfo by galleryInfo, Parcelable {
     override fun generateSLang() {
         val index = LANGUAGES.indexOf(language)
-        if (index != -1) {
-            simpleLanguage = S_LANGS[index]
-        }
-    }
-
-    companion object {
-        private val LANGUAGES = arrayOf(
-            "English",
-            "Chinese",
-            "Spanish",
-            "Korean",
-            "Russian",
-            "French",
-            "Portuguese",
-            "Thai",
-            "German",
-            "Italian",
-            "Vietnamese",
-            "Polish",
-            "Hungarian",
-            "Dutch"
-        )
+        if (index != -1) simpleLanguage = S_LANGS[index]
     }
 }

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

@@ -15,16 +15,35 @@
  */
 package com.hippo.ehviewer.client.data
 
-import android.os.Parcelable
 import java.util.regex.Pattern
 
-interface GalleryInfo : AbstractGalleryInfo, Parcelable {
+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?
+
     fun generateSLang() {
         simpleLanguage = simpleTags?.let { generateSLangFromTags(it) }
             ?: title?.let { generateSLangFromTitle(it) }
     }
 
-    private fun generateSLangFromTags(simpleTags: Array<String>): String? {
+    private fun generateSLangFromTags(simpleTags: List<String>): String? {
         for (tag in simpleTags) {
             for (i in S_LANGS.indices) {
                 if (S_LANG_TAGS[i] == tag) {
@@ -78,20 +97,20 @@ interface GalleryInfo : AbstractGalleryInfo, Parcelable {
             S_LANG_VI,
             S_LANG_PL,
             S_LANG_HU,
-            S_LANG_NL
+            S_LANG_NL,
         )
         val S_LANG_PATTERNS = arrayOf(
             Pattern.compile(
                 "[(\\[]eng(?:lish)?[)\\]]|英訳",
-                Pattern.CASE_INSENSITIVE
-            ),  // [(（\[]ch(?:inese)?[)）\]]|[汉漢]化|中[国國][语語]|中文|中国翻訳
+                Pattern.CASE_INSENSITIVE,
+            ), // [(（\[]ch(?:inese)?[)）\]]|[汉漢]化|中[国國][语語]|中文|中国翻訳
             Pattern.compile(
                 "[(\uFF08\\[]ch(?:inese)?[)\uFF09\\]]|[汉漢]化|中[国國][语語]|中文|中国翻訳",
-                Pattern.CASE_INSENSITIVE
+                Pattern.CASE_INSENSITIVE,
             ),
             Pattern.compile(
                 "[(\\[]spanish[)\\]]|[(\\[]Español[)\\]]|スペイン翻訳",
-                Pattern.CASE_INSENSITIVE
+                Pattern.CASE_INSENSITIVE,
             ),
             Pattern.compile("[(\\[]korean?[)\\]]|韓国翻訳", Pattern.CASE_INSENSITIVE),
             Pattern.compile("[(\\[]rus(?:sian)?[)\\]]|ロシア翻訳", Pattern.CASE_INSENSITIVE),
@@ -99,17 +118,17 @@ interface GalleryInfo : AbstractGalleryInfo, Parcelable {
             Pattern.compile("[(\\[]portuguese|ポルトガル翻訳", Pattern.CASE_INSENSITIVE),
             Pattern.compile(
                 "[(\\[]thai(?: ภาษาไทย)?[)\\]]|แปลไทย|タイ翻訳",
-                Pattern.CASE_INSENSITIVE
+                Pattern.CASE_INSENSITIVE,
             ),
             Pattern.compile("[(\\[]german[)\\]]|ドイツ翻訳", Pattern.CASE_INSENSITIVE),
             Pattern.compile("[(\\[]italiano?[)\\]]|イタリア翻訳", Pattern.CASE_INSENSITIVE),
             Pattern.compile(
                 "[(\\[]vietnamese(?: Tiếng Việt)?[)\\]]|ベトナム翻訳",
-                Pattern.CASE_INSENSITIVE
+                Pattern.CASE_INSENSITIVE,
             ),
             Pattern.compile("[(\\[]polish[)\\]]|ポーランド翻訳", Pattern.CASE_INSENSITIVE),
             Pattern.compile("[(\\[]hun(?:garian)?[)\\]]|ハンガリー翻訳", Pattern.CASE_INSENSITIVE),
-            Pattern.compile("[(\\[]dutch[)\\]]|オランダ翻訳", Pattern.CASE_INSENSITIVE)
+            Pattern.compile("[(\\[]dutch[)\\]]|オランダ翻訳", Pattern.CASE_INSENSITIVE),
         )
         val S_LANG_TAGS = arrayOf(
             "language:english",
@@ -125,7 +144,10 @@ interface GalleryInfo : AbstractGalleryInfo, Parcelable {
             "language:vietnamese",
             "language:polish",
             "language:hungarian",
-            "language:dutch"
+            "language:dutch",
         )
+
+        const val NOT_FAVORITED = -2
+        const val LOCAL_FAVORITED = -1
     }
-}
+}

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

@@ -16,28 +16,24 @@
 package com.hippo.ehviewer.client.data
 
 import android.os.Parcelable
-import com.hippo.widget.LoadImageView
 import kotlinx.parcelize.Parcelize
 
+interface GalleryPreview : Parcelable {
+    val imageKey: String
+    val position: Int
+}
+
 @Parcelize
-class GalleryPreview(
-    @JvmField
-    var imageUrl: String? = null,
-    @JvmField
-    var pageUrl: String? = null,
-    @JvmField
-    var position: Int = 0,
-    @JvmField
-    var offsetX: Int = Int.MIN_VALUE,
-    @JvmField
-    var offsetY: Int = Int.MIN_VALUE,
-    @JvmField
-    var clipWidth: Int = Int.MIN_VALUE,
-    @JvmField
-    var clipHeight: Int = Int.MIN_VALUE,
-) : Parcelable {
-    fun load(view: LoadImageView) {
-        view.setClip(offsetX, offsetY, clipWidth, clipHeight)
-        view.load(imageUrl!!)
-    }
-}
+data class LargeGalleryPreview(
+    override val imageKey: String,
+    override val position: Int,
+) : GalleryPreview
+
+@Parcelize
+data class NormalGalleryPreview(
+    override val imageKey: String,
+    override val position: Int,
+    val offsetX: Int,
+    val clipWidth: Int,
+    val clipHeight: Int,
+) : GalleryPreview

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

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

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

@@ -1,59 +0,0 @@
-/*
- * Copyright 2016 Hippo Seven
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.hippo.ehviewer.client.data
-
-import com.hippo.widget.LoadImageView
-import com.hippo.yorozuya.collect.IntList
-
-class LargePreviewSet(
-    private val mPositionList: IntList = IntList(),
-    private val mImageUrlList: ArrayList<String> = ArrayList(),
-    private val mPageUrlList: ArrayList<String> = ArrayList()
-) : PreviewSet() {
-
-    fun addItem(index: Int, imageUrl: String, pageUrl: String) {
-        mPositionList.add(index)
-        mImageUrlList.add(imageUrl)
-        mPageUrlList.add(pageUrl)
-    }
-
-    override fun size(): Int {
-        return mImageUrlList.size
-    }
-
-    override fun getPosition(index: Int): Int {
-        return mPositionList[index]
-    }
-
-    override fun getPageUrlAt(index: Int): String {
-        return mPageUrlList[index]
-    }
-
-    override fun getGalleryPreview(gid: Long, index: Int): GalleryPreview {
-        val galleryPreview = GalleryPreview()
-        galleryPreview.position = mPositionList[index]
-        galleryPreview.imageUrl = mImageUrlList[index]
-        galleryPreview.pageUrl = mPageUrlList[index]
-        return galleryPreview
-    }
-
-    override fun load(view: LoadImageView, gid: Long, index: Int) {
-        view.resetClip()
-        view.load(
-            mImageUrlList[index]
-        )
-    }
-}

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

@@ -16,30 +16,29 @@
 package com.hippo.ehviewer.client.data
 
 import android.os.Parcelable
-import android.text.TextUtils
 import androidx.annotation.IntDef
-import com.hippo.ehviewer.client.EhConfig
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
+import com.hippo.ehviewer.client.addQueryParameterIfNotBlank
+import com.hippo.ehviewer.client.ehUrl
 import com.hippo.ehviewer.dao.QuickSearch
-import com.hippo.ehviewer.widget.AdvanceSearchTable
-import com.hippo.network.UrlBuilder
-import com.hippo.util.encodeUTF8
-import com.hippo.yorozuya.NumberUtils
-import com.hippo.yorozuya.StringUtils
+import com.hippo.ehviewer.ui.main.AdvanceTable
+import com.hippo.ehviewer.util.encodeUTF8
+import com.hippo.ehviewer.util.toIntOrDefault
 import kotlinx.parcelize.Parcelize
 import java.io.UnsupportedEncodingException
 import java.net.URLDecoder
 
 @Parcelize
 data class ListUrlBuilder(
-    @get:Mode @Mode var mode: Int = MODE_NORMAL,
+    @get:Mode @Mode
+    var mode: Int = MODE_NORMAL,
     private var mPrev: String? = null,
-    private var mNext: String? = null,
-    private var mJumpTo: String? = null,
+    var mNext: String? = null,
+    var mJumpTo: String? = null,
     var category: Int = EhUtils.NONE,
     private var mKeyword: String? = null,
-    private var mSHash: String? = null,
+    var hash: String? = null,
     var advanceSearch: Int = -1,
     var minRating: Int = -1,
     var pageFrom: Int = -1,
@@ -47,7 +46,6 @@ data class ListUrlBuilder(
     var imagePath: String? = null,
     var isUseSimilarityScan: Boolean = false,
     var isOnlySearchCovers: Boolean = false,
-    var isShowExpunged: Boolean = false,
 ) : Parcelable {
 
     fun reset() {
@@ -64,8 +62,7 @@ data class ListUrlBuilder(
         imagePath = null
         isUseSimilarityScan = false
         isOnlySearchCovers = false
-        isShowExpunged = false
-        mSHash = null
+        hash = null
     }
 
     fun setIndex(index: String?, isNext: Boolean = true) {
@@ -84,6 +81,7 @@ data class ListUrlBuilder(
         }
 
     fun set(q: QuickSearch) {
+        reset()
         mode = q.mode
         this.category = q.category
         mKeyword = q.keyword
@@ -91,22 +89,20 @@ data class ListUrlBuilder(
         minRating = q.minRating
         pageFrom = q.pageFrom
         pageTo = q.pageTo
-        imagePath = null
-        isUseSimilarityScan = false
-        isOnlySearchCovers = false
-        isShowExpunged = false
+        mNext = q.name.substringAfterLast('@', "").takeIf { it.isNotEmpty() }
     }
 
-    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 toQuickSearch(name: String): QuickSearch {
+        return QuickSearch(
+            name = name,
+            mode = mode,
+            category = category,
+            keyword = mKeyword,
+            advanceSearch = advanceSearch,
+            minRating = minRating,
+            pageFrom = pageFrom,
+            pageTo = pageTo,
+        )
     }
 
     fun equalsQuickSearch(q: QuickSearch?): Boolean {
@@ -119,7 +115,7 @@ data class ListUrlBuilder(
         if (q.category != this.category) {
             return false
         }
-        if (!StringUtils.equals(q.keyword, mKeyword)) {
+        if (q.keyword != mKeyword) {
             return false
         }
         if (q.advanceSearch != advanceSearch) {
@@ -130,7 +126,9 @@ data class ListUrlBuilder(
         }
         return if (q.pageFrom != pageFrom) {
             false
-        } else q.pageTo == pageTo
+        } else {
+            q.pageTo == pageTo
+        }
     }
 
     /**
@@ -139,10 +137,10 @@ data class ListUrlBuilder(
     // TODO page
     fun setQuery(query: String?) {
         reset()
-        if (TextUtils.isEmpty(query)) {
+        if (query.isNullOrEmpty()) {
             return
         }
-        val queries = StringUtils.split(query, '&')
+        val queries = query.split('&')
         var category = 0
         var keyword: String? = null
         var enableAdvanceSearch = false
@@ -161,48 +159,48 @@ data class ListUrlBuilder(
             val value = str.substring(index + 1)
             when (key) {
                 "f_cats" -> {
-                    val cats = NumberUtils.parseIntSafely(value, EhConfig.ALL_CATEGORY)
-                    category = category or (cats.inv() and EhConfig.ALL_CATEGORY)
+                    val cats = value.toIntOrDefault(EhUtils.ALL_CATEGORY)
+                    category = category or (cats.inv() and EhUtils.ALL_CATEGORY)
                 }
 
                 "f_doujinshi" -> if ("1" == value) {
-                    category = category or EhConfig.DOUJINSHI
+                    category = category or EhUtils.DOUJINSHI
                 }
 
                 "f_manga" -> if ("1" == value) {
-                    category = category or EhConfig.MANGA
+                    category = category or EhUtils.MANGA
                 }
 
                 "f_artistcg" -> if ("1" == value) {
-                    category = category or EhConfig.ARTIST_CG
+                    category = category or EhUtils.ARTIST_CG
                 }
 
                 "f_gamecg" -> if ("1" == value) {
-                    category = category or EhConfig.GAME_CG
+                    category = category or EhUtils.GAME_CG
                 }
 
                 "f_western" -> if ("1" == value) {
-                    category = category or EhConfig.WESTERN
+                    category = category or EhUtils.WESTERN
                 }
 
                 "f_non-h" -> if ("1" == value) {
-                    category = category or EhConfig.NON_H
+                    category = category or EhUtils.NON_H
                 }
 
                 "f_imageset" -> if ("1" == value) {
-                    category = category or EhConfig.IMAGE_SET
+                    category = category or EhUtils.IMAGE_SET
                 }
 
                 "f_cosplay" -> if ("1" == value) {
-                    category = category or EhConfig.COSPLAY
+                    category = category or EhUtils.COSPLAY
                 }
 
                 "f_asianporn" -> if ("1" == value) {
-                    category = category or EhConfig.ASIAN_PORN
+                    category = category or EhUtils.ASIAN_PORN
                 }
 
                 "f_misc" -> if ("1" == value) {
-                    category = category or EhConfig.MISC
+                    category = category or EhUtils.MISC
                 }
 
                 "f_search" -> try {
@@ -217,37 +215,37 @@ data class ListUrlBuilder(
                 }
 
                 "f_sh" -> if ("on" == value) {
-                    advanceSearch = advanceSearch or AdvanceSearchTable.SH
+                    advanceSearch = advanceSearch or AdvanceTable.SH
                 }
 
                 "f_sto" -> if ("on" == value) {
-                    advanceSearch = advanceSearch or AdvanceSearchTable.STO
+                    advanceSearch = advanceSearch or AdvanceTable.STO
                 }
 
                 "f_sfl" -> if ("on" == value) {
-                    advanceSearch = advanceSearch or AdvanceSearchTable.SFL
+                    advanceSearch = advanceSearch or AdvanceTable.SFL
                 }
 
                 "f_sfu" -> if ("on" == value) {
-                    advanceSearch = advanceSearch or AdvanceSearchTable.SFU
+                    advanceSearch = advanceSearch or AdvanceTable.SFU
                 }
 
                 "f_sft" -> if ("on" == value) {
-                    advanceSearch = advanceSearch or AdvanceSearchTable.SFT
+                    advanceSearch = advanceSearch or AdvanceTable.SFT
                 }
 
                 "f_sr" -> if ("on" == value) {
                     enableMinRating = true
                 }
 
-                "f_srdd" -> minRating = NumberUtils.parseIntSafely(value, -1)
+                "f_srdd" -> minRating = value.toIntOrDefault(-1)
                 "f_sp" -> if ("on" == value) {
                     enablePage = true
                 }
 
-                "f_spf" -> pageFrom = NumberUtils.parseIntSafely(value, -1)
-                "f_spt" -> pageTo = NumberUtils.parseIntSafely(value, -1)
-                "f_shash" -> mSHash = value
+                "f_spf" -> pageFrom = value.toIntOrDefault(-1)
+                "f_spt" -> pageTo = value.toIntOrDefault(-1)
+                "f_shash" -> hash = value
             }
         }
         this.category = category
@@ -273,63 +271,66 @@ data class ListUrlBuilder(
 
     fun build(): String {
         return when (mode) {
-            MODE_NORMAL, MODE_SUBSCRIPTION -> {
-                val url: String = if (mode == MODE_NORMAL) {
-                    EhUrl.host
-                } else {
-                    EhUrl.watchedUrl
+            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())
                 }
-                val ub = UrlBuilder(url)
-                if (this.category != EhUtils.NONE) {
-                    ub.addQuery("f_cats", category.inv() and EhConfig.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)
-                }
-                // Search key 
+                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
-                StringUtils.split(mKeyword, '|')?.forEachIndexed { idx, keyword ->
-                    val keyword = keyword.trim { it <= ' ' }
+                mKeyword?.split('|')?.forEachIndexed { idx, kwd ->
+                    val keyword = kwd.trim { it <= ' ' }
                     when (idx) {
-                        0 -> keyword.takeIf { it.isNotEmpty() }?.let { ub.addQuery("f_search", encodeUTF8(it)) }
+                        0 -> addQueryParameterIfNotBlank("f_search", keyword)
+
                         else -> keyword.indexOf(':').takeIf { it >= 0 }?.run {
                             val key = keyword.substring(0, this).trim { it <= ' ' }
                             val value = keyword.substring(this + 1).trim { it <= ' ' }
-                            ub.addQuery(key, encodeUTF8(value))
+                            addQueryParameterIfNotBlank(key, value)
                         }
                     }
                 }
                 // Advance search
                 if (advanceSearch != -1) {
-                    ub.addQuery("advsearch", "1")
-                    if (advanceSearch and AdvanceSearchTable.SH != 0) ub.addQuery("f_sh", "on")
-                    if (advanceSearch and AdvanceSearchTable.STO != 0) ub.addQuery("f_sto", "on")
-                    if (advanceSearch and AdvanceSearchTable.SFL != 0) ub.addQuery("f_sfl", "on")
-                    if (advanceSearch and AdvanceSearchTable.SFU != 0) ub.addQuery("f_sfu", "on")
-                    if (advanceSearch and AdvanceSearchTable.SFT != 0) ub.addQuery("f_sft", "on")
+                    addQueryParameter("advsearch", "1")
+                    if (advanceSearch and AdvanceTable.SH != 0) {
+                        addQueryParameter("f_sh", "on")
+                    }
+                    if (advanceSearch and AdvanceTable.STO != 0) {
+                        addQueryParameter("f_sto", "on")
+                    }
+                    if (advanceSearch and AdvanceTable.SFL != 0) {
+                        addQueryParameter("f_sfl", "on")
+                    }
+                    if (advanceSearch and AdvanceTable.SFU != 0) {
+                        addQueryParameter("f_sfu", "on")
+                    }
+                    if (advanceSearch and AdvanceTable.SFT != 0) {
+                        addQueryParameter("f_sft", "on")
+                    }
                     // Set min star
                     if (minRating != -1) {
-                        ub.addQuery("f_sr", "on")
-                        ub.addQuery("f_srdd", minRating)
+                        addQueryParameter("f_sr", "on")
+                        addQueryParameter("f_srdd", "$minRating")
                     }
                     // Pages
                     if (pageFrom != -1 || pageTo != -1) {
-                        ub.addQuery("f_sp", "on")
-                        ub.addQuery("f_spf", if (pageFrom != -1) pageFrom.toString() else "")
-                        ub.addQuery("f_spt", if (pageTo != -1) pageTo.toString() else "")
+                        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.build()
-            }
+            }.toString()
 
             MODE_UPLOADER -> {
                 val sb = StringBuilder(EhUrl.host)
@@ -392,7 +393,7 @@ data class ListUrlBuilder(
         MODE_WHATS_HOT,
         MODE_IMAGE_SEARCH,
         MODE_SUBSCRIPTION,
-        MODE_TOPLIST
+        MODE_TOPLIST,
     )
     @Retention(AnnotationRetention.SOURCE)
     private annotation class Mode
@@ -405,4 +406,4 @@ data class ListUrlBuilder(
         const val MODE_SUBSCRIPTION = 0x5
         const val MODE_TOPLIST = 0x6
     }
-}
+}

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

@@ -1,75 +0,0 @@
-/*
- * Copyright 2016 Hippo Seven
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.hippo.ehviewer.client.data
-
-import com.hippo.widget.LoadImageView
-import com.hippo.yorozuya.collect.IntList
-
-class NormalPreviewSet(
-    private var mPositionList: IntList = IntList(),
-    private var mImageUrlList: ArrayList<String> = ArrayList(),
-    private var mOffsetXList: IntList = IntList(),
-    private var mOffsetYList: IntList = IntList(),
-    private var mClipWidthList: IntList = IntList(),
-    private var mClipHeightList: IntList = IntList(),
-    private var mPageUrlList: ArrayList<String> = ArrayList()
-) : PreviewSet() {
-
-    fun addItem(
-        position: Int, imageUrl: String, xOffset: Int, yOffset: Int, width: Int,
-        height: Int, pageUrl: String
-    ) {
-        mPositionList.add(position)
-        mImageUrlList.add(imageUrl)
-        mOffsetXList.add(xOffset)
-        mOffsetYList.add(yOffset)
-        mClipWidthList.add(width)
-        mClipHeightList.add(height)
-        mPageUrlList.add(pageUrl)
-    }
-
-    override fun size(): Int {
-        return mPositionList.size
-    }
-
-    override fun getPosition(index: Int): Int {
-        return mPositionList[index]
-    }
-
-    override fun getPageUrlAt(index: Int): String {
-        return mPageUrlList[index]
-    }
-
-    override fun getGalleryPreview(gid: Long, index: Int): GalleryPreview {
-        val galleryPreview = GalleryPreview()
-        galleryPreview.position = mPositionList[index]
-        galleryPreview.imageUrl = mImageUrlList[index]
-        galleryPreview.pageUrl = mPageUrlList[index]
-        galleryPreview.offsetX = mOffsetXList[index]
-        galleryPreview.offsetY = mOffsetYList[index]
-        galleryPreview.clipWidth = mClipWidthList[index]
-        galleryPreview.clipHeight = mClipHeightList[index]
-        return galleryPreview
-    }
-
-    override fun load(view: LoadImageView, gid: Long, index: Int) {
-        view.setClip(
-            mOffsetXList[index], mOffsetYList[index],
-            mClipWidthList[index], mClipHeightList[index]
-        )
-        view.load(mImageUrlList[index])
-    }
-}

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

@@ -0,0 +1,5 @@
+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,7 +15,11 @@
  */
 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

@@ -0,0 +1,5 @@
+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/NoHAtHClientException.kt

@@ -15,4 +15,4 @@
  */
 package com.hippo.ehviewer.client.exception
 
-class NoHAtHClientException(detailMessage: String?) : EhException(detailMessage)
+class NoHAtHClientException(detailMessage: String?) : EhException(detailMessage)