complete two way synchronization

[pub/Android/ownCloud.git] / src / com / owncloud / android / syncadapter / FileSyncAdapter.java

diff --git a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
index 1a3afe6..7b803fc 100644 (file)
--- a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
@@ -210,11 +210,12 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
             Vector<OCFile> files = getStorageManager().getDirectoryContent(\r
                     getStorageManager().getFileById(parentId));\r
             OCFile file;\r
             Vector<OCFile> files = getStorageManager().getDirectoryContent(\r
                     getStorageManager().getFileById(parentId));\r
             OCFile file;\r

+            String currentSavePath = FileDownloader.getSavePath(mAccount.name);\r

             for (int i=0; i < files.size(); ) {\r
                 file = files.get(i);\r
                 if (file.getLastSyncDate() != mCurrentSyncTime) {\r
                     Log.v(TAG, "removing file: " + file);\r
             for (int i=0; i < files.size(); ) {\r
                 file = files.get(i);\r
                 if (file.getLastSyncDate() != mCurrentSyncTime) {\r
                     Log.v(TAG, "removing file: " + file);\r

-                    getStorageManager().removeFile(file);\r
+                    getStorageManager().removeFile(file, (file.isDown() && file.getStoragePath().startsWith(currentSavePath)));\r

                     files.remove(i);\r
                 } else {\r
                     i++;\r
                     files.remove(i);\r
                 } else {\r
                     i++;\r