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 b849a1c..5314e63 100644 (file)
--- a/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
@@ -44,6 +44,7 @@ import android.net.Uri;
 import android.text.TextUtils;\r
 import android.util.Log;\r
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
 import android.text.TextUtils;\r
 import android.util.Log;\r
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r

+import eu.alefzero.owncloud.datamodel.DataStorageManager;\r

 import eu.alefzero.owncloud.datamodel.OCFile;\r
 import eu.alefzero.webdav.HttpPropFind;\r
 import eu.alefzero.webdav.TreeNode;\r
 import eu.alefzero.owncloud.datamodel.OCFile;\r
 import eu.alefzero.webdav.HttpPropFind;\r
 import eu.alefzero.webdav.TreeNode;\r


@@ -65,6 +66,7 @@ public abstract class AbstractOwnCloudSyncAdapter extends
        private Account account;\r
        private ContentProviderClient contentProvider;\r
        private Date lastUpdated;\r
        private Account account;\r
        private ContentProviderClient contentProvider;\r
        private Date lastUpdated;\r

+       private DataStorageManager mStoreManager;\r

 \r
        private HttpHost mHost;\r
        private WebdavClient mClient = null;\r
 \r
        private HttpHost mHost;\r
        private WebdavClient mClient = null;\r


@@ -107,6 +109,14 @@ public abstract class AbstractOwnCloudSyncAdapter extends
                this.lastUpdated = lastUpdated;\r
        }\r
 \r
                this.lastUpdated = lastUpdated;\r
        }\r
 \r

+       public void setStorageManager(DataStorageManager storage_manager) {\r
+         mStoreManager = storage_manager;\r
+       }\r
+       \r
+       public DataStorageManager getStorageManager() {\r
+         return mStoreManager;\r
+       }\r
+       \r

        protected ConnectionKeepAliveStrategy getKeepAliveStrategy() {\r
                return new ConnectionKeepAliveStrategy() {\r
                        public long getKeepAliveDuration(HttpResponse response,\r
        protected ConnectionKeepAliveStrategy getKeepAliveStrategy() {\r
                return new ConnectionKeepAliveStrategy() {\r
                        public long getKeepAliveDuration(HttpResponse response,\r


@@ -143,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


@@ -158,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


@@ -168,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


@@ -186,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


@@ -206,25 +216,29 @@ public abstract class AbstractOwnCloudSyncAdapter extends
                        long mod = n.getProperty(NodeProperty.LAST_MODIFIED_DATE) == null ? 0\r
                                        : Long.parseLong(n\r
                                                        .getProperty(NodeProperty.LAST_MODIFIED_DATE));\r
                        long mod = n.getProperty(NodeProperty.LAST_MODIFIED_DATE) == null ? 0\r
                                        : Long.parseLong(n\r
                                                        .getProperty(NodeProperty.LAST_MODIFIED_DATE));\r

-                       OCFile file = new OCFile(getContentProvider(), getAccount(),\r
-                                       n.getProperty(NodeProperty.PATH));\r
-                       if (file.fileExtist() && file.getModificationTimestamp() >= mod) {\r
+                       \r
+                       OCFile file = getStorageManager().getFileByPath(n.getProperty(NodeProperty.PATH));\r
+                       if (file != null && file.fileExists() && file.getModificationTimestamp() >= mod) {\r

                                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
                                Log.d(TAG, "File " + n.getProperty(NodeProperty.PATH)\r
                                                + " will be "\r

-                                               + (file.fileExtist() ? "updated" : "created"));\r
+                                               + (file.fileExists() ? "updated" : "created"));\r

                                long len = n.getProperty(NodeProperty.CONTENT_LENGTH) == null ? 0\r
                                                : Long.parseLong(n\r
                                                                .getProperty(NodeProperty.CONTENT_LENGTH));\r
                                long create = n.getProperty(NodeProperty.CREATE_DATE) == null ? 0\r
                                                : Long.parseLong(n\r
                                                                .getProperty(NodeProperty.CREATE_DATE));\r
                                long len = n.getProperty(NodeProperty.CONTENT_LENGTH) == null ? 0\r
                                                : Long.parseLong(n\r
                                                                .getProperty(NodeProperty.CONTENT_LENGTH));\r
                                long create = n.getProperty(NodeProperty.CREATE_DATE) == null ? 0\r
                                                : Long.parseLong(n\r
                                                                .getProperty(NodeProperty.CREATE_DATE));\r

-                               file = OCFile.createNewFile(getContentProvider(), getAccount(),\r
-                                               n.getProperty(NodeProperty.PATH), len, create, mod,\r
-                                               n.getProperty(NodeProperty.RESOURCE_TYPE), parent_id);\r
-                               file.save();\r
+\r
+                               file.setFileLength(len);\r
+                               file.setCreationTimestamp(create);\r
+                               file.setModificationTimestamp(mod);\r
+                               file.setMimetype(n.getProperty(NodeProperty.RESOURCE_TYPE));\r
+                               file.setParentId(parent_id);\r
+                               getStorageManager().saveFile(file);\r

                                if (override_parent) {\r
                                        parent_id = file.getFileId();\r
                                        override_parent = false;\r
                                if (override_parent) {\r
                                        parent_id = file.getFileId();\r
                                        override_parent = false;\r