Fix NPE during PagesCache initialization

This commit is contained in:
Koitharu
2023-01-22 09:21:24 +02:00
parent eeba959ba5
commit 3e7a48d27a

View File

@@ -21,7 +21,7 @@ class PagesCache @Inject constructor(@ApplicationContext context: Context) {
private val cacheDir = checkNotNull(findSuitableDir(context)) { private val cacheDir = checkNotNull(findSuitableDir(context)) {
val dirs = (context.externalCacheDirs + context.cacheDir).joinToString(";") { val dirs = (context.externalCacheDirs + context.cacheDir).joinToString(";") {
it.absolutePath it?.absolutePath.toString()
} }
"Cannot find any suitable directory for PagesCache: [$dirs]" "Cannot find any suitable directory for PagesCache: [$dirs]"
} }
@@ -60,6 +60,6 @@ private fun createDiskLruCacheSafe(dir: File, size: Long): DiskLruCache {
private fun findSuitableDir(context: Context): File? { private fun findSuitableDir(context: Context): File? {
val dirs = context.externalCacheDirs + context.cacheDir val dirs = context.externalCacheDirs + context.cacheDir
return dirs.firstNotNullOfOrNull { return dirs.firstNotNullOfOrNull {
it.subdir(CacheDir.PAGES.dir).takeIfWriteable() it?.subdir(CacheDir.PAGES.dir)?.takeIfWriteable()
} }
} }