From 486fbe46a02bb8854984fbf50470e56091839e33 Mon Sep 17 00:00:00 2001
From: tom5079 <tom5079@naver.com>
Date: Sat, 5 Sep 2020 18:11:20 +0900
Subject: [PATCH] Fixed migration

---
 .../java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt  | 6 +++++-
 app/src/main/java/xyz/quaver/pupil/util/update.kt          | 7 +++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
index 982acc0b..c4d08714 100644
--- a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
@@ -50,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
@@ -169,7 +170,10 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
                                 target: Target<Drawable>?,
                                 isFirstResource: Boolean
                             ): Boolean {
-                                Cache.getInstance(context, galleryID).findFile(".thumbnail")?.let { if (it.exists()) it.delete() }
+                                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
                             }
 
diff --git a/app/src/main/java/xyz/quaver/pupil/util/update.kt b/app/src/main/java/xyz/quaver/pupil/util/update.kt
index 436fd912..2bbb38c2 100644
--- a/app/src/main/java/xyz/quaver/pupil/util/update.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/update.kt
@@ -310,15 +310,14 @@ fun xyz.quaver.pupil.util.downloader.DownloadManager.migrate() {
                 )
 
                 synchronized(Cache) {
-                    Cache.instances.delete(galleryID)
+                    Cache.delete(galleryID)
                 }
                 downloadFolderMap[galleryID] = folder.name
+
+                downloadFolder.getChild(".download").let { if (!it.exists()) it.createNewFile(); it.writeText(Json.encodeToString(downloadFolderMap)) }
             }
         }
 
-        downloadFolder.getChild(".download").let { if (!it.exists()) it.createNewFile() }
-        downloadFolder.getChild(".download").writeText(Json.encodeToString(downloadFolderMap))
-
         notification
             .setContentText(getText(R.string.import_old_galleries_notification_done))
             .setProgress(0, 0, false)