From 19a69e0abf0ba13a55a615fed59ea79117867a84 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Thu, 21 Nov 2024 11:53:02 +0100 Subject: [PATCH] simplify check if file is outside cache dir Signed-off-by: Marcel Hibbe --- app/src/main/java/com/nextcloud/talk/utils/FileUtils.kt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/utils/FileUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/FileUtils.kt index 8f4c40690..627787df1 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/FileUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/FileUtils.kt @@ -98,12 +98,7 @@ object FileUtils { fun copyFileToCache(context: Context, sourceFileUri: Uri, filename: String): File? { val cachedFile = File(context.cacheDir, filename) - val aboveOrEqualAPI26Check = - !cachedFile.toPath().normalize().startsWith(context.cacheDir.toPath()) - - val isOutsideCacheDir = aboveOrEqualAPI26Check - - if (isOutsideCacheDir) { + if (!cachedFile.toPath().normalize().startsWith(context.cacheDir.toPath())) { Log.w(TAG, "cachedFile was not created in cacheDir. Aborting for security reasons.") cachedFile.delete() return null