diff --git a/app/src/androidTest/java/com/owncloud/android/AbstractIT.java b/app/src/androidTest/java/com/owncloud/android/AbstractIT.java
index 5ea27541062f..f7ab18fe76c1 100644
--- a/app/src/androidTest/java/com/owncloud/android/AbstractIT.java
+++ b/app/src/androidTest/java/com/owncloud/android/AbstractIT.java
@@ -208,11 +208,7 @@ protected void testOnlyOnServer(OwnCloudVersion version) throws AccountUtils.Acc
     protected OCCapability getCapability() throws AccountUtils.AccountNotFoundException {
         NextcloudClient client = OwnCloudClientFactory.createNextcloudClient(user, targetContext);
 
-        OCCapability ocCapability = (OCCapability) new GetCapabilitiesRemoteOperation()
-            .execute(client)
-            .getSingleData();
-
-        return ocCapability;
+        return new GetCapabilitiesRemoteOperation().execute(client).getResultData();
     }
 
     @Before
diff --git a/app/src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerIT.java b/app/src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerIT.java
index 34f80613a00a..f8b04338182d 100644
--- a/app/src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerIT.java
+++ b/app/src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerIT.java
@@ -53,9 +53,7 @@ public void before() {
 
         assertEquals(0, sut.getAllFiles().size());
 
-        capability = (OCCapability) new GetCapabilitiesRemoteOperation(null)
-            .execute(client)
-            .getSingleData();
+        capability = new GetCapabilitiesRemoteOperation(null).execute(client).getResultData();
     }
 
     @After
diff --git a/app/src/main/java/com/owncloud/android/operations/GetCapabilitiesOperation.java b/app/src/main/java/com/owncloud/android/operations/GetCapabilitiesOperation.java
index 9e86d161a6d0..067727c519a8 100644
--- a/app/src/main/java/com/owncloud/android/operations/GetCapabilitiesOperation.java
+++ b/app/src/main/java/com/owncloud/android/operations/GetCapabilitiesOperation.java
@@ -36,12 +36,11 @@ protected RemoteOperationResult run(OwnCloudClient client) {
             currentCapability = storageManager.getCapability(storageManager.getUser().getAccountName());
         }
 
-        RemoteOperationResult result = new GetCapabilitiesRemoteOperation(currentCapability).execute(client);
+        RemoteOperationResult<OCCapability> result = new GetCapabilitiesRemoteOperation(currentCapability).execute(client);
 
-        if (result.isSuccess()
-                && result.getData() != null && result.getData().size() > 0) {
+        if (result.isSuccess() && result.getResultData() != null) {
             // Read data from the result
-            OCCapability capability = (OCCapability) result.getData().get(0);
+            OCCapability capability = result.getResultData();
 
             // Save the capabilities into database
             storageManager.saveCapabilities(capability);
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 61ed6cbe4e5e..0d38589758a6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@
 androidCommonLibraryVersion = "0.31.0"
 androidGifDrawableVersion = "1.2.30"
 androidImageCropperVersion = "4.7.0"
-androidLibraryVersion ="795e952c01d6cb37c8bf2efd86b2a716a2ea2985"
+androidLibraryVersion = "498d2b9dc8fb1e626f6a7c5cbe548556633adf1d"
 androidPluginVersion = '8.13.2'
 androidsvgVersion = "1.4"
 androidxMediaVersion = "1.5.1"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index b47fa0922c2c..3f57975eb445 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -19643,6 +19643,17 @@
             <sha256 value="4202f3716e02182d759b714b31d5c5af86a60a508477fd1e0e77b446f7fc23e1" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+       <component group="com.github.nextcloud" name="android-library"
+           version="2ce13c93e8a5ca7bbe5a7e6f9d237fb3fd5a8f2d">
+           <artifact name="android-library-2ce13c93e8a5ca7bbe5a7e6f9d237fb3fd5a8f2d.aar">
+               <sha256 value="8a73f0d2541389aaa4e028b20df6ba25df7d047bcf17a5997f7708f3732fb71f"
+                   origin="Generated by Gradle" reason="Artifact is not signed" />
+           </artifact>
+           <artifact name="android-library-2ce13c93e8a5ca7bbe5a7e6f9d237fb3fd5a8f2d.module">
+               <sha256 value="64c0a81478419117abdd523e15f39458a1a046d2ed4e32ebc0fefe222336c7a0"
+                   origin="Generated by Gradle" reason="Artifact is not signed" />
+           </artifact>
+       </component>
       <component group="com.github.nextcloud" name="android-library" version="2d47aa4a368b49465320c16609ad4427dd64ca86">
          <artifact name="android-library-2d47aa4a368b49465320c16609ad4427dd64ca86.aar">
             <sha256 value="d772821c93ced5f256dfc150f90bac38358ea037fa90ac80614cfd089c3996e6" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -19762,6 +19773,17 @@
          <artifact name="android-library-4534a8cb6d6f0b0aa3f3c0a1165d9887cd2d44da.module">
             <sha256 value="032d70024dcf9acfa3695eaf085a8823da98953e49d0ca670c52002f53e454d3" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
+      </component>
+       <component group="com.github.nextcloud" name="android-library"
+           version="498d2b9dc8fb1e626f6a7c5cbe548556633adf1d">
+           <artifact name="android-library-498d2b9dc8fb1e626f6a7c5cbe548556633adf1d.aar">
+               <sha256 value="e8daea0e3aa8f20e8dd03d54b4dc27dbbd068ba8c2ad59ba8ebfe740ba9a2df9"
+                   origin="Generated by Gradle" reason="Artifact is not signed" />
+           </artifact>
+           <artifact name="android-library-498d2b9dc8fb1e626f6a7c5cbe548556633adf1d.module">
+               <sha256 value="7be737376e7d9075bc0841fae0efac938101574c377c1620dd2fb9c211b361d3"
+                   origin="Generated by Gradle" reason="Artifact is not signed" />
+         </artifact>
       </component>
       <component group="com.github.nextcloud" name="android-library" version="4a8c04815faa818380e019a227e2d80df86ef187">
          <artifact name="android-library-4a8c04815faa818380e019a227e2d80df86ef187.aar">