diff --git a/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt b/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt index 47ab483578ce..afd42b72966c 100644 --- a/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt +++ b/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt @@ -268,7 +268,8 @@ class FileUploadWorker( } // Only notify if it is not same file on remote that causes conflict - if (uploadResult.code == ResultCode.SYNC_CONFLICT && FileUploadHelper().isSameFileOnRemote( + if (uploadResult.code == ResultCode.SYNC_CONFLICT && + FileUploadHelper().isSameFileOnRemote( uploadFileOperation.user, File(uploadFileOperation.storagePath), uploadFileOperation.remotePath, diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index a35801964ab0..617c9fda5446 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -16,6 +16,7 @@ + @@ -140,6 +141,7 @@ +