From a440aaffbd5bf2d17497743b5c8242798240bab2 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 2 Jul 2025 10:40:57 +0200
Subject: [PATCH 1/9] Client integration

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .idea/codeStyles/Project.xml                  |  35 ++++++
 .../java/com/owncloud/android/AbstractIT.java |   4 +-
 .../GetCapabilitiesRemoteOperationIT.java     |  14 +++
 .../lib/resources/clientintegration/App.kt    |  19 ++++
 .../lib/resources/clientintegration/Button.kt |  19 ++++
 .../clientintegration/ClientIntegrationUI.kt  |  18 +++
 .../resources/clientintegration/Element.kt    |  12 ++
 .../clientintegration/ElementTypeAdapter.kt   |  71 ++++++++++++
 .../resources/clientintegration/Endpoint.kt   |  25 +++++
 .../GetClientIntegrationJsonOperation.kt      |  81 +++++++++++++
 .../lib/resources/clientintegration/Image.kt  |  18 +++
 .../lib/resources/clientintegration/Layout.kt |  19 ++++
 .../clientintegration/Orientation.kt          |  19 ++++
 .../lib/resources/clientintegration/Row.kt    |  16 +++
 .../lib/resources/clientintegration/Text.kt   |  18 +++
 .../clientintegration/TooltipResponse.kt      |  13 +++
 .../lib/resources/clientintegration/URL.kt    |  19 ++++
 .../GetCapabilitiesRemoteOperation.java       |   8 ++
 .../android/lib/resources/status/Method.kt    |  15 +++
 .../lib/resources/status/OCCapability.kt      |  54 +++++++++
 .../android/lib/resources/status/Type.kt      |  21 ++++
 .../GetClientIntegrationJsonOperationTest.kt  |  92 +++++++++++++++
 .../lib/resources/status/OCCapabilityTest.kt  | 106 ++++++++++++++++++
 23 files changed, 714 insertions(+), 2 deletions(-)
 create mode 100644 library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/App.kt
 create mode 100644 library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Button.kt
 create mode 100644 library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/ClientIntegrationUI.kt
 create mode 100644 library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Element.kt
 create mode 100644 library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/ElementTypeAdapter.kt
 create mode 100644 library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Endpoint.kt
 create mode 100644 library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/GetClientIntegrationJsonOperation.kt
 create mode 100644 library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Image.kt
 create mode 100644 library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Layout.kt
 create mode 100644 library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Orientation.kt
 create mode 100644 library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Row.kt
 create mode 100644 library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Text.kt
 create mode 100644 library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/TooltipResponse.kt
 create mode 100644 library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/URL.kt
 create mode 100644 library/src/main/java/com/owncloud/android/lib/resources/status/Method.kt
 create mode 100644 library/src/main/java/com/owncloud/android/lib/resources/status/Type.kt
 create mode 100644 library/src/test/java/com/owncloud/android/lib/resources/clientintegration/GetClientIntegrationJsonOperationTest.kt

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index f9fc0166c8..59e7e7d1ef 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,5 +1,40 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <JavaCodeStyleSettings>
+      <option name="IMPORT_LAYOUT_TABLE">
+        <value>
+          <package name="" withSubpackages="true" static="false" module="true" />
+          <package name="android" withSubpackages="true" static="true" />
+          <package name="androidx" withSubpackages="true" static="true" />
+          <package name="com" withSubpackages="true" static="true" />
+          <package name="junit" withSubpackages="true" static="true" />
+          <package name="net" withSubpackages="true" static="true" />
+          <package name="org" withSubpackages="true" static="true" />
+          <package name="java" withSubpackages="true" static="true" />
+          <package name="javax" withSubpackages="true" static="true" />
+          <package name="" withSubpackages="true" static="true" />
+          <emptyLine />
+          <package name="android" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="androidx" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="com" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="junit" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="net" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="org" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="java" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="javax" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="" withSubpackages="true" static="false" />
+          <emptyLine />
+        </value>
+      </option>
+    </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
diff --git a/library/src/androidTest/java/com/owncloud/android/AbstractIT.java b/library/src/androidTest/java/com/owncloud/android/AbstractIT.java
index 5d4e543a78..92c790be7d 100644
--- a/library/src/androidTest/java/com/owncloud/android/AbstractIT.java
+++ b/library/src/androidTest/java/com/owncloud/android/AbstractIT.java
@@ -263,8 +263,8 @@ public static File extractAsset(String fileName, Context context) throws IOExcep
 
     @After
     public void after() {
-        removeOnClient(client);
-        removeOnClient(client2);
+//        removeOnClient(client);
+//        removeOnClient(client2);
     }
 
     private void removeOnClient(OwnCloudClient client) {
diff --git a/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java b/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java
index d9b63ff77a..5357d62b77 100644
--- a/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java
+++ b/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java
@@ -23,6 +23,7 @@
 import com.owncloud.android.lib.resources.status.NextcloudVersion;
 import com.owncloud.android.lib.resources.status.OCCapability;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
+import com.owncloud.android.lib.resources.status.Type;
 
 import org.junit.Test;
 
@@ -161,4 +162,17 @@ private void checkCapability(OCCapability capability, String userId) {
             assertTrue(capability.isWCFEnabled().isFalse());
         }
     }
