Fix for e2e

Signed-off-by: alperozturk <alper_ozturk@proton.me>
nextcloud · Apr 1, 2024 · 620d522 · 620d522
1 parent 1fca21c
commit 620d522
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/app/src/main/java/com/nextcloud/client/jobs/download/FileDownloadHelper.kt b/app/src/main/java/com/nextcloud/client/jobs/download/FileDownloadHelper.kt
@@ -63,12 +63,11 @@ class FileDownloadHelper {
  val fileStorageManager = FileDataStorageManager(user, MainApp.getAppContext().contentResolver)
  val topParentId = fileStorageManager.getTopParentId(file)
 
- return if (file.isFolder) {
-  backgroundJobManager.isStartFileDownloadJobScheduled(user, file.fileId) ||
-  backgroundJobManager.isStartFileDownloadJobScheduled(user, topParentId)
+ val isJobScheduled = backgroundJobManager.isStartFileDownloadJobScheduled(user, file.fileId)
+ return isJobScheduled || if (file.isFolder) {
+ backgroundJobManager.isStartFileDownloadJobScheduled(user, topParentId)
  } else {
- backgroundJobManager.isStartFileDownloadJobScheduled(user, file.fileId) ||
- FileDownloadWorker.isDownloading(user.accountName, file.fileId)
+ FileDownloadWorker.isDownloading(user.accountName, file.fileId)
  }
  }
 

diff --git a/app/src/main/java/com/owncloud/android/operations/DownloadFileOperation.java b/app/src/main/java/com/owncloud/android/operations/DownloadFileOperation.java
@@ -273,7 +273,7 @@ protected RemoteOperationResult run(OwnCloudClient client) {
  }
  }
 
- if (downloadType == DownloadType.DOWNLOAD) {
+ if (downloadType == DownloadType.DOWNLOAD && !file.isEncrypted()) {
  moved = tmpFile.renameTo(newFile);
  newFile.setLastModified(file.getModificationTimestamp());
  if (!moved) {