Skip to content

[stable-3.30] BugFix - Unnecessary Sync #13904

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tobiasKaminsky merged 1 commit into from
Oct 30, 2024
Merged

[stable-3.30] BugFix - Unnecessary Sync #13904

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions app/src/main/java/com/owncloud/android/operations/SynchronizeFolderOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -129,7 +130,6 @@ protected RemoteOperationResult run(OwnCloudClient client) {
if (result.isSuccess()) {
if (mRemoteFolderChanged) {
result = fetchAndSyncRemoteFolder(client);

} else {
prepareOpsFromLocalKnowledge();
}
Expand Down Expand Up @@ -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(
Expand All @@ -431,7 +430,6 @@ private void prepareOpsFromLocalKnowledge() throws OperationCancelledException {
getStorageManager()
);
mFilesToSyncContents.add(operation);

}
}
}
Expand All @@ -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));
}

/**
Expand Down