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 3c1caf9..1d23ec8 100644 (file)
--- a/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
@@ -15,23 +15,18 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
  *\r
  */\r
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
  *\r
  */\r

+\r

 package eu.alefzero.owncloud.syncadapter;\r
 \r
 import java.io.IOException;\r
 import java.net.UnknownHostException;\r
 import java.util.Date;\r
 package eu.alefzero.owncloud.syncadapter;\r
 \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
 \r
 import org.apache.http.HttpHost;\r
 import org.apache.http.HttpRequest;\r
 import org.apache.http.HttpResponse;\r

-import org.apache.http.auth.AuthScope;\r
-import org.apache.http.auth.UsernamePasswordCredentials;\r

 import org.apache.http.client.ClientProtocolException;\r
 import org.apache.http.conn.ConnectionKeepAliveStrategy;\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


@@ -42,29 +37,30 @@ 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 eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\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.WebdavUtils;\r
+import eu.alefzero.webdav.WebdavClient;\r

 \r
 /**\r
 \r
 /**\r

- * Base SyncAdapter for OwnCloud\r
- * Designed to be subclassed for the concreete SyncAdapter, like ConcatsSync, CalendarSync, FileSync etc..\r
+ * Base SyncAdapter for OwnCloud Designed to be subclassed for the concrete\r
+ * SyncAdapter, like ConcatsSync, CalendarSync, FileSync etc..\r

  * \r
  * @author sassman\r
  * \r
  * @author sassman\r

- *\r
+ * \r

  */\r
  */\r

-public abstract class AbstractOwnCloudSyncAdapter extends AbstractThreadedSyncAdapter {\r
+public abstract class AbstractOwnCloudSyncAdapter extends\r
+               AbstractThreadedSyncAdapter {\r

 \r
        private AccountManager accountManager;\r
        private Account account;\r
        private ContentProviderClient contentProvider;\r
        private Date lastUpdated;\r
 \r
        private AccountManager accountManager;\r
        private Account account;\r
        private ContentProviderClient contentProvider;\r
        private Date lastUpdated;\r

-       \r
-       private DefaultHttpClient client = null;\r
-       private HttpHost host;\r
+       private DataStorageManager mStoreManager;\r
+\r
+       private HttpHost mHost;\r
+       private WebdavClient mClient = null;\r
+       private static String TAG = "AbstractOwnCloudSyncAdapter";\r

 \r
        public AbstractOwnCloudSyncAdapter(Context context, boolean autoInitialize) {\r
                super(context, autoInitialize);\r
 \r
        public AbstractOwnCloudSyncAdapter(Context context, boolean autoInitialize) {\r
                super(context, autoInitialize);\r


@@ -102,87 +98,82 @@ public abstract class AbstractOwnCloudSyncAdapter extends AbstractThreadedSyncAd
        public void setLastUpdated(Date lastUpdated) {\r
                this.lastUpdated = lastUpdated;\r
        }\r
        public void setLastUpdated(Date lastUpdated) {\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
        \r
        protected ConnectionKeepAliveStrategy getKeepAliveStrategy() {\r
                return new ConnectionKeepAliveStrategy() {\r

-                       public long getKeepAliveDuration(HttpResponse response, HttpContext context) {\r
-                               // TODO: change keep alive straategy basing on response: ie forbidden/not found/etc\r
+                       public long getKeepAliveDuration(HttpResponse response,\r
+                                       HttpContext context) {\r
+                               // Change keep alive straategy basing on response: ie\r
+                               // forbidden/not found/etc\r

                                // should have keep alive 0\r
                                // default return: 5s\r
                                // should have keep alive 0\r
                                // default return: 5s\r

+                               int statusCode = response.getStatusLine().getStatusCode();\r
+\r
+                               // HTTP 400, 500 Errors as well as HTTP 118 - Connection timed\r
+                               // out\r
+                               if ((statusCode >= 400 && statusCode <= 418)\r
+                                               || (statusCode >= 421 && statusCode <= 426)\r
+                                               || (statusCode >= 500 && statusCode <= 510)\r
+                                               || statusCode == 118) {\r
+                                       return 0;\r
+                               }\r
+\r

                                return 5 * 1000;\r
                        }\r
                };\r
        }\r
                                return 5 * 1000;\r
                        }\r
                };\r
        }\r

-       \r
-       protected HttpPropFind getPropFindQuery() throws OperationCanceledException, AuthenticatorException, IOException {\r
+\r
+       protected HttpPropFind getPropFindQuery()\r
+                       throws OperationCanceledException, AuthenticatorException,\r
+                       IOException {\r

                HttpPropFind query = new HttpPropFind(getUri().toString());\r
                query.setHeader("Content-type", "text/xml");\r
                query.setHeader("User-Agent", "Android-ownCloud");\r
                return query;\r
        }\r
                HttpPropFind query = new HttpPropFind(getUri().toString());\r
                query.setHeader("Content-type", "text/xml");\r
                query.setHeader("User-Agent", "Android-ownCloud");\r
                return query;\r
        }\r

-       \r
-       protected HttpResponse fireRawRequest(HttpRequest query) throws ClientProtocolException, OperationCanceledException, AuthenticatorException, IOException {\r
-           BasicHttpContext httpContext = new BasicHttpContext();\r
-        BasicScheme basicAuth = new BasicScheme();\r
-        httpContext.setAttribute("preemptive-auth", basicAuth);\r
-        \r
-        HttpResponse response = getClient().execute(this.host, query, httpContext);\r
-        return response;\r
-       }\r
-       \r
-       protected TreeNode fireRequest(HttpRequest query) throws ClientProtocolException, OperationCanceledException, 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(), this.host, root.getChildList());\r
-               return root;\r
+\r
+       protected HttpResponse fireRawRequest(HttpRequest query)\r
+                       throws ClientProtocolException, OperationCanceledException,\r
+                       AuthenticatorException, IOException {\r
+               /*BasicHttpContext httpContext = new BasicHttpContext();\r
+               BasicScheme basicAuth = new BasicScheme();\r
+               httpContext.setAttribute("preemptive-auth", basicAuth);\r
+\r
+               HttpResponse response = getClient().execute(mHost, query, httpContext);*/\r
+               return null;\r

        }\r
        }\r

-       \r
+\r

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

-               return Uri.parse(this.getAccountManager().getUserData(getAccount(), AccountAuthenticator.KEY_OC_URL));\r
+               return Uri.parse(this.getAccountManager().getUserData(getAccount(),\r
+                               AccountAuthenticator.KEY_OC_URL));\r

        }\r
        }\r

