Merge remote-tracking branch 'origin/master'

.idea/deploymentTargetDropDown.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
+    <targetSelectedWithDropDown>
       <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
+        <type value="QUICK_BOOT_TARGET" />
         <deviceKey>
           <Key>
             <type value="VIRTUAL_DEVICE_PATH" />
@@ -11,7 +11,7 @@
           </Key>
         </deviceKey>
       </Target>
-    </runningDeviceTargetSelectedWithDropDown>
+    </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-01-24T19:20:51.436372Z" />
+    <timeTargetWasSelectedWithDropDown value="2022-01-24T19:40:46.041035Z" />
   </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.19/Pupil-v5.2.19.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.2.19/Pupil-v5.2.19.apk)  
+[![](https://img.shields.io/github/downloads/tom5079/Pupil/5.2.20/Pupil-v5.2.20.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.2.20/Pupil-v5.2.20.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.20"
+        versionName "5.2.21"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

app/release/output-metadata.json

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

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

@@ -160,6 +160,8 @@ fun initWebView(context: Context) {
 
         webViewClient = object: WebViewClient() {
             override fun onPageFinished(view: WebView?, url: String?) {
+                webViewReady = true
+
                 webView.evaluateJavascript(
                     """
                     try {
@@ -172,7 +174,6 @@ fun initWebView(context: Context) {
                 ) {
                     val es2020: Boolean = Json.decodeFromString(it)
 
-                    webViewReady = es2020
                     oldWebView = !es2020
                 }
             }

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

@@ -53,7 +53,7 @@ suspend inline fun <reified T> WebView.evaluate(script: String): T = coroutineSc
 
     while (result == null) {
         try {
-            while (!oldWebView && !(webViewReady && !webViewFailed)) yield()
+            while (!oldWebView && !(webViewReady && !webViewFailed)) delay(100)
 
             result = if (oldWebView)
                 "null"
@@ -82,7 +82,7 @@ suspend inline fun <reified T> WebView.evaluatePromise(
 
     while (result == null) {
         try {
-            while (!oldWebView && !(webViewReady && !webViewFailed)) yield()
+            while (!oldWebView && !(webViewReady && !webViewFailed)) delay(100)
 
             result = if (oldWebView)
                 "null"