Skip to content

Avoid concurrent folder sync to avoid duplicates in filelist #17911

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

Closed
daniele-verducci wants to merge 1 commit into from
+17 −5
Closed

Avoid concurrent folder sync to avoid duplicates in filelist #17911

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
22 changes: 17 additions & 5 deletions app/src/main/java/com/owncloud/android/operations/RefreshFolderOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
import java.util.List;
import java.util.Map;
import java.util.Vector;
import java.util.concurrent.ConcurrentHashMap;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
Expand All @@ -73,6 +74,8 @@ public class RefreshFolderOperation extends RemoteOperation {

private static final String TAG = RefreshFolderOperation.class.getSimpleName();

private static final Map<String, Object> FOLDER_LOCKS = new ConcurrentHashMap<>();

public static final String EVENT_SINGLE_FOLDER_CONTENTS_SYNCED =
RefreshFolderOperation.class.getName() + ".EVENT_SINGLE_FOLDER_CONTENTS_SYNCED";
public static final String EVENT_SINGLE_FOLDER_SHARES_SYNCED =
Expand Down Expand Up @@ -260,15 +263,24 @@ public List<OCFile> getChildren() {
*/
@Override
protected RemoteOperationResult run(OwnCloudClient client) {
RemoteOperationResult result;
mFailsInKeptInSyncFound = 0;
mConflictsFound = 0;
mForgottenLocalFiles.clear();

if (mLocalFolder == null) {
Log_OC.e(TAG, "Local folder is null, cannot run refresh folder operation");
return new RemoteOperationResult<>(ResultCode.FILE_NOT_FOUND);
}
// filelist doesn't have a constraint on the file, so duplicates are possible if two folder sync are launched
// at the same time (may happen on app start, as startMetadataSyncForRoot is called by onCreate and
// syncAndUpdateFolder is called by onResume at short distance)
final String lockKey = user.getAccountName() + mLocalFolder.getRemotePath();
synchronized (FOLDER_LOCKS.computeIfAbsent(lockKey, key -> new Object())) {
return runLocked(client);
}
}

private RemoteOperationResult runLocked(OwnCloudClient client) {
RemoteOperationResult result;
mFailsInKeptInSyncFound = 0;
mConflictsFound = 0;
mForgottenLocalFiles.clear();

// Account metadata is refreshed after the folder listing so that it never delays the file list. It is not
// needed to render the folder, and blocking on it adds several sequential requests before the first PROPFIND.
Expand Down
Loading