From fc8191e26841dc25407dd74cb50738ff9a3157a6 Mon Sep 17 00:00:00 2001 From: masensio Date: Thu, 27 Mar 2014 18:01:13 +0100 Subject: [PATCH] Check the version number instead of the version string --- .../lib/common/accounts/AccountUtils.java | 5 --- .../status/GetRemoteStatusOperation.java | 2 - .../lib/resources/status/OwnCloudVersion.java | 44 ------------------- 3 files changed, 51 deletions(-) diff --git a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java index 4b9c3d61..7f0cd351 100644 --- a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java +++ b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java @@ -81,7 +81,6 @@ public class AccountUtils { AccountManager ama = AccountManager.get(context); String baseurl = ama.getUserData(account, Constants.KEY_OC_BASE_URL); String version = ama.getUserData(account, Constants.KEY_OC_VERSION); - String versionString = ama.getUserData(account, Constants.KEY_OC_VERSION_STRING); boolean supportsOAuth = (ama.getUserData(account, Constants.KEY_SUPPORTS_OAUTH2) != null); boolean supportsSamlSso = (ama.getUserData(account, Constants.KEY_SUPPORTS_SAML_WEB_SSO) != null); OwnCloudVersion ver = new OwnCloudVersion(version); @@ -149,10 +148,6 @@ public class AccountUtils { * http://server/path or https://owncloud.server */ public static final String KEY_OC_BASE_URL = "oc_base_url"; - /** - * Version string as shown in the status.php resource in the server side - */ - public static final String KEY_OC_VERSION_STRING = "oc_version_string"; /** * Flag signaling if the ownCloud server can be accessed with OAuth2 access tokens. */ diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java index 1cf369f1..052c7aae 100644 --- a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java +++ b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java @@ -56,7 +56,6 @@ public class GetRemoteStatusOperation extends RemoteOperation { private static final String NODE_INSTALLED = "installed"; private static final String NODE_VERSION = "version"; - private static final String NODE_VERSIONSTRING = "versionstring"; private String mUrl; private RemoteOperationResult mLatestResult; @@ -86,7 +85,6 @@ public class GetRemoteStatusOperation extends RemoteOperation { mLatestResult = new RemoteOperationResult(RemoteOperationResult.ResultCode.INSTANCE_NOT_CONFIGURED); } else { String version = json.getString(NODE_VERSION); - String versionString = json.getString(NODE_VERSIONSTRING); mOCVersion = new OwnCloudVersion(version); if (!mOCVersion.isVersionValid()) { mLatestResult = new RemoteOperationResult(RemoteOperationResult.ResultCode.BAD_OC_VERSION); diff --git a/src/com/owncloud/android/lib/resources/status/OwnCloudVersion.java b/src/com/owncloud/android/lib/resources/status/OwnCloudVersion.java index 737e21c6..ff14dbc5 100644 --- a/src/com/owncloud/android/lib/resources/status/OwnCloudVersion.java +++ b/src/com/owncloud/android/lib/resources/status/OwnCloudVersion.java @@ -25,8 +25,6 @@ package com.owncloud.android.lib.resources.status; -import android.util.Log; - public class OwnCloudVersion implements Comparable { public static final OwnCloudVersion owncloud_v1 = new OwnCloudVersion( 0x010000); @@ -61,39 +59,15 @@ public class OwnCloudVersion implements Comparable { mVersion = 0; mIsValid = false; mCountDots = version.length() - version.replace(".", "").length(); - Log.d("OwnCloudVersion", "VERSION "+ version + " Asign dots = " + String.valueOf(mCountDots)); parseVersion(version); } - -// public OwnCloudVersion(String version, String versionString) { -// mVersion = 0; -// mIsValid = false; -// //mCountDots = version.length() - version.replace(".", "").length(); -// mCountDots = 2; -// Log.d("OwnCloudVersion", "VERSION "+ version + " Asign dots = " + String.valueOf(mCountDots)); -// parseVersion(version); -// if (versionString != null && versionString.length() > 0) { -// mVersionString = versionString; -// -// } else if (mIsValid) { -// mVersionString = version; -// } -// } public String toString() { String versionToString = String.valueOf((mVersion >> (8*mCountDots)) % 256); - Log.d("OwnCloudVersion", " versionToString " + versionToString); for (int i = mCountDots - 1; i >= 0; i-- ) { - Log.d("OwnCloudVersion", "i = "+ i + " versionToString " + versionToString); versionToString = versionToString + "." + String.valueOf((mVersion >> (8*i)) % 256); } - //versionToString = versionToString + "." + String.valueOf((mVersion) % 256); - - Log.d("OwnCloudVersion", "dots = " + String.valueOf(mCountDots)); - Log.d("OwnCloudVersion", " versionToString " + versionToString); - Log.d("OwncloudVersion", ((mVersion >> 24) % 256) + "." + ((mVersion >> 16) % 256) + "." + ((mVersion >> 8) % 256) + "." - + ((mVersion) % 256)); return versionToString; } @@ -138,25 +112,7 @@ public class OwnCloudVersion implements Comparable { versionValue = versionValue << 8; } } - Log.d("OwnCloudVersion", " ---- version " + String.valueOf(versionValue)); -// versionValue = 0; -// if (nums.length > 0) { -// versionValue += Integer.parseInt(nums[0]); -// } -// versionValue = versionValue << 8; -// if (nums.length > 1) { -// versionValue += Integer.parseInt(nums[1]); -// } -// versionValue = versionValue << 8; -// if (nums.length > 2) { -// versionValue += Integer.parseInt(nums[2]); -// } -// versionValue = versionValue << 8; -// if (nums.length > 3) { -// versionValue += Integer.parseInt(nums[3]); -// } -// Log.d("OwnCloudVersion", " -----version " + String.valueOf(versionValue)); return versionValue; }