Fixed Download location dialog keep popping up

.idea/deploymentTargetDropDown.xml

@@ -12,6 +12,6 @@
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-01-04T14:06:06.261345Z" />
+    <timeTargetWasSelectedWithDropDown value="2022-01-08T00:45:48.713777Z" />
   </component>
 </project>

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.6/Pupil-v5.2.6.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.2.6/Pupil-v5.2.6.apk)
+[![](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://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.6"
+        versionName "5.2.8"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

app/release/output-metadata.json

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

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

@@ -39,7 +39,6 @@ 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.android.material.snackbar.Snackbar
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.BufferOverflow
@@ -47,13 +46,12 @@ import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import okhttp3.*
 import xyz.quaver.io.FileX
-import xyz.quaver.pupil.hitomi.evaluations
+import xyz.quaver.pupil.hitomi.evaluationContext
 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.ConcurrentHashMap
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 import kotlin.reflect.KClass
@@ -96,31 +94,29 @@ fun reloadWebView() {
     if (reloadJob?.isActive == true) return
 
     reloadJob = CoroutineScope(Dispatchers.IO).launch {
-        if (evaluations.isEmpty()) {
+        webViewReady = false
-            webViewReady = false
+        webViewFailed = false
-            webViewFailed = false
 
-            while (evaluations.isNotEmpty()) yield()
+        evaluationContext.cancelChildren()
 
-            runCatching {
+        runCatching {
-                URL(
+            URL(
-                    if (isDebugBuild)
+                if (isDebugBuild)
-                        "https://tom5079.github.io/Pupil/hitomi-dev.html"
+                    "https://tom5079.github.io/Pupil/hitomi-dev.html"
-                    else
+                else
-                        "https://tom5079.github.io/Pupil/hitomi.html"
+                    "https://tom5079.github.io/Pupil/hitomi.html"
-                ).readText()
+            ).readText()
-            }.onFailure {
+        }.onFailure {
-                webViewFailed = true
+            webViewFailed = true
-            }.getOrNull()?.let { html ->
+        }.getOrNull()?.let { html ->
-                launch(Dispatchers.Main) {
+            launch(Dispatchers.Main) {
-                    webView.loadDataWithBaseURL(
+                webView.loadDataWithBaseURL(
-                        "https://hitomi.la/",
+                    "https://hitomi.la/",
-                        html,
+                    html,
-                        "text/html",
+                    "text/html",
-                        null,
+                    null,
-                        null
+                    null
-                    )
+                )
-                }
             }
         }
     }
@@ -152,7 +148,7 @@ fun reloadWhenFailedOrUpdate() = CoroutineScope(Dispatchers.Default).launch {
 }
 
 var isDebugBuild: Boolean = false
-private lateinit var userAgent: String
+lateinit var userAgent: String
 
 class Pupil : Application() {
 
@@ -166,7 +162,7 @@ class Pupil : Application() {
         instance = this
         isDebugBuild = applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE != 0
 
-        WebView.setWebContentsDebuggingEnabled(true)
+        if (isDebugBuild) WebView.setWebContentsDebuggingEnabled(true)
 
         webView = WebView(this).apply {
             with (settings) {
@@ -191,7 +187,6 @@ class Pupil : Application() {
                             "onReceivedError: ${error?.description}"
                         )
                     }
-                    webViewFailed = true
                 }
             }
 
@@ -257,7 +252,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

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

@@ -16,17 +16,15 @@
 
 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.Dispatchers
+import kotlinx.coroutines.*
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.transformWhile
-import kotlinx.coroutines.withContext
-import kotlinx.coroutines.yield
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
@@ -40,19 +38,25 @@ import kotlin.coroutines.suspendCoroutine
 
 const val protocol = "https:"
 
-val evaluations = Collections.newSetFromMap<String>(ConcurrentHashMap())
+val evaluationContext = Dispatchers.Main + Job()
 
-suspend fun WebView.evaluate(script: String): String = withContext(Dispatchers.Main) {
+suspend fun WebView.evaluate(script: String): String = coroutineScope {
-    while (webViewFailed || !webViewReady) yield()
+    var result: String? = null
 
-    val uid = UUID.randomUUID().toString()
+    while (result == null) {
+        try {
+            result = withContext(evaluationContext) {
+                while (webViewFailed || !webViewReady) yield()
 
-    evaluations.add(uid)
+                suspendCoroutine { continuation ->
+                    evaluateJavascript(script) {
+                        continuation.resume(it)
+                    }
+                }
 
-    val result: String = suspendCoroutine { continuation ->
+            }
-        evaluateJavascript(script) {
+        } catch (e: CancellationException) {
-            evaluations.remove(uid)
+            continue
-            continuation.resume(it)
         }
     }
 
@@ -60,24 +64,36 @@ suspend fun WebView.evaluate(script: String): String = withContext(Dispatchers.M
 }
 
 @OptIn(ExperimentalCoroutinesApi::class)
-suspend fun WebView.evaluatePromise(script: String, then: String = ".then(result => Callback.onResult(%uid, JSON.stringify(result))).catch(err => Callback.onError(%uid, JSON.stringify(error)))"): String? = withContext(Dispatchers.Main) {
+suspend fun WebView.evaluatePromise(
-    while (webViewFailed || !webViewReady) yield()
+    script: String,
+    then: String = ".then(result => Callback.onResult(%uid, JSON.stringify(result))).catch(err => Callback.onError(%uid, JSON.stringify(error)))"
+): String? = coroutineScope {
+    var result: String? = null
 
-    val uid = UUID.randomUUID().toString()
+    while (result == null) {
+        try {
+            result = withContext(evaluationContext) {
+                while (webViewFailed || !webViewReady) yield()
 
-    evaluations.add(uid)
+                val uid = UUID.randomUUID().toString()
 
-    evaluateJavascript((script+then).replace("%uid", "'$uid'"), null)
+                evaluateJavascript((script + then).replace("%uid", "'$uid'"), null)
 
-    val flow: Flow<Pair<String, String?>> = webViewFlow.transformWhile { (currentUid, result) ->
+                val flow: Flow<Pair<String, String?>> = webViewFlow.transformWhile { (currentUid, result) ->
-        if (currentUid == uid) {
+                    if (currentUid == uid) {
-            evaluations.remove(uid)
+                        emit(currentUid to result)
-            emit(currentUid to result)
+                    }
+                    currentUid != uid
+                }
+
+                flow.first().second
+            }
+        } catch (e: CancellationException) {
+            continue
         }
-        currentUid != uid
     }
 
-    flow.first().second
+    result
 }
 
 @Suppress("EXPERIMENTAL_API_USAGE")
@@ -107,16 +123,6 @@ suspend fun urlFromUrlFromHash(galleryID: Int, image: GalleryFiles, dir: String?
         """.trimIndent()
     )
 
-
-    FirebaseCrashlytics.getInstance().log(
-        """
-        url_from_url_from_hash(
-            ${galleryID.toString().js},
-            ${Json.encodeToString(image)},
-            ${dir.js}, ${ext.js}, ${base.js}
-        )
-        """.trimIndent()
-    )
     return Json.decodeFromString(result)
 }
 

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

@@ -40,6 +40,7 @@ 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.util.concurrent.ConcurrentHashMap
@@ -172,6 +173,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() }