-       \r
-       private DefaultHttpClient getClient() throws OperationCanceledException, AuthenticatorException, IOException {\r
-               if(this.client == null) {\r
+\r
+       protected WebdavClient getClient() throws OperationCanceledException,\r
+                       AuthenticatorException, IOException {\r
+               if (mClient == null) {\r

                        String username = getAccount().name.split("@")[0];\r
                        String username = getAccount().name.split("@")[0];\r

-                       String password = this.getAccountManager().blockingGetAuthToken(getAccount(), AccountAuthenticator.AUTH_TOKEN_TYPE, true);\r
-                       if (this.getAccountManager().getUserData(getAccount(), AccountAuthenticator.KEY_OC_URL) == null) {\r
+                       String password = this.getAccountManager().blockingGetAuthToken(\r
+                                       getAccount(), AccountAuthenticator.AUTH_TOKEN_TYPE, true);\r
+                       if (this.getAccountManager().getUserData(getAccount(),\r
+                                       AccountAuthenticator.KEY_OC_URL) == null) {\r

                                throw new UnknownHostException();\r
                        }\r
                        Uri uri = getUri();\r
                                throw new UnknownHostException();\r
                        }\r
                        Uri uri = getUri();\r

-       \r
-                       int port = (uri.getPort() == -1) ? 80 : uri.getPort();\r
-                       this.client = new DefaultHttpClient();\r
-                       this.client.getCredentialsProvider().setCredentials(\r
-                               new AuthScope(uri.getHost(), port),\r
-                               new UsernamePasswordCredentials(username, password)\r
-                       );\r
-                       this.client.setKeepAliveStrategy(this.getKeepAliveStrategy());\r
-                       this.host = new HttpHost(uri.getHost(), port, (uri.getScheme() == "https") ? "https" : "http");\r
-               }\r
-               \r
-               return this.client;\r
-       }\r
-       \r
-       private void parseResponse(HttpResponse resp, Uri uri, DefaultHttpClient client, HttpHost targetHost, LinkedList<TreeNode> insertList) throws IOException, OperationCanceledException, AuthenticatorException {\r
-               boolean skipFirst = true;\r
-               for (TreeNode n :WebdavUtils.parseResponseToNodes(resp.getEntity().getContent())) {\r
-                       String path = n.stripPathFromFilename(uri.getPath());\r
-                       if (skipFirst) {\r
-                               skipFirst = false;\r
-                               continue;\r
-                       }\r
-                       insertList.add(n);\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 + n.getProperty(NodeProperty.NAME).replace(" ", "%20") + "/");\r
-                               HttpResponse response = fireRawRequest(method);\r
-                               parseResponse(response, uri, client, targetHost, n.getChildList());\r
-                       }\r
+\r
+                       mClient = new WebdavClient(uri);\r
+                       mClient.setCredentials(username, password);\r
+                       mClient.allowUnsignedCertificates();\r
+                       mHost = mClient.getTargetHost();\r

                }\r
                }\r

+\r
+               return mClient;\r

        }\r
        }\r

-       \r

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