Granted that accounts different only in port number won't mix their files in the...

[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 9f0c0dc..8be8dff 100644 (file)
--- a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
@@ -39,6 +39,7 @@ import eu.alefzero.owncloud.datamodel.FileDataStorageManager;
 import eu.alefzero.owncloud.datamodel.OCFile;\r
 import eu.alefzero.owncloud.files.services.FileDownloader;\r
 import eu.alefzero.webdav.WebdavEntry;\r
+import eu.alefzero.webdav.WebdavUtils;\r
 \r
 /**\r
  * SyncAdapter implementation for syncing sample SyncAdapter contacts to the\r
@@ -149,7 +150,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
 \r
     private void fetchData(String uri, SyncResult syncResult, long parentId) {\r
         try {\r
-            //Log.v(TAG, "syncing: fetching " + uri);\r
+            Log.d(TAG, "fetching " + uri);\r
             \r
             // remote request \r
             PropFindMethod query = new PropFindMethod(uri);\r
@@ -176,7 +177,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
                                                                          .getModificationTimestamp()) {\r
                     Intent intent = new Intent(this.getContext(), FileDownloader.class);\r
                     intent.putExtra(FileDownloader.EXTRA_ACCOUNT, getAccount());\r
-                    intent.putExtra(FileDownloader.EXTRA_FILE_PATH, file.getURLDecodedRemotePath());\r
+                    intent.putExtra(FileDownloader.EXTRA_FILE_PATH, file.getRemotePath());\r
                     intent.putExtra(FileDownloader.EXTRA_REMOTE_PATH, file.getRemotePath());\r
                     intent.putExtra(FileDownloader.EXTRA_FILE_SIZE, file.getFileLength());\r
                     file.setKeepInSync(true);\r
@@ -184,7 +185,8 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
                 }\r
                 if (getStorageManager().getFileByPath(file.getRemotePath()) != null)\r
                     file.setKeepInSync(getStorageManager().getFileByPath(file.getRemotePath()).keepInSync());\r
-                //getStorageManager().saveFile(file);\r
+                \r
+                //Log.v(TAG, "adding file: " + file);\r
                 updatedFiles.add(file);\r
                 if (parentId == 0)\r
                     parentId = file.getFileId();\r
@@ -204,7 +206,8 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
             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
+                    Log.v(TAG, "removing file: " + file);\r
                     getStorageManager().removeFile(file);\r
                     files.remove(i);\r
                 } else {\r
@@ -219,10 +222,10 @@ 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
-                    fetchData(getUri().toString() + 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
+            if (mCancellation) Log.d(TAG, "Leaving " + uri + " because cancelation request");\r
                 \r
             /*  Commented code for ugly performance tests\r
             mResponseDelays[mDelaysIndex] = responseDelay;\r
@@ -254,7 +257,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
     }\r
 \r
     private OCFile fillOCFile(WebdavEntry we) {\r
-        OCFile file = new OCFile(we.path());\r
+        OCFile file = new OCFile(we.decodedPath());\r
         file.setCreationTimestamp(we.createTimestamp());\r
         file.setFileLength(we.contentLength());\r
         file.setMimetype(we.contentType());\r