X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/7a42dc2bf4e98ba9a121958f5442ae197ce65611..1551a5280afc682baf84582c150b3a9a4e47f219:/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 ee01c418..82114140 100644 --- a/src/com/owncloud/android/services/OperationsService.java +++ b/src/com/owncloud/android/services/OperationsService.java @@ -34,6 +34,7 @@ import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.lib.common.OwnCloudClientManagerFactory; import com.owncloud.android.lib.common.OwnCloudCredentials; import com.owncloud.android.lib.common.OwnCloudCredentialsFactory; +import com.owncloud.android.lib.common.accounts.AccountUtils; import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException; import com.owncloud.android.lib.common.operations.OnRemoteOperationListener; import com.owncloud.android.lib.common.operations.RemoteOperation; @@ -54,6 +55,7 @@ import com.owncloud.android.operations.SynchronizeFolderOperation; import com.owncloud.android.operations.UnshareLinkOperation; import android.accounts.Account; +import android.accounts.AccountManager; import android.accounts.AccountsException; import android.accounts.AuthenticatorException; import android.accounts.OperationCanceledException; @@ -441,7 +443,13 @@ public class OperationsService extends Service { OwnCloudAccount ocAccount = new OwnCloudAccount(mLastTarget.mAccount, mService); mOwnCloudClient = OwnCloudClientManagerFactory.getDefaultSingleton(). - getClientFor(ocAccount, mService, MainApp.getUserAgent()); + getClientFor(ocAccount, mService); + + AccountManager am = AccountManager.get(mService.getApplicationContext()); + String version = am.getUserData(mLastTarget.mAccount, + AccountUtils.Constants.KEY_OC_VERSION); + mOwnCloudClient.setOwnCloudVersion(version); + mStorageManager = new FileDataStorageManager( mLastTarget.mAccount, mService.getContentResolver() @@ -459,7 +467,7 @@ public class OperationsService extends Service { OwnCloudAccount ocAccount = new OwnCloudAccount( mLastTarget.mServerUrl, credentials); mOwnCloudClient = OwnCloudClientManagerFactory.getDefaultSingleton(). - getClientFor(ocAccount, mService, MainApp.getUserAgent()); + getClientFor(ocAccount, mService); mStorageManager = null; } } @@ -469,7 +477,7 @@ public class OperationsService extends Service { result = ((SyncOperation)mCurrentOperation).execute(mOwnCloudClient, mStorageManager); } else { - result = mCurrentOperation.execute(mOwnCloudClient, MainApp.getUserAgent()); + result = mCurrentOperation.execute(mOwnCloudClient); } } catch (AccountsException e) {