Jelajahi Sumber

Use sameMajorVersion of OwnCloudVersion

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
tobiasKaminsky 5 tahun lalu
induk
melakukan
883dc6925d

+ 1 - 1
build.gradle

@@ -56,7 +56,7 @@ configurations {
 
 
 ext {
 ext {
     jacocoVersion = "0.8.2"
     jacocoVersion = "0.8.2"
-    androidLibraryVersion = "master-SNAPSHOT"
+    androidLibraryVersion = "sameMajor-SNAPSHOT"
 
 
     travisBuild = System.getenv("TRAVIS") == "true"
     travisBuild = System.getenv("TRAVIS") == "true"
 
 

+ 1 - 1
src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -1255,7 +1255,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 
 
             // show outdated warning
             // show outdated warning
             if (getResources().getBoolean(R.bool.show_outdated_server_warning) &&
             if (getResources().getBoolean(R.bool.show_outdated_server_warning) &&
-                MainApp.OUTDATED_SERVER_VERSION.compareTo(mServerInfo.mVersion) >= 0 &&
+                MainApp.OUTDATED_SERVER_VERSION.isSameMajorVersion(mServerInfo.mVersion) &&
                 !mServerInfo.hasExtendedSupport) {
                 !mServerInfo.hasExtendedSupport) {
                 DisplayUtils.showServerOutdatedSnackbar(this, Snackbar.LENGTH_INDEFINITE);
                 DisplayUtils.showServerOutdatedSnackbar(this, Snackbar.LENGTH_INDEFINITE);
             }
             }

+ 1 - 2
src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -27,7 +27,6 @@ package com.owncloud.android.ui.activity;
 
 
 import android.Manifest;
 import android.Manifest;
 import android.accounts.Account;
 import android.accounts.Account;
-import android.accounts.AccountManager;
 import android.accounts.AuthenticatorException;
 import android.accounts.AuthenticatorException;
 import android.annotation.TargetApi;
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.Activity;
@@ -378,7 +377,7 @@ public class FileDisplayActivity extends FileActivity
 
 
             // show outdated warning
             // show outdated warning
             if (getResources().getBoolean(R.bool.show_outdated_server_warning) &&
             if (getResources().getBoolean(R.bool.show_outdated_server_warning) &&
-                MainApp.OUTDATED_SERVER_VERSION.compareTo(serverVersion) >= 0 &&
+                MainApp.OUTDATED_SERVER_VERSION.isSameMajorVersion(serverVersion) &&
                 getCapabilities().getExtendedSupport().isFalse()) {
                 getCapabilities().getExtendedSupport().isFalse()) {
                 DisplayUtils.showServerOutdatedSnackbar(this, Snackbar.LENGTH_LONG);
                 DisplayUtils.showServerOutdatedSnackbar(this, Snackbar.LENGTH_LONG);
             }
             }