Refactoring of main Activities and Fragments to avoid inconsistent states leading...

[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 efd4c2b..5ea4e3e 100644 (file)
--- a/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
@@ -149,18 +149,11 @@ public abstract class AbstractOwnCloudSyncAdapter extends
     protected WebdavClient getClient() throws OperationCanceledException,\r
             AuthenticatorException, IOException {\r
         if (mClient == null) {\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
             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
+            mClient = new WebdavClient(account, getContext());\r

             // mHost = mClient.getTargetHost();\r
         }\r
 \r
             // mHost = mClient.getTargetHost();\r
         }\r
 \r