flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-07 16:06:08 +00:00
Code Issues Releases Wiki Activity

Save version with two dots, for the comparison with MINIMUM_VERSION_FOR_SHARING_API

Browse Source
This commit is contained in:
masensio 2014-03-28 09:36:12 +01:00
parent fc8191e268
commit 5924b6abbc
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,6 +44,7 @@ public class OwnCloudVersion implements Comparable<OwnCloudVersion> {
// for version AA.BB.CC // for version AA.BB.CC
// ie version 2.0.3 will be stored as 0x020003 // ie version 2.0.3 will be stored as 0x020003
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 // not parsed, saved same value offered by the server
private String mVersionString; private String mVersionString;
@ -51,12 +52,14 @@ public class OwnCloudVersion implements Comparable<OwnCloudVersion> {
protected OwnCloudVersion(int version) { protected OwnCloudVersion(int version) {
mVersion = version; mVersion = version;
mShortVersion= version;
mIsValid = true; mIsValid = true;
mVersionString = ""; 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(); mCountDots = version.length() - version.replace(".", "").length();
parseVersion(version); parseVersion(version);
@ -100,32 +103,29 @@ public class OwnCloudVersion implements Comparable<OwnCloudVersion> {
} }
private int getParsedVersion(String version) throws NumberFormatException { private int getParsedVersion(String version) throws NumberFormatException {
int versionValue = 0; int versionValue = 0;
// get only numeric part // get only numeric part
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++) {
versionValue += Integer.parseInt(nums[i]); versionValue += Integer.parseInt(nums[i]);
if (i< nums.length -1) { if ( i<=2 ) {
versionValue = versionValue << 8; mShortVersion = versionValue;
} }
}
return versionValue; if (i < nums.length -1) {
versionValue = versionValue << 8;
}
}
return versionValue;
} }
public boolean isSharedSupported() { public boolean isSharedSupported() {
// int version = 0; return (mShortVersion >= MINIMUM_VERSION_FOR_SHARING_API);
// try {
// version = getParsedVersion(mVersion);
//
// } catch (Exception e) {
// // nothing to do here
// }
return (mVersion >= MINIMUM_VERSION_FOR_SHARING_API);
} }