mirror of
https://github.com/owncloud/android-library.git
synced 2025-06-07 16:06:08 +00:00
Save version with two dots, for the comparison with MINIMUM_VERSION_FOR_SHARING_API
This commit is contained in:
parent
fc8191e268
commit
5924b6abbc
@ -44,6 +44,7 @@ public class OwnCloudVersion implements Comparable<OwnCloudVersion> {
|
||||
// for version AA.BB.CC
|
||||
// ie version 2.0.3 will be stored as 0x020003
|
||||
private int mVersion;
|
||||
private int mShortVersion; // version with 2 dots or less, for comparing with _MINIMUM_VERSION_FOR_SHARING_API
|
||||
private boolean mIsValid;
|
||||
// not parsed, saved same value offered by the server
|
||||
private String mVersionString;
|
||||
@ -51,12 +52,14 @@ public class OwnCloudVersion implements Comparable<OwnCloudVersion> {
|
||||
|
||||
protected OwnCloudVersion(int version) {
|
||||
mVersion = version;
|
||||
mShortVersion= version;
|
||||
mIsValid = true;
|
||||
mVersionString = "";
|
||||
}
|
||||
|
||||
public OwnCloudVersion(String version){
|
||||
mVersion = 0;
|
||||
mShortVersion = 0;
|
||||
mIsValid = false;
|
||||
mCountDots = version.length() - version.replace(".", "").length();
|
||||
parseVersion(version);
|
||||
@ -108,7 +111,11 @@ public class OwnCloudVersion implements Comparable<OwnCloudVersion> {
|
||||
String[] nums = version.split("\\.");
|
||||
for (int i = 0; i < nums.length; i++) {
|
||||
versionValue += Integer.parseInt(nums[i]);
|
||||
if (i< nums.length -1) {
|
||||
if ( i<=2 ) {
|
||||
mShortVersion = versionValue;
|
||||
}
|
||||
|
||||
if (i < nums.length -1) {
|
||||
versionValue = versionValue << 8;
|
||||
}
|
||||
}
|
||||
@ -118,14 +125,7 @@ public class OwnCloudVersion implements Comparable<OwnCloudVersion> {
|
||||
|
||||
|
||||
public boolean isSharedSupported() {
|
||||
// int version = 0;
|
||||
// try {
|
||||
// version = getParsedVersion(mVersion);
|
||||
//
|
||||
// } catch (Exception e) {
|
||||
// // nothing to do here
|
||||
// }
|
||||
return (mVersion >= MINIMUM_VERSION_FOR_SHARING_API);
|
||||
return (mShortVersion >= MINIMUM_VERSION_FOR_SHARING_API);
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user