diff --git a/library/build.gradle b/library/build.gradle index 852c2bf23..c6f8f1bd2 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -134,7 +134,7 @@ android { htmlOutput = layout.buildDirectory.file("reports/lint/lint.html").get().asFile htmlReport = true warningsAsErrors = true - targetSdk 36 + targetSdk 37 } defaultConfig { @@ -164,7 +164,7 @@ android { testOptions { unitTests.returnDefaultValues = true - targetSdk 36 + targetSdk 37 } packagingOptions { diff --git a/library/src/androidTest/AndroidManifest.xml b/library/src/androidTest/AndroidManifest.xml new file mode 100644 index 000000000..6ab602342 --- /dev/null +++ b/library/src/androidTest/AndroidManifest.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/library/src/androidTest/java/com/owncloud/android/AbstractIT.java b/library/src/androidTest/java/com/owncloud/android/AbstractIT.java index 59a163689..095820b1d 100644 --- a/library/src/androidTest/java/com/owncloud/android/AbstractIT.java +++ b/library/src/androidTest/java/com/owncloud/android/AbstractIT.java @@ -1,6 +1,7 @@ /* * Nextcloud Android Library * + * SPDX-FileCopyrightText: 2026 Alper Ozturk * SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH and Nextcloud contributors * SPDX-FileCopyrightText: 2018-2023 Tobias Kaminsky * SPDX-FileCopyrightText: 2025 TSI-mc @@ -13,8 +14,10 @@ import static org.junit.Assume.assumeFalse; import static org.junit.Assume.assumeTrue; +import android.Manifest; import android.content.Context; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import androidx.test.platform.app.InstrumentationRegistry; @@ -89,6 +92,7 @@ public static void beforeAll() throws InterruptedException, IOException { Bundle arguments = InstrumentationRegistry.getArguments(); context = InstrumentationRegistry.getInstrumentation().getTargetContext(); + grantLocalNetworkPermission(); url = Uri.parse(arguments.getString("TEST_SERVER_URL")); String loginName = arguments.getString("TEST_SERVER_USERNAME"); @@ -116,6 +120,16 @@ public static void beforeAll() throws InterruptedException, testConnection(); } + private static void grantLocalNetworkPermission() { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.CINNAMON_BUN) { + return; + } + + InstrumentationRegistry.getInstrumentation() + .getUiAutomation() + .grantRuntimePermission(context.getPackageName(), Manifest.permission.ACCESS_LOCAL_NETWORK); + } + private static void waitForServer(OwnCloudClient client, Uri baseUrl) { String statusUrl = baseUrl + "/status.php"; GetMethod get; diff --git a/sample_client/build.gradle b/sample_client/build.gradle index 70dbefbc1..ebb8168a8 100644 --- a/sample_client/build.gradle +++ b/sample_client/build.gradle @@ -38,7 +38,7 @@ android { defaultConfig { minSdkVersion 26 - targetSdkVersion 36 + targetSdkVersion 37 multiDexEnabled = true