v5.3.5

Merge pull request #126 from tom5079/Pupil-116
Pupil 116 Favorite tag backup
2022-04-24 18:27:56 +09:00 · 2022-04-24 18:08:13 +09:00 · 2022-04-24 18:08:04 +09:00 · 2022-04-22 16:39:13 +09:00 · 2022-04-21 17:41:06 +09:00 · 2022-04-21 17:26:58 +09:00
55 changed files with 1224 additions and 1215 deletions
--- a/.github/workflows/watchdiff.yml
+++ b/.github/workflows/watchdiff.yml
@@ -1,23 +0,0 @@
 # This is a basic workflow that is manually triggered
 name: Watch hitomi.la file changes
 on:
  schedule:
    - cron: "*/10 * * * *"
 jobs:
  watchdiff:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
        with:
          ref: watchdiff
      - name: Download files
        run: ./fetch.sh
      - name: Commit and Push
        id: push
        run: |
            git config --global user.name 'Watchdiff bot'
            git config --global user.email 'tom5079@naver.com'
            { git add . && git commit -m "File update" && git push; } | tail -1 | grep -q "nothing to commit"
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,33 @@
 # Gradle files
 .gradle/
 build/
 # Local configuration file (sdk path, etc)
 local.properties
 # Log/OS Files
 *.log
 # Android Studio generated files and folders
 captures/
 .externalNativeBuild/
 .cxx/
 *.apk
 output.json
 # IntelliJ
 *.iml
-.gradle
+.idea/
-/local.properties
+misc.xml
-/.idea/caches
+deploymentTargetDropDown.xml
-/.idea/libraries
+render.experimental.xml
 /.idea/modules.xml
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
 .DS_Store
 /build
 /captures
 .externalNativeBuild
-#Github pages
+# Keystore files
-/gh-pages
+*.jks
 *.keystore
-#Private files
+# Google Services (e.g. APIs or Firebase)
-**/google-services.json
+google-services.json
-**/credentials.json
+
 # Android Profiling
 *.hprof
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,139 +0,0 @@
 <component name="ProjectCodeStyleConfiguration">
  <code_scheme name="Project" version="173">
    <option name="RIGHT_MARGIN" value="120" />
    <JetCodeStyleSettings>
      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
        <value>
          <package name="java.util" alias="false" withSubpackages="false" />
          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
          <package name="io.ktor" alias="false" withSubpackages="true" />
        </value>
      </option>
      <option name="PACKAGES_IMPORT_LAYOUT">
        <value>
          <package name="" alias="false" withSubpackages="true" />
          <package name="java" alias="false" withSubpackages="true" />
          <package name="javax" alias="false" withSubpackages="true" />
          <package name="kotlin" alias="false" withSubpackages="true" />
          <package name="" alias="true" withSubpackages="true" />
        </value>
      </option>
      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
    </JetCodeStyleSettings>
    <codeStyleSettings language="XML">
      <indentOptions>
        <option name="CONTINUATION_INDENT_SIZE" value="4" />
      </indentOptions>
      <arrangement>
        <rules>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>xmlns:android</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>xmlns:.*</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
              <order>BY_NAME</order>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*:id</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*:name</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>name</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>style</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
              <order>BY_NAME</order>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
              <order>ANDROID_ATTRIBUTE_ORDER</order>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*</NAME>
                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>.*</XML_NAMESPACE>
                </AND>
              </match>
              <order>BY_NAME</order>
            </rule>
          </section>
        </rules>
      </arrangement>
    </codeStyleSettings>
    <codeStyleSettings language="kotlin">
      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
    </codeStyleSettings>
  </code_scheme>
 </component>
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,5 +0,0 @@
 <component name="ProjectCodeStyleConfiguration">
  <state>
    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
  </state>
 </component>
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="CompilerConfiguration">
    <bytecodeTargetLevel target="11" />
  </component>
 </project>
--- a/.idea/copyright/GPL.xml
+++ b/.idea/copyright/GPL.xml
@@ -1,6 +0,0 @@
 <component name="CopyrightManager">
  <copyright>
    <option name="notice" value="    Pupil, Hitomi.la viewer for Android&#10;    Copyright (C) &amp;#36;today.year  tom5079&#10;&#10;    This program is free software: you can redistribute it and/or modify&#10;    it under the terms of the GNU General Public License as published by&#10;    the Free Software Foundation, either version 3 of the License, or&#10;    (at your option) any later version.&#10;&#10;    This program is distributed in the hope that it will be useful,&#10;    but WITHOUT ANY WARRANTY; without even the implied warranty of&#10;    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the&#10;    GNU General Public License for more details.&#10;&#10;    You should have received a copy of the GNU General Public License&#10;    along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;." />
    <option name="myName" value="GPL" />
  </copyright>
 </component>
--- a/.idea/copyright/profiles_settings.xml
+++ b/.idea/copyright/profiles_settings.xml
@@ -1,7 +0,0 @@
 <component name="CopyrightManager">
  <settings>
    <module2copyright>
      <element module="Project Files" copyright="GPL" />
    </module2copyright>
  </settings>
 </component>
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -1,17 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="deploymentTargetDropDown">
    <targetSelectedWithDropDown>
      <Target>
        <type value="QUICK_BOOT_TARGET" />
        <deviceKey>
          <Key>
            <type value="VIRTUAL_DEVICE_PATH" />
            <value value="$USER_HOME$/.android/avd/Pixel_2_API_30.avd" />
          </Key>
        </deviceKey>
      </Target>
    </targetSelectedWithDropDown>
    <timeTargetWasSelectedWithDropDown value="2022-01-08T14:40:03.455241Z" />
  </component>
 </project>
--- a/.idea/dictionaries/tom50.xml
+++ b/.idea/dictionaries/tom50.xml
@@ -1,7 +0,0 @@
 <component name="ProjectDictionaryState">
  <dictionary name="tom50">
    <words>
      <w>hitomi</w>
    </words>
  </dictionary>
 </component>
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
 </project>
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,22 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="GradleMigrationSettings" migrationVersion="1" />
  <component name="GradleSettings">
    <option name="linkedExternalProjectsSettings">
      <GradleProjectSettings>
        <option name="testRunner" value="GRADLE" />
        <option name="distributionType" value="DEFAULT_WRAPPED" />
        <option name="externalProjectPath" value="$PROJECT_DIR$" />
        <option name="gradleHome" value="/usr/share/java/gradle" />
        <option name="gradleJvm" value="11" />
        <option name="modules">
          <set>
            <option value="$PROJECT_DIR$" />
            <option value="$PROJECT_DIR$/app" />
          </set>
        </option>
        <option name="resolveModulePerSourceSet" value="false" />
      </GradleProjectSettings>
    </option>
  </component>
 </project>
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +0,0 @@
 <component name="InspectionProjectProfileManager">
  <profile version="1.0">
    <option name="myName" value="Project Default" />
    <inspection_tool class="AndroidLintNewerVersionAvailable" enabled="true" level="WARNING" enabled_by_default="true" />
  </profile>
 </component>
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -1,90 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="RemoteRepositoriesConfiguration">
    <remote-repository>
      <option name="id" value="central" />
      <option name="name" value="Maven Central repository" />
      <option name="url" value="https://repo1.maven.org/maven2" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="jboss.community" />
      <option name="name" value="JBoss Community repository" />
      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="maven2" />
      <option name="name" value="maven2" />
      <option name="url" value="http://guardian.github.com/maven/repo-releases" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="BintrayJCenter" />
      <option name="name" value="BintrayJCenter" />
      <option name="url" value="https://jcenter.bintray.com/" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="maven" />
      <option name="name" value="maven" />
      <option name="url" value="https://jitpack.io" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="Google" />
      <option name="name" value="Google" />
      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="MavenRepo" />
      <option name="name" value="MavenRepo" />
      <option name="url" value="https://repo.maven.apache.org/maven2/" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="maven2" />
      <option name="name" value="maven2" />
      <option name="url" value="https://guardian.github.com/maven/repo-releases" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="maven3" />
      <option name="name" value="maven3" />
      <option name="url" value="https://s3.amazonaws.com/fabric-artifacts-private/internal-snapshots" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="maven4" />
      <option name="name" value="maven4" />
      <option name="url" value="https://maven.fabric.io/public" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="MavenLocal" />
      <option name="name" value="MavenLocal" />
      <option name="url" value="file:/$USER_HOME$/.m2/repository/" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="MavenLocal" />
      <option name="name" value="MavenLocal" />
      <option name="url" value="file:/$USER_HOME$/.m2/repository" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="maven3" />
      <option name="name" value="maven3" />
      <option name="url" value="https://dl.bintray.com/tom5079/maven" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="maven3" />
      <option name="name" value="maven3" />
      <option name="url" value="http://dl.bintray.com/piasy/maven" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="maven2" />
      <option name="name" value="maven2" />
      <option name="url" value="https://guardian.github.io/maven/repo-releases/" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="MavenLocal" />
      <option name="name" value="MavenLocal" />
      <option name="url" value="file:$USER_HOME$/.m2/repository/" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="maven2" />
      <option name="name" value="maven2" />
      <option name="url" value="https://oss.sonatype.org/content/repositories/snapshots" />
    </remote-repository>
  </component>
 </project>
--- a/.idea/kotlinCodeInsightSettings.xml
+++ b/.idea/kotlinCodeInsightSettings.xml
@@ -1,7 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="KotlinCodeInsightWorkspaceSettings">
    <option name="addUnambiguousImportsOnTheFly" value="true" />
    <option name="optimizeImportsOnTheFly" value="true" />
  </component>
 </project>
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="Kotlin2JvmCompilerArguments">
    <option name="jvmTarget" value="1.8" />
  </component>
 </project>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,16 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="DesignSurface">
    <option name="filePathToZoomLevelMap">
      <map>
        <entry key="app/src/main/res/layout/reader_activity.xml" value="0.14351851851851852" />
      </map>
    </option>
  </component>
  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/build/classes" />
  </component>
  <component name="ProjectType">
    <option name="id" value="Android" />
  </component>
 </project>
