From 4aea7d08ce2445d0294f2a9a306517ff04a105d8 Mon Sep 17 00:00:00 2001
From: tom5079 <tom5079@naver.com>
Date: Mon, 18 Jan 2021 22:17:48 +0900
Subject: [PATCH] fixed cleanup() deleting .cache fixed empty tag showing up

---
 .../java/xyz/quaver/pupil/adapters/SearchResultsAdapter.kt  | 2 +-
 app/src/main/java/xyz/quaver/pupil/util/ImageCache.kt       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/xyz/quaver/pupil/adapters/SearchResultsAdapter.kt b/app/src/main/java/xyz/quaver/pupil/adapters/SearchResultsAdapter.kt
index 0bccd261..8183737b 100644
--- a/app/src/main/java/xyz/quaver/pupil/adapters/SearchResultsAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/SearchResultsAdapter.kt
@@ -146,7 +146,7 @@ class SearchResultsAdapter(private val results: List<ItemInfo>) : RecyclerSwipeA
             CoroutineScope(Dispatchers.Main).launch {
                 with (binding.tagGroup) {
                     tags.clear()
-                    result.extra[ItemInfo.ExtraType.TAGS]?.await()?.split(", ")?.map {
+                    result.extra[ItemInfo.ExtraType.TAGS]?.await()?.split(", ")?.let { if (it.size == 1 && it.first().isEmpty()) emptyList() else it }?.map {
                         Tag.parse(it)
                     }?.let { tags.addAll(it) }
                     refresh()
diff --git a/app/src/main/java/xyz/quaver/pupil/util/ImageCache.kt b/app/src/main/java/xyz/quaver/pupil/util/ImageCache.kt
index 460efb18..66b79ba7 100644
--- a/app/src/main/java/xyz/quaver/pupil/util/ImageCache.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/ImageCache.kt
@@ -19,12 +19,12 @@
 package xyz.quaver.pupil.util
 
 import android.content.Context
-import android.util.Log
 import com.google.firebase.crashlytics.FirebaseCrashlytics
-import kotlinx.coroutines.*
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.channels.sendBlocking
+import kotlinx.coroutines.coroutineScope
 import okhttp3.*
 import org.kodein.di.DIAware
 import org.kodein.di.android.di
@@ -50,7 +50,7 @@ class ImageCache(context: Context) : DIAware {
     suspend fun cleanup() = coroutineScope {
         val LIMIT = 100*1024*1024
 
-        cacheFolder.listFiles { it -> it.canonicalPath !in cache.values }?.forEach { it.delete() }
+        cacheFolder.listFiles { it -> it.canonicalPath !in cache.values || it.name == ".cache" }?.forEach { it.delete() }
 
         if (cacheFolder.size() > LIMIT)
             do {