From 094e698e95d5592f754e23dc491a6177f6000e13 Mon Sep 17 00:00:00 2001 From: davigonz Date: Wed, 18 Dec 2019 17:54:09 +0100 Subject: [PATCH 1/3] Include field to know servers lower than 10 --- .../owncloud/android/lib/resources/status/OwnCloudVersion.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/OwnCloudVersion.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/OwnCloudVersion.kt index dae5b91a..b7e9f2f6 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/OwnCloudVersion.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/OwnCloudVersion.kt @@ -79,6 +79,9 @@ class OwnCloudVersion(version: String) : Comparable, Parcelable val isPreemptiveAuthenticationPreferred: Boolean get() = mVersion < MINIMUM_VERSION_WITH_SESSION_MONITORING || mVersion >= MINIMUM_VERSION_WITH_SESSION_MONITORING_WORKING_IN_PREEMPTIVE_MODE + val isVersionLowerThan10: Boolean + get() = mVersion < VERSION_LOWER_THAN_10 + val isMultiplePublicSharingSupported: Boolean get() = mVersion >= MINIMUM_VERSION_WITH_MULTIPLE_PUBLIC_SHARING @@ -199,6 +202,8 @@ class OwnCloudVersion(version: String) : Comparable, Parcelable private const val MINIMUM_VERSION_WITH_SESSION_MONITORING_WORKING_IN_PREEMPTIVE_MODE = 0x09010301 // 9.1.3.1, final 9.1.3: https://github.com/owncloud/core/commit/f9a867b70c217463289a741d4d26079eb2a80dfd + private const val VERSION_LOWER_THAN_10 = 0xA000000 // 10.0.0 + private const val MINIMUM_VERSION_WITH_MULTIPLE_PUBLIC_SHARING = 0xA000000 // 10.0.0 private const val MINIMUN_MAJOR_VERSION_WITHOUT_PUBLIC_UPLOAD_PERMISSION = 0xA000000 // 10.0.0 From 169836683e3f62c9c5640941b01066ee1069cd8d Mon Sep 17 00:00:00 2001 From: davigonz Date: Wed, 18 Dec 2019 17:56:53 +0100 Subject: [PATCH 2/3] Update versionName and versionCode --- owncloudComLibrary/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/owncloudComLibrary/build.gradle b/owncloudComLibrary/build.gradle index 151d3926..a9a1825c 100644 --- a/owncloudComLibrary/build.gradle +++ b/owncloudComLibrary/build.gradle @@ -22,8 +22,8 @@ android { minSdkVersion 21 targetSdkVersion 28 - versionCode = 10000400 - versionName = "1.0.4" + versionCode = 10000401 + versionName = "1.0.4.1" } lintOptions { From 9a806469c5a0289494fbf8dae3491d632ae8c53e Mon Sep 17 00:00:00 2001 From: davigonz Date: Thu, 19 Dec 2019 09:10:38 +0100 Subject: [PATCH 3/3] Rename 10 version constant --- .../owncloud/android/lib/resources/status/OwnCloudVersion.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/OwnCloudVersion.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/OwnCloudVersion.kt index b7e9f2f6..e395e5ab 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/OwnCloudVersion.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/OwnCloudVersion.kt @@ -80,7 +80,7 @@ class OwnCloudVersion(version: String) : Comparable, Parcelable get() = mVersion < MINIMUM_VERSION_WITH_SESSION_MONITORING || mVersion >= MINIMUM_VERSION_WITH_SESSION_MONITORING_WORKING_IN_PREEMPTIVE_MODE val isVersionLowerThan10: Boolean - get() = mVersion < VERSION_LOWER_THAN_10 + get() = mVersion < VERSION_10 val isMultiplePublicSharingSupported: Boolean get() = mVersion >= MINIMUM_VERSION_WITH_MULTIPLE_PUBLIC_SHARING @@ -202,7 +202,7 @@ class OwnCloudVersion(version: String) : Comparable, Parcelable private const val MINIMUM_VERSION_WITH_SESSION_MONITORING_WORKING_IN_PREEMPTIVE_MODE = 0x09010301 // 9.1.3.1, final 9.1.3: https://github.com/owncloud/core/commit/f9a867b70c217463289a741d4d26079eb2a80dfd - private const val VERSION_LOWER_THAN_10 = 0xA000000 // 10.0.0 + private const val VERSION_10 = 0xA000000 // 10.0.0 private const val MINIMUM_VERSION_WITH_MULTIPLE_PUBLIC_SHARING = 0xA000000 // 10.0.0