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

Grant comparison between versions of 4 parts and version of less than 4 parts will be right in any possible situation

Browse Source
This commit is contained in:
masensio 2014-03-31 14:53:29 +02:00
parent 5924b6abbc
commit 7426541883
1 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,48 +27,49 @@ package com.owncloud.android.lib.resources.status;
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); 0x01000000);
public static final OwnCloudVersion owncloud_v2 = new OwnCloudVersion( public static final OwnCloudVersion owncloud_v2 = new OwnCloudVersion(
0x020000); 0x02000000);
public static final OwnCloudVersion owncloud_v3 = new OwnCloudVersion( public static final OwnCloudVersion owncloud_v3 = new OwnCloudVersion(
0x030000); 0x03000000);
public static final OwnCloudVersion owncloud_v4 = new OwnCloudVersion( public static final OwnCloudVersion owncloud_v4 = new OwnCloudVersion(
0x040000); 0x04000000);
public static final OwnCloudVersion owncloud_v4_5 = new OwnCloudVersion( public static final OwnCloudVersion owncloud_v4_5 = new OwnCloudVersion(
0x040500); 0x04050000);
public static final int MINIMUM_VERSION_FOR_SHARING_API = 0x05001B; // 5.0.27 public static final int MINIMUM_VERSION_FOR_SHARING_API = 0x05001B; // 5.0.27
private static final int MAX_DOTS = 3;
// format is in version // format is in version
// 0xAABBCC // 0xAABBCCDD
// for version AA.BB.CC // for version AA.BB.CC.DD
// ie version 2.0.3 will be stored as 0x020003 // ie version 2.0.3 will be stored as 0x02000300
private int mVersion; private int mVersion;
private int mShortVersion; // version with 2 dots or less, for comparing with _MINIMUM_VERSION_FOR_SHARING_API
private boolean mIsValid; private boolean mIsValid;
// not parsed, saved same value offered by the server
private String mVersionString;
private int mCountDots;
protected OwnCloudVersion(int version) { protected OwnCloudVersion(int version) {
mVersion = version; mVersion = version;
mShortVersion= version;
mIsValid = true; mIsValid = true;
mVersionString = "";
} }
public OwnCloudVersion(String version){ public OwnCloudVersion(String version){
mVersion = 0; mVersion = 0;
mShortVersion = 0;
mIsValid = false; mIsValid = false;
mCountDots = version.length() - version.replace(".", "").length(); int countDots = version.length() - version.replace(".", "").length();
// Complete the version. Version must have 3 dots
for (int i = countDots; i < MAX_DOTS; i++) {
version = version + ".0";
}
parseVersion(version); parseVersion(version);
} }
public String toString() { public String toString() {
String versionToString = String.valueOf((mVersion >> (8*mCountDots)) % 256); String versionToString = String.valueOf((mVersion >> (8*MAX_DOTS)) % 256);
for (int i = mCountDots - 1; i >= 0; i-- ) { for (int i = MAX_DOTS - 1; i >= 0; i-- ) {
versionToString = versionToString + "." + String.valueOf((mVersion >> (8*i)) % 256); versionToString = versionToString + "." + String.valueOf((mVersion >> (8*i)) % 256);
} }
return versionToString; return versionToString;
@ -78,10 +79,6 @@ public class OwnCloudVersion implements Comparable<OwnCloudVersion> {
return toString(); return toString();
} }
public String getVersionString() {
return mVersionString;
}
public boolean isVersionValid() { public boolean isVersionValid() {
return mIsValid; return mIsValid;
} }
@ -109,13 +106,9 @@ public class OwnCloudVersion implements Comparable<OwnCloudVersion> {
version = version.replaceAll("[^\\d.]", ""); version = version.replaceAll("[^\\d.]", "");
String[] nums = version.split("\\."); String[] nums = version.split("\\.");
for (int i = 0; i < nums.length; i++) { for (int i = 0; i < nums.length && i <= MAX_DOTS; i++) {
versionValue += Integer.parseInt(nums[i]); versionValue += Integer.parseInt(nums[i]);
if ( i<=2 ) { if (i < nums.length - 1) {
mShortVersion = versionValue;
}
if (i < nums.length -1) {
versionValue = versionValue << 8; versionValue = versionValue << 8;
} }
} }
@ -125,7 +118,7 @@ public class OwnCloudVersion implements Comparable<OwnCloudVersion> {
public boolean isSharedSupported() { public boolean isSharedSupported() {
return (mShortVersion >= MINIMUM_VERSION_FOR_SHARING_API); return (mVersion >= MINIMUM_VERSION_FOR_SHARING_API);
} }