+    
+    @Test
+    public void testClientIntegration() {
+        // get capabilities
+        RemoteOperationResult result = new GetCapabilitiesRemoteOperation().execute(nextcloudClient);
+        assertTrue(result.isSuccess());
+        assertNotNull(result.getSingleData());
+
+        OCCapability capability = (OCCapability) result.getSingleData();
+
+        assertEquals(5, capability.getClientIntegrationEndpoints(Type.CONTEXT_MENU, "").size());
+        assertEquals(2, capability.getClientIntegrationEndpoints(Type.CREATE_NEW, "").size());
+    } 
 }
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/App.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/App.kt
new file mode 100644
index 0000000000..c867c010bb
--- /dev/null
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/App.kt
@@ -0,0 +1,19 @@
+/*
+ * Nextcloud Android Library
+ *
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2025 Tobias Kaminsky <tobias@kaminsky.me>
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.nextcloud.android.lib.resources.clientintegration
+
+import com.google.gson.annotations.SerializedName
+
+data class App(
+    val version: Double,
+    @SerializedName("context-menu")
+    val contextMenu: List<Endpoint>,
+    @SerializedName("create-new")
+    val createNew: List<Endpoint>
+)
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Button.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Button.kt
new file mode 100644
index 0000000000..36125f308d
--- /dev/null
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Button.kt
@@ -0,0 +1,19 @@
+/*
+ * Nextcloud Android Library
+ *
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2025 Tobias Kaminsky <tobias@kaminsky.me>
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.nextcloud.android.lib.resources.clientintegration
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class Button(
+    val label: String,
+    val type: String
+) : Element,
+    Parcelable
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/ClientIntegrationUI.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/ClientIntegrationUI.kt
new file mode 100644
index 0000000000..b1804bec5a
--- /dev/null
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/ClientIntegrationUI.kt
@@ -0,0 +1,18 @@
+/*
+ * Nextcloud Android Library
+ *
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2025 Tobias Kaminsky <tobias@kaminsky.me>
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.nextcloud.android.lib.resources.clientintegration
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class ClientIntegrationUI(
+    val version: Double,
+    val root: Layout
+) : Parcelable
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Element.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Element.kt
new file mode 100644
index 0000000000..50ec9f0689
--- /dev/null
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Element.kt
@@ -0,0 +1,12 @@
+/*
+ * Nextcloud Android Library
+ *
+ * SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.nextcloud.android.lib.resources.clientintegration
+
+import android.os.Parcelable
+
+interface Element : Parcelable
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
new file mode 100644
index 0000000000..767ba01d66
--- /dev/null
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/ElementTypeAdapter.kt
@@ -0,0 +1,71 @@
+/*
+ * Nextcloud Android Library
+ *
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2025 Tobias Kaminsky <tobias@kaminsky.me>
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.nextcloud.android.lib.resources.clientintegration
+
+import com.google.gson.Gson
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import com.google.gson.JsonSerializationContext
+import com.google.gson.JsonSerializer
+import java.lang.reflect.Type
+
+class ElementTypeAdapter :
+    JsonSerializer<Element>,
+    JsonDeserializer<Element> {
+    override fun serialize(
+        src: Element,
+        type: Type,
+        context: JsonSerializationContext
+    ): JsonElement {
+        // needs to be a new Gson instance, otherwise we end up in a loop
+        val element = Gson().toJsonTree(src)
+        element.asJsonObject.addProperty("element", src.javaClass.name)
+
+        return element
+    }
+
+    @Throws(JsonParseException::class, ClassNotFoundException::class, Throwable::class)
+    override fun deserialize(
+        json: JsonElement,
+        type: Type,
+        context: JsonDeserializationContext
+    ): Element? {
+        val jsonObject = json.asJsonObject
+        val typeName = jsonObject.get("element").asString
+
+        try {
+            val cls: Class<out Element> =
+                when (typeName) {
+                    "Button" ->
+                        Class.forName("com.nextcloud.android.lib.resources.clientintegration.Button")
+                            as Class<out Element>
+
+                    "Text" ->
+                        Class.forName("com.nextcloud.android.lib.resources.clientintegration.Text")
+                            as Class<out Element>
+
+                    "Image" ->
+                        Class.forName("com.nextcloud.android.lib.resources.clientintegration.Image")
+                            as Class<out Element>
+
+                    "URL" ->
+                        Class.forName("com.nextcloud.android.lib.resources.clientintegration.URL")
+                            as Class<out Element>
+
+                    else -> return null
+                }
+
+            return Gson().fromJson(json, cls)
+        } catch (e: ClassNotFoundException) {
+            throw JsonParseException(e)
+        }
+    }
+}
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Endpoint.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Endpoint.kt
new file mode 100644
index 0000000000..66b25b2240
--- /dev/null
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Endpoint.kt
@@ -0,0 +1,25 @@
+/*
+ * Nextcloud Android Library
+ *
+ * SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.nextcloud.android.lib.resources.clientintegration
+
+import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
+import com.owncloud.android.lib.resources.status.Method
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class Endpoint(
+    val name: String,
+    val url: String,
+    var method: Method?,
+    @SerializedName("mimetype_filters")
+    val mimetypeFilter: String?,
+    val params: Map<String, String>?,
+    val icon: String?,
+    val filter: String?
+) : Parcelable
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/GetClientIntegrationJsonOperation.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/GetClientIntegrationJsonOperation.kt
new file mode 100644
index 0000000000..44ac855f1f
--- /dev/null
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/GetClientIntegrationJsonOperation.kt
@@ -0,0 +1,81 @@
+/*
+ * Nextcloud Android Library
+ *
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2025 Tobias Kaminsky <tobias@kaminsky.me>
+ * SPDX-License-Identifier: MIT
+ */
+package com.nextcloud.android.lib.resources.clientintegration
+
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonArray
+import com.google.gson.reflect.TypeToken
+import com.nextcloud.common.NextcloudClient
+import com.nextcloud.operations.GetMethod
+import com.owncloud.android.lib.common.operations.RemoteOperationResult
+import com.owncloud.android.lib.common.utils.Log_OC
+import com.owncloud.android.lib.ocs.ServerResponse
+import com.owncloud.android.lib.resources.OCSRemoteOperation
+import org.apache.commons.httpclient.HttpStatus
+
+/**
+ * Get client integration
+ */
+class GetClientIntegrationJsonOperation(
+    val url: String
+) : OCSRemoteOperation<JsonArray>() {
+    @Suppress("TooGenericExceptionCaught")
+    override fun run(client: NextcloudClient): RemoteOperationResult<JsonArray> {
+        var result: RemoteOperationResult<JsonArray>
+        var getMethod: GetMethod? = null
+        try {
+            getMethod =
+                GetMethod(
+                    client.baseUri.toString() + url + JSON_FORMAT,
+                    true
+                )
+            val status = client.execute(getMethod)
+            if (status == HttpStatus.SC_OK) {
+                val terms =
+                    getServerResponse(
+                        getMethod,
+                        object : TypeToken<ServerResponse<JsonArray>>() {}
+                    )?.ocs?.data
+
+                val json = parseResult(getMethod.getResponseBodyAsString())
+
+                if (terms != null) {
+                    result = RemoteOperationResult(true, getMethod)
+                    result.resultData = terms
+                } else {
+                    result = RemoteOperationResult(false, getMethod)
+                }
+            } else {
+                result = RemoteOperationResult(false, getMethod)
+            }
+        } catch (e: Exception) {
+            result = RemoteOperationResult(e)
+            Log_OC.e(
+                TAG,
+                "Get client integration failed: " + result.logMessage,
+                result.exception
+            )
+        } finally {
+            getMethod?.releaseConnection()
+        }
+        return result
+    }
+
+    fun parseResult(response: String): ClientIntegrationUI {
+        val gson =
+            GsonBuilder()
+                .registerTypeHierarchyAdapter(Element::class.java, ElementTypeAdapter())
+                .create()
+
+        return gson.fromJson(response, ClientIntegrationUI::class.java)
+    }
+
+    companion object {
+        private val TAG = GetClientIntegrationJsonOperation::class.java.simpleName
+    }
+}
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Image.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Image.kt
new file mode 100644
index 0000000000..2432d375bb
--- /dev/null
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Image.kt
@@ -0,0 +1,18 @@
+/*
+ * Nextcloud Android Library
+ *
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2025 Tobias Kaminsky <tobias@kaminsky.me>
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.nextcloud.android.lib.resources.clientintegration
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class Image(
+    val url: String
+) : Element,
+    Parcelable
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Layout.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Layout.kt
new file mode 100644
index 0000000000..c72833b87e
--- /dev/null
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Layout.kt
@@ -0,0 +1,19 @@
+/*
+ * Nextcloud Android Library
+ *
+ * SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.nextcloud.android.lib.resources.clientintegration
+
+import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class Layout(
+    @SerializedName("orientation")
+    var orientation: Orientation,
+    var rows: List<Row>
+) : Parcelable
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Orientation.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Orientation.kt
new file mode 100644
index 0000000000..131cb347bd
--- /dev/null
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Orientation.kt
@@ -0,0 +1,19 @@
+/*
+ * Nextcloud Android Library
+ *
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2025 Tobias Kaminsky <tobias@kaminsky.me>
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.nextcloud.android.lib.resources.clientintegration
+
+import com.google.gson.annotations.SerializedName
+
+enum class Orientation {
+    @SerializedName("horizontal")
+    HORIZONTAL,
+
+    @SerializedName("vertical")
+    VERTICAL
+}
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Row.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Row.kt
new file mode 100644
index 0000000000..f4b53175f9
--- /dev/null
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Row.kt
@@ -0,0 +1,16 @@
+/*
+ * Nextcloud Android Library
+ *
+ * SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.nextcloud.android.lib.resources.clientintegration
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class Row(
+    val children: List<Element>
+) : Parcelable
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Text.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Text.kt
new file mode 100644
index 0000000000..82e081ca6b
--- /dev/null
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Text.kt
@@ -0,0 +1,18 @@
+/*
+ * Nextcloud Android Library
+ *
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2025 Tobias Kaminsky <tobias@kaminsky.me>
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.nextcloud.android.lib.resources.clientintegration
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class Text(
+    val text: String
+) : Element,
+    Parcelable
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/TooltipResponse.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/TooltipResponse.kt
new file mode 100644
index 0000000000..c21136a5e7
--- /dev/null
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/TooltipResponse.kt
@@ -0,0 +1,13 @@
+/*
+ * Nextcloud Android Library
+ *
+ * SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.nextcloud.android.lib.resources.clientintegration
+
+data class TooltipResponse(
+    val version: Double,
+    val tooltip: String
+)
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/URL.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/URL.kt
new file mode 100644
index 0000000000..20fba7f366
--- /dev/null
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/URL.kt
@@ -0,0 +1,19 @@
+/*
+ * Nextcloud Android Library
+ *
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2025 Tobias Kaminsky <tobias@kaminsky.me>
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.nextcloud.android.lib.resources.clientintegration
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class URL(
+    val text: String,
+    val url: String
+) : Element,
+    Parcelable
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/status/GetCapabilitiesRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/status/GetCapabilitiesRemoteOperation.java
index 0a457c68bc..acb980b956 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/status/GetCapabilitiesRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/status/GetCapabilitiesRemoteOperation.java
@@ -179,6 +179,9 @@ public class GetCapabilitiesRemoteOperation extends RemoteOperation<OCCapability
     // notes folder location
     private static final String NODE_NOTES = "notes";
     private static final String NOTES_PATH = "notes_path";
+    
+    // client integration
+    private static final String NODE_CLIENT_INTEGRATION = "client_integration";
 
     private static final String PROPERTY_DEFAULT_PERMISSIONS = "default_permissions";
 
@@ -812,6 +815,11 @@ private OCCapability parseResponse(String response) throws JSONException {
                     }
                 }
 
+                // client integration
+                if (respCapabilities.has(NODE_CLIENT_INTEGRATION)) {
+                    capability.setClientIntegrationJson(respCapabilities.getString(NODE_CLIENT_INTEGRATION));
+                }
+
                 // support
                 if (respCapabilities.has(NODE_SUPPORT)) {
                     JSONObject supportCapability = respCapabilities.getJSONObject(NODE_SUPPORT);
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/status/Method.kt b/library/src/main/java/com/owncloud/android/lib/resources/status/Method.kt
new file mode 100644
index 0000000000..17431d36ed
--- /dev/null
+++ b/library/src/main/java/com/owncloud/android/lib/resources/status/Method.kt
@@ -0,0 +1,15 @@
+/*
+ * Nextcloud Android Library
+ *
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2025 Tobias Kaminsky <tobias@kaminsky.me>
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.owncloud.android.lib.resources.status
+
+enum class Method {
+    GET,
+    POST,
+    PUT
+}
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/status/OCCapability.kt b/library/src/main/java/com/owncloud/android/lib/resources/status/OCCapability.kt
index e0d0378f96..ddab607d52 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/status/OCCapability.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/status/OCCapability.kt
@@ -9,6 +9,11 @@
  */
 package com.owncloud.android.lib.resources.status
 
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import com.nextcloud.android.lib.resources.clientintegration.App
+import com.nextcloud.android.lib.resources.clientintegration.Endpoint
+
 /**
  * Contains data of the Capabilities for an account, from the Capabilities API
  */
