Fix isDownloading for nested folders

Signed-off-by: alperozturk <[email protected]>
nextcloud · Jan 11, 2024 · a92e14a · a92e14a
1 parent c396d2a
commit a92e14a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/app/src/main/java/com/nextcloud/client/files/downloader/FileDownloadHelper.kt b/app/src/main/java/com/nextcloud/client/files/downloader/FileDownloadHelper.kt
@@ -60,8 +60,12 @@ class FileDownloadHelper {
             return false
         }
 
+        val fileStorageManager = FileDataStorageManager(user, MainApp.getAppContext().contentResolver)
+        val topParentId = fileStorageManager.getTopParentId(file)
+
         return if (file.isFolder) {
-            backgroundJobManager.isStartFileDownloadJobScheduled(user, file.fileId)
+            backgroundJobManager.isStartFileDownloadJobScheduled(user, file.fileId) ||
+                backgroundJobManager.isStartFileDownloadJobScheduled(user, topParentId)
         } else {
             FileDownloadWorker.isDownloading(user.accountName, file.fileId)
         }

diff --git a/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java b/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java
@@ -180,6 +180,27 @@ public boolean fileExists(String path) {
         return fileDao.getFileByEncryptedRemotePath(path, user.getAccountName()) != null;
     }
 
+    public long getTopParentId(OCFile file) {
+        if (file.getParentId() == 1) {
+            return file.getFileId();
+        }
+
+        return getTopParentIdRecursive(file);
+    }
+
+    private long getTopParentIdRecursive(OCFile file) {
+        if (file.getParentId() == 1) {
+            return file.getFileId();
+        }
+
+        OCFile parentFile = getFileById(file.getParentId());
+        if (parentFile != null) {
+            return getTopParentId(parentFile);
+        }
+
+        return file.getFileId();
+    }
+
     public List<OCFile> getAllFilesRecursivelyInsideFolder(OCFile file) {
         ArrayList<OCFile> result = new ArrayList<>();