Browse Source

Merge pull request #9141 from nextcloud/bump-outdated-server-version

Bump versions before RC
Tobias Kaminsky 3 years ago
parent
commit
6176998a0e

+ 1 - 1
build.gradle

@@ -120,7 +120,7 @@ android {
     compileSdkVersion 29
 
     defaultConfig {
-        minSdkVersion 22
+        minSdkVersion 23
         targetSdkVersion 29
 
         // arguments to be passed to functional tests

+ 0 - 22
src/main/AndroidManifest.xml

@@ -21,33 +21,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.owncloud.android">
 
-    <!-- GET_ACCOUNTS is needed for API <= 22.
-        For API >= 23 results in the addition of CONTACTS group to the list of permissions that may be
-        dynamically disabled or enabled by the user after installation; but it is not important,
-        since GET_ACCOUNTS is an special case, the permission is not really needed to access accounts
-        owned by the app, our use case.
-        See note in http://developer.android.com/intl/es/reference/android/Manifest.permission.html#GET_ACCOUNTS -->
-    <uses-permission
-        android:name="android.permission.GET_ACCOUNTS"
-        android:maxSdkVersion="22" />
-
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.WRITE_CONTACTS" />
     <uses-permission android:name="android.permission.READ_CALENDAR" />
     <uses-permission android:name="android.permission.WRITE_CALENDAR" />
 
-    <!-- USE_CREDENTIALS, MANAGE_ACCOUNTS and AUTHENTICATE_ACCOUNTS are needed for API <= 22.
-        In API >= 23 they do not exist anymore -->
-    <uses-permission
-        android:name="android.permission.USE_CREDENTIALS"
-        android:maxSdkVersion="22" />
-    <uses-permission
-        android:name="android.permission.MANAGE_ACCOUNTS"
-        android:maxSdkVersion="22" />
-    <uses-permission
-        android:name="android.permission.AUTHENTICATE_ACCOUNTS"
-        android:maxSdkVersion="22" />
-
     <!-- WRITE_EXTERNAL_STORAGE may be enabled or disabled by the user after installation in
         API >= 23; the app needs to handle this -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

+ 1 - 1
src/main/java/com/owncloud/android/MainApp.java

@@ -120,7 +120,7 @@ import static com.owncloud.android.ui.activity.ContactsPreferenceActivity.PREFER
  */
 public class MainApp extends MultiDexApplication implements HasAndroidInjector {
 
-    public static final OwnCloudVersion OUTDATED_SERVER_VERSION = OwnCloudVersion.nextcloud_18;
+    public static final OwnCloudVersion OUTDATED_SERVER_VERSION = OwnCloudVersion.nextcloud_19;
     public static final OwnCloudVersion MINIMUM_SUPPORTED_SERVER_VERSION = OwnCloudVersion.nextcloud_16;
 
     private static final String TAG = MainApp.class.getSimpleName();

+ 2 - 2
src/test/java/com/nextcloud/client/device/TestPowerManagementService.kt

@@ -82,9 +82,9 @@ class TestPowerManagementService {
         @Test
         fun `power saving queries power manager on API 21+`() {
             // GIVEN
-            //      API level >= 22 (since 22+ is supported)
+            //      API level >= 21
             //      power save mode is on
-            whenever(deviceInfo.apiLevel).thenReturn(Build.VERSION_CODES.LOLLIPOP_MR1)
+            whenever(deviceInfo.apiLevel).thenReturn(Build.VERSION_CODES.Q)
             whenever(platformPowerManager.isPowerSaveMode).thenReturn(true)
 
             // WHEN