Merge remote-tracking branch 'origin/master'

Added self-test and reload
Reduced update ignoring time to 1d from 1w

.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"

.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>

.idea/deploymentTargetDropDown.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <targetSelectedWithDropDown>
+      <Target>
+        <type value="QUICK_BOOT_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="$USER_HOME$/.android/avd/Pixel_2_API_31.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </targetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2022-02-01T08:00:57.223690Z" />
+  </component>
+</project>

.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$" />

.idea/jarRepositories.xml

@@ -86,5 +86,15 @@
       <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>

.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">

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.32/Pupil-v5.1.32.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.1.32/Pupil-v5.1.32.apk)
+[![](https://img.shields.io/github/downloads/tom5079/Pupil/5.3.2/Pupil-v5.3.2.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.3.2/Pupil-v5.3.2.apk)  
 [![](https://discordapp.com/api/guilds/610452916612104194/embed.png?style=banner2)](https://discord.gg/Stj4b5v)
 
 # Features

app/build.gradle

@@ -32,13 +32,13 @@ configurations {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     defaultConfig {
         applicationId "xyz.quaver.pupil"
         minSdkVersion 16
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 69
-        versionName "5.1.32"
+        versionName "5.3.3"
         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
+        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_11
     }
 }
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar", "*.aar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0"
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2"
     
-    implementation "androidx.appcompat:appcompat:1.3.0"
+    implementation "androidx.appcompat:appcompat:1.4.1"
-    implementation "androidx.activity:activity-ktx:1.3.0-beta01"
+    implementation "androidx.activity:activity-ktx:1.4.0"
-    implementation "androidx.fragment:fragment-ktx:1.3.4"
+    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"
@@ -127,14 +128,17 @@ dependencies {
 
     implementation "org.jsoup:jsoup:1.14.3"
 
-    implementation "com.google.guava:guava:31.0.1-android"
+    implementation ("app.cash.zipline:zipline:1.0.0-SNAPSHOT") {
+        exclude group: "com.squareup.okio", module: "okio"
+    }
 
-    implementation "xyz.quaver:documentfilex:0.7.1"
+    implementation "xyz.quaver:documentfilex:0.7.2"
     implementation "xyz.quaver:floatingsearchview:1.1.7"
 
-    testImplementation "junit:junit:4.13.1"
+    testImplementation "junit:junit:4.13.2"
-    androidTestImplementation "androidx.test.ext:junit:1.1.2"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0"
-    androidTestImplementation "androidx.test:rules:1.3.0"
+    androidTestImplementation "androidx.test.ext:junit:1.1.3"
-    androidTestImplementation "androidx.test:runner:1.3.0"
+    androidTestImplementation "androidx.test:rules:1.4.0"
-    androidTestImplementation "androidx.test.espresso:espresso-core:3.3.0"
+    androidTestImplementation "androidx.test:runner:1.4.0"
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
 }

app/proguard-rules.pro

@@ -33,4 +33,5 @@
 }
 -keep class xyz.quaver.pupil.ui.fragment.ManageFavoritesFragment
 -keep class xyz.quaver.pupil.ui.fragment.ManageStorageFragment
--keep class com.hippo.quickjs.** { *; }
+-keep class xyz.quaver.pupil.** { *; }
+-keep class app.cash.zipline.** { *; }

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": [],
+      "attributes": [],
       "versionCode": 69,
-      "versionName": "5.1.32",
+      "versionName": "5.3.3",
       "outputFile": "app-release.apk"
     }
-  ]
+  ],
+  "elementType": "File"
 }

app/src/androidTest/java/xyz/quaver/pupil/ExampleInstrumentedTest.kt

@@ -21,15 +21,17 @@
 package xyz.quaver.pupil
 
 import android.util.Log
