user01/Pupil
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed cleanup() deleting .cache

Browse Source 
fixed empty tag showing up
This commit is contained in:
tom5079
2021-01-18 22:17:48 +09:00
parent 2f16838e1e
commit 4aea7d08ce
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/xyz/quaver/pupil/adapters/SearchResultsAdapter.kt
View File

@@ -146,7 +146,7 @@ class SearchResultsAdapter(private val results: List<ItemInfo>) : RecyclerSwipeA
CoroutineScope(Dispatchers.Main).launch { CoroutineScope(Dispatchers.Main).launch {
with (binding.tagGroup) { with (binding.tagGroup) {
tags.clear() 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) Tag.parse(it)
}?.let { tags.addAll(it) } }?.let { tags.addAll(it) }
refresh() refresh()

6
app/src/main/java/xyz/quaver/pupil/util/ImageCache.kt
View File

@@ -19,12 +19,12 @@
package xyz.quaver.pupil.util package xyz.quaver.pupil.util
import android.content.Context import android.content.Context
import android.util.Log
import com.google.firebase.crashlytics.FirebaseCrashlytics import com.google.firebase.crashlytics.FirebaseCrashlytics
import kotlinx.coroutines.* import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.channels.BufferOverflow import kotlinx.coroutines.channels.BufferOverflow
import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.channels.sendBlocking import kotlinx.coroutines.channels.sendBlocking
import kotlinx.coroutines.coroutineScope
import okhttp3.* import okhttp3.*
import org.kodein.di.DIAware import org.kodein.di.DIAware
import org.kodein.di.android.di import org.kodein.di.android.di
@@ -50,7 +50,7 @@ class ImageCache(context: Context) : DIAware {
suspend fun cleanup() = coroutineScope { suspend fun cleanup() = coroutineScope {
val LIMIT = 100*1024*1024 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) if (cacheFolder.size() > LIMIT)
do { do {