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 ecb320e..878c696 100644 (file)
--- a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
@@ -28,9 +28,9 @@ import org.apache.http.client.ClientProtocolException;
 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.utils.OwnCloudClientUtils;\r
+import com.owncloud.android.network.OwnCloudClientUtils;\r
 \r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
@@ -144,15 +144,13 @@ public abstract class AbstractOwnCloudSyncAdapter extends
     }\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
-    protected WebdavClient getClient() throws OperationCanceledException,\r
-            AuthenticatorException, IOException {\r
+    protected WebdavClient getClient() throws /*OperationCanceledException,\r
+            AuthenticatorException,*/ IOException {\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
             mClient = OwnCloudClientUtils.createOwnCloudClient(account, getContext());\r