-import android.webkit.WebView
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import kotlinx.coroutines.MainScope
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.withContext
+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.
@@ -38,22 +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() {
+    fun test_empty() {
-        // Context of the app under test.
+        print(
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+            "".trim()
+                .replace(Regex("""^\?"""), "")
+                .lowercase(Locale.getDefault())
+                .split(Regex("\\s+"))
+                .map {
+                    it.replace('_', ' ')
+                })
+    }
+    @Test
+    fun test_nozomi() {
+        val nozomi = getGalleryIDsFromNozomi(null, "index", "all")
 
-        runBlocking {
+        Log.d("PUPILD", nozomi.size.toString())
-            MainScope().launch {
-                val webView = WebView(appContext).apply {
-                    settings.javaScriptEnabled = true
     }
-                webView.evaluateJavascript("3") {
+
-                    Log.d("PUPILD", it)
+    @Test
+    fun test_search() {
+        val ids = getGalleryIDsForQuery("language:korean").reversed()
+
+        print(ids.size)
     }
-                Log.d("PUPILD", "SYNC?")
+
-            }.join()
+    @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"))
     }
 }

app/src/main/AndroidManifest.xml

@@ -6,8 +6,8 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
-    <uses-permission-sdk-23 android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="23"/>
-    <uses-permission-sdk-23 android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="23"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.VIBRATE"/>
@@ -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" />

app/src/main/java/xyz/quaver/pupil/Pupil.kt

@@ -18,7 +18,6 @@
 
 package xyz.quaver.pupil
 
-import android.annotation.SuppressLint
 import android.app.Application
 import android.app.Notification
 import android.app.NotificationChannel
@@ -27,24 +26,31 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Build
-import android.webkit.WebView
+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 java.io.File
+import java.net.URL
 import java.util.*
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
@@ -71,26 +77,46 @@ val client: OkHttpClient
         clientHolder = it
     }
 
-@SuppressLint("StaticFieldLeak")
+private var version = ""
-lateinit var webView: WebView
+var runtimeReady = false
+    private set
+lateinit var runtime: QuickJs
+    private set
 
 class Pupil : Application() {
-
     companion object {
         lateinit var instance: Pupil
             private set
     }
 
-    @SuppressLint("SetJavaScriptEnabled")
+    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
 
-        webView = WebView(this).apply {
-            settings.javaScriptEnabled = true
-
-            loadData("""<script src="https://ltn.hitomi.la/gg.js"></script>""", "text/html", null)
-        }
-
         AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
 
         preferences = PreferenceManager.getDefaultSharedPreferences(this)
@@ -100,6 +126,7 @@ class Pupil : Application() {
             else userID
         }
 
+        FirebaseApp.initializeApp(this)
         FirebaseCrashlytics.getInstance().setUserId(userID)
 
         val proxyInfo = getProxyInfo()
@@ -109,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)
@@ -122,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
@@ -161,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

app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt

@@ -104,10 +104,10 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt
 
             val cache = Cache.getInstance(itemView.context, galleryID)
 
-            val galleryBlock = runBlocking {
+            CoroutineScope(Dispatchers.IO).launch {
-                cache.getGalleryBlock()
+                val galleryBlock = cache.getGalleryBlock() ?: return@launch
-            } ?: return
 
+                launch(Dispatchers.Main) {
                     val resources = itemView.context.resources
                     val languages = resources.getStringArray(R.array.languages).map {
                         it.split("|").let { split ->
@@ -128,10 +128,7 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt
                         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.delete(context, galleryID)
-                            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?) {}
@@ -189,7 +186,7 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt
                         text =
                             resources.getString(R.string.galleryblock_language, languages[galleryBlock.language])
                         visibility = when {
-                    galleryBlock.language.isNotEmpty() -> View.VISIBLE
+                            !galleryBlock.language.isNullOrEmpty() -> View.VISIBLE
                             else -> View.GONE
                         }
                     }
@@ -266,6 +263,9 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt
                     }
 
 
+                }
+            }
+
             // Make some views invisible to make it thinner
             if (thin) {
                 binding.galleryblockTagGroup.visibility = View.GONE

app/src/main/java/xyz/quaver/pupil/hitomi/Utils.kt

@@ -1,65 +0,0 @@
-/*
- *    Copyright 2019 tom5079
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package xyz.quaver
-
-import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.modules.SerializersModule
-import kotlinx.serialization.modules.plus
-import kotlinx.serialization.modules.polymorphic
-import kotlinx.serialization.modules.subclass
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import xyz.quaver.pupil.client
-import java.io.IOException
-import java.net.URL
-import java.util.concurrent.TimeUnit
-import kotlin.time.Duration
-
-/**
- * kotlinx.serialization.json.Json object for global use  
- * properties should not be changed
- *
- * @see [https://kotlin.github.io/kotlinx.serialization/kotlinx-serialization-core/kotlinx-serialization-core/kotlinx.serialization.json/-json/index.html]
- */
-val json = Json {
-    isLenient = true
-    ignoreUnknownKeys = true
-    allowSpecialFloatingPointValues = true
-    useArrayPolymorphism = true
-}
-
-typealias HeaderSetter = (Request.Builder) -> Request.Builder
-fun URL.readText(settings: HeaderSetter? = null): String {
-    val request = Request.Builder()
-        .url(this).let { 
-            settings?.invoke(it) ?: it
-        }.build()
-    
-    return client.newCall(request).execute().also{ if (it.code() != 200) throw IOException() }.body()?.use { it.string() } ?: throw IOException()
-}
-
-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() }.body()?.use { it.bytes() } ?: throw IOException()
-}

app/src/main/java/xyz/quaver/pupil/hitomi/common.kt

@@ -16,21 +16,105 @@
 
 package xyz.quaver.pupil.hitomi
 
-import android.annotation.SuppressLint
-import android.util.Log
-import android.webkit.WebView
-import android.webkit.WebViewClient
 import kotlinx.coroutines.*
+import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
-import xyz.quaver.json
+import kotlinx.serialization.json.Json
-import xyz.quaver.pupil.Pupil
+import okhttp3.Request
-import xyz.quaver.pupil.webView
+import xyz.quaver.pupil.client
-import xyz.quaver.readText
+import xyz.quaver.pupil.runtime
+import xyz.quaver.pupil.runtimeReady
+import java.io.IOException
 import java.net.URL
