From 8e43ea47ff462662a628ecd8ee0f1f086d6eea1f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 4 Feb 2026 08:05:35 +0000 Subject: [PATCH 1/2] chore(deps): update plugin com.diffplug.spotless to v8.2.1 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/verification-metadata.xml | 6 ++++++ library/build.gradle | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 84d0b57f4..66d381a37 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -192,6 +192,7 @@ + @@ -8080,6 +8081,11 @@ + + + + + diff --git a/library/build.gradle b/library/build.gradle index 0d73ab0bf..5ed0a3852 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -29,7 +29,7 @@ buildscript { } plugins { - id "com.diffplug.spotless" version "8.1.0" + id "com.diffplug.spotless" version "8.2.1" id 'org.jetbrains.kotlin.plugin.serialization' version '2.3.10' } From 0b5df3f344e5475c8354859ea03d7d2a0b49c4be Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 4 Feb 2026 08:05:35 +0000 Subject: [PATCH 2/2] chore(deps): update plugin com.diffplug.spotless to v8.2.1 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Signed-off-by: tobiasKaminsky --- gradle/verification-metadata.xml | 35 ++++++++++++++++--- .../shares/UpdateShareRemoteOperationIT.kt | 2 ++ .../clientintegration/ElementTypeAdapter.kt | 16 ++++++--- .../files/ToggleFileLockRemoteOperation.kt | 9 +++-- .../extensions/ArrayListExtensions.kt | 6 +++- .../android/lib/common/network/WebdavEntry.kt | 7 ++-- 6 files changed, 60 insertions(+), 15 deletions(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 66d381a37..347e41111 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -112,6 +112,7 @@ + @@ -8126,14 +8127,22 @@ - - - + + + - - + + + + + + + + + + @@ -8182,6 +8191,14 @@ + + + + + + + + @@ -8230,6 +8247,14 @@ + + + + + + + + diff --git a/library/src/androidTest/java/com/owncloud/android/lib/resources/shares/UpdateShareRemoteOperationIT.kt b/library/src/androidTest/java/com/owncloud/android/lib/resources/shares/UpdateShareRemoteOperationIT.kt index eeb4228ca..f5c3c0d76 100644 --- a/library/src/androidTest/java/com/owncloud/android/lib/resources/shares/UpdateShareRemoteOperationIT.kt +++ b/library/src/androidTest/java/com/owncloud/android/lib/resources/shares/UpdateShareRemoteOperationIT.kt @@ -197,9 +197,11 @@ class UpdateShareRemoteOperationIT : AbstractIT() { result.message ) } + capability.version.isNewerOrEqual(NextcloudVersion.nextcloud_21) -> { assertEquals("Password needs to be at least 8 characters long.", result.message) } + else -> { assertEquals("Password needs to be at least 8 characters long", result.message) } diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/ElementTypeAdapter.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/ElementTypeAdapter.kt index 222ef6413..f7744eea0 100644 --- a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/ElementTypeAdapter.kt +++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/ElementTypeAdapter.kt @@ -45,19 +45,25 @@ class ElementTypeAdapter : val prefix = "com.nextcloud.android.lib.resources.clientintegration" val cls: Class = when (typeName) { - "Button" -> + "Button" -> { Class.forName("$prefix.LayoutButton") as Class + } - "Text" -> + "Text" -> { Class.forName("$prefix.LayoutText") as Class + } - "Image" -> + "Image" -> { Class.forName("$prefix.LayoutImage") as Class + } - "URL" -> + "URL" -> { Class.forName("$prefix.LayoutURL") as Class + } - else -> return null + else -> { + return null + } } return Gson().fromJson(json, cls) diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/files/ToggleFileLockRemoteOperation.kt b/library/src/main/java/com/nextcloud/android/lib/resources/files/ToggleFileLockRemoteOperation.kt index b4d5473e4..fbaea2f60 100644 --- a/library/src/main/java/com/nextcloud/android/lib/resources/files/ToggleFileLockRemoteOperation.kt +++ b/library/src/main/java/com/nextcloud/android/lib/resources/files/ToggleFileLockRemoteOperation.kt @@ -60,8 +60,13 @@ class ToggleFileLockRemoteOperation( private fun isSuccess(status: Int): Boolean = when (status) { HttpStatus.SC_OK -> true - HttpStatus.SC_LOCKED -> toLock // treat "already locked" as success when trying to lock - HttpStatus.SC_PRECONDITION_FAILED -> !toLock // used for "already unlocked" when trying to unlock + + HttpStatus.SC_LOCKED -> toLock + + // treat "already locked" as success when trying to lock + HttpStatus.SC_PRECONDITION_FAILED -> !toLock + + // used for "already unlocked" when trying to unlock else -> false } diff --git a/library/src/main/java/com/nextcloud/extensions/ArrayListExtensions.kt b/library/src/main/java/com/nextcloud/extensions/ArrayListExtensions.kt index 3e53e9b15..53c2304cb 100644 --- a/library/src/main/java/com/nextcloud/extensions/ArrayListExtensions.kt +++ b/library/src/main/java/com/nextcloud/extensions/ArrayListExtensions.kt @@ -20,10 +20,14 @@ inline fun ArrayList<*>.processXmlData(tagName: String): T? { Float::class -> { textContent.toFloatOrNull() as? T } + Double::class -> { textContent.toDoubleOrNull() as? T } - else -> textContent as? T + + else -> { + textContent as? T + } } } } diff --git a/library/src/main/java/com/owncloud/android/lib/common/network/WebdavEntry.kt b/library/src/main/java/com/owncloud/android/lib/common/network/WebdavEntry.kt index 23edd9891..79d04d505 100644 --- a/library/src/main/java/com/owncloud/android/lib/common/network/WebdavEntry.kt +++ b/library/src/main/java/com/owncloud/android/lib/common/network/WebdavEntry.kt @@ -393,11 +393,12 @@ class WebdavEntry constructor( if (prop?.value != null) { tags = when (prop.value) { - is ArrayList<*> -> + is ArrayList<*> -> { (prop.value as ArrayList<*>) .filterIsInstance() .map { parseTag(it) } .toTypedArray() + } is Element -> { val element = (prop.value as Element) @@ -405,7 +406,9 @@ class WebdavEntry constructor( arrayOf(tag) } - else -> emptyArray() + else -> { + emptyArray() + } } }