Bug fix

Merge remote-tracking branch 'origin/master'
Fuck hitomi
2022-02-01 17:36:44 +09:00 · 2022-02-01 11:45:54 +09:00 · 2022-02-01 11:45:45 +09:00 · 2022-02-01 11:45:35 +09:00 · 2022-02-01 11:40:23 +09:00 · 2022-02-01 11:39:26 +09:00
44 changed files with 1516 additions and 367 deletions
--- a/.github/workflows/watchdiff.yml
+++ b/.github/workflows/watchdiff.yml
@@ -0,0 +1,23 @@
+# 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/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="11" />
  </component>
 </project>
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -7,11 +7,11 @@
        <deviceKey>
          <Key>
            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="$USER_HOME$/.android/avd/Pixel_3a_API_30_x86.avd" />
+            <value value="$USER_HOME$/.android/avd/Pixel_2_API_31.avd" />
          </Key>
        </deviceKey>
      </Target>
    </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2021-10-25T00:27:52.904947Z" />
+    <timeTargetWasSelectedWithDropDown value="2022-02-01T08:00:57.223690Z" />
  </component>
 </project>
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,6 +7,8 @@
        <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$" />
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -81,5 +81,20 @@
      <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>
+    <remote-repository>
+      <option name="id" value="maven3" />
+      <option name="name" value="maven3" />
+      <option name="url" value="https://maven.mozilla.org/maven2/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven3" />
+      <option name="name" value="maven3" />
+      <option name="url" value="https://oss.sonatype.org/content/repositories/snapshots/" />
+    </remote-repository>
  </component>
 </project>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="../../../../layout/custom_preview.xml" value="0.2564814814814815" />