-import java.nio.charset.Charset
+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>(
@@ -44,69 +128,26 @@ const val galleryblockextension = ".html"
 const val galleryblockdir = "galleryblock"
 const val nozomiextension = ".nozomi"
 
-@SuppressLint("SetJavaScriptEnabled")
+val evaluationContext = Executors.newSingleThreadExecutor().asCoroutineDispatcher() + Job()
-interface gg {
-    fun m(g: Int): Int
-    val b: String
-    fun s(h: String): String
 
-    companion object {
+object gg {
-        @Volatile private var instance: gg? = null
 
-        fun getInstance(): gg =
+    suspend fun m(g: Int): Int = withContext(evaluationContext) {
-            instance ?: synchronized(this) {
+        while (!runtimeReady) delay(1000)
-                instance ?: object: gg {
+        runtime.evaluate("gg.m($g)").toString().toInt()
-                    override fun m(g: Int): Int {
-                        var result: Int? = null
-
-                        MainScope().launch {
-                            while (webView.progress != 100) delay(100)
-                            webView.evaluateJavascript("gg.m($g)") {
-                                result = it.toInt()
     }
+    suspend fun b(): String = withContext(evaluationContext) {
+        while (!runtimeReady) delay(1000)
+        runtime.evaluate("gg.b").toString()
     }
 
-                        while (result == null) Thread.sleep(100)
+    suspend fun s(h: String): String = withContext(evaluationContext) {
-
+        while (!runtimeReady) delay(1000)
-                        return result!!
+        runtime.evaluate("gg.s('$h')").toString()
-                    }
-
-                    override val b: String
-                        get() {
-                            var result: String? = null
-
-                            MainScope().launch {
-                                while (webView.progress != 100) delay(100)
-                                webView.evaluateJavascript("gg.b") {
-                                    result = it.replace("\"", "")
-                                }
-                            }
-
-                            while (result == null) Thread.sleep(100)
-
-                            return result!!
-                        }
-
-                    override fun s(h: String): String {
-                        var result: String? = null
-
-                        MainScope().launch {
-                            while (webView.progress != 100) delay(100)
-                            webView.evaluateJavascript("gg.s('$h')") {
-                                result = it.replace("\"", "")
-                            }
-                        }
-
-                        while (result == null) Thread.sleep(100)
-
-                        return result!!
-                    }
-                }.also { instance = it }
-            }
     }
 }
 
-fun subdomainFromURL(url: String, base: String? = null) : String {
+suspend fun subdomainFromURL(url: String, base: String? = null) : String {
     var retval = "b"
 
     if (!base.isNullOrBlank())
@@ -120,41 +161,43 @@ fun subdomainFromURL(url: String, base: String? = null) : String {
     val g = m.groupValues.let { it[2]+it[1] }.toIntOrNull(b)
 
     if (g != null) {
-        retval = (97+ gg.getInstance().m(g)).toChar().toString() + retval
+        retval = (97+ gg.m(g)).toChar().toString() + retval
     }
 
     return retval
 }
 
-fun urlFromUrl(url: String, base: String? = null) : String {
+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 =
-fun fullPathFromHash(hash: String) : String =
+    "${gg.b()}${gg.s(hash)}/$hash"
-    "${gg.getInstance().b}${gg.getInstance().s(hash)}/$hash"
 
 fun realFullPathFromHash(hash: String): String =
     hash.replace(Regex("""^.*(..)(.)$"""), "$2/$1/$hash")
 
-fun urlFromHash(galleryID: Int, image: GalleryFiles, dir: String? = null, ext: String? = null) : String {
+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"
 }
 
-fun urlFromUrlFromHash(galleryID: Int, image: GalleryFiles, dir: String? = null, ext: String? = null, base: String? = null) =
+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)
 
-fun rewriteTnPaths(html: String) =
+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")
         }
+    }
+}
 
-fun imageUrlFromImage(galleryID: Int, image: GalleryFiles, noWebp: Boolean) : String {
+suspend fun imageUrlFromImage(galleryID: Int, image: GalleryFiles, noWebp: Boolean) : String {
     return when {
         noWebp ->
             urlFromUrlFromHash(galleryID, image)

app/src/main/java/xyz/quaver/pupil/hitomi/galleries.kt

@@ -17,10 +17,6 @@
 package xyz.quaver.pupil.hitomi
 
 import kotlinx.serialization.Serializable
-import org.jsoup.Jsoup
-import xyz.quaver.readText
-import java.net.URL
-import java.net.URLDecoder
 
 @Serializable
 data class Gallery(
@@ -37,44 +33,22 @@ data class Gallery(
     val tags: List<String>,
     val thumbnails: List<String>
 )
-fun getGallery(galleryID: Int) : Gallery {
-    val url = Jsoup.parse(URL("https://hitomi.la/galleries/$galleryID.html").readText())
-        .select("link").attr("href")
 
-    val doc = Jsoup.parse(URL(url).readText())
+suspend fun getGallery(galleryID: Int) : Gallery {
+    val info = getGalleryInfo(galleryID)
 
-    val related = Regex("\\d+")
+    return Gallery(
-        .findAll(doc.select("script").first()!!.html())
+        info.related,
-        .map {
+        info.languages.map { it.name to it.galleryid },
-            it.value.toInt()
+        urlFromUrlFromHash(galleryID, info.files.first(), "webpbigtn", "webp", "tn"),
-        }.toList()
+        info.title,
-
+        info.artists?.map { it.artist }.orEmpty(),
-    val langList = doc.select("#lang-list a").map {
+        info.groups?.map { it.group }.orEmpty(),
-            Pair(it.text(), "$protocol//hitomi.la${it.attr("href")}")
+        info.type,
-        }
+        info.language.orEmpty(),
-
+        info.parodys?.map { it.parody }.orEmpty(),
-    val cover = protocol + doc.selectFirst(".cover img")!!.attr("src")
+        info.characters?.map { it.character }.orEmpty(),
-    val title = doc.selectFirst(".gallery h1 a")!!.text()
+        info.tags?.map { "${if (it.female.isNullOrEmpty()) "" else "female:"}${if (it.male.isNullOrEmpty()) "" else "male:"}${it.tag}" }.orEmpty(),
-    val artists = doc.select(".gallery h2 a").map { it.text() }
+        info.files.map { urlFromUrlFromHash(galleryID, it, "webpsmalltn", "webp", "tn") }
-    val groups = doc.select(".gallery-info a[href~=^/group/]").map { it.text() }
+    )
-    val type = doc.selectFirst(".gallery-info a[href~=^/type/]")!!.text()
-
-    val language = run {
-        val href = doc.select(".gallery-info a[href~=^/index.+\\.html\$]").attr("href")
-        Regex("""index-([^-]+)(-.+)?\.html""").find(href)?.groupValues?.getOrNull(1) ?: ""
-    }
-
-    val series = doc.select(".gallery-info a[href~=^/series/]").map { it.text() }
-    val characters = doc.select(".gallery-info a[href~=^/character/]").map { it.text() }
-
-    val tags = doc.select(".gallery-info a[href~=^/tag/]").map {
-        val href = URLDecoder.decode(it.attr("href"), "UTF-8")
-        href.slice(5 until href.indexOf('-'))
-    }
-
-    val thumbnails = getGalleryInfo(galleryID).files.map { galleryInfo ->
-        urlFromUrlFromHash(galleryID, galleryInfo, "smalltn", "jpg", "tn")
-    }
-
-    return Gallery(related, langList, cover, title, artists, groups, type, language, series, characters, tags, thumbnails)
 }

app/src/main/java/xyz/quaver/pupil/hitomi/galleryblock.kt

@@ -18,18 +18,16 @@ package xyz.quaver.pupil.hitomi
 
 import kotlinx.serialization.Serializable
 import org.jsoup.Jsoup
-import xyz.quaver.readText
 import java.net.URL
 import java.net.URLDecoder
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
-import java.util.*
 import javax.net.ssl.HttpsURLConnection
+import kotlin.io.readText
 
 //galleryblock.js
 fun fetchNozomi(area: String? = null, tag: String = "index", language: String = "all", start: Int = -1, count: Int = -1) : Pair<List<Int>, Int> {
-    val url =
+    val url = when(area) {
-            when(area) {
         null -> "$protocol//$domain/$tag-$language$nozomiextension"
         else -> "$protocol//$domain/$area/$tag-$language$nozomiextension"
     }
@@ -72,34 +70,23 @@ data class GalleryBlock(
     val series: List<String>,
     val type: String,
     val language: String,
-    val relatedTags: List<String>
+    val relatedTags: List<String>,
+    val groups: List<String> = emptyList()
 )
 
-fun getGalleryBlock(galleryID: Int) : GalleryBlock {
+suspend fun getGalleryBlock(galleryID: Int) : GalleryBlock {
-    val url = "$protocol//$domain/$galleryblockdir/$galleryID$extension"
+    val info = getGalleryInfo(galleryID)
 
-    val doc = Jsoup.parse(rewriteTnPaths(URL(url).readText()))
+    return GalleryBlock(
-
+        galleryID,
-    val galleryUrl = doc.selectFirst("h1 > a")!!.attr("href")
+        "",
-
+        listOf(urlFromUrlFromHash(galleryID, info.files.first(), "webpbigtn", "webp", "tn")),
-    val thumbnails = doc.select(".dj-img-cont img").map { protocol + it.attr("src") }
+        info.title,
-
+        info.artists?.map { it.artist }.orEmpty(),
-    val title = doc.selectFirst("h1 > a")!!.text()
+        info.parodys?.map { it.parody }.orEmpty(),
-    val artists = doc.select(".artist-list a").map{ it.text() }
+        info.type,
-    val series = doc.select(".dj-content a[href~=^/series/]").map { it.text() }
+        info.language.orEmpty(),
-    val type = doc.selectFirst("a[href~=^/type/]")!!.text()
+        info.tags?.map { "${if (it.female.isNullOrEmpty()) "" else "female:"}${if (it.male.isNullOrEmpty()) "" else "male:"}${it.tag}" }.orEmpty(),
-
+        info.groups?.map { it.group }.orEmpty()
-    val language = run {
+    )
-        val href = doc.select("a[href~=^/index.+\\.html\$]").attr("href")
-        Regex("""index-([^-]+)(-.+)?\.html""").find(href)?.groupValues?.getOrNull(1) ?: ""
-    }
-
-    val relatedTags = doc.select(".relatedtags a").map {
-        val href = URLDecoder.decode(it.attr("href"), "UTF-8")
-        href.slice(5 until href.indexOf("-all"))
-    }
-
-    return GalleryBlock(galleryID, galleryUrl, thumbnails, title, artists, series, type, language, relatedTags)
 }
-
-fun getGalleryBlockOrNull(galleryID: Int) = runCatching { getGalleryBlock(galleryID) }.getOrNull()

app/src/main/java/xyz/quaver/pupil/hitomi/reader.kt

@@ -17,19 +17,8 @@
 package xyz.quaver.pupil.hitomi
 
 import kotlinx.serialization.Serializable
-
+import xyz.quaver.pupil.hitomi.GalleryInfo
-fun getReferer(galleryID: Int) = "https://hitomi.la/reader/$galleryID.html"
+import xyz.quaver.pupil.hitomi.getGalleryInfo
-
-@Serializable
-data class GalleryInfo(
-    val language_localname: String? = null,
-    val language: String? = null,
-    val date: String? = null,
-    val files: List<GalleryFiles>,
-    val id: Int? = null,
-    val type: String? = null,
-    val title: String? = null
-)
 
 @Serializable
 data class GalleryFiles(

app/src/main/java/xyz/quaver/pupil/hitomi/results.kt

@@ -16,13 +16,11 @@
 
 package xyz.quaver.pupil.hitomi
 
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.coroutineScope
 import java.util.*
 
-fun doSearch(query: String, sortByPopularity: Boolean = false) : Set<Int> {
+suspend fun doSearch(query: String, sortByPopularity: Boolean = false) : Set<Int> = coroutineScope {
     val terms = query
         .trim()
         .replace(Regex("""^\?"""), "")
@@ -43,37 +41,36 @@ fun doSearch(query: String, sortByPopularity: Boolean = false) : Set<Int> {
     }
 
     val positiveResults = positiveTerms.map {
-        CoroutineScope(Dispatchers.IO).async {
+        async {
-            kotlin.runCatching {
+            runCatching {
                 getGalleryIDsForQuery(it)
             }.getOrElse { emptySet() }
         }
     }
 
-    val negativeResults = negativeTerms.map {
+    val negativeResults = negativeTerms.mapIndexed { index, it ->
-        CoroutineScope(Dispatchers.IO).async {
+        async {
-            kotlin.runCatching {
+            runCatching {
                 getGalleryIDsForQuery(it)
             }.getOrElse { emptySet() }
         }
     }
 
-    var results = when {
+    val results = when {
         sortByPopularity -> getGalleryIDsFromNozomi(null, "popular", "all")
         positiveTerms.isEmpty() -> getGalleryIDsFromNozomi(null, "index", "all")
         else -> emptySet()
-    }
+    }.toMutableSet()
 
-    runBlocking {
+    fun filterPositive(newResults: Set<Int>) {
-        @Synchronized fun filterPositive(newResults: Set<Int>) {
+        when {
-            results = when {
+            results.isEmpty() -> results.addAll(newResults)
-                results.isEmpty() -> newResults
+            else -> results.retainAll(newResults)
-                else -> results intersect newResults
         }
     }
 
-        @Synchronized fun filterNegative(newResults: Set<Int>) {
+    fun filterNegative(newResults: Set<Int>) {
-            results = results subtract newResults
+        results.removeAll(newResults)
     }
 
     //positive results
@@ -82,10 +79,9 @@ fun doSearch(query: String, sortByPopularity: Boolean = false) : Set<Int> {
     }
 
     //negative results
-        negativeResults.forEach {
+    negativeResults.forEachIndexed { index, it ->
         filterNegative(it.await())
     }
-    }
 
-    return results
+    results
 }

app/src/main/java/xyz/quaver/pupil/hitomi/search.kt

@@ -18,8 +18,6 @@ package xyz.quaver.pupil.hitomi
 
 import okhttp3.Request
 import xyz.quaver.pupil.client
-import xyz.quaver.readBytes
-import xyz.quaver.readText
 import java.net.URL
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
@@ -224,7 +222,7 @@ fun getNodeAtAddress(field: String, address: Long) : Node? {
                 else -> "$protocol//$domain/$index_dir/$field.$tag_index_version.index"
             }
 
-    val nodedata = getURLAtRange(url, address.until(address+max_node_size))
+    val nodedata = getURLAtRange(url, address.until(address+ max_node_size))
 
     return decodeNode(nodedata)
 }
@@ -271,7 +269,7 @@ fun decodeNode(data: ByteArray) : Node {
         datas.add(Pair(offset, length))
     }
 
-    val numberOfSubNodeAddresses = B+1
+    val numberOfSubNodeAddresses = B +1
     val subNodeAddresses = ArrayList<Long>()
 
     for (i in 0.until(numberOfSubNodeAddresses)) {

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)

app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt

@@ -23,12 +23,12 @@ 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.common.util.concurrent.RateLimiter
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -41,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
@@ -77,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),
@@ -87,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 {
@@ -168,24 +165,19 @@ class DownloadService : Service() {
         }
     }
 
-    private val rateLimiter = RateLimiter.create(2.0)
-    private val rateLimitHost = Regex("..?\\.hitomi.la")
-
     private val interceptor: PupilInterceptor = { chain ->
         val request = chain.request()
 
-        if (rateLimitHost.matches(request.url().host()))
-            rateLimiter.acquire()
-
         var response = chain.proceed(request)
         var limit = 5
 
-        if (!response.isSuccessful && limit > 0) {
+        while (!response.isSuccessful) {
-            Thread.sleep(10000)
+            if (response.code() == 503) {
-            if (rateLimitHost.matches(request.url().host()))
+                Thread.sleep(200)
-                rateLimiter.acquire()
+            } else if (--limit > 0)
+                break
+
             response = chain.proceed(request)
-            limit -= 1
         }
 
         response.newBuilder()
@@ -226,20 +218,21 @@ class DownloadService : Service() {
             val (galleryID, index, startId) = call.request().tag() as Tag
             val ext = call.request().url().encodedPath().split('.').last()
 
-            kotlin.runCatching {
+            CoroutineScope(Dispatchers.IO).launch {
-                val image = response.also { if (it.code() != 200) throw IOException("$galleryID $index ${response.request().url()} CODE ${it.code()}") }.body()?.use { it.bytes() } ?: throw Exception("Response null")
+                runCatching {
+                    val image = response.also { if (it.code() != 200) throw IOException( "$galleryID $index ${response.request().url()} CODE ${it.code()}" ) }.body()?.use { it.bytes() } ?: throw Exception("Response null")
                     val padding = ceil(progress[galleryID]?.size?.let { log10(it.toFloat()) } ?: 0F).toInt()
 
-                CoroutineScope(Dispatchers.IO).launch {
+                    Cache.getInstance(this@DownloadService, galleryID)
-                    kotlin.runCatching {
+                        .putImage(index, "${index.toString().padStart(padding, '0')}.$ext", image)
-                        Cache.getInstance(this@DownloadService, galleryID).putImage(index, "${index.toString().padStart(padding, '0')}.$ext", image)
+
-                    }.onSuccess {
                     progress[galleryID]?.set(index, Float.POSITIVE_INFINITY)
                     notify(galleryID)
 
                     if (isCompleted(galleryID)) {
                         if (DownloadManager.getInstance(this@DownloadService)
-                                    .getDownloadFolder(galleryID) != null)
+                                .getDownloadFolder(galleryID) != null
+                        )
                             Cache.getInstance(this@DownloadService, galleryID).moveToDownload()
 
                         startId?.let { stopSelf(it) }
@@ -248,9 +241,6 @@ class DownloadService : Service() {
                     FirebaseCrashlytics.getInstance().recordException(it)
                 }
             }
-            }.onFailure {
-                FirebaseCrashlytics.getInstance().recordException(it)
-            }
         }
     }
 
@@ -334,8 +324,7 @@ class DownloadService : Service() {
         }
 
         if (isCompleted(galleryID)) {
-            if (DownloadManager.getInstance(this@DownloadService)
+            if (DownloadManager.getInstance(this@DownloadService).getDownloadFolder(galleryID) != null)
-                    .getDownloadFolder(galleryID) != null )
                 Cache.getInstance(this@DownloadService, galleryID).moveToDownload()
 
             notificationManager.cancel(galleryID)
@@ -357,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)

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)

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.pupil.hitomi.doSearch
-import xyz.quaver.pupil.hitomi.getGalleryIDsFromNozomi
-import xyz.quaver.pupil.hitomi.getSuggestionsForQuery
 import xyz.quaver.pupil.*
 import xyz.quaver.pupil.adapters.GalleryBlockAdapter
 import xyz.quaver.pupil.databinding.MainActivityBinding
+import xyz.quaver.pupil.hitomi.doSearch
+import xyz.quaver.pupil.hitomi.getGalleryIDsFromNozomi
+import xyz.quaver.pupil.hitomi.getSuggestionsForQuery
 import xyz.quaver.pupil.services.DownloadService
 import xyz.quaver.pupil.types.*
 import xyz.quaver.pupil.ui.dialog.DownloadLocationDialogFragment
@@ -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)
 

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)) {
+        with(menu.findItem(R.id.reader_menu_favorite)) {
-            this ?: return@with
-
             if (favorites.contains(galleryID))
                 (icon as Animatable).start()
         }

app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadFolderNameDialogFragment.kt

@@ -24,7 +24,9 @@ import android.view.ViewGroup
 import androidx.core.widget.addTextChangedListener
 import androidx.fragment.app.DialogFragment
 import com.google.android.material.snackbar.Snackbar
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.databinding.DownloadFolderNameDialogBinding
 import xyz.quaver.pupil.util.Preferences
@@ -56,15 +58,16 @@ class DownloadFolderNameDialogFragment : DialogFragment() {
 
     private fun initView() {
         val galleryID = Cache.instances.let { if (it.size == 0) 1199708 else it.keys.elementAt((0 until it.size).random()) }
-        val galleryBlock = runBlocking {
+        CoroutineScope(Dispatchers.IO).launch {
-            Cache.getInstance(requireContext(), galleryID).getGalleryBlock()
+            val galleryBlock = Cache.getInstance(requireContext(), galleryID).getGalleryBlock()
-        }
 
             binding.message.text = getString(R.string.settings_download_folder_name_message, formatMap.keys.toString(), galleryBlock?.formatDownloadFolder() ?: "")
-        binding.edittext.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.edittext.setText(Preferences["download_folder_name", "[-id-] -title-"])
         binding.okButton.setOnClickListener {
             val newValue = binding.edittext.text.toString()
 

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() {

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"))
                     )

app/src/main/java/xyz/quaver/pupil/util/downloader/Cache.kt

@@ -21,12 +21,9 @@ 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.*
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import kotlinx.coroutines.withContext
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
@@ -35,35 +32,38 @@ import okhttp3.Request
 import xyz.quaver.io.FileX
 import xyz.quaver.io.util.*
 import xyz.quaver.pupil.client
-import xyz.quaver.pupil.hitomi.GalleryBlock
+import xyz.quaver.pupil.hitomi.*
-import xyz.quaver.pupil.hitomi.GalleryInfo
-import xyz.quaver.pupil.hitomi.getGalleryBlock
-import xyz.quaver.pupil.hitomi.getGalleryInfo
 import java.io.File
 import java.io.IOException
+import java.io.InputStream
 import java.util.concurrent.ConcurrentHashMap
 
 @Serializable
-data class OldGalleryBlock(
+data class OldGalleryInfo(
-    val code: String,
+    val language_localname: String? = null,
-    val id: Int,
+    val language: String? = null,
-    val galleryUrl: String,
+    val date: String? = null,
-    val thumbnails: List<String>,
+    val files: List<OldGalleryFiles>,
-    val title: String,
+    val id: Int? = null,
-    val artists: List<String>,
+    val type: String? = null,
-    val series: List<String>,
+    val title: String? = null
-    val type: String,
-    val language: String,
-    val relatedTags: List<String>
 )
 
 @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 galleryBlock: GalleryBlock? = null,
-    var reader: OldReader? = null,
+    var reader: OldGalleryInfo? = null,
     var imageList: MutableList<String?>? = null
 ) {
     fun copy(): OldMetadata = OldMetadata(galleryBlock, reader, imageList?.let { MutableList(it.size) { i -> it[i] } })
@@ -75,20 +75,7 @@ data class Metadata(
     var galleryInfo: GalleryInfo? = null,
     var imageList: MutableList<String?>? = null
 ) {
-    constructor(old: OldMetadata) : this(old.galleryBlock?.let { galleryBlock -> GalleryBlock(
+    constructor(old: OldMetadata) : this(old.galleryBlock, getGalleryInfo(old.galleryBlock?.id ?: throw Exception()), old.imageList)
-        galleryBlock.id,
-        galleryBlock.galleryUrl,
-        galleryBlock.thumbnails,
-        galleryBlock.title,
-        galleryBlock.artists,
-        galleryBlock.series,
-        galleryBlock.type,
-        galleryBlock.language,
-        galleryBlock.relatedTags) },
-        old.reader?.galleryInfo,
-        old.imageList
-    )
-
     fun copy(): Metadata = Metadata(galleryBlock, galleryInfo, imageList?.let { MutableList(it.size) { i -> it[i] } })
 }
 
@@ -116,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)
@@ -171,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() }
@@ -207,11 +195,12 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
         metadata.imageList?.getOrNull(index)?.let { findFile(it) }
 
     @Suppress("BlockingMethodInNonBlockingContext")
-    fun putImage(index: Int, fileName: String, data: ByteArray) {
+    suspend fun putImage(index: Int, fileName: String, data: ByteArray) = coroutineScope {
         val file = cacheFolder.getChild(fileName)
 
         if (!file.exists())
             file.createNewFile()
+
         file.writeBytes(data)
         setMetadata { metadata -> metadata.imageList!![index] = fileName }
     }

app/src/main/java/xyz/quaver/pupil/util/downloader/DownloadManager.kt

@@ -20,8 +20,9 @@ package xyz.quaver.pupil.util.downloader
 
 import android.content.Context
 import android.content.ContextWrapper
-import android.util.Log
+import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
@@ -47,14 +48,12 @@ class DownloadManager private constructor(context: Context) : ContextWrapper(con
     val defaultDownloadFolder = FileX(this, getExternalFilesDir(null)!!)
 
     val downloadFolder: FileX
-        get() = {
+        get() = kotlin.runCatching {
-            kotlin.runCatching {
             FileX(this, Preferences.get<String>("download_folder"))
         }.getOrElse {
             Preferences["download_folder"] = defaultDownloadFolder.uri.toString()
             defaultDownloadFolder
         }
-        }.invoke()
 
     private var prevDownloadFolder: FileX? = null
     private var downloadFolderMapInstance: MutableMap<Int, String>? = null
@@ -63,21 +62,19 @@ class DownloadManager private constructor(context: Context) : ContextWrapper(con
         get() {
             if (prevDownloadFolder != downloadFolder) {
                 prevDownloadFolder = downloadFolder
-                downloadFolderMapInstance = {
+                downloadFolderMapInstance = run {
                     val file = downloadFolder.getChild(".download")
-
                     val data = if (file.exists())
                         kotlin.runCatching {
-                            file.readText()?.let { Json.decodeFromString<MutableMap<Int, String>>(it) }
+                            file.readText()?.let{ Json.decodeFromString<MutableMap<Int, String>>(it) }
                         }.onFailure { file.delete() }.getOrNull()
                     else
                         null
-
+                    data ?: run {
-                    data ?: {
                         file.createNewFile()
-                        mutableMapOf<Int, String>()
+                        mutableMapOf()
-                    }.invoke()
+                    }
-                }.invoke()
+                }
             }
 
             return downloadFolderMapInstance ?: mutableMapOf()
@@ -86,7 +83,7 @@ class DownloadManager private constructor(context: Context) : ContextWrapper(con
 
     @Synchronized
     fun isDownloading(galleryID: Int): Boolean {
-        val isThisGallery: (Call) -> Boolean = { (it.request().tag() as? DownloadService.Tag)?.galleryID == galleryID }
+        val isThisGallery: (Call) -> Boolean = { !it.isCanceled && (it.request().tag() as? DownloadService.Tag)?.galleryID == galleryID }
 
         return downloadFolderMap.containsKey(galleryID)
                 && client.dispatcher().let { it.queuedCalls().any(isThisGallery) || it.runningCalls().any(isThisGallery) }
@@ -96,23 +93,19 @@ class DownloadManager private constructor(context: Context) : ContextWrapper(con
     fun getDownloadFolder(galleryID: Int): FileX? =
         downloadFolderMap[galleryID]?.let { downloadFolder.getChild(it) }
 
-    @Synchronized
+    fun addDownloadFolder(galleryID: Int) = CoroutineScope(Dispatchers.IO).launch {
-    fun addDownloadFolder(galleryID: Int) {
+        val name = Cache.getInstance(this@DownloadManager, galleryID).getGalleryBlock()
-        val name = runBlocking {
+            ?.formatDownloadFolder() ?: return@launch
-            Cache.getInstance(this@DownloadManager, galleryID).getGalleryBlock()
-        }?.formatDownloadFolder() ?: return
 
         val folder = downloadFolder.getChild(name)
 
-        if (folder.exists())
+        downloadFolderMap[galleryID] = name
-            return
-
-        folder.mkdir()
-
-        downloadFolderMap[galleryID] = folder.name
 
         downloadFolder.getChild(".download").let { if (!it.exists()) it.createNewFile() }
         downloadFolder.getChild(".download").writeText(Json.encodeToString(downloadFolderMap))
+
+        if (folder.exists()) return@launch
+        folder.mkdir()
     }
 
     @Synchronized

app/src/main/java/xyz/quaver/pupil/util/misc.kt

@@ -19,12 +19,12 @@
 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.pupil.hitomi.GalleryBlock
 import xyz.quaver.pupil.hitomi.GalleryInfo
-import xyz.quaver.pupil.hitomi.getReferer
 import xyz.quaver.pupil.hitomi.imageUrlFromImage
 import java.util.*
 import kotlin.collections.ArrayList
@@ -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,18 +98,22 @@ fun GalleryBlock.formatDownloadFolderTest(format: String): String =
         }
     }.replace(Regex("""[*\\|"?><:/]"""), "").ellipsize(127)
 
-val GalleryInfo.requestBuilders: List<Request.Builder>
+suspend fun GalleryInfo.getRequestBuilders(): List<Request.Builder> {
-    get() {
+    val galleryID = this.id.toIntOrNull() ?: 0
-        val galleryID = this.id ?: 0
-        val lowQuality = Preferences["low_quality", true]
-
     return this.files.map {
         Request.Builder()
-                .url(imageUrlFromImage(galleryID, it, !lowQuality))
+            .url(
+                runCatching {
+                    imageUrlFromImage(galleryID, it, false)
+                }
+                .onFailure {
+                    FirebaseCrashlytics.getInstance().recordException(it)
+                }
+                .getOrDefault("https://a/")
+            )
             .header("Referer", "https://hitomi.la/")
-                .header("User-Agent", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.45 Safari/537.36")
-        }
     }
+}
 
 fun String.ellipsize(n: Int): String =
     if (this.length > n)

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()
             }
         }

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>

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>

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>

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"/>

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>

app/src/main/res/xml/root_preferences.xml

@@ -56,12 +56,6 @@
             app:key="nomedia"
             app:title="@string/settings_nomedia_title"/>
 
-        <SwitchPreferenceCompat
-            app:key="low_quality"
-            app:title="@string/settings_low_quality"
-            app:summary="@string/settings_low_quality_summary"
-            app:defaultValue="true"/>
-
     </PreferenceCategory>
 
     <PreferenceCategory

app/src/test/java/xyz/quaver/pupil/ExampleUnitTest.kt

@@ -26,15 +26,8 @@ package xyz.quaver.pupil
  * See [testing documentation](http://d.android.com/tools/testing).
  */
 
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import org.junit.Assert.assertEquals
-import org.junit.Before
 import org.junit.Test
-import xyz.quaver.pupil.hitomi.getGalleryInfo
-import xyz.quaver.pupil.hitomi.imageUrlFromImage
 import java.lang.reflect.ParameterizedType
-import java.util.concurrent.TimeUnit
 
 class ExampleUnitTest {
     @Test

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:firebase-crashlytics-gradle:2.8.1"
-        classpath "com.google.firebase:perf-plugin:1.4.0"
+        classpath "com.google.firebase:perf-plugin:1.4.1"
         classpath "com.google.android.gms:oss-licenses-plugin:0.10.4"
     }
 }
@@ -26,6 +26,7 @@ allprojects {
         jcenter()
         maven { url "https://jitpack.io" }
         maven { url "https://guardian.github.io/maven/repo-releases/" }
+        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
     }
 }
 

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

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