Browse Source

Fix isDownloading Folder

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk 1 năm trước cách đây
mục cha
commit
de8e5045bf

+ 4 - 8
app/src/main/java/com/nextcloud/client/files/downloader/FileDownloadHelper.kt

@@ -60,14 +60,10 @@ class FileDownloadHelper {
             return false
         }
 
-        return if (file.isFolder) {
-            FileDownloadWorker.isFolderDownloading(file)
-        } else {
-            backgroundJobManager.isStartFileDownloadJobScheduled(
-                user,
-                file
-            )
-        }
+        return backgroundJobManager.isStartFileDownloadJobScheduled(
+            user,
+            file
+        )
     }
 
     fun cancelPendingOrCurrentDownloads(user: User?, file: OCFile?) {

+ 0 - 20
app/src/main/java/com/nextcloud/client/files/downloader/FileDownloadWorker.kt

@@ -68,8 +68,6 @@ class FileDownloadWorker(
     companion object {
         private val TAG = FileDownloadWorker::class.java.simpleName
 
-        private var folderDownloadStatusPair = HashMap<Long, Boolean>()
-
         const val FOLDER_ID = "FOLDER_ID"
         const val USER_NAME = "USER"
         const val FILE = "FILE"
@@ -86,14 +84,6 @@ class FileDownloadWorker(
         const val EXTRA_LINKED_TO_PATH = "LINKED_TO"
         const val ACCOUNT_NAME = "ACCOUNT_NAME"
 
-        fun isFolderDownloading(folder: OCFile): Boolean {
-            for ((id, status) in folderDownloadStatusPair) {
-                return id == folder.fileId && status
-            }
-
-            return false
-        }
-
         fun getDownloadAddedMessage(): String {
             return FileDownloadWorker::class.java.name + "DOWNLOAD_ADDED"
         }
@@ -236,20 +226,10 @@ class FileDownloadWorker(
     }
 
     private fun setWorkerState(user: User?, file: DownloadFileOperation?) {
-        val folderId = inputData.keyValueMap[FOLDER_ID] as Long?
-        folderId?.let {
-            folderDownloadStatusPair[folderId] = true
-        }
-
         WorkerStateLiveData.instance().setWorkState(WorkerState.Download(user, file))
     }
 
     private fun setIdleWorkerState() {
-        val folderId = inputData.keyValueMap[FOLDER_ID] as Long?
-        folderId?.let {
-            folderDownloadStatusPair.remove(folderId)
-        }
-
         WorkerStateLiveData.instance().setWorkState(WorkerState.Idle)
     }