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/GetCapabilitiesRemoteOperationIT.java b/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java
index d9b63ff77a..1c58ed18a8 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<OCCapability> result = new GetCapabilitiesRemoteOperation().execute(nextcloudClient);
+        assertTrue(result.isSuccess());
+        assertNotNull(result.getResultData());
+
+        OCCapability capability = result.getResultData();
+
+        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/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/ClientIntegrationUI.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/ClientIntegrationUI.kt
new file mode 100644
index 0000000000..b64f03a577
--- /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..ec3e74a6eb
--- /dev/null
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Element.kt
@@ -0,0 +1,13 @@
+/*
+ * 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
+
+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..222ef64132
--- /dev/null
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/ElementTypeAdapter.kt
@@ -0,0 +1,68 @@
+/*
+ * 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 prefix = "com.nextcloud.android.lib.resources.clientintegration"
+            val cls: Class<out Element> =
+                when (typeName) {
+                    "Button" ->
+                        Class.forName("$prefix.LayoutButton") as Class<out Element>
+
+                    "Text" ->
+                        Class.forName("$prefix.LayoutText") as Class<out Element>
+
+                    "Image" ->
+                        Class.forName("$prefix.LayoutImage") as Class<out Element>
+
+                    "URL" ->
+                        Class.forName("$prefix.LayoutURL") 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..b2de2759c0
--- /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 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 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?
+) : 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..7a46e6c193
--- /dev/null
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Layout.kt
@@ -0,0 +1,20 @@
+/*
+ * 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 com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class Layout(
+    @SerializedName("orientation")
+    var orientation: LayoutOrientation,
+    var rows: List<LayoutRow>
+) : Parcelable
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutButton.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutButton.kt
new file mode 100644
index 0000000000..e46957c7f5
--- /dev/null
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutButton.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 LayoutButton(
+    val label: String,
+    val type: String
+) : Element,
+    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..8d72d77412
--- /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 LayoutImage(
+    val url: String
+) : Element,
+    Parcelable
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutOrientation.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutOrientation.kt
new file mode 100644
index 0000000000..95556046d6
--- /dev/null
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutOrientation.kt
@@ -0,0 +1,22 @@
+/*
+ * 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 com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+enum class LayoutOrientation : Parcelable {
+    @SerializedName("horizontal")
+    HORIZONTAL,
+
+    @SerializedName("vertical")
+    VERTICAL
+}
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutRow.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutRow.kt
new file mode 100644
index 0000000000..569c9afcbc
--- /dev/null
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutRow.kt
@@ -0,0 +1,17 @@
+/*
+ * 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 LayoutRow(
+    val children: List<Element>
+) : Parcelable
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutText.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutText.kt
new file mode 100644
index 0000000000..994a61b832
--- /dev/null
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutText.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 LayoutText(
+    val text: String
+) : Element,
+    Parcelable
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutURL.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutURL.kt
new file mode 100644
index 0000000000..ebebca12da
--- /dev/null
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutURL.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 LayoutURL(
+    val text: String,
+    val url: 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..14aaa4eae8
--- /dev/null
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/TooltipResponse.kt
@@ -0,0 +1,14 @@
+/*
+ * 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
+
+data class TooltipResponse(
+    val version: Double,
+    val tooltip: String
+)
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/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..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
@@ -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 }
+                .mapNotNull { 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/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())
+    }
 }