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 73e41d2..1d23ec8 100644 (file)
--- a/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
@@ -15,22 +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

-
-package eu.alefzero.owncloud.syncadapter;
-
+\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.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,166 +37,143 @@ 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.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
-
-/**
- * Base SyncAdapter for OwnCloud
- * Designed to be subclassed for the concrete SyncAdapter, like ConcatsSync, CalendarSync, FileSync etc..
- * 
- * @author sassman
- *
- */
-public abstract class AbstractOwnCloudSyncAdapter extends AbstractThreadedSyncAdapter {
-
-       private AccountManager accountManager;
-       private Account account;
-       private ContentProviderClient contentProvider;
-       private Date lastUpdated;
-       
-       private HttpHost mHost;
-       private WebdavClient mClient = null;
-
-       public AbstractOwnCloudSyncAdapter(Context context, boolean autoInitialize) {
-               super(context, autoInitialize);
-               this.setAccountManager(AccountManager.get(context));
-       }
-
-       public AccountManager getAccountManager() {
-               return accountManager;
-       }
-
-       public void setAccountManager(AccountManager accountManager) {
-               this.accountManager = accountManager;
-       }
-
-       public Account getAccount() {
-               return account;
-       }
-
-       public void setAccount(Account account) {
-               this.account = account;
-       }
-
-       public ContentProviderClient getContentProvider() {
-               return contentProvider;
-       }
-
-       public void setContentProvider(ContentProviderClient contentProvider) {
-               this.contentProvider = contentProvider;
-       }
-
-       public Date getLastUpdated() {
-               return lastUpdated;
-       }
-
-       public void setLastUpdated(Date lastUpdated) {
-               this.lastUpdated = lastUpdated;
-       }
-       
-       protected ConnectionKeepAliveStrategy getKeepAliveStrategy() {
-               return new ConnectionKeepAliveStrategy() {
-                       public long getKeepAliveDuration(HttpResponse response, HttpContext context) {
-                               // Change keep alive straategy basing on response: ie forbidden/not found/etc
-                               // should have keep alive 0
+\r
+/**\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
+ */\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
+       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
+               this.setAccountManager(AccountManager.get(context));\r
+       }\r
+\r
+       public AccountManager getAccountManager() {\r
+               return accountManager;\r
+       }\r
+\r
+       public void setAccountManager(AccountManager accountManager) {\r
+               this.accountManager = accountManager;\r
+       }\r
+\r
+       public Account getAccount() {\r
+               return account;\r
+       }\r
+\r
+       public void setAccount(Account account) {\r
+               this.account = account;\r
+       }\r
+\r
+       public ContentProviderClient getContentProvider() {\r
+               return contentProvider;\r
+       }\r
+\r
+       public void setContentProvider(ContentProviderClient contentProvider) {\r
+               this.contentProvider = contentProvider;\r
+       }\r
+\r
+       public Date getLastUpdated() {\r
+               return lastUpdated;\r
+       }\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
+                       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
                                int statusCode = response.getStatusLine().getStatusCode();\r
                                // default return: 5s\r
                                int statusCode = response.getStatusLine().getStatusCode();\r

-                               \r
-                               // HTTP 400, 500 Errors as well as HTTP 118 - Connection timed out\r
-                               if((statusCode >= 400 && statusCode <= 418) || \r
-                                               (statusCode >= 421 && statusCode <= 426) ||\r
-                                               (statusCode >= 500 && statusCode <= 510 ) ||\r
-                                               statusCode == 118) {\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
                                        return 0;\r
                                }\r

-                               
-                               return 5 * 1000;
-                       }
-               };
-       }
-       
-       protected HttpPropFind getPropFindQuery() throws OperationCanceledException, AuthenticatorException, IOException {
-               HttpPropFind query = new HttpPropFind(getUri().toString());
-               query.setHeader("Content-type", "text/xml");
-               query.setHeader("User-Agent", "Android-ownCloud");
-               return query;
-       }
-       
-       protected HttpResponse fireRawRequest(HttpRequest query) throws ClientProtocolException, OperationCanceledException, AuthenticatorException, IOException {
-           BasicHttpContext httpContext = new BasicHttpContext();
-        BasicScheme basicAuth = new BasicScheme();
-        httpContext.setAttribute("preemptive-auth", basicAuth);
-        
-        HttpResponse response = getClient().execute(mHost, query, httpContext);
-        return response;
-       }
-       
-       protected TreeNode fireRequest(HttpRequest query) throws ClientProtocolException, OperationCanceledException, AuthenticatorException, IOException {
-               HttpResponse response = fireRawRequest(query);
-               
-               TreeNode root = new TreeNode();
-               root.setProperty(TreeNode.NodeProperty.NAME, "");
-               this.parseResponse(response, getUri(), getClient(), mHost, root.getChildList(), false, 0);
-               return root;
-       }
-       
-       protected Uri getUri() {
-               return Uri.parse(this.getAccountManager().getUserData(getAccount(), AccountAuthenticator.KEY_OC_URL));
-       }
-       
-       private DefaultHttpClient getClient() throws OperationCanceledException, AuthenticatorException, IOException {
-               if(mClient == null) {
-                       String username = getAccount().name.split("@")[0];
-                       String password = this.getAccountManager().blockingGetAuthToken(getAccount(), AccountAuthenticator.AUTH_TOKEN_TYPE, true);
-                       if (this.getAccountManager().getUserData(getAccount(), AccountAuthenticator.KEY_OC_URL) == null) {
-                               throw new UnknownHostException();
-                       }
-                       Uri uri = getUri();
-       
-                       mClient = new WebdavClient(uri);
-                       mClient.setCredentials(username, password);
-                       mClient.allowUnsignedCertificates();
-                       mHost = mClient.getTargetHost();
-               }
-               
-               return mClient.getHttpClient();
-       }
-       
-       private void parseResponse(HttpResponse resp, Uri uri, DefaultHttpClient client, HttpHost targetHost, LinkedList<TreeNode> insertList, boolean sf, long parent_id) throws IOException, OperationCanceledException, AuthenticatorException {
-               boolean skipFirst = sf, override_parent = !sf;
-               for (TreeNode n :WebdavUtils.parseResponseToNodes(resp.getEntity().getContent())) {\r
-                 if (skipFirst) {\r
-        skipFirst = false;\r
-        continue;\r
-      }
-                       String path = n.stripPathFromFilename(uri.getPath());\r
-                       OCFile new_file = OCFile.createNewFile(getContentProvider(),\r
-          getAccount(),\r
-          n.getProperty(NodeProperty.PATH),\r
-          0,//Long.parseLong(n.getProperty(NodeProperty.CONTENT_LENGTH)),\r
-          0,//Long.parseLong(n.getProperty(NodeProperty.CREATE_DATE)),\r
-          0,//Long.parseLong(n.getProperty(NodeProperty.LAST_MODIFIED_DATE)),\r
-          n.getProperty(NodeProperty.RESOURCE_TYPE),\r
-          parent_id);\r
-                       new_file.save();\r
-                       if (override_parent) {\r
-                         parent_id = new_file.getFileId();\r
-                         override_parent = false;\r
-                       }
-
-                       if (!TextUtils.isEmpty(n.getProperty(NodeProperty.NAME)) &&
-                                       n.getProperty(NodeProperty.RESOURCE_TYPE).equals("DIR")) {
-                           
-                           HttpPropFind method = new HttpPropFind(uri.getPath() + path + n.getProperty(NodeProperty.NAME).replace(" ", "%20") + "/");
-                               HttpResponse response = fireRawRequest(method);
-                               parseResponse(response, uri, client, targetHost, n.getChildList(), true, new_file.getFileId());
-                       }
-               }
-       }
+\r
+                               return 5 * 1000;\r
+                       }\r
+               };\r
+       }\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
+\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
+       protected Uri getUri() {\r
+               return Uri.parse(this.getAccountManager().getUserData(getAccount(),\r
+                               AccountAuthenticator.KEY_OC_URL));\r
+       }\r
+\r
+       protected WebdavClient getClient() throws OperationCanceledException,\r
+                       AuthenticatorException, IOException {\r
+               if (mClient == null) {\r
+                       String username = getAccount().name.split("@")[0];\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
+\r
+                       mClient = new WebdavClient(uri);\r
+                       mClient.setCredentials(username, password);\r
+                       mClient.allowUnsignedCertificates();\r
+                       mHost = mClient.getTargetHost();\r
+               }\r
+\r
+               return mClient;\r
+       }\r

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