diff --git a/app/build.gradle b/app/build.gradle index 4f7dcf3f..8dc54834 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -38,7 +38,7 @@ android { minSdkVersion 16 targetSdkVersion 31 versionCode 69 - versionName "5.2.8" + versionName "5.2.9" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true } diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 5543bf8b..633b431d 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -12,7 +12,7 @@ "filters": [], "attributes": [], "versionCode": 69, - "versionName": "5.2.8", + "versionName": "5.2.9", "outputFile": "app-release.apk" } ], diff --git a/app/src/main/java/xyz/quaver/pupil/hitomi/common.kt b/app/src/main/java/xyz/quaver/pupil/hitomi/common.kt index 5e338d86..60fb8138 100644 --- a/app/src/main/java/xyz/quaver/pupil/hitomi/common.kt +++ b/app/src/main/java/xyz/quaver/pupil/hitomi/common.kt @@ -67,7 +67,7 @@ suspend fun WebView.evaluate(script: String): String = coroutineScope { 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? = coroutineScope { +): String = coroutineScope { var result: String? = null while (result == null) { diff --git a/app/src/main/java/xyz/quaver/pupil/hitomi/search.kt b/app/src/main/java/xyz/quaver/pupil/hitomi/search.kt index df2562f1..6063b2c0 100644 --- a/app/src/main/java/xyz/quaver/pupil/hitomi/search.kt +++ b/app/src/main/java/xyz/quaver/pupil/hitomi/search.kt @@ -46,5 +46,7 @@ suspend fun getSuggestionsForQuery(query: String) : List { suspend fun getGalleryIDsFromNozomi(area: String?, tag: String, language: String) : Set { val jsArea = if (area == null) "null" else "'$area'" - return Json.decodeFromString(webView.evaluatePromise("""get_galleryids_from_nozomi($jsArea, '$tag', '$language')""") ?: return emptySet()) + val json = webView.evaluatePromise("""get_galleryids_from_nozomi($jsArea, '$tag', '$language')""") + + return Json.decodeFromString(json) } \ No newline at end of file diff --git a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt index c2c011c9..3a3d3f12 100644 --- a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt +++ b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt @@ -801,7 +801,6 @@ class MainActivity : throw Exception("No result") } } catch (e: Exception) { - if (e !is CancellationException) FirebaseCrashlytics.getInstance().recordException(e)