Use same worker for file download

Signed-off-by: alperozturk <alper_ozturk@proton.me>

app/src/main/java/com/nextcloud/client/files/downloader/FileDownloadHelper.kt

@@ -60,10 +60,8 @@ class FileDownloadHelper {
             return false
         }
 
-        return backgroundJobManager.isStartFileDownloadJobScheduled(
-            user,
-            file
-        ) || FileDownloadWorker.isDownloading(user, file)
+        return FileDownloadWorker.isDownloading(user, file) ||
+            (file.isFolder && backgroundJobManager.isStartFileDownloadJobScheduled(user, file))
     }
 
     fun cancelPendingOrCurrentDownloads(user: User?, file: OCFile?) {

app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManagerImpl.kt

@@ -86,6 +86,7 @@ internal class BackgroundJobManagerImpl(
         const val JOB_NOTIFICATION = "notification"
         const val JOB_ACCOUNT_REMOVAL = "account_removal"
         const val JOB_FILES_UPLOAD = "files_upload"
+        const val JOB_FOLDER_DOWNLOAD = "folder_download"
         const val JOB_FILES_DOWNLOAD = "files_download"
         const val JOB_PDF_GENERATION = "pdf_generation"
         const val JOB_IMMEDIATE_CALENDAR_BACKUP = "immediate_calendar_backup"
@@ -509,7 +510,11 @@ internal class BackgroundJobManagerImpl(
     }
 
     private fun startFileDownloadJobTag(user: User, ocFile: OCFile): String {
-        return JOB_FILES_DOWNLOAD + user.accountName + ocFile.fileId
+        return if (ocFile.isFolder) {
+            JOB_FOLDER_DOWNLOAD + user.accountName + ocFile.fileId
+        } else {
+            JOB_FILES_DOWNLOAD + user.accountName
+        }
     }
 
     override fun isStartFileDownloadJobScheduled(user: User, ocFile: OCFile): Boolean {
@@ -561,7 +566,7 @@ internal class BackgroundJobManagerImpl(
             .setInputData(data)
             .build()
 
-        workManager.enqueueUniqueWork(tag, ExistingWorkPolicy.REPLACE, request)
+        workManager.enqueueUniqueWork(tag, ExistingWorkPolicy.KEEP, request)
     }
 
     override fun getFileUploads(user: User): LiveData<List<JobInfo>> {