X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/91bc3fdb1eb923053b469b94e5b200482f522010..8361540852ec87b51c85937e0f326a83e19cd8ad:/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java?ds=sidebyside

diff --git a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
index db5a084d..92c0b720 100644
--- 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;
 import org.apache.http.protocol.HttpContext;
 
-import com.owncloud.android.authenticator.AccountAuthenticator;
+import com.owncloud.android.AccountUtils;
 import com.owncloud.android.datamodel.DataStorageManager;
-import com.owncloud.android.utils.OwnCloudClientUtils;
+import com.owncloud.android.network.OwnCloudClientUtils;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -39,7 +39,6 @@ import android.accounts.OperationCanceledException;
 import android.content.AbstractThreadedSyncAdapter;
 import android.content.ContentProviderClient;
 import android.content.Context;
-import android.net.Uri;
 import eu.alefzero.webdav.WebdavClient;
 
 /**
@@ -143,21 +142,14 @@ public abstract class AbstractOwnCloudSyncAdapter extends
         return null;
     }
 
-    protected Uri getUri() {
-        return Uri.parse(this.getAccountManager().getUserData(getAccount(),
-                AccountAuthenticator.KEY_OC_URL));
-    }
-
-    protected WebdavClient getClient() throws /*OperationCanceledException,
-            AuthenticatorException,*/ IOException {
-        if (mClient == null) {
-            if (this.getAccountManager().getUserData(getAccount(),
-                    AccountAuthenticator.KEY_OC_URL) == null) {
-                throw new UnknownHostException();
-            }
-            mClient = OwnCloudClientUtils.createOwnCloudClient(account, getContext());
+    protected void initClientForCurrentAccount() throws UnknownHostException {
+        if (AccountUtils.constructFullURLForAccount(getContext(), account) == null) {
+            throw new UnknownHostException();
         }
-
+        mClient = OwnCloudClientUtils.createOwnCloudClient(account, getContext());
+    }
+    
+    protected WebdavClient getClient() {
         return mClient;
     }
 }
\ No newline at end of file