Skip to content

chore(sdk): min version 26 #2047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alperozturk96 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

chore(sdk): min version 26 #2047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
673f0e0
chore(sdk): min version 26
alperozturk96 Jun 16, 2026
4245da0
chore(sdk): min version 26
alperozturk96 Jun 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion library/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ android {
}

defaultConfig {
minSdkVersion 23
minSdkVersion 26

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunnerArgument "TEST_SERVER_URL", "${NC_TEST_SERVER_BASEURL}"
Expand Down
30 changes: 12 additions & 18 deletions .../androidTest/java/com/owncloud/android/lib/resources/files/UploadFileRemoteOperationIT.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
*/
package com.owncloud.android.lib.resources.files

import android.os.Build
import com.owncloud.android.AbstractIT
import com.owncloud.android.lib.common.utils.Log_OC
import com.owncloud.android.lib.resources.files.model.RemoteFile
Expand Down Expand Up @@ -80,24 +79,19 @@ class UploadFileRemoteOperationIT : AbstractIT() {
)
}

private fun getCreationTimestamp(file: File): Long? {
return if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
return null
} else {
try {
Files
.readAttributes(file.toPath(), BasicFileAttributes::class.java)
.creationTime()
.to(TimeUnit.SECONDS)
} catch (e: IOException) {
Log_OC.e(
UploadFileRemoteOperation::class.java.simpleName,
"Failed to read creation timestamp for file: " + file.name
)
null
}
private fun getCreationTimestamp(file: File): Long? =
try {
Files
.readAttributes(file.toPath(), BasicFileAttributes::class.java)
.creationTime()
.to(TimeUnit.SECONDS)
} catch (e: IOException) {
Log_OC.e(
UploadFileRemoteOperation::class.java.simpleName,
"Failed to read creation timestamp for file: " + file.name
)
null
}
}

companion object {
const val TIME_OFFSET = 10
Expand Down
18 changes: 6 additions & 12 deletions library/src/main/java/com/nextcloud/common/DNSCache.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
*/
package com.nextcloud.common

import android.os.Build
import androidx.annotation.VisibleForTesting
import com.nextcloud.android.lib.core.Clock
import com.nextcloud.android.lib.core.ClockImpl
Expand Down Expand Up @@ -76,17 +75,12 @@ object DNSCache {
hostname: String,
preferIPV4: Boolean
) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
cache.compute(hostname) { _, old ->
val addresses =
old?.addresses?.let {
sortAddresses(it, preferIPV4)
} ?: emptyList()
DNSInfo(addresses, preferIPV4)
}
} else {
val addresses = cache[hostname]?.addresses?.let { sortAddresses(it, preferIPV4) } ?: emptyList()
cache[hostname] = DNSInfo(addresses, preferIPV4)
cache.compute(hostname) { _, old ->
val addresses =
old?.addresses?.let {
sortAddresses(it, preferIPV4)
} ?: emptyList()
DNSInfo(addresses, preferIPV4)
}
}

