5.2.8 Fix for loading not finishing

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.7/Pupil-v5.2.7.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.2.7/Pupil-v5.2.7.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.8-BETA01"
+        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.8-BETA01",
+      "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,11 +94,10 @@ fun reloadWebView() {
     if (reloadJob?.isActive == true) return
 
     reloadJob = CoroutineScope(Dispatchers.IO).launch {
-        if (evaluations.isEmpty()) {
         webViewReady = false
         webViewFailed = false
 
-            while (evaluations.isNotEmpty()) yield()
+        evaluationContext.cancelChildren()
 
         runCatching {
             URL(
@@ -124,7 +121,6 @@ fun reloadWebView() {
         }
     }
 }
-}
 
 private var htmlVersion: String = ""
 fun reloadWhenFailedOrUpdate() = CoroutineScope(Dispatchers.Default).launch {
@@ -191,7 +187,6 @@ class Pupil : Application() {
                             "onReceivedError: ${error?.description}"
                         )
                     }
-                    webViewFailed = true
                 }
             }
 

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

@@ -16,6 +16,7 @@
 
 package xyz.quaver.pupil.hitomi
 
+import android.util.Log
 import android.webkit.WebView
 import android.widget.Toast
 import com.google.common.collect.ConcurrentHashMultiset
@@ -37,49 +38,63 @@ 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 {
-    val result: String = withTimeout(10000) {
+    var result: String? = null
+
+    while (result == null) {
+        try {
+            result = withContext(evaluationContext) {
                 while (webViewFailed || !webViewReady) yield()
 
-        val uid = UUID.randomUUID().toString()
-
-        evaluations.add(uid)
-
                 suspendCoroutine { continuation ->
                     evaluateJavascript(script) {
-                evaluations.remove(uid)
                         continuation.resume(it)
                     }
                 }
+
+            }
+        } catch (e: CancellationException) {
+            continue
+        }
     }
 
     result
 }
 
 @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(
-    val flow: Flow<Pair<String, String?>> = withTimeout(10000) {
+    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
+
+    while (result == null) {
+        try {
+            result = withContext(evaluationContext) {
                 while (webViewFailed || !webViewReady) yield()
 
                 val uid = UUID.randomUUID().toString()
 
-        evaluations.add(uid)
-
                 evaluateJavascript((script + then).replace("%uid", "'$uid'"), null)
 
-        webViewFlow.transformWhile { (currentUid, result) ->
+                val flow: Flow<Pair<String, String?>> = webViewFlow.transformWhile { (currentUid, result) ->
                     if (currentUid == uid) {
-                evaluations.remove(uid)
                         emit(currentUid to result)
                     }
                     currentUid != uid
                 }
-    }
 
                 flow.first().second
             }
+        } catch (e: CancellationException) {
+            continue
+        }
+    }
+
+    result
+}
 
 @Suppress("EXPERIMENTAL_API_USAGE")
 suspend fun getGalleryInfo(galleryID: Int): GalleryInfo {
@@ -108,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)
 }