5.2.8 Fix for loading not finishing

.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>

.idea/deploymentTargetDropDown.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <targetSelectedWithDropDown>
+      <Target>
+        <type value="QUICK_BOOT_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="$USER_HOME$/.android/avd/Pixel_2_API_30.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </targetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2022-01-04T14:31:24.587053Z" />
+  </component>
+</project>

.idea/gradle.xml

@@ -7,6 +7,8 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="/usr/share/java/gradle" />
+        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

.idea/misc.xml

@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="app/src/main/res/layout/reader_activity.xml" value="0.14351851851851852" />
+      </map>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

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.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

@@ -32,13 +32,13 @@ configurations {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     defaultConfig {
         applicationId "xyz.quaver.pupil"
         minSdkVersion 16
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 69
-        versionName "5.2.2"
+        versionName "5.2.8"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -79,30 +79,30 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar", "*.aar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0"
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2"
     
-    implementation "androidx.appcompat:appcompat:1.3.0"
+    implementation "androidx.appcompat:appcompat:1.4.0"
-    implementation "androidx.activity:activity-ktx:1.3.0-beta01"
+    implementation "androidx.activity:activity-ktx:1.4.0"
-    implementation "androidx.fragment:fragment-ktx:1.3.4"
+    implementation "androidx.fragment:fragment-ktx:1.4.0"
     implementation "androidx.preference:preference-ktx:1.1.1"
     implementation "androidx.recyclerview:recyclerview:1.2.1"
-    implementation "androidx.constraintlayout:constraintlayout:2.0.4"
+    implementation "androidx.constraintlayout:constraintlayout:2.1.2"
     implementation "androidx.gridlayout:gridlayout:1.0.0"
     implementation "androidx.biometric:biometric:1.1.0"
-    implementation "androidx.work:work-runtime-ktx:2.6.0-beta01"
+    implementation "androidx.work:work-runtime-ktx:2.7.1"
 
     implementation "com.daimajia.swipelayout:library:1.2.0@aar"
 
-    implementation "com.google.android.material:material:1.3.0"
+    implementation "com.google.android.material:material:1.4.0"
 
-    implementation platform('com.google.firebase:firebase-bom:26.5.0')
+    implementation platform('com.google.firebase:firebase-bom:29.0.3')
     implementation "com.google.firebase:firebase-analytics-ktx"
     implementation "com.google.firebase:firebase-crashlytics-ktx"
     implementation "com.google.firebase:firebase-perf-ktx"
 
     implementation "com.google.android.gms:play-services-oss-licenses:17.0.0"
-    implementation "com.google.android.gms:play-services-mlkit-face-detection:16.1.7"
+    implementation "com.google.android.gms:play-services-mlkit-face-detection:16.2.1"
 
     implementation "com.github.clans:fab:1.6.4"
 
@@ -129,13 +129,13 @@ dependencies {
 
     implementation "com.google.guava:guava:31.0.1-android"
 
-    implementation "xyz.quaver:documentfilex:0.7.1"
+    implementation "xyz.quaver:documentfilex:0.7.2"
     implementation "xyz.quaver:floatingsearchview:1.1.7"
 
-    testImplementation "junit:junit:4.13.1"
+    testImplementation "junit:junit:4.13.2"
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0"
-    androidTestImplementation "androidx.test.ext:junit:1.1.2"
+    androidTestImplementation "androidx.test.ext:junit:1.1.3"
-    androidTestImplementation "androidx.test:rules:1.3.0"
+    androidTestImplementation "androidx.test:rules:1.4.0"
-    androidTestImplementation "androidx.test:runner:1.3.0"
+    androidTestImplementation "androidx.test:runner:1.4.0"
-    androidTestImplementation "androidx.test.espresso:espresso-core:3.3.0"
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
 }

app/release/output-metadata.json

@@ -1,5 +1,5 @@
 {
-  "version": 2,
+  "version": 3,
   "artifactType": {
     "type": "APK",
     "kind": "Directory"
@@ -10,9 +10,11 @@
     {
       "type": "SINGLE",
       "filters": [],
+      "attributes": [],
       "versionCode": 69,
-      "versionName": "5.2.2",
+      "versionName": "5.2.8",
       "outputFile": "app-release.apk"
     }
-  ]
+  ],
+  "elementType": "File"
 }

app/src/main/AndroidManifest.xml

@@ -59,7 +59,8 @@
         <activity
             android:name=".ui.ReaderActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
-            android:parentActivityName=".ui.MainActivity">
+            android:parentActivityName=".ui.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -223,7 +224,8 @@
         <activity
             android:name=".ui.MainActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
-            android:theme="@style/NoActionBarAppTheme">
+            android:theme="@style/NoActionBarAppTheme"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.VIEW" />

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(
@@ -123,7 +120,6 @@ fun reloadWebView() {
             }
         }
     }
-    }
 }
 
 private var htmlVersion: String = ""
@@ -166,7 +162,7 @@ class Pupil : Application() {
         instance = this
         isDebugBuild = applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE != 0
 
-        WebView.setWebContentsDebuggingEnabled(true)
+        if (isDebugBuild) WebView.setWebContentsDebuggingEnabled(true)
 
         webView = WebView(this).apply {
             with (settings) {
@@ -186,7 +182,21 @@ class Pupil : Application() {
                     request: WebResourceRequest?,
                     error: WebResourceError?
                 ) {
-                    webViewFailed = true
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                        FirebaseCrashlytics.getInstance().log(
+                            "onReceivedError: ${error?.description}"
+                        )
+                    }
+                }
+            }
+
+            webChromeClient = object: WebChromeClient() {
+                override fun onConsoleMessage(consoleMessage: ConsoleMessage?): Boolean {
+                    FirebaseCrashlytics.getInstance().log(
+                        "onConsoleMessage: ${consoleMessage?.message()} (${consoleMessage?.sourceId()}:${consoleMessage?.lineNumber()})"
+                    )
+
+                    return super.onConsoleMessage(consoleMessage)
                 }
             }
 
@@ -242,7 +252,6 @@ class Pupil : Application() {
 
         try {
             Preferences.get<String>("download_folder").also {
-                if (it.startsWith("content") && Build.VERSION.SDK_INT > 19)
                 contentResolver.takePersistableUriPermission(
                     Uri.parse(it),
                     Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION

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

@@ -16,17 +16,15 @@
 
 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.Dispatchers
+import kotlinx.coroutines.*
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.transformWhile
-import kotlinx.coroutines.withContext
-import kotlinx.coroutines.yield
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
@@ -40,52 +38,62 @@ 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 {
-    if (webViewFailed) {
+    var result: String? = null
-        Toast.makeText(Pupil.instance, "Failed to load scripts. Please restart the app.", Toast.LENGTH_LONG).show()
-    }
 
+    while (result == null) {
+        try {
+            result = withContext(evaluationContext) {
                 while (webViewFailed || !webViewReady) yield()
 
-    val uid = UUID.randomUUID().toString()
+                suspendCoroutine { continuation ->
-
-    evaluations.add(uid)
-
-    val result: String = 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(
-    if (webViewFailed) {
+    script: String,
-        Toast.makeText(Pupil.instance, "Failed to load the scripts. Please restart the app.", Toast.LENGTH_LONG).show()
+    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)
-
-    evaluateJavascript((script+then).replace("%uid", "'$uid'"), null)
 
                 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")
@@ -115,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)
 }
 

app/src/main/java/xyz/quaver/pupil/receiver/UpdateBroadcastReceiver.kt

@@ -24,6 +24,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
+import android.os.Build
 import android.webkit.MimeTypeMap
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
@@ -76,7 +77,7 @@ class UpdateBroadcastReceiver : BroadcastReceiver() {
                 val pendingIntent = PendingIntent.getActivity(context, 0, Intent(Intent.ACTION_VIEW).apply {
                     flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NEW_TASK
                     setDataAndType(uri, MimeTypeMap.getSingleton().getMimeTypeFromExtension("apk"))
-                }, 0)
+                }, if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_IMMUTABLE else 0)
 
                 val notification = NotificationCompat.Builder(context, "update")
                     .setSmallIcon(android.R.drawable.stat_sys_download_done)

app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt

@@ -23,6 +23,7 @@ import android.app.PendingIntent
 import android.app.Service
 import android.content.Context
 import android.content.Intent
+import android.os.Build
 import android.util.Log
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
@@ -74,7 +75,7 @@ class DownloadService : Service() {
 
         val pendingIntent = TaskStackBuilder.create(this).run {
             addNextIntentWithParentStack(intent)
-            getPendingIntent(galleryID, PendingIntent.FLAG_UPDATE_CURRENT)
+            getPendingIntent(galleryID, PendingIntent.FLAG_UPDATE_CURRENT or if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_MUTABLE else 0)
         }
         val action =
             NotificationCompat.Action.Builder(0, getText(android.R.string.cancel),
@@ -84,7 +85,7 @@ class DownloadService : Service() {
                     Intent(this, DownloadService::class.java)
                         .putExtra(KEY_COMMAND, COMMAND_CANCEL)
                         .putExtra(KEY_ID, galleryID),
-                    PendingIntent.FLAG_UPDATE_CURRENT),
+                    PendingIntent.FLAG_UPDATE_CURRENT or if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_MUTABLE else 0),
             ).build()
 
         notification[galleryID] = NotificationCompat.Builder(this, "download").apply {

app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt

@@ -161,12 +161,10 @@ class ReaderActivity : BaseActivity() {
         }
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.reader, menu)
 
-        with(menu?.findItem(R.id.reader_menu_favorite)) {
+        with(menu.findItem(R.id.reader_menu_favorite)) {
-            this ?: return@with
-
             if (favorites.contains(galleryID))
                 (icon as Animatable).start()
         }

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

@@ -6,14 +6,14 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.0.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath "com.google.gms:google-services:4.3.8"
+        classpath "com.google.gms:google-services:4.3.10"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
-        classpath "com.google.firebase:firebase-crashlytics-gradle:2.7.0"
+        classpath "com.google.firebase:firebase-crashlytics-gradle:2.8.1"
         classpath "com.google.firebase:perf-plugin:1.4.0"
         classpath "com.google.android.gms:oss-licenses-plugin:0.10.4"
     }

gradle.properties

@@ -20,4 +20,4 @@ kotlin.code.style=official
 android.enableJetifier=true
 android.useAndroidX=true
 
-kotlin_version=1.5.10
+kotlin_version=1.6.10

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip