mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-22 21:25:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Bump versions before RC
This commit is contained in:
Tobias Kaminsky 2021-10-25 16:13:56 +02:00 committed by GitHub
commit 6176998a0e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

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

22
src/main/AndroidManifest.xml
View file

@ -21,33 +21,11 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="com.owncloud.android"> 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.READ_CONTACTS" />
<uses-permission android:name="android.permission.WRITE_CONTACTS" /> <uses-permission android:name="android.permission.WRITE_CONTACTS" />
<uses-permission android:name="android.permission.READ_CALENDAR" /> <uses-permission android:name="android.permission.READ_CALENDAR" />
<uses-permission android:name="android.permission.WRITE_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 <!-- WRITE_EXTERNAL_STORAGE may be enabled or disabled by the user after installation in
API >= 23; the app needs to handle this --> API >= 23; the app needs to handle this -->
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

2
src/main/java/com/owncloud/android/MainApp.java
View file

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

4
src/test/java/com/nextcloud/client/device/TestPowerManagementService.kt
View file

@ -82,9 +82,9 @@ class TestPowerManagementService {
@Test @Test
fun `power saving queries power manager on API 21+`() { fun `power saving queries power manager on API 21+`() {
// GIVEN // GIVEN
// API level >= 22 (since 22+ is supported) // API level >= 21
// power save mode is on // 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) whenever(platformPowerManager.isPowerSaveMode).thenReturn(true)
// WHEN // WHEN