@@ -122,6 +127,54 @@ class OCCapability {
     // notes folder location
     var notesFolderPath: String? = null
 
+    // client integration
+    var clientIntegrationJson: String? = null
+
+    fun getClientIntegrationEndpoints(
+        hook: Type,
+        mimetype: String
+    ): List<Endpoint> {
+        if (clientIntegrationJson == null) {
+            return emptyList()
+        }
+
+        val appsType = object : TypeToken<Map<String, App>>() {}.type
+        val apps: Map<String, App> = Gson().fromJson(clientIntegrationJson, appsType)
+
+        val endpoints =
+            apps.values
+                .filter { it.version <= CLIENT_INTEGRATION_VERSION }
+                .map { mapHooks(it, hook) }
+                .flatMap { it.toList() }
+                .filter { filterMimetype(mimetype, it.mimetypeFilter) }
+
+        // GET by default
+        endpoints.forEach {
+            if (it.method == null) {
+                it.method = Method.GET
+            }
+        }
+
+        return endpoints
+    }
+
+    private fun mapHooks(
+        app: App,
+        hook: Type
+    ): List<Endpoint> =
+        when (hook) {
+            Type.CONTEXT_MENU -> app.contextMenu
+            Type.CREATE_NEW -> app.createNew
+        }
+
+    private fun filterMimetype(
+        mimetype: String,
+        mimetypeFilter: String?
+    ): Boolean =
+        mimetypeFilter?.split(",")?.any {
+            mimetype.startsWith(it.trim())
+        } ?: true
+
     // Etag for capabilities
     var etag: String? = ""
 
@@ -140,5 +193,6 @@ class OCCapability {
 
     companion object {
         private const val VERSION_DOT = "."
+        const val CLIENT_INTEGRATION_VERSION = 0.1
     }
 }
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/status/Type.kt b/library/src/main/java/com/owncloud/android/lib/resources/status/Type.kt
new file mode 100644
index 0000000000..96d773d932
--- /dev/null
+++ b/library/src/main/java/com/owncloud/android/lib/resources/status/Type.kt
@@ -0,0 +1,21 @@
+/*
+ * Nextcloud Android Library
+ *
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2025 Tobias Kaminsky <tobias@kaminsky.me>
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.owncloud.android.lib.resources.status
+
+import com.google.gson.annotations.SerializedName
+
+enum class Type(
+    val string: String
+) {
+    @SerializedName("context-menu")
+    CONTEXT_MENU("context-menu"),
+
+    @SerializedName("create-new")
+    CREATE_NEW("create-new")
+}
diff --git a/library/src/test/java/com/owncloud/android/lib/resources/clientintegration/GetClientIntegrationJsonOperationTest.kt b/library/src/test/java/com/owncloud/android/lib/resources/clientintegration/GetClientIntegrationJsonOperationTest.kt
new file mode 100644
index 0000000000..433e70a62f
--- /dev/null
+++ b/library/src/test/java/com/owncloud/android/lib/resources/clientintegration/GetClientIntegrationJsonOperationTest.kt
@@ -0,0 +1,92 @@
+/*
+ * Nextcloud Android Library
+ *
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2025 Tobias Kaminsky <tobias@kaminsky.me>
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.owncloud.android.lib.resources.clientintegration
+
+import com.nextcloud.android.lib.resources.clientintegration.Button
+import com.nextcloud.android.lib.resources.clientintegration.GetClientIntegrationJsonOperation
+import com.nextcloud.android.lib.resources.clientintegration.Image
+import com.nextcloud.android.lib.resources.clientintegration.Orientation
+import com.nextcloud.android.lib.resources.clientintegration.Text
+import junit.framework.TestCase.assertEquals
+import org.junit.Test
+
+class GetClientIntegrationJsonOperationTest {
+    @Test
+    @Suppress("LongMethod")
+    fun testParseJson() {
+        val string = """
+            {
+                "version": 0.1,
+                "root": {
+                    "orientation": "vertical",
+                    "rows": [
+                        {
+                            "children": [
+                                    {
+                                        "element": "Button",
+                                        "type": "primary",
+                                        "label": "Submit"
+                                    },
+                                    {
+                                        "element": "Button",
+                                        "type": "secondary",
+                                        "label": "Cancel"
+                                    }
+                            ]
+                        },
+                        {
+                            "children": [
+                                {
+                                    "element": "Text",
+                                    "text": "Hello World!"
+                                }, 
+                                {
+                                    "element": "Image",
+                                    "url": "/core/img/logo/logo.png"
+                                }
+                            ]
+                        }
+                    ]
+                }
+            }
+            """
+
+        val sut = GetClientIntegrationJsonOperation("")
+
+        val clientIntegrationUI = sut.parseResult(string)
+
+        assertEquals(0.1, clientIntegrationUI.version)
+        assertEquals(Orientation.VERTICAL, clientIntegrationUI.root.orientation)
+        assertEquals(2, clientIntegrationUI.root.rows.count())
+
+        // row 1
+        assertEquals(
+            2,
+            clientIntegrationUI.root.rows[0]
+                .children
+                .count()
+        )
+
+        val button1 = clientIntegrationUI.root.rows[0].children[0] as Button
+        assertEquals("Submit", button1.label)
+
+        // row 2
+        assertEquals(
+            2,
+            clientIntegrationUI.root.rows[1]
+                .children
+                .count()
+        )
+        val text = clientIntegrationUI.root.rows[1].children[0] as Text
+        assertEquals("Hello World!", text.text)
+
+        val image = clientIntegrationUI.root.rows[1].children[1] as Image
+        assertEquals("/core/img/logo/logo.png", image.url)
+    }
+}
diff --git a/library/src/test/java/com/owncloud/android/lib/resources/status/OCCapabilityTest.kt b/library/src/test/java/com/owncloud/android/lib/resources/status/OCCapabilityTest.kt
index dabdb03850..f57d4baff8 100644
--- a/library/src/test/java/com/owncloud/android/lib/resources/status/OCCapabilityTest.kt
+++ b/library/src/test/java/com/owncloud/android/lib/resources/status/OCCapabilityTest.kt
@@ -7,6 +7,7 @@
  */
 package com.owncloud.android.lib.resources.status
 
+import junit.framework.TestCase.assertEquals
 import org.junit.Test
 
 class OCCapabilityTest {
@@ -35,4 +36,109 @@ class OCCapabilityTest {
             directEditingEtag = null
         }
     }
+
+    @Test
+    @Suppress("LongMethod")
+    fun parseClientIntegrationJson() {
+        val string = """{
+              "analytics": {
+                "version": 0.1,
+                "context-menu": [
+                  {
+                    "name": "Show data in Analytics",
+                    "url": "\/ocs\/v2.php\/apps\/analytics\/createFromDataFile?fileId={fileId}",
+                    "method": "POST",
+                    "mimetype_filters": "text\/csv",
+                    "params": {
+                        'file_id': '{fileId}',
+                        'file_path': '{filePath}'
+                    },
+                    "icon": "\/apps\/analytics\/img\/app.svg"
+                  }
+                ],
+                 "create-new": [
+                  {
+                    "name": "Analytic chart",
+                    "url": "\/ocs\/v2.php\/apps\/clientintegrationtest\/newChart"
+                  }
+                  ]
+              },
+              "brandNewApp": {
+                "version": 0.2,
+                "context-menu": [
+                  {
+                    "name": "Too new",
+                    "url": "\/ocs\/v2.php\/apps\/brandNewApp\/",
+                    "method": "GET",
+                    "icon": "\/apps\/brandNewApp\/img\/app.svg"
+                  }
+                ],
+                 "create-new": [
+                      {
+                        "name": "Analytic chart",
+                        "url": "\/ocs\/v2.php\/apps\/clientintegrationtest\/newChart"
+                      }
+                 ]
+              },
+              "clientintegrationtest": {
+                "version": 0.1,
+                "context-menu": [
+                  {
+                    "name": "List all UI elements",
+                    "url": "\/ocs\/v2.php\/apps\/clientintegrationtest\/all"
+                  },
+                  {
+                    "name": "First version",
+                    "url": "\/ocs\/v2.php\/apps\/clientintegrationtest\/version1"
+                  },
+                  {
+                    "name": "Convert to PDF",
+                    "url": "\/ocs\/v2.php\/apps\/clientintegrationtest\/convertFile\/123123",
+                    "mimetype_filters": "image\/"
+                  },
+                  {
+                    "name": "Create transcript",
+                    "url": "\/ocs\/v2.php\/apps\/clientintegrationtest\/version1",
+                    "mimetype_filters": "audio\/",
+                    "android_icon": "file_sound"
+                  },
+                  {
+                    "name": "Create zip file",
+                    "url": "\/ocs\/v2.php\/apps\/file_zip\/zip\/1231123",
+                    "android_icon": "file_zip",
+                    "ios_icon": "zip",
+                    "desktop_icon": "zip"
+                  },
+                  {
+                    "name": "Unzip",
+                    "url": "\/ocs\/v2.php\/apps\/clientintegrationtest\/version1",
+                    "mimetype_filters": "application\/zip",
+                    "android_icon": "file_zip"
+                  }
+                ],
+                "create-new": [
+                  {
+                    "name": "Deck board",
+                    "url": "\/ocs\/v2.php\/apps\/clientintegrationtest\/newDeckBoard"
+                  },
+                  {
+                    "name": "New Contact",
+                    "url": "\/ocs\/v2.php\/apps\/clientintegrationtest\/newContact",
+                    "android_icon": "file_vcard"
+                  }
+                ]
+              }
+            }"""
+
+        val sut = OCCapability()
+        sut.clientIntegrationJson = string
+
+        // Markdown
+        assertEquals(3, sut.getClientIntegrationEndpoints(Type.CONTEXT_MENU, "text/markdown").size.toLong())
+        assertEquals(3, sut.getClientIntegrationEndpoints(Type.CREATE_NEW, "text/markdown").size.toLong())
+
+        // Zip
+        assertEquals(4, sut.getClientIntegrationEndpoints(Type.CONTEXT_MENU, "application/zip").size.toLong())
+        assertEquals(3, sut.getClientIntegrationEndpoints(Type.CREATE_NEW, "application/zip").size.toLong())
+    }
 }

