fix white text on configuration screen

[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 41a0503..1d23ec8 100644 (file)
--- a/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
@@ -21,16 +21,12 @@ package eu.alefzero.owncloud.syncadapter;
 import java.io.IOException;\r
 import java.net.UnknownHostException;\r
 import java.util.Date;\r
 import java.io.IOException;\r
 import java.net.UnknownHostException;\r
 import java.util.Date;\r

-import java.util.LinkedList;\r

 \r
 import org.apache.http.HttpHost;\r
 import org.apache.http.HttpRequest;\r
 import org.apache.http.HttpResponse;\r
 import org.apache.http.client.ClientProtocolException;\r
 import org.apache.http.conn.ConnectionKeepAliveStrategy;\r
 \r
 import org.apache.http.HttpHost;\r
 import org.apache.http.HttpRequest;\r
 import org.apache.http.HttpResponse;\r
 import org.apache.http.client.ClientProtocolException;\r
 import org.apache.http.conn.ConnectionKeepAliveStrategy;\r

-import org.apache.http.impl.auth.BasicScheme;\r
-import org.apache.http.impl.client.DefaultHttpClient;\r
-import org.apache.http.protocol.BasicHttpContext;\r

 import org.apache.http.protocol.HttpContext;\r
 \r
 import android.accounts.Account;\r
 import org.apache.http.protocol.HttpContext;\r
 \r
 import android.accounts.Account;\r


@@ -41,15 +37,10 @@ import android.content.AbstractThreadedSyncAdapter;
 import android.content.ContentProviderClient;\r
 import android.content.Context;\r
 import android.net.Uri;\r
 import android.content.ContentProviderClient;\r
 import android.content.Context;\r
 import android.net.Uri;\r

-import android.text.TextUtils;\r
-import android.util.Log;\r

 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r

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

 import eu.alefzero.webdav.HttpPropFind;\r
 import eu.alefzero.webdav.HttpPropFind;\r

-import eu.alefzero.webdav.TreeNode;\r
-import eu.alefzero.webdav.TreeNode.NodeProperty;\r

 import eu.alefzero.webdav.WebdavClient;\r
 import eu.alefzero.webdav.WebdavClient;\r

-import eu.alefzero.webdav.WebdavUtils;\r

 \r
 /**\r
  * Base SyncAdapter for OwnCloud Designed to be subclassed for the concrete\r
 \r
 /**\r
  * Base SyncAdapter for OwnCloud Designed to be subclassed for the concrete\r


@@ -65,6 +56,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 +99,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,24 +143,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
-       }\r
-\r
-       protected TreeNode fireRequest(HttpRequest query)\r
-                       throws ClientProtocolException, OperationCanceledException,\r
-                       AuthenticatorException, IOException {\r
-               HttpResponse response = fireRawRequest(query);\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
-               return root;\r
+               HttpResponse response = getClient().execute(mHost, query, httpContext);*/\r
+               return null;\r

        }\r
 \r
        protected Uri getUri() {\r
        }\r
 \r
        protected Uri getUri() {\r


@@ -168,7 +156,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,61 +174,6 @@ public abstract class AbstractOwnCloudSyncAdapter extends
                        mHost = mClient.getTargetHost();\r
                }\r
 \r
                        mHost = mClient.getTargetHost();\r
                }\r
 \r

-               return mClient.getHttpClient();\r
-       }\r
-\r
-       private void parseResponse(HttpResponse resp, Uri uri,\r
-                       DefaultHttpClient client, HttpHost targetHost,\r
-                       LinkedList<TreeNode> insertList, boolean sf, long parent_id)\r
-                       throws IOException, OperationCanceledException,\r
-                       AuthenticatorException {\r
-               boolean skipFirst = sf, override_parent = !sf;\r
-               for (TreeNode n : WebdavUtils.parseResponseToNodes(resp.getEntity()\r
-                               .getContent())) {\r
-                       if (skipFirst) {\r
-                               skipFirst = false;\r
-                               continue;\r
-                       }\r
-                       String path = n.stripPathFromFilename(uri.getPath());\r
-\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.fileExists() && file.getModificationTimestamp() >= mod) {\r
-                               Log.d(TAG, "No update for file/dir " + file.getFileName()\r
-                                               + " is needed");\r
-                       } else {\r
-                               Log.d(TAG, "File " + n.getProperty(NodeProperty.PATH)\r
-                                               + " will be "\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
-                               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
-                               if (override_parent) {\r
-                                       parent_id = file.getFileId();\r
-                                       override_parent = false;\r
-                               }\r
-                       }\r
-\r
-                       if (!TextUtils.isEmpty(n.getProperty(NodeProperty.NAME))\r
-                                       && n.getProperty(NodeProperty.RESOURCE_TYPE).equals("DIR")) {\r
-\r
-                               HttpPropFind method = new HttpPropFind(uri.getPath() + path\r
-                                               + n.getProperty(NodeProperty.NAME).replace(" ", "%20")\r
-                                               + "/");\r
-                               HttpResponse response = fireRawRequest(method);\r
-                               parseResponse(response, uri, client, targetHost,\r
-                                               n.getChildList(), true, file.getFileId());\r
-                       }\r
-               }\r
+               return mClient;\r

        }\r
 }
\ No newline at end of file
        }\r
 }
\ No newline at end of file