Bug fix

app/build.gradle

@@ -20,7 +20,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 29
         versionCode 57
-        versionName "5.0-beta1"
+        versionName "5.0-beta4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

app/release/output-metadata.json

@@ -12,7 +12,7 @@
       "filters": [],
       "properties": [],
       "versionCode": 57,
-      "versionName": "5.0-beta1",
+      "versionName": "5.0-beta4",
       "enabled": true,
       "outputFile": "app-release.apk"
     }

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

@@ -35,7 +35,11 @@ import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import androidx.vectordrawable.graphics.drawable.Animatable2Compat
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import com.bumptech.glide.RequestManager
+import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.bumptech.glide.load.engine.GlideException
+import com.bumptech.glide.request.RequestListener
+import com.bumptech.glide.request.target.Target
 import com.daimajia.swipe.SwipeLayout
 import com.daimajia.swipe.adapters.RecyclerSwipeAdapter
 import com.daimajia.swipe.interfaces.SwipeAdapterInterface
@@ -46,6 +50,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import xyz.quaver.hitomi.getReader
+import xyz.quaver.io.util.getChild
 import xyz.quaver.pupil.BuildConfig
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.favorites
@@ -88,11 +93,10 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
                     val imageList = cache.metadata.imageList!!
 
                     progress = imageList.filterNotNull().size
+                    max = imageList.size
 
-                    if (visibility == View.GONE) {
+                    if (visibility == View.GONE)
                         visibility = View.VISIBLE
-                        max = imageList.size
-                    }
 
                     if (progress == max) {
                         val downloadManager = DownloadManager.getInstance(context)
@@ -158,6 +162,28 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
                         .skipMemoryCache(true)
                         .diskCacheStrategy(DiskCacheStrategy.NONE)
                         .error(R.drawable.image_broken_variant)
+                        .listener(object: RequestListener<Drawable> {
+                            override fun onLoadFailed(
+                                e: GlideException?,
+                                model: Any?,
+                                target: Target<Drawable>?,
+                                isFirstResource: Boolean
+                            ): Boolean {
+                                Cache.getInstance(context, galleryID).let {
+                                    it.cacheFolder.getChild(".thumbnail").let { if (it.exists()) it.delete() }
+                                    it.downloadFolder?.getChild(".thumbnail")?.let { if (it.exists()) it.delete() }
+                                }
+                                return false
+                            }
+
+                            override fun onResourceReady(
+                                resource: Drawable?,
+                                model: Any?,
+                                target: Target<Drawable>?,
+                                dataSource: DataSource?,
+                                isFirstResource: Boolean
+                            ): Boolean = false
+                        })
                         .apply {
                             if (BuildConfig.CENSOR)
                                 override(5, 8)

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

@@ -138,7 +138,7 @@ class ReaderAdapter(private val activity: ReaderActivity,
             if (progress?.isInfinite() == true && image != null) {
                 holder.view.reader_item_progressbar.visibility = View.INVISIBLE
 
-                holder.view.image.post {
+                CoroutineScope(Dispatchers.IO).launch {
                     glide
                         .load(image.readBytes())
                         .diskCacheStrategy(DiskCacheStrategy.NONE)
@@ -155,16 +155,14 @@ class ReaderAdapter(private val activity: ReaderActivity,
                                 cache!!.metadata.imageList?.set(position, null)
                                 image.delete()
                                 DownloadService.cancel(holder.view.context, galleryID)
-                                DownloadService.delete(holder.view.context, galleryID)
+                                DownloadService.download(holder.view.context, galleryID, true)
                                 return true
                             }
 
                             override fun onResourceReady(resource: Drawable?, model: Any?, target: Target<Drawable>?, dataSource: DataSource?, isFirstResource: Boolean) =
                                 false
-                        })
-                        .into(holder.view.image)
+                        }).let { launch(Dispatchers.Main) { it.into(holder.view.image) } }
                 }
-
             } else {
                 holder.view.reader_item_progressbar.visibility = View.VISIBLE
 

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

@@ -103,7 +103,7 @@ class DownloadService : Service() {
     @SuppressLint("RestrictedApi")
     private fun notify(galleryID: Int) {
         val max = progress[galleryID]?.size ?: 0
-        val progress = progress[galleryID]?.count { it.isInfinite() } ?: 0
+        val progress = progress[galleryID]?.count { it == Float.POSITIVE_INFINITY } ?: 0
 
         val notification = notification[galleryID] ?: return
 
@@ -196,7 +196,7 @@ class DownloadService : Service() {
     */
     val progress = SparseArray<MutableList<Float>?>()
 
-    fun isCompleted(galleryID: Int) = progress[galleryID]?.toList()?.all { it.isInfinite() } == true
+    fun isCompleted(galleryID: Int) = progress[galleryID]?.toList()?.all { it == Float.POSITIVE_INFINITY } == true
 
     private val callback = object: Callback {
 
@@ -308,10 +308,10 @@ class DownloadService : Service() {
         }
 
         if (progress.indexOfKey(galleryID) < 0)
-            progress.put(galleryID, mutableListOf())
+            progress.put(galleryID, MutableList(reader.galleryInfo.files.size) { 0F })
 
-        cache.metadata.imageList?.forEach {
-            progress[galleryID]?.add(if (it != null) Float.POSITIVE_INFINITY else 0F)
+        cache.metadata.imageList?.forEachIndexed { index, image ->
+            progress[galleryID]?.set(index, if (image != null) Float.POSITIVE_INFINITY else 0F)
         }
 
         notification[galleryID]?.setContentTitle(reader.galleryInfo.title?.ellipsize(30))
@@ -328,9 +328,11 @@ class DownloadService : Service() {
             }
         }
 
-        reader.requestBuilders.filterIndexed { index, _ -> progress[galleryID]?.get(index)?.isInfinite() != true }.forEachIndexed { index, it ->
-            val request = it.tag(Tag(galleryID, index, startId)).build()
-            client.newCall(request).enqueue(callback)
+        reader.requestBuilders.forEachIndexed { index, it ->
+            if (progress[galleryID]?.get(index)?.isInfinite() != true) {
+                val request = it.tag(Tag(galleryID, index, startId)).build()
+                client.newCall(request).enqueue(callback)
+            }
         }
 
         queued.forEach { download(it) }

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

@@ -1034,7 +1034,7 @@ class MainActivity : AppCompatActivity() {
                     val downloads = DownloadManager.getInstance(this@MainActivity).downloadFolderMap.keys.toList()
 
                     when {
-                        query.isEmpty() -> downloads.also {
+                        query.isEmpty() -> downloads.reversed().also {
                             totalItems = it.size
                         }
                         else -> {

app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadLocationDialogFragment.kt

@@ -122,6 +122,9 @@ class DownloadLocationDialogFragment : DialogFragment() {
             .setTitle(R.string.settings_download_folder)
             .setView(build())
             .setPositiveButton(requireContext().getText(android.R.string.ok)) { _, _ ->
+                if (Preferences["download_folder", ""].isEmpty())
+                    Preferences["download_folder"] = context?.getExternalFilesDir(null)?.canonicalPath ?: ""
+
                 DownloadManager.getInstance(requireContext()).migrate()
             }
 
@@ -146,7 +149,7 @@ class DownloadLocationDialogFragment : DialogFragment() {
                         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
                             context.contentResolver.takePersistableUriPermission(uri, takeFlags)
 
-                        if (FileX(context, uri).canWrite())
+                        if (kotlin.runCatching { FileX(context, uri).canWrite() }.getOrDefault(false))
                             Preferences["download_folder"] = uri.toString()
                         else {
                             Snackbar.make(

app/src/main/java/xyz/quaver/pupil/ui/dialog/MirrorDialog.kt

@@ -82,7 +82,7 @@ class MirrorDialog(context: Context) : AlertDialog(context) {
                 }
 
                 onItemMoved = {
-                    Preferences["mirrors", it.joinToString(">")]
+                    Preferences["mirrors"] = it.joinToString(">")
                 }
             }
         }

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

@@ -66,7 +66,7 @@ class ManageFavoritesFragment : PreferenceFragmentCompat() {
                         type = "text/plain"
                         putExtra(Intent.EXTRA_TEXT, response.body()?.use { it.string() }?.replace("\n", ""))
                     }.let {
-                        context.startActivity(Intent.createChooser(it, getString(R.string.settings_backup_share)))
+                        getContext()?.startActivity(Intent.createChooser(it, getString(R.string.settings_backup_share)))
                     }
                 }
             })

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

@@ -91,7 +91,7 @@ class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenc
                                 }
 
                                 if (dir.exists())
-                                    dir.listFiles()?.forEach { (it as FileX).deleteRecursively() }
+                                    dir.listFiles()?.forEach { (it as? FileX)?.deleteRecursively() }
 
                                 job = launch {
                                     var size = 0L

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

@@ -60,6 +60,7 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
                 instances[galleryID] ?: Cache(context, galleryID).also { instances.put(galleryID, it) }
             }
 
+        @Synchronized
         fun delete(galleryID: Int) {
             instances[galleryID]?.cacheFolder?.deleteRecursively()
             instances.delete(galleryID)
@@ -86,11 +87,11 @@ class Cache private constructor(context: Context, val galleryID: Int) : ContextW
         }
 
     fun findFile(fileName: String): FileX? =
-        cacheFolder.getChild(fileName).let {
+         downloadFolder?.let { downloadFolder -> downloadFolder.getChild(fileName).let {
             if (it.exists()) it else null
-        } ?: downloadFolder?.let { downloadFolder -> downloadFolder.getChild(fileName).let {
+        } } ?: cacheFolder.getChild(fileName).let {
             if (it.exists()) it else null
-        } }
+        }
 
     @Suppress("BlockingMethodInNonBlockingContext")
     fun setMetadata(change: (Metadata) -> Unit) {

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

@@ -113,6 +113,7 @@ class DownloadManager private constructor(context: Context) : ContextWrapper(con
 
         downloadFolderMap[galleryID] = folder.name
 
+        downloadFolder.getChild(".download").let { if (!it.exists()) it.createNewFile() }
         downloadFolder.getChild(".download").writeText(Json.encodeToString(downloadFolderMap))
     }
 
@@ -126,6 +127,7 @@ class DownloadManager private constructor(context: Context) : ContextWrapper(con
                 downloadFolder.getChild(it).delete()
                 downloadFolderMap.remove(galleryID)
 
+                downloadFolder.getChild(".download").let { if (!it.exists()) it.createNewFile() }
                 downloadFolder.getChild(".download").writeText(Json.encodeToString(downloadFolderMap))
             }
         }

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

@@ -24,6 +24,7 @@ import android.app.PendingIntent
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import android.content.IntentFilter
 import android.net.Uri
 import android.util.Base64
 import android.util.Log
@@ -32,11 +33,13 @@ import androidx.appcompat.app.AlertDialog
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.preference.PreferenceManager
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 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.*
 import okhttp3.Call
 import okhttp3.Callback
@@ -45,6 +48,8 @@ import okhttp3.Response
 import ru.noties.markwon.Markwon
 import xyz.quaver.hitomi.GalleryBlock
 import xyz.quaver.hitomi.Reader
+import xyz.quaver.hitomi.getGalleryBlock
+import xyz.quaver.hitomi.getReader
 import xyz.quaver.io.FileX
 import xyz.quaver.io.util.getChild
 import xyz.quaver.io.util.*
@@ -53,6 +58,7 @@ import xyz.quaver.pupil.R
 import xyz.quaver.pupil.client
 import xyz.quaver.pupil.services.DownloadService
 import xyz.quaver.pupil.util.downloader.Cache
+import xyz.quaver.pupil.util.downloader.Metadata
 import java.io.File
 import java.io.IOException
 import java.net.URL
@@ -189,7 +195,7 @@ fun checkUpdate(context: Context, force: Boolean = false) {
     }
 }
 
-fun restore(favorites: GalleryList, url: String, onFailure: ((Exception) -> Unit)? = null, onSuccess: ((List<Int>) -> Unit)? = null) {
+fun restore(favorites: GalleryList, url: String, onFailure: ((Throwable) -> Unit)? = null, onSuccess: ((List<Int>) -> Unit)? = null) {
     if (!URLUtil.isValidUrl(url)) {
         onFailure?.invoke(IllegalArgumentException())
         return
@@ -206,10 +212,12 @@ fun restore(favorites: GalleryList, url: String, onFailure: ((Exception) -> Unit
         }
 
         override fun onResponse(call: Call, response: Response) {
-            Json.decodeFromString<List<Int>>(response.body().use { it?.string() } ?: "[]").let {
-                favorites.addAll(it)
-                onSuccess?.invoke(it)
-            }
+            kotlin.runCatching {
+                Json.decodeFromString<List<Int>>(response.body().use { it?.string() } ?: "[]").let {
+                    favorites.addAll(it)
+                    onSuccess?.invoke(it)
+                }
+            }.onFailure { onFailure?.invoke(it) }
         }
     })
 }
@@ -224,12 +232,15 @@ private val receiver = object: BroadcastReceiver() {
             ACTION_CANCEL -> {
                 job?.cancel()
                 NotificationManagerCompat.from(context).cancel(R.id.notification_id_import)
+                context.unregisterReceiver(this)
             }
         }
     }
 }
 @SuppressLint("RestrictedApi")
 fun xyz.quaver.pupil.util.downloader.DownloadManager.migrate() {
+    registerReceiver(receiver, IntentFilter().apply { addAction(receiver.ACTION_CANCEL) })
+
     val notificationManager = NotificationManagerCompat.from(this)
     val action = NotificationCompat.Action.Builder(0, getText(android.R.string.cancel),
         PendingIntent.getBroadcast(this, R.id.notification_import_cancel_action.normalizeID(), Intent(receiver.ACTION_CANCEL), PendingIntent.FLAG_UPDATE_CURRENT)
@@ -245,55 +256,65 @@ fun xyz.quaver.pupil.util.downloader.DownloadManager.migrate() {
 
     job?.cancel()
     job = CoroutineScope(Dispatchers.IO).launch {
-        val folders = downloadFolder.listFiles { folder ->
+        val downloadFolders = downloadFolder.listFiles { folder ->
             (folder as? FileX)?.isDirectory == true && !downloadFolderMap.values.contains(folder.name)
         }
-        if (folders.isNullOrEmpty()) return@launch
-        folders.forEachIndexed { index, folder ->
+
+        if (downloadFolders.isNullOrEmpty()) return@launch
+
+        downloadFolders.forEachIndexed { index, folder ->
             notification
-                .setContentText(getString(R.string.import_old_galleries_notification_text, index, folders.size))
-                .setProgress(index, folders.size, false)
+                .setContentText(getString(R.string.import_old_galleries_notification_text, index, downloadFolders.size))
+                .setProgress(index, downloadFolders.size, false)
             notificationManager.notify(R.id.notification_id_import, notification.build())
 
             kotlin.runCatching {
-                val folder = (folder as? FileX) ?: return@runCatching
+                if (folder !is FileX) return@runCatching
 
-                val metadata = folder.getChild(".metadata").readText()?.let { Json.parseToJsonElement(it).jsonObject } ?: return@runCatching
+                val metadata = kotlin.runCatching {
+                    folder.getChild(".metadata").readText()?.let { Json.parseToJsonElement(it).jsonObject }
+                }.getOrNull()
 
-                val galleryBlock: GalleryBlock? =
-                    metadata["galleryBlock"]?.let { Json.decodeFromJsonElement<GalleryBlock>(it) }
-                val reader: Reader? =
-                    metadata["reader"]?.let { Json.decodeFromJsonElement<Reader>(it) }
+                val galleryID = folder.name.toIntOrNull() ?: return@runCatching
 
-                val galleryID = galleryBlock?.id ?: reader?.galleryInfo?.id ?: folder.name.toIntOrNull() ?: return@runCatching
+                val galleryBlock: GalleryBlock? = kotlin.runCatching {
+                    metadata?.get("galleryBlock")?.let { Json.decodeFromJsonElement<GalleryBlock>(it) }
+                }.getOrNull() ?: getGalleryBlock(galleryID)
+                val reader: Reader? = kotlin.runCatching {
+                    metadata?.get("reader")?.let { Json.decodeFromJsonElement<Reader>(it) }
+                }.getOrNull() ?: getReader(galleryID)
 
-                metadata["thumbnail"]?.jsonPrimitive?.contentOrNull.let { thumbnail ->
+                metadata?.get("thumbnail")?.jsonPrimitive?.contentOrNull?.also { thumbnail ->
                     val file = folder.getChild(".thumbnail").also {
-                        if (!it.exists())
-                            it.createNewFile()
+                        if (it.exists())
+                            it.delete()
+                        it.createNewFile()
                     }
 
                     file.writeBytes(Base64.decode(thumbnail, Base64.DEFAULT))
                 }
 
-                downloadFolderMap[galleryID] = folder.name
-
-                val cache = Cache.getInstance(this@migrate, galleryID)
-
                 val list: MutableList<String?> =
-                    MutableList(cache.getReader()!!.galleryInfo.files.size) { null }
+                    MutableList(reader!!.galleryInfo.files.size) { null }
 
-                folder.listFiles { dir ->
-                    dir?.nameWithoutExtension?.toIntOrNull() != null
+                folder.listFiles { file ->
+                    file?.nameWithoutExtension?.let {
+                        Regex("""\d{5}""").matches(it) && it.toIntOrNull() != null
+                    } == true
                 }?.forEach {
                     list[it.nameWithoutExtension.toInt()] = it.name
                 }
 
-                cache.setMetadata {
-                    it.galleryBlock = galleryBlock
-                    it.reader = reader
-                    it.imageList = list
+                folder.getChild(".metadata").also { if (it.exists()) it.delete(); it.createNewFile() }.writeText(
+                    Json.encodeToString(Metadata(galleryBlock, reader, list))
+                )
+
+                synchronized(Cache) {
+                    Cache.delete(galleryID)
                 }
+                downloadFolderMap[galleryID] = folder.name
+
+                downloadFolder.getChild(".download").let { if (!it.exists()) it.createNewFile(); it.writeText(Json.encodeToString(downloadFolderMap)) }
             }
         }
 
@@ -303,5 +324,7 @@ fun xyz.quaver.pupil.util.downloader.DownloadManager.migrate() {
             .setOngoing(false)
             .mActions.clear()
         notificationManager.notify(R.id.notification_id_import, notification.build())
+
+        unregisterReceiver(receiver)
     }
 }