Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
41 changes: 36 additions & 5 deletions gradle/verification-metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@
<trusted-key id="4797B4F5DCC46CEA61059071A1AE06236CA2BA62" group="^com[.]diffplug($|([.].*))" regex="true"/>
<trusted-key id="47EB6836245D2D40E89DFB4136D4E9618F3ADAB5">
<trusting group="io.github.oshai" name="kotlin-logging-jvm" version="5.1.4"/>
<trusting group="io.github.oshai" name="kotlin-logging-jvm" version="7.0.13"/>
<trusting group="io.github.oshai" name="kotlin-logging-jvm" version="7.0.3"/>
<trusting group="io.github.oshai" name="kotlin-logging-jvm" version="7.0.7"/>
</trusted-key>
Expand Down Expand Up @@ -192,6 +193,7 @@
<trusting group="org.eclipse.platform" name="org.eclipse.osgi" version="3.23.0"/>
<trusting group="org.eclipse.platform" name="org.eclipse.osgi" version="3.23.100"/>
<trusting group="org.eclipse.platform" name="org.eclipse.osgi" version="3.23.200"/>
<trusting group="org.eclipse.platform" name="org.eclipse.osgi" version="3.24.0"/>
</trusted-key>
<trusted-key id="A31DDE881C3E3C4C985BD0D02C7F998F4272C851" group="com.diffplug.spotless"/>
<trusted-key id="A413F67D71BEEC23ADD0CE0ACB43338E060CF9FA">
Expand Down Expand Up @@ -8080,6 +8082,11 @@
<sha256 value="58b0b4ed49b3b19072b55c7111c0991a07f9b6d20709af8aa470c714114afbfb" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.diffplug.spotless" name="com.diffplug.spotless.gradle.plugin" version="8.2.1">
<artifact name="com.diffplug.spotless.gradle.plugin-8.2.1.pom">
<sha256 value="306b777dc39f44fec62b50bdefe41b716beb0fd7cd3f81572273a134c2e155b9" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.diffplug.spotless" name="spotless-lib" version="3.0.2">
<artifact name="spotless-lib-3.0.2.jar">
<sha256 value="3f9a7fdfc5b03ac20894834170910c15c4f2b84ed4ce3677898a307ad589837c" origin="Generated by Gradle"/>
Expand Down Expand Up @@ -8120,14 +8127,22 @@
<sha256 value="a4daac7a7bb8d826a807ce6277274ca461945aa29787d771e5392416593e2741" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.diffplug.spotless" name="spotless-lib" version="4.1.0">
<artifact name="spotless-lib-4.1.0.jar">
<sha256 value="d9d5e5ce724a4071c3b6d96433744f3b69a27c66e0f2d7ed372b7a1df612c0a1" origin="Generated by Gradle"/>
<component group="com.diffplug.spotless" name="spotless-lib" version="4.3.0">
<artifact name="spotless-lib-4.3.0.jar">
<sha256 value="669f844ec0a974941c6da04b670748f43178239b6d99fddb5b062ce9d06d0939" origin="Generated by Gradle"/>
</artifact>
<artifact name="spotless-lib-4.1.0.module">
<sha256 value="4cb73d4d7bcd8c7b6bbf308f729d4cb79cccdcc6d7d37cc9379ac988707e1ad3" origin="Generated by Gradle"/>
<artifact name="spotless-lib-4.3.0.module">
<sha256 value="2351c080fe2455334602ffd0a821d88adf62a53e6ea184c4395f4f5505de3723" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.diffplug.spotless" name="spotless-lib" version="4.1.0">
<artifact name="spotless-lib-4.1.0.jar">
<sha256 value="d9d5e5ce724a4071c3b6d96433744f3b69a27c66e0f2d7ed372b7a1df612c0a1" origin="Generated by Gradle"/>
</artifact>
<artifact name="spotless-lib-4.1.0.module">
<sha256 value="4cb73d4d7bcd8c7b6bbf308f729d4cb79cccdcc6d7d37cc9379ac988707e1ad3" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.diffplug.spotless" name="spotless-lib-extra" version="3.0.2">
<artifact name="spotless-lib-extra-3.0.2.jar">
<sha256 value="b0e77746d633d445e78489ac3d08ad2ea1b3537c4d064e4abe46cc42d62303eb" origin="Generated by Gradle"/>
Expand Down Expand Up @@ -8176,6 +8191,14 @@
<sha256 value="67b0257f31b9e1d5dd9a4169229f9997a99c72c1f940cfa8e53c072bb8ebccfd" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.diffplug.spotless" name="spotless-lib-extra" version="4.3.0">
<artifact name="spotless-lib-extra-4.3.0.jar">
<sha256 value="754f804c09dfa2eb8d53963311d2be68f1b4a5621011dcb550d702ead28651d9" origin="Generated by Gradle"/>
</artifact>
<artifact name="spotless-lib-extra-4.3.0.module">
<sha256 value="c8898905e692a7e08701357c3cad0d4fe26aa208cd7ab0ded8d70d3929cba112" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.diffplug.spotless" name="spotless-plugin-gradle" version="7.0.2">
<artifact name="spotless-plugin-gradle-7.0.2.jar">
<sha256 value="59a34c4f84a48d4c8d929e2f89906369e65476ec0499a43de87c3e4127977cd5" origin="Generated by Gradle"/>
Expand Down Expand Up @@ -8224,6 +8247,14 @@
<sha256 value="892bfb7c1e1af32ae3b458fda95389f564186b2d4ccd62097046fc690cd49a68" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.diffplug.spotless" name="spotless-plugin-gradle" version="8.2.1">
<artifact name="spotless-plugin-gradle-8.2.1.jar">
<sha256 value="dbf44f8df1832800241d4f135129fc921ba82fb22d72430cc42d4d3d5bbf9d3c" origin="Generated by Gradle"/>
</artifact>
<artifact name="spotless-plugin-gradle-8.2.1.module">
<sha256 value="38f6f6f24dd05a626c91cc163af4d3867abd50f086767aa64da25f320fa2939b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml" name="oss-parent" version="56">
<artifact name="oss-parent-56.pom">
<sha256 value="fd491f78857424106d2e3d605bcd799b53d31a565cdc868463ca7e875db45a50" origin="Generated by Gradle"/>
Expand Down
2 changes: 1 addition & 1 deletion library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,25 @@ class ElementTypeAdapter :
val prefix = "com.nextcloud.android.lib.resources.clientintegration"
val cls: Class<out Element> =
when (typeName) {
"Button" ->
"Button" -> {
Class.forName("$prefix.LayoutButton") as Class<out Element>
}

"Text" ->
"Text" -> {
Class.forName("$prefix.LayoutText") as Class<out Element>
}

"Image" ->
"Image" -> {
Class.forName("$prefix.LayoutImage") as Class<out Element>
}

"URL" ->
"URL" -> {
Class.forName("$prefix.LayoutURL") as Class<out Element>
}

else -> return null
else -> {
return null
}
}

return Gson().fromJson(json, cls)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,14 @@ inline fun <reified T> 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
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -393,19 +393,22 @@ class WebdavEntry constructor(
if (prop?.value != null) {
tags =
when (prop.value) {
is ArrayList<*> ->
is ArrayList<*> -> {
(prop.value as ArrayList<*>)
.filterIsInstance<Element>()
.map { parseTag(it) }
.toTypedArray()
}

is Element -> {
val element = (prop.value as Element)
val tag = parseTag(element)
arrayOf(tag)
}

else -> emptyArray()
else -> {
emptyArray()
}
}
}

Expand Down
Loading