mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-29 01:48:53 +03:00
Code Issues Projects Releases Packages Wiki Activity

check if location of cached file makes sense

Browse source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2023-05-31 17:26:37 +02:00
parent d49441e036
commit bd23edc9a5
No known key found for this signature in database
GPG key ID: C793F8B59F43CE7B
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt
View file

@ -126,7 +126,9 @@ class UploadAndShareFilesWorker(val context: Context, workerParameters: WorkerPa
initNotificationSetup() initNotificationSetup()
if (file != null && file.length() > CHUNK_UPLOAD_THRESHOLD_SIZE) { if (file == null) {
uploadSuccess = false
} else if (file.length() > CHUNK_UPLOAD_THRESHOLD_SIZE) {
Log.d(TAG, "starting chunked upload because size is " + file.length()) Log.d(TAG, "starting chunked upload because size is " + file.length())
initNotificationWithPercentage() initNotificationWithPercentage()

8
app/src/main/java/com/nextcloud/talk/utils/FileUtils.kt
View file

@ -112,9 +112,15 @@ object FileUtils {
} }
@Suppress("NestedBlockDepth") @Suppress("NestedBlockDepth")
fun copyFileToCache(context: Context, sourceFileUri: Uri, filename: String): File { fun copyFileToCache(context: Context, sourceFileUri: Uri, filename: String): File? {
val cachedFile = File(context.cacheDir, filename) val cachedFile = File(context.cacheDir, filename)
if (!cachedFile.canonicalPath.startsWith(context.cacheDir.canonicalPath, true)) {
Log.w(TAG, "cachedFile was not created in cacheDir. Aborting for security reasons.")
cachedFile.delete()
return null
}
if (cachedFile.exists()) { if (cachedFile.exists()) {
Log.d(TAG, "file is already in cache") Log.d(TAG, "file is already in cache")
} else { } else {