X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/ba2dbeb7356cc95ebe260b50b147fe472452f8bf..00482b6dcb1e98da39df54374f7098b51d66bee5:/src/com/owncloud/android/operations/UpdateOCVersionOperation.java diff --git a/src/com/owncloud/android/operations/UpdateOCVersionOperation.java b/src/com/owncloud/android/operations/UpdateOCVersionOperation.java index 22fdc934..d2bf5f33 100644 --- a/src/com/owncloud/android/operations/UpdateOCVersionOperation.java +++ b/src/com/owncloud/android/operations/UpdateOCVersionOperation.java @@ -1,5 +1,8 @@ -/* ownCloud Android client application - * Copyright (C) 2012-2013 ownCloud Inc. +/** + * ownCloud Android client application + * + * @author David A. Velasco + * Copyright (C) 2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -28,8 +31,8 @@ import com.owncloud.android.lib.common.accounts.AccountUtils.Constants; import com.owncloud.android.lib.common.operations.RemoteOperation; import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; +import com.owncloud.android.lib.common.utils.Log_OC; import com.owncloud.android.lib.resources.status.OwnCloudVersion; -import com.owncloud.android.utils.Log_OC; import android.accounts.Account; import android.accounts.AccountManager; @@ -38,8 +41,6 @@ import android.content.Context; /** * Remote operation that checks the version of an ownCloud server and stores it locally - * - * @author David A. Velasco */ public class UpdateOCVersionOperation extends RemoteOperation { @@ -47,11 +48,13 @@ public class UpdateOCVersionOperation extends RemoteOperation { private Account mAccount; private Context mContext; + private OwnCloudVersion mOwnCloudVersion; public UpdateOCVersionOperation(Account account, Context context) { mAccount = account; mContext = context; + mOwnCloudVersion = null; } @@ -74,10 +77,13 @@ public class UpdateOCVersionOperation extends RemoteOperation { if (response != null) { JSONObject json = new JSONObject(response); if (json != null && json.getString("version") != null) { - OwnCloudVersion ocver = new OwnCloudVersion(json.getString("version")); - if (ocver.isVersionValid()) { - accountMngr.setUserData(mAccount, Constants.KEY_OC_VERSION, ocver.toString()); - Log_OC.d(TAG, "Got new OC version " + ocver.toString()); + + String version = json.getString("version"); + mOwnCloudVersion = new OwnCloudVersion(version); + if (mOwnCloudVersion.isVersionValid()) { + accountMngr.setUserData(mAccount, Constants.KEY_OC_VERSION, mOwnCloudVersion.getVersion()); + Log_OC.d(TAG, "Got new OC version " + mOwnCloudVersion.toString()); + result = new RemoteOperationResult(ResultCode.OK); } else { @@ -107,4 +113,9 @@ public class UpdateOCVersionOperation extends RemoteOperation { return result; } + + public OwnCloudVersion getOCVersion() { + return mOwnCloudVersion; + } + }