Expand Down
14 changes: 6 additions & 8 deletions library/src/main/java/com/owncloud/android/lib/common/network/AdvancedSslSocketFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,12 @@ public Socket createSocket(String host, int port, InetAddress clientHost, int cl

/*
private void logSslInfo() {
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.FROYO) {
Log_OC.v(TAG, "SUPPORTED SSL PARAMETERS");
logSslParameters(mSslContext.getSupportedSSLParameters());
Log_OC.v(TAG, "DEFAULT SSL PARAMETERS");
logSslParameters(mSslContext.getDefaultSSLParameters());
Log_OC.i(TAG, "CURRENT PARAMETERS");
Log_OC.i(TAG, "Protocol: " + mSslContext.getProtocol());
}
Log_OC.v(TAG, "SUPPORTED SSL PARAMETERS");
logSslParameters(mSslContext.getSupportedSSLParameters());
Log_OC.v(TAG, "DEFAULT SSL PARAMETERS");
logSslParameters(mSslContext.getDefaultSSLParameters());
Log_OC.i(TAG, "CURRENT PARAMETERS");
Log_OC.i(TAG, "Protocol: " + mSslContext.getProtocol());
Log_OC.i(TAG, "PROVIDER");
logSecurityProvider(mSslContext.getProvider());
}
Expand Down
13 changes: 5 additions & 8 deletions library/src/main/java/com/owncloud/android/lib/common/network/AdvancedX509KeyManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import android.content.Intent;
import android.content.SharedPreferences;
import android.net.Uri;
import android.os.Build;
import android.security.KeyChain;
import android.security.KeyChainException;
import android.util.SparseArray;
Expand Down Expand Up @@ -514,13 +513,11 @@ private void startActivityNotification(@NonNull Intent intent, int decisionId, @
flags |= PendingIntent.FLAG_IMMUTABLE;
final PendingIntent call = PendingIntent.getActivity(context, 0, intent, flags);
NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
NotificationChannel channel = new NotificationChannel(
NOTIFICATION_CHANNEL_ID,
context.getString(R.string.notification_channel_name),
NotificationManager.IMPORTANCE_DEFAULT);
notificationManager.createNotificationChannel(channel);
}
NotificationChannel channel = new NotificationChannel(
NOTIFICATION_CHANNEL_ID,
context.getString(R.string.notification_channel_name),
NotificationManager.IMPORTANCE_DEFAULT);
notificationManager.createNotificationChannel(channel);
final Notification notification = new NotificationCompat
.Builder(context, NOTIFICATION_CHANNEL_ID)
.setContentTitle(context.getString(R.string.notification_title_select_client_cert))
Expand Down
10 changes: 3 additions & 7 deletions ...ary/src/main/java/com/owncloud/android/lib/resources/assistant/chat/model/Conversation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@

package com.owncloud.android.lib.resources.assistant.chat.model

import android.os.Build
import androidx.annotation.RequiresApi
import com.google.gson.annotations.SerializedName
import java.time.ZoneId
import java.time.format.DateTimeFormatter
Expand All @@ -34,9 +32,8 @@ data class Conversation(
}

@OptIn(ExperimentalTime::class)
@RequiresApi(Build.VERSION_CODES.O)
fun titleRepresentation(): String {
return if (title != null) {
fun titleRepresentation(): String =
if (title != null) {
title
} else {
val instant = Instant.fromEpochSeconds(timestamp)
Expand All @@ -47,7 +44,6 @@ data class Conversation(
.ofPattern(TITLE_PRESENTATION_TIME_PATTERN, Locale.getDefault())
.withZone(deviceZone)

return formatter.format(instant.toJavaInstant())
formatter.format(instant.toJavaInstant())
}
}
}
3 changes: 0 additions & 3 deletions ...ary/src/main/java/com/owncloud/android/lib/resources/files/DownloadFileRemoteOperation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
*/
package com.owncloud.android.lib.resources.files

import android.os.Build
import androidx.annotation.RequiresApi
import com.nextcloud.common.NextcloudClient
import com.nextcloud.common.SessionTimeOut
import com.nextcloud.common.defaultSessionTimeOut
Expand All @@ -28,7 +26,6 @@ import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.atomic.AtomicBoolean

@Suppress("NestedBlockDepth", "TooGenericExceptionCaught", "ThrowsCount")
@RequiresApi(Build.VERSION_CODES.O)
class DownloadFileRemoteOperation
@JvmOverloads
constructor(
Expand Down
2 changes: 1 addition & 1 deletion sample_client/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ android {
}

defaultConfig {
minSdkVersion 23
minSdkVersion 26
targetSdkVersion 36

multiDexEnabled = true
Expand Down
7 changes: 1 addition & 6 deletions sample_client/src/main/java/com/owncloud/android/lib/sampleclient/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
import android.widget.TextView;
import android.widget.Toast;

import androidx.annotation.RequiresApi;

import com.owncloud.android.lib.common.OwnCloudClient;
import com.owncloud.android.lib.common.OwnCloudClientFactory;
import com.owncloud.android.lib.common.OwnCloudCredentialsFactory;
Expand Down Expand Up @@ -129,9 +127,7 @@ public void onClickHandler(View button) {
startRemoteDeletion();
break;
case R.id.button_download:
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
startDownload();
}
startDownload();
break;
case R.id.button_delete_local:
startLocalDeletion();
Expand Down Expand Up @@ -174,7 +170,6 @@ private void startRemoteDeletion() {
removeOperation.execute(mClient, this, mHandler);
}

@RequiresApi(api = Build.VERSION_CODES.O)
private void startDownload() {
File downFolder = new File(getCacheDir(), getString(R.string.download_folder_path));
downFolder.mkdir();
Expand Down
Loading