X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/09eab4bc054e62f285944e106b19ad9a28839879..37236f0faa2709affcd0a77e47069ecb259860a7:/src/com/owncloud/android/services/OperationsService.java

diff --git a/src/com/owncloud/android/services/OperationsService.java b/src/com/owncloud/android/services/OperationsService.java
index bc0446b1..b9f8846e 100644
--- a/src/com/owncloud/android/services/OperationsService.java
+++ b/src/com/owncloud/android/services/OperationsService.java
@@ -26,6 +26,7 @@ import java.util.concurrent.ConcurrentMap;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
+import com.owncloud.android.lib.common.OwnCloudAccount;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.OwnCloudCredentials;
 import com.owncloud.android.lib.common.OwnCloudCredentialsFactory;
@@ -469,10 +470,9 @@ public class OperationsService extends Service {
                 if (mLastTarget == null || !mLastTarget.equals(next.first)) {
                     mLastTarget = next.first;
                     if (mLastTarget.mAccount != null) {
+                        OwnCloudAccount ocAccount = new OwnCloudAccount(mLastTarget.mAccount, this);
                         mOwnCloudClient = ((MainApp)getApplicationContext()).
-                                getOwnCloudClientManager().getClientFor(
-                                        mLastTarget.mAccount, 
-                                        this);
+                                getOwnCloudClientManager().getClientFor(ocAccount, this);
                         mStorageManager = 
                                 new FileDataStorageManager(
                                         mLastTarget.mAccount, 
@@ -492,12 +492,10 @@ public class OperationsService extends Service {
                             credentials = OwnCloudCredentialsFactory.newSamlSsoCredentials(
                                     mLastTarget.mCookie); // SAML SSO
                         }
-                        
+                        OwnCloudAccount ocAccount = new OwnCloudAccount(
+                                mLastTarget.mServerUrl, credentials);
                         mOwnCloudClient = ((MainApp)getApplicationContext()).
-                                getOwnCloudClientManager().getClientFor(
-                                        mLastTarget.mServerUrl,
-                                        credentials,    // still can be null, and that is right
-                                        this);
+                                getOwnCloudClientManager().getClientFor(ocAccount, this);
                         mOwnCloudClient.setFollowRedirects(mLastTarget.mFollowRedirects);
                         mStorageManager = null;
                     }