X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/99d52af203f63a5dd3d43626f569ac88c5ac9b14..c2abbaaedb69dba35866a48b745b68f3519cbca1:/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 ecb320eb..47730995 100644
--- a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
@@ -1,10 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,6 @@
 package com.owncloud.android.syncadapter;
 
 import java.io.IOException;
-import java.net.UnknownHostException;
 import java.util.Date;
 
 import org.apache.http.HttpRequest;
@@ -28,9 +27,11 @@ 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.authentication.AccountUtils;
+import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;
 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 +40,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 +143,12 @@ public abstract class AbstractOwnCloudSyncAdapter extends
         return null;
     }
 
-    protected Uri getUri() {
-        return Uri.parse(this.getAccountManager().getUserData(getAccount(),
-                AccountAuthenticator.KEY_OC_URL));
+    protected void initClientForCurrentAccount() throws OperationCanceledException, AuthenticatorException, IOException, AccountNotFoundException {
+        AccountUtils.constructFullURLForAccount(getContext(), account);
+        mClient = OwnCloudClientUtils.createOwnCloudClient(account, getContext());
     }
-
-    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 WebdavClient getClient() {
         return mClient;
     }
 }
\ No newline at end of file