From 47d115d75a0039b528340b77e4473400f92faa08 Mon Sep 17 00:00:00 2001 From: masensio Date: Mon, 30 Sep 2013 10:28:03 +0200 Subject: [PATCH 1/1] Change the loop mChildren update to the previous version --- .../android/operations/SynchronizeFolderOperation.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java index fba1d886..3721258a 100644 --- a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java +++ b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java @@ -258,15 +258,18 @@ public class SynchronizeFolderOperation extends RemoteOperation { } // won't let these fails break the synchronization process } - // removal of obsolete files mChildren = mStorageManager.getDirectoryContent(mStorageManager.getFileById(mParentId)); + OCFile file; String currentSavePath = FileStorageUtils.getSavePath(mAccount.name); - for (OCFile fileChild: mChildren) { - if (!filesOnServer.contains(fileChild.getRemotePath())) { - Log_OC.d(TAG, "removing file: " + fileChild.getFileName()); - mStorageManager.removeFile(fileChild, (fileChild.isDown() && fileChild.getStoragePath().startsWith(currentSavePath))); - // mChildren.remove(fileChild); //.remove(i); + for (int i=0; i < mChildren.size(); ) { + file = mChildren.get(i); + if (file.getLastSyncDateForProperties() != mCurrentSyncTime) { + Log_OC.d(TAG, "removing file: " + file); + mStorageManager.removeFile(file, (file.isDown() && file.getStoragePath().startsWith(currentSavePath))); + mChildren.remove(i); + } else { + i++; } } -- 2.11.0