From bbfdb5dfab9b13ca9dded12929d084a7510d8e6c Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 2 Jul 2025 10:40:57 +0200
Subject: [PATCH 01/13] wip

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .../lib/resources/declarativeui/Endpoint.kt   | 14 ++++++++++++
 .../GetCapabilitiesRemoteOperation.java       | 21 ++++++++++++++++++
 .../lib/resources/status/OCCapability.kt      | 22 +++++++++++++++++++
 3 files changed, 57 insertions(+)
 create mode 100644 library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Endpoint.kt

diff --git a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Endpoint.kt b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Endpoint.kt
new file mode 100644
index 000000000..d69f7e3fe
--- /dev/null
+++ b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Endpoint.kt
@@ -0,0 +1,14 @@
+/*
+ * Nextcloud Android Library
+ *
+ * SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.owncloud.android.lib.resources.declarativeui
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class Endpoint(val name: String, val relativeURL: String) : 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 431ac4acb..fce228dd9 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
@@ -177,6 +177,10 @@ public class GetCapabilitiesRemoteOperation extends RemoteOperation {
     // notes folder location
     private static final String NODE_NOTES = "notes";
     private static final String NOTES_PATH = "notes_path";
+    
+    // declarative ui
+    private static final String NODE_DECLARATIVE_UI = "declarativeui";
+    private static final String NODE_CONTEXT_MENU = "context-menu";
 
     private static final String PROPERTY_DEFAULT_PERMISSIONS = "default_permissions";
 
@@ -804,6 +808,23 @@ private OCCapability parseResponse(String response) throws JSONException {
                         capability.setNotesFolderPath(notesFolderPath);
                     }
                 }
+                
+                // declarative ui
+                if (respCapabilities.has(NODE_DECLARATIVE_UI)) {
+                    JSONObject declarativeUiCapability = respCapabilities.getJSONObject(NODE_DECLARATIVE_UI);
+                    
+                    if (declarativeUiCapability.has(NODE_CONTEXT_MENU)) {
+                        String array = declarativeUiCapability.getString(NODE_CONTEXT_MENU);
+
+//                        ArrayList<Endpoint> endpoints = new ArrayList<>();
+//                        
+//                        for (int i = 0; i < array.length(); i++) {
+//                            endpoints.add(new Endpoint(array.getJSONArray(i).getString(0), 
+//                                                       array.getJSONArray(i).getString(1)));
+//                        }
+                        capability.setDeclarativeUiContextMenuJson(array);
+                    }
+                }
 
             }
 
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 dc435ff38..06d106708 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,10 @@
  */
 package com.owncloud.android.lib.resources.status
 
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import com.owncloud.android.lib.resources.declarativeui.Endpoint
+
 /**
  * Contains data of the Capabilities for an account, from the Capabilities API
  */
