Minor bug fix

app/build.gradle

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

app/release/output-metadata.json

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

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

@@ -153,7 +153,7 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
                 CoroutineScope(Dispatchers.IO).launch {
                     val thumbnail = cache.getThumbnail()
 
-                    galleryblock_thumbnail.post {
+                    launch(Dispatchers.Main) {
                         glide
                             .load(thumbnail)
                             .skipMemoryCache(true)

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

@@ -240,7 +240,7 @@ class DownloadService : Service() {
         }
     }
 
-    fun cancel(startId: Int? = null) {
+    fun cancel() {
         client.dispatcher().queuedCalls().filter {
             it.request().tag() is Tag
         }.forEach {
@@ -255,19 +255,19 @@ class DownloadService : Service() {
         progress.clear()
         notification.clear()
         notificationManager.cancelAll()
-
-        startId?.let { stopSelf(it) }
     }
 
     fun cancel(galleryID: Int, startId: Int? = null) {
         client.dispatcher().queuedCalls().filter {
             (it.request().tag() as? Tag)?.galleryID == galleryID
         }.forEach {
+            (it.request().tag() as? Tag)?.startId?.let { stopSelf(it) }
             it.cancel()
         }
         client.dispatcher().runningCalls().filter {
             (it.request().tag() as? Tag)?.galleryID == galleryID
         }.forEach {
+            (it.request().tag() as? Tag)?.startId?.let { stopSelf(it) }
             it.cancel()
         }
 
@@ -372,10 +372,10 @@ class DownloadService : Service() {
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         when (intent?.getStringExtra(KEY_COMMAND)) {
             COMMAND_DOWNLOAD -> intent.getIntExtra(KEY_ID, -1).let { if (it > 0)
-                download(it, intent.getBooleanExtra(KEY_PRIORITY, false), startId = startId)
+                download(it, intent.getBooleanExtra(KEY_PRIORITY, false), startId)
             }
-            COMMAND_CANCEL -> intent.getIntExtra(KEY_ID, -1).let { if (it > 0) cancel(it, startId = startId) else cancel(startId = startId) }
+            COMMAND_CANCEL -> intent.getIntExtra(KEY_ID, -1).let { if (it > 0) cancel(it, startId) else cancel() }
-            COMMAND_DELETE -> intent.getIntExtra(KEY_ID, -1).let { if (it > 0) delete(it, startId = startId) }
+            COMMAND_DELETE -> intent.getIntExtra(KEY_ID, -1).let { if (it > 0) delete(it, startId) }
         }
 
         return START_NOT_STICKY

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

@@ -46,7 +46,7 @@ class DownloadFolderNameDialogFragment : DialogFragment() {
 
         return layoutInflater.inflate(R.layout.dialog_download_folder_name, null).apply {
             message.text = getString(R.string.settings_download_folder_name_message, formatMap.keys.toString(), galleryBlock?.formatDownloadFolder() ?: "")
-            edittext.setText(Preferences.get<String>("download_folder_name"))
+            edittext.setText(Preferences["download_folder_name", "[-id-] -title-"])
             edittext.addTextChangedListener {
                 message.text = getString(R.string.settings_download_folder_name_message, formatMap.keys.toString(), galleryBlock?.formatDownloadFolderTest(it.toString()) ?: "")
             }

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

@@ -147,7 +147,7 @@ class SettingsFragment :
                     summary = FileX(context, Preferences.get<String>("download_folder")).canonicalPath
                 }
                 "download_folder_name" -> {
-                    summary = Preferences.get<String>("download_folder_name")
+                    summary = Preferences["download_folder_name", "[-id-] -title-"]
                 }
             }
         }
@@ -186,7 +186,7 @@ class SettingsFragment :
                             onPreferenceClickListener = this@SettingsFragment
                         }
                         "download_folder_name" -> {
-                            summary = Preferences.get<String>("download_folder_name")
+                            summary = Preferences["download_folder_name", "[-id-] -title-"]
 
                             setOnPreferenceClickListener {
                                 DownloadFolderNameDialogFragment().show(requireActivity().supportFragmentManager, "Download Location Dialog")

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

@@ -109,7 +109,7 @@ class DownloadManager private constructor(context: Context) : ContextWrapper(con
         val folder = downloadFolder.getChild(name)
 
         if (!folder.exists())
-            folder.mkdirs()
+            folder.mkdir()
 
         downloadFolderMap[galleryID] = folder.name