Merge pull request #387 from nextcloud/140rc2

140rc2

Author: AndyScherzinger

AndroidManifest.xml

@@ -20,8 +20,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.owncloud.android"
-    android:versionCode="10040001"
-    android:versionName="1.4.0 RC1">
+    android:versionCode="10040002"
+    android:versionName="1.4.0 RC2">
 
     <uses-sdk
         android:minSdkVersion="14"

src/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -243,12 +243,12 @@ public void onClick(View v) {
     }
 
     /**
-     * For Android 5+.
+     * For Android 7+.
      * Opens a pop up info for the new instant upload and disabled the old instant upload.
      */
     private void upgradeNotificationForInstantUpload() {
-        // check for Android 5+ if legacy instant upload is activated --> disable + show info
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP &&
+        // check for Android 7+ if legacy instant upload is activated --> disable + show info
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N &&
                 (PreferenceManager.instantPictureUploadEnabled(this) ||
                         PreferenceManager.instantPictureUploadEnabled(this))) {
 

src/com/owncloud/android/ui/activity/Preferences.java

@@ -368,8 +368,8 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
 
         mPrefInstantUploadCategory = (PreferenceCategory) findPreference("instant_uploading_category");
 
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-            // Instant upload via preferences on pre Android Lollipop
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+            // Instant upload via preferences on pre Android Nougat
             mPrefInstantUploadPath = findPreference("instant_upload_path");
             if (mPrefInstantUploadPath != null) {