From 06fce6dc2f2daf4d7461d519dd2d3a7a37cf9398 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Wed, 17 Dec 2025 13:01:18 +0100
Subject: [PATCH 2/9] make orientation parcable and add tests

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../clientintegration/Orientation.kt          |  5 ++-
 .../GetClientIntegrationJsonOperationTest.kt  | 43 +++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Orientation.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Orientation.kt
index 131cb347bd..0ac46d42f9 100644
--- a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Orientation.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Orientation.kt
@@ -8,9 +8,12 @@
 
 package com.nextcloud.android.lib.resources.clientintegration
 
+import android.os.Parcelable
 import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.Parcelize
 
-enum class Orientation {
+@Parcelize
+enum class Orientation : Parcelable {
     @SerializedName("horizontal")
     HORIZONTAL,
 
diff --git a/library/src/test/java/com/owncloud/android/lib/resources/clientintegration/GetClientIntegrationJsonOperationTest.kt b/library/src/test/java/com/owncloud/android/lib/resources/clientintegration/GetClientIntegrationJsonOperationTest.kt
index 433e70a62f..e36247d018 100644
--- a/library/src/test/java/com/owncloud/android/lib/resources/clientintegration/GetClientIntegrationJsonOperationTest.kt
+++ b/library/src/test/java/com/owncloud/android/lib/resources/clientintegration/GetClientIntegrationJsonOperationTest.kt
@@ -89,4 +89,47 @@ class GetClientIntegrationJsonOperationTest {
         val image = clientIntegrationUI.root.rows[1].children[1] as Image
         assertEquals("/core/img/logo/logo.png", image.url)
     }
+
+    @Test
+    @Suppress("LongMethod")
+    fun testParseJsonHorizontal() {
+        val string = """
+            {
+                "version": 0.2,
+                "root": {
+                    "orientation": "horizontal",
+                    "rows": [
+                        {
+                            "children": [
+                                {
+                                    "element": "Text",
+                                    "text": "Left"
+                                },
+                                {
+                                    "element": "Text",
+                                    "text": "Right"
+                                }
+                            ]
+                        }
+                    ]
+                }
+            }
+            """
+
+        val sut = GetClientIntegrationJsonOperation("")
+        val clientIntegrationUI = sut.parseResult(string)
+
+        assertEquals(0.2, clientIntegrationUI.version)
+        assertEquals(Orientation.HORIZONTAL, clientIntegrationUI.root.orientation)
+        assertEquals(1, clientIntegrationUI.root.rows.count())
+
+        val row = clientIntegrationUI.root.rows[0]
+        assertEquals(2, row.children.count())
+
+        val leftText = row.children[0] as Text
+        assertEquals("Left", leftText.text)
+
+        val rightText = row.children[1] as Text
+        assertEquals("Right", rightText.text)
+    }
 }

From fe22bd4dadc58567fbe7b21b49129796a008ee76 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 17 Dec 2025 14:53:09 +0100
Subject: [PATCH 3/9] update

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .../java/com/owncloud/android/AbstractIT.java |   4 +-
 .../resources/clientintegration/Element.kt    |   3 +-
 .../resources/clientintegration/Endpoint.kt   |   3 +-
 .../GetClientIntegrationJsonOperation.kt      |  81 -----------
 .../lib/resources/clientintegration/Layout.kt |   3 +-
 .../lib/resources/clientintegration/Row.kt    |   3 +-
 .../clientintegration/TooltipResponse.kt      |   3 +-
 .../GetClientIntegrationJsonOperationTest.kt  | 135 ------------------
 8 files changed, 12 insertions(+), 223 deletions(-)
 delete mode 100644 library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/GetClientIntegrationJsonOperation.kt
 delete mode 100644 library/src/test/java/com/owncloud/android/lib/resources/clientintegration/GetClientIntegrationJsonOperationTest.kt

diff --git a/library/src/androidTest/java/com/owncloud/android/AbstractIT.java b/library/src/androidTest/java/com/owncloud/android/AbstractIT.java
index 92c790be7d..5d4e543a78 100644
--- a/library/src/androidTest/java/com/owncloud/android/AbstractIT.java
+++ b/library/src/androidTest/java/com/owncloud/android/AbstractIT.java
@@ -263,8 +263,8 @@ public static File extractAsset(String fileName, Context context) throws IOExcep
 
     @After
     public void after() {
-//        removeOnClient(client);
-//        removeOnClient(client2);
+        removeOnClient(client);
+        removeOnClient(client2);
     }
 
     private void removeOnClient(OwnCloudClient client) {
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Element.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Element.kt
index 50ec9f0689..ec3e74a6eb 100644
--- a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Element.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Element.kt
@@ -1,7 +1,8 @@
 /*
  * Nextcloud Android Library
  *
- * SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2025 Tobias Kaminsky <tobias@kaminsky.me>
  * SPDX-License-Identifier: MIT
  */
 
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Endpoint.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Endpoint.kt
index 66b25b2240..e09ebd2225 100644
--- a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Endpoint.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Endpoint.kt
@@ -1,7 +1,8 @@
 /*
  * Nextcloud Android Library
  *
- * SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2025 Tobias Kaminsky <tobias@kaminsky.me>
  * SPDX-License-Identifier: MIT
  */
 
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/GetClientIntegrationJsonOperation.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/GetClientIntegrationJsonOperation.kt
deleted file mode 100644
index 44ac855f1f..0000000000
--- a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/GetClientIntegrationJsonOperation.kt
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Nextcloud Android Library
- *
- * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
- * SPDX-FileCopyrightText: 2025 Tobias Kaminsky <tobias@kaminsky.me>
- * SPDX-License-Identifier: MIT
- */
-package com.nextcloud.android.lib.resources.clientintegration
-
-import com.google.gson.GsonBuilder
-import com.google.gson.JsonArray
-import com.google.gson.reflect.TypeToken
-import com.nextcloud.common.NextcloudClient
-import com.nextcloud.operations.GetMethod
-import com.owncloud.android.lib.common.operations.RemoteOperationResult
-import com.owncloud.android.lib.common.utils.Log_OC
-import com.owncloud.android.lib.ocs.ServerResponse
-import com.owncloud.android.lib.resources.OCSRemoteOperation
-import org.apache.commons.httpclient.HttpStatus
-
-/**
- * Get client integration
- */
-class GetClientIntegrationJsonOperation(
-    val url: String
-) : OCSRemoteOperation<JsonArray>() {
-    @Suppress("TooGenericExceptionCaught")
-    override fun run(client: NextcloudClient): RemoteOperationResult<JsonArray> {
-        var result: RemoteOperationResult<JsonArray>
-        var getMethod: GetMethod? = null
-        try {
-            getMethod =
-                GetMethod(
-                    client.baseUri.toString() + url + JSON_FORMAT,
-                    true
-                )
-            val status = client.execute(getMethod)
-            if (status == HttpStatus.SC_OK) {
-                val terms =
-                    getServerResponse(
-                        getMethod,
-                        object : TypeToken<ServerResponse<JsonArray>>() {}
-                    )?.ocs?.data
-
-                val json = parseResult(getMethod.getResponseBodyAsString())
-
-                if (terms != null) {
-                    result = RemoteOperationResult(true, getMethod)
-                    result.resultData = terms
-                } else {
-                    result = RemoteOperationResult(false, getMethod)
-                }
-            } else {
-                result = RemoteOperationResult(false, getMethod)
-            }
-        } catch (e: Exception) {
-            result = RemoteOperationResult(e)
-            Log_OC.e(
-                TAG,
-                "Get client integration failed: " + result.logMessage,
-                result.exception
-            )
-        } finally {
-            getMethod?.releaseConnection()
-        }
-        return result
-    }
-
-    fun parseResult(response: String): ClientIntegrationUI {
-        val gson =
-            GsonBuilder()
-                .registerTypeHierarchyAdapter(Element::class.java, ElementTypeAdapter())
-                .create()
-
-        return gson.fromJson(response, ClientIntegrationUI::class.java)
-    }
-
-    companion object {
-        private val TAG = GetClientIntegrationJsonOperation::class.java.simpleName
-    }
-}
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Layout.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Layout.kt
index c72833b87e..3596bc98f9 100644
--- a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Layout.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Layout.kt
@@ -1,7 +1,8 @@
 /*
  * Nextcloud Android Library
  *
- * SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2025 Tobias Kaminsky <tobias@kaminsky.me>
  * SPDX-License-Identifier: MIT
  */
 
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Row.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Row.kt
index f4b53175f9..6b6b64958c 100644
--- a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Row.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Row.kt
@@ -1,7 +1,8 @@
 /*
  * Nextcloud Android Library
  *
- * SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2025 Tobias Kaminsky <tobias@kaminsky.me>
  * SPDX-License-Identifier: MIT
  */
 
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/TooltipResponse.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/TooltipResponse.kt
index c21136a5e7..14aaa4eae8 100644
--- a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/TooltipResponse.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/TooltipResponse.kt
@@ -1,7 +1,8 @@
 /*
  * Nextcloud Android Library
  *
- * SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2025 Tobias Kaminsky <tobias@kaminsky.me>
  * SPDX-License-Identifier: MIT
  */
 
diff --git a/library/src/test/java/com/owncloud/android/lib/resources/clientintegration/GetClientIntegrationJsonOperationTest.kt b/library/src/test/java/com/owncloud/android/lib/resources/clientintegration/GetClientIntegrationJsonOperationTest.kt
deleted file mode 100644
index e36247d018..0000000000
--- a/library/src/test/java/com/owncloud/android/lib/resources/clientintegration/GetClientIntegrationJsonOperationTest.kt
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Nextcloud Android Library
- *
- * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
- * SPDX-FileCopyrightText: 2025 Tobias Kaminsky <tobias@kaminsky.me>
- * SPDX-License-Identifier: MIT
- */
-
-package com.owncloud.android.lib.resources.clientintegration
-
-import com.nextcloud.android.lib.resources.clientintegration.Button
-import com.nextcloud.android.lib.resources.clientintegration.GetClientIntegrationJsonOperation
-import com.nextcloud.android.lib.resources.clientintegration.Image
-import com.nextcloud.android.lib.resources.clientintegration.Orientation
-import com.nextcloud.android.lib.resources.clientintegration.Text
-import junit.framework.TestCase.assertEquals
-import org.junit.Test
-
-class GetClientIntegrationJsonOperationTest {
-    @Test
-    @Suppress("LongMethod")
-    fun testParseJson() {
-        val string = """
-            {
-                "version": 0.1,
-                "root": {
-                    "orientation": "vertical",
-                    "rows": [
-                        {
-                            "children": [
-                                    {
-                                        "element": "Button",
-                                        "type": "primary",
-                                        "label": "Submit"
-                                    },
-                                    {
-                                        "element": "Button",
-                                        "type": "secondary",
-                                        "label": "Cancel"
-                                    }
-                            ]
-                        },
-                        {
-                            "children": [
-                                {
-                                    "element": "Text",
-                                    "text": "Hello World!"
-                                }, 
-                                {
-                                    "element": "Image",
-                                    "url": "/core/img/logo/logo.png"
-                                }
-                            ]
-                        }
-                    ]
-                }
-            }
-            """
-
-        val sut = GetClientIntegrationJsonOperation("")
-
-        val clientIntegrationUI = sut.parseResult(string)
-
-        assertEquals(0.1, clientIntegrationUI.version)
-        assertEquals(Orientation.VERTICAL, clientIntegrationUI.root.orientation)
-        assertEquals(2, clientIntegrationUI.root.rows.count())
-
-        // row 1
-        assertEquals(
-            2,
-            clientIntegrationUI.root.rows[0]
-                .children
-                .count()
-        )
-
-        val button1 = clientIntegrationUI.root.rows[0].children[0] as Button
-        assertEquals("Submit", button1.label)
-
-        // row 2
-        assertEquals(
-            2,
-            clientIntegrationUI.root.rows[1]
-                .children
-                .count()
-        )
-        val text = clientIntegrationUI.root.rows[1].children[0] as Text
-        assertEquals("Hello World!", text.text)
-
-        val image = clientIntegrationUI.root.rows[1].children[1] as Image
-        assertEquals("/core/img/logo/logo.png", image.url)
-    }
-
-    @Test
-    @Suppress("LongMethod")
-    fun testParseJsonHorizontal() {
-        val string = """
-            {
-                "version": 0.2,
-                "root": {
-                    "orientation": "horizontal",
-                    "rows": [
-                        {
-                            "children": [
-                                {
-                                    "element": "Text",
-                                    "text": "Left"
-                                },
-                                {
-                                    "element": "Text",
-                                    "text": "Right"
-                                }
-                            ]
-                        }
-                    ]
-                }
-            }
-            """
-
-        val sut = GetClientIntegrationJsonOperation("")
-        val clientIntegrationUI = sut.parseResult(string)
-
-        assertEquals(0.2, clientIntegrationUI.version)
-        assertEquals(Orientation.HORIZONTAL, clientIntegrationUI.root.orientation)
-        assertEquals(1, clientIntegrationUI.root.rows.count())
-
-        val row = clientIntegrationUI.root.rows[0]
-        assertEquals(2, row.children.count())
-
-        val leftText = row.children[0] as Text
-        assertEquals("Left", leftText.text)
-
-        val rightText = row.children[1] as Text
-        assertEquals("Right", rightText.text)
-    }
-}

From b67565efe2903713e28666caabe0a82894ee09c6 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 17 Dec 2025 16:20:33 +0100
Subject: [PATCH 4/9] ClientIntegrationUI root might be null

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .../lib/resources/clientintegration/ClientIntegrationUI.kt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/ClientIntegrationUI.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/ClientIntegrationUI.kt
index b1804bec5a..b64f03a577 100644
--- a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/ClientIntegrationUI.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/ClientIntegrationUI.kt
@@ -14,5 +14,5 @@ import kotlinx.parcelize.Parcelize
 @Parcelize
 data class ClientIntegrationUI(
     val version: Double,
-    val root: Layout
+    val root: Layout?
 ) : Parcelable

From d42f42e87ec2720df7d6ff571aa61c990cde411b Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Fri, 19 Dec 2025 13:27:47 +0100
Subject: [PATCH 5/9] change layout item names

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../android/lib/resources/clientintegration/Layout.kt         | 4 ++--
 .../clientintegration/{Button.kt => LayoutButton.kt}          | 2 +-
 .../{Orientation.kt => LayoutOrientation.kt}                  | 2 +-
 .../lib/resources/clientintegration/{Row.kt => LayoutRow.kt}  | 2 +-
 .../resources/clientintegration/{Text.kt => LayoutText.kt}    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/{Button.kt => LayoutButton.kt} (94%)
 rename library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/{Orientation.kt => LayoutOrientation.kt} (91%)
 rename library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/{Row.kt => LayoutRow.kt} (94%)
 rename library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/{Text.kt => LayoutText.kt} (94%)

diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Layout.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Layout.kt
index 3596bc98f9..67848254ee 100644
--- a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Layout.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Layout.kt
@@ -15,6 +15,6 @@ import kotlinx.parcelize.Parcelize
 @Parcelize
 data class Layout(
     @SerializedName("orientation")
-    var orientation: Orientation,
-    var rows: List<Row>
+    var orientation: LayoutOrientation,
+    var layoutRows: List<LayoutRow>
 ) : Parcelable
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Button.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutButton.kt
similarity index 94%
rename from library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Button.kt
rename to library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutButton.kt
index 36125f308d..e46957c7f5 100644
--- a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Button.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutButton.kt
@@ -12,7 +12,7 @@ import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-data class Button(
+data class LayoutButton(
     val label: String,
     val type: String
 ) : Element,
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Orientation.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutOrientation.kt
similarity index 91%
rename from library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Orientation.kt
rename to library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutOrientation.kt
index 0ac46d42f9..95556046d6 100644
--- a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Orientation.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutOrientation.kt
@@ -13,7 +13,7 @@ import com.google.gson.annotations.SerializedName
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-enum class Orientation : Parcelable {
+enum class LayoutOrientation : Parcelable {
     @SerializedName("horizontal")
     HORIZONTAL,
 
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Row.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutRow.kt
similarity index 94%
rename from library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Row.kt
rename to library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutRow.kt
index 6b6b64958c..569c9afcbc 100644
--- a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Row.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutRow.kt
@@ -12,6 +12,6 @@ import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-data class Row(
+data class LayoutRow(
     val children: List<Element>
 ) : Parcelable
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Text.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutText.kt
similarity index 94%
rename from library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Text.kt
rename to library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutText.kt
index 82e081ca6b..994a61b832 100644
--- a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Text.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutText.kt
@@ -12,7 +12,7 @@ import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-data class Text(
+data class LayoutText(
     val text: String
 ) : Element,
     Parcelable

From 23b1f77da88f3c2167ff7862ccbe909f704d8478 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Fri, 19 Dec 2025 14:24:03 +0100
Subject: [PATCH 6/9] remove unused element

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../lib/resources/clientintegration/Image.kt   | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Image.kt

diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Image.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Image.kt
deleted file mode 100644
index 2432d375bb..0000000000
--- a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Image.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Nextcloud Android Library
- *
- * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
- * SPDX-FileCopyrightText: 2025 Tobias Kaminsky <tobias@kaminsky.me>
- * SPDX-License-Identifier: MIT
- */
-
-package com.nextcloud.android.lib.resources.clientintegration
-
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-data class Image(
-    val url: String
-) : Element,
-    Parcelable

From c0fbc30f95aa7fe9913e2bb285d196186d23b005 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Fri, 19 Dec 2025 14:55:14 +0100
Subject: [PATCH 7/9] fix adapter

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../clientintegration/ElementTypeAdapter.kt   | 21 ++++++++-----------
 .../lib/resources/clientintegration/Layout.kt |  2 +-
 .../clientintegration/LayoutImage.kt          | 17 +++++++++++++++
 .../{URL.kt => LayoutURL.kt}                  |  2 +-
 4 files changed, 28 insertions(+), 14 deletions(-)
 create mode 100644 library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutImage.kt
 rename library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/{URL.kt => LayoutURL.kt} (95%)

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 767ba01d66..6eb02c2469 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
@@ -42,23 +42,20 @@ class ElementTypeAdapter :
         val typeName = jsonObject.get("element").asString
 
         try {
+            val prefix = "com.nextcloud.android.lib.resources.clientintegration"
             val cls: Class<out Element> =
                 when (typeName) {
-                    "Button" ->
-                        Class.forName("com.nextcloud.android.lib.resources.clientintegration.Button")
-                            as Class<out Element>
+                    "LayoutButton" ->
+                        Class.forName("$prefix.LayoutButton") as Class<out Element>
 
-                    "Text" ->
-                        Class.forName("com.nextcloud.android.lib.resources.clientintegration.Text")
-                            as Class<out Element>
+                    "LayoutText" ->
+                        Class.forName("$prefix.LayoutText") as Class<out Element>
 
-                    "Image" ->
-                        Class.forName("com.nextcloud.android.lib.resources.clientintegration.Image")
-                            as Class<out Element>
+                    "LayoutImage" ->
+                        Class.forName("$prefix.LayoutImage") as Class<out Element>
 
-                    "URL" ->
-                        Class.forName("com.nextcloud.android.lib.resources.clientintegration.URL")
-                            as Class<out Element>
+                    "LayoutURL" ->
+                        Class.forName("$prefix.LayoutURL") as Class<out Element>
 
                     else -> return null
                 }
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Layout.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Layout.kt
index 67848254ee..7a46e6c193 100644
--- a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Layout.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Layout.kt
@@ -16,5 +16,5 @@ import kotlinx.parcelize.Parcelize
 data class Layout(
     @SerializedName("orientation")
     var orientation: LayoutOrientation,
-    var layoutRows: List<LayoutRow>
+    var rows: List<LayoutRow>
 ) : Parcelable
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutImage.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutImage.kt
new file mode 100644
index 0000000000..989c781b3a
--- /dev/null
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutImage.kt
@@ -0,0 +1,17 @@
+/*
+ * Nextcloud Android Library
+ *
+ * SPDX-FileCopyrightText: 2025 Alper Ozturk <alper.ozturk@nextcloud.com>
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.nextcloud.android.lib.resources.clientintegration
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class Image(
+    val url: String
+) : Element,
+    Parcelable
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/URL.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutURL.kt
similarity index 95%
rename from library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/URL.kt
rename to library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutURL.kt
index 20fba7f366..ebebca12da 100644
--- a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/URL.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutURL.kt
@@ -12,7 +12,7 @@ import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-data class URL(
+data class LayoutURL(
     val text: String,
     val url: String
 ) : Element,

From 7f61654b42f9489894c81b4a0fe6732fcc8f04a9 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Fri, 19 Dec 2025 15:06:58 +0100
Subject: [PATCH 8/9] fix adapter

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../lib/resources/clientintegration/ElementTypeAdapter.kt | 8 ++++----
 .../lib/resources/clientintegration/LayoutImage.kt        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

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 6eb02c2469..222ef64132 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,16 +45,16 @@ class ElementTypeAdapter :
             val prefix = "com.nextcloud.android.lib.resources.clientintegration"
             val cls: Class<out Element> =
                 when (typeName) {
-                    "LayoutButton" ->
+                    "Button" ->
                         Class.forName("$prefix.LayoutButton") as Class<out Element>
 
-                    "LayoutText" ->
+                    "Text" ->
                         Class.forName("$prefix.LayoutText") as Class<out Element>
 
-                    "LayoutImage" ->
+                    "Image" ->
                         Class.forName("$prefix.LayoutImage") as Class<out Element>
 
-                    "LayoutURL" ->
+                    "URL" ->
                         Class.forName("$prefix.LayoutURL") as Class<out Element>
 
                     else -> return null
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutImage.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutImage.kt
index 989c781b3a..8d72d77412 100644
--- a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutImage.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutImage.kt
@@ -11,7 +11,7 @@ import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-data class Image(
+data class LayoutImage(
     val url: String
 ) : Element,
     Parcelable

From 8a9afa163c79828e12c0721da5ae1accad2496d7 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Mon, 12 Jan 2026 14:14:38 +0100
Subject: [PATCH 9/9] fix tests

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .../android/GetCapabilitiesRemoteOperationIT.java      | 10 +++++-----
 .../lib/resources/clientintegration/Endpoint.kt        |  3 +--
 .../android/lib/resources/status/E2EVersion.kt         |  3 ++-
 .../android/lib/resources/status/OCCapability.kt       |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java b/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java
index 5357d62b77..1c58ed18a8 100644
--- a/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java
+++ b/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java
@@ -166,13 +166,13 @@ private void checkCapability(OCCapability capability, String userId) {
     @Test
     public void testClientIntegration() {
         // get capabilities
-        RemoteOperationResult result = new GetCapabilitiesRemoteOperation().execute(nextcloudClient);
+        RemoteOperationResult<OCCapability> result = new GetCapabilitiesRemoteOperation().execute(nextcloudClient);
         assertTrue(result.isSuccess());
-        assertNotNull(result.getSingleData());
+        assertNotNull(result.getResultData());
 
-        OCCapability capability = (OCCapability) result.getSingleData();
+        OCCapability capability = result.getResultData();
 
-        assertEquals(5, capability.getClientIntegrationEndpoints(Type.CONTEXT_MENU, "").size());
-        assertEquals(2, capability.getClientIntegrationEndpoints(Type.CREATE_NEW, "").size());
+        assertEquals(1, capability.getClientIntegrationEndpoints(Type.CONTEXT_MENU, "application/pdf").size());
+        assertEquals(0, capability.getClientIntegrationEndpoints(Type.CREATE_NEW, "").size());
     } 
 }
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Endpoint.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Endpoint.kt
index e09ebd2225..b2de2759c0 100644
--- a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Endpoint.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Endpoint.kt
@@ -21,6 +21,5 @@ data class Endpoint(
     @SerializedName("mimetype_filters")
     val mimetypeFilter: String?,
     val params: Map<String, String>?,
-    val icon: String?,
-    val filter: String?
+    val icon: String?
 ) : Parcelable
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/status/E2EVersion.kt b/library/src/main/java/com/owncloud/android/lib/resources/status/E2EVersion.kt
index cc3dcdb125..c54175fe11 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/status/E2EVersion.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/status/E2EVersion.kt
@@ -14,10 +14,11 @@ enum class E2EVersion(
     V1_1("1.1"),
     V1_2("1.2"),
     V2_0("2.0"),
+    V2_1("2.1"),
     UNKNOWN("");
 
     companion object {
         @JvmStatic
-        fun fromValue(v: String): E2EVersion = E2EVersion.values().firstOrNull { it.value == v } ?: UNKNOWN
+        fun fromValue(v: String): E2EVersion = entries.firstOrNull { it.value == v } ?: UNKNOWN
     }
 }
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/status/OCCapability.kt b/library/src/main/java/com/owncloud/android/lib/resources/status/OCCapability.kt
index ddab607d52..21cea878b5 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/status/OCCapability.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/status/OCCapability.kt
@@ -144,7 +144,7 @@ class OCCapability {
         val endpoints =
             apps.values
                 .filter { it.version <= CLIENT_INTEGRATION_VERSION }
-                .map { mapHooks(it, hook) }
+                .mapNotNull { mapHooks(it, hook) }
                 .flatMap { it.toList() }
                 .filter { filterMimetype(mimetype, it.mimetypeFilter) }