Merge pull request #1534 from kiwix/feature/macgills/#1533-npe-delete-cache-dir

#1533 allow nullable return
This commit is contained in:
Seán Mac Gillicuddy 2019-09-30 10:58:22 +01:00 committed by GitHub
commit 2b41745c7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -41,15 +41,15 @@ object FileUtils {
"${Environment.getExternalStorageDirectory()}${File.separator}Android" +
"${File.separator}obb${File.separator}${BuildConfig.APPLICATION_ID}"
@JvmStatic fun getFileCacheDir(context: Context): File =
@JvmStatic fun getFileCacheDir(context: Context): File? =
if (Environment.MEDIA_MOUNTED == Environment.getExternalStorageState()) {
context.externalCacheDir!!
context.externalCacheDir
} else {
context.cacheDir
}
@JvmStatic @Synchronized fun deleteCachedFiles(context: Context) {
getFileCacheDir(context).deleteRecursively()
getFileCacheDir(context)?.deleteRecursively()
}
@JvmStatic @Synchronized fun deleteZimFile(path: String) {