From d01ccc344a6c59b1f7af4fe45d577344b9ecfdee Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Wed, 23 Jul 2025 08:26:11 +0200 Subject: [PATCH] MinSDK 21 Signed-off-by: tobiasKaminsky --- README.md | 2 +- library/build.gradle | 2 +- .../android/lib/common/network/AdvancedX509KeyManager.java | 2 -- .../android/lib/common/operations/RemoteOperationResult.java | 3 +-- sample_client/build.gradle | 2 +- 5 files changed, 4 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 13c6f8fc9c..49d3d80e51 100644 --- a/README.md +++ b/README.md @@ -116,7 +116,7 @@ Licensed under Apache License, Version 2.0. ## Compatibility -Nextcloud Android library is valid for Android version 3.0 and up (with ```android:minSdkVersion="11"``` and ```android:targetSdkVersion="24"```). +Nextcloud Android library is valid for Android version 5.0 and up (with ```android:minSdkVersion="21"``` and ```android:targetSdkVersion="35"```). Nextcloud Android library supports Nextcloud server from version 9+. diff --git a/library/build.gradle b/library/build.gradle index 787e892ffe..c0c82adf1f 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -138,7 +138,7 @@ android { } defaultConfig { - minSdkVersion 19 + minSdkVersion 21 targetSdkVersion 35 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/library/src/main/java/com/owncloud/android/lib/common/network/AdvancedX509KeyManager.java b/library/src/main/java/com/owncloud/android/lib/common/network/AdvancedX509KeyManager.java index f204ed1954..5d00461503 100644 --- a/library/src/main/java/com/owncloud/android/lib/common/network/AdvancedX509KeyManager.java +++ b/library/src/main/java/com/owncloud/android/lib/common/network/AdvancedX509KeyManager.java @@ -26,7 +26,6 @@ import android.webkit.ClientCertRequest; import androidx.annotation.NonNull; -import androidx.annotation.RequiresApi; import androidx.core.app.ActivityCompat; import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationManagerCompat; @@ -455,7 +454,6 @@ public PrivateKey getPrivateKey(@NonNull String alias) { } @SuppressWarnings("unused") - @RequiresApi(21) public void handleWebViewClientCertRequest(@NonNull final ClientCertRequest request) { Log_OC.d(TAG, "handleWebViewClientCertRequest(keyTypes=" + Arrays.toString(request.getKeyTypes()) + ", issuers=" + Arrays.toString(request.getPrincipals()) + ", hostname=" + request.getHost() + diff --git a/library/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperationResult.java b/library/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperationResult.java index 0441e588b8..ff6cd3a102 100644 --- a/library/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperationResult.java +++ b/library/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperationResult.java @@ -19,7 +19,6 @@ import android.accounts.Account; import android.accounts.AccountsException; import android.content.Context; -import android.os.Build; import android.system.ErrnoException; import android.system.OsConstants; @@ -271,7 +270,7 @@ public RemoteOperationResult(Exception e) { if (e instanceof OperationCancelledException) { mCode = ResultCode.CANCELLED; - } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && e instanceof ErrnoException && ((ErrnoException) e).errno == OsConstants.ENOTCONN) { + } else if (e instanceof ErrnoException && ((ErrnoException) e).errno == OsConstants.ENOTCONN) { mCode = ResultCode.NO_NETWORK_CONNECTION; } else if (e instanceof ConnectException) { mCode = ResultCode.HOST_NOT_AVAILABLE; diff --git a/sample_client/build.gradle b/sample_client/build.gradle index b6d6b5373f..41a1c50162 100644 --- a/sample_client/build.gradle +++ b/sample_client/build.gradle @@ -41,7 +41,7 @@ android { } defaultConfig { - minSdkVersion 19 + minSdkVersion 21 targetSdkVersion 35 multiDexEnabled true