X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/e89e0300774b57323466760c632700e2900e6d7a..0df1eeaac48dfd43f7fd6240dab63fd8c5d53b45:/src/com/owncloud/android/services/SyncFolderHandler.java diff --git a/src/com/owncloud/android/services/SyncFolderHandler.java b/src/com/owncloud/android/services/SyncFolderHandler.java index 6d4bc73e..b68d930b 100644 --- a/src/com/owncloud/android/services/SyncFolderHandler.java +++ b/src/com/owncloud/android/services/SyncFolderHandler.java @@ -106,18 +106,19 @@ class SyncFolderHandler extends Handler { RemoteOperationResult result = null; try { - if (mOwnCloudClient == null || !account.equals(mCurrentAccount)) { - /// get client object to send the request to the ownCloud server, if cannot + + if (mCurrentAccount == null || !mCurrentAccount.equals(account)) { mCurrentAccount = account; mStorageManager = new FileDataStorageManager( account, mService.getContentResolver() ); - OwnCloudAccount ocAccount = new OwnCloudAccount(account, mService); - mOwnCloudClient = OwnCloudClientManagerFactory.getDefaultSingleton(). - getClientFor(ocAccount, mService); + } // else, reuse storage manager from previous operation - } // else, reuse client from previous operation + // always get client from client manager, to get fresh credentials in case of update + OwnCloudAccount ocAccount = new OwnCloudAccount(account, mService); + mOwnCloudClient = OwnCloudClientManagerFactory.getDefaultSingleton(). + getClientFor(ocAccount, mService); /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), "Executing sync folder " + remotePath);*/