5.2.5 Added logging to fix app crashing

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.2/Pupil-v5.2.2.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.2.2/Pupil-v5.2.2.apk)
+[![](https://img.shields.io/github/downloads/tom5079/Pupil/5.2.5/Pupil-v5.2.5.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.2.5/Pupil-v5.2.5.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 30
         versionCode 69
-        versionName "5.2.2"
+        versionName "5.2.5"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -129,7 +129,7 @@ dependencies {
 
     implementation "com.google.guava:guava:31.0.1-android"
 
-    implementation "xyz.quaver:documentfilex:0.7.1"
+    implementation "xyz.quaver:documentfilex:0.7.2-DEV"
     implementation "xyz.quaver:floatingsearchview:1.1.7"
 
     testImplementation "junit:junit:4.13.1"

app/release/output-metadata.json

@@ -11,7 +11,7 @@
       "type": "SINGLE",
       "filters": [],
       "versionCode": 69,
-      "versionName": "5.2.2",
+      "versionName": "5.2.5",
       "outputFile": "app-release.apk"
     }
   ]

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

@@ -186,10 +186,25 @@ class Pupil : Application() {
                     request: WebResourceRequest?,
                     error: WebResourceError?
                 ) {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                        FirebaseCrashlytics.getInstance().log(
+                            "onReceivedError: ${error?.description}"
+                        )
+                    }
                     webViewFailed = true
                 }
             }
 
+            webChromeClient = object: WebChromeClient() {
+                override fun onConsoleMessage(consoleMessage: ConsoleMessage?): Boolean {
+                    FirebaseCrashlytics.getInstance().log(
+                        "onConsoleMessage: ${consoleMessage?.message()} (${consoleMessage?.sourceId()}:${consoleMessage?.lineNumber()})"
+                    )
+
+                    return super.onConsoleMessage(consoleMessage)
+                }
+            }
+
             addJavascriptInterface(object {
                 @JavascriptInterface
                 fun onResult(uid: String, result: String) {

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

@@ -43,10 +43,6 @@ const val protocol = "https:"
 val evaluations = Collections.newSetFromMap<String>(ConcurrentHashMap())
 
 suspend fun WebView.evaluate(script: String): String = withContext(Dispatchers.Main) {
-    if (webViewFailed) {
-        Toast.makeText(Pupil.instance, "Failed to load scripts. Please restart the app.", Toast.LENGTH_LONG).show()
-    }
-
     while (webViewFailed || !webViewReady) yield()
 
     val uid = UUID.randomUUID().toString()
@@ -65,10 +61,6 @@ 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) {
-    if (webViewFailed) {
-        Toast.makeText(Pupil.instance, "Failed to load the scripts. Please restart the app.", Toast.LENGTH_LONG).show()
-    }
-
     while (webViewFailed || !webViewReady) yield()
 
     val uid = UUID.randomUUID().toString()

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

@@ -19,6 +19,7 @@
 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
@@ -103,7 +104,15 @@ suspend fun GalleryInfo.getRequestBuilders(): List<Request.Builder> {
 
     return this.files.map {
         Request.Builder()
-            .url(imageUrlFromImage(galleryID, it, !lowQuality))
+            .url(
+                runCatching {
+                    imageUrlFromImage(galleryID, it, !lowQuality)
+                }
+                .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")
     }

build.gradle

@@ -23,6 +23,7 @@ allprojects {
     repositories {
         google()
         mavenCentral()
+        mavenLocal()
         jcenter()
         maven { url "https://jitpack.io" }
         maven { url "https://guardian.github.io/maven/repo-releases/" }