mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 05:35:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix potential race condition

Browse source 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
This commit is contained in:
alperozturk 2024-01-05 15:35:49 +01:00 committed by Alper Öztürk
parent e366499718
commit 2664349c16
2 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/com/nextcloud/client/files/downloader/FileDownloadWorker.kt
View file

@ -66,6 +66,7 @@ class FileDownloadWorker(
private val TAG = FileDownloadWorker::class.java.simpleName
private var currentDownload: DownloadFileOperation? = null
private val lock = Any()
const val FILES_SEPARATOR = ","
const val FOLDER_REMOTE_PATH = "FOLDER_REMOTE_PATH"
@ -84,12 +85,16 @@ class FileDownloadWorker(
const val EXTRA_ACCOUNT_NAME = "EXTRA_ACCOUNT_NAME"
fun isDownloading(user: User, file: OCFile): Boolean {
return currentDownload?.isActive(user, file) ?: false
synchronized(lock) {
return currentDownload?.isActive(user, file) ?: false
}
}
fun cancelCurrentDownload(user: User, file: OCFile) {
if (currentDownload?.isActive(user, file) == true) {
currentDownload?.cancel()
synchronized(lock) {
if (currentDownload?.isActive(user, file) == true) {
currentDownload?.cancel()
}
}
}

18
app/src/main/java/com/owncloud/android/operations/DownloadFileOperation.java
View file

@ -170,6 +170,11 @@ public class DownloadFileOperation extends RemoteOperation {
}
}
Context operationContext = context.get();
if (operationContext == null) {
return new RemoteOperationResult(RemoteOperationResult.ResultCode.UNKNOWN_ERROR);
}
RemoteOperationResult result;
File newFile = null;
boolean moved;
@ -190,6 +195,8 @@ public class DownloadFileOperation extends RemoteOperation {
result = downloadOperation.execute(client);
if (result.isSuccess()) {
modificationTimestamp = downloadOperation.getModificationTimestamp();
etag = downloadOperation.getEtag();
@ -204,13 +211,13 @@ public class DownloadFileOperation extends RemoteOperation {
// decrypt file
if (file.isEncrypted()) {
FileDataStorageManager fileDataStorageManager = new FileDataStorageManager(user, context.get().getContentResolver());
FileDataStorageManager fileDataStorageManager = new FileDataStorageManager(user, operationContext.getContentResolver());
OCFile parent = fileDataStorageManager.getFileByPath(file.getParentRemotePath());
OCFile parent = fileDataStorageManager.getFileByEncryptedRemotePath(file.getParentRemotePath());
DecryptedFolderMetadata metadata = EncryptionUtils.downloadFolderMetadata(parent,
client,
context.get(),
operationContext,
user);
if (metadata == null) {
@ -228,7 +235,7 @@ public class DownloadFileOperation extends RemoteOperation {
key,
iv,
authenticationTag,
new ArbitraryDataProviderImpl(context.get()),
new ArbitraryDataProviderImpl(operationContext),
user);
try (FileOutputStream fileOutputStream = new FileOutputStream(tmpFile)) {
@ -248,7 +255,7 @@ public class DownloadFileOperation extends RemoteOperation {
} else if (downloadType == DownloadType.EXPORT) {
new FileExportUtils().exportFile(file.getFileName(),
file.getMimeType(),
context.get().getContentResolver(),
operationContext.getContentResolver(),
null,
tmpFile);
if (!tmpFile.delete()) {
@ -256,6 +263,7 @@ public class DownloadFileOperation extends RemoteOperation {
}
}
}
Log_OC.i(TAG, "Download of " + file.getRemotePath() + " to " + getSavePath() + ": " +
result.getLogMessage());