X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/400a17d3e32952fbec63902084ff1d32ee346f4c..a032bdeebc51a6e81d1bd5c558944f96fc55eacb:/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 9f0c0dc5..42d3e36a 100644
--- 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;
 import eu.alefzero.owncloud.files.services.FileDownloader;
 import eu.alefzero.webdav.WebdavEntry;
+import eu.alefzero.webdav.WebdavUtils;
 
 /**
  * SyncAdapter implementation for syncing sample SyncAdapter contacts to the
@@ -149,7 +150,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
 
     private void fetchData(String uri, SyncResult syncResult, long parentId) {
         try {
-            //Log.v(TAG, "syncing: fetching " + uri);
+            Log.d(TAG, "fetching " + uri);
             
             // remote request 
             PropFindMethod query = new PropFindMethod(uri);
@@ -176,7 +177,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
                                                                          .getModificationTimestamp()) {
                     Intent intent = new Intent(this.getContext(), FileDownloader.class);
                     intent.putExtra(FileDownloader.EXTRA_ACCOUNT, getAccount());
-                    intent.putExtra(FileDownloader.EXTRA_FILE_PATH, file.getURLDecodedRemotePath());
+                    intent.putExtra(FileDownloader.EXTRA_FILE_PATH, file.getRemotePath());
                     intent.putExtra(FileDownloader.EXTRA_REMOTE_PATH, file.getRemotePath());
                     intent.putExtra(FileDownloader.EXTRA_FILE_SIZE, file.getFileLength());
                     file.setKeepInSync(true);
@@ -184,7 +185,9 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
                 }
                 if (getStorageManager().getFileByPath(file.getRemotePath()) != null)
                     file.setKeepInSync(getStorageManager().getFileByPath(file.getRemotePath()).keepInSync());
+                
                 //getStorageManager().saveFile(file);
+                Log.v(TAG, "adding file: " + file);
                 updatedFiles.add(file);
                 if (parentId == 0)
                     parentId = file.getFileId();
@@ -204,7 +207,8 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
             OCFile file;
             for (int i=0; i < files.size(); ) {
                 file = files.get(i);
-                if (file.getLastSyncDate() != mCurrentSyncTime && file.getLastSyncDate() != 0) {
+                if (file.getLastSyncDate() != mCurrentSyncTime) {
+                    Log.v(TAG, "removing file: " + file);
                     getStorageManager().removeFile(file);
                     files.remove(i);
                 } else {
@@ -219,10 +223,10 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
             for (int i=0; i < files.size() && !mCancellation; i++) {
                 OCFile newFile = files.get(i);
                 if (newFile.getMimetype().equals("DIR")) {
-                    fetchData(getUri().toString() + newFile.getRemotePath(), syncResult, newFile.getFileId());
+                    fetchData(getUri().toString() + WebdavUtils.encodePath(newFile.getRemotePath()), syncResult, newFile.getFileId());
                 }
             }
-            if (mCancellation) Log.d(TAG, "Leaving " + uri + " because cancellation request");
+            if (mCancellation) Log.d(TAG, "Leaving " + uri + " because cancelation request");
                 
             /*  Commented code for ugly performance tests
             mResponseDelays[mDelaysIndex] = responseDelay;
@@ -254,7 +258,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
     }
 
     private OCFile fillOCFile(WebdavEntry we) {
-        OCFile file = new OCFile(we.path());
+        OCFile file = new OCFile(we.decodedPath());
         file.setCreationTimestamp(we.createTimestamp());
         file.setFileLength(we.contentLength());
         file.setMimetype(we.contentType());