--- a/.idea/scopes/Pupil.xml
+++ b/.idea/scopes/Pupil.xml
@@ -1,3 +0,0 @@
 <component name="DependencyValidationManager">
  <scope name="Pupil" pattern="file[app]:*/" />
 </component>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="VcsDirectoryMappings">
    <mapping directory="" vcs="Git" />
  </component>
 </project>
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 *Pupil, Hitomi.la viewer for Android*  
 ![](https://img.shields.io/github/downloads/tom5079/Pupil/total)  
-[![](https://img.shields.io/github/downloads/tom5079/Pupil/5.2.9/Pupil-v5.2.9.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.2.9/Pupil-v5.2.9.apk)  
+[![](https://img.shields.io/github/downloads/tom5079/Pupil/5.3.4/Pupil-v5.3.4.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.3.4/Pupil-v5.3.4.apk)  
 [![](https://discordapp.com/api/guilds/610452916612104194/embed.png?style=banner2)](https://discord.gg/Stj4b5v)
 # Features
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,13 +32,13 @@ configurations {
 }
 android {
-    compileSdkVersion 31
+    compileSdkVersion 32
    defaultConfig {
        applicationId "xyz.quaver.pupil"
        minSdkVersion 16
-        targetSdkVersion 31
+        targetSdkVersion 32
        versionCode 69
-        versionName "5.2.10"
+        versionName "5.3.5"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        vectorDrawables.useSupportLibrary = true
    }
@@ -67,34 +67,35 @@ android {
        viewBinding true
    }
    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = JavaVersion.VERSION_11.toString()
        freeCompilerArgs += "-Xuse-experimental=kotlin.Experimental"
    }
    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_11
    }
 }
 dependencies {
    implementation fileTree(dir: "libs", include: ["*.jar", "*.aar"])
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1"
    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2"
    implementation "org.jetbrains.kotlinx:kotlinx-datetime:0.3.2"
-    implementation "androidx.appcompat:appcompat:1.4.0"
+    implementation "androidx.appcompat:appcompat:1.4.1"
    implementation "androidx.activity:activity-ktx:1.4.0"
-    implementation "androidx.fragment:fragment-ktx:1.4.0"
+    implementation "androidx.fragment:fragment-ktx:1.4.1"
-    implementation "androidx.preference:preference-ktx:1.1.1"
+    implementation "androidx.preference:preference-ktx:1.2.0"
    implementation "androidx.recyclerview:recyclerview:1.2.1"
-    implementation "androidx.constraintlayout:constraintlayout:2.1.2"
+    implementation "androidx.constraintlayout:constraintlayout:2.1.3"
    implementation "androidx.gridlayout:gridlayout:1.0.0"
    implementation "androidx.biometric:biometric:1.1.0"
    implementation "androidx.work:work-runtime-ktx:2.7.1"
    implementation "com.daimajia.swipelayout:library:1.2.0@aar"
-    implementation "com.google.android.material:material:1.4.0"
+    implementation "com.google.android.material:material:1.5.0"
    implementation platform('com.google.firebase:firebase-bom:29.0.3')
    implementation "com.google.firebase:firebase-analytics-ktx"
@@ -102,7 +103,7 @@ dependencies {
    implementation "com.google.firebase:firebase-perf-ktx"
    implementation "com.google.android.gms:play-services-oss-licenses:17.0.0"
-    implementation "com.google.android.gms:play-services-mlkit-face-detection:16.2.1"
+    implementation "com.google.android.gms:play-services-mlkit-face-detection:17.0.1"
    implementation "com.github.clans:fab:1.6.4"
@@ -128,13 +129,11 @@ dependencies {
    implementation "org.jsoup:jsoup:1.14.3"
    implementation "com.google.guava:guava:31.0.1-android"
    implementation "xyz.quaver:documentfilex:0.7.2"
    implementation "xyz.quaver:floatingsearchview:1.1.7"
    testImplementation "junit:junit:4.13.2"
-    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.1"
    androidTestImplementation "androidx.test.ext:junit:1.1.3"
    androidTestImplementation "androidx.test:rules:1.4.0"
    androidTestImplementation "androidx.test:runner:1.4.0"
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -33,4 +33,5 @@
 }
 -keep class xyz.quaver.pupil.ui.fragment.ManageFavoritesFragment
 -keep class xyz.quaver.pupil.ui.fragment.ManageStorageFragment
-keep class com.hippo.quickjs.** { *; }
+-keep class xyz.quaver.pupil.** { *; }
 -keep class app.cash.zipline.** { *; }
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -12,7 +12,7 @@
      "filters": [],
      "attributes": [],
      "versionCode": 69,
-      "versionName": "5.2.10",
+      "versionName": "5.3.5",
      "outputFile": "app-release.apk"
    }
  ],
--- a/app/src/androidTest/java/xyz/quaver/pupil/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/xyz/quaver/pupil/ExampleInstrumentedTest.kt
@@ -20,18 +20,18 @@
 package xyz.quaver.pupil
 import android.os.Build
 import android.util.Log
 import android.webkit.*
 import android.widget.Toast
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
+import kotlinx.coroutines.runBlocking
-import com.google.firebase.crashlytics.FirebaseCrashlytics
+import okhttp3.OkHttpClient
-import kotlinx.coroutines.*
+import okhttp3.Request
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import xyz.quaver.pupil.hitomi.*
 import java.util.*
 import java.util.concurrent.TimeUnit
 /**
 * Instrumented test, which will execute on an Android device.
@@ -40,113 +40,144 @@ import xyz.quaver.pupil.hitomi.*
 */
@RunWith(AndroidJUnit4::class)
 class ExampleInstrumentedTest {
 //    @Before
 //    fun init() {
 //        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
 //    }
    @Before
    fun init() {
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        clientBuilder = OkHttpClient.Builder()
            .readTimeout(0, TimeUnit.SECONDS)
            .writeTimeout(0, TimeUnit.SECONDS)
            .callTimeout(0, TimeUnit.SECONDS)
            .connectTimeout(0, TimeUnit.SECONDS)
            .addInterceptor { chain ->
                val request = chain.request().newBuilder()
                    .header("Referer", "https://hitomi.la/")
                    .build()
-        runBlocking {
+                chain.proceed(request)
            withContext(Dispatchers.Main) {
                WebView.setWebContentsDebuggingEnabled(true)
                webView = WebView(appContext).apply {
                    with (settings) {
                        javaScriptEnabled = true
                        domStorageEnabled = true
                    }
                    userAgent = settings.userAgentString
                    webViewClient = object: WebViewClient() {
                        override fun onPageFinished(view: WebView?, url: String?) {
                            webViewReady = true
                        }
                        override fun onReceivedError(
                            view: WebView?,
                            request: WebResourceRequest?,
                            error: WebResourceError?
                        ) {
                        }
                    }
                    webChromeClient = object: WebChromeClient() {
                        override fun onConsoleMessage(consoleMessage: ConsoleMessage?): Boolean {
                            return super.onConsoleMessage(consoleMessage)
                        }
                    }
                    addJavascriptInterface(object {
                        @JavascriptInterface
                        fun onResult(uid: String, result: String) {
                            _webViewFlow.tryEmit(uid to result)
                        }
                        @JavascriptInterface
                        fun onError(uid: String, message: String) {
                            _webViewFlow.tryEmit(uid to null)
                        }
                    }, "Callback")
                }
                reloadWhenFailedOrUpdate()
            }
        }
    }
    @Test
-    fun test_getGalleryIDsFromNozomi() {
+    fun test_empty() {
-        runBlocking {
+        print(
-            val result = getGalleryIDsFromNozomi(null, "boten", "all")
+            "".trim()
                .replace(Regex("""^\?"""), "")
                .lowercase(Locale.getDefault())
                .split(Regex("\\s+"))
                .map {
                    it.replace('_', ' ')
                })
    }
    @Test
    fun test_nozomi() {
        val nozomi = getGalleryIDsFromNozomi(null, "index", "all")
-            Log.d("PUPILD", "getGalleryIDsFromNozomi: ${result.size}")
+        Log.d("PUPILD", nozomi.size.toString())
        }
    }
    @Test
-    fun test_getGalleryIDsForQuery() {
+    fun test_search() {
-        runBlocking {
+        val ids = getGalleryIDsForQuery("language:korean").reversed()
            val result = getGalleryIDsForQuery("female:crotch tattoo")
-            Log.d("PUPILD", "getGalleryIDsForQuery: ${result.size}")
+        print(ids.size)
        }
    }
    @Test
-    fun test_getSuggestionsForQuery() {
+    fun test_suggestions() {
-        runBlocking {
+        val suggestions = getSuggestionsForQuery("language:g")
            val result = getSuggestionsForQuery("fem")
-            Log.d("PUPILD", "getSuggestionsForQuery: ${result.size}")
+        print(suggestions)
        }
    }
    @Test
-    fun test_urlFromUrlFromHash() {
+    fun test_doSearch() {
-        runBlocking {
+        val r = runBlocking {
-            val galleryInfo = getGalleryInfo(2102416)
+            doSearch("language:korean")
            val result = galleryInfo.files.map {
                imageUrlFromImage(2102416, it, false)
            }
            Log.d("PUPILD", result.toString())
        }
        Log.d("PUPILD", r.take(10).toString())
    }
 //    @Test
 //    fun test_getBlock() {
 //        val galleryBlock = getGalleryBlock(2097576)
 //
 //        print(galleryBlock)
 //    }
 //
 //    @Test
 //    fun test_getGallery() {
 //        val gallery = getGallery(2097751)
 //
 //        print(gallery)
 //    }
    @Test
    fun test_getGalleryInfo() {
-        runBlocking {
+        val info = getGalleryInfo(1469394)
            val galleryInfo = getGalleryInfo(2102416)
-            Log.d("PUPILD", galleryInfo.toString())
+        print(info)
        }
    }
    @Test
-    fun test_getGalleryBlock() {
+    fun test_getReader() {
-        runBlocking {
+        val reader = getGalleryInfo(2128654)
            val block = getGalleryBlock(2102731)
-            Log.d("PUPILD", block.toString())
+        Log.d("PUPILD", reader.toString())
        }
    }
    @Test
    fun test_getImages() { runBlocking {
        val galleryID = 2128654
        val images = getGalleryInfo(galleryID).files.map {
            imageUrlFromImage(galleryID, it,false)
        }
        Log.d("PUPILD", images.toString())
 //        images.forEachIndexed { index, image ->
 //            println("Testing $index/${images.size}: $image")
 //            val response = client.newCall(
 //                Request.Builder()
 //                    .url(image)
 //                    .header("Referer", "https://hitomi.la/")
 //                    .build()
 //            ).execute()
 //
 //            assertEquals(200, response.code())
 //
 //            println("$index/${images.size} Passed")
 //        }
    } }
 //    @Test
 //    fun test_urlFromUrlFromHash() {
 //        val url = urlFromUrlFromHash(1531795, GalleryFiles(
 //            212, "719d46a7556be0d0021c5105878507129b5b3308b02cf67f18901b69dbb3b5ef", 1, "00.jpg", 300
 //        ), "webp")
 //
 //        print(url)
 //    }
 //    @Test
 //    suspend fun test_doSearch_extreme() {
 //        val query = "language:korean -tag:sample -female:humiliation -female:diaper -female:strap-on -female:squirting -female:lizard_girl -female:voyeurism -type:artistcg -female:blood -female:ryona -male:blood -male:ryona -female:crotch_tattoo -male:urethra_insertion -female:living_clothes -male:tentacles -female:slave -female:gag -male:gag -female:wooden_horse -male:exhibitionism -male:miniguy -female:mind_break -male:mind_break -male:unbirth -tag:scanmark -tag:no_penetration -tag:nudity_only -female:enema -female:brain_fuck -female:navel_fuck -tag:novel -tag:mosaic_censorship -tag:webtoon -male:rape -female:rape -female:yuri -male:anal -female:anal -female:futanari -female:huge_breasts -female:big_areolae -male:torture -male:stuck_in_wall -female:stuck_in_wall -female:torture -female:birth -female:pregnant -female:drugs -female:bdsm -female:body_writing -female:cbt -male:dark_skin -male:insect -female:insect -male:vore -female:vore -female:vomit -female:urination -female:urethra_insertion -tag:mmf_threesome -female:sex_toys -female:double_penetration -female:eggs -female:prolapse -male:smell -male:bestiality -female:bestiality -female:big_ass -female:milf -female:mother -male:dilf -male:netorare -female:netorare -female:cosplaying -female:filming -female:armpit_sex -female:armpit_licking -female:tickling -female:lactation -male:skinsuit -female:skinsuit -male:bbm -female:prostitution -female:double_penetration -female:females_only -male:males_only -female:tentacles -female:tentacles -female:stomach_deformation -female:hairy_armpits -female:large_insertions -female:mind_control -male:orc -female:dark_skin -male:yandere -female:yandere -female:scat -female:toddlercon -female:bbw -female:hairy -male:cuntboy -male:lactation -male:drugs -female:body_modification -female:monoeye -female:chikan -female:long_tongue -female:harness -female:fisting -female:glory_hole -female:latex -male:latex -female:unbirth -female:giantess -female:sole_dickgirl -female:robot -female:doll_joints -female:machine -tag:artbook -male:cbt -female:farting -male:farting -male:midget -female:midget -female:exhibitionism  -male:monster -female:big_nipples -female:big_clit -female:gyaru -female:piercing -female:necrophilia -female:snuff -female:smell -male:cheating -female:cheating -male:snuff -female:harem -male:harem"
 //        print(doSearch(query).size)
 //    }
 //    @Test
 //    suspend fun test_parse() {
 //        print(doSearch("-male:yaoi -female:yaoi -female:loli").size)
 //    }
 //    @Test
 //    fun test_subdomainFromUrl() {
 //        val galleryInfo = getGalleryInfo(1929109).files[2]
 //        print(urlFromUrlFromHash(1929109, galleryInfo, "webp", null, "a"))
 //    }
 }
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,8 +6,8 @@
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
    <uses-permission android:name="android.permission.USE_BIOMETRIC" />
-    <uses-permission-sdk-23 android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="23"/>
-    <uses-permission-sdk-23 android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="23"/>
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
    <uses-permission android:name="android.permission.CAMERA" />
    <uses-permission android:name="android.permission.VIBRATE"/>
--- a/app/src/main/java/xyz/quaver/pupil/Pupil.kt
+++ b/app/src/main/java/xyz/quaver/pupil/Pupil.kt
@@ -18,19 +18,15 @@
 package xyz.quaver.pupil
 import android.annotation.SuppressLint
 import android.app.Application
 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
 import android.content.Intent
 import android.content.pm.ApplicationInfo
 import android.net.Uri
 import android.os.Build
 import android.util.Log
 import android.webkit.*
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.ContextCompat
 import androidx.preference.PreferenceManager
@@ -40,14 +36,16 @@ import com.github.piasy.biv.loader.fresco.FrescoImageLoader
 import com.google.android.gms.common.GooglePlayServicesNotAvailableException
 import com.google.android.gms.common.GooglePlayServicesRepairableException
 import com.google.android.gms.security.ProviderInstaller
 import com.google.firebase.FirebaseApp
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.*
-import kotlinx.coroutines.channels.BufferOverflow
+import okhttp3.Dispatcher
-import kotlinx.coroutines.flow.MutableSharedFlow
+import okhttp3.Interceptor
-import kotlinx.coroutines.flow.asSharedFlow
+import okhttp3.OkHttpClient
-import okhttp3.*
+import okhttp3.Response
 import xyz.quaver.io.FileX
 import xyz.quaver.pupil.hitomi.evaluationContext
 import xyz.quaver.pupil.hitomi.readText
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.util.*
 import java.io.File
@@ -78,145 +76,14 @@ val client: OkHttpClient
        clientHolder = it
    }
@SuppressLint("StaticFieldLeak")
 lateinit var webView: WebView
 val _webViewFlow = MutableSharedFlow<Pair<String, String?>>()
 val webViewFlow = _webViewFlow.asSharedFlow()
 var webViewReady = false
 var webViewFailed = false
 private var reloadJob: Job? = null
 fun reloadWebView() {
    if (reloadJob?.isActive == true) return
    reloadJob = CoroutineScope(Dispatchers.IO).launch {
        webViewReady = false
        webViewFailed = false
        evaluationContext.cancelChildren()
        runCatching {
            URL(
                if (isDebugBuild)
                    "https://tom5079.github.io/Pupil/hitomi-dev.html"
                else
                    "https://tom5079.github.io/Pupil/hitomi.html"
            ).readText()
        }.onFailure {
            webViewFailed = true
        }.getOrNull()?.let { html ->
            launch(Dispatchers.Main) {
                webView.loadDataWithBaseURL(
                    "https://hitomi.la/",
                    html,
                    "text/html",
                    null,
                    null
                )
            }
        }
    }
 }
 private var htmlVersion: String = ""
 fun reloadWhenFailedOrUpdate() = CoroutineScope(Dispatchers.Default).launch {
    while (true) {
        if (
            webViewFailed ||
            runCatching {
                URL(
                    if (isDebugBuild)
                        "https://tom5079.github.io/Pupil/hitomi-dev.html.ver"
                    else
                        "https://tom5079.github.io/Pupil/hitomi.html.ver"
                ).readText()
            }.getOrNull().let { version ->
                (!version.isNullOrEmpty() && version != htmlVersion).also {
                    if (it) htmlVersion = version!!
                }
            }
        ) {
            reloadWebView()
        }
        delay(if (webViewReady && !webViewFailed) 10000 else 1000)
    }
 }
 var isDebugBuild: Boolean = false
 lateinit var userAgent: String
 class Pupil : Application() {
    companion object {
        lateinit var instance: Pupil
            private set
    }
    @SuppressLint("SetJavaScriptEnabled")
    override fun onCreate() {
        instance = this
        isDebugBuild = applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE != 0
        if (isDebugBuild) WebView.setWebContentsDebuggingEnabled(true)
        webView = WebView(this).apply {
            with (settings) {
                javaScriptEnabled = true
                domStorageEnabled = true
            }
            userAgent = settings.userAgentString
            webViewClient = object: WebViewClient() {
                override fun onPageFinished(view: WebView?, url: String?) {
                    webViewReady = true
                }
                override fun onReceivedError(
                    view: WebView?,
                    request: WebResourceRequest?,
                    error: WebResourceError?
                ) {
                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                        FirebaseCrashlytics.getInstance().log(
                            "onReceivedError: ${error?.description}"
                        )
                    }
                }
            }
            webChromeClient = object: WebChromeClient() {
                override fun onConsoleMessage(consoleMessage: ConsoleMessage?): Boolean {
                    FirebaseCrashlytics.getInstance().log(
                        "onConsoleMessage: ${consoleMessage?.message()} (${consoleMessage?.sourceId()}:${consoleMessage?.lineNumber()})"
                    )
                    return super.onConsoleMessage(consoleMessage)
                }
            }
            addJavascriptInterface(object {
                @JavascriptInterface
                fun onResult(uid: String, result: String) {
                    CoroutineScope(Dispatchers.Unconfined).launch {
                        _webViewFlow.emit(uid to result)
                    }
                }
                @JavascriptInterface
                fun onError(uid: String, message: String) {
                    CoroutineScope(Dispatchers.Unconfined).launch {
                        _webViewFlow.emit(uid to null)
                    }
                    Toast.makeText(this@Pupil, message, Toast.LENGTH_LONG).show()
                    FirebaseCrashlytics.getInstance().recordException(
                        Exception(message)
                    )
                }
            }, "Callback")
        }
        reloadWhenFailedOrUpdate()
        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
@@ -227,6 +94,7 @@ class Pupil : Application() {
            else userID
        }
        FirebaseApp.initializeApp(this)
        FirebaseCrashlytics.getInstance().setUserId(userID)
        val proxyInfo = getProxyInfo()
@@ -237,7 +105,7 @@ class Pupil : Application() {
            .proxyInfo(proxyInfo)
            .addInterceptor { chain ->
                val request = chain.request().newBuilder()
-                    .header("User-Agent", userAgent)
+                    .addHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.81 Safari/537.36")
                    .header("Referer", "https://hitomi.la/")
                    .build()
--- a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
@@ -104,168 +104,168 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt
            val cache = Cache.getInstance(itemView.context, galleryID)
            val galleryBlock = runBlocking {
                cache.getGalleryBlock()
            } ?: return
            val resources = itemView.context.resources
            val languages = resources.getStringArray(R.array.languages).map {
                it.split("|").let { split ->
                    Pair(split[0], split[1])
                }
            }.toMap()
            val artists = galleryBlock.artists
            val series = galleryBlock.series
            binding.galleryblockThumbnail.apply {
                setOnClickListener {
                    itemView.performClick()
                }
                setOnLongClickListener {
                    itemView.performLongClick()
                }
                setFailureImage(ContextCompat.getDrawable(context, R.drawable.image_broken_variant))
                setImageLoaderCallback(object: ImageLoader.Callback {
                    override fun onFail(error: Exception?) {
                        Cache.getInstance(context, galleryID).let { cache ->
                            cache.cacheFolder.getChild(".thumbnail").let { if (it.exists()) it.delete() }
                            cache.downloadFolder?.getChild(".thumbnail")?.let { if (it.exists()) it.delete() }
                        }
                    }
                    override fun onCacheHit(imageType: Int, image: File?) {}
                    override fun onCacheMiss(imageType: Int, image: File?) {}
                    override fun onFinish() {}
                    override fun onProgress(progress: Int) {}
                    override fun onStart() {}
                    override fun onSuccess(image: File?) {}
                })
                ssiv?.recycle()
                CoroutineScope(Dispatchers.IO).launch {
                    cache.getThumbnail().let { launch(Dispatchers.Main) {
                        showImage(it)
                    } }
                }
            }
            binding.galleryblockTitle.text = galleryBlock.title
            with(binding.galleryblockArtist) {
                text = artists.joinToString { it.wordCapitalize() }
                visibility = when {
                    artists.isNotEmpty() -> View.VISIBLE
                    else -> View.GONE
                }
                CoroutineScope(Dispatchers.IO).launch {
                    val gallery = runCatching {
                        getGallery(galleryID)
                    }.getOrNull()
                    if (gallery?.groups?.isNotEmpty() != true)
                        return@launch
                    launch(Dispatchers.Main) {
                        text = context.getString(
                            R.string.galleryblock_artist_with_group,
                            artists.joinToString { it.wordCapitalize() },
                            gallery.groups.joinToString { it.wordCapitalize() }
                        )
                    }
                }
            }
            with(binding.galleryblockSeries) {
                text =
                    resources.getString(
                        R.string.galleryblock_series,
                        series.joinToString(", ") { it.wordCapitalize() })
                visibility = when {
                    series.isNotEmpty() -> View.VISIBLE
                    else -> View.GONE
                }
            }
            binding.galleryblockType.text = resources.getString(R.string.galleryblock_type, galleryBlock.type).wordCapitalize()
            with(binding.galleryblockLanguage) {
                text =
                    resources.getString(R.string.galleryblock_language, languages[galleryBlock.language])
                visibility = when {
                    galleryBlock.language.isNotEmpty() -> View.VISIBLE
                    else -> View.GONE
                }
            }
            with(binding.galleryblockTagGroup) {
                onClickListener = {
                    onChipClickedHandler.forEach { callback ->
                        callback.invoke(it)
                    }
                }
                tags.clear()
                CoroutineScope(Dispatchers.IO).launch {
                    tags.addAll(
                        galleryBlock.relatedTags.sortedBy {
                            val tag = Tag.parse(it)
                            if (favoriteTags.contains(tag))
                                -1
                            else
                                when(Tag.parse(it).area) {
                                    "female" -> 0
                                    "male" -> 1
                                    else -> 2
                                }
                        }.map {
                            Tag.parse(it)
                        }
                    )
                    launch(Dispatchers.Main) {
                        refresh()
                    }
                }
            }
            binding.galleryblockId.text = galleryBlock.id.toString()
            binding.galleryblockPagecount.text = "-"
            CoroutineScope(Dispatchers.IO).launch {
-                val pageCount = kotlin.runCatching {
+                val galleryBlock = cache.getGalleryBlock() ?: return@launch
                    getGalleryInfo(galleryBlock.id).files.size
                }.getOrNull() ?: return@launch
                withContext(Dispatchers.Main) {
                    binding.galleryblockPagecount.text = itemView.context.getString(R.string.galleryblock_pagecount, pageCount)
                }
            }
-            with(binding.galleryblockFavorite) {
+                launch(Dispatchers.Main) {
-                setImageResource(if (favorites.contains(galleryBlock.id)) R.drawable.ic_star_filled else R.drawable.ic_star_empty)
+                    val resources = itemView.context.resources
-                setOnClickListener {
+                    val languages = resources.getStringArray(R.array.languages).map {
-                    when {
+                        it.split("|").let { split ->
-                        favorites.contains(galleryBlock.id) -> {
+                            Pair(split[0], split[1])
                            favorites.remove(galleryBlock.id)
                            setImageResource(R.drawable.ic_star_empty)
                        }
-                        else -> {
+                    }.toMap()
                            favorites.add(galleryBlock.id)
-                            setImageDrawable(AnimatedVectorDrawableCompat.create(context, R.drawable.avd_star).apply {
+                    val artists = galleryBlock.artists
-                                this ?: return@apply
+                    val series = galleryBlock.series
-                                registerAnimationCallback(object: Animatable2Compat.AnimationCallback() {
+                    binding.galleryblockThumbnail.apply {
-                                    override fun onAnimationEnd(drawable: Drawable?) {
+                        setOnClickListener {
-                                        setImageResource(R.drawable.ic_star_filled)
+                            itemView.performClick()
-                                    }
+                        }
-                                })
+                        setOnLongClickListener {
-                                start()
+                            itemView.performLongClick()
-                            })
+                        }
                        setFailureImage(ContextCompat.getDrawable(context, R.drawable.image_broken_variant))
                        setImageLoaderCallback(object: ImageLoader.Callback {
                            override fun onFail(error: Exception?) {
                                Cache.delete(context, galleryID)
                            }
                            override fun onCacheHit(imageType: Int, image: File?) {}
                            override fun onCacheMiss(imageType: Int, image: File?) {}
                            override fun onFinish() {}
                            override fun onProgress(progress: Int) {}
                            override fun onStart() {}
                            override fun onSuccess(image: File?) {}
                        })
                        ssiv?.recycle()
                        CoroutineScope(Dispatchers.IO).launch {
                            cache.getThumbnail().let { launch(Dispatchers.Main) {
                                showImage(it)
                            } }
                        }
                    }
                    binding.galleryblockTitle.text = galleryBlock.title
                    with(binding.galleryblockArtist) {
                        text = artists.joinToString { it.wordCapitalize() }
                        visibility = when {
                            artists.isNotEmpty() -> View.VISIBLE
                            else -> View.GONE
                        }
                        CoroutineScope(Dispatchers.IO).launch {
                            val gallery = runCatching {
                                getGallery(galleryID)
                            }.getOrNull()
                            if (gallery?.groups?.isNotEmpty() != true)
                                return@launch
                            launch(Dispatchers.Main) {
                                text = context.getString(
                                    R.string.galleryblock_artist_with_group,
                                    artists.joinToString { it.wordCapitalize() },
                                    gallery.groups.joinToString { it.wordCapitalize() }
                                )
                            }
                        }
                    }
                    with(binding.galleryblockSeries) {
                        text =
                            resources.getString(
                                R.string.galleryblock_series,
                                series.joinToString(", ") { it.wordCapitalize() })
                        visibility = when {
                            series.isNotEmpty() -> View.VISIBLE
                            else -> View.GONE
                        }
                    }
                    binding.galleryblockType.text = resources.getString(R.string.galleryblock_type, galleryBlock.type).wordCapitalize()
                    with(binding.galleryblockLanguage) {
                        text =
                            resources.getString(R.string.galleryblock_language, languages[galleryBlock.language])
                        visibility = when {
                            !galleryBlock.language.isNullOrEmpty() -> View.VISIBLE
                            else -> View.GONE
                        }
                    }
                    with(binding.galleryblockTagGroup) {
                        onClickListener = {
                            onChipClickedHandler.forEach { callback ->
                                callback.invoke(it)
                            }
                        }
                        tags.clear()
                        CoroutineScope(Dispatchers.IO).launch {
                            tags.addAll(
                                galleryBlock.relatedTags.sortedBy {
                                    val tag = Tag.parse(it)
                                    if (favoriteTags.contains(tag))
                                        -1
                                    else
                                        when(Tag.parse(it).area) {
                                            "female" -> 0
                                            "male" -> 1
                                            else -> 2
                                        }
                                }.map {
                                    Tag.parse(it)
                                }
                            )
                            launch(Dispatchers.Main) {
                                refresh()
                            }
                        }
                    }
                    binding.galleryblockId.text = galleryBlock.id.toString()
                    binding.galleryblockPagecount.text = "-"
                    CoroutineScope(Dispatchers.IO).launch {
                        val pageCount = kotlin.runCatching {
                            getGalleryInfo(galleryBlock.id).files.size
                        }.getOrNull() ?: return@launch
                        withContext(Dispatchers.Main) {
                            binding.galleryblockPagecount.text = itemView.context.getString(R.string.galleryblock_pagecount, pageCount)
                        }
                    }
                    with(binding.galleryblockFavorite) {
                        setImageResource(if (favorites.contains(galleryBlock.id)) R.drawable.ic_star_filled else R.drawable.ic_star_empty)
                        setOnClickListener {
                            when {
                                favorites.contains(galleryBlock.id) -> {
                                    favorites.remove(galleryBlock.id)
                                    setImageResource(R.drawable.ic_star_empty)
                                }
                                else -> {
                                    favorites.add(galleryBlock.id)
                                    setImageDrawable(AnimatedVectorDrawableCompat.create(context, R.drawable.avd_star).apply {
                                        this ?: return@apply
                                        registerAnimationCallback(object: Animatable2Compat.AnimationCallback() {
                                            override fun onAnimationEnd(drawable: Drawable?) {
                                                setImageResource(R.drawable.ic_star_filled)
                                            }
                                        })
                                        start()
                                    })
                                }
                            }
                        }
                    }
                }
            }
            // Make some views invisible to make it thinner
            if (thin) {
                binding.galleryblockTagGroup.visibility = View.GONE
--- a/app/src/main/java/xyz/quaver/pupil/hitomi/Utils.kt
+++ b/app/src/main/java/xyz/quaver/pupil/hitomi/Utils.kt
@@ -1,56 +0,0 @@
 /*
 *    Copyright 2019 tom5079
 *
 *    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 xyz.quaver
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.modules.SerializersModule
 import kotlinx.serialization.modules.plus
 import kotlinx.serialization.modules.polymorphic
 import kotlinx.serialization.modules.subclass
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import xyz.quaver.pupil.client
 import java.io.IOException
 import java.net.URL
 import java.util.concurrent.TimeUnit
 import kotlin.time.Duration
 /**
 * kotlinx.serialization.json.Json object for global use  
 * properties should not be changed
 *
 * @see [https://kotlin.github.io/kotlinx.serialization/kotlinx-serialization-core/kotlinx-serialization-core/kotlinx.serialization.json/-json/index.html]
 */
 val json = Json {
    isLenient = true
    ignoreUnknownKeys = true
    allowSpecialFloatingPointValues = true
    useArrayPolymorphism = true
 }
 typealias HeaderSetter = (Request.Builder) -> Request.Builder
 fun URL.readText(settings: HeaderSetter? = null): String {
    val request = Request.Builder()
        .url(this).let { 
            settings?.invoke(it) ?: it
        }.build()
    return client.newCall(request).execute().also{ if (it.code() != 200) throw IOException() }.body()?.use { it.string() } ?: throw IOException()
 }
--- a/app/src/main/java/xyz/quaver/pupil/hitomi/common.kt
+++ b/app/src/main/java/xyz/quaver/pupil/hitomi/common.kt
@@ -16,127 +16,259 @@
 package xyz.quaver.pupil.hitomi
 import android.util.Log
 import android.webkit.WebView
 import android.widget.Toast
 import com.google.common.collect.ConcurrentHashMultiset
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.sync.withLock
-import kotlinx.coroutines.flow.transformWhile
+import kotlinx.datetime.Clock.System.now
-import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.datetime.Instant
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import xyz.quaver.json
+import okhttp3.Call
-import xyz.quaver.pupil.*
+import okhttp3.Callback
-import java.util.*
+import okhttp3.Request
-import java.util.concurrent.ConcurrentHashMap
+import okhttp3.Response
-import kotlin.coroutines.resume
+import xyz.quaver.pupil.client
-import kotlin.coroutines.suspendCoroutine
+import java.io.IOException
 import java.net.URL
 import java.util.concurrent.Executors
 import kotlin.coroutines.resumeWithException
 import kotlin.time.Duration.Companion.minutes
 import kotlin.time.ExperimentalTime
 const val protocol = "https:"
-val evaluationContext = Dispatchers.Main + Job()
+@Serializable
 data class Artist(
    val artist: String,
    val url: String
 )
-suspend fun WebView.evaluate(script: String): String = coroutineScope {
+@Serializable
-    var result: String? = null
+data class Group(
    val group: String,
    val url: String
 )
-    while (result == null) {
+@Serializable
-        try {
+data class Parody(
-            result = withContext(evaluationContext) {
+    val parody: String,
-                while (webViewFailed || !webViewReady) yield()
+    val url: String
 )
-                suspendCoroutine { continuation ->
+@Serializable
-                    evaluateJavascript(script) {
+data class Character(
-                        continuation.resume(it)
+    val character: String,
-                    }
+    val url: String
-                }
+)
-            }
+@Serializable
-        } catch (e: CancellationException) {
+data class Tag(
-            continue
+    val tag: String,
-        }
+    val url: String,
-    }
+    val female: String? = null,
    val male: String? = null
 )
-    result
+@Serializable
 data class Language(
    val galleryid: String,
    val url: String,
    val language_localname: String,
    val name: String
 )
@Serializable
 data class GalleryInfo(
    val id: String,
    val title: String,
    val japanese_title: String? = null,
    val language: String? = null,
    val type: String,
    val date: String,
    val artists: List<Artist>? = null,
    val groups: List<Group>? = null,
    val parodys: List<Parody>? = null,
    val tags: List<Tag>? = null,
    val related: List<Int> = emptyList(),
    val languages: List<Language> = emptyList(),
    val characters: List<Character>? = null,
    val scene_indexes: List<Int>? = emptyList(),
    val files: List<GalleryFiles> = emptyList()
 )
 val json = Json {
    isLenient = true
    ignoreUnknownKeys = true
    allowSpecialFloatingPointValues = true
    useArrayPolymorphism = true
 }
-@OptIn(ExperimentalCoroutinesApi::class)
+typealias HeaderSetter = (Request.Builder) -> Request.Builder
-suspend fun WebView.evaluatePromise(
+fun URL.readText(settings: HeaderSetter? = null): String {
-    script: String,
+    val request = Request.Builder()
-    then: String = ".then(result => Callback.onResult(%uid, JSON.stringify(result))).catch(err => Callback.onError(%uid, JSON.stringify(error)))"
+        .url(this).let {
-): String = coroutineScope {
+            settings?.invoke(it) ?: it
-    var result: String? = null
+        }.build()
-    while (result == null) {
+    return client.newCall(request).execute().also{ if (it.code() != 200) throw IOException("CODE ${it.code()}") }.body()?.use { it.string() } ?: throw IOException()
-        try {
+}
            result = withContext(evaluationContext) {
                while (webViewFailed || !webViewReady) yield()
-                val uid = UUID.randomUUID().toString()
+fun URL.readBytes(settings: HeaderSetter? = null): ByteArray {
    val request = Request.Builder()
        .url(this).let {
            settings?.invoke(it) ?: it
        }.build()
-                val flow: Flow<Pair<String, String?>> = webViewFlow.transformWhile { (currentUid, result) ->
+    return client.newCall(request).execute().also { if (it.code() != 200) throw IOException("CODE ${it.code()}") }.body()?.use { it.bytes() } ?: throw IOException()
                    if (currentUid == uid) {
                        emit(currentUid to result)
                    }
                    currentUid != uid
                }
                launch {
                    evaluateJavascript((script + then).replace("%uid", "'$uid'"), null)
                }
                flow.first().second
            }
        } catch (e: CancellationException) {
            continue
        }
    }
    result
 }
@Suppress("EXPERIMENTAL_API_USAGE")
-suspend fun getGalleryInfo(galleryID: Int): GalleryInfo {
+fun getGalleryInfo(galleryID: Int) =
-    val result = webView.evaluatePromise("get_gallery_info($galleryID)")
+    json.decodeFromString<GalleryInfo>(
-
+        URL("$protocol//$domain/galleries/$galleryID.js").readText()
-    return json.decodeFromString(result)
+            .replace("var galleryinfo = ", "")
-}
+    )
 //common.js
 const val domain = "ltn.hitomi.la"
 const val galleryblockextension = ".html"
 const val galleryblockdir = "galleryblock"
 const val nozomiextension = ".nozomi"
-val String?.js: String
+val evaluationContext = Dispatchers.Main + Job()
    get() = if (this == null) "null" else "'$this'"
-@OptIn(ExperimentalSerializationApi::class)
+object gg {
-suspend fun urlFromUrlFromHash(galleryID: Int, image: GalleryFiles, dir: String? = null, ext: String? = null, base: String? = null): String {
+    private var lastRetrieval: Instant? = null
    val result = webView.evaluate(
        """
        url_from_url_from_hash(
            ${galleryID.toString().js},
            ${Json.encodeToString(image)},
            ${dir.js}, ${ext.js}, ${base.js}
        )
        """.trimIndent()
    )
-    return Json.decodeFromString(result)
+    private val mutex = Mutex()
    private var mDefault = 0
    private val mMap = mutableMapOf<Int, Int>()
    private var b = ""
    @OptIn(ExperimentalTime::class, ExperimentalCoroutinesApi::class)
    private suspend fun refresh() = withContext(Dispatchers.IO) {
        mutex.withLock {
            if (lastRetrieval == null || (lastRetrieval!! + 1.minutes) < now()) {
                val ggjs: String = suspendCancellableCoroutine { continuation ->
                    val call = client.newCall(Request.Builder().url("https://ltn.hitomi.la/gg.js").build())
                    call.enqueue(object: Callback {
                        override fun onFailure(call: Call, e: IOException) {
                            if (continuation.isCancelled) return
                            continuation.resumeWithException(e)
                        }
                        override fun onResponse(call: Call, response: Response) {
                            if (!call.isCanceled) {
                                response.body()?.use {
                                    continuation.resume(it.string()) {
                                        call.cancel()
                                    }
                                }
                            }
                        }
                    })
                    continuation.invokeOnCancellation {
                        call.cancel()
                    }
                }
                mDefault = Regex("var o = (\\d)").find(ggjs)!!.groupValues[1].toInt()
                val o = Regex("o = (\\d); break;").find(ggjs)!!.groupValues[1].toInt()
                mMap.clear()
                Regex("case (\\d+):").findAll(ggjs).forEach {
                    val case = it.groupValues[1].toInt()
                    mMap[case] = o
                }
                b = Regex("b: '(.+)'").find(ggjs)!!.groupValues[1]
                lastRetrieval = now()
            }
        }
    }
    suspend fun m(g: Int): Int {
        refresh()
        return mMap[g] ?: mDefault
    }
    suspend fun b(): String {
        refresh()
        return b
    }
    fun s(h: String): String {
        val m = Regex("(..)(.)$").find(h)
        return m!!.groupValues.let { it[2]+it[1] }.toInt(16).toString(10)
    }
 }
 suspend fun subdomainFromURL(url: String, base: String? = null) : String {
    var retval = "b"
    if (!base.isNullOrBlank())
        retval = base
    val b = 16
    val r = Regex("""/[0-9a-f]{61}([0-9a-f]{2})([0-9a-f])""")
    val m = r.find(url) ?: return "a"
    val g = m.groupValues.let { it[2]+it[1] }.toIntOrNull(b)
    if (g != null) {
        retval = (97+ gg.m(g)).toChar().toString() + retval
    }
    return retval
 }
 suspend fun urlFromUrl(url: String, base: String? = null) : String {
    return url.replace(Regex("""//..?\.hitomi\.la/"""), "//${subdomainFromURL(url, base)}.hitomi.la/")
 }
 suspend fun fullPathFromHash(hash: String) : String =
    "${gg.b()}${gg.s(hash)}/$hash"
 fun realFullPathFromHash(hash: String): String =
    hash.replace(Regex("""^.*(..)(.)$"""), "$2/$1/$hash")
 suspend fun urlFromHash(galleryID: Int, image: GalleryFiles, dir: String? = null, ext: String? = null) : String {
    val ext = ext ?: dir ?: image.name.takeLastWhile { it != '.' }
    val dir = dir ?: "images"
    return "https://a.hitomi.la/$dir/${fullPathFromHash(image.hash)}.$ext"
 }
 suspend fun urlFromUrlFromHash(galleryID: Int, image: GalleryFiles, dir: String? = null, ext: String? = null, base: String? = null) =
    if (base == "tn")
        urlFromUrl("https://a.hitomi.la/$dir/${realFullPathFromHash(image.hash)}.$ext", base)
    else
        urlFromUrl(urlFromHash(galleryID, image, dir, ext), base)
 suspend fun rewriteTnPaths(html: String) {
    html.replace(Regex("""//tn\.hitomi\.la/[^/]+/[0-9a-f]/[0-9a-f]{2}/[0-9a-f]{64}""")) { url ->
        runBlocking {
            urlFromUrl(url.value, "tn")
        }
    }
 }
 suspend fun imageUrlFromImage(galleryID: Int, image: GalleryFiles, noWebp: Boolean) : String {
-    return when {
+    return urlFromUrlFromHash(galleryID, image, "webp", null, "a")
-        noWebp ->
+//    return when {
-            urlFromUrlFromHash(galleryID, image)
+//        noWebp ->
-//        image.hasavif != 0 ->
+//            urlFromUrlFromHash(galleryID, image)
-//            urlFromUrlFromHash(galleryID, image, "avif", null, "a")
+////        image.hasavif != 0 ->
-        image.haswebp != 0 ->
+////            urlFromUrlFromHash(galleryID, image, "avif", null, "a")
-            urlFromUrlFromHash(galleryID, image, "webp", null, "a")
+//        image.haswebp != 0 ->
-        else ->
+//            urlFromUrlFromHash(galleryID, image, "webp", null, "a")
-            urlFromUrlFromHash(galleryID, image)
+//        else ->
-    }
+//            urlFromUrlFromHash(galleryID, image)
 //    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/hitomi/galleries.kt
+++ b/app/src/main/java/xyz/quaver/pupil/hitomi/galleries.kt
@@ -17,10 +17,6 @@
 package xyz.quaver.pupil.hitomi
 import kotlinx.serialization.Serializable
 import org.jsoup.Jsoup
 import xyz.quaver.readText
 import java.net.URL
 import java.net.URLDecoder
@Serializable
 data class Gallery(
@@ -37,44 +33,22 @@ data class Gallery(
    val tags: List<String>,
    val thumbnails: List<String>
 )
 suspend fun getGallery(galleryID: Int) : Gallery {
-    val url = Jsoup.parse(URL("https://hitomi.la/galleries/$galleryID.html").readText())
+    val info = getGalleryInfo(galleryID)
        .select("link").attr("href")
-    val doc = Jsoup.parse(URL(url).readText())
+    return Gallery(
-
+        info.related,
-    val related = Regex("\\d+")
+        info.languages.map { it.name to it.galleryid },
-        .findAll(doc.select("script").first()!!.html())
+        urlFromUrlFromHash(galleryID, info.files.first(), "webpbigtn", "webp", "tn"),
-        .map {
+        info.title,
-            it.value.toInt()
+        info.artists?.map { it.artist }.orEmpty(),
-        }.toList()
+        info.groups?.map { it.group }.orEmpty(),
-
+        info.type,
-    val langList = doc.select("#lang-list a").map {
+        info.language.orEmpty(),
-            Pair(it.text(), "$protocol//hitomi.la${it.attr("href")}")
+        info.parodys?.map { it.parody }.orEmpty(),
-        }
+        info.characters?.map { it.character }.orEmpty(),
-
+        info.tags?.map { "${if (it.female.isNullOrEmpty()) "" else "female:"}${if (it.male.isNullOrEmpty()) "" else "male:"}${it.tag}" }.orEmpty(),
-    val cover = protocol + doc.selectFirst(".cover img")!!.attr("src")
+        info.files.map { urlFromUrlFromHash(galleryID, it, "webpsmalltn", "webp", "tn") }
-    val title = doc.selectFirst(".gallery h1 a")!!.text()
+    )
    val artists = doc.select(".gallery h2 a").map { it.text() }
    val groups = doc.select(".gallery-info a[href~=^/group/]").map { it.text() }
    val type = doc.selectFirst(".gallery-info a[href~=^/type/]")!!.text()
    val language = run {
        val href = doc.select(".gallery-info a[href~=^/index.+\\.html\$]").attr("href")
        Regex("""index-([^-]+)(-.+)?\.html""").find(href)?.groupValues?.getOrNull(1) ?: ""
    }
    val series = doc.select(".gallery-info a[href~=^/series/]").map { it.text() }
    val characters = doc.select(".gallery-info a[href~=^/character/]").map { it.text() }
    val tags = doc.select(".gallery-info a[href~=^/tag/]").map {
        val href = URLDecoder.decode(it.attr("href"), "UTF-8")
        href.slice(5 until href.indexOf('-'))
    }
    val thumbnails = getGalleryInfo(galleryID).files.map { galleryInfo ->
        urlFromUrlFromHash(galleryID, galleryInfo, "smalltn", "jpg", "tn")
    }
    return Gallery(related, langList, cover, title, artists, groups, type, language, series, characters, tags, thumbnails)
 }
--- a/app/src/main/java/xyz/quaver/pupil/hitomi/galleryblock.kt
+++ b/app/src/main/java/xyz/quaver/pupil/hitomi/galleryblock.kt
@@ -18,14 +18,47 @@ package xyz.quaver.pupil.hitomi
 import kotlinx.serialization.Serializable
 import org.jsoup.Jsoup
 import xyz.quaver.pupil.webView
 import xyz.quaver.readText
 import java.net.URL
 import java.net.URLDecoder
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
 import java.util.*
 import javax.net.ssl.HttpsURLConnection
 import kotlin.io.readText
 //galleryblock.js
 fun fetchNozomi(area: String? = null, tag: String = "index", language: String = "all", start: Int = -1, count: Int = -1) : Pair<List<Int>, Int> {
    val url = when(area) {
        null -> "$protocol//$domain/$tag-$language$nozomiextension"
        else -> "$protocol//$domain/$area/$tag-$language$nozomiextension"
    }
    with(URL(url).openConnection() as HttpsURLConnection) {
        requestMethod = "GET"
        if (start != -1 && count != -1) {
            val startByte = start*4
            val endByte = (start+count)*4-1
            setRequestProperty("Range", "bytes=$startByte-$endByte")
        }
        connect()
        val totalItems = getHeaderField("Content-Range")
            .replace(Regex("^[Bb]ytes \\d+-\\d+/"), "").toInt() / 4
        val nozomi = ArrayList<Int>()
        val arrayBuffer = ByteBuffer
            .wrap(inputStream.readBytes())
            .order(ByteOrder.BIG_ENDIAN)
        while (arrayBuffer.hasRemaining())
            nozomi.add(arrayBuffer.int)
        return Pair(nozomi, totalItems)
    }
 }
@Serializable
 data class GalleryBlock(
@@ -37,43 +70,23 @@ data class GalleryBlock(
    val series: List<String>,
    val type: String,
    val language: String,
-    val relatedTags: List<String>
+    val relatedTags: List<String>,
    val groups: List<String> = emptyList()
 )
 suspend fun getGalleryBlock(galleryID: Int) : GalleryBlock {
-    val url = "$protocol//$domain/$galleryblockdir/$galleryID$extension"
+    val info = getGalleryInfo(galleryID)
-    val html: String = webView.evaluatePromise(
+    return GalleryBlock(
-        """
+        galleryID,
-        $.get('$url').always(function(data, status) {
+        "",
-            if (status === 'success') {
+        listOf(urlFromUrlFromHash(galleryID, info.files.first(), "webpbigtn", "webp", "tn")),
-                Callback.onResult(%uid, data);
+        info.title,
-            }
+        info.artists?.map { it.artist }.orEmpty(),
-        }); 
+        info.parodys?.map { it.parody }.orEmpty(),
-        """.trimIndent(),
+        info.type,
-        then = ""
+        info.language.orEmpty(),
        info.tags?.map { "${if (it.female.isNullOrEmpty()) "" else "female:"}${if (it.male.isNullOrEmpty()) "" else "male:"}${it.tag}" }.orEmpty(),
        info.groups?.map { it.group }.orEmpty()
    )
    val doc = Jsoup.parse(html)
    val galleryUrl = doc.selectFirst("h1 > a")!!.attr("href")
    val thumbnails = doc.select(".dj-img-cont img").map { protocol + it.attr("src") }
    val title = doc.selectFirst("h1 > a")!!.text()
    val artists = doc.select(".artist-list a").map{ it.text() }
    val series = doc.select(".dj-content a[href~=^/series/]").map { it.text() }
    val type = doc.selectFirst("a[href~=^/type/]")!!.text()
    val language = run {
        val href = doc.select("a[href~=^/index.+\\.html\$]").attr("href")
        Regex("""index-([^-]+)(-.+)?\.html""").find(href)?.groupValues?.getOrNull(1) ?: ""
    }
    val relatedTags = doc.select(".relatedtags a").map {
        val href = URLDecoder.decode(it.attr("href"), "UTF-8")
        href.slice(5 until href.indexOf("-all"))
    }
    return GalleryBlock(galleryID, galleryUrl, thumbnails, title, artists, series, type, language, relatedTags)
 }
--- a/app/src/main/java/xyz/quaver/pupil/hitomi/reader.kt
+++ b/app/src/main/java/xyz/quaver/pupil/hitomi/reader.kt
@@ -17,19 +17,8 @@
 package xyz.quaver.pupil.hitomi
 import kotlinx.serialization.Serializable
-
+import xyz.quaver.pupil.hitomi.GalleryInfo
-fun getReferer(galleryID: Int) = "https://hitomi.la/reader/$galleryID.html"
+import xyz.quaver.pupil.hitomi.getGalleryInfo
@Serializable
 data class GalleryInfo(
    val language_localname: String? = null,
    val language: String? = null,
    val date: String? = null,
    val files: List<GalleryFiles>,
    val id: Int? = null,
    val type: String? = null,
    val title: String? = null
 )
@Serializable
 data class GalleryFiles(
@@ -44,6 +33,6 @@ data class GalleryFiles(
 //Set header `Referer` to reader url to avoid 403 error
@Deprecated("", replaceWith = ReplaceWith("getGalleryInfo"))
-suspend fun getReader(galleryID: Int) : GalleryInfo {
+fun getReader(galleryID: Int) : GalleryInfo {
   return getGalleryInfo(galleryID)
 }
--- a/app/src/main/java/xyz/quaver/pupil/hitomi/results.kt
+++ b/app/src/main/java/xyz/quaver/pupil/hitomi/results.kt
@@ -16,8 +16,8 @@
 package xyz.quaver.pupil.hitomi
-import android.util.Log
+import kotlinx.coroutines.async
-import kotlinx.coroutines.*
+import kotlinx.coroutines.coroutineScope
 import java.util.*
 suspend fun doSearch(query: String, sortByPopularity: Boolean = false) : Set<Int> = coroutineScope {
--- a/app/src/main/java/xyz/quaver/pupil/hitomi/search.kt
+++ b/app/src/main/java/xyz/quaver/pupil/hitomi/search.kt
@@ -16,37 +16,313 @@
 package xyz.quaver.pupil.hitomi
-import kotlinx.serialization.ExperimentalSerializationApi
+import okhttp3.Request
-import kotlinx.serialization.Serializable
+import xyz.quaver.pupil.client
-import kotlinx.serialization.decodeFromString
+import java.net.URL
-import kotlinx.serialization.json.Json
+import java.nio.ByteBuffer
-import xyz.quaver.pupil.webView
+import java.nio.ByteOrder
 import java.security.MessageDigest
 import kotlin.math.min
 //searchlib.js
 const val separator = "-"
 const val extension = ".html"
 const val index_dir = "tagindex"
 const val galleries_index_dir = "galleriesindex"
 const val max_node_size = 464
 const val B = 16
 const val compressed_nozomi_prefix = "n"
-@OptIn(ExperimentalSerializationApi::class)
+val tag_index_version: String by lazy { getIndexVersion("tagindex") }
-suspend fun getGalleryIDsForQuery(query: String) : Set<Int> {
+val galleries_index_version: String by lazy { getIndexVersion("galleriesindex") }
    val result = webView.evaluatePromise("get_galleryids_for_query('$query')")
-    return Json.decodeFromString(result)
+fun sha256(data: ByteArray) : ByteArray {
    return MessageDigest.getInstance("SHA-256").digest(data)
 }
@OptIn(ExperimentalUnsignedTypes::class)
 fun hashTerm(term: String) : UByteArray {
    return sha256(term.toByteArray()).toUByteArray().sliceArray(0 until 4)
 }
 fun sanitize(input: String) : String {
    return input.replace(Regex("[/#]"), "")
 }
 fun getIndexVersion(name: String) =
        URL("$protocol//$domain/$name/version?_=${System.currentTimeMillis()}").readText()
 //search.js
 fun getGalleryIDsForQuery(query: String) : Set<Int> {
    query.replace("_", " ").let {
        if (it.indexOf(':') > -1) {
            val sides = it.split(":")
            val ns = sides[0]
            var tag = sides[1]
            var area : String? = ns
            var language = "all"
            when (ns) {
                "female", "male" -> {
                    area = "tag"
                    tag = it
                }
                "language" -> {
                    area = null
                    language = tag
                    tag = "index"
                }
            }
            return getGalleryIDsFromNozomi(area, tag, language)
        }
        val key = hashTerm(it)
        val field = "galleries"
        val node = getNodeAtAddress(field, 0) ?: return emptySet()
        val data = bSearch(field, key, node)
        if (data != null)
            return getGalleryIDsFromData(data)
        return emptySet()
    }
 }
 fun getSuggestionsForQuery(query: String) : List<Suggestion> {
    query.replace('_', ' ').let {
        var field = "global"
        var term = it
        if (term.indexOf(':') > -1) {
            val sides = it.split(':')
            field = sides[0]
            term = sides[1]
        }
        val key = hashTerm(term)
        val node = getNodeAtAddress(field, 0) ?: return emptyList()
        val data = bSearch(field, key, node)
        if (data != null)
            return getSuggestionsFromData(field, data)
        return emptyList()
    }
 }
@Serializable
 data class Suggestion(val s: String, val t: Int, val u: String, val n: String)
 fun getSuggestionsFromData(field: String, data: Pair<Long, Int>) : List<Suggestion> {
    val url = "$protocol//$domain/$index_dir/$field.$tag_index_version.data"
    val (offset, length) = data
    if (length > 10000 || length <= 0)
        throw Exception("length $length is too long")
-@OptIn(ExperimentalSerializationApi::class)
+    val inbuf = getURLAtRange(url, offset.until(offset+length))
 suspend fun getSuggestionsForQuery(query: String) : List<Suggestion> {
    val result = webView.evaluatePromise("get_suggestions_for_query('$query')")
-    return Json.decodeFromString<List<List<Suggestion>?>>(result)[0] ?: return emptyList()
+    val suggestions = ArrayList<Suggestion>()
    val buffer = ByteBuffer
        .wrap(inbuf)
        .order(ByteOrder.BIG_ENDIAN)
    val numberOfSuggestions = buffer.int
    if (numberOfSuggestions > 100 || numberOfSuggestions <= 0)
        throw Exception("number of suggestions $numberOfSuggestions is too long")
    for (i in 0.until(numberOfSuggestions)) {
        var top = buffer.int
        val ns = inbuf.sliceArray(buffer.position().until(buffer.position()+top)).toString(charset("UTF-8"))
        buffer.position(buffer.position()+top)
        top = buffer.int
        val tag = inbuf.sliceArray(buffer.position().until(buffer.position()+top)).toString(charset("UTF-8"))
        buffer.position(buffer.position()+top)
        val count = buffer.int
        val tagname = sanitize(tag)
        val u =
                when(ns) {
                    "female", "male" -> "/tag/$ns:$tagname${separator}1$extension"
                    "language" -> "/index-$tagname${separator}1$extension"
                    else -> "/$ns/$tagname${separator}all${separator}1$extension"
                }
        suggestions.add(Suggestion(tag, count, u, ns))
    }
    return suggestions
 }
-@OptIn(ExperimentalSerializationApi::class)
+fun getGalleryIDsFromNozomi(area: String?, tag: String, language: String) : Set<Int> {
-suspend fun getGalleryIDsFromNozomi(area: String?, tag: String, language: String) : Set<Int> {
+    val nozomiAddress =
-    val jsArea = if (area == null) "null" else "'$area'"
+            when(area) {
                null -> "$protocol//$domain/$compressed_nozomi_prefix/$tag-$language$nozomiextension"
                else -> "$protocol//$domain/$compressed_nozomi_prefix/$area/$tag-$language$nozomiextension"
            }
-    val json = webView.evaluatePromise("""get_galleryids_from_nozomi($jsArea, '$tag', '$language')""")
+    val bytes = try {
        URL(nozomiAddress).readBytes()
    } catch (e: Exception) {
        return emptySet()
    }
-    return Json.decodeFromString(json)
+    val nozomi = mutableSetOf<Int>()
    val arrayBuffer = ByteBuffer
        .wrap(bytes)
        .order(ByteOrder.BIG_ENDIAN)
    while (arrayBuffer.hasRemaining())
        nozomi.add(arrayBuffer.int)
    return nozomi
 }
 fun getGalleryIDsFromData(data: Pair<Long, Int>) : Set<Int> {
    val url = "$protocol//$domain/$galleries_index_dir/galleries.$galleries_index_version.data"
    val (offset, length) = data
    if (length > 100000000 || length <= 0)
        throw Exception("length $length is too long")
    val inbuf = getURLAtRange(url, offset.until(offset+length))
    val galleryIDs = mutableSetOf<Int>()
    val buffer = ByteBuffer
        .wrap(inbuf)
        .order(ByteOrder.BIG_ENDIAN)
    val numberOfGalleryIDs = buffer.int
    val expectedLength = numberOfGalleryIDs*4+4
    if (numberOfGalleryIDs > 10000000 || numberOfGalleryIDs <= 0)
        throw Exception("number_of_galleryids $numberOfGalleryIDs is too long")
    else if (inbuf.size != expectedLength)
        throw Exception("inbuf.byteLength ${inbuf.size} != expected_length $expectedLength")
    for (i in 0.until(numberOfGalleryIDs))
        galleryIDs.add(buffer.int)
    return galleryIDs
 }
 fun getNodeAtAddress(field: String, address: Long) : Node? {
    val url =
            when(field) {
                "galleries" -> "$protocol//$domain/$galleries_index_dir/galleries.$galleries_index_version.index"
                "languages" -> "$protocol//$domain/$galleries_index_dir/languages.$galleries_index_version.index"
                "nozomiurl" -> "$protocol//$domain/$galleries_index_dir/nozomiurl.$galleries_index_version.index"
                else -> "$protocol//$domain/$index_dir/$field.$tag_index_version.index"
            }
    val nodedata = getURLAtRange(url, address.until(address+ max_node_size))
    return decodeNode(nodedata)
 }
 fun getURLAtRange(url: String, range: LongRange) : ByteArray {
    val request = Request.Builder()
        .url(url)
        .header("Range", "bytes=${range.first}-${range.last}")
        .build()
    return client.newCall(request).execute().body()?.use { it.bytes() } ?: byteArrayOf()
 }
@OptIn(ExperimentalUnsignedTypes::class)
 data class Node(val keys: List<UByteArray>, val datas: List<Pair<Long, Int>>, val subNodeAddresses: List<Long>)
@OptIn(ExperimentalUnsignedTypes::class)
 fun decodeNode(data: ByteArray) : Node {
    val buffer = ByteBuffer
        .wrap(data)
        .order(ByteOrder.BIG_ENDIAN)
    val uData = data.toUByteArray()
    val numberOfKeys = buffer.int
    val keys = ArrayList<UByteArray>()
    for (i in 0.until(numberOfKeys)) {
        val keySize = buffer.int
        if (keySize == 0 || keySize > 32)
            throw Exception("fatal: !keySize || keySize > 32")
        keys.add(uData.sliceArray(buffer.position().until(buffer.position()+keySize)))
        buffer.position(buffer.position()+keySize)
    }
    val numberOfDatas = buffer.int
    val datas = ArrayList<Pair<Long, Int>>()
    for (i in 0.until(numberOfDatas)) {
        val offset = buffer.long
        val length = buffer.int
        datas.add(Pair(offset, length))
    }
    val numberOfSubNodeAddresses = B +1
    val subNodeAddresses = ArrayList<Long>()
    for (i in 0.until(numberOfSubNodeAddresses)) {
        val subNodeAddress = buffer.long
        subNodeAddresses.add(subNodeAddress)
    }
    return Node(keys, datas, subNodeAddresses)
 }
@OptIn(ExperimentalUnsignedTypes::class)
 fun bSearch(field: String, key: UByteArray, node: Node) : Pair<Long, Int>? {
    fun compareArrayBuffers(dv1: UByteArray, dv2: UByteArray) : Int {
        val top = min(dv1.size, dv2.size)
        for (i in 0.until(top)) {
            if (dv1[i] < dv2[i])
                return -1
            else if (dv1[i] > dv2[i])
                return 1
        }
        return 0
    }
    fun locateKey(key: UByteArray, node: Node) : Pair<Boolean, Int> {
        for (i in node.keys.indices) {
            val cmpResult = compareArrayBuffers(key, node.keys[i])
            if (cmpResult <= 0)
                return Pair(cmpResult==0, i)
        }
        return Pair(false, node.keys.size)
    }
    fun isLeaf(node: Node) : Boolean {
        for (subnode in node.subNodeAddresses)
            if (subnode != 0L)
                return false
        return true
    }
    if (node.keys.isEmpty())
        return null
    val (there, where) = locateKey(key, node)
    if (there)
        return node.datas[where]
    else if (isLeaf(node))
        return null
    val nextNode = getNodeAtAddress(field, node.subNodeAddresses[where]) ?: return null
    return bSearch(field, key, nextNode)
 }
--- a/app/src/main/java/xyz/quaver/pupil/receiver/UpdateBroadcastReceiver.kt
+++ b/app/src/main/java/xyz/quaver/pupil/receiver/UpdateBroadcastReceiver.kt
@@ -60,8 +60,10 @@ class UpdateBroadcastReceiver : BroadcastReceiver() {
                            when (uri.scheme) {
                                "file" ->
-                                    FileProvider.getUriForFile(context, context.applicationContext.packageName + ".provider", File(uri.path!!)
+                                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
-                                    )
+                                        FileProvider.getUriForFile(context, context.applicationContext.packageName + ".provider", File(uri.path!!))
                                    else
                                        uri
                                "content" -> uri
                                else -> null
                            }
@@ -74,7 +76,7 @@ class UpdateBroadcastReceiver : BroadcastReceiver() {
                val notificationManager = NotificationManagerCompat.from(context)
-                val pendingIntent = PendingIntent.getActivity(context, 0, Intent(Intent.ACTION_VIEW).apply {
+                val pendingIntent = PendingIntent.getActivity(context, System.currentTimeMillis().toInt(), Intent(Intent.ACTION_VIEW).apply {
                    flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NEW_TASK
                    setDataAndType(uri, MimeTypeMap.getSingleton().getMimeTypeFromExtension("apk"))
                }, if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_IMMUTABLE else 0)
--- a/app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt
+++ b/app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt
@@ -29,7 +29,6 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.TaskStackBuilder
 import androidx.core.content.ContextCompat
 import com.google.common.util.concurrent.RateLimiter
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -166,24 +165,19 @@ class DownloadService : Service() {
        }
    }
    private val rateLimiter = RateLimiter.create(2.0)
    private val rateLimitHost = Regex("..?\\.hitomi.la")
    private val interceptor: PupilInterceptor = { chain ->
        val request = chain.request()
        if (rateLimitHost.matches(request.url().host()))
            rateLimiter.acquire()
        var response = chain.proceed(request)
        var limit = 5
-        if (!response.isSuccessful && limit > 0) {
+        while (!response.isSuccessful) {
-            Thread.sleep(10000)
+            if (response.code() == 503) {
-            if (rateLimitHost.matches(request.url().host()))
+                Thread.sleep(200)
-                rateLimiter.acquire()
+            } else if (--limit > 0)
                break
            response = chain.proceed(request)
            limit -= 1
        }
        response.newBuilder()
@@ -224,30 +218,28 @@ class DownloadService : Service() {
            val (galleryID, index, startId) = call.request().tag() as Tag
            val ext = call.request().url().encodedPath().split('.').last()
-            kotlin.runCatching {
+            CoroutineScope(Dispatchers.IO).launch {
-                val image = response.also { if (it.code() != 200) throw IOException("$galleryID $index ${response.request().url()} CODE ${it.code()}") }.body()?.use { it.bytes() } ?: throw Exception("Response null")
+                runCatching {
-                val padding = ceil(progress[galleryID]?.size?.let { log10(it.toFloat()) } ?: 0F).toInt()
+                    val image = response.also { if (it.code() != 200) throw IOException( "$galleryID $index ${response.request().url()} CODE ${it.code()}" ) }.body()?.use { it.bytes() } ?: throw Exception("Response null")
                    val padding = ceil(progress[galleryID]?.size?.let { log10(it.toFloat()) } ?: 0F).toInt()
-                CoroutineScope(Dispatchers.IO).launch {
+                    Cache.getInstance(this@DownloadService, galleryID)
-                    kotlin.runCatching {
+                        .putImage(index, "${index.toString().padStart(padding, '0')}.$ext", image)
                        Cache.getInstance(this@DownloadService, galleryID).putImage(index, "${index.toString().padStart(padding, '0')}.$ext", image)
                    }.onSuccess {
                        progress[galleryID]?.set(index, Float.POSITIVE_INFINITY)
                        notify(galleryID)
-                        if (isCompleted(galleryID)) {
+                    progress[galleryID]?.set(index, Float.POSITIVE_INFINITY)
-                            if (DownloadManager.getInstance(this@DownloadService)
+                    notify(galleryID)
                                    .getDownloadFolder(galleryID) != null)
                                Cache.getInstance(this@DownloadService, galleryID).moveToDownload()
-                            startId?.let { stopSelf(it) }
+                    if (isCompleted(galleryID)) {
-                        }
+                        if (DownloadManager.getInstance(this@DownloadService)
-                    }.onFailure {
+                                .getDownloadFolder(galleryID) != null
-                        FirebaseCrashlytics.getInstance().recordException(it)
+                        )
                            Cache.getInstance(this@DownloadService, galleryID).moveToDownload()
                        startId?.let { stopSelf(it) }
                    }
                }.onFailure {
                    FirebaseCrashlytics.getInstance().recordException(it)
                }
            }.onFailure {
                FirebaseCrashlytics.getInstance().recordException(it)
            }
        }
    }
@@ -332,8 +324,7 @@ class DownloadService : Service() {
        }
        if (isCompleted(galleryID)) {
-            if (DownloadManager.getInstance(this@DownloadService)
+            if (DownloadManager.getInstance(this@DownloadService).getDownloadFolder(galleryID) != null)
                    .getDownloadFolder(galleryID) != null )
                Cache.getInstance(this@DownloadService, galleryID).moveToDownload()
            notificationManager.cancel(galleryID)
--- a/app/src/main/java/xyz/quaver/pupil/types/SendLogException.kt
+++ b/app/src/main/java/xyz/quaver/pupil/types/SendLogException.kt
@@ -0,0 +1,22 @@
 /*
 *     Pupil, Hitomi.la viewer for Android
 *     Copyright (C) 2022  tom5079
 *
 *     This program 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.
 *
 *     This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package xyz.quaver.pupil.types
 class SendLogException : Exception()
 class JavascriptException(message: String?) : Exception(message)
--- a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
@@ -25,7 +25,6 @@ import android.os.Build
 import android.os.Bundle
 import android.text.InputType
 import android.text.util.Linkify
 import android.util.Log
 import android.view.KeyEvent
 import android.view.MenuItem
 import android.view.View
@@ -45,12 +44,12 @@ import xyz.quaver.floatingsearchview.FloatingSearchView
 import xyz.quaver.floatingsearchview.suggestions.model.SearchSuggestion
 import xyz.quaver.floatingsearchview.util.view.MenuView
 import xyz.quaver.floatingsearchview.util.view.SearchInputView
 import xyz.quaver.pupil.hitomi.doSearch
 import xyz.quaver.pupil.hitomi.getGalleryIDsFromNozomi
 import xyz.quaver.pupil.hitomi.getSuggestionsForQuery
 import xyz.quaver.pupil.*
 import xyz.quaver.pupil.adapters.GalleryBlockAdapter
 import xyz.quaver.pupil.databinding.MainActivityBinding
 import xyz.quaver.pupil.hitomi.doSearch
 import xyz.quaver.pupil.hitomi.getGalleryIDsFromNozomi
 import xyz.quaver.pupil.hitomi.getSuggestionsForQuery
 import xyz.quaver.pupil.services.DownloadService
 import xyz.quaver.pupil.types.*
 import xyz.quaver.pupil.ui.dialog.DownloadLocationDialogFragment
@@ -64,7 +63,10 @@ import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.downloader.DownloadManager
 import xyz.quaver.pupil.util.restore
 import java.util.regex.Pattern
-import kotlin.math.*
+import kotlin.math.ceil
 import kotlin.math.max
 import kotlin.math.min
 import kotlin.math.roundToInt
 class MainActivity :
    BaseActivity(),
@@ -116,7 +118,7 @@ class MainActivity :
                    onFailure = {
                        Snackbar.make(binding.contents.recyclerview, R.string.settings_backup_failed, Snackbar.LENGTH_LONG).show()
                    }, onSuccess = {
-                        Snackbar.make(binding.contents.recyclerview, getString(R.string.settings_restore_success, it.size), Snackbar.LENGTH_LONG).show()
+                        Snackbar.make(binding.contents.recyclerview, getString(R.string.settings_restore_success, it), Snackbar.LENGTH_LONG).show()
                    }
                )
            }
@@ -125,9 +127,7 @@ class MainActivity :
        if (Preferences["download_folder", ""].isEmpty())
            DownloadLocationDialogFragment().show(supportFragmentManager, "Download Location Dialog")
-
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && !Preferences["download_folder_ignore_warning", false] &&
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R &&
            !Preferences["download_folder_ignore_warning", false] &&
            ContextCompat.getExternalFilesDirs(this, null).filterNotNull().map { Uri.fromFile(it).toString() }
                .contains(Preferences["download_folder", ""])
        ) {
--- a/app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadFolderNameDialogFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadFolderNameDialogFragment.kt
@@ -24,7 +24,9 @@ import android.view.ViewGroup
 import androidx.core.widget.addTextChangedListener
 import androidx.fragment.app.DialogFragment
 import com.google.android.material.snackbar.Snackbar
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.databinding.DownloadFolderNameDialogBinding
 import xyz.quaver.pupil.util.Preferences
@@ -56,15 +58,16 @@ class DownloadFolderNameDialogFragment : DialogFragment() {
    private fun initView() {
        val galleryID = Cache.instances.let { if (it.size == 0) 1199708 else it.keys.elementAt((0 until it.size).random()) }
-        val galleryBlock = runBlocking {
+        CoroutineScope(Dispatchers.IO).launch {
-            Cache.getInstance(requireContext(), galleryID).getGalleryBlock()
+            val galleryBlock = Cache.getInstance(requireContext(), galleryID).getGalleryBlock()
            binding.message.text = getString(R.string.settings_download_folder_name_message, formatMap.keys.toString(), galleryBlock?.formatDownloadFolder() ?: "")
            binding.edittext.addTextChangedListener {
                binding.message.text = requireContext().getString(R.string.settings_download_folder_name_message, formatMap.keys.toString(), galleryBlock?.formatDownloadFolderTest(it.toString()) ?: "")
            }
        }
        binding.message.text = getString(R.string.settings_download_folder_name_message, formatMap.keys.toString(), galleryBlock?.formatDownloadFolder() ?: "")
        binding.edittext.setText(Preferences["download_folder_name", "[-id-] -title-"])
        binding.edittext.addTextChangedListener {
            binding.message.text = requireContext().getString(R.string.settings_download_folder_name_message, formatMap.keys.toString(), galleryBlock?.formatDownloadFolderTest(it.toString()) ?: "")
        }
        binding.okButton.setOnClickListener {
            val newValue = binding.edittext.text.toString()
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageFavoritesFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageFavoritesFragment.kt
@@ -19,21 +19,30 @@
 package xyz.quaver.pupil.ui.fragment
 import android.content.Intent
 import android.content.res.Resources
 import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
 import android.os.Bundle
 import android.widget.EditText
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.DrawableCompat
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.buildJsonObject
 import okhttp3.*
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.client
 import xyz.quaver.pupil.favorites
 import xyz.quaver.pupil.util.restore
 import java.io.File
 import java.io.IOException
 import kotlin.math.roundToInt
 class ManageFavoritesFragment : PreferenceFragmentCompat() {
@@ -47,21 +56,62 @@ class ManageFavoritesFragment : PreferenceFragmentCompat() {
        val context = context ?: return
        findPreference<Preference>("backup")?.setOnPreferenceClickListener {
            val iconSize = (24 * Resources.getSystem().displayMetrics.density).roundToInt()
            val strokeWidth = (3 * Resources.getSystem().displayMetrics.density)
            val icon = object: CircularProgressDrawable(context) {
                override fun getIntrinsicHeight(): Int {
                    return iconSize
                }
                override fun getIntrinsicWidth(): Int {
                    return iconSize
                }
            }
            icon.strokeWidth = strokeWidth
            icon.colorFilter = PorterDuffColorFilter(ContextCompat.getColor(context, R.color.colorAccent), PorterDuff.Mode.SRC_IN)
            DrawableCompat.setTint(icon, ContextCompat.getColor(context, R.color.colorAccent))
            icon.start()
            it.icon = icon
            val favorites = runCatching {
                Json.parseToJsonElement(File(ContextCompat.getDataDir(context), "favorites.json").readText())
            }.getOrNull()
            val favoriteTags = kotlin.runCatching {
                Json.parseToJsonElement(File(ContextCompat.getDataDir(context), "favorites_tags.json").readText())
            }.getOrNull()
            val request = Request.Builder()
                .url(context.getString(R.string.backup_url))
                .post(
                    FormBody.Builder()
-                        .add("f:1", File(ContextCompat.getDataDir(context), "favorites.json").readText())
+                        .add("f:1", buildJsonObject {
                            favorites?.let {
                                put("favorites", it)
                            }
                            favoriteTags?.let {
                                put("favorite_tags", it)
                            }
                        }.toString())
                        .build()
                ).build()
            client.newCall(request).enqueue(object: Callback {
                override fun onFailure(call: Call, e: IOException) {
                    val view = view ?: return
                    MainScope().launch {
                        it.icon = null
                    }
                    Snackbar.make(view, R.string.settings_backup_failed, Snackbar.LENGTH_LONG).show()
                }
                override fun onResponse(call: Call, response: Response) {
                    MainScope().launch {
                        it.icon = null
                    }
                    if (response.code() != 200) {
                        response.close()
                        return
@@ -93,7 +143,7 @@ class ManageFavoritesFragment : PreferenceFragmentCompat() {
                            Snackbar.make(view, R.string.settings_restore_failed, Snackbar.LENGTH_LONG).show()
                        }, onSuccess = onSuccess@{
                            val view = view ?: return@onSuccess
-                            Snackbar.make(view, context.getString(R.string.settings_restore_success, it.size), Snackbar.LENGTH_LONG).show()
+                            Snackbar.make(view, context.getString(R.string.settings_restore_success, it), Snackbar.LENGTH_LONG).show()
                        })
                }.setNegativeButton(android.R.string.cancel) { _, _ ->
                    // Do Nothing
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageStorageFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageStorageFragment.kt
@@ -18,22 +18,38 @@
 package xyz.quaver.pupil.ui.fragment
 import android.graphics.ColorFilter
 import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
 import android.os.Bundle
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import xyz.quaver.io.FileX
 import xyz.quaver.io.SAFileX
 import xyz.quaver.io.util.deleteRecursively
 import xyz.quaver.io.util.getChild
 import xyz.quaver.io.util.readText
 import xyz.quaver.io.util.writeText
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.histories
 import xyz.quaver.pupil.hitomi.json
 import xyz.quaver.pupil.util.byteToString
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.downloader.DownloadManager
 import xyz.quaver.pupil.util.downloader.Metadata
 import java.io.File
 import kotlin.math.roundToInt
 class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenceClickListener {
@@ -45,12 +61,10 @@ class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenc
        initPreferences()
    }
-    override fun onPreferenceClick(preference: Preference?): Boolean {
+    override fun onPreferenceClick(preference: Preference): Boolean {
        val context = context ?: return false
        with(preference) {
            this ?: return false
            when (key) {
                "delete_cache" -> {
                    val dir = File(context.cacheDir, "imageCache")
@@ -80,6 +94,46 @@ class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenc
                        setNegativeButton(android.R.string.cancel) { _, _ -> }
                    }.show()
                }
                "recover_downloads" -> {
                    val density = context.resources.displayMetrics.density
                    this.icon = object: CircularProgressDrawable(context) {
                        override fun getIntrinsicHeight() = (24*density).roundToInt()
                        override fun getIntrinsicWidth() = (24*density).roundToInt()
                    }.apply {
                        setStyle(CircularProgressDrawable.DEFAULT)
                        colorFilter = PorterDuffColorFilter(ContextCompat.getColor(context, R.color.colorAccent), PorterDuff.Mode.SRC_IN)
                        start()
                    }
                    val downloadManager = DownloadManager.getInstance(context)
                    val downloadFolderMap = downloadManager.downloadFolderMap
                    downloadFolderMap.clear()
                    downloadManager.downloadFolder.listFiles { file -> file.isDirectory }?.forEach { folder ->
                        val metadataFile = FileX(context, folder, ".metadata")
                        if (!metadataFile.exists()) return@forEach
                        val metadata = metadataFile.readText()?.let {
                            json.decodeFromString<Metadata>(it)
                        } ?: return@forEach
                        val galleryID = metadata.galleryBlock?.id ?: metadata.galleryInfo?.id?.toIntOrNull() ?: return@forEach
                        downloadFolderMap[galleryID] = folder.name
                    }
                    downloadManager.downloadFolderMap.putAll(downloadFolderMap)
                    val downloads = FileX(context, downloadManager.downloadFolder, ".download")
                    if (!downloads.exists()) downloads.createNewFile()
                    downloads.writeText(Json.encodeToString(downloadFolderMap))
                    this.icon = null
                    Toast.makeText(context, android.R.string.ok, Toast.LENGTH_SHORT).show()
                }
                "delete_downloads" -> {
                    val dir = DownloadManager.getInstance(context).downloadFolder
@@ -191,6 +245,12 @@ class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenc
            onPreferenceClickListener = this@ManageStorageFragment
        }
        with(findPreference<Preference>("recover_downloads")) {
            this ?: return@with
            onPreferenceClickListener = this@ManageStorageFragment
        }
    }
    override fun onDestroy() {
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt
@@ -26,6 +26,7 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.preference.*
 import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -36,6 +37,7 @@ import xyz.quaver.pupil.R
 import xyz.quaver.pupil.client
 import xyz.quaver.pupil.clientBuilder
 import xyz.quaver.pupil.clientHolder
 import xyz.quaver.pupil.types.SendLogException
 import xyz.quaver.pupil.ui.LockActivity
 import xyz.quaver.pupil.ui.SettingsActivity
 import xyz.quaver.pupil.ui.dialog.*
@@ -78,10 +80,8 @@ class SettingsFragment :
        }
    }
-    override fun onPreferenceClick(preference: Preference?): Boolean {
+    override fun onPreferenceClick(preference: Preference): Boolean {
        with (preference) {
            this ?: return false
            when (key) {
                "app_version" -> {
                    checkUpdate(activity as SettingsActivity, true)
@@ -107,6 +107,7 @@ class SettingsFragment :
                    ProxyDialogFragment().show(parentFragmentManager, "Proxy Dialog")
                }
                "user_id" -> {
                    FirebaseCrashlytics.getInstance().recordException(SendLogException())
                    (context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(
                        ClipData.newPlainText("user_id", Preferences.get<String>("user_id"))
                    )
@@ -119,10 +120,8 @@ class SettingsFragment :
        return true
    }
-    override fun onPreferenceChange(preference: Preference?, newValue: Any?): Boolean {
+    override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean {
        with (preference) {
            this ?: return false
            when (key) {
                "tag_translation" -> {
                    updateTranslations()
@@ -160,7 +159,7 @@ class SettingsFragment :
            when (key) {
                "proxy" -> {
-                    summary = context?.let { getProxyInfo().type.name }
+                    summary = context.let { getProxyInfo().type.name }
                }
                "download_folder" -> {
                    summary = FileX(context, Preferences.get<String>("download_folder")).canonicalPath
@@ -297,7 +296,7 @@ class SettingsFragment :
                        }
                        "oss" -> {
                            setOnPreferenceClickListener {
-                                context?.startActivity(Intent(context, OssLicensesMenuActivity::class.java))
+                                context.startActivity(Intent(context, OssLicensesMenuActivity::class.java))
                                true
                            }
                        }
--- a/app/src/main/java/xyz/quaver/pupil/util/downloader/Cache.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/downloader/Cache.kt
@@ -21,13 +21,9 @@ package xyz.quaver.pupil.util.downloader
 import android.content.Context
 import android.content.ContextWrapper
 import android.net.Uri
-import android.util.Log
+import kotlinx.coroutines.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
@@ -36,35 +32,42 @@ import okhttp3.Request
 import xyz.quaver.io.FileX
 import xyz.quaver.io.util.*
 import xyz.quaver.pupil.client
-import xyz.quaver.pupil.hitomi.GalleryBlock
+import xyz.quaver.pupil.hitomi.*
 import xyz.quaver.pupil.hitomi.GalleryInfo
 import xyz.quaver.pupil.hitomi.getGalleryBlock
 import xyz.quaver.pupil.hitomi.getGalleryInfo
 import xyz.quaver.pupil.userAgent
 import java.io.File
 import java.io.IOException
 import java.util.concurrent.ConcurrentHashMap
@Serializable
-data class OldGalleryBlock(
+data class OldReader(
    val code: String,
-    val id: Int,
+    val galleryInfo: OldGalleryInfo
    val galleryUrl: String,
    val thumbnails: List<String>,
    val title: String,
    val artists: List<String>,
    val series: List<String>,
    val type: String,
    val language: String,
    val relatedTags: List<String>
 )
@Serializable
-data class OldReader(val code: String, val galleryInfo: GalleryInfo)
+data class OldGalleryInfo(
    val language_localname: String? = null,
    val language: String? = null,
    val date: String? = null,
    val files: List<OldGalleryFiles>,
    val id: Int? = null,
    val type: String? = null,
    val title: String? = null
 )
@Serializable
 data class OldGalleryFiles(
    val width: Int,
    val hash: String,
    val haswebp: Int = 0,
    val name: String,
    val height: Int,
    val hasavif: Int = 0,
    val hasavifsmalltn: Int? = 0
 )
@Serializable
 data class OldMetadata(
-    var galleryBlock: OldGalleryBlock? = null,
+    var galleryBlock: GalleryBlock? = null,
    var reader: OldReader? = null,
    var imageList: MutableList<String?>? = null
 ) {
@@ -77,17 +80,29 @@ data class Metadata(
    var galleryInfo: GalleryInfo? = null,
    var imageList: MutableList<String?>? = null
 ) {
-    constructor(old: OldMetadata) : this(old.galleryBlock?.let { galleryBlock -> GalleryBlock(
+    constructor(old: OldMetadata) : this(
-        galleryBlock.id,
+        old.galleryBlock,
-        galleryBlock.galleryUrl,
+        old.reader?.galleryInfo?.let { oldGalleryInfo ->
-        galleryBlock.thumbnails,
+            GalleryInfo(
-        galleryBlock.title,
+                oldGalleryInfo.id.toString(),
-        galleryBlock.artists,
+                oldGalleryInfo.title ?: "",
-        galleryBlock.series,
+                null,
-        galleryBlock.type,
+                oldGalleryInfo.language,
-        galleryBlock.language,
+                oldGalleryInfo.type ?: "",
-        galleryBlock.relatedTags) },
+                oldGalleryInfo.date ?: "",
-        old.reader?.galleryInfo,
+                files = oldGalleryInfo.files.map {
                    GalleryFiles(
                        it.width,
                        it.hash,
                        it.haswebp,
                        it.name,
                        it.height,
                        it.hasavif,
                        it.hasavifsmalltn
                    )
                }
            )
        },
        old.imageList
    )
@@ -95,7 +110,6 @@ data class Metadata(
 }
 class Cache private constructor(context: Context, val galleryID: Int) : ContextWrapper(context) {
    companion object {
        val instances = ConcurrentHashMap<Int, Cache>()
@@ -120,10 +134,10 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
            kotlin.runCatching {
                Json.decodeFromString<Metadata>(metadata)
            }.getOrElse {
-                Metadata(Json.decodeFromString<OldMetadata>(metadata))
+                Metadata(json.decodeFromString<OldMetadata>(metadata))
            }
        }
-    }.getOrNull() ?: Metadata()
+    }.onFailure { it.printStackTrace() }.getOrNull() ?: Metadata()
    val downloadFolder: FileX?
        get() = DownloadManager.getInstance(this).getDownloadFolder(galleryID)
@@ -210,11 +224,12 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
        metadata.imageList?.getOrNull(index)?.let { findFile(it) }
    @Suppress("BlockingMethodInNonBlockingContext")
-    fun putImage(index: Int, fileName: String, data: ByteArray) {
+    suspend fun putImage(index: Int, fileName: String, data: ByteArray) = coroutineScope {
        val file = cacheFolder.getChild(fileName)
        if (!file.exists())
            file.createNewFile()
        file.writeBytes(data)
        setMetadata { metadata -> metadata.imageList!![index] = fileName }
    }
--- a/app/src/main/java/xyz/quaver/pupil/util/downloader/DownloadManager.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/downloader/DownloadManager.kt
@@ -20,8 +20,9 @@ package xyz.quaver.pupil.util.downloader
 import android.content.Context
 import android.content.ContextWrapper
-import android.util.Log
+import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
@@ -47,14 +48,12 @@ class DownloadManager private constructor(context: Context) : ContextWrapper(con
    val defaultDownloadFolder = FileX(this, getExternalFilesDir(null)!!)
    val downloadFolder: FileX
-        get() = {
+        get() = kotlin.runCatching {
-            kotlin.runCatching {
+            FileX(this, Preferences.get<String>("download_folder"))
-                FileX(this, Preferences.get<String>("download_folder"))
+        }.getOrElse {
-            }.getOrElse {
+            Preferences["download_folder"] = defaultDownloadFolder.uri.toString()
-                Preferences["download_folder"] = defaultDownloadFolder.uri.toString()
+            defaultDownloadFolder
-                defaultDownloadFolder
+        }
            }
        }.invoke()
    private var prevDownloadFolder: FileX? = null
    private var downloadFolderMapInstance: MutableMap<Int, String>? = null
@@ -63,21 +62,19 @@ class DownloadManager private constructor(context: Context) : ContextWrapper(con
        get() {
            if (prevDownloadFolder != downloadFolder) {
                prevDownloadFolder = downloadFolder
-                downloadFolderMapInstance = {
+                downloadFolderMapInstance = run {
                    val file = downloadFolder.getChild(".download")
                    val data = if (file.exists())
                        kotlin.runCatching {
-                            file.readText()?.let { Json.decodeFromString<MutableMap<Int, String>>(it) }
+                            file.readText()?.let{ Json.decodeFromString<MutableMap<Int, String>>(it) }
                        }.onFailure { file.delete() }.getOrNull()
                    else
                        null
-
+                    data ?: run {
                    data ?: {
                        file.createNewFile()
-                        mutableMapOf<Int, String>()
+                        mutableMapOf()
-                    }.invoke()
+                    }
-                }.invoke()
+                }
            }
            return downloadFolderMapInstance ?: mutableMapOf()
@@ -86,7 +83,7 @@ class DownloadManager private constructor(context: Context) : ContextWrapper(con
    @Synchronized
    fun isDownloading(galleryID: Int): Boolean {
-        val isThisGallery: (Call) -> Boolean = { (it.request().tag() as? DownloadService.Tag)?.galleryID == galleryID }
+        val isThisGallery: (Call) -> Boolean = { !it.isCanceled && (it.request().tag() as? DownloadService.Tag)?.galleryID == galleryID }
        return downloadFolderMap.containsKey(galleryID)
                && client.dispatcher().let { it.queuedCalls().any(isThisGallery) || it.runningCalls().any(isThisGallery) }
@@ -96,23 +93,19 @@ class DownloadManager private constructor(context: Context) : ContextWrapper(con
    fun getDownloadFolder(galleryID: Int): FileX? =
        downloadFolderMap[galleryID]?.let { downloadFolder.getChild(it) }
-    @Synchronized
+    fun addDownloadFolder(galleryID: Int) = CoroutineScope(Dispatchers.IO).launch {
-    fun addDownloadFolder(galleryID: Int) {
+        val name = Cache.getInstance(this@DownloadManager, galleryID).getGalleryBlock()
-        val name = runBlocking {
+            ?.formatDownloadFolder() ?: return@launch
            Cache.getInstance(this@DownloadManager, galleryID).getGalleryBlock()
        }?.formatDownloadFolder() ?: return
        val folder = downloadFolder.getChild(name)
-        if (folder.exists())
+        downloadFolderMap[galleryID] = name
            return
        folder.mkdir()
        downloadFolderMap[galleryID] = folder.name
        downloadFolder.getChild(".download").let { if (!it.exists()) it.createNewFile() }
        downloadFolder.getChild(".download").writeText(Json.encodeToString(downloadFolderMap))
        if (folder.exists()) return@launch
        folder.mkdir()
    }
    @Synchronized
--- a/app/src/main/java/xyz/quaver/pupil/util/misc.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/misc.kt
@@ -25,7 +25,6 @@ import okhttp3.OkHttpClient
 import okhttp3.Request
 import xyz.quaver.pupil.hitomi.GalleryBlock
 import xyz.quaver.pupil.hitomi.GalleryInfo
 import xyz.quaver.pupil.hitomi.getReferer
 import xyz.quaver.pupil.hitomi.imageUrlFromImage
 import java.util.*
 import kotlin.collections.ArrayList
@@ -78,7 +77,8 @@ fun OkHttpClient.Builder.proxyInfo(proxyInfo: ProxyInfo) = this.apply {
 val formatMap = mapOf<String, GalleryBlock.() -> (String)>(
    "-id-" to { id.toString() },
    "-title-" to { title },
-    "-artist-" to { artists.joinToString() }
+    "-artist-" to { if (artists.isNotEmpty()) artists.joinToString() else "N/A" },
    "-group-" to { if (groups.isNotEmpty()) groups.joinToString() else "N/A" }
    // TODO
 )
 /**
@@ -99,14 +99,12 @@ fun GalleryBlock.formatDownloadFolderTest(format: String): String =
    }.replace(Regex("""[*\\|"?><:/]"""), "").ellipsize(127)
 suspend fun GalleryInfo.getRequestBuilders(): List<Request.Builder> {
-    val galleryID = this.id ?: 0
+    val galleryID = this.id.toIntOrNull() ?: 0
    val lowQuality = Preferences["low_quality", true]
    return this.files.map {
        Request.Builder()
            .url(
                runCatching {
-                    imageUrlFromImage(galleryID, it, !lowQuality)
+                    imageUrlFromImage(galleryID, it, false)
                }
                .onFailure {
                    FirebaseCrashlytics.getInstance().recordException(it)
@@ -114,7 +112,6 @@ suspend fun GalleryInfo.getRequestBuilders(): List<Request.Builder> {
                .getOrDefault("https://a/")
            )
            .header("Referer", "https://hitomi.la/")
            .header("User-Agent", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.45 Safari/537.36")
    }
 }
--- a/app/src/main/java/xyz/quaver/pupil/util/update.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/update.kt
@@ -27,17 +27,14 @@ import androidx.preference.PreferenceManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.*
 import okhttp3.Call
 import okhttp3.Callback
 import okhttp3.Request
 import okhttp3.Response
 import ru.noties.markwon.Markwon
-import xyz.quaver.pupil.BuildConfig
+import xyz.quaver.pupil.*
-import xyz.quaver.pupil.R
+import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.client
 import xyz.quaver.pupil.favorites
 import java.io.File
 import java.io.IOException
 import java.net.URL
@@ -162,7 +159,7 @@ fun checkUpdate(context: Context, force: Boolean = false) {
            setNegativeButton(if (force) android.R.string.cancel else R.string.ignore) { _, _ ->
                if (!force)
                    preferences.edit()
-                        .putLong("ignore_update_until", System.currentTimeMillis() + 604800000)
+                        .putLong("ignore_update_until", System.currentTimeMillis() + 86400000)
                        .apply()
            }
        }
@@ -173,7 +170,7 @@ fun checkUpdate(context: Context, force: Boolean = false) {
    }
 }
-fun restore(url: String, onFailure: ((Throwable) -> Unit)? = null, onSuccess: ((List<Int>) -> Unit)? = null) {
+fun restore(url: String, onFailure: ((Throwable) -> Unit)? = null, onSuccess: ((Int) -> Unit)? = null) {
    if (!URLUtil.isValidUrl(url)) {
        onFailure?.invoke(IllegalArgumentException())
        return
@@ -191,9 +188,20 @@ fun restore(url: String, onFailure: ((Throwable) -> Unit)? = null, onSuccess: ((
        override fun onResponse(call: Call, response: Response) {
            kotlin.runCatching {
-                Json.decodeFromString<List<Int>>(response.also { if (it.code() != 200) throw IOException() }.body().use { it?.string() } ?: "[]").let {
+                val data = Json.parseToJsonElement(response.also { if (it.code() != 200) throw IOException() }.body().use { it?.string() } ?: "[]")
-                    favorites.addAll(it)
+
-                    onSuccess?.invoke(it)
+                when (data) {
                    is JsonArray -> favorites.addAll(data.map { it.jsonPrimitive.int })
                    is JsonObject -> {
                        val newFavorites = data["favorites"]?.let { Json.decodeFromJsonElement<List<Int>>(it) }.orEmpty()
                        val newFavoriteTags = data["favorite_tags"]?.let { Json.decodeFromJsonElement<List<Tag>>(it) }.orEmpty()
                        favorites.addAll(newFavorites)
                        favoriteTags.addAll(newFavoriteTags)
                        onSuccess?.invoke(favorites.size + favoriteTags.size)
                    }
                    else -> error("data is neither JsonArray or JsonObject")
                }
            }.onFailure { onFailure?.invoke(it) }
        }
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -157,4 +157,5 @@
    <string name="settings_max_concurrent_download">並列ダウンロード</string>
    <string name="unaccessible_download_folder">アンドロイド11以上では外部からのアプリ内部空間接近が不可能です。ダウンロードフォルダを変更しますか？</string>
    <string name="settings_networking">ネットワーク</string>
    <string name="settings_recover_downloads">ダウンロードデータベースを再構築</string>
 </resources>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -157,4 +157,5 @@
    <string name="settings_max_concurrent_download">병렬 다운로드</string>
    <string name="unaccessible_download_folder">안드로이드 11 이상에서는 외부에서 현재 다운로드 폴더에 접근할 수 없습니다. 변경하시겠습니까?</string>
    <string name="settings_networking">네트워크</string>
    <string name="settings_recover_downloads">다운로드 데이터베이스 복구</string>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -150,6 +150,7 @@
    <string name="settings_storage_usage_loading">Calculating storage usage…</string>
    <string name="settings_clear_cache">Clear cache</string>
    <string name="settings_clear_cache_alert_message">Deleting cache can affect image loading speed. Do you want to continue?</string>
    <string name="settings_recover_downloads">Reconstruct download database</string>
    <string name="settings_clear_downloads">Clear downloads</string>
    <string name="settings_clear_downloads_alert_message">Delete all downloaded galleries.\nDo you want to continue?</string>
    <string name="settings_clear_history">Clear history</string>
--- a/app/src/main/res/xml/manage_storage_preferences.xml
+++ b/app/src/main/res/xml/manage_storage_preferences.xml
@@ -27,6 +27,11 @@
        app:key="delete_downloads"
        app:title="@string/settings_clear_downloads"/>
    <Preference
        app:key="recover_downloads"
        app:title="@string/settings_recover_downloads"
        app:iconSpaceReserved="true"/>
    <Preference
        app:key="clear_history"
        app:title="@string/settings_clear_history"/>
--- a/app/src/main/res/xml/network_security_config.xml
+++ b/app/src/main/res/xml/network_security_config.xml
@@ -18,6 +18,9 @@
  -->
 <network-security-config>
    <domain-config cleartextTrafficPermitted="true">
        <domain includeSubdomains="false">10.0.2.2</domain>
    </domain-config>
    <domain-config cleartextTrafficPermitted="true">
        <domain includeSubdomains="false">ix.io</domain>
    </domain-config>
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -56,12 +56,6 @@
            app:key="nomedia"
            app:title="@string/settings_nomedia_title"/>
        <SwitchPreferenceCompat
            app:key="low_quality"
            app:title="@string/settings_low_quality"
            app:summary="@string/settings_low_quality_summary"
            app:defaultValue="true"/>
    </PreferenceCategory>
    <PreferenceCategory
--- a/app/src/test/java/xyz/quaver/pupil/ExampleUnitTest.kt
+++ b/app/src/test/java/xyz/quaver/pupil/ExampleUnitTest.kt
@@ -26,15 +26,8 @@ package xyz.quaver.pupil
 * See [testing documentation](http://d.android.com/tools/testing).
 */
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 import xyz.quaver.pupil.hitomi.getGalleryInfo
 import xyz.quaver.pupil.hitomi.imageUrlFromImage
 import java.lang.reflect.ParameterizedType
 import java.util.concurrent.TimeUnit
 class ExampleUnitTest {
    @Test
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath 'com.android.tools.build:gradle:7.1.3'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
        classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
@@ -14,8 +14,8 @@ buildscript {
        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files
        classpath "com.google.firebase:firebase-crashlytics-gradle:2.8.1"
-        classpath "com.google.firebase:perf-plugin:1.4.0"
+        classpath "com.google.firebase:perf-plugin:1.4.1"
-        classpath "com.google.android.gms:oss-licenses-plugin:0.10.4"
+        classpath "com.google.android.gms:oss-licenses-plugin:0.10.5"
    }
 }
@@ -26,6 +26,7 @@ allprojects {
        jcenter()
        maven { url "https://jitpack.io" }
        maven { url "https://guardian.github.io/maven/repo-releases/" }
        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
    }
 }
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
--- a/0
+++ b/0
Author	SHA1	Message	Date
tom5079	d663092363	v5.3.5	2022-04-24 18:27:56 +09:00
tom5079	edf6188e36	Merge pull request #126 from tom5079/Pupil-116 Pupil 116 Favorite tag backup	2022-04-24 18:08:13 +09:00
tom5079	f3f3395e68	Merge pull request #128 from tom5079/Pupil-127 Pupil-127 Use gg.js directly	2022-04-24 18:08:04 +09:00
tom5079	ac9dc347e3	Pupil-127 Use gg.js directly	2022-04-22 16:39:13 +09:00
tom5079	8721d85946	Show ProgressDrawable when backup	2022-04-21 17:41:06 +09:00
tom5079	a0bd1a8738	Pupil-116 Add favorite tags backup	2022-04-21 17:26:58 +09:00
tom5079	35fdf3e3b0	Update PreferenceFragments to comply with updated library	2022-04-21 16:49:13 +09:00
tom5079	aced8293f1	Dependency Update	2022-04-21 16:45:13 +09:00
tom5079	3f516faad8	AGP update	2022-04-21 16:42:34 +09:00
tom5079	824f7b9602	Merge remote-tracking branch 'origin/master'	2022-04-16 06:30:31 +09:00
tom5079	95aeeaa16f	updated .gitignore	2022-04-16 06:30:10 +09:00
tom5079	63f08f0230	Fixed Downloaded folder gets deleted when opened with no network	2022-03-25 16:48:38 +09:00
tom5079	3b241fe857	Delete watchdiff.yml	2022-02-02 06:38:50 +09:00
tom5079	75bc104f43	Update watchdiff.yml	2022-02-02 05:57:55 +09:00
tom5079	30afd56324	Update README.md	2022-02-01 19:11:55 +09:00
tom5079	5ee1bb11a0	Merge remote-tracking branch 'origin/master'	2022-02-01 19:11:25 +09:00
tom5079	c1de45abce	use webp by default	2022-02-01 19:10:54 +09:00
tom5079	8805033c8d	Update README.md	2022-02-01 17:47:46 +09:00
tom5079	0ed59bb8a9	Merge remote-tracking branch 'origin/master'	2022-02-01 17:46:44 +09:00
tom5079	8163f2fd28	Bug fix	2022-02-01 17:46:35 +09:00
tom5079	521a65c9d2	Update README.md	2022-02-01 17:37:50 +09:00
tom5079	eb98424668	Bug fix	2022-02-01 17:36:44 +09:00
tom5079	961c731743	Merge remote-tracking branch 'origin/master'	2022-02-01 11:45:54 +09:00
tom5079	5188769fb6	Fuck hitomi	2022-02-01 11:45:45 +09:00
tom5079	8f27d9e30f	Update README.md	2022-02-01 11:45:35 +09:00
tom5079	b58566999e	Update README.md	2022-02-01 11:40:23 +09:00
tom5079	117d6dcd2b	Fuck hitomi	2022-02-01 11:39:26 +09:00
tom5079	2608796929	Remove dumb code	2022-01-31 13:28:31 +09:00
tom5079	792f5b5a7f	Fixed downloading after revisiting cached manga	2022-01-31 13:27:23 +09:00
tom5079	a77b1db749	Merge remote-tracking branch 'origin/master'	2022-01-31 13:18:28 +09:00
tom5079	9d984d92af	Fixed downloading after revisiting cached manga	2022-01-31 13:17:44 +09:00
tom5079	e303f25991	Update README.md	2022-01-31 11:10:02 +09:00
tom5079	85973d2305	Merge remote-tracking branch 'origin/master'	2022-01-31 11:05:05 +09:00
tom5079	13f8d7b747	Added download database recovery	2022-01-31 11:04:52 +09:00
tom5079	e198860edb	Update README.md	2022-01-31 07:39:58 +09:00
tom5079	fc8355467b	Fixed autoupdate for Android 5 and 6	2022-01-31 01:46:22 +09:00
tom5079	67abc15442	Merge remote-tracking branch 'origin/master'	2022-01-31 01:03:26 +09:00
tom5079	e94cddb86a	Hitomi is stupid enough to block user agent for chrome... holy shit Added self-test and reload Reduced update ignoring time to 1d from 1w	2022-01-31 01:02:47 +09:00
tom5079	700f7a33a5	Update README.md	2022-01-25 05:00:04 +09:00
tom5079	41e952144d	Merge remote-tracking branch 'origin/master'	2022-01-25 04:59:37 +09:00
tom5079	910ed65937	Improve startup speed	2022-01-25 04:59:25 +09:00
tom5079	e06701a2fb	Update README.md	2022-01-25 04:30:24 +09:00
tom5079	62dce26c73	Merge remote-tracking branch 'origin/master'	2022-01-25 04:28:16 +09:00
tom5079	ac0cff62d4	Ask user to update WebView when es2020 is not supported	2022-01-25 04:28:04 +09:00
tom5079	655c060814	Drop Guava from dependency	2022-01-22 10:00:28 +09:00
tom5079	36d27895e7	Update README.md	2022-01-21 17:11:03 +09:00
tom5079	803481f74c	Merge remote-tracking branch 'origin/master'	2022-01-21 17:08:57 +09:00
tom5079	b3ca1686e3	5.2.19 Improved error report Lenient JSON decoding	2022-01-21 17:08:49 +09:00
tom5079	8f220eb0cb	Update README.md	2022-01-20 19:42:41 +09:00
tom5079	51d5f42e8b	Merge remote-tracking branch 'origin/master'	2022-01-20 19:41:22 +09:00
tom5079	8d8c5ace61	Fixed {}	2022-01-20 19:41:10 +09:00
tom5079	4bb6b8ccc9	Update README.md	2022-01-20 18:06:28 +09:00
tom5079	6bebd36e83	Merge remote-tracking branch 'origin/master'	2022-01-20 18:05:27 +09:00
tom5079	edc7053e50	Optimize Firebase	2022-01-20 18:05:18 +09:00
tom5079	55e6ef5f78	Update README.md	2022-01-20 16:06:26 +09:00
tom5079	9781d7a5dc	Merge remote-tracking branch 'origin/master'	2022-01-20 16:05:31 +09:00
tom5079	b83cf87cd8	Updated proguard-rules.pro	2022-01-20 16:05:22 +09:00
tom5079	430864512d	Update README.md	2022-01-20 15:58:17 +09:00
tom5079	16eeef1878	Merge remote-tracking branch 'origin/master'	2022-01-20 15:57:54 +09:00
tom5079	994d4b589b	5.2.15 Fixed thumbnail not loading	2022-01-20 15:57:43 +09:00
tom5079	43adba6f13	Update README.md	2022-01-18 18:26:14 +09:00
tom5079	e4fbd21731	Update README.md	2022-01-17 00:46:20 +09:00
tom5079	8be64745fc	Fix thumbnail	2022-01-17 00:45:20 +09:00
tom5079	b66f376729	Merge remote-tracking branch 'origin/master'	2022-01-17 00:45:13 +09:00
tom5079	cc40416e1e	Improved loading speed Fixed images not loading	2022-01-17 00:35:15 +09:00
tom5079	5073352366	Update README.md	2022-01-16 11:29:36 +09:00
tom5079	9ae12a2c4c	Merge remote-tracking branch 'origin/master'	2022-01-16 11:29:21 +09:00
tom5079	843b8412a9	5.2.13 Fixed thumbnails not loading	2022-01-16 11:29:06 +09:00
tom5079	4f67578371	Update README.md	2022-01-11 17:16:20 +09:00
tom5079	37f2227093	Merge remote-tracking branch 'origin/master'	2022-01-11 17:12:10 +09:00
tom5079	1833c0bde5	5.1.12 Improved suggestion loading speed / Fixed images not loading	2022-01-11 17:11:59 +09:00
tom5079	aa3aeca3f2	Update README.md	2022-01-11 12:25:43 +09:00
tom5079	152d4e248f	Removed runBlocking from codebase	2022-01-11 12:21:43 +09:00