adjusting design to holo, stability for account setup

[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 1d23ec8..3d9a766 100644 (file)
--- a/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
@@ -22,7 +22,6 @@ import java.io.IOException;
 import java.net.UnknownHostException;\r
 import java.util.Date;\r
 \r
 import java.net.UnknownHostException;\r
 import java.util.Date;\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.HttpRequest;\r
 import org.apache.http.HttpResponse;\r
 import org.apache.http.client.ClientProtocolException;\r


@@ -39,7 +38,6 @@ import android.content.Context;
 import android.net.Uri;\r
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
 import eu.alefzero.owncloud.datamodel.DataStorageManager;\r
 import android.net.Uri;\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.WebdavClient;\r
 \r
 /**\r
 import eu.alefzero.webdav.WebdavClient;\r
 \r
 /**\r


@@ -49,8 +47,7 @@ import eu.alefzero.webdav.WebdavClient;
  * @author sassman\r
  * \r
  */\r
  * @author sassman\r
  * \r
  */\r

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

 \r
        private AccountManager accountManager;\r
        private Account account;\r
 \r
        private AccountManager accountManager;\r
        private Account account;\r


@@ -58,9 +55,7 @@ public abstract class AbstractOwnCloudSyncAdapter extends
        private Date lastUpdated;\r
        private DataStorageManager mStoreManager;\r
 \r
        private Date lastUpdated;\r
        private DataStorageManager mStoreManager;\r
 \r

-       private HttpHost mHost;\r

        private WebdavClient mClient = null;\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


@@ -131,15 +126,6 @@ public abstract class AbstractOwnCloudSyncAdapter extends
                };\r
        }\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
        protected HttpResponse fireRawRequest(HttpRequest query)\r
                        throws ClientProtocolException, OperationCanceledException,\r
                        AuthenticatorException, IOException {\r


@@ -171,7 +157,7 @@ public abstract class AbstractOwnCloudSyncAdapter extends
                        mClient = new WebdavClient(uri);\r
                        mClient.setCredentials(username, password);\r
                        mClient.allowUnsignedCertificates();\r
                        mClient = new WebdavClient(uri);\r
                        mClient.setCredentials(username, password);\r
                        mClient.allowUnsignedCertificates();\r

-                       mHost = mClient.getTargetHost();\r
+                       //mHost = mClient.getTargetHost();\r

                }\r
 \r
                return mClient;\r
                }\r
 \r
                return mClient;\r