@@ -120,6 +124,24 @@ class OCCapability {
 
     // notes folder location
     var notesFolderPath: String? = null
+    
+    // declarative ui
+    var declarativeUiContextMenuJson: String? = null
+    val declarativeUiContextMenu: List<Endpoint>
+        
+        get() {
+            val listType = object : TypeToken<Array<Array<String>>>() {}.type
+            val arrayList : Array<Array<String>> =  Gson().fromJson(declarativeUiContextMenuJson, listType)
+            
+            var returnList = mutableListOf<Endpoint>();
+            
+            for (a in arrayList) {
+                returnList.add(Endpoint(a[0], a[1]))
+            }
+            
+            return returnList
+        }
+        
 
     // Etag for capabilities
     var etag: String? = ""

From 758c07401fd4a8528065ea48e3ad0c5cff715462 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 2 Jul 2025 12:33:55 +0200
Subject: [PATCH 02/13] wip

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .../GetDeclarativeUiJsonOperation.kt          | 67 +++++++++++++++++++
 .../lib/resources/status/OCCapability.kt      |  6 +-
 2 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 library/src/main/java/com/nextcloud/android/lib/resources/declarativeui/GetDeclarativeUiJsonOperation.kt

diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/declarativeui/GetDeclarativeUiJsonOperation.kt b/library/src/main/java/com/nextcloud/android/lib/resources/declarativeui/GetDeclarativeUiJsonOperation.kt
new file mode 100644
index 000000000..33cc4dcb4
--- /dev/null
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/declarativeui/GetDeclarativeUiJsonOperation.kt
@@ -0,0 +1,67 @@
+/*
+ * Nextcloud Android Library
+ *
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2024 Tobias Kaminsky <tobias@kaminsky.me>
+ * SPDX-License-Identifier: MIT
+ */
+package com.nextcloud.android.lib.resources.declarativeui
+
+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 terms of service of an user
+ */
+class GetDeclarativeUiJsonOperation(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
+
+                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 terms failed: " + result.logMessage,
+                result.exception
+            )
+        } finally {
+            getMethod?.releaseConnection()
+        }
+        return result
+    }
+
+    companion object {
+        private val TAG = GetDeclarativeUiJsonOperation::class.java.simpleName
+    }
+}
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 06d106708..fe85d3590 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
@@ -130,10 +130,14 @@ class OCCapability {
     val declarativeUiContextMenu: List<Endpoint>
         
         get() {
+            if (declarativeUiContextMenuJson == null) {
+                return emptyList()
+            }
+            
             val listType = object : TypeToken<Array<Array<String>>>() {}.type
             val arrayList : Array<Array<String>> =  Gson().fromJson(declarativeUiContextMenuJson, listType)
             
-            var returnList = mutableListOf<Endpoint>();
+            val returnList = mutableListOf<Endpoint>();
             
             for (a in arrayList) {
                 returnList.add(Endpoint(a[0], a[1]))

From e1bc9ec8b96b16c44e72bfab457282d127586b2e Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 10 Jul 2025 13:55:54 +0200
Subject: [PATCH 03/13] wip

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .idea/codeStyles/Project.xml                  | 35 +++++++++++++++
 .../GetDeclarativeUiJsonOperation.kt          | 17 ++++++++
 .../lib/resources/declarativeui/Button.kt     | 10 +++++
 .../resources/declarativeui/DeclarativeUI.kt  | 10 +++++
 .../lib/resources/declarativeui/Element.kt    | 10 +++++
 .../lib/resources/declarativeui/Layout.kt     | 14 ++++++
 .../lib/resources/declarativeui/Row.kt        | 12 ++++++
 .../GetDeclarativeUiJsonOperationTest.kt      | 43 +++++++++++++++++++
 8 files changed, 151 insertions(+)
 create mode 100644 library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Button.kt
 create mode 100644 library/src/main/java/com/owncloud/android/lib/resources/declarativeui/DeclarativeUI.kt
 create mode 100644 library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Element.kt
 create mode 100644 library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Layout.kt
 create mode 100644 library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Row.kt
 create mode 100644 library/src/test/java/com/owncloud/android/lib/resources/declarativeui/GetDeclarativeUiJsonOperationTest.kt

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index f9fc0166c..59e7e7d1e 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/main/java/com/nextcloud/android/lib/resources/declarativeui/GetDeclarativeUiJsonOperation.kt b/library/src/main/java/com/nextcloud/android/lib/resources/declarativeui/GetDeclarativeUiJsonOperation.kt
index 33cc4dcb4..f712eeaa7 100644
--- a/library/src/main/java/com/nextcloud/android/lib/resources/declarativeui/GetDeclarativeUiJsonOperation.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/declarativeui/GetDeclarativeUiJsonOperation.kt
@@ -7,6 +7,7 @@
  */
 package com.nextcloud.android.lib.resources.declarativeui
 
+import com.google.gson.Gson
 import com.google.gson.JsonArray
 import com.google.gson.reflect.TypeToken
 import com.nextcloud.common.NextcloudClient
@@ -15,6 +16,7 @@ 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 com.owncloud.android.lib.resources.declarativeui.DeclarativeUI
 import org.apache.commons.httpclient.HttpStatus
 
 /**
@@ -39,6 +41,8 @@ class GetDeclarativeUiJsonOperation(val url: String) : OCSRemoteOperation<JsonAr
                         object : TypeToken<ServerResponse<JsonArray>>() {}
                     )?.ocs?.data
 
+                val json = parseResult(getMethod.getResponseBodyAsString())
+
                 if (terms != null) {
                     result = RemoteOperationResult(true, getMethod)
                     result.resultData = terms
@@ -61,6 +65,19 @@ class GetDeclarativeUiJsonOperation(val url: String) : OCSRemoteOperation<JsonAr
         return result
     }
 
+    fun parseResult(response: String) : DeclarativeUI {
+        // val listType = object : TypeToken<>>() {}.type
+
+        // val gson = GsonBuilder()
+        //     .registerTypeAdapter(RichElement::class.java, RichElementTypeAdapter())
+        //     .registerTypeAdapter(PreviewObject::class.java, PreviewObjectAdapter())
+        //     .create()
+        // val listType = object : TypeToken<MutableList<Activity?>?>() {
+        // }.getType()
+        
+        return Gson().fromJson(response, DeclarativeUI::class.java)
+    }
+
     companion object {
         private val TAG = GetDeclarativeUiJsonOperation::class.java.simpleName
     }
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Button.kt b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Button.kt
new file mode 100644
index 000000000..0cae7afdd
--- /dev/null
+++ b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Button.kt
@@ -0,0 +1,10 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package com.owncloud.android.lib.resources.declarativeui
+
+data class Button(val label: String, val type: String) : Element
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/DeclarativeUI.kt b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/DeclarativeUI.kt
new file mode 100644
index 000000000..9bf37a266
--- /dev/null
+++ b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/DeclarativeUI.kt
@@ -0,0 +1,10 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package com.owncloud.android.lib.resources.declarativeui
+
+data class DeclarativeUI(val version: Double)
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Element.kt b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Element.kt
new file mode 100644
index 000000000..b482155f6
--- /dev/null
+++ b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Element.kt
@@ -0,0 +1,10 @@
+/*
+ * Nextcloud Android Library
+ *
+ * SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.owncloud.android.lib.resources.declarativeui
+
+interface Element
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Layout.kt b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Layout.kt
new file mode 100644
index 000000000..a2586c41a
--- /dev/null
+++ b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Layout.kt
@@ -0,0 +1,14 @@
+/*
+ * Nextcloud Android Library
+ *
+ * SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.owncloud.android.lib.resources.declarativeui
+
+data class Layout(
+    val type: String,
+    val rows: List<Row>
+)
+
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Row.kt b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Row.kt
new file mode 100644
index 000000000..eeba9b0fb
--- /dev/null
+++ b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Row.kt
@@ -0,0 +1,12 @@
+/*
+ * Nextcloud Android Library
+ *
+ * SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.owncloud.android.lib.resources.declarativeui
+
+data class Row(
+    val children: List<Element>
+)
diff --git a/library/src/test/java/com/owncloud/android/lib/resources/declarativeui/GetDeclarativeUiJsonOperationTest.kt b/library/src/test/java/com/owncloud/android/lib/resources/declarativeui/GetDeclarativeUiJsonOperationTest.kt
new file mode 100644
index 000000000..d403dd0cf
--- /dev/null
+++ b/library/src/test/java/com/owncloud/android/lib/resources/declarativeui/GetDeclarativeUiJsonOperationTest.kt
@@ -0,0 +1,43 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package com.owncloud.android.lib.resources.declarativeui
+
+import com.nextcloud.android.lib.resources.declarativeui.GetDeclarativeUiJsonOperation
+import junit.framework.TestCase.assertEquals
+import org.junit.Test
+
+class GetDeclarativeUiJsonOperationTest {
+    @Test
+    fun testParseJson() {
+        val string1 = """{
+            "version": 0.1,
+            "root": Layout {
+            }
+                
+            }
+  "Button": {
+    "label": "Submit",
+    "type": "primary",
+  },
+  "Image": {
+    "url": "/core/img/logo/logo.png"
+  }
+}"""
+
+        val string = """{
+            "version": "0.1"
+             }
+            """
+
+        val sut = GetDeclarativeUiJsonOperation("")
+
+        val declarativeUI = sut.parseResult(string)
+
+        assertEquals(0.1, declarativeUI.version)
+    }
+}

From 7efd7c66acd7bfb40c8fe5e0aa927919d420f392 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Tue, 15 Jul 2025 14:00:04 +0200
Subject: [PATCH 04/13] wip

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .../GetDeclarativeUiJsonOperation.kt          | 24 +++---
 .../lib/resources/declarativeui/Button.kt     |  5 +-
 .../resources/declarativeui/DeclarativeUI.kt  |  5 +-
 .../declarativeui/ElementTypeAdapter.kt       | 66 ++++++++++++++++
 .../lib/resources/declarativeui/Endpoint.kt   |  5 +-
 .../lib/resources/declarativeui/Image.kt      | 12 +++
 .../lib/resources/declarativeui/Layout.kt     |  8 +-
 .../resources/declarativeui/Orientation.kt    | 18 +++++
 .../lib/resources/declarativeui/Text.kt       | 12 +++
 .../lib/resources/status/OCCapability.kt      | 17 ++--
 .../GetDeclarativeUiJsonOperationTest.kt      | 78 +++++++++++++++----
 11 files changed, 206 insertions(+), 44 deletions(-)
 create mode 100644 library/src/main/java/com/owncloud/android/lib/resources/declarativeui/ElementTypeAdapter.kt
 create mode 100644 library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Image.kt
 create mode 100644 library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Orientation.kt
 create mode 100644 library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Text.kt

diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/declarativeui/GetDeclarativeUiJsonOperation.kt b/library/src/main/java/com/nextcloud/android/lib/resources/declarativeui/GetDeclarativeUiJsonOperation.kt
index f712eeaa7..76496b1c4 100644
--- a/library/src/main/java/com/nextcloud/android/lib/resources/declarativeui/GetDeclarativeUiJsonOperation.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/declarativeui/GetDeclarativeUiJsonOperation.kt
@@ -7,7 +7,7 @@
  */
 package com.nextcloud.android.lib.resources.declarativeui
 
-import com.google.gson.Gson
+import com.google.gson.GsonBuilder
 import com.google.gson.JsonArray
 import com.google.gson.reflect.TypeToken
 import com.nextcloud.common.NextcloudClient
@@ -17,12 +17,16 @@ import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.ocs.ServerResponse
 import com.owncloud.android.lib.resources.OCSRemoteOperation
 import com.owncloud.android.lib.resources.declarativeui.DeclarativeUI
+import com.owncloud.android.lib.resources.declarativeui.Element
+import com.owncloud.android.lib.resources.declarativeui.ElementTypeAdapter
 import org.apache.commons.httpclient.HttpStatus
 
 /**
  * Get terms of service of an user
  */
-class GetDeclarativeUiJsonOperation(val url: String) : OCSRemoteOperation<JsonArray>() {
+class GetDeclarativeUiJsonOperation(
+    val url: String
+) : OCSRemoteOperation<JsonArray>() {
     @Suppress("TooGenericExceptionCaught")
     override fun run(client: NextcloudClient): RemoteOperationResult<JsonArray> {
         var result: RemoteOperationResult<JsonArray>
@@ -65,17 +69,13 @@ class GetDeclarativeUiJsonOperation(val url: String) : OCSRemoteOperation<JsonAr
         return result
     }
 
-    fun parseResult(response: String) : DeclarativeUI {
-        // val listType = object : TypeToken<>>() {}.type
+    fun parseResult(response: String): DeclarativeUI {
+        val gson =
+            GsonBuilder()
+                .registerTypeHierarchyAdapter(Element::class.java, ElementTypeAdapter())
+                .create()
 
-        // val gson = GsonBuilder()
-        //     .registerTypeAdapter(RichElement::class.java, RichElementTypeAdapter())
-        //     .registerTypeAdapter(PreviewObject::class.java, PreviewObjectAdapter())
-        //     .create()
-        // val listType = object : TypeToken<MutableList<Activity?>?>() {
-        // }.getType()
-        
-        return Gson().fromJson(response, DeclarativeUI::class.java)
+        return gson.fromJson(response, DeclarativeUI::class.java)
     }
 
     companion object {
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Button.kt b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Button.kt
index 0cae7afdd..f064851f2 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Button.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Button.kt
@@ -7,4 +7,7 @@
 
 package com.owncloud.android.lib.resources.declarativeui
 
-data class Button(val label: String, val type: String) : Element
+data class Button(
+    val label: String,
+    val type: String
+) : Element
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/DeclarativeUI.kt b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/DeclarativeUI.kt
index 9bf37a266..8a1c8b8a9 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/DeclarativeUI.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/DeclarativeUI.kt
@@ -7,4 +7,7 @@
 
 package com.owncloud.android.lib.resources.declarativeui
 
-data class DeclarativeUI(val version: Double)
+data class DeclarativeUI(
+    val version: Double,
+    val root: Layout
+)
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/ElementTypeAdapter.kt b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/ElementTypeAdapter.kt
new file mode 100644
index 000000000..a7ae25ec4
--- /dev/null
+++ b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/ElementTypeAdapter.kt
@@ -0,0 +1,66 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package com.owncloud.android.lib.resources.declarativeui
+
+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, java.lang.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.owncloud.android.lib.resources.declarativeui.Button")
+                            as Class<out Element>
+
+                    "Text" ->
+                        Class.forName("com.owncloud.android.lib.resources.declarativeui.Text")
+                            as Class<out Element>
+
+                    "Image" ->
+                        Class.forName("com.owncloud.android.lib.resources.declarativeui.Image")
+                            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/owncloud/android/lib/resources/declarativeui/Endpoint.kt b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Endpoint.kt
index d69f7e3fe..f0ad19b3c 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Endpoint.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Endpoint.kt
@@ -11,4 +11,7 @@ import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-data class Endpoint(val name: String, val relativeURL: String) : Parcelable
+data class Endpoint(
+    val name: String,
+    val relativeURL: String
+) : Parcelable
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Image.kt b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Image.kt
new file mode 100644
index 000000000..5ed854677
--- /dev/null
+++ b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Image.kt
@@ -0,0 +1,12 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package com.owncloud.android.lib.resources.declarativeui
+
+data class Image(
+    val url: String
+) : Element
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Layout.kt b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Layout.kt
index a2586c41a..6ee4ddf16 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Layout.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Layout.kt
@@ -7,8 +7,10 @@
 
 package com.owncloud.android.lib.resources.declarativeui
 
+import com.google.gson.annotations.SerializedName
+
 data class Layout(
-    val type: String,
-    val rows: List<Row>
+    @SerializedName("orientation")
+    var orientation: Orientation,
+    var rows: List<Row>
 )
-
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Orientation.kt b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Orientation.kt
new file mode 100644
index 000000000..be53b7160
--- /dev/null
+++ b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Orientation.kt
@@ -0,0 +1,18 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package com.owncloud.android.lib.resources.declarativeui
+
+import com.google.gson.annotations.SerializedName
+
+enum class Orientation {
+    @SerializedName("horizontal")
+    HORIZONTAL,
+
+    @SerializedName("vertical")
+    VERTICAL
+}
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Text.kt b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Text.kt
new file mode 100644
index 000000000..17805a48b
--- /dev/null
+++ b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Text.kt
@@ -0,0 +1,12 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package com.owncloud.android.lib.resources.declarativeui
+
+data class Text(
+    val text: String
+) : Element
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 fe85d3590..253aca6f1 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
@@ -124,28 +124,27 @@ class OCCapability {
 
     // notes folder location
     var notesFolderPath: String? = null
-    
+
     // declarative ui
     var declarativeUiContextMenuJson: String? = null
     val declarativeUiContextMenu: List<Endpoint>
-        
+
         get() {
             if (declarativeUiContextMenuJson == null) {
                 return emptyList()
             }
-            
+
             val listType = object : TypeToken<Array<Array<String>>>() {}.type
-            val arrayList : Array<Array<String>> =  Gson().fromJson(declarativeUiContextMenuJson, listType)
-            
-            val returnList = mutableListOf<Endpoint>();
-            
+            val arrayList: Array<Array<String>> = Gson().fromJson(declarativeUiContextMenuJson, listType)
+
+            val returnList = mutableListOf<Endpoint>()
+
             for (a in arrayList) {
                 returnList.add(Endpoint(a[0], a[1]))
             }
-            
+
             return returnList
         }
-        
 
     // Etag for capabilities
     var etag: String? = ""
diff --git a/library/src/test/java/com/owncloud/android/lib/resources/declarativeui/GetDeclarativeUiJsonOperationTest.kt b/library/src/test/java/com/owncloud/android/lib/resources/declarativeui/GetDeclarativeUiJsonOperationTest.kt
index d403dd0cf..17287ed16 100644
--- a/library/src/test/java/com/owncloud/android/lib/resources/declarativeui/GetDeclarativeUiJsonOperationTest.kt
+++ b/library/src/test/java/com/owncloud/android/lib/resources/declarativeui/GetDeclarativeUiJsonOperationTest.kt
@@ -13,25 +13,43 @@ import org.junit.Test
 
 class GetDeclarativeUiJsonOperationTest {
     @Test
+    @Suppress("LongMethod")
     fun testParseJson() {
-        val string1 = """{
-            "version": 0.1,
-            "root": Layout {
+        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"
+                                }
+                            ]
+                        }
+                    ]
+                }
             }
-                
-            }
-  "Button": {
-    "label": "Submit",
-    "type": "primary",
-  },
-  "Image": {
-    "url": "/core/img/logo/logo.png"
-  }
-}"""
-
-        val string = """{
-            "version": "0.1"
-             }
             """
 
         val sut = GetDeclarativeUiJsonOperation("")
@@ -39,5 +57,31 @@ class GetDeclarativeUiJsonOperationTest {
         val declarativeUI = sut.parseResult(string)
 
         assertEquals(0.1, declarativeUI.version)
+        assertEquals(Orientation.VERTICAL, declarativeUI.root.orientation)
+        assertEquals(2, declarativeUI.root.rows.count())
+
+        // row 1
+        assertEquals(
+            2,
+            declarativeUI.root.rows[0]
+                .children
+                .count()
+        )
+
+        val button1 = declarativeUI.root.rows[0].children[0] as Button
+        assertEquals("Submit", button1.label)
+
+        // row 2
+        assertEquals(
+            2,
+            declarativeUI.root.rows[1]
+                .children
+                .count()
+        )
+        val text = declarativeUI.root.rows[1].children[0] as Text
+        assertEquals("Hello World!", text.text)
+
+        val image = declarativeUI.root.rows[1].children[1] as Image
+        assertEquals("/core/img/logo/logo.png", image.url)
     }
 }

From efbf4726a64aea09a81938821c12f4f22a6ed6d4 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 23 Jul 2025 08:24:31 +0200
Subject: [PATCH 05/13] wip

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .../lib/resources/status/DeclarativeUI.kt     | 10 ++++++++
 .../GetCapabilitiesRemoteOperation.java       | 19 +++------------
 .../android/lib/resources/status/Hook.kt      | 12 ++++++++++
 .../lib/resources/status/OCCapability.kt      | 24 +++++++------------
 4 files changed, 34 insertions(+), 31 deletions(-)
 create mode 100644 library/src/main/java/com/owncloud/android/lib/resources/status/DeclarativeUI.kt
 create mode 100644 library/src/main/java/com/owncloud/android/lib/resources/status/Hook.kt

diff --git a/library/src/main/java/com/owncloud/android/lib/resources/status/DeclarativeUI.kt b/library/src/main/java/com/owncloud/android/lib/resources/status/DeclarativeUI.kt
new file mode 100644
index 000000000..56e37d480
--- /dev/null
+++ b/library/src/main/java/com/owncloud/android/lib/resources/status/DeclarativeUI.kt
@@ -0,0 +1,10 @@
+/*
+ * Nextcloud Android Library
+ *
+ * SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.owncloud.android.lib.resources.status
+
+data class DeclarativeUI(val hooks: Map<String, Hook>)
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 fce228dd9..8ede17080 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
@@ -214,7 +214,7 @@ public RemoteOperationResult run(NextcloudClient client) {
 
             status = client.execute(get);
 
-            if (isNotModified(status)) {
+            if (false) {
                 Log_OC.d(TAG, "Capabilities not modified");
 
                 result = new RemoteOperationResult(true, get);
@@ -808,24 +808,11 @@ private OCCapability parseResponse(String response) throws JSONException {
                         capability.setNotesFolderPath(notesFolderPath);
                     }
                 }
-                
+
                 // declarative ui
                 if (respCapabilities.has(NODE_DECLARATIVE_UI)) {
-                    JSONObject declarativeUiCapability = respCapabilities.getJSONObject(NODE_DECLARATIVE_UI);
-                    
-                    if (declarativeUiCapability.has(NODE_CONTEXT_MENU)) {
-                        String array = declarativeUiCapability.getString(NODE_CONTEXT_MENU);
-
-//                        ArrayList<Endpoint> endpoints = new ArrayList<>();
-//                        
-//                        for (int i = 0; i < array.length(); i++) {
-//                            endpoints.add(new Endpoint(array.getJSONArray(i).getString(0), 
-//                                                       array.getJSONArray(i).getString(1)));
-//                        }
-                        capability.setDeclarativeUiContextMenuJson(array);
-                    }
+                    capability.setDeclarativeUiJson(respCapabilities.getString(NODE_DECLARATIVE_UI));
                 }
-
             }
 
             Log_OC.d(TAG, "*** Get Capabilities completed ");
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/status/Hook.kt b/library/src/main/java/com/owncloud/android/lib/resources/status/Hook.kt
new file mode 100644
index 000000000..bcae5064e
--- /dev/null
+++ b/library/src/main/java/com/owncloud/android/lib/resources/status/Hook.kt
@@ -0,0 +1,12 @@
+/*
+ * Nextcloud Android Library
+ *
+ * SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.owncloud.android.lib.resources.status
+
+import com.owncloud.android.lib.resources.declarativeui.Endpoint
+
+data class Hook(val endpoints: List<Endpoint>)
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 253aca6f1..5d0342b37 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
@@ -125,25 +125,19 @@ class OCCapability {
     // notes folder location
     var notesFolderPath: String? = null
 
-    // declarative ui
-    var declarativeUiContextMenuJson: String? = null
-    val declarativeUiContextMenu: List<Endpoint>
+    // declarative ui - context menu
+    var declarativeUiJson: String? = null
 
-        get() {
-            if (declarativeUiContextMenuJson == null) {
+    fun getDeclarativeUi(type: String) : List<Endpoint> {
+            if (declarativeUiJson == null ||  type.isEmpty()) {
                 return emptyList()
             }
 
-            val listType = object : TypeToken<Array<Array<String>>>() {}.type
-            val arrayList: Array<Array<String>> = Gson().fromJson(declarativeUiContextMenuJson, listType)
-
-            val returnList = mutableListOf<Endpoint>()
-
-            for (a in arrayList) {
-                returnList.add(Endpoint(a[0], a[1]))
-            }
-
-            return returnList
+         val listType = object : TypeToken<Map<String, Hook>>() {}.type
+         val l = object : TypeToken<List<String>>() {}.type
+            val declarativeUI: Map<String, Hook> = Gson().fromJson(declarativeUiJson, l)
+        
+            return declarativeUI.getValue(type).endpoints
         }
 
     // Etag for capabilities

From 71b069789ec97b4f41f2c5345ddc628fac9f7265 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 24 Jul 2025 09:56:41 +0200
Subject: [PATCH 06/13] working version

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .../GetCapabilitiesRemoteOperationIT.java       | 17 +++++++++++++++++
 .../lib/resources/declarativeui/Endpoint.kt     |  2 +-
 .../lib/resources/status/DeclarativeUI.kt       |  4 +++-
 .../lib/resources/status/OCCapability.kt        |  8 ++++----
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java b/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java
index 0b8bcda75..6437bae06 100644
--- a/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java
+++ b/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java
@@ -10,6 +10,7 @@
 package com.owncloud.android;
 
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.resources.declarativeui.Endpoint;
 import com.owncloud.android.lib.resources.status.CapabilityBooleanType;
 import com.owncloud.android.lib.resources.status.E2EVersion;
 import com.owncloud.android.lib.resources.status.GetCapabilitiesRemoteOperation;
@@ -19,6 +20,8 @@
 
 import org.junit.Test;
 
+import java.util.List;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -165,4 +168,18 @@ private void checkCapability(OCCapability capability, String userId) {
             assertTrue(capability.getUserStatusSupportsBusy().isTrue());
         }
     }
+    
+    @Test
+    public void testDeclarativeUI() {
+        // get capabilities
+        RemoteOperationResult result = new GetCapabilitiesRemoteOperation().execute(nextcloudClient);
+        assertTrue(result.isSuccess());
+        assertNotNull(result.getSingleData());
+
+        OCCapability capability = (OCCapability) result.getSingleData();
+
+        List<Endpoint> createNewList =  capability.getDeclarativeUi("create-new");
+        
+        assertFalse(createNewList.isEmpty());
+    } 
 }
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Endpoint.kt b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Endpoint.kt
index f0ad19b3c..9417c7d8c 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Endpoint.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Endpoint.kt
@@ -13,5 +13,5 @@ import kotlinx.parcelize.Parcelize
 @Parcelize
 data class Endpoint(
     val name: String,
-    val relativeURL: String
+    val url: String
 ) : Parcelable
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/status/DeclarativeUI.kt b/library/src/main/java/com/owncloud/android/lib/resources/status/DeclarativeUI.kt
index 56e37d480..f4fa09180 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/status/DeclarativeUI.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/status/DeclarativeUI.kt
@@ -7,4 +7,6 @@
 
 package com.owncloud.android.lib.resources.status
 
-data class DeclarativeUI(val hooks: Map<String, Hook>)
+import com.owncloud.android.lib.resources.declarativeui.Endpoint
+
+data class DeclarativeUI(val contextmenu: List<Endpoint>)
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 5d0342b37..5836ef8c0 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
@@ -133,11 +133,11 @@ class OCCapability {
                 return emptyList()
             }
 
-         val listType = object : TypeToken<Map<String, Hook>>() {}.type
-         val l = object : TypeToken<List<String>>() {}.type
-            val declarativeUI: Map<String, Hook> = Gson().fromJson(declarativeUiJson, l)
+         val l = object : TypeToken<DeclarativeUI>() {}.type
+         //val l = object : TypeToken<List<String>>() {}.type
+            val declarativeUI: DeclarativeUI = Gson().fromJson(declarativeUiJson, l)
         
-            return declarativeUI.getValue(type).endpoints
+            return declarativeUI.contextmenu // declarativeUI.getValue(type).endpoints
         }
 
     // Etag for capabilities

From 3f62a46b0b378bfed0a9b0e34dd5ca907c839157 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 21 Aug 2025 08:52:52 +0200
Subject: [PATCH 07/13] wip

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .../GetCapabilitiesRemoteOperationIT.java     |  7 +++----
 .../lib/resources/declarativeui/Endpoint.kt   |  6 +++++-
 ...{DeclarativeUI.kt => DeclarativeUiData.kt} |  4 +---
 .../android/lib/resources/status/Hook.kt      | 11 +++++++++-
 .../lib/resources/status/OCCapability.kt      | 20 +++++++++----------
 5 files changed, 28 insertions(+), 20 deletions(-)
 rename library/src/main/java/com/owncloud/android/lib/resources/status/{DeclarativeUI.kt => DeclarativeUiData.kt} (59%)

diff --git a/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java b/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java
index 6437bae06..5dc6b767c 100644
--- a/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java
+++ b/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java
@@ -10,13 +10,13 @@
 package com.owncloud.android;
 
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.lib.resources.declarativeui.Endpoint;
 import com.owncloud.android.lib.resources.status.CapabilityBooleanType;
 import com.owncloud.android.lib.resources.status.E2EVersion;
 import com.owncloud.android.lib.resources.status.GetCapabilitiesRemoteOperation;
 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;
 
@@ -178,8 +178,7 @@ public void testDeclarativeUI() {
 
         OCCapability capability = (OCCapability) result.getSingleData();
 
-        List<Endpoint> createNewList =  capability.getDeclarativeUi("create-new");
-        
-        assertFalse(createNewList.isEmpty());
+        assertEquals(5, capability.getDeclarativeUiEndpoints(Type.CONTEXT_MENU).size());
+        assertEquals(2, capability.getDeclarativeUiEndpoints(Type.CREATE_NEW).size());
     } 
 }
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Endpoint.kt b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Endpoint.kt
index 9417c7d8c..b159a0cbf 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Endpoint.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Endpoint.kt
@@ -8,10 +8,14 @@
 package com.owncloud.android.lib.resources.declarativeui
 
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class Endpoint(
     val name: String,
-    val url: String
+    val url: String,
+    @SerializedName("android_icon")
+    val icon: String?,
+    val filter: String?
 ) : Parcelable
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/status/DeclarativeUI.kt b/library/src/main/java/com/owncloud/android/lib/resources/status/DeclarativeUiData.kt
similarity index 59%
rename from library/src/main/java/com/owncloud/android/lib/resources/status/DeclarativeUI.kt
rename to library/src/main/java/com/owncloud/android/lib/resources/status/DeclarativeUiData.kt
index f4fa09180..df3e84199 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/status/DeclarativeUI.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/status/DeclarativeUiData.kt
@@ -7,6 +7,4 @@
 
 package com.owncloud.android.lib.resources.status
 
-import com.owncloud.android.lib.resources.declarativeui.Endpoint
-
-data class DeclarativeUI(val contextmenu: List<Endpoint>)
+data class DeclarativeUiData(val hooks: List<Hook>)
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/status/Hook.kt b/library/src/main/java/com/owncloud/android/lib/resources/status/Hook.kt
index bcae5064e..c8a016317 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/status/Hook.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/status/Hook.kt
@@ -7,6 +7,15 @@
 
 package com.owncloud.android.lib.resources.status
 
+import com.google.gson.annotations.SerializedName
 import com.owncloud.android.lib.resources.declarativeui.Endpoint
 
-data class Hook(val endpoints: List<Endpoint>)
+data class Hook(val type: Type, val endpoints: List<Endpoint>)
+
+enum class Type {
+    @SerializedName("context-menu")
+    CONTEXT_MENU,
+
+    @SerializedName("create-new")
+    CREATE_NEW
+}
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 5836ef8c0..2e83ed9af 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
@@ -10,7 +10,6 @@
 package com.owncloud.android.lib.resources.status
 
 import com.google.gson.Gson
-import com.google.gson.reflect.TypeToken
 import com.owncloud.android.lib.resources.declarativeui.Endpoint
 
 /**
@@ -128,18 +127,17 @@ class OCCapability {
     // declarative ui - context menu
     var declarativeUiJson: String? = null
 
-    fun getDeclarativeUi(type: String) : List<Endpoint> {
-            if (declarativeUiJson == null ||  type.isEmpty()) {
-                return emptyList()
-            }
-
-         val l = object : TypeToken<DeclarativeUI>() {}.type
-         //val l = object : TypeToken<List<String>>() {}.type
-            val declarativeUI: DeclarativeUI = Gson().fromJson(declarativeUiJson, l)
-        
-            return declarativeUI.contextmenu // declarativeUI.getValue(type).endpoints
+    fun getDeclarativeUiEndpoints(hook: Type): List<Endpoint> {
+        if (declarativeUiJson == null) {
+            return emptyList()
         }
 
+        val declarativeUI: DeclarativeUiData = Gson().fromJson(declarativeUiJson, DeclarativeUiData::class.java)
+
+        return declarativeUI.hooks.find { it.type == hook }?.endpoints
+            ?: emptyList()
+    }
+
     // Etag for capabilities
     var etag: String? = ""
 

From f4b76c44c367935c59f641a8d2fb7f642e1313c0 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Tue, 16 Sep 2025 13:51:10 +0200
Subject: [PATCH 08/13] wip

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .../java/com/owncloud/android/AbstractIT.java |  4 +-
 .../GetCapabilitiesRemoteOperationIT.java     | 16 ++--
 .../lib/resources/declarativeui/Endpoint.kt   |  5 ++
 .../{DeclarativeUiData.kt => Method.kt}       |  6 +-
 .../lib/resources/status/OCCapability.kt      | 27 +++++-
 .../lib/resources/status/{Hook.kt => Type.kt} |  9 +-
 .../lib/resources/status/OCCapabilityTest.kt  | 83 +++++++++++++++++++
 7 files changed, 128 insertions(+), 22 deletions(-)
 rename library/src/main/java/com/owncloud/android/lib/resources/status/{DeclarativeUiData.kt => Method.kt} (77%)
 rename library/src/main/java/com/owncloud/android/lib/resources/status/{Hook.kt => Type.kt} (62%)

diff --git a/library/src/androidTest/java/com/owncloud/android/AbstractIT.java b/library/src/androidTest/java/com/owncloud/android/AbstractIT.java
index d36d360d1..be1e3ab67 100644
--- a/library/src/androidTest/java/com/owncloud/android/AbstractIT.java
+++ b/library/src/androidTest/java/com/owncloud/android/AbstractIT.java
@@ -262,8 +262,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 5dc6b767c..41bfe2124 100644
--- a/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java
+++ b/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java
@@ -9,6 +9,13 @@
  */
 package com.owncloud.android;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.resources.status.CapabilityBooleanType;
 import com.owncloud.android.lib.resources.status.E2EVersion;
@@ -20,15 +27,6 @@
 
 import org.junit.Test;
 
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
 /**
  * Class to test GetRemoteCapabilitiesOperation
  */
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Endpoint.kt b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Endpoint.kt
index b159a0cbf..5e651feed 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Endpoint.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Endpoint.kt
@@ -9,12 +9,17 @@ package com.owncloud.android.lib.resources.declarativeui
 
 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 bodyParams: Array<String>?,
     @SerializedName("android_icon")
     val icon: String?,
     val filter: String?
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/status/DeclarativeUiData.kt b/library/src/main/java/com/owncloud/android/lib/resources/status/Method.kt
similarity index 77%
rename from library/src/main/java/com/owncloud/android/lib/resources/status/DeclarativeUiData.kt
rename to library/src/main/java/com/owncloud/android/lib/resources/status/Method.kt
index df3e84199..e84eaad64 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/status/DeclarativeUiData.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/status/Method.kt
@@ -7,4 +7,8 @@
 
 package com.owncloud.android.lib.resources.status
 
-data class DeclarativeUiData(val hooks: List<Hook>)
+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 2e83ed9af..47cfb50df 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
@@ -10,6 +10,7 @@
 package com.owncloud.android.lib.resources.status
 
 import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
 import com.owncloud.android.lib.resources.declarativeui.Endpoint
 
 /**
@@ -127,15 +128,33 @@ class OCCapability {
     // declarative ui - context menu
     var declarativeUiJson: String? = null
 
-    fun getDeclarativeUiEndpoints(hook: Type): List<Endpoint> {
+    fun getDeclarativeUiEndpoints(hook: Type, mimetype: String): List<Endpoint> {
         if (declarativeUiJson == null) {
             return emptyList()
         }
 
-        val declarativeUI: DeclarativeUiData = Gson().fromJson(declarativeUiJson, DeclarativeUiData::class.java)
+        val apps = object : TypeToken<Map<String, Map<String, List<Endpoint>>>>() {}.type
+        val test: Map<String, Map<String, List<Endpoint>>> = Gson().fromJson(declarativeUiJson, apps)
 
-        return declarativeUI.hooks.find { it.type == hook }?.endpoints
-            ?: emptyList()
+        val endpoints = test.values
+            .map { it[hook.string] }
+            .flatMap { it?.toList().orEmpty() }
+            .filter {
+                filterMimetype(mimetype, it.mimetypeFilter)
+
+            }
+
+        endpoints.forEach {
+            if (it.method == null) {
+                it.method = Method.GET
+            }
+        }
+
+        return endpoints
+    }
+
+    private fun filterMimetype(mimetype: String, mimetypeFilter: String?): Boolean {
+        return mimetypeFilter?.split(",")?.any { mimetype.startsWith(it.trim()) } ?: true
     }
 
     // Etag for capabilities
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/status/Hook.kt b/library/src/main/java/com/owncloud/android/lib/resources/status/Type.kt
similarity index 62%
rename from library/src/main/java/com/owncloud/android/lib/resources/status/Hook.kt
rename to library/src/main/java/com/owncloud/android/lib/resources/status/Type.kt
index c8a016317..2c91bc791 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/status/Hook.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/status/Type.kt
@@ -8,14 +8,11 @@
 package com.owncloud.android.lib.resources.status
 
 import com.google.gson.annotations.SerializedName
-import com.owncloud.android.lib.resources.declarativeui.Endpoint
 
-data class Hook(val type: Type, val endpoints: List<Endpoint>)
-
-enum class Type {
+enum class Type(val string: String) {
     @SerializedName("context-menu")
-    CONTEXT_MENU,
+    CONTEXT_MENU("context-menu"),
 
     @SerializedName("create-new")
-    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 dabdb0385..34ccac87d 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,86 @@ class OCCapabilityTest {
             directEditingEtag = null
         }
     }
+
+    @Test
+    fun parseDeclarativeUI() {
+        val string = """{
+              "analytics": {
+                "context-menu": [
+                  {
+                    "name": "Show data in Analytics",
+                    "url": "\/ocs\/v2.php\/apps\/analytics\/createFromDataFile?fileId={fileId}",
+                    "method": "POST",
+                    "mimetype_filters": "text\/csv",
+                    "bodyParams": [],
+                    "icon": "\/apps\/analytics\/img\/app.svg"
+                  }
+                ],
+                 "create-new": [
+                  {
+                    "name": "Analytic chart",
+                    "url": "\/ocs\/v2.php\/apps\/declarativetest\/newChart"
+                  }
+                  ]
+              },
+              "declarativetest": {
+                "context-menu": [
+                  {
+                    "name": "List all UI elements",
+                    "url": "\/ocs\/v2.php\/apps\/declarativetest\/all"
+                  },
+                  {
+                    "name": "First version",
+                    "url": "\/ocs\/v2.php\/apps\/declarativetest\/version1"
+                  },
+                  {
+                    "name": "Convert to PDF",
+                    "url": "\/ocs\/v2.php\/apps\/declarativetest\/convertFile\/123123",
+                    "mimetype_filters": "image\/"
+                  },
+                  {
+                    "name": "Create transcript",
+                    "url": "\/ocs\/v2.php\/apps\/declarativetest\/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\/declarativetest\/version1",
+                    "mimetype_filters": "application\/zip",
+                    "android_icon": "file_zip"
+                  }
+                ],
+                "create-new": [
+                  {
+                    "name": "Deck board",
+                    "url": "\/ocs\/v2.php\/apps\/declarativetest\/newDeckBoard"
+                  },
+                  {
+                    "name": "New Contact",
+                    "url": "\/ocs\/v2.php\/apps\/declarativetest\/newContact",
+                    "android_icon": "file_vcard"
+                  }
+                ]
+              }
+            }"""
+        
+        val sut = OCCapability()
+        sut.declarativeUiJson = string
+
+        // Markdown
+        assertEquals(3, sut.getDeclarativeUiEndpoints(Type.CONTEXT_MENU, "text/markdown").size.toLong())
+        assertEquals(3, sut.getDeclarativeUiEndpoints(Type.CREATE_NEW, "text/markdown").size.toLong())
+
+        // Zip
+        assertEquals(3, sut.getDeclarativeUiEndpoints(Type.CONTEXT_MENU, "application/zip").size.toLong())
+        assertEquals(3, sut.getDeclarativeUiEndpoints(Type.CREATE_NEW, "application/zip").size.toLong())
+    }
 }

From dc2be58bd96a84c896087493bdfbbe1524a037e9 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Mon, 22 Sep 2025 14:01:46 +0200
Subject: [PATCH 09/13] wip

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .../GetCapabilitiesRemoteOperationIT.java     |  4 +--
 .../declarativeui/ElementTypeAdapter.kt       |  4 +++
 .../lib/resources/declarativeui/Endpoint.kt   |  2 +-
 .../lib/resources/declarativeui/URL.kt        | 13 +++++++++
 .../lib/resources/status/OCCapability.kt      | 29 ++++++++++++-------
 .../android/lib/resources/status/Type.kt      |  4 ++-
 .../lib/resources/status/OCCapabilityTest.kt  |  3 +-
 7 files changed, 43 insertions(+), 16 deletions(-)
 create mode 100644 library/src/main/java/com/owncloud/android/lib/resources/declarativeui/URL.kt

diff --git a/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java b/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java
index 41bfe2124..9a6886160 100644
--- a/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java
+++ b/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java
@@ -176,7 +176,7 @@ public void testDeclarativeUI() {
 
         OCCapability capability = (OCCapability) result.getSingleData();
 
-        assertEquals(5, capability.getDeclarativeUiEndpoints(Type.CONTEXT_MENU).size());
-        assertEquals(2, capability.getDeclarativeUiEndpoints(Type.CREATE_NEW).size());
+        assertEquals(5, capability.getDeclarativeUiEndpoints(Type.CONTEXT_MENU, "").size());
+        assertEquals(2, capability.getDeclarativeUiEndpoints(Type.CREATE_NEW, "").size());
     } 
 }
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/ElementTypeAdapter.kt b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/ElementTypeAdapter.kt
index a7ae25ec4..4763e4ec6 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/ElementTypeAdapter.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/ElementTypeAdapter.kt
@@ -55,6 +55,10 @@ class ElementTypeAdapter :
                         Class.forName("com.owncloud.android.lib.resources.declarativeui.Image")
                             as Class<out Element>
 
+                    "URL" ->
+                        Class.forName("com.owncloud.android.lib.resources.declarativeui.URL")
+                            as Class<out Element>
+
                     else -> return null
                 }
 
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Endpoint.kt b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Endpoint.kt
index 5e651feed..2ae5658bc 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Endpoint.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Endpoint.kt
@@ -19,8 +19,8 @@ data class Endpoint(
     var method: Method?,
     @SerializedName("mimetype_filters")
     val mimetypeFilter: String?,
+    @SerializedName("params")
     val bodyParams: Array<String>?,
-    @SerializedName("android_icon")
     val icon: String?,
     val filter: String?
 ) : Parcelable
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/URL.kt b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/URL.kt
new file mode 100644
index 000000000..de345f5e0
--- /dev/null
+++ b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/URL.kt
@@ -0,0 +1,13 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package com.owncloud.android.lib.resources.declarativeui
+
+data class URL(
+    val text: String,
+    val url: String
+) : Element
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 47cfb50df..e3228467f 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
@@ -128,7 +128,10 @@ class OCCapability {
     // declarative ui - context menu
     var declarativeUiJson: String? = null
 
-    fun getDeclarativeUiEndpoints(hook: Type, mimetype: String): List<Endpoint> {
+    fun getDeclarativeUiEndpoints(
+        hook: Type,
+        mimetype: String
+    ): List<Endpoint> {
         if (declarativeUiJson == null) {
             return emptyList()
         }
@@ -136,13 +139,13 @@ class OCCapability {
         val apps = object : TypeToken<Map<String, Map<String, List<Endpoint>>>>() {}.type
         val test: Map<String, Map<String, List<Endpoint>>> = Gson().fromJson(declarativeUiJson, apps)
 
-        val endpoints = test.values
-            .map { it[hook.string] }
-            .flatMap { it?.toList().orEmpty() }
-            .filter {
-                filterMimetype(mimetype, it.mimetypeFilter)
-
-            }
+        val endpoints =
+            test.values
+                .map { it[hook.string] }
+                .flatMap { it?.toList().orEmpty() }
+                .filter {
+                    filterMimetype(mimetype, it.mimetypeFilter)
+                }
 
         endpoints.forEach {
             if (it.method == null) {
@@ -153,9 +156,13 @@ class OCCapability {
         return endpoints
     }
 
-    private fun filterMimetype(mimetype: String, mimetypeFilter: String?): Boolean {
-        return mimetypeFilter?.split(",")?.any { mimetype.startsWith(it.trim()) } ?: true
-    }
+    private fun filterMimetype(
+        mimetype: String,
+        mimetypeFilter: String?
+    ): Boolean =
+        mimetypeFilter?.split(",")?.any {
+            mimetype.startsWith(it.trim())
+        } ?: true
 
     // Etag for capabilities
     var etag: String? = ""
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
index 2c91bc791..0449d43e3 100644
--- 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
@@ -9,7 +9,9 @@ package com.owncloud.android.lib.resources.status
 
 import com.google.gson.annotations.SerializedName
 
-enum class Type(val string: String) {
+enum class Type(
+    val string: String
+) {
     @SerializedName("context-menu")
     CONTEXT_MENU("context-menu"),
 
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 34ccac87d..c96e666b0 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
@@ -38,6 +38,7 @@ class OCCapabilityTest {
     }
 
     @Test
+    @Suppress("LongMethod")
     fun parseDeclarativeUI() {
         val string = """{
               "analytics": {
@@ -106,7 +107,7 @@ class OCCapabilityTest {
                 ]
               }
             }"""
-        
+
         val sut = OCCapability()
         sut.declarativeUiJson = string
 

From 81a517b601b96ffbb4f7fae1f1de88be2b42132c Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 25 Sep 2025 13:10:41 +0200
Subject: [PATCH 10/13] wip

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .../android/lib/resources/declarativeui/Endpoint.kt        | 3 +--
 .../android/lib/resources/status/OCCapabilityTest.kt       | 7 +++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Endpoint.kt b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Endpoint.kt
index 2ae5658bc..735b2b6cf 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Endpoint.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Endpoint.kt
@@ -19,8 +19,7 @@ data class Endpoint(
     var method: Method?,
     @SerializedName("mimetype_filters")
     val mimetypeFilter: String?,
-    @SerializedName("params")
-    val bodyParams: Array<String>?,
+    val params: Map<String, String>?,
     val icon: String?,
     val filter: String?
 ) : Parcelable
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 c96e666b0..cf1968068 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
@@ -48,7 +48,10 @@ class OCCapabilityTest {
                     "url": "\/ocs\/v2.php\/apps\/analytics\/createFromDataFile?fileId={fileId}",
                     "method": "POST",
                     "mimetype_filters": "text\/csv",
-                    "bodyParams": [],
+                    "params": {
+                        'file_id': '{fileId}',
+                        'file_path': '{filePath}'
+                    },
                     "icon": "\/apps\/analytics\/img\/app.svg"
                   }
                 ],
@@ -116,7 +119,7 @@ class OCCapabilityTest {
         assertEquals(3, sut.getDeclarativeUiEndpoints(Type.CREATE_NEW, "text/markdown").size.toLong())
 
         // Zip
-        assertEquals(3, sut.getDeclarativeUiEndpoints(Type.CONTEXT_MENU, "application/zip").size.toLong())
+        assertEquals(4, sut.getDeclarativeUiEndpoints(Type.CONTEXT_MENU, "application/zip").size.toLong())
         assertEquals(3, sut.getDeclarativeUiEndpoints(Type.CREATE_NEW, "application/zip").size.toLong())
     }
 }

From 09cf4217e675482eea6d676fb1b8fa581aa2a854 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Tue, 7 Oct 2025 09:28:10 +0200
Subject: [PATCH 11/13] wip

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .../GetCapabilitiesRemoteOperationIT.java     |  6 +--
 ...t => GetClientIntegrationJsonOperation.kt} | 22 +++++------
 .../lib/resources/clientintegration/App.kt    | 19 ++++++++++
 .../Button.kt                                 |  2 +-
 .../ClientIntegrationUI.kt}                   |  4 +-
 .../Element.kt                                |  2 +-
 .../ElementTypeAdapter.kt                     |  2 +-
 .../Endpoint.kt                               |  2 +-
 .../Image.kt                                  |  2 +-
 .../Layout.kt                                 |  2 +-
 .../Orientation.kt                            |  2 +-
 .../Row.kt                                    |  2 +-
 .../Text.kt                                   |  2 +-
 .../URL.kt                                    |  2 +-
 .../GetCapabilitiesRemoteOperation.java       | 11 +++---
 .../android/lib/resources/status/Method.kt    |  3 +-
 .../lib/resources/status/OCCapability.kt      | 37 ++++++++++++-------
 .../android/lib/resources/status/Type.kt      |  3 +-
 .../GetDeclarativeUiJsonOperationTest.kt      |  6 +--
 .../lib/resources/status/OCCapabilityTest.kt  | 31 +++++++++++++---
 20 files changed, 106 insertions(+), 56 deletions(-)
 rename library/src/main/java/com/nextcloud/android/lib/resources/declarativeui/{GetDeclarativeUiJsonOperation.kt => GetClientIntegrationJsonOperation.kt} (76%)
 create mode 100644 library/src/main/java/com/owncloud/android/lib/resources/clientintegration/App.kt
 rename library/src/main/java/com/owncloud/android/lib/resources/{declarativeui => clientintegration}/Button.kt (78%)
 rename library/src/main/java/com/owncloud/android/lib/resources/{declarativeui/DeclarativeUI.kt => clientintegration/ClientIntegrationUI.kt} (67%)
 rename library/src/main/java/com/owncloud/android/lib/resources/{declarativeui => clientintegration}/Element.kt (71%)
 rename library/src/main/java/com/owncloud/android/lib/resources/{declarativeui => clientintegration}/ElementTypeAdapter.kt (97%)
 rename library/src/main/java/com/owncloud/android/lib/resources/{declarativeui => clientintegration}/Endpoint.kt (90%)
 rename library/src/main/java/com/owncloud/android/lib/resources/{declarativeui => clientintegration}/Image.kt (76%)
 rename library/src/main/java/com/owncloud/android/lib/resources/{declarativeui => clientintegration}/Layout.kt (82%)
 rename library/src/main/java/com/owncloud/android/lib/resources/{declarativeui => clientintegration}/Orientation.kt (84%)
 rename library/src/main/java/com/owncloud/android/lib/resources/{declarativeui => clientintegration}/Row.kt (74%)
 rename library/src/main/java/com/owncloud/android/lib/resources/{declarativeui => clientintegration}/Text.kt (76%)
 rename library/src/main/java/com/owncloud/android/lib/resources/{declarativeui => clientintegration}/URL.kt (78%)
 rename library/src/test/java/com/owncloud/android/lib/resources/{declarativeui => clientintegration}/GetDeclarativeUiJsonOperationTest.kt (92%)

diff --git a/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java b/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java
index 9a6886160..8f3184a5b 100644
--- a/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java
+++ b/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java
@@ -168,7 +168,7 @@ private void checkCapability(OCCapability capability, String userId) {
     }
     
     @Test
-    public void testDeclarativeUI() {
+    public void testClientIntegration() {
         // get capabilities
         RemoteOperationResult result = new GetCapabilitiesRemoteOperation().execute(nextcloudClient);
         assertTrue(result.isSuccess());
@@ -176,7 +176,7 @@ public void testDeclarativeUI() {
 
         OCCapability capability = (OCCapability) result.getSingleData();
 
-        assertEquals(5, capability.getDeclarativeUiEndpoints(Type.CONTEXT_MENU, "").size());
-        assertEquals(2, capability.getDeclarativeUiEndpoints(Type.CREATE_NEW, "").size());
+        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/declarativeui/GetDeclarativeUiJsonOperation.kt b/library/src/main/java/com/nextcloud/android/lib/resources/declarativeui/GetClientIntegrationJsonOperation.kt
similarity index 76%
rename from library/src/main/java/com/nextcloud/android/lib/resources/declarativeui/GetDeclarativeUiJsonOperation.kt
rename to library/src/main/java/com/nextcloud/android/lib/resources/declarativeui/GetClientIntegrationJsonOperation.kt
index 76496b1c4..00565e654 100644
--- a/library/src/main/java/com/nextcloud/android/lib/resources/declarativeui/GetDeclarativeUiJsonOperation.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/declarativeui/GetClientIntegrationJsonOperation.kt
@@ -1,8 +1,8 @@
 /*
  * Nextcloud Android Library
  *
- * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
- * SPDX-FileCopyrightText: 2024 Tobias Kaminsky <tobias@kaminsky.me>
+ * 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.declarativeui
@@ -16,15 +16,15 @@ 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 com.owncloud.android.lib.resources.declarativeui.DeclarativeUI
-import com.owncloud.android.lib.resources.declarativeui.Element
-import com.owncloud.android.lib.resources.declarativeui.ElementTypeAdapter
+import com.owncloud.android.lib.resources.clientintegration.ClientIntegrationUI
+import com.owncloud.android.lib.resources.clientintegration.Element
+import com.owncloud.android.lib.resources.clientintegration.ElementTypeAdapter
 import org.apache.commons.httpclient.HttpStatus
 
 /**
- * Get terms of service of an user
+ * Get client integration
  */
-class GetDeclarativeUiJsonOperation(
+class GetClientIntegrationJsonOperation(
     val url: String
 ) : OCSRemoteOperation<JsonArray>() {
     @Suppress("TooGenericExceptionCaught")
@@ -60,7 +60,7 @@ class GetDeclarativeUiJsonOperation(
             result = RemoteOperationResult(e)
             Log_OC.e(
                 TAG,
-                "Get terms failed: " + result.logMessage,
+                "Get client integration failed: " + result.logMessage,
                 result.exception
             )
         } finally {
@@ -69,16 +69,16 @@ class GetDeclarativeUiJsonOperation(
         return result
     }
 
-    fun parseResult(response: String): DeclarativeUI {
+    fun parseResult(response: String): ClientIntegrationUI {
         val gson =
             GsonBuilder()
                 .registerTypeHierarchyAdapter(Element::class.java, ElementTypeAdapter())
                 .create()
 
-        return gson.fromJson(response, DeclarativeUI::class.java)
+        return gson.fromJson(response, ClientIntegrationUI::class.java)
     }
 
     companion object {
-        private val TAG = GetDeclarativeUiJsonOperation::class.java.simpleName
+        private val TAG = GetClientIntegrationJsonOperation::class.java.simpleName
     }
 }
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/App.kt b/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/App.kt
new file mode 100644
index 000000000..a6d349835
--- /dev/null
+++ b/library/src/main/java/com/owncloud/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.owncloud.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/owncloud/android/lib/resources/declarativeui/Button.kt b/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Button.kt
similarity index 78%
rename from library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Button.kt
rename to library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Button.kt
index f064851f2..0ec8b985f 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Button.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Button.kt
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-package com.owncloud.android.lib.resources.declarativeui
+package com.owncloud.android.lib.resources.clientintegration
 
 data class Button(
     val label: String,
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/DeclarativeUI.kt b/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/ClientIntegrationUI.kt
similarity index 67%
rename from library/src/main/java/com/owncloud/android/lib/resources/declarativeui/DeclarativeUI.kt
rename to library/src/main/java/com/owncloud/android/lib/resources/clientintegration/ClientIntegrationUI.kt
index 8a1c8b8a9..112c02827 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/DeclarativeUI.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/ClientIntegrationUI.kt
@@ -5,9 +5,9 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-package com.owncloud.android.lib.resources.declarativeui
+package com.owncloud.android.lib.resources.clientintegration
 
-data class DeclarativeUI(
+data class ClientIntegrationUI(
     val version: Double,
     val root: Layout
 )
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Element.kt b/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Element.kt
similarity index 71%
rename from library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Element.kt
rename to library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Element.kt
index b482155f6..aab24c921 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Element.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Element.kt
@@ -5,6 +5,6 @@
  * SPDX-License-Identifier: MIT
  */
 
-package com.owncloud.android.lib.resources.declarativeui
+package com.owncloud.android.lib.resources.clientintegration
 
 interface Element
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/ElementTypeAdapter.kt b/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/ElementTypeAdapter.kt
similarity index 97%
rename from library/src/main/java/com/owncloud/android/lib/resources/declarativeui/ElementTypeAdapter.kt
rename to library/src/main/java/com/owncloud/android/lib/resources/clientintegration/ElementTypeAdapter.kt
index 4763e4ec6..458fd22ea 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/ElementTypeAdapter.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/ElementTypeAdapter.kt
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-package com.owncloud.android.lib.resources.declarativeui
+package com.owncloud.android.lib.resources.clientintegration
 
 import com.google.gson.Gson
 import com.google.gson.JsonDeserializationContext
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Endpoint.kt b/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Endpoint.kt
similarity index 90%
rename from library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Endpoint.kt
rename to library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Endpoint.kt
index 735b2b6cf..ff60d63f9 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Endpoint.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Endpoint.kt
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-package com.owncloud.android.lib.resources.declarativeui
+package com.owncloud.android.lib.resources.clientintegration
 
 import android.os.Parcelable
 import com.google.gson.annotations.SerializedName
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Image.kt b/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Image.kt
similarity index 76%
rename from library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Image.kt
rename to library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Image.kt
index 5ed854677..922bce85d 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Image.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Image.kt
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-package com.owncloud.android.lib.resources.declarativeui
+package com.owncloud.android.lib.resources.clientintegration
 
 data class Image(
     val url: String
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Layout.kt b/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Layout.kt
similarity index 82%
rename from library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Layout.kt
rename to library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Layout.kt
index 6ee4ddf16..de0adcf6a 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Layout.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Layout.kt
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-package com.owncloud.android.lib.resources.declarativeui
+package com.owncloud.android.lib.resources.clientintegration
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Orientation.kt b/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Orientation.kt
similarity index 84%
rename from library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Orientation.kt
rename to library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Orientation.kt
index be53b7160..56c27fa89 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Orientation.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Orientation.kt
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-package com.owncloud.android.lib.resources.declarativeui
+package com.owncloud.android.lib.resources.clientintegration
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Row.kt b/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Row.kt
similarity index 74%
rename from library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Row.kt
rename to library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Row.kt
index eeba9b0fb..12cf0ada1 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Row.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Row.kt
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-package com.owncloud.android.lib.resources.declarativeui
+package com.owncloud.android.lib.resources.clientintegration
 
 data class Row(
     val children: List<Element>
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Text.kt b/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Text.kt
similarity index 76%
rename from library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Text.kt
rename to library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Text.kt
index 17805a48b..6eea42fda 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/Text.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Text.kt
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-package com.owncloud.android.lib.resources.declarativeui
+package com.owncloud.android.lib.resources.clientintegration
 
 data class Text(
     val text: String
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/URL.kt b/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/URL.kt
similarity index 78%
rename from library/src/main/java/com/owncloud/android/lib/resources/declarativeui/URL.kt
rename to library/src/main/java/com/owncloud/android/lib/resources/clientintegration/URL.kt
index de345f5e0..284310301 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/declarativeui/URL.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/URL.kt
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-package com.owncloud.android.lib.resources.declarativeui
+package com.owncloud.android.lib.resources.clientintegration
 
 data class URL(
     val text: String,
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 8ede17080..664d60545 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
@@ -178,9 +178,8 @@ public class GetCapabilitiesRemoteOperation extends RemoteOperation {
     private static final String NODE_NOTES = "notes";
     private static final String NOTES_PATH = "notes_path";
     
-    // declarative ui
-    private static final String NODE_DECLARATIVE_UI = "declarativeui";
-    private static final String NODE_CONTEXT_MENU = "context-menu";
+    // client integration
+    private static final String NODE_CLIENT_INTEGRATION = "client_integration";
 
     private static final String PROPERTY_DEFAULT_PERMISSIONS = "default_permissions";
 
@@ -214,7 +213,7 @@ public RemoteOperationResult run(NextcloudClient client) {
 
             status = client.execute(get);
 
-            if (false) {
+            if (isNotModified(status)) {
                 Log_OC.d(TAG, "Capabilities not modified");
 
                 result = new RemoteOperationResult(true, get);
@@ -810,8 +809,8 @@ private OCCapability parseResponse(String response) throws JSONException {
                 }
 
                 // declarative ui
-                if (respCapabilities.has(NODE_DECLARATIVE_UI)) {
-                    capability.setDeclarativeUiJson(respCapabilities.getString(NODE_DECLARATIVE_UI));
+                if (respCapabilities.has(NODE_CLIENT_INTEGRATION)) {
+                    capability.setClientIntegrationJson(respCapabilities.getString(NODE_CLIENT_INTEGRATION));
                 }
             }
 
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
index e84eaad64..17431d36e 100644
--- 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
@@ -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/owncloud/android/lib/resources/status/OCCapability.kt b/library/src/main/java/com/owncloud/android/lib/resources/status/OCCapability.kt
index e3228467f..41f84731b 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
@@ -11,7 +11,8 @@ package com.owncloud.android.lib.resources.status
 
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import com.owncloud.android.lib.resources.declarativeui.Endpoint
+import com.owncloud.android.lib.resources.clientintegration.App
+import com.owncloud.android.lib.resources.clientintegration.Endpoint
 
 /**
  * Contains data of the Capabilities for an account, from the Capabilities API
@@ -125,28 +126,28 @@ class OCCapability {
     // notes folder location
     var notesFolderPath: String? = null
 
-    // declarative ui - context menu
-    var declarativeUiJson: String? = null
+    // declarative ui
+    var clientIntegrationJson: String? = null
 
-    fun getDeclarativeUiEndpoints(
+    fun getClientIntegrationEndpoints(
         hook: Type,
         mimetype: String
     ): List<Endpoint> {
-        if (declarativeUiJson == null) {
+        if (clientIntegrationJson == null) {
             return emptyList()
         }
 
-        val apps = object : TypeToken<Map<String, Map<String, List<Endpoint>>>>() {}.type
-        val test: Map<String, Map<String, List<Endpoint>>> = Gson().fromJson(declarativeUiJson, apps)
+        val appsType = object : TypeToken<Map<String, App>>() {}.type
+        val apps: Map<String, App> = Gson().fromJson(clientIntegrationJson, appsType)
 
         val endpoints =
-            test.values
-                .map { it[hook.string] }
-                .flatMap { it?.toList().orEmpty() }
-                .filter {
-                    filterMimetype(mimetype, it.mimetypeFilter)
-                }
+            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
@@ -156,6 +157,15 @@ class OCCapability {
         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?
@@ -179,5 +189,6 @@ class OCCapability {
 
     companion object {
         private const val VERSION_DOT = "."
+        private 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
index 0449d43e3..96d773d93 100644
--- 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
@@ -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/declarativeui/GetDeclarativeUiJsonOperationTest.kt b/library/src/test/java/com/owncloud/android/lib/resources/clientintegration/GetDeclarativeUiJsonOperationTest.kt
similarity index 92%
rename from library/src/test/java/com/owncloud/android/lib/resources/declarativeui/GetDeclarativeUiJsonOperationTest.kt
rename to library/src/test/java/com/owncloud/android/lib/resources/clientintegration/GetDeclarativeUiJsonOperationTest.kt
index 17287ed16..8cc7a1046 100644
--- a/library/src/test/java/com/owncloud/android/lib/resources/declarativeui/GetDeclarativeUiJsonOperationTest.kt
+++ b/library/src/test/java/com/owncloud/android/lib/resources/clientintegration/GetDeclarativeUiJsonOperationTest.kt
@@ -5,9 +5,9 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-package com.owncloud.android.lib.resources.declarativeui
+package com.owncloud.android.lib.resources.clientintegration
 
-import com.nextcloud.android.lib.resources.declarativeui.GetDeclarativeUiJsonOperation
+import com.nextcloud.android.lib.resources.declarativeui.GetClientIntegrationJsonOperation
 import junit.framework.TestCase.assertEquals
 import org.junit.Test
 
@@ -52,7 +52,7 @@ class GetDeclarativeUiJsonOperationTest {
             }
             """
 
-        val sut = GetDeclarativeUiJsonOperation("")
+        val sut = GetClientIntegrationJsonOperation("")
 
         val declarativeUI = sut.parseResult(string)
 
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 cf1968068..2e822f3e1 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
@@ -39,9 +39,10 @@ class OCCapabilityTest {
 
     @Test
     @Suppress("LongMethod")
-    fun parseDeclarativeUI() {
+    fun parseClientIntegrationJson() {
         val string = """{
               "analytics": {
+                "version": 0.1,
                 "context-menu": [
                   {
                     "name": "Show data in Analytics",
@@ -62,7 +63,25 @@ class OCCapabilityTest {
                   }
                   ]
               },
+              "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\/declarativetest\/newChart"
+                      }
+                 ]
+              },
               "declarativetest": {
+                "version": 0.1,
                 "context-menu": [
                   {
                     "name": "List all UI elements",
@@ -112,14 +131,14 @@ class OCCapabilityTest {
             }"""
 
         val sut = OCCapability()
-        sut.declarativeUiJson = string
+        sut.clientIntegrationJson = string
 
         // Markdown
-        assertEquals(3, sut.getDeclarativeUiEndpoints(Type.CONTEXT_MENU, "text/markdown").size.toLong())
-        assertEquals(3, sut.getDeclarativeUiEndpoints(Type.CREATE_NEW, "text/markdown").size.toLong())
+        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.getDeclarativeUiEndpoints(Type.CONTEXT_MENU, "application/zip").size.toLong())
-        assertEquals(3, sut.getDeclarativeUiEndpoints(Type.CREATE_NEW, "application/zip").size.toLong())
+        assertEquals(4, sut.getClientIntegrationEndpoints(Type.CONTEXT_MENU, "application/zip").size.toLong())
+        assertEquals(3, sut.getClientIntegrationEndpoints(Type.CREATE_NEW, "application/zip").size.toLong())
     }
 }

From 14f8263d3e1ab122a554eddf83ad08eaea0dccf9 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Tue, 7 Oct 2025 09:34:29 +0200
Subject: [PATCH 12/13] wip

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .../lib/resources/clientintegration/App.kt    |  2 +-
 .../lib/resources/clientintegration/Button.kt |  2 +-
 .../clientintegration/ClientIntegrationUI.kt  |  2 +-
 .../resources/clientintegration/Element.kt    |  2 +-
 .../clientintegration/ElementTypeAdapter.kt   | 12 ++++-----
 .../resources/clientintegration/Endpoint.kt   |  2 +-
 .../GetClientIntegrationJsonOperation.kt      |  5 +---
 .../lib/resources/clientintegration/Image.kt  |  2 +-
 .../lib/resources/clientintegration/Layout.kt |  2 +-
 .../clientintegration/Orientation.kt          |  2 +-
 .../lib/resources/clientintegration/Row.kt    |  2 +-
 .../lib/resources/clientintegration/Text.kt   |  2 +-
 .../lib/resources/clientintegration/URL.kt    |  2 +-
 .../GetCapabilitiesRemoteOperation.java       |  2 +-
 .../lib/resources/status/OCCapability.kt      |  6 ++---
 ... GetClientIntegrationJsonOperationTest.kt} | 26 +++++++++++--------
 .../lib/resources/status/OCCapabilityTest.kt  | 20 +++++++-------
 17 files changed, 47 insertions(+), 46 deletions(-)
 rename library/src/main/java/com/{owncloud => nextcloud}/android/lib/resources/clientintegration/App.kt (87%)
 rename library/src/main/java/com/{owncloud => nextcloud}/android/lib/resources/clientintegration/Button.kt (78%)
 rename library/src/main/java/com/{owncloud => nextcloud}/android/lib/resources/clientintegration/ClientIntegrationUI.kt (78%)
 rename library/src/main/java/com/{owncloud => nextcloud}/android/lib/resources/clientintegration/Element.kt (70%)
 rename library/src/main/java/com/{owncloud => nextcloud}/android/lib/resources/clientintegration/ElementTypeAdapter.kt (76%)
 rename library/src/main/java/com/{owncloud => nextcloud}/android/lib/resources/clientintegration/Endpoint.kt (90%)
 rename library/src/main/java/com/nextcloud/android/lib/resources/{declarativeui => clientintegration}/GetClientIntegrationJsonOperation.kt (90%)
 rename library/src/main/java/com/{owncloud => nextcloud}/android/lib/resources/clientintegration/Image.kt (76%)
 rename library/src/main/java/com/{owncloud => nextcloud}/android/lib/resources/clientintegration/Layout.kt (82%)
 rename library/src/main/java/com/{owncloud => nextcloud}/android/lib/resources/clientintegration/Orientation.kt (83%)
 rename library/src/main/java/com/{owncloud => nextcloud}/android/lib/resources/clientintegration/Row.kt (74%)
 rename library/src/main/java/com/{owncloud => nextcloud}/android/lib/resources/clientintegration/Text.kt (76%)
 rename library/src/main/java/com/{owncloud => nextcloud}/android/lib/resources/clientintegration/URL.kt (77%)
 rename library/src/test/java/com/owncloud/android/lib/resources/clientintegration/{GetDeclarativeUiJsonOperationTest.kt => GetClientIntegrationJsonOperationTest.kt} (68%)

diff --git a/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/App.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/App.kt
similarity index 87%
rename from library/src/main/java/com/owncloud/android/lib/resources/clientintegration/App.kt
rename to library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/App.kt
index a6d349835..c867c010b 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/App.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/App.kt
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-package com.owncloud.android.lib.resources.clientintegration
+package com.nextcloud.android.lib.resources.clientintegration
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Button.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Button.kt
similarity index 78%
rename from library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Button.kt
rename to library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Button.kt
index 0ec8b985f..59354126c 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Button.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Button.kt
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-package com.owncloud.android.lib.resources.clientintegration
+package com.nextcloud.android.lib.resources.clientintegration
 
 data class Button(
     val label: String,
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/ClientIntegrationUI.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/ClientIntegrationUI.kt
similarity index 78%
rename from library/src/main/java/com/owncloud/android/lib/resources/clientintegration/ClientIntegrationUI.kt
rename to library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/ClientIntegrationUI.kt
index 112c02827..588edde22 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/ClientIntegrationUI.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/ClientIntegrationUI.kt
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-package com.owncloud.android.lib.resources.clientintegration
+package com.nextcloud.android.lib.resources.clientintegration
 
 data class ClientIntegrationUI(
     val version: Double,
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Element.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Element.kt
similarity index 70%
rename from library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Element.kt
rename to library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Element.kt
index aab24c921..ecf06ef37 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Element.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Element.kt
@@ -5,6 +5,6 @@
  * SPDX-License-Identifier: MIT
  */
 
-package com.owncloud.android.lib.resources.clientintegration
+package com.nextcloud.android.lib.resources.clientintegration
 
 interface Element
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/ElementTypeAdapter.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/ElementTypeAdapter.kt
similarity index 76%
rename from library/src/main/java/com/owncloud/android/lib/resources/clientintegration/ElementTypeAdapter.kt
rename to library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/ElementTypeAdapter.kt
index 458fd22ea..62c4ef791 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/ElementTypeAdapter.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/ElementTypeAdapter.kt
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-package com.owncloud.android.lib.resources.clientintegration
+package com.nextcloud.android.lib.resources.clientintegration
 
 import com.google.gson.Gson
 import com.google.gson.JsonDeserializationContext
@@ -31,7 +31,7 @@ class ElementTypeAdapter :
         return element
     }
 
-    @Throws(JsonParseException::class, java.lang.ClassNotFoundException::class, Throwable::class)
+    @Throws(JsonParseException::class, ClassNotFoundException::class, Throwable::class)
     override fun deserialize(
         json: JsonElement,
         type: Type,
@@ -44,19 +44,19 @@ class ElementTypeAdapter :
             val cls: Class<out Element> =
                 when (typeName) {
                     "Button" ->
-                        Class.forName("com.owncloud.android.lib.resources.declarativeui.Button")
+                        Class.forName("com.nextcloud.android.lib.resources.clientintegration.Button")
                             as Class<out Element>
 
                     "Text" ->
-                        Class.forName("com.owncloud.android.lib.resources.declarativeui.Text")
+                        Class.forName("com.nextcloud.android.lib.resources.clientintegration.Text")
                             as Class<out Element>
 
                     "Image" ->
-                        Class.forName("com.owncloud.android.lib.resources.declarativeui.Image")
+                        Class.forName("com.nextcloud.android.lib.resources.clientintegration.Image")
                             as Class<out Element>
 
                     "URL" ->
-                        Class.forName("com.owncloud.android.lib.resources.declarativeui.URL")
+                        Class.forName("com.nextcloud.android.lib.resources.clientintegration.URL")
                             as Class<out Element>
 
                     else -> return null
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Endpoint.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Endpoint.kt
similarity index 90%
rename from library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Endpoint.kt
rename to library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Endpoint.kt
index ff60d63f9..66b25b224 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Endpoint.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Endpoint.kt
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-package com.owncloud.android.lib.resources.clientintegration
+package com.nextcloud.android.lib.resources.clientintegration
 
 import android.os.Parcelable
 import com.google.gson.annotations.SerializedName
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/declarativeui/GetClientIntegrationJsonOperation.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/GetClientIntegrationJsonOperation.kt
similarity index 90%
rename from library/src/main/java/com/nextcloud/android/lib/resources/declarativeui/GetClientIntegrationJsonOperation.kt
rename to library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/GetClientIntegrationJsonOperation.kt
index 00565e654..44ac855f1 100644
--- a/library/src/main/java/com/nextcloud/android/lib/resources/declarativeui/GetClientIntegrationJsonOperation.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/GetClientIntegrationJsonOperation.kt
@@ -5,7 +5,7 @@
  * SPDX-FileCopyrightText: 2025 Tobias Kaminsky <tobias@kaminsky.me>
  * SPDX-License-Identifier: MIT
  */
-package com.nextcloud.android.lib.resources.declarativeui
+package com.nextcloud.android.lib.resources.clientintegration
 
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonArray
@@ -16,9 +16,6 @@ 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 com.owncloud.android.lib.resources.clientintegration.ClientIntegrationUI
-import com.owncloud.android.lib.resources.clientintegration.Element
-import com.owncloud.android.lib.resources.clientintegration.ElementTypeAdapter
 import org.apache.commons.httpclient.HttpStatus
 
 /**
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Image.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Image.kt
similarity index 76%
rename from library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Image.kt
rename to library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Image.kt
index 922bce85d..22754ddc2 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Image.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Image.kt
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-package com.owncloud.android.lib.resources.clientintegration
+package com.nextcloud.android.lib.resources.clientintegration
 
 data class Image(
     val url: String
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Layout.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Layout.kt
similarity index 82%
rename from library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Layout.kt
rename to library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Layout.kt
index de0adcf6a..6d2ee28a5 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Layout.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Layout.kt
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-package com.owncloud.android.lib.resources.clientintegration
+package com.nextcloud.android.lib.resources.clientintegration
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Orientation.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Orientation.kt
similarity index 83%
rename from library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Orientation.kt
rename to library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Orientation.kt
index 56c27fa89..8a44f1851 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Orientation.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Orientation.kt
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-package com.owncloud.android.lib.resources.clientintegration
+package com.nextcloud.android.lib.resources.clientintegration
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Row.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Row.kt
similarity index 74%
rename from library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Row.kt
rename to library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Row.kt
index 12cf0ada1..ec767709c 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Row.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Row.kt
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-package com.owncloud.android.lib.resources.clientintegration
+package com.nextcloud.android.lib.resources.clientintegration
 
 data class Row(
     val children: List<Element>
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Text.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Text.kt
similarity index 76%
rename from library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Text.kt
rename to library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Text.kt
index 6eea42fda..589f20409 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/Text.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Text.kt
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-package com.owncloud.android.lib.resources.clientintegration
+package com.nextcloud.android.lib.resources.clientintegration
 
 data class Text(
     val text: String
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/URL.kt b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/URL.kt
similarity index 77%
rename from library/src/main/java/com/owncloud/android/lib/resources/clientintegration/URL.kt
rename to library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/URL.kt
index 284310301..c1e981478 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/clientintegration/URL.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/URL.kt
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-package com.owncloud.android.lib.resources.clientintegration
+package com.nextcloud.android.lib.resources.clientintegration
 
 data class URL(
     val text: String,
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 664d60545..984926ef4 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
@@ -808,7 +808,7 @@ private OCCapability parseResponse(String response) throws JSONException {
                     }
                 }
 
-                // declarative ui
+                // client integration
                 if (respCapabilities.has(NODE_CLIENT_INTEGRATION)) {
                     capability.setClientIntegrationJson(respCapabilities.getString(NODE_CLIENT_INTEGRATION));
                 }
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 41f84731b..e3201faba 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
@@ -11,8 +11,8 @@ package com.owncloud.android.lib.resources.status
 
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import com.owncloud.android.lib.resources.clientintegration.App
-import com.owncloud.android.lib.resources.clientintegration.Endpoint
+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
@@ -126,7 +126,7 @@ class OCCapability {
     // notes folder location
     var notesFolderPath: String? = null
 
-    // declarative ui
+    // client integration
     var clientIntegrationJson: String? = null
 
     fun getClientIntegrationEndpoints(
diff --git a/library/src/test/java/com/owncloud/android/lib/resources/clientintegration/GetDeclarativeUiJsonOperationTest.kt b/library/src/test/java/com/owncloud/android/lib/resources/clientintegration/GetClientIntegrationJsonOperationTest.kt
similarity index 68%
rename from library/src/test/java/com/owncloud/android/lib/resources/clientintegration/GetDeclarativeUiJsonOperationTest.kt
rename to library/src/test/java/com/owncloud/android/lib/resources/clientintegration/GetClientIntegrationJsonOperationTest.kt
index 8cc7a1046..8a0ee95d2 100644
--- a/library/src/test/java/com/owncloud/android/lib/resources/clientintegration/GetDeclarativeUiJsonOperationTest.kt
+++ b/library/src/test/java/com/owncloud/android/lib/resources/clientintegration/GetClientIntegrationJsonOperationTest.kt
@@ -7,11 +7,15 @@
 
 package com.owncloud.android.lib.resources.clientintegration
 
-import com.nextcloud.android.lib.resources.declarativeui.GetClientIntegrationJsonOperation
+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 GetDeclarativeUiJsonOperationTest {
+class GetClientIntegrationJsonOperationTest {
     @Test
     @Suppress("LongMethod")
     fun testParseJson() {
@@ -54,34 +58,34 @@ class GetDeclarativeUiJsonOperationTest {
 
         val sut = GetClientIntegrationJsonOperation("")
 
-        val declarativeUI = sut.parseResult(string)
+        val clientIntegrationUI = sut.parseResult(string)
 
-        assertEquals(0.1, declarativeUI.version)
-        assertEquals(Orientation.VERTICAL, declarativeUI.root.orientation)
-        assertEquals(2, declarativeUI.root.rows.count())
+        assertEquals(0.1, clientIntegrationUI.version)
+        assertEquals(Orientation.VERTICAL, clientIntegrationUI.root.orientation)
+        assertEquals(2, clientIntegrationUI.root.rows.count())
 
         // row 1
         assertEquals(
             2,
-            declarativeUI.root.rows[0]
+            clientIntegrationUI.root.rows[0]
                 .children
                 .count()
         )
 
-        val button1 = declarativeUI.root.rows[0].children[0] as Button
+        val button1 = clientIntegrationUI.root.rows[0].children[0] as Button
         assertEquals("Submit", button1.label)
 
         // row 2
         assertEquals(
             2,
-            declarativeUI.root.rows[1]
+            clientIntegrationUI.root.rows[1]
                 .children
                 .count()
         )
-        val text = declarativeUI.root.rows[1].children[0] as Text
+        val text = clientIntegrationUI.root.rows[1].children[0] as Text
         assertEquals("Hello World!", text.text)
 
-        val image = declarativeUI.root.rows[1].children[1] as Image
+        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 2e822f3e1..f57d4baff 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
@@ -59,7 +59,7 @@ class OCCapabilityTest {
                  "create-new": [
                   {
                     "name": "Analytic chart",
-                    "url": "\/ocs\/v2.php\/apps\/declarativetest\/newChart"
+                    "url": "\/ocs\/v2.php\/apps\/clientintegrationtest\/newChart"
                   }
                   ]
               },
@@ -76,29 +76,29 @@ class OCCapabilityTest {
                  "create-new": [
                       {
                         "name": "Analytic chart",
-                        "url": "\/ocs\/v2.php\/apps\/declarativetest\/newChart"
+                        "url": "\/ocs\/v2.php\/apps\/clientintegrationtest\/newChart"
                       }
                  ]
               },
-              "declarativetest": {
+              "clientintegrationtest": {
                 "version": 0.1,
                 "context-menu": [
                   {
                     "name": "List all UI elements",
-                    "url": "\/ocs\/v2.php\/apps\/declarativetest\/all"
+                    "url": "\/ocs\/v2.php\/apps\/clientintegrationtest\/all"
                   },
                   {
                     "name": "First version",
-                    "url": "\/ocs\/v2.php\/apps\/declarativetest\/version1"
+                    "url": "\/ocs\/v2.php\/apps\/clientintegrationtest\/version1"
                   },
                   {
                     "name": "Convert to PDF",
-                    "url": "\/ocs\/v2.php\/apps\/declarativetest\/convertFile\/123123",
+                    "url": "\/ocs\/v2.php\/apps\/clientintegrationtest\/convertFile\/123123",
                     "mimetype_filters": "image\/"
                   },
                   {
                     "name": "Create transcript",
-                    "url": "\/ocs\/v2.php\/apps\/declarativetest\/version1",
+                    "url": "\/ocs\/v2.php\/apps\/clientintegrationtest\/version1",
                     "mimetype_filters": "audio\/",
                     "android_icon": "file_sound"
                   },
@@ -111,7 +111,7 @@ class OCCapabilityTest {
                   },
                   {
                     "name": "Unzip",
-                    "url": "\/ocs\/v2.php\/apps\/declarativetest\/version1",
+                    "url": "\/ocs\/v2.php\/apps\/clientintegrationtest\/version1",
                     "mimetype_filters": "application\/zip",
                     "android_icon": "file_zip"
                   }
@@ -119,11 +119,11 @@ class OCCapabilityTest {
                 "create-new": [
                   {
                     "name": "Deck board",
-                    "url": "\/ocs\/v2.php\/apps\/declarativetest\/newDeckBoard"
+                    "url": "\/ocs\/v2.php\/apps\/clientintegrationtest\/newDeckBoard"
                   },
                   {
                     "name": "New Contact",
-                    "url": "\/ocs\/v2.php\/apps\/declarativetest\/newContact",
+                    "url": "\/ocs\/v2.php\/apps\/clientintegrationtest\/newContact",
                     "android_icon": "file_vcard"
                   }
                 ]

From e424b9f9d56460d29240d6e449aa82744c79bada Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 22 Oct 2025 15:19:20 +0200
Subject: [PATCH 13/13] wip

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .../resources/clientintegration/TooltipResponse.kt  | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/TooltipResponse.kt

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 000000000..c21136a5e
--- /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
+)