Merge remote-tracking branch 'origin/master'

Improved error report
Lenient JSON decoding

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.14/Pupil-v5.2.14.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.2.14/Pupil-v5.2.14.apk)  
+[![](https://img.shields.io/github/downloads/tom5079/Pupil/5.2.18/Pupil-v5.2.18.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.2.18/Pupil-v5.2.18.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.15"
+        versionName "5.2.19"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

app/proguard-rules.pro

@@ -33,4 +33,4 @@
 }
 -keep class xyz.quaver.pupil.ui.fragment.ManageFavoritesFragment
 -keep class xyz.quaver.pupil.ui.fragment.ManageStorageFragment
--keep class com.hippo.quickjs.** { *; }
+-keep class xyz.quaver.pupil.** { *; }

app/release/output-metadata.json

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

app/src/androidTest/java/xyz/quaver/pupil/ExampleInstrumentedTest.kt

@@ -112,7 +112,7 @@ class ExampleInstrumentedTest {
     @Test
     fun test_getGalleryBlock() {
         runBlocking {
-            val block = getGalleryBlock(2013877)
+            val block = getGalleryBlock(2119310)
 
             Log.d("PUPILD", block.toString())
         }

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

@@ -25,9 +25,9 @@ import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
 import android.content.Intent
-import android.content.pm.ApplicationInfo
 import android.net.Uri
 import android.os.Build
+import android.util.Log
 import android.webkit.*
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatDelegate
@@ -46,8 +46,7 @@ import kotlinx.coroutines.flow.asSharedFlow
 import okhttp3.*
 import xyz.quaver.io.FileX
 import xyz.quaver.pupil.hitomi.evaluationContext
-import xyz.quaver.pupil.types.JavascriptConsoleException
-import xyz.quaver.pupil.types.JavascriptOnErrorException
+import xyz.quaver.pupil.types.JavascriptException
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.util.*
 import java.io.File
@@ -98,9 +97,9 @@ fun reloadWebView() {
         runCatching {
             URL(
                 if (BuildConfig.DEBUG)
-                    "https://tom5079.github.io/Pupil/hitomi-dev.html"
+                    "https://tom5079.github.io/PupilSources/hitomi-dev.html"
                 else
-                    "https://tom5079.github.io/Pupil/hitomi.html"
+                    "https://tom5079.github.io/PupilSources/hitomi.html"
             ).readText()
         }.onFailure {
             webViewFailed = true
@@ -126,9 +125,9 @@ fun reloadWhenFailedOrUpdate() = CoroutineScope(Dispatchers.Default).launch {
             runCatching {
                 URL(
                     if (BuildConfig.DEBUG)
-                        "https://tom5079.github.io/Pupil/hitomi-dev.html.ver"
+                        "https://tom5079.github.io/PupilSources/hitomi-dev.html.ver"
                     else
-                        "https://tom5079.github.io/Pupil/hitomi.html.ver"
+                        "https://tom5079.github.io/PupilSources/hitomi.html.ver"
                 ).readText()
             }.getOrNull().let { version ->
                 (!version.isNullOrEmpty() && version != htmlVersion).also {
@@ -166,8 +165,8 @@ fun initWebView(context: Context) {
                 error: WebResourceError?
             ) {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    FirebaseCrashlytics.getInstance().recordException(
-                        JavascriptOnErrorException("onReceivedError: ${error?.description}")
+                    FirebaseCrashlytics.getInstance().log(
+                        "onReceivedError: ${error?.description}"
                     )
                 }
             }
@@ -175,8 +174,8 @@ fun initWebView(context: Context) {
 
         webChromeClient = object: WebChromeClient() {
             override fun onConsoleMessage(consoleMessage: ConsoleMessage?): Boolean {
-                FirebaseCrashlytics.getInstance().recordException(
-                    JavascriptConsoleException("onConsoleMessage: ${consoleMessage?.message()} (${consoleMessage?.sourceId()}:${consoleMessage?.lineNumber()})")
+                FirebaseCrashlytics.getInstance().log(
+                    "onConsoleMessage: ${consoleMessage?.message()} (${consoleMessage?.sourceId()}:${consoleMessage?.lineNumber()})"
                 )
 
                 return super.onConsoleMessage(consoleMessage)
@@ -191,13 +190,13 @@ fun initWebView(context: Context) {
                 }
             }
             @JavascriptInterface
-            fun onError(uid: String, message: String) {
+            fun onError(uid: String, script: String, message: String, stack: String) {
                 CoroutineScope(Dispatchers.Unconfined).launch {
-                    _webViewFlow.emit(uid to null)
+                    _webViewFlow.emit(uid to "")
                 }
-                Toast.makeText(context, message, Toast.LENGTH_LONG).show()
+
                 FirebaseCrashlytics.getInstance().recordException(
-                    JavascriptOnErrorException(message)
+                    JavascriptException("onError script: $script\nmessage: $message\nstack: $stack")
                 )
             }
         }, "Callback")

app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt

@@ -186,7 +186,7 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt
                         text =
                             resources.getString(R.string.galleryblock_language, languages[galleryBlock.language])
                         visibility = when {
-                            galleryBlock.language.isNotEmpty() -> View.VISIBLE
+                            !galleryBlock.language.isNullOrEmpty() -> View.VISIBLE
                             else -> View.GONE
                         }
                     }

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

@@ -1,46 +0,0 @@
-/*
- *    Copyright 2019 tom5079
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package xyz.quaver
-
-import kotlinx.serialization.json.Json
-import okhttp3.Request
-import xyz.quaver.pupil.client
-import java.io.IOException
-import java.net.URL
-
-/**
- * kotlinx.serialization.json.Json object for global use  
- * properties should not be changed
- *
- * @see [https://kotlin.github.io/kotlinx.serialization/kotlinx-serialization-core/kotlinx-serialization-core/kotlinx.serialization.json/-json/index.html]
- */
-val json = Json {
-    isLenient = true
-    ignoreUnknownKeys = true
-    allowSpecialFloatingPointValues = true
-    useArrayPolymorphism = true
-}
-
-typealias HeaderSetter = (Request.Builder) -> Request.Builder
-fun URL.readText(settings: HeaderSetter? = null): String {
-    val request = Request.Builder()
-        .url(this).let { 
-            settings?.invoke(it) ?: it
-        }.build()
-    
-    return client.newCall(request).execute().also{ if (it.code() != 200) throw IOException() }.body()?.use { it.string() } ?: throw IOException()
-}

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

@@ -16,11 +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
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
@@ -29,10 +25,11 @@ import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import xyz.quaver.json
-import xyz.quaver.pupil.*
+import xyz.quaver.pupil.webView
+import xyz.quaver.pupil.webViewFailed
+import xyz.quaver.pupil.webViewFlow
+import xyz.quaver.pupil.webViewReady
 import java.util.*
-import java.util.concurrent.ConcurrentHashMap
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
@@ -40,7 +37,20 @@ const val protocol = "https:"
 
 val evaluationContext = Dispatchers.Main + Job()
 
-suspend fun WebView.evaluate(script: String): String = coroutineScope {
+/**
+ * kotlinx.serialization.json.Json object for global use
+ * properties should not be changed
+ *
+ * @see [https://kotlin.github.io/kotlinx.serialization/kotlinx-serialization-core/kotlinx-serialization-core/kotlinx.serialization.json/-json/index.html]
+ */
+val json = Json {
+    isLenient = true
+    ignoreUnknownKeys = true
+    allowSpecialFloatingPointValues = true
+    useArrayPolymorphism = true
+}
+
+suspend inline fun <reified T> WebView.evaluate(script: String): T = coroutineScope {
     var result: String? = null
 
     while (result == null) {
@@ -60,14 +70,14 @@ suspend fun WebView.evaluate(script: String): String = coroutineScope {
         }
     }
 
-    result
+    json.decodeFromString(result)
 }
 
 @OptIn(ExperimentalCoroutinesApi::class)
-suspend fun WebView.evaluatePromise(
+suspend inline fun <reified T> WebView.evaluatePromise(
     script: String,
-    then: String = ".then(result => Callback.onResult(%uid, JSON.stringify(result))).catch(err => { console.err(err); Callback.onError(%uid, JSON.stringify(err)); })"
-): String = coroutineScope {
+    then: String = ".then(result => Callback.onResult(%uid, JSON.stringify(result))).catch(err => Callback.onError(%uid, String.raw`$script`, err.message, err.stack))"
+): T = coroutineScope {
     var result: String? = null
 
     while (result == null) {
@@ -95,27 +105,22 @@ suspend fun WebView.evaluatePromise(
         }
     }
 
-    result
+    json.decodeFromString(result)
 }
 
 @Suppress("EXPERIMENTAL_API_USAGE")
-suspend fun getGalleryInfo(galleryID: Int): GalleryInfo {
-    val result = webView.evaluatePromise("get_gallery_info($galleryID)")
-
-    return json.decodeFromString(result)
-}
+suspend fun getGalleryInfo(galleryID: Int): GalleryInfo =
+    webView.evaluatePromise("get_gallery_info($galleryID)")
 
 //common.js
 const val domain = "ltn.hitomi.la"
-const val galleryblockdir = "galleryblock"
-const val nozomiextension = ".nozomi"
 
 val String?.js: String
     get() = if (this == null) "null" else "'$this'"
 
 @OptIn(ExperimentalSerializationApi::class)
-suspend fun urlFromUrlFromHash(galleryID: Int, image: GalleryFiles, dir: String? = null, ext: String? = null, base: String? = null): String {
-    val result = webView.evaluate(
+suspend fun urlFromUrlFromHash(galleryID: Int, image: GalleryFiles, dir: String? = null, ext: String? = null, base: String? = null): String =
+    webView.evaluate(
         """
         url_from_url_from_hash(
             ${galleryID.toString().js},
@@ -125,9 +130,6 @@ suspend fun urlFromUrlFromHash(galleryID: Int, image: GalleryFiles, dir: String?
         """.trimIndent()
     )
 
-    return Json.decodeFromString(result)
-}
-
 suspend fun imageUrlFromImage(galleryID: Int, image: GalleryFiles, noWebp: Boolean) : String {
     return when {
         noWebp ->

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

@@ -19,17 +19,12 @@ package xyz.quaver.pupil.hitomi
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
-import org.jsoup.Jsoup
 import xyz.quaver.pupil.webView
-import xyz.quaver.readText
-import java.net.URL
-import java.net.URLDecoder
 
 @Serializable
 data class Gallery(
     val related: List<Int>,
-    val langList: Map<String, String>
-    ,
+    val langList: Map<String, String>,
     val cover: String,
     val title: String,
     val artists: List<String>,
@@ -41,7 +36,5 @@ data class Gallery(
     val tags: List<String>,
     val thumbnails: List<String>
 )
-suspend fun getGallery(galleryID: Int) : Gallery {
-    val result = webView.evaluatePromise("get_gallery($galleryID)")
-    return Json.decodeFromString(result)
-}
+suspend fun getGallery(galleryID: Int) : Gallery =
+    webView.evaluatePromise("get_gallery($galleryID)")

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

@@ -17,17 +17,7 @@
 package xyz.quaver.pupil.hitomi
 
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.json.Json
-import org.jsoup.Jsoup
 import xyz.quaver.pupil.webView
-import xyz.quaver.readText
-import java.net.URL
-import java.net.URLDecoder
-import java.nio.ByteBuffer
-import java.nio.ByteOrder
-import java.util.*
-import javax.net.ssl.HttpsURLConnection
 
 @Serializable
 data class GalleryBlock(
@@ -38,11 +28,9 @@ data class GalleryBlock(
     val artists: List<String>,
     val series: List<String>,
     val type: String,
-    val language: String,
+    val language: String?,
     val relatedTags: List<String>
 )
 
-suspend fun getGalleryBlock(galleryID: Int) : GalleryBlock {
-    val result = webView.evaluatePromise("get_gallery_block($galleryID)")
-    return Json.decodeFromString(result)
-}
+suspend fun getGalleryBlock(galleryID: Int) : GalleryBlock =
+    webView.evaluatePromise("get_gallery_block($galleryID)")

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

@@ -27,23 +27,19 @@ import xyz.quaver.pupil.webView
 const val extension = ".html"
 
 @OptIn(ExperimentalSerializationApi::class)
-suspend fun getGalleryIDsForQuery(query: String) : Set<Int> {
-    val result = webView.evaluatePromise("get_galleryids_for_query('$query')")
-
-    return Json.decodeFromString(result)
-}
+suspend fun getGalleryIDsForQuery(query: String) : Set<Int> =
+    webView.evaluatePromise("get_galleryids_for_query('$query')")
 
 @Serializable
 data class Suggestion(val s: String, val t: Int, val u: String, val n: String)
 
 @OptIn(ExperimentalSerializationApi::class)
-suspend fun getSuggestionsForQuery(query: String) : List<Suggestion> {
-    val result = webView.evaluatePromise(
+suspend fun getSuggestionsForQuery(query: String) : List<Suggestion> =
+    webView.evaluatePromise(
         "get_suggestions_for_query('$query', ++search_serial)",
         then = """
             .then(r => {
                 let [results, results_serial] = r;
-                console.log(results_serial, r, search_serial);
                 if (search_serial !== results_serial) {
                     Callback.onResult(%uid, '[]');
                 } else {
@@ -53,14 +49,9 @@ suspend fun getSuggestionsForQuery(query: String) : List<Suggestion> {
         """.trimIndent()
     )
 
-    return Json.decodeFromString(result) ?: return emptyList()
-}
-
 @OptIn(ExperimentalSerializationApi::class)
 suspend fun getGalleryIDsFromNozomi(area: String?, tag: String, language: String) : Set<Int> {
     val jsArea = if (area == null) "null" else "'$area'"
 
-    val json = webView.evaluatePromise("""get_galleryids_from_nozomi($jsArea, '$tag', '$language')""")
-
-    return Json.decodeFromString(json)
+    return webView.evaluatePromise("""get_galleryids_from_nozomi($jsArea, '$tag', '$language')""")
 }

app/src/main/java/xyz/quaver/pupil/types/SendLogException.kt

@@ -18,5 +18,5 @@
 
 package xyz.quaver.pupil.types
 
-class JavascriptConsoleException(message: String?): Exception(message)
-class JavascriptOnErrorException(message: String?): Exception(message)
+class SendLogException : Exception()
+class JavascriptException(message: String?) : Exception(message)

app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt

@@ -26,6 +26,7 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.preference.*
 import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -36,6 +37,7 @@ import xyz.quaver.pupil.R
 import xyz.quaver.pupil.client
 import xyz.quaver.pupil.clientBuilder
 import xyz.quaver.pupil.clientHolder
+import xyz.quaver.pupil.types.SendLogException
 import xyz.quaver.pupil.ui.LockActivity
 import xyz.quaver.pupil.ui.SettingsActivity
 import xyz.quaver.pupil.ui.dialog.*
@@ -107,6 +109,7 @@ class SettingsFragment :
                     ProxyDialogFragment().show(parentFragmentManager, "Proxy Dialog")
                 }
                 "user_id" -> {
+                    FirebaseCrashlytics.getInstance().recordException(SendLogException())
                     (context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(
                         ClipData.newPlainText("user_id", Preferences.get<String>("user_id"))
                     )