Adding cancellation to uploads (WIP)

[pub/Android/ownCloud.git] / src / com / owncloud / android / syncadapter / AbstractOwnCloudSyncAdapter.java

diff --git a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
index e8b1fcb..878c696 100644 (file)
--- a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
@@ -28,8 +28,9 @@ import org.apache.http.client.ClientProtocolException;
 import org.apache.http.conn.ConnectionKeepAliveStrategy;\r
 import org.apache.http.protocol.HttpContext;\r
 \r
 import org.apache.http.conn.ConnectionKeepAliveStrategy;\r
 import org.apache.http.protocol.HttpContext;\r
 \r

-import com.owncloud.android.authenticator.AccountAuthenticator;\r
+import com.owncloud.android.AccountUtils;\r

 import com.owncloud.android.datamodel.DataStorageManager;\r
 import com.owncloud.android.datamodel.DataStorageManager;\r

+import com.owncloud.android.network.OwnCloudClientUtils;\r

 \r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
 \r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r


@@ -143,20 +144,16 @@ public abstract class AbstractOwnCloudSyncAdapter extends
     }\r
 \r
     protected Uri getUri() {\r
     }\r
 \r
     protected Uri getUri() {\r

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

     }\r
 \r
     }\r
 \r

-    protected WebdavClient getClient() throws OperationCanceledException,\r
-            AuthenticatorException, IOException {\r
+    protected WebdavClient getClient() throws /*OperationCanceledException,\r
+            AuthenticatorException,*/ IOException {\r

         if (mClient == null) {\r
         if (mClient == null) {\r

-            if (this.getAccountManager().getUserData(getAccount(),\r
-                    AccountAuthenticator.KEY_OC_URL) == null) {\r
+            if (AccountUtils.constructFullURLForAccount(getContext(), getAccount()) == null) {\r

                 throw new UnknownHostException();\r
             }\r
                 throw new UnknownHostException();\r
             }\r

-            mClient = new WebdavClient(account, getContext());\r
-            mClient.allowSelfsignedCertificates();\r
-            // mHost = mClient.getTargetHost();\r
+            mClient = OwnCloudClientUtils.createOwnCloudClient(account, getContext());\r

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