fix setting fileid for existing file

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

diff --git a/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java b/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
index a3eead9..5314e63 100644 (file)
--- a/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
@@ -153,12 +153,12 @@ public abstract class AbstractOwnCloudSyncAdapter extends
        protected HttpResponse fireRawRequest(HttpRequest query)\r
                        throws ClientProtocolException, OperationCanceledException,\r
                        AuthenticatorException, IOException {\r
        protected HttpResponse fireRawRequest(HttpRequest query)\r
                        throws ClientProtocolException, OperationCanceledException,\r
                        AuthenticatorException, IOException {\r

-               BasicHttpContext httpContext = new BasicHttpContext();\r
+               /*BasicHttpContext httpContext = new BasicHttpContext();\r

                BasicScheme basicAuth = new BasicScheme();\r
                httpContext.setAttribute("preemptive-auth", basicAuth);\r
 \r
                BasicScheme basicAuth = new BasicScheme();\r
                httpContext.setAttribute("preemptive-auth", basicAuth);\r
 \r

-               HttpResponse response = getClient().execute(mHost, query, httpContext);\r
-               return response;\r
+               HttpResponse response = getClient().execute(mHost, query, httpContext);*/\r
+               return null;\r

        }\r
 \r
        protected TreeNode fireRequest(HttpRequest query)\r
        }\r
 \r
        protected TreeNode fireRequest(HttpRequest query)\r


@@ -168,8 +168,8 @@ public abstract class AbstractOwnCloudSyncAdapter extends
 \r
                TreeNode root = new TreeNode();\r
                root.setProperty(TreeNode.NodeProperty.NAME, "");\r
 \r
                TreeNode root = new TreeNode();\r
                root.setProperty(TreeNode.NodeProperty.NAME, "");\r

-               this.parseResponse(response, getUri(), getClient(), mHost,\r
-                               root.getChildList(), false, 0);\r
+               //this.parseResponse(response, getUri(), getClient(), mHost,\r
+               //              root.getChildList(), false, 0);\r

                return root;\r
        }\r
 \r
                return root;\r
        }\r
 \r


@@ -178,7 +178,7 @@ public abstract class AbstractOwnCloudSyncAdapter extends
                                AccountAuthenticator.KEY_OC_URL));\r
        }\r
 \r
                                AccountAuthenticator.KEY_OC_URL));\r
        }\r
 \r

-       private DefaultHttpClient getClient() throws OperationCanceledException,\r
+       protected WebdavClient getClient() throws OperationCanceledException,\r

                        AuthenticatorException, IOException {\r
                if (mClient == null) {\r
                        String username = getAccount().name.split("@")[0];\r
                        AuthenticatorException, IOException {\r
                if (mClient == null) {\r
                        String username = getAccount().name.split("@")[0];\r


@@ -196,7 +196,7 @@ public abstract class AbstractOwnCloudSyncAdapter extends
                        mHost = mClient.getTargetHost();\r
                }\r
 \r
                        mHost = mClient.getTargetHost();\r
                }\r
 \r

-               return mClient.getHttpClient();\r
+               return mClient;\r

        }\r
 \r
        private void parseResponse(HttpResponse resp, Uri uri,\r
        }\r
 \r
        private void parseResponse(HttpResponse resp, Uri uri,\r


@@ -222,6 +222,7 @@ public abstract class AbstractOwnCloudSyncAdapter extends
                                Log.d(TAG, "No update for file/dir " + file.getFileName()\r
                                                + " is needed");\r
                        } else {\r
                                Log.d(TAG, "No update for file/dir " + file.getFileName()\r
                                                + " is needed");\r
                        } else {\r

+                         file = new OCFile(n.getProperty(NodeProperty.PATH));\r

                                Log.d(TAG, "File " + n.getProperty(NodeProperty.PATH)\r
                                                + " will be "\r
                                                + (file.fileExists() ? "updated" : "created"));\r
                                Log.d(TAG, "File " + n.getProperty(NodeProperty.PATH)\r
                                                + " will be "\r
                                                + (file.fileExists() ? "updated" : "created"));\r


@@ -231,7 +232,7 @@ public abstract class AbstractOwnCloudSyncAdapter extends
                                long create = n.getProperty(NodeProperty.CREATE_DATE) == null ? 0\r
                                                : Long.parseLong(n\r
                                                                .getProperty(NodeProperty.CREATE_DATE));\r
                                long create = n.getProperty(NodeProperty.CREATE_DATE) == null ? 0\r
                                                : Long.parseLong(n\r
                                                                .getProperty(NodeProperty.CREATE_DATE));\r

-                               file = new OCFile(n.getProperty(NodeProperty.PATH));\r
+\r

                                file.setFileLength(len);\r
                                file.setCreationTimestamp(create);\r
                                file.setModificationTimestamp(mod);\r
                                file.setFileLength(len);\r
                                file.setCreationTimestamp(create);\r
                                file.setModificationTimestamp(mod);\r