Quick patch to fix operations not ready for HTTPS

[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 9dfa8f6..42d3e36 100644 (file)
--- a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
@@ -150,7 +150,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
 \r
     private void fetchData(String uri, SyncResult syncResult, long parentId) {\r
         try {\r
 \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
             \r
             // remote request \r
             PropFindMethod query = new PropFindMethod(uri);\r


@@ -185,7 +185,9 @@ 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
                 //getStorageManager().saveFile(file);\r

+                Log.v(TAG, "adding file: " + file);\r

                 updatedFiles.add(file);\r
                 if (parentId == 0)\r
                     parentId = file.getFileId();\r
                 updatedFiles.add(file);\r
                 if (parentId == 0)\r
                     parentId = file.getFileId();\r


@@ -205,7 +207,8 @@ 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
+                    Log.v(TAG, "removing file: " + file);\r

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


@@ -223,7 +226,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
                     fetchData(getUri().toString() + WebdavUtils.encodePath(newFile.getRemotePath()), syncResult, newFile.getFileId());\r
                 }\r
             }\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
                 \r
             /*  Commented code for ugly performance tests\r
             mResponseDelays[mDelaysIndex] = responseDelay;\r