Merge remote-tracking branch 'origin/master'

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

.idea/deploymentTargetDropDown.xml

@@ -12,6 +12,6 @@
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-01-08T00:45:48.713777Z" />
+    <timeTargetWasSelectedWithDropDown value="2022-01-31T00:48:12.732208Z" />
   </component>
 </project>

.idea/misc.xml

@@ -3,7 +3,11 @@
   <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>

README.md

@@ -2,7 +2,7 @@
 *Pupil, Hitomi.la viewer for Android*  
 
 ![](https://img.shields.io/github/downloads/tom5079/Pupil/total)  
-[![](https://img.shields.io/github/downloads/tom5079/Pupil/5.2.8/Pupil-v5.2.8.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.2.8/Pupil-v5.2.8.apk)
+[![](https://img.shields.io/github/downloads/tom5079/Pupil/5.2.23/Pupil-v5.2.23.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.2.23/Pupil-v5.2.23.apk)  
 [![](https://discordapp.com/api/guilds/610452916612104194/embed.png?style=banner2)](https://discord.gg/Stj4b5v)
 
 # Features

app/build.gradle

@@ -38,7 +38,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 31
         versionCode 69
-        versionName "5.2.8"
+        versionName "5.2.24"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -82,19 +82,20 @@ dependencies {
     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.4.0"
+    implementation "androidx.appcompat:appcompat:1.4.1"
     implementation "androidx.activity:activity-ktx:1.4.0"
     implementation "androidx.fragment:fragment-ktx:1.4.0"
     implementation "androidx.preference:preference-ktx:1.1.1"
     implementation "androidx.recyclerview:recyclerview:1.2.1"
-    implementation "androidx.constraintlayout:constraintlayout:2.1.2"
+    implementation "androidx.constraintlayout:constraintlayout:2.1.3"
     implementation "androidx.gridlayout:gridlayout:1.0.0"
     implementation "androidx.biometric:biometric:1.1.0"
     implementation "androidx.work:work-runtime-ktx:2.7.1"
+    implementation 'androidx.webkit:webkit:1.4.0'
 
     implementation "com.daimajia.swipelayout:library:1.2.0@aar"
 
-    implementation "com.google.android.material:material:1.4.0"
+    implementation "com.google.android.material:material:1.5.0"
 
     implementation platform('com.google.firebase:firebase-bom:29.0.3')
     implementation "com.google.firebase:firebase-analytics-ktx"
@@ -102,7 +103,7 @@ dependencies {
     implementation "com.google.firebase:firebase-perf-ktx"
 
     implementation "com.google.android.gms:play-services-oss-licenses:17.0.0"
-    implementation "com.google.android.gms:play-services-mlkit-face-detection:16.2.1"
+    implementation "com.google.android.gms:play-services-mlkit-face-detection:17.0.0"
 
     implementation "com.github.clans:fab:1.6.4"
 
@@ -111,6 +112,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,8 +129,6 @@ dependencies {
 
     implementation "org.jsoup:jsoup:1.14.3"
 
-    implementation "com.google.guava:guava:31.0.1-android"
-
     implementation "xyz.quaver:documentfilex:0.7.2"
     implementation "xyz.quaver:floatingsearchview:1.1.7"
 

app/proguard-rules.pro

@@ -33,4 +33,4 @@
 }
 -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.** { *; }

app/release/output-metadata.json

@@ -12,7 +12,7 @@
       "filters": [],
       "attributes": [],
       "versionCode": 69,
-      "versionName": "5.2.8",
+      "versionName": "5.2.23",
       "outputFile": "app-release.apk"
     }
   ],

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

@@ -20,10 +20,13 @@
 
 package xyz.quaver.pupil
 
+import android.os.Build
 import android.util.Log
 import android.webkit.*
+import android.widget.Toast
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.*
 import org.junit.Before
 import org.junit.Test
@@ -43,30 +46,7 @@ class ExampleInstrumentedTest {
 
         runBlocking {
             withContext(Dispatchers.Main) {
-                webView = WebView(appContext).apply {
+                initWebView(appContext)
-                    settings.javaScriptEnabled = true
-
-                    addJavascriptInterface(object {
-                        @JavascriptInterface
-                        fun onResult(uid: String, result: String) {
-                            _webViewFlow.tryEmit(uid to result)
-                        }
-                    }, "Callback")
-
-                    loadDataWithBaseURL(
-                        "https://hitomi.la/",
-                        """
-                            <script src="https://ltn.hitomi.la/jquery.min.js"></script>
-                            <script src="https://ltn.hitomi.la/common.js"></script>
-                            <script src="https://ltn.hitomi.la/search.js"></script>
-                            <script src="https://ltn.hitomi.la/searchlib.js"></script>
-                            <script src="https://ltn.hitomi.la/results.js></script>
-                        """.trimIndent(),
-                        "text/html",
-                        null,
-                        null
-                    )
-                }
             }
         }
     }
@@ -74,7 +54,7 @@ class ExampleInstrumentedTest {
     @Test
     fun test_getGalleryIDsFromNozomi() {
         runBlocking {
-            val result = getGalleryIDsFromNozomi(null, "index", "all")
+            val result = getGalleryIDsFromNozomi(null, "boten", "all")
 
             Log.d("PUPILD", "getGalleryIDsFromNozomi: ${result.size}")
         }
@@ -120,10 +100,19 @@ class ExampleInstrumentedTest {
         }
     }
 
+    @Test
+    fun test_getGallery() {
+        runBlocking {
+            val gallery = getGallery(2109479)
+
+            Log.d("PUPILD", gallery.toString())
+        }
+    }
+
     @Test
     fun test_getGalleryBlock() {
         runBlocking {
-            val block = getGalleryBlock(2102731)
+            val block = getGalleryBlock(2119310)
 
             Log.d("PUPILD", block.toString())
         }

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

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

@@ -25,15 +25,15 @@ import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
 import android.content.Intent
-import android.content.pm.ApplicationInfo
 import android.net.Uri
 import android.os.Build
 import android.util.Log
 import android.webkit.*
-import android.widget.Toast
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.ContextCompat
 import androidx.preference.PreferenceManager
+import androidx.webkit.WebViewCompat
+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
@@ -41,12 +41,14 @@ import com.google.android.gms.common.GooglePlayServicesRepairableException
 import com.google.android.gms.security.ProviderInstaller
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.*
-import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
 import okhttp3.*
 import xyz.quaver.io.FileX
 import xyz.quaver.pupil.hitomi.evaluationContext
+import xyz.quaver.pupil.types.JavascriptException
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.util.*
 import java.io.File
@@ -79,15 +81,10 @@ val client: OkHttpClient
 
 @SuppressLint("StaticFieldLeak")
 lateinit var webView: WebView
-val _webViewFlow = MutableSharedFlow<Pair<String, String?>>(
+val _webViewFlow = MutableSharedFlow<Pair<String, String?>>()
-    extraBufferCapacity = 2,
-    onBufferOverflow = BufferOverflow.DROP_OLDEST
-)
 val webViewFlow = _webViewFlow.asSharedFlow()
 var webViewReady = false
-    private set
+var oldWebView = false
-var webViewFailed = false
-    private set
 private var reloadJob: Job? = null
 
 fun reloadWebView() {
@@ -95,19 +92,17 @@ fun reloadWebView() {
 
     reloadJob = CoroutineScope(Dispatchers.IO).launch {
         webViewReady = false
-        webViewFailed = false
+        oldWebView = false
 
-        evaluationContext.cancelChildren()
+        evaluationContext.cancelChildren(CancellationException("reload"))
 
         runCatching {
             URL(
-                if (isDebugBuild)
+                if (BuildConfig.DEBUG)
-                    "https://tom5079.github.io/Pupil/hitomi-dev.html"
+                    "https://tom5079.github.io/PupilSources/hitomi-dev.html"
                 else
-                    "https://tom5079.github.io/Pupil/hitomi.html"
+                    "https://tom5079.github.io/PupilSources/hitomi.html"
             ).readText()
-        }.onFailure {
-            webViewFailed = true
         }.getOrNull()?.let { html ->
             launch(Dispatchers.Main) {
                 webView.loadDataWithBaseURL(
@@ -126,13 +121,13 @@ private var htmlVersion: String = ""
 fun reloadWhenFailedOrUpdate() = CoroutineScope(Dispatchers.Default).launch {
     while (true) {
         if (
-            webViewFailed ||
+            (!webViewReady && !oldWebView) ||
             runCatching {
                 URL(
-                    if (isDebugBuild)
+                    if (BuildConfig.DEBUG)
-                        "https://tom5079.github.io/Pupil/hitomi-dev.html.ver"
+                        "https://tom5079.github.io/PupilSources/hitomi-dev.html.ver"
                     else
-                        "https://tom5079.github.io/Pupil/hitomi.html.ver"
+                        "https://tom5079.github.io/PupilSources/hitomi.html.ver"
                 ).readText()
             }.getOrNull().let { version ->
                 (!version.isNullOrEmpty() && version != htmlVersion).also {
@@ -143,28 +138,15 @@ fun reloadWhenFailedOrUpdate() = CoroutineScope(Dispatchers.Default).launch {
             reloadWebView()
         }
 
-        delay(if (webViewReady && !webViewFailed) 10000 else 1000)
+        delay(if (webViewReady) 10000 else 1000)
     }
 }
 
-var isDebugBuild: Boolean = false
+@SuppressLint("SetJavaScriptEnabled")
-lateinit var userAgent: String
+fun initWebView(context: Context) {
+    if (BuildConfig.DEBUG) WebView.setWebContentsDebuggingEnabled(true)
 
-class Pupil : Application() {
+    webView = WebView(context).apply {
-
-    companion object {
-        lateinit var instance: Pupil
-            private set
-    }
-
-    @SuppressLint("SetJavaScriptEnabled")
-    override fun onCreate() {
-        instance = this
-        isDebugBuild = applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE != 0
-
-        if (isDebugBuild) WebView.setWebContentsDebuggingEnabled(true)
-
-        webView = WebView(this).apply {
         with (settings) {
             javaScriptEnabled = true
             domStorageEnabled = true
@@ -174,7 +156,12 @@ class Pupil : Application() {
 
         webViewClient = object: WebViewClient() {
             override fun onPageFinished(view: WebView?, url: String?) {
-                    webViewReady = true
+                webView.evaluateJavascript("try { self_test() } catch (err) { 'err' }") {
+                    val result: String = Json.decodeFromString(it)
+
+                    oldWebView = result == "es2020_unsupported";
+                    webViewReady = result == "OK";
+                }
             }
 
             override fun onReceivedError(
@@ -203,20 +190,40 @@ class Pupil : Application() {
         addJavascriptInterface(object {
             @JavascriptInterface
             fun onResult(uid: String, result: String) {
-                    _webViewFlow.tryEmit(uid to result)
+                CoroutineScope(Dispatchers.Unconfined).launch {
+                    _webViewFlow.emit(uid to result)
+                }
             }
             @JavascriptInterface
-                fun onError(uid: String, message: String) {
+            fun onError(uid: String, script: String, message: String, stack: String) {
-                    _webViewFlow.tryEmit(uid to null)
+                CoroutineScope(Dispatchers.Unconfined).launch {
-                    Toast.makeText(this@Pupil, message, Toast.LENGTH_LONG).show()
+                    _webViewFlow.emit(uid to "")
+                }
+
                 FirebaseCrashlytics.getInstance().recordException(
-                        Exception(message)
+                    JavascriptException("onError script: $script\nmessage: $message\nstack: $stack")
                 )
             }
         }, "Callback")
     }
 
     reloadWhenFailedOrUpdate()
+}
+
+lateinit var userAgent: String
+
+class Pupil : Application() {
+
+    companion object {
+        lateinit var instance: Pupil
+            private set
+    }
+
+    @SuppressLint("SetJavaScriptEnabled")
+    override fun onCreate() {
+        instance = this
+
+        initWebView(this)
 
         AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
 
@@ -238,6 +245,7 @@ class Pupil : Application() {
             .addInterceptor { chain ->
                 val request = chain.request().newBuilder()
                     .header("User-Agent", userAgent)
+                    .header("Referer", "https://hitomi.la/")
                     .build()
 
                 val tag = request.tag() ?: return@addInterceptor chain.proceed(request)
@@ -291,7 +299,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,56 +0,0 @@
-/*
- *    Copyright 2019 tom5079
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package xyz.quaver
-
-import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.modules.SerializersModule
-import kotlinx.serialization.modules.plus
-import kotlinx.serialization.modules.polymorphic
-import kotlinx.serialization.modules.subclass
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import xyz.quaver.pupil.client
-import java.io.IOException
-import java.net.URL
-import java.util.concurrent.TimeUnit
-import kotlin.time.Duration
-
-/**
- * kotlinx.serialization.json.Json object for global use  
- * properties should not be changed
- *
- * @see [https://kotlin.github.io/kotlinx.serialization/kotlinx-serialization-core/kotlinx-serialization-core/kotlinx.serialization.json/-json/index.html]
- */
-val json = Json {
-    isLenient = true
-    ignoreUnknownKeys = true
-    allowSpecialFloatingPointValues = true
-    useArrayPolymorphism = true
-}
-
-typealias HeaderSetter = (Request.Builder) -> Request.Builder
-fun URL.readText(settings: HeaderSetter? = null): String {
-    val request = Request.Builder()
-        .url(this).let { 
-            settings?.invoke(it) ?: it
-        }.build()
-    
-    return client.newCall(request).execute().also{ if (it.code() != 200) throw IOException() }.body()?.use { it.string() } ?: throw IOException()
-}

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

@@ -18,9 +18,6 @@ package xyz.quaver.pupil.hitomi
 
 import android.util.Log
 import android.webkit.WebView
-import android.widget.Toast
-import com.google.common.collect.ConcurrentHashMultiset
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
@@ -29,10 +26,8 @@ import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import xyz.quaver.json
 import xyz.quaver.pupil.*
 import java.util.*
-import java.util.concurrent.ConcurrentHashMap
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
@@ -40,14 +35,29 @@ const val protocol = "https:"
 
 val evaluationContext = Dispatchers.Main + Job()
 
-suspend fun WebView.evaluate(script: String): String = coroutineScope {
+/**
+ * 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
+}
+
+suspend inline fun <reified T> WebView.evaluate(script: String): T = coroutineScope { withTimeout(60000) {
     var result: String? = null
 
     while (result == null) {
         try {
-            result = withContext(evaluationContext) {
+            while (!oldWebView && !webViewReady) delay(1000)
-                while (webViewFailed || !webViewReady) yield()
 
+            result = if (oldWebView)
+                "null"
+            else withContext(evaluationContext) {
                 suspendCoroutine { continuation ->
                     evaluateJavascript(script) {
                         continuation.resume(it)
@@ -56,29 +66,29 @@ suspend fun WebView.evaluate(script: String): String = coroutineScope {
 
             }
         } catch (e: CancellationException) {
-            continue
+            if (e.message != "reload") result = "null"
         }
     }
 
-    result
+    json.decodeFromString(result)
-}
+} }
 
 @OptIn(ExperimentalCoroutinesApi::class)
-suspend fun WebView.evaluatePromise(
+suspend inline fun <reified T> WebView.evaluatePromise(
     script: String,
-    then: String = ".then(result => Callback.onResult(%uid, JSON.stringify(result))).catch(err => Callback.onError(%uid, JSON.stringify(error)))"
+    then: String = ".then(result => Callback.onResult(%uid, JSON.stringify(result))).catch(err => Callback.onError(%uid, String.raw`$script`, err.message, err.stack))"
-): String? = coroutineScope {
+): T = coroutineScope { withTimeout(60000) {
     var result: String? = null
 
     while (result == null) {
         try {
-            result = withContext(evaluationContext) {
+            while (!oldWebView && !webViewReady) delay(1000)
-                while (webViewFailed || !webViewReady) yield()
 
+            result = if (oldWebView)
+                "null"
+            else withContext(evaluationContext) {
                 val uid = UUID.randomUUID().toString()
 
-                evaluateJavascript((script + then).replace("%uid", "'$uid'"), null)
-
                 val flow: Flow<Pair<String, String?>> = webViewFlow.transformWhile { (currentUid, result) ->
                     if (currentUid == uid) {
                         emit(currentUid to result)
@@ -86,34 +96,33 @@ suspend fun WebView.evaluatePromise(
                     currentUid != uid
                 }
 
+                launch {
+                    evaluateJavascript((script + then).replace("%uid", "'$uid'"), null)
+                }
+
                 flow.first().second
             }
         } catch (e: CancellationException) {
-            continue
+            if (e.message != "reload") result = "null"
         }
     }
 
-    result
+    json.decodeFromString(result)
-}
+} }
 
 @Suppress("EXPERIMENTAL_API_USAGE")
-suspend fun getGalleryInfo(galleryID: Int): GalleryInfo {
+suspend fun getGalleryInfo(galleryID: Int): GalleryInfo =
-    val result = webView.evaluatePromise("get_gallery_info($galleryID)")
+    webView.evaluatePromise("get_gallery_info($galleryID)")
-
-    return json.decodeFromString(result!!)
-}
 
 //common.js
 const val domain = "ltn.hitomi.la"
-const val galleryblockdir = "galleryblock"
-const val nozomiextension = ".nozomi"
 
 val String?.js: String
     get() = if (this == null) "null" else "'$this'"
 
 @OptIn(ExperimentalSerializationApi::class)
-suspend fun urlFromUrlFromHash(galleryID: Int, image: GalleryFiles, dir: String? = null, ext: String? = null, base: String? = null): String {
+suspend fun urlFromUrlFromHash(galleryID: Int, image: GalleryFiles, dir: String? = null, ext: String? = null, base: String? = null): String =
-    val result = webView.evaluate(
+    webView.evaluate(
         """
         url_from_url_from_hash(
             ${galleryID.toString().js},
@@ -123,9 +132,6 @@ suspend fun urlFromUrlFromHash(galleryID: Int, image: GalleryFiles, dir: String?
         """.trimIndent()
     )
 
-    return Json.decodeFromString(result)
-}
-
 suspend fun imageUrlFromImage(galleryID: Int, image: GalleryFiles, noWebp: Boolean) : String {
     return when {
         noWebp ->

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

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

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

@@ -17,15 +17,7 @@
 package xyz.quaver.pupil.hitomi
 
 import kotlinx.serialization.Serializable
-import org.jsoup.Jsoup
 import xyz.quaver.pupil.webView
-import xyz.quaver.readText
-import java.net.URL
-import java.net.URLDecoder
-import java.nio.ByteBuffer
-import java.nio.ByteOrder
-import java.util.*
-import javax.net.ssl.HttpsURLConnection
 
 @Serializable
 data class GalleryBlock(
@@ -36,44 +28,9 @@ data class GalleryBlock(
     val artists: List<String>,
     val series: List<String>,
     val type: String,
-    val language: String,
+    val language: String?,
     val relatedTags: List<String>
 )
 
-suspend fun getGalleryBlock(galleryID: Int) : GalleryBlock {
+suspend fun getGalleryBlock(galleryID: Int) : GalleryBlock =
-    val url = "$protocol//$domain/$galleryblockdir/$galleryID$extension"
+    webView.evaluatePromise("get_gallery_block($galleryID)")
-
-    val html: String = webView.evaluatePromise(
-        """
-        $.get('$url').always(function(data, status) {
-            if (status === 'success') {
-                Callback.onResult(%uid, data);
-            }
-        }); 
-        """.trimIndent(),
-        then = ""
-    )!!
-
-    val doc = Jsoup.parse(html)
-
-    val galleryUrl = doc.selectFirst("h1 > a")!!.attr("href")
-
-    val thumbnails = doc.select(".dj-img-cont img").map { protocol + it.attr("src") }
-
-    val title = doc.selectFirst("h1 > a")!!.text()
-    val artists = doc.select(".artist-list a").map{ it.text() }
-    val series = doc.select(".dj-content a[href~=^/series/]").map { it.text() }
-    val type = doc.selectFirst("a[href~=^/type/]")!!.text()
-
-    val language = run {
-        val href = doc.select("a[href~=^/index.+\\.html\$]").attr("href")
-        Regex("""index-([^-]+)(-.+)?\.html""").find(href)?.groupValues?.getOrNull(1) ?: ""
-    }
-
-    val relatedTags = doc.select(".relatedtags a").map {
-        val href = URLDecoder.decode(it.attr("href"), "UTF-8")
-        href.slice(5 until href.indexOf("-all"))
-    }
-
-    return GalleryBlock(galleryID, galleryUrl, thumbnails, title, artists, series, type, language, relatedTags)
-}

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

@@ -16,7 +16,8 @@
 
 package xyz.quaver.pupil.hitomi
 
-import kotlinx.coroutines.*
+import kotlinx.coroutines.async
+import kotlinx.coroutines.coroutineScope
 import java.util.*
 
 suspend fun doSearch(query: String, sortByPopularity: Boolean = false) : Set<Int> = coroutineScope {
@@ -47,7 +48,7 @@ suspend fun doSearch(query: String, sortByPopularity: Boolean = false) : Set<Int
         }
     }
 
-    val negativeResults = negativeTerms.map {
+    val negativeResults = negativeTerms.mapIndexed { index, it ->
         async {
             runCatching {
                 getGalleryIDsForQuery(it)
@@ -55,21 +56,21 @@ suspend fun doSearch(query: String, sortByPopularity: Boolean = false) : Set<Int
         }
     }
 
-    var results = when {
+    val results = when {
         sortByPopularity -> getGalleryIDsFromNozomi(null, "popular", "all")
         positiveTerms.isEmpty() -> getGalleryIDsFromNozomi(null, "index", "all")
         else -> emptySet()
-    }
+    }.toMutableSet()
 
     fun filterPositive(newResults: Set<Int>) {
-        results = when {
+        when {
-            results.isEmpty() -> newResults
+            results.isEmpty() -> results.addAll(newResults)
-            else -> results intersect newResults
+            else -> results.retainAll(newResults)
         }
     }
 
     fun filterNegative(newResults: Set<Int>) {
-        results = results subtract newResults
+        results.removeAll(newResults)
     }
 
     //positive results
@@ -78,7 +79,7 @@ suspend fun doSearch(query: String, sortByPopularity: Boolean = false) : Set<Int
     }
 
     //negative results
-    negativeResults.forEach {
+    negativeResults.forEachIndexed { index, it ->
         filterNegative(it.await())
     }
 

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

@@ -16,6 +16,7 @@
 
 package xyz.quaver.pupil.hitomi
 
+import android.util.Log
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
@@ -26,25 +27,31 @@ import xyz.quaver.pupil.webView
 const val extension = ".html"
 
 @OptIn(ExperimentalSerializationApi::class)
-suspend fun getGalleryIDsForQuery(query: String) : Set<Int> {
+suspend fun getGalleryIDsForQuery(query: String) : Set<Int> =
-    val result = webView.evaluatePromise("get_galleryids_for_query('$query')") ?: return emptySet()
+    webView.evaluatePromise("get_galleryids_for_query('$query')")
-
-    return Json.decodeFromString(result)
-}
 
 @Serializable
 data class Suggestion(val s: String, val t: Int, val u: String, val n: String)
 
 @OptIn(ExperimentalSerializationApi::class)
-suspend fun getSuggestionsForQuery(query: String) : List<Suggestion> {
+suspend fun getSuggestionsForQuery(query: String) : List<Suggestion> =
-    val result = webView.evaluatePromise("get_suggestions_for_query('$query')") ?: return emptyList()
+    webView.evaluatePromise(
-
+        "get_suggestions_for_query('$query', ++search_serial)",
-    return Json.decodeFromString<List<List<Suggestion>?>>(result)[0] ?: return emptyList()
+        then = """
-}
+            .then(r => {
+                let [results, results_serial] = r;
+                if (search_serial !== results_serial) {
+                    Callback.onResult(%uid, '[]');
+                } else {
+                    Callback.onResult(%uid, JSON.stringify(results));
+                }
+            });
+        """.trimIndent()
+    )
 
 @OptIn(ExperimentalSerializationApi::class)
 suspend fun getGalleryIDsFromNozomi(area: String?, tag: String, language: String) : Set<Int> {
     val jsArea = if (area == null) "null" else "'$area'"
 
-    return Json.decodeFromString(webView.evaluatePromise("""get_galleryids_from_nozomi($jsArea, '$tag', '$language')""") ?: return emptySet())
+    return webView.evaluatePromise("""get_galleryids_from_nozomi($jsArea, '$tag', '$language')""")
 }

app/src/main/java/xyz/quaver/pupil/receiver/UpdateBroadcastReceiver.kt

@@ -60,8 +60,10 @@ class UpdateBroadcastReceiver : BroadcastReceiver() {
 
                             when (uri.scheme) {
                                 "file" ->
-                                    FileProvider.getUriForFile(context, context.applicationContext.packageName + ".provider", File(uri.path!!)
+                                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
-                                    )
+                                        FileProvider.getUriForFile(context, context.applicationContext.packageName + ".provider", File(uri.path!!))
+                                    else
+                                        uri
                                 "content" -> uri
                                 else -> null
                             }
@@ -74,7 +76,7 @@ class UpdateBroadcastReceiver : BroadcastReceiver() {
 
                 val notificationManager = NotificationManagerCompat.from(context)
 
-                val pendingIntent = PendingIntent.getActivity(context, 0, Intent(Intent.ACTION_VIEW).apply {
+                val pendingIntent = PendingIntent.getActivity(context, System.currentTimeMillis().toInt(), Intent(Intent.ACTION_VIEW).apply {
                     flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NEW_TASK
                     setDataAndType(uri, MimeTypeMap.getSingleton().getMimeTypeFromExtension("apk"))
                 }, if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_IMMUTABLE else 0)

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

@@ -29,7 +29,6 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.TaskStackBuilder
 import androidx.core.content.ContextCompat
-import com.google.common.util.concurrent.RateLimiter
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -166,24 +165,19 @@ class DownloadService : Service() {
         }
     }
 
-    private val rateLimiter = RateLimiter.create(2.0)
-    private val rateLimitHost = Regex("..?\\.hitomi.la")
-
     private val interceptor: PupilInterceptor = { chain ->
         val request = chain.request()
 
-        if (rateLimitHost.matches(request.url().host()))
-            rateLimiter.acquire()
-
         var response = chain.proceed(request)
         var limit = 5
 
-        if (!response.isSuccessful && limit > 0) {
+        while (!response.isSuccessful) {
-            Thread.sleep(10000)
+            if (response.code() == 503) {
-            if (rateLimitHost.matches(request.url().host()))
+                Thread.sleep(200)
-                rateLimiter.acquire()
+            } else if (--limit > 0)
+                break
+
             response = chain.proceed(request)
-            limit -= 1
         }
 
         response.newBuilder()
@@ -224,31 +218,34 @@ 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 {
+                    response.also {
+                        if (it.code() != 200) throw IOException(
+                            "$galleryID $index ${response.request().url()} CODE ${it.code()}"
+                        )
+                    }.body()?.use {
                         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", it.byteStream())
-                        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) }
                         }
+                    } ?: throw Exception("Response null")
                 }.onFailure {
                     FirebaseCrashlytics.getInstance().recordException(it)
                 }
             }
-            }.onFailure {
-                FirebaseCrashlytics.getInstance().recordException(it)
-            }
         }
     }
 
@@ -332,8 +329,6 @@ class DownloadService : Service() {
         }
 
         if (isCompleted(galleryID)) {
-            if (DownloadManager.getInstance(this@DownloadService)
-                    .getDownloadFolder(galleryID) != null )
             Cache.getInstance(this@DownloadService, galleryID).moveToDownload()
 
             notificationManager.cancel(galleryID)

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

@@ -19,6 +19,7 @@
 package xyz.quaver.pupil.ui
 
 import android.annotation.SuppressLint
+import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.net.Uri
 import android.os.Build
@@ -37,6 +38,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.view.GravityCompat
 import androidx.core.view.ViewCompat
 import androidx.recyclerview.widget.RecyclerView
+import androidx.webkit.WebViewCompat
 import com.google.android.material.navigation.NavigationView
 import com.google.android.material.snackbar.Snackbar
 import com.google.firebase.crashlytics.FirebaseCrashlytics
@@ -105,6 +107,8 @@ class MainActivity :
 
     private lateinit var binding: MainActivityBinding
 
+    private var oldWebViewJob: Job? = null
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = MainActivityBinding.inflate(layoutInflater)
@@ -125,9 +129,40 @@ class MainActivity :
         if (Preferences["download_folder", ""].isEmpty())
             DownloadLocationDialogFragment().show(supportFragmentManager, "Download Location Dialog")
 
+        oldWebViewJob = CoroutineScope(Dispatchers.Unconfined).launch {
+            do {
+                delay(1000)
+                if (oldWebView) {
+                    AlertDialog.Builder(this@MainActivity)
+                        .setTitle(android.R.string.dialog_alert_title)
+                        .setMessage(R.string.old_webview)
+                        .setCancelable(false)
+                        .setPositiveButton(android.R.string.ok) { _, _ ->
+                            WebViewCompat.getCurrentWebViewPackage(this@MainActivity)?.packageName?.let { packageName ->
+                                try {
+                                    startActivity(
+                                        Intent(
+                                            Intent.ACTION_VIEW,
+                                            Uri.parse("market://details?id=$packageName")
+                                        )
+                                    )
+                                } catch (e: ActivityNotFoundException) {
+                                    startActivity(
+                                        Intent(
+                                            Intent.ACTION_VIEW,
+                                            Uri.parse("https://play.google.com/store/apps/details?id=$packageName")
+                                        )
+                                    )
+                                }
+                            }
+                        }
+                        .show()
+                    break
+                }
+            } while (isActive)
+        }
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R &&
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && !Preferences["download_folder_ignore_warning", false] &&
-            !Preferences["download_folder_ignore_warning", false] &&
             ContextCompat.getExternalFilesDirs(this, null).filterNotNull().map { Uri.fromFile(it).toString() }
                 .contains(Preferences["download_folder", ""])
         ) {
@@ -169,6 +204,8 @@ class MainActivity :
     override fun onDestroy() {
         super.onDestroy()
 
+        oldWebViewJob?.cancel()
+
         (binding.contents.recyclerview.adapter as? GalleryBlockAdapter)?.updateAll = false
     }
 
@@ -801,7 +838,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/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,37 @@
 
 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.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 +95,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 ?: 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 +246,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,7 +21,6 @@ package xyz.quaver.pupil.util.downloader
 import android.content.Context
 import android.content.ContextWrapper
 import android.net.Uri
-import android.util.Log
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -40,9 +39,9 @@ import xyz.quaver.pupil.hitomi.GalleryBlock
 import xyz.quaver.pupil.hitomi.GalleryInfo
 import xyz.quaver.pupil.hitomi.getGalleryBlock
 import xyz.quaver.pupil.hitomi.getGalleryInfo
-import xyz.quaver.pupil.userAgent
 import java.io.File
 import java.io.IOException
+import java.io.InputStream
 import java.util.concurrent.ConcurrentHashMap
 
 @Serializable
@@ -210,12 +209,14 @@ 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) {
+    fun putImage(index: Int, fileName: String, data: InputStream) {
         val file = cacheFolder.getChild(fileName)
 
         if (!file.exists())
             file.createNewFile()
-        file.writeBytes(data)
+        file.outputStream()?.use {
+            data.copyTo(it)
+        }
         setMetadata { metadata -> metadata.imageList!![index] = fileName }
     }
 
@@ -228,6 +229,9 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
             return@launch
 
         (lock[galleryID] ?: Mutex().also { lock[galleryID] = it }).withLock {
+            if (downloadFolder.exists()) downloadFolder.deleteRecursively()
+            downloadFolder.mkdir()
+
             val cacheMetadata = cacheFolder.getChild(".metadata")
             val downloadMetadata = downloadFolder.getChild(".metadata")
 

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

@@ -27,6 +27,7 @@ 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 xyz.quaver.pupil.userAgent
 import java.util.*
 import kotlin.collections.ArrayList
 
@@ -114,7 +115,7 @@ suspend fun GalleryInfo.getRequestBuilders(): List<Request.Builder> {
                 .getOrDefault("https://a/")
             )
             .header("Referer", "https://hitomi.la/")
-            .header("User-Agent", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.45 Safari/537.36")
+            .header("User-Agent", userAgent)
     }
 }
 

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,6 @@
     <string name="settings_max_concurrent_download">並列ダウンロード</string>
     <string name="unaccessible_download_folder">アンドロイド11以上では外部からのアプリ内部空間接近が不可能です。ダウンロードフォルダを変更しますか？</string>
     <string name="settings_networking">ネットワーク</string>
+    <string name="old_webview">WebViewのアップデートが必要です</string>
+    <string name="settings_recover_downloads">ダウンロードデータベースを再構築</string>
 </resources>

app/src/main/res/values-ko/strings.xml

@@ -157,4 +157,6 @@
     <string name="settings_max_concurrent_download">병렬 다운로드</string>
     <string name="unaccessible_download_folder">안드로이드 11 이상에서는 외부에서 현재 다운로드 폴더에 접근할 수 없습니다. 변경하시겠습니까?</string>
     <string name="settings_networking">네트워크</string>
+    <string name="old_webview">WebView 업데이트가 필요합니다</string>
+    <string name="settings_recover_downloads">다운로드 데이터베이스 복구</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -51,6 +51,8 @@
 
     <string name="unaccessible_download_folder">From Android 11 and above, current Download folder cannot be accessed by outside apps. Would you like to change the download folder?</string>
 
+    <string name="old_webview">You are using an old version of WebView. Please update it on PlayStore</string>
+
     <string name="main_drawer_home">Home</string>
     <string name="main_drawer_history">History</string>
     <string name="main_drawer_downloads">Downloads</string>
@@ -150,6 +152,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"/>

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath 'com.android.tools.build:gradle:7.1.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"
@@ -14,7 +14,7 @@ buildscript {
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
         classpath "com.google.firebase:firebase-crashlytics-gradle:2.8.1"
-        classpath "com.google.firebase:perf-plugin:1.4.0"
+        classpath "com.google.firebase:perf-plugin:1.4.1"
         classpath "com.google.android.gms:oss-licenses-plugin:0.10.4"
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip