Bug fix

app/build.gradle

@@ -20,8 +20,8 @@ android {
         applicationId "xyz.quaver.pupil"
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 57
+        versionCode 58
-        versionName "5.0-beta8"
+        versionName "5.0-hotfix1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

app/release/output-metadata.json

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "properties": [],
-      "versionCode": 57,
+      "versionCode": 58,
-      "versionName": "5.0-beta8",
+      "versionName": "5.0-hotfix1",
       "enabled": true,
       "outputFile": "app-release.apk"
     }

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

@@ -18,10 +18,7 @@
 
 package xyz.quaver.pupil
 
-import android.app.Application
+import android.app.*
-import android.app.Notification
-import android.app.NotificationChannel
-import android.app.NotificationManager
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
@@ -43,6 +40,7 @@ import okhttp3.Response
 import xyz.quaver.io.FileX
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.util.*
+import xyz.quaver.pupil.util.downloader.DownloadManager
 import xyz.quaver.setClient
 import java.io.File
 import java.util.*
@@ -115,6 +113,8 @@ class Pupil : Application() {
             Preferences.remove("download_folder")
         }
 
+        DownloadManager.getInstance(this).migrate()
+
         histories = SavedSet(File(ContextCompat.getDataDir(this), "histories.json"), 0)
         favorites = SavedSet(File(ContextCompat.getDataDir(this), "favorites.json"), 0)
         favoriteTags = SavedSet(File(ContextCompat.getDataDir(this), "favorites_tags.json"), Tag.parse(""))

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

@@ -42,6 +42,7 @@ import xyz.quaver.hitomi.getReferer
 import xyz.quaver.hitomi.imageUrlFromImage
 import xyz.quaver.hiyobi.createImgList
 import xyz.quaver.io.util.readBytes
+import xyz.quaver.pupil.BuildConfig
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.services.DownloadService
 import xyz.quaver.pupil.ui.ReaderActivity
@@ -123,6 +124,10 @@ class ReaderAdapter(private val activity: ReaderActivity,
                     .diskCacheStrategy(DiskCacheStrategy.NONE)
                     .skipMemoryCache(false)
                     .fitCenter()
+                    .apply {
+                        if (BuildConfig.CENSOR)
+                            override(5, 8)
+                    }
                     .error(R.drawable.image_broken_variant)
                     .into(holder.view.image)
             }
@@ -139,6 +144,10 @@ class ReaderAdapter(private val activity: ReaderActivity,
                         .diskCacheStrategy(DiskCacheStrategy.NONE)
                         .skipMemoryCache(true)
                         .fitCenter()
+                        .apply {
+                            if (BuildConfig.CENSOR)
+                                override(5, 8)
+                        }
                         .error(R.drawable.image_broken_variant)
                         .listener(object: RequestListener<Drawable> {
                             override fun onLoadFailed(

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

@@ -27,6 +27,7 @@ import android.util.SparseArray
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.TaskStackBuilder
+import androidx.core.content.ContextCompat
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -46,7 +47,6 @@ import xyz.quaver.pupil.util.downloader.DownloadManager
 import xyz.quaver.pupil.util.ellipsize
 import xyz.quaver.pupil.util.normalizeID
 import xyz.quaver.pupil.util.requestBuilders
-import xyz.quaver.pupil.util.startForegroundServiceCompat
 import java.io.IOException
 
 private typealias ProgressListener = (DownloadService.Tag, Long, Long, Boolean) -> Unit
@@ -354,7 +354,7 @@ class DownloadService : Service() {
         const val COMMAND_DELETE = "DELETE"
 
         private fun command(context: Context, extras: Intent.() -> Unit) {
-            context.startForegroundServiceCompat(Intent(context, DownloadService::class.java).apply(extras))
+            ContextCompat.startForegroundService(context, Intent(context, DownloadService::class.java).apply(extras))
         }
 
         fun download(context: Context, galleryID: Int, priority: Boolean = false) {

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

@@ -968,4 +968,14 @@ class MainActivity :
             }
         }
     }
+
+    override fun onLowMemory() {
+        super.onLowMemory()
+        Glide.get(this).onLowMemory()
+    }
+
+    override fun onTrimMemory(level: Int) {
+        super.onTrimMemory(level)
+        Glide.get(this).onTrimMemory(level)
+    }
 }

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

@@ -35,6 +35,7 @@ import androidx.recyclerview.widget.PagerSnapHelper
 import androidx.recyclerview.widget.RecyclerView
 import androidx.vectordrawable.graphics.drawable.Animatable2Compat
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
+import com.bumptech.glide.Glide
 import com.google.android.material.snackbar.Snackbar
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.android.synthetic.main.activity_reader.*
@@ -473,4 +474,14 @@ class ReaderActivity : BaseActivity() {
             }
         }
     }
+
+    override fun onLowMemory() {
+        super.onLowMemory()
+        Glide.get(this).onLowMemory()
+    }
+
+    override fun onTrimMemory(level: Int) {
+        super.onTrimMemory(level)
+        Glide.get(this).onTrimMemory(level)
+    }
 }

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

@@ -22,6 +22,7 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.os.Build
+import androidx.core.content.ContextCompat
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import xyz.quaver.Code
@@ -101,13 +102,6 @@ fun GalleryBlock.formatDownloadFolderTest(format: String): String =
         }
     }
 
-fun Context.startForegroundServiceCompat(service: Intent) {
-    if (Build.VERSION.SDK_INT >= 26)
-        startForegroundService(service)
-    else
-        startService(service)
-}
-
 val Reader.requestBuilders: List<Request.Builder>
     get() {
         val galleryID = this.galleryInfo.id ?: 0

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

@@ -258,7 +258,12 @@ fun xyz.quaver.pupil.util.downloader.DownloadManager.migrate() {
     job?.cancel()
     job = CoroutineScope(Dispatchers.IO).launch {
         val downloadFolders = downloadFolder.listFiles { folder ->
-            (folder as? FileX)?.isDirectory == true && !downloadFolderMap.values.contains(folder.name)
+            folder.isDirectory && !downloadFolderMap.values.contains(folder.name)
+        }?.map {
+            if (it !is FileX)
+                FileX(this@migrate, it)
+            else
+                it
         }
 
         if (downloadFolders.isNullOrEmpty()) return@launch
@@ -270,8 +275,6 @@ fun xyz.quaver.pupil.util.downloader.DownloadManager.migrate() {
             notificationManager.notify(R.id.notification_id_import, notification.build())
 
             kotlin.runCatching {
-                if (folder !is FileX) return@runCatching
-
                 val metadata = kotlin.runCatching {
                     folder.getChild(".metadata").readText()?.let { Json.parseToJsonElement(it).jsonObject }
                 }.getOrNull()