Merge remote-tracking branch 'origin/master'

Added self-test and reload
Reduced update ignoring time to 1d from 1w

.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>
-    <timeTargetWasSelectedWithDropDown value="2022-01-24T19:20:51.436372Z" />
+    </targetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2022-01-31T00:48:12.732208Z" />
   </component>
 </project>

.idea/misc.xml

@@ -5,6 +5,9 @@
       <map>
         <entry key="../../../../layout/custom_preview.xml" value="0.2564814814814815" />
         <entry key="app/src/main/res/layout/reader_activity.xml" value="0.14351851851851852" />
+        <entry key="app/src/main/res/xml/lock_preferences.xml" value="0.5119791666666667" />
+        <entry key="app/src/main/res/xml/manage_storage_preferences.xml" value="0.2604166666666667" />
+        <entry key="app/src/main/res/xml/root_preferences.xml" value="0.5119791666666667" />
       </map>
     </option>
   </component>

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.23/Pupil-v5.2.23.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.2.23/Pupil-v5.2.23.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.24"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -82,12 +82,12 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0"
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2"
     
-    implementation "androidx.appcompat:appcompat:1.4.0"
+    implementation "androidx.appcompat:appcompat:1.4.1"
     implementation "androidx.activity:activity-ktx:1.4.0"
     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.1.2"
+    implementation "androidx.constraintlayout:constraintlayout:2.1.3"
     implementation "androidx.gridlayout:gridlayout:1.0.0"
     implementation "androidx.biometric:biometric:1.1.0"
     implementation "androidx.work:work-runtime-ktx:2.7.1"
@@ -95,7 +95,7 @@ dependencies {
 
     implementation "com.daimajia.swipelayout:library:1.2.0@aar"
 
-    implementation "com.google.android.material:material:1.4.0"
+    implementation "com.google.android.material:material:1.5.0"
 
     implementation platform('com.google.firebase:firebase-bom:29.0.3')
     implementation "com.google.firebase:firebase-analytics-ktx"
@@ -103,7 +103,7 @@ dependencies {
     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.2.1"
+    implementation "com.google.android.gms:play-services-mlkit-face-detection:17.0.0"
 
     implementation "com.github.clans:fab:1.6.4"
 

app/release/output-metadata.json

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

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

@@ -84,7 +84,6 @@ lateinit var webView: WebView
 val _webViewFlow = MutableSharedFlow<Pair<String, String?>>()
 val webViewFlow = _webViewFlow.asSharedFlow()
 var webViewReady = false
-var webViewFailed = false
 var oldWebView = false
 private var reloadJob: Job? = null
 
@@ -93,7 +92,6 @@ fun reloadWebView() {
 
     reloadJob = CoroutineScope(Dispatchers.IO).launch {
         webViewReady = false
-        webViewFailed = false
         oldWebView = false
 
         evaluationContext.cancelChildren(CancellationException("reload"))
@@ -105,8 +103,6 @@ fun reloadWebView() {
                 else
                     "https://tom5079.github.io/PupilSources/hitomi.html"
             ).readText()
-        }.onFailure {
-            webViewFailed = true
         }.getOrNull()?.let { html ->
             launch(Dispatchers.Main) {
                 webView.loadDataWithBaseURL(
@@ -125,7 +121,7 @@ private var htmlVersion: String = ""
 fun reloadWhenFailedOrUpdate() = CoroutineScope(Dispatchers.Default).launch {
     while (true) {
         if (
-            webViewFailed ||
+            (!webViewReady && !oldWebView) ||
             runCatching {
                 URL(
                     if (BuildConfig.DEBUG)
@@ -142,7 +138,7 @@ fun reloadWhenFailedOrUpdate() = CoroutineScope(Dispatchers.Default).launch {
             reloadWebView()
         }
 
-        delay(if (webViewReady && !webViewFailed) 10000 else 1000)
+        delay(if (webViewReady) 10000 else 1000)
     }
 }
 
@@ -160,20 +156,11 @@ fun initWebView(context: Context) {
 
         webViewClient = object: WebViewClient() {
             override fun onPageFinished(view: WebView?, url: String?) {
-                webView.evaluateJavascript(
-                    """
-                        try {
-                            new Function('(x => x?.y ?? z)');
-                            true;
-                        } catch (err) {
-                            false;
-                        }
-                    """.trimIndent()
-                ) {
-                    val es2020: Boolean = Json.decodeFromString(it)
+                webView.evaluateJavascript("try { self_test() } catch (err) { 'err' }") {
+                    val result: String = Json.decodeFromString(it)
 
-                    webViewReady = es2020
-                    oldWebView = !es2020
+                    oldWebView = result == "es2020_unsupported";
+                    webViewReady = result == "OK";
                 }
             }
 

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

@@ -48,12 +48,12 @@ val json = Json {
     useArrayPolymorphism = true
 }
 
-suspend inline fun <reified T> WebView.evaluate(script: String): T = coroutineScope {
+suspend inline fun <reified T> WebView.evaluate(script: String): T = coroutineScope { withTimeout(60000) {
     var result: String? = null
 
     while (result == null) {
         try {
-            while (!oldWebView && !(webViewReady && !webViewFailed)) yield()
+            while (!oldWebView && !webViewReady) delay(1000)
 
             result = if (oldWebView)
                 "null"
@@ -71,18 +71,18 @@ suspend inline fun <reified T> WebView.evaluate(script: String): T = coroutineSc
     }
 
     json.decodeFromString(result)
-}
+} }
 
 @OptIn(ExperimentalCoroutinesApi::class)
 suspend inline fun <reified T> WebView.evaluatePromise(
     script: String,
     then: String = ".then(result => Callback.onResult(%uid, JSON.stringify(result))).catch(err => Callback.onError(%uid, String.raw`$script`, err.message, err.stack))"
-): T = coroutineScope {
+): T = coroutineScope { withTimeout(60000) {
     var result: String? = null
 
     while (result == null) {
         try {
-            while (!oldWebView && !(webViewReady && !webViewFailed)) yield()
+            while (!oldWebView && !webViewReady) delay(1000)
 
             result = if (oldWebView)
                 "null"
@@ -108,7 +108,7 @@ suspend inline fun <reified T> WebView.evaluatePromise(
     }
 
     json.decodeFromString(result)
-}
+} }
 
 @Suppress("EXPERIMENTAL_API_USAGE")
 suspend fun getGalleryInfo(galleryID: Int): GalleryInfo =

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

@@ -60,8 +60,10 @@ class UpdateBroadcastReceiver : BroadcastReceiver() {
 
                             when (uri.scheme) {
                                 "file" ->
-                                    FileProvider.getUriForFile(context, context.applicationContext.packageName + ".provider", File(uri.path!!)
-                                    )
+                                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
+                                        FileProvider.getUriForFile(context, context.applicationContext.packageName + ".provider", File(uri.path!!))
+                                    else
+                                        uri
                                 "content" -> uri
                                 else -> null
                             }
@@ -74,7 +76,7 @@ class UpdateBroadcastReceiver : BroadcastReceiver() {
 
                 val notificationManager = NotificationManagerCompat.from(context)
 
-                val pendingIntent = PendingIntent.getActivity(context, 0, Intent(Intent.ACTION_VIEW).apply {
+                val pendingIntent = PendingIntent.getActivity(context, System.currentTimeMillis().toInt(), 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"))
                 }, if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_IMMUTABLE else 0)

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

@@ -329,9 +329,7 @@ class DownloadService : Service() {
         }
 
         if (isCompleted(galleryID)) {
-            if (DownloadManager.getInstance(this@DownloadService)
-                    .getDownloadFolder(galleryID) != null )
-                Cache.getInstance(this@DownloadService, galleryID).moveToDownload()
+            Cache.getInstance(this@DownloadService, galleryID).moveToDownload()
 
             notificationManager.cancel(galleryID)
             startId?.let { stopSelf(it) }

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

@@ -18,22 +18,37 @@
 
 package xyz.quaver.pupil.ui.fragment
 
+import android.graphics.ColorFilter
+import android.graphics.PorterDuff
+import android.graphics.PorterDuffColorFilter
 import android.os.Bundle
+import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
+import androidx.core.content.ContextCompat
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
+import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
 import xyz.quaver.io.FileX
+import xyz.quaver.io.SAFileX
 import xyz.quaver.io.util.deleteRecursively
+import xyz.quaver.io.util.getChild
+import xyz.quaver.io.util.readText
+import xyz.quaver.io.util.writeText
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.histories
 import xyz.quaver.pupil.util.byteToString
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.downloader.DownloadManager
+import xyz.quaver.pupil.util.downloader.Metadata
 import java.io.File
+import kotlin.math.roundToInt
 
 class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenceClickListener {
 
@@ -80,6 +95,46 @@ class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenc
                         setNegativeButton(android.R.string.cancel) { _, _ -> }
                     }.show()
                 }
+                "recover_downloads" -> {
+                    val density = context.resources.displayMetrics.density
+                    this.icon = object: CircularProgressDrawable(context) {
+                        override fun getIntrinsicHeight() = (24*density).roundToInt()
+                        override fun getIntrinsicWidth() = (24*density).roundToInt()
+                    }.apply {
+                        setStyle(CircularProgressDrawable.DEFAULT)
+                        colorFilter = PorterDuffColorFilter(ContextCompat.getColor(context, R.color.colorAccent), PorterDuff.Mode.SRC_IN)
+                        start()
+                    }
+
+                    val downloadManager = DownloadManager.getInstance(context)
+
+                    val downloadFolderMap = downloadManager.downloadFolderMap
+
+                    downloadFolderMap.clear()
+
+                    downloadManager.downloadFolder.listFiles { file -> file.isDirectory }?.forEach { folder ->
+                        val metadataFile = FileX(context, folder, ".metadata")
+
+                        if (!metadataFile.exists()) return@forEach
+
+                        val metadata = metadataFile.readText()?.let {
+                            Json.decodeFromString<Metadata>(it)
+                        } ?: return@forEach
+
+                        val galleryID = metadata.galleryBlock?.id ?: metadata.galleryInfo?.id ?: return@forEach
+
+                        downloadFolderMap[galleryID] = folder.name
+                    }
+
+                    downloadManager.downloadFolderMap.putAll(downloadFolderMap)
+                    val downloads = FileX(context, downloadManager.downloadFolder, ".download")
+
+                    if (!downloads.exists()) downloads.createNewFile()
+                    downloads.writeText(Json.encodeToString(downloadFolderMap))
+
+                    this.icon = null
+                    Toast.makeText(context, android.R.string.ok, Toast.LENGTH_SHORT).show()
+                }
                 "delete_downloads" -> {
                     val dir = DownloadManager.getInstance(context).downloadFolder
 
@@ -191,6 +246,12 @@ class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenc
 
             onPreferenceClickListener = this@ManageStorageFragment
         }
+
+        with(findPreference<Preference>("recover_downloads")) {
+            this ?: return@with
+
+            onPreferenceClickListener = this@ManageStorageFragment
+        }
     }
 
     override fun onDestroy() {

app/src/main/java/xyz/quaver/pupil/util/downloader/Cache.kt

@@ -21,7 +21,6 @@ package xyz.quaver.pupil.util.downloader
 import android.content.Context
 import android.content.ContextWrapper
 import android.net.Uri
-import android.util.Log
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -40,7 +39,6 @@ import xyz.quaver.pupil.hitomi.GalleryBlock
 import xyz.quaver.pupil.hitomi.GalleryInfo
 import xyz.quaver.pupil.hitomi.getGalleryBlock
 import xyz.quaver.pupil.hitomi.getGalleryInfo
-import xyz.quaver.pupil.userAgent
 import java.io.File
 import java.io.IOException
 import java.io.InputStream
@@ -231,6 +229,9 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
             return@launch
 
         (lock[galleryID] ?: Mutex().also { lock[galleryID] = it }).withLock {
+            if (downloadFolder.exists()) downloadFolder.deleteRecursively()
+            downloadFolder.mkdir()
+
             val cacheMetadata = cacheFolder.getChild(".metadata")
             val downloadMetadata = downloadFolder.getChild(".metadata")
 

app/src/main/java/xyz/quaver/pupil/util/downloader/DownloadManager.kt

@@ -48,14 +48,12 @@ class DownloadManager private constructor(context: Context) : ContextWrapper(con
     val defaultDownloadFolder = FileX(this, getExternalFilesDir(null)!!)
 
     val downloadFolder: FileX
-        get() = {
-            kotlin.runCatching {
-                FileX(this, Preferences.get<String>("download_folder"))
-            }.getOrElse {
-                Preferences["download_folder"] = defaultDownloadFolder.uri.toString()
-                defaultDownloadFolder
-            }
-        }.invoke()
+        get() = kotlin.runCatching {
+            FileX(this, Preferences.get<String>("download_folder"))
+        }.getOrElse {
+            Preferences["download_folder"] = defaultDownloadFolder.uri.toString()
+            defaultDownloadFolder
+        }
 
     private var prevDownloadFolder: FileX? = null
     private var downloadFolderMapInstance: MutableMap<Int, String>? = null
@@ -64,21 +62,19 @@ class DownloadManager private constructor(context: Context) : ContextWrapper(con
         get() {
             if (prevDownloadFolder != downloadFolder) {
                 prevDownloadFolder = downloadFolder
-                downloadFolderMapInstance = {
+                downloadFolderMapInstance = run {
                     val file = downloadFolder.getChild(".download")
-
                     val data = if (file.exists())
                         kotlin.runCatching {
-                            file.readText()?.let { Json.decodeFromString<MutableMap<Int, String>>(it) }
+                            file.readText()?.let{ Json.decodeFromString<MutableMap<Int, String>>(it) }
                         }.onFailure { file.delete() }.getOrNull()
                     else
                         null
-
-                    data ?: {
+                    data ?: run {
                         file.createNewFile()
-                        mutableMapOf<Int, String>()
-                    }.invoke()
-                }.invoke()
+                        mutableMapOf()
+                    }
+                }
             }
 
             return downloadFolderMapInstance ?: mutableMapOf()
@@ -103,14 +99,13 @@ class DownloadManager private constructor(context: Context) : ContextWrapper(con
 
         val folder = downloadFolder.getChild(name)
 
-        if (folder.exists()) return@launch
-
-        folder.mkdir()
-
-        downloadFolderMap[galleryID] = folder.name
+        downloadFolderMap[galleryID] = name
 
         downloadFolder.getChild(".download").let { if (!it.exists()) it.createNewFile() }
         downloadFolder.getChild(".download").writeText(Json.encodeToString(downloadFolderMap))
+
+        if (folder.exists()) return@launch
+        folder.mkdir()
     }
 
     @Synchronized

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

@@ -27,6 +27,7 @@ import xyz.quaver.pupil.hitomi.GalleryBlock
 import xyz.quaver.pupil.hitomi.GalleryInfo
 import xyz.quaver.pupil.hitomi.getReferer
 import xyz.quaver.pupil.hitomi.imageUrlFromImage
+import xyz.quaver.pupil.userAgent
 import java.util.*
 import kotlin.collections.ArrayList
 
@@ -114,7 +115,7 @@ suspend fun GalleryInfo.getRequestBuilders(): List<Request.Builder> {
                 .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")
+            .header("User-Agent", userAgent)
     }
 }
 

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

@@ -162,7 +162,7 @@ fun checkUpdate(context: Context, force: Boolean = false) {
             setNegativeButton(if (force) android.R.string.cancel else R.string.ignore) { _, _ ->
                 if (!force)
                     preferences.edit()
-                        .putLong("ignore_update_until", System.currentTimeMillis() + 604800000)
+                        .putLong("ignore_update_until", System.currentTimeMillis() + 86400000)
                         .apply()
             }
         }

app/src/main/res/values-ja/strings.xml

@@ -158,4 +158,5 @@
     <string name="unaccessible_download_folder">アンドロイド11以上では外部からのアプリ内部空間接近が不可能です。ダウンロードフォルダを変更しますか？</string>
     <string name="settings_networking">ネットワーク</string>
     <string name="old_webview">WebViewのアップデートが必要です</string>
+    <string name="settings_recover_downloads">ダウンロードデータベースを再構築</string>
 </resources>

app/src/main/res/values-ko/strings.xml

@@ -158,4 +158,5 @@
     <string name="unaccessible_download_folder">안드로이드 11 이상에서는 외부에서 현재 다운로드 폴더에 접근할 수 없습니다. 변경하시겠습니까?</string>
     <string name="settings_networking">네트워크</string>
     <string name="old_webview">WebView 업데이트가 필요합니다</string>
+    <string name="settings_recover_downloads">다운로드 데이터베이스 복구</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -152,6 +152,7 @@
     <string name="settings_storage_usage_loading">Calculating storage usage…</string>
     <string name="settings_clear_cache">Clear cache</string>
     <string name="settings_clear_cache_alert_message">Deleting cache can affect image loading speed. Do you want to continue?</string>
+    <string name="settings_recover_downloads">Reconstruct download database</string>
     <string name="settings_clear_downloads">Clear downloads</string>
     <string name="settings_clear_downloads_alert_message">Delete all downloaded galleries.\nDo you want to continue?</string>
     <string name="settings_clear_history">Clear history</string>

app/src/main/res/xml/manage_storage_preferences.xml

@@ -27,6 +27,11 @@
         app:key="delete_downloads"
         app:title="@string/settings_clear_downloads"/>
 
+    <Preference
+        app:key="recover_downloads"
+        app:title="@string/settings_recover_downloads"
+        app:iconSpaceReserved="true"/>
+
     <Preference
         app:key="clear_history"
         app:title="@string/settings_clear_history"/>

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath 'com.android.tools.build:gradle:7.1.0'
         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"
@@ -14,7 +14,7 @@ buildscript {
         // 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.8.1"
-        classpath "com.google.firebase:perf-plugin:1.4.0"
+        classpath "com.google.firebase:perf-plugin:1.4.1"
         classpath "com.google.android.gms:oss-licenses-plugin:0.10.4"
     }
 }

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-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip