Merge pull request nextcloud#13897 from nextcloud/bugfix/unnecessary-…

…sync BugFix - Unnecessary Sync
tobiasKaminsky · Oct 30, 2024 · 2e03e22 · 2e03e22
2 parents 1fa3f72 + 6a8ca4d
commit 2e03e22
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/app/src/main/java/com/owncloud/android/operations/SynchronizeFolderOperation.java b/app/src/main/java/com/owncloud/android/operations/SynchronizeFolderOperation.java
@@ -40,6 +40,7 @@
 import java.util.Map;
 import java.util.Vector;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Consumer;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
@@ -129,7 +130,6 @@ protected RemoteOperationResult run(OwnCloudClient client) {
             if (result.isSuccess()) {
                 if (mRemoteFolderChanged) {
                     result = fetchAndSyncRemoteFolder(client);
-
                 } else {
                     prepareOpsFromLocalKnowledge();
                 }
@@ -419,7 +419,6 @@ private void prepareOpsFromLocalKnowledge() throws OperationCancelledException {
             if (!child.isFolder()) {
                 if (!child.isDown()) {
                     mFilesForDirectDownload.add(child);
-
                 } else {
                     /// this should result in direct upload of files that were locally modified
                     SynchronizeFileOperation operation = new SynchronizeFileOperation(
@@ -431,7 +430,6 @@ private void prepareOpsFromLocalKnowledge() throws OperationCancelledException {
                         getStorageManager()
                     );
                     mFilesToSyncContents.add(operation);
-
                 }
             }
         }
@@ -442,9 +440,8 @@ private void syncContents() throws OperationCancelledException {
         startContentSynchronizations(mFilesToSyncContents);
     }
 
-
     private void startDirectDownloads() {
-        FileDownloadHelper.Companion.instance().downloadFile(user, mLocalFolder);
+        mFilesForDirectDownload.forEach(file -> FileDownloadHelper.Companion.instance().downloadFile(user, file));
     }
 
     /**