+        <entry key="app/src/main/res/layout/reader_activity.xml" value="0.14351851851851852" />
+        <entry key="app/src/main/res/xml/lock_preferences.xml" value="0.5119791666666667" />
+        <entry key="app/src/main/res/xml/manage_storage_preferences.xml" value="0.2604166666666667" />
+        <entry key="app/src/main/res/xml/root_preferences.xml" value="0.5119791666666667" />
+      </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">
--- 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.1.13/Pupil-v5.1.13.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.1.13/Pupil-v5.1.13.apk)  
+[![](https://img.shields.io/github/downloads/tom5079/Pupil/5.3.1/Pupil-v5.3.1.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.3.1/Pupil-v5.3.1.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 30
+    compileSdkVersion 31
    defaultConfig {
        applicationId "xyz.quaver.pupil"
        minSdkVersion 16
-        targetSdkVersion 30
-        versionCode 67
-        versionName "5.1.14"
+        targetSdkVersion 31
+        versionCode 69
+        versionName "5.3.2"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        vectorDrawables.useSupportLibrary = true
    }
@@ -67,42 +67,42 @@ 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
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        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.4.3"
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2"
    
-    implementation "androidx.appcompat:appcompat:1.3.0"
-    implementation "androidx.activity:activity-ktx:1.3.0-beta01"
-    implementation "androidx.fragment:fragment-ktx:1.3.4"
+    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.preference:preference-ktx:1.1.1"
    implementation "androidx.recyclerview:recyclerview:1.2.1"
-    implementation "androidx.constraintlayout:constraintlayout:2.0.4"
+    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.6.0-beta01"
+    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.3.0"
+    implementation "com.google.android.material:material:1.5.0"

-    implementation platform('com.google.firebase:firebase-bom:26.5.0')
+    implementation platform('com.google.firebase:firebase-bom:29.0.3')
    implementation "com.google.firebase:firebase-analytics-ktx"
    implementation "com.google.firebase:firebase-crashlytics-ktx"
    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.1.7"
+    implementation "com.google.android.gms:play-services-mlkit-face-detection:17.0.0"

    implementation "com.github.clans:fab:1.6.4"

@@ -111,6 +111,7 @@ dependencies {
    implementation 'com.github.piasy:BigImageViewer:1.8.1'
    implementation 'com.github.piasy:FrescoImageLoader:1.8.1'
    implementation 'com.github.piasy:FrescoImageViewFactory:1.8.1'
+    implementation 'com.facebook.fresco:imagepipeline-okhttp3:2.6.0'

    //noinspection GradleDependency
    implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
@@ -125,13 +126,19 @@ dependencies {

    implementation "ru.noties.markwon:core:3.1.0"

-    implementation "xyz.quaver:libpupil:2.1.7-DEV"
-    implementation "xyz.quaver:documentfilex:0.6.1"
+    implementation "org.jsoup:jsoup:1.14.3"
+
+    implementation ("app.cash.zipline:zipline:1.0.0-SNAPSHOT") {
+        exclude group: "com.squareup.okio", module: "okio"
+    }
+
+    implementation "xyz.quaver:documentfilex:0.7.2"
    implementation "xyz.quaver:floatingsearchview:1.1.7"

-    testImplementation "junit:junit:4.13.1"
-    androidTestImplementation "androidx.test.ext:junit:1.1.2"
-    androidTestImplementation "androidx.test:rules:1.3.0"
-    androidTestImplementation "androidx.test:runner:1.3.0"
-    androidTestImplementation "androidx.test.espresso:espresso-core:3.3.0"
+    testImplementation "junit:junit:4.13.2"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0"
+    androidTestImplementation "androidx.test.ext:junit:1.1.3"
+    androidTestImplementation "androidx.test:rules:1.4.0"
+    androidTestImplementation "androidx.test:runner:1.4.0"
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
 }
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -32,4 +32,6 @@
    kotlinx.serialization.KSerializer serializer(...);
 }
 -keep class xyz.quaver.pupil.ui.fragment.ManageFavoritesFragment
-keep class xyz.quaver.pupil.ui.fragment.ManageStorageFragment
+-keep class xyz.quaver.pupil.ui.fragment.ManageStorageFragment
+-keep class xyz.quaver.pupil.** { *; }
+-keep class app.cash.zipline.** { *; }
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -1,5 +1,5 @@
 {
-  "version": 2,
+  "version": 3,
  "artifactType": {
    "type": "APK",
    "kind": "Directory"
@@ -10,9 +10,11 @@
    {
      "type": "SINGLE",
      "filters": [],
-      "versionCode": 67,
-      "versionName": "5.1.14",
+      "attributes": [],
+      "versionCode": 69,
+      "versionName": "5.3.2",
      "outputFile": "app-release.apk"
    }
-  ]
+  ],
+  "elementType": "File"
 }
--- a/app/src/androidTest/java/xyz/quaver/pupil/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/xyz/quaver/pupil/ExampleInstrumentedTest.kt
@@ -20,10 +20,18 @@

 package xyz.quaver.pupil

+import android.util.Log
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
+import kotlinx.coroutines.runBlocking
+import okhttp3.OkHttpClient
+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.
@@ -32,10 +40,142 @@ import org.junit.runner.RunWith
 */
@RunWith(AndroidJUnit4::class)
 class ExampleInstrumentedTest {
+//    @Before
+//    fun init() {
+//        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+//    }
+
+    @Before
+    fun init() {
+        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()
+
+                chain.proceed(request)
+            }
+    }

    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+    fun test_empty() {
+        print(
+            "".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", nozomi.size.toString())
+    }
+
+    @Test
+    fun test_search() {
+        val ids = getGalleryIDsForQuery("language:korean").reversed()
+
+        print(ids.size)
+    }
+
+    @Test
+    fun test_suggestions() {
+        val suggestions = getSuggestionsForQuery("language:g")
+
+        print(suggestions)
+    }
+
+    @Test
+    fun test_doSearch() {
+        val r = runBlocking {
+            doSearch("language:korean")
+        }
+
+        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() {
+        val info = getGalleryInfo(1469394)
+
+        print(info)
+    }
+
+    @Test
+    fun test_getReader() {
+        val reader = getGalleryInfo(1722144)
+
+        print(reader)
+    }
+
+    @Test
+    fun test_getImages() {
+        val galleryID = 2099306
+
+        val images = getGalleryInfo(galleryID).files.map {
+            imageUrlFromImage(galleryID, it,false)
+        }
+
+        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-sdk-23 android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="23"/>
+    <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"/>
@@ -59,7 +59,8 @@
        <activity
            android:name=".ui.ReaderActivity"
            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:parentActivityName=".ui.MainActivity">
+            android:parentActivityName=".ui.MainActivity"
+            android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />

@@ -223,7 +224,8 @@
        <activity
            android:name=".ui.MainActivity"
            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:theme="@style/NoActionBarAppTheme">
+            android:theme="@style/NoActionBarAppTheme"
+            android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <action android:name="android.intent.action.VIEW" />
--- a/app/src/main/java/xyz/quaver/pupil/Pupil.kt
+++ b/app/src/main/java/xyz/quaver/pupil/Pupil.kt
@@ -30,22 +30,27 @@ import android.util.Log
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.ContextCompat
 import androidx.preference.PreferenceManager
+import app.cash.zipline.QuickJs
+import com.facebook.imagepipeline.backends.okhttp3.OkHttpImagePipelineConfigFactory
 import com.github.piasy.biv.BigImageViewer
 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 okhttp3.Dispatcher
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 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 xyz.quaver.pupil.util.downloader.DownloadManager
-import xyz.quaver.setClient
 import java.io.File
+import java.net.URL
 import java.util.*
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
@@ -70,12 +75,48 @@ var clientHolder: OkHttpClient? = null
 val client: OkHttpClient
    get() = clientHolder ?: clientBuilder.build().also {
        clientHolder = it
-        setClient(it)
    }

+private var version = ""
+var runtimeReady = false
+    private set
+lateinit var runtime: QuickJs
+    private set
+
 class Pupil : Application() {
+    companion object {
+        lateinit var instance: Pupil
+            private set
+    }
+
+    init {
+        CoroutineScope(Dispatchers.IO).launch {
+            withContext(evaluationContext) {
+                runtime = QuickJs.create()
+            }
+            while (true) {
+                kotlin.runCatching {
+                    val newVersion = URL("https://tom5079.github.io/PupilSources/hitomi.html.ver").readText()
+
+                    if (version != newVersion) {
+                        runtimeReady = false
+                        version = newVersion
+                        evaluationContext.cancelChildren()
+                        withContext(evaluationContext) {
+                            runtime.evaluate(URL("https://tom5079.github.io/PupilSources/assets/js/gg.js").readText())
+                            runtimeReady = true
+                        }
+                    }
+                }
+
+                delay(10000)
+            }
+        }
+    }

    override fun onCreate() {
+        instance = this
+
        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)

        preferences = PreferenceManager.getDefaultSharedPreferences(this)
@@ -85,6 +126,7 @@ class Pupil : Application() {
            else userID
        }

+        FirebaseApp.initializeApp(this)
        FirebaseCrashlytics.getInstance().setUserId(userID)

        val proxyInfo = getProxyInfo()
@@ -94,7 +136,11 @@ class Pupil : Application() {
            .readTimeout(0, TimeUnit.SECONDS)
            .proxyInfo(proxyInfo)
            .addInterceptor { chain ->
-                val request = chain.request()
+                val request = chain.request().newBuilder()
+                    .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()
+
                val tag = request.tag() ?: return@addInterceptor chain.proceed(request)

                interceptors[tag::class]?.invoke(chain) ?: chain.proceed(request)
@@ -107,7 +153,7 @@ class Pupil : Application() {

        try {
            Preferences.get<String>("download_folder").also {
-                if (it.startsWith("content") && Build.VERSION.SDK_INT > 19)
+                if (it.startsWith("content://"))
                    contentResolver.takePersistableUriPermission(
                        Uri.parse(it),
                        Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
@@ -146,7 +192,14 @@ class Pupil : Application() {
            e.printStackTrace()
        }

-        BigImageViewer.initialize(FrescoImageLoader.with(this))
+        BigImageViewer.initialize(
+            FrescoImageLoader.with(
+                this,
+                OkHttpImagePipelineConfigFactory
+                    .newBuilder(this, client)
+                    .build()
+            )
+        )

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
            val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
--- a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
@@ -35,14 +35,13 @@ import com.daimajia.swipe.adapters.RecyclerSwipeAdapter
 import com.daimajia.swipe.interfaces.SwipeAdapterInterface
 import com.github.piasy.biv.loader.ImageLoader
 import kotlinx.coroutines.*
-import xyz.quaver.hitomi.getGallery
-import xyz.quaver.hitomi.getGalleryInfo
-import xyz.quaver.hitomi.getReader
 import xyz.quaver.io.util.getChild
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.databinding.GalleryblockItemBinding
 import xyz.quaver.pupil.favoriteTags
 import xyz.quaver.pupil.favorites
+import xyz.quaver.pupil.hitomi.getGallery
+import xyz.quaver.pupil.hitomi.getGalleryInfo
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.ui.view.ProgressCard
 import xyz.quaver.pupil.util.Preferences
@@ -105,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 {
-                    getGalleryInfo(galleryBlock.id).files.size
-                }.getOrNull() ?: return@launch
-                withContext(Dispatchers.Main) {
-                    binding.galleryblockPagecount.text = itemView.context.getString(R.string.galleryblock_pagecount, pageCount)
-                }
-            }
+                val galleryBlock = cache.getGalleryBlock() ?: return@launch

-            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)
+                launch(Dispatchers.Main) {
+                    val resources = itemView.context.resources
+                    val languages = resources.getStringArray(R.array.languages).map {
+                        it.split("|").let { split ->
+                            Pair(split[0], split[1])
                        }
-                        else -> {
-                            favorites.add(galleryBlock.id)
+                    }.toMap()

-                            setImageDrawable(AnimatedVectorDrawableCompat.create(context, R.drawable.avd_star).apply {
-                                this ?: return@apply
+                    val artists = galleryBlock.artists
+                    val series = galleryBlock.series

-                                registerAnimationCallback(object: Animatable2Compat.AnimationCallback() {
-                                    override fun onAnimationEnd(drawable: Drawable?) {
-                                        setImageResource(R.drawable.ic_star_filled)
-                                    }
-                                })
-                                start()
-                            })
+                    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.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/adapters/ReaderAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
@@ -40,9 +40,9 @@ import com.github.piasy.biv.view.BigImageView
 import com.github.piasy.biv.view.ImageShownCallback
 import com.github.piasy.biv.view.ImageViewFactory
 import kotlinx.coroutines.*
-import xyz.quaver.hitomi.GalleryInfo
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.databinding.ReaderItemBinding
+import xyz.quaver.pupil.hitomi.GalleryInfo
 import xyz.quaver.pupil.ui.ReaderActivity
 import xyz.quaver.pupil.util.downloader.Cache
 import java.io.File
--- a/app/src/main/java/xyz/quaver/pupil/hitomi/common.kt
+++ b/app/src/main/java/xyz/quaver/pupil/hitomi/common.kt
@@ -0,0 +1,211 @@
+/*
+ *    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.pupil.hitomi
+
+import kotlinx.coroutines.*
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
+import okhttp3.Request
+import xyz.quaver.pupil.client
+import xyz.quaver.pupil.runtime
+import xyz.quaver.pupil.runtimeReady
+import java.io.IOException
+import java.net.URL
+import java.util.concurrent.Executors
+
+const val protocol = "https:"
+
+@Serializable
+data class Artist(
+    val artist: String,
+    val url: String
+)
+
+@Serializable
+data class Group(
+    val group: String,
+    val url: String
+)
+
+@Serializable
+data class Parody(
+    val parody: String,
+    val url: String
+)
+
+@Serializable
+data class Character(
+    val character: String,
+    val url: String
+)
+
+@Serializable
+data class Tag(
+    val tag: String,
+    val url: String,
+    val female: String? = null,
+    val male: String? = null
+)
+
+@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
+}
+
+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("CODE ${it.code()}") }.body()?.use { it.string() } ?: throw IOException()
+}
+
+fun URL.readBytes(settings: HeaderSetter? = null): ByteArray {
+    val request = Request.Builder()
+        .url(this).let {
+            settings?.invoke(it) ?: it
+        }.build()
+
+    return client.newCall(request).execute().also { if (it.code() != 200) throw IOException("CODE ${it.code()}") }.body()?.use { it.bytes() } ?: throw IOException()
+}
+
+@Suppress("EXPERIMENTAL_API_USAGE")
+fun getGalleryInfo(galleryID: Int) =
+    json.decodeFromString<GalleryInfo>(
+        URL("$protocol//$domain/galleries/$galleryID.js").readText()
+            .replace("var galleryinfo = ", "")
+    )
+
+//common.js
+const val domain = "ltn.hitomi.la"
+const val galleryblockextension = ".html"
+const val galleryblockdir = "galleryblock"
+const val nozomiextension = ".nozomi"
+
+val evaluationContext = Executors.newSingleThreadExecutor().asCoroutineDispatcher() + Job()
+
+object gg {
+
+    suspend fun m(g: Int): Int = withContext(evaluationContext) {
+        while (!runtimeReady) delay(1000)
+        runtime.evaluate("gg.m($g)").toString().toInt()
+    }
+    suspend fun b(): String = withContext(evaluationContext) {
+        while (!runtimeReady) delay(1000)
+        runtime.evaluate("gg.b").toString()
+    }
+
+    suspend fun s(h: String): String = withContext(evaluationContext) {
+        while (!runtimeReady) delay(1000)
+        runtime.evaluate("gg.s('$h')").toString()
+    }
+}
+
+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 {
+        noWebp ->
+            urlFromUrlFromHash(galleryID, image)
+//        image.hasavif != 0 ->
+//            urlFromUrlFromHash(galleryID, image, "avif", null, "a")
+        image.haswebp != 0 ->
+            urlFromUrlFromHash(galleryID, image, "webp", null, "a")
+        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
@@ -0,0 +1,54 @@
+/*
+ *    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.pupil.hitomi
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Gallery(
+    val related: List<Int>,
+    val langList: List<Pair<String, String>>,
+    val cover: String,
+    val title: String,
+    val artists: List<String>,
+    val groups: List<String>,
+    val type: String,
+    val language: String,
+    val series: List<String>,
+    val characters: List<String>,
+    val tags: List<String>,
+    val thumbnails: List<String>
+)
+
+suspend fun getGallery(galleryID: Int) : Gallery {
+    val info = getGalleryInfo(galleryID)
+
+    return Gallery(
+        info.related,
+        info.languages.map { it.name to it.galleryid },
+        urlFromUrlFromHash(galleryID, info.files.first(), "webpbigtn", "webp", "tn"),
+        info.title,
+        info.artists?.map { it.artist }.orEmpty(),
+        info.groups?.map { it.group }.orEmpty(),
+        info.type,
+        info.language.orEmpty(),
+        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(),
+        info.files.map { urlFromUrlFromHash(galleryID, it, "webpsmalltn", "webp", "tn") }
+    )
+}
--- a/app/src/main/java/xyz/quaver/pupil/hitomi/galleryblock.kt
+++ b/app/src/main/java/xyz/quaver/pupil/hitomi/galleryblock.kt
@@ -0,0 +1,92 @@
+/*
+ *    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.pupil.hitomi
+
+import kotlinx.serialization.Serializable
+import org.jsoup.Jsoup
+import java.net.URL
+import java.net.URLDecoder
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+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(
+    val id: Int,
+    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>,
+    val groups: List<String> = emptyList()
+)
+
+suspend fun getGalleryBlock(galleryID: Int) : GalleryBlock {
+    val info = getGalleryInfo(galleryID)
+
+    return GalleryBlock(
+        galleryID,
+        "",
+        listOf(urlFromUrlFromHash(galleryID, info.files.first(), "webpbigtn", "webp", "tn")),
+        info.title,
+        info.artists?.map { it.artist }.orEmpty(),
+        info.parodys?.map { it.parody }.orEmpty(),
+        info.type,
+        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()
+    )
+}
--- a/app/src/main/java/xyz/quaver/pupil/hitomi/reader.kt
+++ b/app/src/main/java/xyz/quaver/pupil/hitomi/reader.kt
@@ -0,0 +1,38 @@
+/*
+ *    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.pupil.hitomi
+
+import kotlinx.serialization.Serializable
+import xyz.quaver.pupil.hitomi.GalleryInfo
+import xyz.quaver.pupil.hitomi.getGalleryInfo
+
+@Serializable
+data class GalleryFiles(
+    val width: Int,
+    val hash: String,
+    val haswebp: Int = 0,
+    val name: String,
+    val height: Int,
+    val hasavif: Int = 0,
+    val hasavifsmalltn: Int? = 0
+)
+
+//Set header `Referer` to reader url to avoid 403 error
+@Deprecated("", replaceWith = ReplaceWith("getGalleryInfo"))
+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
@@ -0,0 +1,87 @@
+/*
+ *    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.pupil.hitomi
+
+import kotlinx.coroutines.async
+import kotlinx.coroutines.coroutineScope
+import java.util.*
+
+suspend fun doSearch(query: String, sortByPopularity: Boolean = false) : Set<Int> = coroutineScope {
+    val terms = query
+        .trim()
+        .replace(Regex("""^\?"""), "")
+        .lowercase()
+        .split(Regex("\\s+"))
+        .map {
+            it.replace('_', ' ')
+        }
+
+    val positiveTerms = LinkedList<String>()
+    val negativeTerms = LinkedList<String>()
+
+    for (term in terms) {
+        if (term.matches(Regex("^-.+")))
+            negativeTerms.push(term.replace(Regex("^-"), ""))
+        else if (term.isNotBlank())
+            positiveTerms.push(term)
+    }
+
+    val positiveResults = positiveTerms.map {
+        async {
+            runCatching {
+                getGalleryIDsForQuery(it)
+            }.getOrElse { emptySet() }
+        }
+    }
+
+    val negativeResults = negativeTerms.mapIndexed { index, it ->
+        async {
+            runCatching {
+                getGalleryIDsForQuery(it)
+            }.getOrElse { emptySet() }
+        }
+    }
+
+    val results = when {
+        sortByPopularity -> getGalleryIDsFromNozomi(null, "popular", "all")
+        positiveTerms.isEmpty() -> getGalleryIDsFromNozomi(null, "index", "all")
+        else -> emptySet()
+    }.toMutableSet()
+
+    fun filterPositive(newResults: Set<Int>) {
+        when {
+            results.isEmpty() -> results.addAll(newResults)
+            else -> results.retainAll(newResults)
+        }
+    }
+
+    fun filterNegative(newResults: Set<Int>) {
+        results.removeAll(newResults)
+    }
+
+    //positive results
+    positiveResults.forEach {
+        filterPositive(it.await())
+    }
+
+    //negative results
+    negativeResults.forEachIndexed { index, it ->
+        filterNegative(it.await())
+    }
+
+    results
+}
--- a/app/src/main/java/xyz/quaver/pupil/hitomi/search.kt
+++ b/app/src/main/java/xyz/quaver/pupil/hitomi/search.kt
@@ -0,0 +1,328 @@
+/*
+ *    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.pupil.hitomi
+
+import okhttp3.Request
+import xyz.quaver.pupil.client
+import java.net.URL
+import java.nio.ByteBuffer
+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"
+
+val tag_index_version: String by lazy { getIndexVersion("tagindex") }
+val galleries_index_version: String by lazy { getIndexVersion("galleriesindex") }
+
+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()
+    }
+}
+
+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")
+
+    val inbuf = getURLAtRange(url, offset.until(offset+length))
+
+    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
+}
+
+fun getGalleryIDsFromNozomi(area: String?, tag: String, language: String) : Set<Int> {
+    val nozomiAddress =
+            when(area) {
+                null -> "$protocol//$domain/$compressed_nozomi_prefix/$tag-$language$nozomiextension"
+                else -> "$protocol//$domain/$compressed_nozomi_prefix/$area/$tag-$language$nozomiextension"
+            }
+
+    val bytes = try {
+        URL(nozomiAddress).readBytes()
+    } catch (e: Exception) {
+        return emptySet()
+    }
+
+    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
@@ -24,6 +24,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
+import android.os.Build
 import android.webkit.MimeTypeMap
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
@@ -59,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
                            }
@@ -73,10 +76,10 @@ 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"))
-                }, 0)
+                }, if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_IMMUTABLE else 0)

                val notification = NotificationCompat.Builder(context, "update")
                    .setSmallIcon(android.R.drawable.stat_sys_download_done)
--- a/app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt
+++ b/app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt
@@ -23,10 +23,13 @@ import android.app.PendingIntent
 import android.app.Service
 import android.content.Context
 import android.content.Intent
+import android.os.Build
+import android.util.Log
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.TaskStackBuilder
 import androidx.core.content.ContextCompat
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -38,12 +41,9 @@ import okhttp3.ResponseBody
 import okio.*
 import xyz.quaver.pupil.*
 import xyz.quaver.pupil.ui.ReaderActivity
-import xyz.quaver.pupil.util.cleanCache
+import xyz.quaver.pupil.util.*
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.downloader.DownloadManager
-import xyz.quaver.pupil.util.ellipsize
-import xyz.quaver.pupil.util.normalizeID
-import xyz.quaver.pupil.util.requestBuilders
 import java.io.IOException
 import java.util.concurrent.ConcurrentHashMap
 import kotlin.math.ceil
@@ -74,7 +74,7 @@ class DownloadService : Service() {

        val pendingIntent = TaskStackBuilder.create(this).run {
            addNextIntentWithParentStack(intent)
-            getPendingIntent(galleryID, PendingIntent.FLAG_UPDATE_CURRENT)
+            getPendingIntent(galleryID, PendingIntent.FLAG_UPDATE_CURRENT or if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_MUTABLE else 0)
        }
        val action =
            NotificationCompat.Action.Builder(0, getText(android.R.string.cancel),
@@ -84,7 +84,7 @@ class DownloadService : Service() {
                    Intent(this, DownloadService::class.java)
                        .putExtra(KEY_COMMAND, COMMAND_CANCEL)
                        .putExtra(KEY_ID, galleryID),
-                    PendingIntent.FLAG_UPDATE_CURRENT),
+                    PendingIntent.FLAG_UPDATE_CURRENT or if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_MUTABLE else 0),
            ).build()

        notification[galleryID] = NotificationCompat.Builder(this, "download").apply {
@@ -167,12 +167,17 @@ class DownloadService : Service() {

    private val interceptor: PupilInterceptor = { chain ->
        val request = chain.request()
-        var response = chain.proceed(request)

-        var retry = 5
-        while (!response.isSuccessful && retry > 0) {
+        var response = chain.proceed(request)
+        var limit = 5
+
+        while (!response.isSuccessful) {
+            if (response.code() == 503) {
+                Thread.sleep(200)
+            } else if (--limit > 0)
+                break
+
            response = chain.proceed(request)
-            retry--
        }

        response.newBuilder()
@@ -202,14 +207,10 @@ class DownloadService : Service() {
    private val callback = object: Callback {

        override fun onFailure(call: Call, e: IOException) {
-            e.printStackTrace()
+            FirebaseCrashlytics.getInstance().recordException(e)

            if (e.message?.contains("cancel", true) == false) {
                val galleryID = (call.request().tag() as Tag).galleryID
-
-                // Retry
-                cancel(galleryID)
-                download(galleryID)
            }
        }

@@ -217,29 +218,27 @@ class DownloadService : Service() {
            val (galleryID, index, startId) = call.request().tag() as Tag
            val ext = call.request().url().encodedPath().split('.').last()

-            kotlin.runCatching {
-                val image = response.also { if (it.code() != 200) throw IOException() }.body()?.use { it.bytes() } ?: throw Exception()
-                val padding = ceil(progress[galleryID]?.size?.let { log10(it.toFloat()) } ?: 0F).toInt()
+            CoroutineScope(Dispatchers.IO).launch {
+                runCatching {
+                    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 {
-                    kotlin.runCatching {
-                        Cache.getInstance(this@DownloadService, galleryID).putImage(index, "${index.toString().padStart(padding, '0')}.$ext", image)
-                    }.onSuccess {
-                        progress[galleryID]?.set(index, Float.POSITIVE_INFINITY)
-                        notify(galleryID)
+                    Cache.getInstance(this@DownloadService, galleryID)
+                        .putImage(index, "${index.toString().padStart(padding, '0')}.$ext", image)

-                        if (isCompleted(galleryID)) {
-                            if (DownloadManager.getInstance(this@DownloadService)
-                                    .getDownloadFolder(galleryID) != null)
-                                Cache.getInstance(this@DownloadService, galleryID).moveToDownload()
+                    progress[galleryID]?.set(index, Float.POSITIVE_INFINITY)
+                    notify(galleryID)

-                            startId?.let { stopSelf(it) }
-                        }
-                    }.onFailure {
-                        it.printStackTrace()
-                        cancel(galleryID)
-                        download(galleryID)
+                    if (isCompleted(galleryID)) {
+                        if (DownloadManager.getInstance(this@DownloadService)
+                                .getDownloadFolder(galleryID) != null
+                        )
+                            Cache.getInstance(this@DownloadService, galleryID).moveToDownload()
+
+                        startId?.let { stopSelf(it) }
                    }
+                }.onFailure {
+                    FirebaseCrashlytics.getInstance().recordException(it)
                }
            }
        }
@@ -325,8 +324,7 @@ class DownloadService : Service() {
        }

        if (isCompleted(galleryID)) {
-            if (DownloadManager.getInstance(this@DownloadService)
-                    .getDownloadFolder(galleryID) != null )
+            if (DownloadManager.getInstance(this@DownloadService).getDownloadFolder(galleryID) != null)
                Cache.getInstance(this@DownloadService, galleryID).moveToDownload()

            notificationManager.cancel(galleryID)
@@ -348,7 +346,7 @@ class DownloadService : Service() {
            }
        }

-        galleryInfo.requestBuilders.forEachIndexed { index, it ->
+        galleryInfo.getRequestBuilders().forEachIndexed { index, it ->
            if (progress[galleryID]?.get(index)?.isInfinite() == false) {
                val request = it.tag(Tag(galleryID, index, startId)).build()
                client.newCall(request).enqueue(callback)
--- 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/types/Suggestions.kt
+++ b/app/src/main/java/xyz/quaver/pupil/types/Suggestions.kt
@@ -21,7 +21,7 @@ package xyz.quaver.pupil.types
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 import xyz.quaver.floatingsearchview.suggestions.model.SearchSuggestion
-import xyz.quaver.hitomi.Suggestion
+import xyz.quaver.pupil.hitomi.Suggestion
 import xyz.quaver.pupil.util.translations

@Parcelize
--- a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
@@ -44,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.hitomi.doSearch
-import xyz.quaver.hitomi.getGalleryIDsFromNozomi
-import xyz.quaver.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
@@ -63,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(),
@@ -124,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", ""])
        ) {
@@ -800,7 +801,6 @@ class MainActivity :
                        throw Exception("No result")
                }
            } catch (e: Exception) {
-
                if (e !is CancellationException)
                    FirebaseCrashlytics.getInstance().recordException(e)

--- a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
@@ -161,12 +161,10 @@ class ReaderActivity : BaseActivity() {
        }
    }

-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
        menuInflater.inflate(R.menu.reader, menu)

-        with(menu?.findItem(R.id.reader_menu_favorite)) {
-            this ?: return@with
-
+        with(menu.findItem(R.id.reader_menu_favorite)) {
            if (favorites.contains(galleryID))
                (icon as Animatable).start()
        }
--- 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 {
-            Cache.getInstance(requireContext(), galleryID).getGalleryBlock()
+        CoroutineScope(Dispatchers.IO).launch {
+            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/dialog/GalleryDialog.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/dialog/GalleryDialog.kt
@@ -35,8 +35,8 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import xyz.quaver.hitomi.Gallery
-import xyz.quaver.hitomi.getGallery
+import xyz.quaver.pupil.hitomi.Gallery
+import xyz.quaver.pupil.hitomi.getGallery
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.GalleryBlockAdapter
 import xyz.quaver.pupil.adapters.ThumbnailPageAdapter
--- 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 {

@@ -80,6 +96,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 +247,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.*
@@ -107,6 +109,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"))
                    )
--- 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,47 +21,49 @@ package xyz.quaver.pupil.util.downloader
 import android.content.Context
 import android.content.ContextWrapper
 import android.net.Uri
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.*
 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
 import kotlinx.serialization.json.Json
 import okhttp3.Request
-import xyz.quaver.hitomi.GalleryBlock
-import xyz.quaver.hitomi.GalleryInfo
 import xyz.quaver.io.FileX
 import xyz.quaver.io.util.*
 import xyz.quaver.pupil.client
+import xyz.quaver.pupil.hitomi.*
 import java.io.File
 import java.io.IOException
+import java.io.InputStream
 import java.util.concurrent.ConcurrentHashMap

@Serializable
-data class OldGalleryBlock(
-    val code: String,
-    val id: Int,
-    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>
+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 OldReader(val code: String, val galleryInfo: GalleryInfo)
+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 reader: OldReader? = null,
+    var galleryBlock: GalleryBlock? = null,
+    var reader: OldGalleryInfo? = null,
    var imageList: MutableList<String?>? = null
 ) {
    fun copy(): OldMetadata = OldMetadata(galleryBlock, reader, imageList?.let { MutableList(it.size) { i -> it[i] } })
@@ -73,20 +75,7 @@ data class Metadata(
    var galleryInfo: GalleryInfo? = null,
    var imageList: MutableList<String?>? = null
 ) {
-    constructor(old: OldMetadata) : this(old.galleryBlock?.let { galleryBlock -> GalleryBlock(
-        galleryBlock.id,
-        galleryBlock.galleryUrl,
-        galleryBlock.thumbnails,
-        galleryBlock.title,
-        galleryBlock.artists,
-        galleryBlock.series,
-        galleryBlock.type,
-        galleryBlock.language,
-        galleryBlock.relatedTags) },
-        old.reader?.galleryInfo,
-        old.imageList
-    )
-
+    constructor(old: OldMetadata) : this(old.galleryBlock, getGalleryInfo(old.galleryBlock?.id ?: throw Exception()), old.imageList)
    fun copy(): Metadata = Metadata(galleryBlock, galleryInfo, imageList?.let { MutableList(it.size) { i -> it[i] } })
 }

@@ -114,12 +103,12 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
    var metadata = kotlin.runCatching {
        findFile(".metadata")?.readText()?.let { metadata ->
            kotlin.runCatching {
-                Json.decodeFromString<Metadata>(metadata)
+                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)
@@ -155,7 +144,7 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
        return metadata.galleryBlock
            ?: withContext(Dispatchers.IO) {
                try {
-                    xyz.quaver.hitomi.getGalleryBlock(galleryID).also {
+                    getGalleryBlock(galleryID).also {
                        setMetadata { metadata -> metadata.galleryBlock = it }
                    }
                } catch (e: Exception) { return@withContext null }
@@ -169,6 +158,7 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
                kotlin.runCatching {
                    val request = Request.Builder()
                        .url(it)
+                        .header("Referer", "https://hitomi.la/")
                        .build()

                    client.newCall(request).execute().also { if (it.code() != 200) throw IOException() }.body()?.use { it.bytes() }
@@ -187,7 +177,7 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
        return metadata.galleryInfo
            ?: withContext(Dispatchers.IO) {
                try {
-                    xyz.quaver.hitomi.getGalleryInfo(galleryID).also {
+                    getGalleryInfo(galleryID).also {
                        setMetadata { metadata ->
                            metadata.galleryInfo = it

@@ -205,12 +195,11 @@ 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.runBlocking
+import kotlinx.coroutines.CoroutineScope
+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() = {
-            kotlin.runCatching {
-                FileX(this, Preferences.get<String>("download_folder"))
-            }.getOrElse {
-                Preferences["download_folder"] = defaultDownloadFolder.uri.toString()
-                defaultDownloadFolder
-            }
-        }.invoke()
+        get() = kotlin.runCatching {
+            FileX(this, Preferences.get<String>("download_folder"))
+        }.getOrElse {
+            Preferences["download_folder"] = defaultDownloadFolder.uri.toString()
+            defaultDownloadFolder
+        }

    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 ?: {
+                    data ?: run {
                        file.createNewFile()
-                        mutableMapOf<Int, String>()
-                    }.invoke()
-                }.invoke()
+                        mutableMapOf()
+                    }
+                }
            }

            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) {
-        val name = runBlocking {
-            Cache.getInstance(this@DownloadManager, galleryID).getGalleryBlock()
-        }?.formatDownloadFolder() ?: return
+    fun addDownloadFolder(galleryID: Int) = CoroutineScope(Dispatchers.IO).launch {
+        val name = Cache.getInstance(this@DownloadManager, galleryID).getGalleryBlock()
+            ?.formatDownloadFolder() ?: return@launch

        val folder = downloadFolder.getChild(name)

-        if (folder.exists())
-            return
-
-        folder.mkdir()
-
-        downloadFolderMap[galleryID] = folder.name
+        downloadFolderMap[galleryID] = 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
@@ -19,13 +19,13 @@
 package xyz.quaver.pupil.util

 import android.annotation.SuppressLint
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.serialization.json.*
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import xyz.quaver.hitomi.GalleryBlock
-import xyz.quaver.hitomi.GalleryInfo
-import xyz.quaver.hitomi.getReferer
-import xyz.quaver.hitomi.imageUrlFromImage
+import xyz.quaver.pupil.hitomi.GalleryBlock
+import xyz.quaver.pupil.hitomi.GalleryInfo
+import xyz.quaver.pupil.hitomi.imageUrlFromImage
 import java.util.*
 import kotlin.collections.ArrayList

@@ -77,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
 )
 /**
@@ -97,17 +98,24 @@ fun GalleryBlock.formatDownloadFolderTest(format: String): String =
        }
    }.replace(Regex("""[*\\|"?><:/]"""), "").ellipsize(127)

-val GalleryInfo.requestBuilders: List<Request.Builder>
-    get() {
-        val galleryID = this.id ?: 0
-        val lowQuality = Preferences["low_quality", true]
+suspend fun GalleryInfo.getRequestBuilders(): List<Request.Builder> {
+    val galleryID = this.id.toIntOrNull() ?: 0
+    val lowQuality = Preferences["low_quality", true]

-        return this.files.map {
-            Request.Builder()
-                .url(imageUrlFromImage(galleryID, it, !lowQuality))
-                .header("Referer", getReferer(galleryID))
-        }
+    return this.files.map {
+        Request.Builder()
+            .url(
+                runCatching {
+                    imageUrlFromImage(galleryID, it, !lowQuality)
+                }
+                .onFailure {
+                    FirebaseCrashlytics.getInstance().recordException(it)
+                }
+                .getOrDefault("https://a/")
+            )
+            .header("Referer", "https://hitomi.la/")
    }
+}

 fun String.ellipsize(n: Int): String =
    if (this.length > n)
--- a/app/src/main/java/xyz/quaver/pupil/util/update.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/update.kt
@@ -162,7 +162,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()
            }
        }
--- 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/test/java/xyz/quaver/pupil/ExampleUnitTest.kt
+++ b/app/src/test/java/xyz/quaver/pupil/ExampleUnitTest.kt
@@ -26,21 +26,14 @@ package xyz.quaver.pupil
 * See [testing documentation](http://d.android.com/tools/testing).
 */

-import kotlinx.serialization.*
-import kotlinx.serialization.json.Json
 import org.junit.Test
 import java.lang.reflect.ParameterizedType
-import kotlin.reflect.KClass
-import kotlin.reflect.KType
-import kotlin.reflect.typeOf

 class ExampleUnitTest {
-
    @Test
    fun test() {
        val a = mutableSetOf<Int>()

        print(a::class.java.methods.firstOrNull { it.name == "add" }?.genericParameterTypes?.firstOrNull() as? ParameterizedType)
    }
-
 }
--- a/build.gradle
+++ b/build.gradle
@@ -6,15 +6,15 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.1.0'
        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"
-        classpath "com.google.gms:google-services:4.3.8"
+        classpath "com.google.gms:google-services:4.3.10"
        // 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.7.0"
-        classpath "com.google.firebase:perf-plugin:1.4.0"
+        classpath "com.google.firebase:firebase-crashlytics-gradle:2.8.1"
+        classpath "com.google.firebase:perf-plugin:1.4.1"
        classpath "com.google.android.gms:oss-licenses-plugin:0.10.4"
    }
 }
@@ -24,9 +24,9 @@ allprojects {
        google()
        mavenCentral()
        jcenter()
-        mavenLocal()
        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.properties
+++ b/gradle.properties
@@ -20,4 +20,4 @@ kotlin.code.style=official
 android.enableJetifier=true
 android.useAndroidX=true

-kotlin_version=1.5.10
+kotlin_version=1.6.10
--- 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-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
Author	SHA1	Message	Date
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
tom5079	7461c8d201	Merge remote-tracking branch 'origin/master'	2022-01-09 00:34:38 +09:00
tom5079	0902fdf981	Improved search speed	2022-01-09 00:34:29 +09:00
tom5079	0fd2cf4fd7	Removed logs	2022-01-08 18:33:48 +09:00
tom5079	679558106f	Update README.md	2022-01-08 10:20:00 +09:00
tom5079	e498efc493	Fixed Download location dialog keep popping up	2022-01-08 10:13:20 +09:00
tom5079	74bbc71741	Fixed thumbnail not loading	2022-01-08 10:06:45 +09:00
tom5079	502b4890e3	5.2.8 Fix for loading not finishing	2022-01-07 18:47:07 +09:00
tom5079	dfb60461e4	Merge remote-tracking branch 'origin/master'	2022-01-05 20:20:08 +09:00
tom5079	bd6bc418e6	5.2.8-BETA01 potential fix for loading not finishing	2022-01-05 20:19:00 +09:00
tom5079	a284143ce1	Update README.md	2022-01-04 23:18:16 +09:00
tom5079	1f1c782772	5.2.7 Fix app crashing on Android 12	2022-01-04 23:15:34 +09:00
tom5079	5c0f5fe333	5.2.6 Dependency update & Fixes the bug (The problem was kotlinx.serialization!!!)	2022-01-04 22:50:16 +09:00
tom5079	748e023fde	5.2.5 Added logging to fix app crashing	2022-01-04 20:30:45 +09:00
tom5079	30104bacd2	Update README.md	2022-01-04 20:16:41 +09:00
tom5079	f33d1a1bfa	5.2.4 Added logging to fix app crashing	2022-01-04 20:16:04 +09:00
tom5079	3c08331441	5.2.3 Added logging to fix app crashing	2022-01-04 19:57:00 +09:00
tom5079	3eaa38247b	5.2.2 Fixed app crashing	2022-01-04 19:10:58 +09:00
tom5079	304ce643f9	Update README.md	2022-01-03 17:15:56 +09:00
tom5079	b4ad994f95	Create watchdiff.yml	2022-01-03 15:36:00 +09:00
tom5079	03c5cfa791	Fixed image not loading	2022-01-03 14:46:22 +09:00
tom5079	e8056072b8	Merge remote-tracking branch 'origin/master'	2022-01-03 14:31:50 +09:00
tom5079	d134639a5f	Update README.md	2022-01-03 11:45:55 +09:00
tom5079	b4745d76b8	Update README.md	2022-01-03 09:18:38 +09:00
tom5079	c5fd674020	User-Agent	2022-01-03 00:00:37 +09:00
tom5079	9b821dd7cb	Update README.md	2022-01-02 23:49:58 +09:00
tom5079	1b441f6aea	Migrate to coroutine	2022-01-02 20:32:00 +09:00
tom5079	213902c854	Update README.md	2022-01-02 16:46:54 +09:00
tom5079	2054922586	Update README.md	2022-01-02 16:46:43 +09:00
tom5079	a17b7355f5	Merge remote-tracking branch 'origin/master'	2022-01-02 15:30:20 +09:00
tom5079	066a1e1f3a	use WebView(!) as a js engine	2022-01-02 15:30:03 +09:00
tom5079	b10cbfbd63	Update README.md	2022-01-02 15:18:11 +09:00
tom5079	fcd72bb8bd	Revert back to quickjs-android (quickjs stackoverflows)	2022-01-02 09:16:28 +09:00
tom5079	37cd99731c	Fixed images not loading	2022-01-02 09:08:53 +09:00
tom5079	ed97773f24	Update README.md	2022-01-01 16:58:31 +09:00
tom5079	0424ba3e87	Merge remote-tracking branch 'origin/master'	2022-01-01 16:58:08 +09:00
tom5079	9539c4e7bf	Fixed some images not loading	2022-01-01 16:57:55 +09:00
tom5079	248b378f01	Fixed some images not loading	2022-01-01 16:56:15 +09:00
tom5079	1c40575665	Fixed images not loading	2022-01-01 08:34:47 +09:00
tom5079	ac67c648be	Update README.md	2022-01-01 02:07:12 +09:00
tom5079	42cc026acc	Merge remote-tracking branch 'origin/master'	2021-12-31 15:37:37 +09:00
tom5079	23a74edfad	Forgot to change version	2021-12-31 15:37:29 +09:00
tom5079	5da1804f17	Update README.md	2021-12-31 15:33:21 +09:00
tom5079	75f0c35017	Merge remote-tracking branch 'origin/master'	2021-12-31 15:29:05 +09:00
tom5079	0e6b02d260	Dependency update	2021-12-31 15:28:44 +09:00
tom5079	d5a0ce55f0	Update README.md	2021-12-31 14:47:28 +09:00
tom5079	09fc6fe8ef	Merge remote-tracking branch 'origin/master'	2021-12-31 14:40:45 +09:00
tom5079	ff30be879a	Dependency update	2021-12-31 14:40:31 +09:00
tom5079	309fe4d831	Update README.md	2021-12-29 20:28:52 +09:00
tom5079	dff0c817a7	Merge remote-tracking branch 'origin/master'	2021-12-29 20:28:38 +09:00
tom5079	04313981d4	5.1.22 Fixed gallery thumbnail not visible	2021-12-29 20:28:18 +09:00
tom5079	810cb4d13a	Update README.md	2021-12-29 11:37:02 +09:00
tom5079	969e32e744	Dependency Update	2021-12-29 11:36:16 +09:00
tom5079	980909df9b	Update README.md	2021-12-17 01:21:29 +09:00
tom5079	e6753088a4	User-Agent hack Fixes unable to download some images	2021-12-13 10:46:57 +09:00
tom5079	cbdb6cb63a	Update README.md	2021-12-12 20:08:20 +09:00
tom5079	3cdf1a899e	Potential Image load fail fix	2021-12-12 20:06:23 +09:00
tom5079	c796be5de5	nvm	2021-11-24 16:05:11 +09:00
tom5079	db301cb0c3	Merge branch 'master' of github.com:tom5079/Pupil	2021-11-24 16:03:52 +09:00
tom5079	f00421ef23	state.jpg	2021-11-24 16:03:42 +09:00
tom5079	b324654967	Update README.md	2021-11-03 09:50:07 +09:00
tom5079	aa10ada3ee	Dependency update	2021-11-03 09:42:12 +09:00
tom5079	10c97987fb	Aligned with new hitomi.la image servers	2021-10-30 08:52:10 +09:00
tom5079	b532615bbd	Aligned with new hitomi.la image servers	2021-10-29 16:55:12 +09:00
tom5079	3066f41af3	Update README.md	2021-10-28 08:33:35 +09:00
tom5079	0c401c6741	Merge remote-tracking branch 'origin/master'	2021-10-28 08:32:45 +09:00
tom5079	1a21d1c937	Aligned with new hitomi.la image servers	2021-10-28 08:30:59 +09:00
tom5079	525b49a5c9	Update README.md	2021-10-25 22:07:12 +09:00