Fixed bad synchronization of files removed from another client; checked that conditio...

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / syncadapter / FileSyncAdapter.java

diff --git a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
index 61975dd..3397836 100644 (file)
--- a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
@@ -185,6 +185,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
                 }\r
                 if (getStorageManager().getFileByPath(file.getRemotePath()) != null)\r
                     file.setKeepInSync(getStorageManager().getFileByPath(file.getRemotePath()).keepInSync());\r
                 }\r
                 if (getStorageManager().getFileByPath(file.getRemotePath()) != null)\r
                     file.setKeepInSync(getStorageManager().getFileByPath(file.getRemotePath()).keepInSync());\r

+                \r

                 //getStorageManager().saveFile(file);\r
                 updatedFiles.add(file);\r
                 if (parentId == 0)\r
                 //getStorageManager().saveFile(file);\r
                 updatedFiles.add(file);\r
                 if (parentId == 0)\r


@@ -205,7 +206,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
             OCFile file;\r
             for (int i=0; i < files.size(); ) {\r
                 file = files.get(i);\r
             OCFile file;\r
             for (int i=0; i < files.size(); ) {\r
                 file = files.get(i);\r

-                if (file.getLastSyncDate() != mCurrentSyncTime && file.getLastSyncDate() != 0) {\r
+                if (file.getLastSyncDate() != mCurrentSyncTime) {\r

                     getStorageManager().removeFile(file);\r
                     files.remove(i);\r
                 } else {\r
                     getStorageManager().removeFile(file);\r
                     files.remove(i);\r
                 } else {\r


@@ -220,7 +221,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
             for (int i=0; i < files.size() && !mCancellation; i++) {\r
                 OCFile newFile = files.get(i);\r
                 if (newFile.getMimetype().equals("DIR")) {\r
             for (int i=0; i < files.size() && !mCancellation; i++) {\r
                 OCFile newFile = files.get(i);\r
                 if (newFile.getMimetype().equals("DIR")) {\r

-                    fetchData(getUri().toString() + WebdavUtils.encode(newFile.getRemotePath()), syncResult, newFile.getFileId());\r
+                    fetchData(getUri().toString() + WebdavUtils.encodePath(newFile.getRemotePath()), syncResult, newFile.getFileId());\r

                 }\r
             }\r
             if (mCancellation) Log.d(TAG, "Leaving " + uri + " because cancellation request");\r
                 }\r
             }\r
             if (mCancellation) Log.d(TAG, "Leaving " + uri + " because cancellation request");\r