flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-10-31 02:17:41 +00:00
Code Issues Releases Wiki Activity

Check the version number instead of the version string

Browse Source
This commit is contained in:
masensio 2014-03-27 18:01:13 +01:00
parent 8d820f42fb
commit fc8191e268
3 changed files with 0 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/owncloud/android/lib/common/accounts/AccountUtils.java
View File

@ -81,7 +81,6 @@ public class AccountUtils {
AccountManager ama = AccountManager.get(context); AccountManager ama = AccountManager.get(context);
String baseurl = ama.getUserData(account, Constants.KEY_OC_BASE_URL); String baseurl = ama.getUserData(account, Constants.KEY_OC_BASE_URL);
String version = ama.getUserData(account, Constants.KEY_OC_VERSION); 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 supportsOAuth = (ama.getUserData(account, Constants.KEY_SUPPORTS_OAUTH2) != null);
boolean supportsSamlSso = (ama.getUserData(account, Constants.KEY_SUPPORTS_SAML_WEB_SSO) != null); boolean supportsSamlSso = (ama.getUserData(account, Constants.KEY_SUPPORTS_SAML_WEB_SSO) != null);
OwnCloudVersion ver = new OwnCloudVersion(version); OwnCloudVersion ver = new OwnCloudVersion(version);
@ -149,10 +148,6 @@ public class AccountUtils {
* http://server/path or https://owncloud.server * http://server/path or https://owncloud.server
*/ */
public static final String KEY_OC_BASE_URL = "oc_base_url"; 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. * Flag signaling if the ownCloud server can be accessed with OAuth2 access tokens.
*/ */

2
src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
View File

@ -56,7 +56,6 @@ public class GetRemoteStatusOperation extends RemoteOperation {
private static final String NODE_INSTALLED = "installed"; private static final String NODE_INSTALLED = "installed";
private static final String NODE_VERSION = "version"; private static final String NODE_VERSION = "version";
private static final String NODE_VERSIONSTRING = "versionstring";
private String mUrl; private String mUrl;
private RemoteOperationResult mLatestResult; private RemoteOperationResult mLatestResult;
@ -86,7 +85,6 @@ public class GetRemoteStatusOperation extends RemoteOperation {
mLatestResult = new RemoteOperationResult(RemoteOperationResult.ResultCode.INSTANCE_NOT_CONFIGURED); mLatestResult = new RemoteOperationResult(RemoteOperationResult.ResultCode.INSTANCE_NOT_CONFIGURED);
} else { } else {
String version = json.getString(NODE_VERSION); String version = json.getString(NODE_VERSION);
String versionString = json.getString(NODE_VERSIONSTRING);
mOCVersion = new OwnCloudVersion(version); mOCVersion = new OwnCloudVersion(version);
if (!mOCVersion.isVersionValid()) { if (!mOCVersion.isVersionValid()) {
mLatestResult = new RemoteOperationResult(RemoteOperationResult.ResultCode.BAD_OC_VERSION); mLatestResult = new RemoteOperationResult(RemoteOperationResult.ResultCode.BAD_OC_VERSION);

44
src/com/owncloud/android/lib/resources/status/OwnCloudVersion.java
View File

@ -25,8 +25,6 @@
package com.owncloud.android.lib.resources.status; package com.owncloud.android.lib.resources.status;
import android.util.Log;
public class OwnCloudVersion implements Comparable<OwnCloudVersion> { public class OwnCloudVersion implements Comparable<OwnCloudVersion> {
public static final OwnCloudVersion owncloud_v1 = new OwnCloudVersion( public static final OwnCloudVersion owncloud_v1 = new OwnCloudVersion(
0x010000); 0x010000);
@ -61,39 +59,15 @@ public class OwnCloudVersion implements Comparable<OwnCloudVersion> {
mVersion = 0; mVersion = 0;
mIsValid = false; mIsValid = false;
mCountDots = version.length() - version.replace(".", "").length(); mCountDots = version.length() - version.replace(".", "").length();
Log.d("OwnCloudVersion", "VERSION "+ version + " Asign dots = " + String.valueOf(mCountDots));
parseVersion(version); 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() { public String toString() {
String versionToString = String.valueOf((mVersion >> (8*mCountDots)) % 256); String versionToString = String.valueOf((mVersion >> (8*mCountDots)) % 256);
Log.d("OwnCloudVersion", " versionToString " + versionToString);
for (int i = mCountDots - 1; i >= 0; i-- ) { 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 >> (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; return versionToString;
} }
@ -138,25 +112,7 @@ public class OwnCloudVersion implements Comparable<OwnCloudVersion> {
versionValue = versionValue << 8; 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; return versionValue;
} }