diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 84d0b57f4d..347e41111d 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -112,6 +112,7 @@
+
@@ -192,6 +193,7 @@
+
@@ -8080,6 +8082,11 @@
+
+
+
+
+
@@ -8120,14 +8127,22 @@
-
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
@@ -8176,6 +8191,14 @@
+
+
+
+
+
+
+
+
@@ -8224,6 +8247,14 @@
+
+
+
+
+
+
+
+
diff --git a/library/build.gradle b/library/build.gradle
index 0d73ab0bfd..5ed0a38527 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'
}
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 eeb4228cab..f5c3c0d768 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 222ef64132..f7744eea0f 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 b4d5473e4f..fbaea2f603 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 3e53e9b152..53c2304cb6 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 23edd98917..79d04d505b 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()
+ }
}
}