From d3924f13fabff8310aed4670b7d2a94c244ccfb2 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 15 Jun 2023 14:41:18 +0200
Subject: [PATCH] wip

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .idea/codeStyles/Project.xml                  |   2 -
 gradle/wrapper/gradle-wrapper.properties      |   6 +-
 .../accounts/ExternalLinksOperationIT.kt      |   5 +-
 .../DashboardGetWidgetItemsRemoteOperation.kt |   4 +-
 .../DashboardListWidgetsRemoteOperation.kt    |   4 +-
 ...irectEditingCreateFileRemoteOperation.java |   4 +-
 .../DirectEditingOpenFileRemoteOperation.java |   4 +-
 .../files/ToggleFileLockRemoteOperation.kt    |   4 +-
 .../GetGroupfoldersRemoteOperation.kt         |   4 +-
 .../profile/GetHoverCardRemoteOperation.kt    |   4 +-
 .../UnifiedSearchProvidersRemoteOperation.kt  |   4 +-
 .../search/UnifiedSearchRemoteOperation.kt    |   4 +-
 ...WorkspaceDirectEditingRemoteOperation.java |   4 +-
 .../com/nextcloud/common/NextcloudClient.kt   |   4 +-
 .../accounts/ExternalLinksOperation.java      |  48 ++--
 .../operations/LegacyRemoteOperation.kt       | 192 ++++++++++++++
 .../operations/NextcloudRemoteOperation.kt    |  88 ++++++
 .../common/operations/RemoteOperation.java    | 251 ++----------------
 .../OCSNextcloudRemoteOperation.java          |  63 +++++
 .../lib/resources/OCSRemoteOperation.java     |   4 +-
 .../GetActivitiesRemoteOperation.java         |  87 +-----
 .../comments/CommentFileRemoteOperation.java  |   4 +-
 .../MarkCommentsAsReadRemoteOperation.java    |   4 +-
 .../e2ee/GetMetadataRemoteOperation.java      |   4 +-
 .../e2ee/LockFileRemoteOperation.java         |   4 +-
 .../e2ee/StoreMetadataRemoteOperation.java    |   4 +-
 .../e2ee/ToggleEncryptionRemoteOperation.java |   3 +-
 .../e2ee/UnlockFileRemoteOperation.java       |   4 +-
 .../e2ee/UpdateMetadataRemoteOperation.java   |   4 +-
 .../files/CheckEtagRemoteOperation.java       |   4 +-
 .../resources/files/CommentFileOperation.java |  63 +++++
 .../files/CopyFileRemoteOperation.java        |   4 +-
 .../CreateFileFromTemplateOperation.java      |  95 +++++++
 .../files/CreateFolderRemoteOperation.java    |   6 +-
 .../files/DownloadFileRemoteOperation.java    |   4 +-
 .../files/ExistenceCheckRemoteOperation.java  |   4 +-
 .../files/FetchTemplateRemoteOperation.java   | 104 ++++++++
 .../files/MoveFileRemoteOperation.java        |   4 +-
 .../files/ReadFileRemoteOperation.java        |   4 +-
 .../ReadFileVersionsRemoteOperation.java      |   4 +-
 .../files/ReadFolderRemoteOperation.java      |   3 +-
 .../files/RemoveFileRemoteOperation.java      |   4 +-
 .../files/RenameFileRemoteOperation.java      |   4 +-
 .../RestoreFileVersionRemoteOperation.java    |   4 +-
 ...chDocumentsCreateAssetRemoteOperation.java |  91 +++++++
 .../files/RichDocumentsTemplateType.kt        |  26 ++
 .../RichDocumentsUrlRemoteOperation.java      |  91 +++++++
 .../files/SearchRemoteOperation.java          |   4 +-
 .../files/StreamMediaFileRemoteOperation.java |  91 +++++++
 .../android/lib/resources/files/Template.kt   |  46 ++++
 .../files/ToggleFavoriteRemoteOperation.java  |   4 +-
 .../files/UploadFileRemoteOperation.java      |   4 +-
 ...DeleteAllNotificationsRemoteOperation.java |   4 +-
 .../DeleteNotificationRemoteOperation.java    |   4 +-
 .../GetNotificationRemoteOperation.java       |   4 +-
 .../GetNotificationsRemoteOperation.java      |   4 +-
 ...ccountDeviceForNotificationsOperation.java |   4 +-
 ...ccountDeviceForNotificationsOperation.java |   4 +-
 .../shares/CreateShareRemoteOperation.java    |   4 +-
 .../shares/GetShareRemoteOperation.java       |   4 +-
 .../shares/GetShareesRemoteOperation.java     |   4 +-
 .../GetSharesForFileRemoteOperation.java      |   4 +-
 .../shares/GetSharesRemoteOperation.java      |   4 +-
 .../shares/RemoveShareRemoteOperation.java    |   4 +-
 .../shares/UpdateShareRemoteOperation.java    |   4 +-
 .../GetCapabilitiesRemoteOperation.java       |  91 +------
 .../status/GetStatusRemoteOperation.java      |   4 +-
 .../tags/CreateTagRemoteOperation.kt          |   4 +-
 .../resources/tags/GetTagsRemoteOperation.kt  |   4 +-
 .../resources/tags/PutTagRemoteOperation.kt   |   4 +-
 .../EmptyTrashbinRemoteOperation.java         |   4 +-
 .../ReadTrashbinFolderRemoteOperation.java    |   4 +-
 .../RemoveTrashbinFileRemoteOperation.java    |   4 +-
 .../RestoreTrashbinFileRemoteOperation.java   |   4 +-
 .../users/CheckRemoteWipeRemoteOperation.java |   4 +-
 .../ClearStatusMessageRemoteOperation.java    |   4 +-
 .../users/ConvertAppTokenRemoteOperation.java |   4 +-
 .../DeleteAppPasswordRemoteOperation.java     |   4 +-
 .../users/DeletePrivateKeyOperation.kt        |   4 +-
 .../users/DeletePublicKeyOperation.java       |   4 +-
 .../GetPredefinedStatusesRemoteOperation.java |   4 +-
 .../users/GetPublicKeyOperation.java          |   4 +-
 .../users/GetStatusRemoteOperation.java       |   4 +-
 .../users/GetUserAvatarRemoteOperation.java   |   4 +-
 .../users/GetUserInfoRemoteOperation.java     |   4 +-
 .../RemoteWipeSuccessRemoteOperation.java     |   4 +-
 .../lib/resources/users/SendCSROperation.java |   4 +-
 ...nedCustomStatusMessageRemoteOperation.java |   6 +-
 .../users/SetStatusRemoteOperation.java       |   4 +-
 ...nedCustomStatusMessageRemoteOperation.java |   4 +-
 .../users/SetUserInfoRemoteOperation.java     |   4 +-
 .../users/StorePrivateKeyOperation.java       |   4 +-
 scripts/analysis/findbugs-results.txt         |   2 +-
 93 files changed, 1158 insertions(+), 582 deletions(-)
 create mode 100644 library/src/main/java/com/owncloud/android/lib/common/operations/LegacyRemoteOperation.kt
 create mode 100644 library/src/main/java/com/owncloud/android/lib/common/operations/NextcloudRemoteOperation.kt
 create mode 100644 library/src/main/java/com/owncloud/android/lib/resources/OCSNextcloudRemoteOperation.java
 create mode 100644 library/src/main/java/com/owncloud/android/lib/resources/files/CommentFileOperation.java
 create mode 100644 library/src/main/java/com/owncloud/android/lib/resources/files/CreateFileFromTemplateOperation.java
 create mode 100644 library/src/main/java/com/owncloud/android/lib/resources/files/FetchTemplateRemoteOperation.java
 create mode 100644 library/src/main/java/com/owncloud/android/lib/resources/files/RichDocumentsCreateAssetRemoteOperation.java
 create mode 100644 library/src/main/java/com/owncloud/android/lib/resources/files/RichDocumentsTemplateType.kt
 create mode 100644 library/src/main/java/com/owncloud/android/lib/resources/files/RichDocumentsUrlRemoteOperation.java
 create mode 100644 library/src/main/java/com/owncloud/android/lib/resources/files/StreamMediaFileRemoteOperation.java
 create mode 100644 library/src/main/java/com/owncloud/android/lib/resources/files/Template.kt

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index c7699d0ba..840b98f89 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -6,8 +6,6 @@
           <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
         </value>
       </option>
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <MarkdownNavigatorCodeStyleSettings>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1f344c72f..7160d4c3d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Sep 16 08:12:41 CEST 2022
+#Thu Jun 15 14:34:27 CEST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/library/src/androidTest/java/com/owncloud/android/lib/common/accounts/ExternalLinksOperationIT.kt b/library/src/androidTest/java/com/owncloud/android/lib/common/accounts/ExternalLinksOperationIT.kt
index 49d3b3ffa..55694dc84 100644
--- a/library/src/androidTest/java/com/owncloud/android/lib/common/accounts/ExternalLinksOperationIT.kt
+++ b/library/src/androidTest/java/com/owncloud/android/lib/common/accounts/ExternalLinksOperationIT.kt
@@ -27,7 +27,6 @@
 package com.owncloud.android.lib.common.accounts
 
 import com.owncloud.android.AbstractIT
-import com.owncloud.android.lib.common.ExternalLink
 import junit.framework.Assert.assertEquals
 import junit.framework.Assert.assertTrue
 import org.junit.Test
@@ -35,10 +34,10 @@ import org.junit.Test
 class ExternalLinksOperationIT : AbstractIT() {
     @Test
     fun retrieveExternalLinks() {
-        val result = ExternalLinksOperation().execute(client)
+        val result = ExternalLinksOperation().execute(nextcloudClient)
         assertTrue(result.isSuccess)
 
-        val data = result.data as ArrayList<ExternalLink>
+        val data = result.resultData
         assertEquals(2, data.size)
 
         assertEquals("Nextcloud", data[0].name)
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/dashboard/DashboardGetWidgetItemsRemoteOperation.kt b/library/src/main/java/com/nextcloud/android/lib/resources/dashboard/DashboardGetWidgetItemsRemoteOperation.kt
index 3c926472f..b6002096b 100644
--- a/library/src/main/java/com/nextcloud/android/lib/resources/dashboard/DashboardGetWidgetItemsRemoteOperation.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/dashboard/DashboardGetWidgetItemsRemoteOperation.kt
@@ -27,12 +27,12 @@ import com.nextcloud.common.NextcloudClient
 import com.nextcloud.operations.GetMethod
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import com.owncloud.android.lib.ocs.ServerResponse
-import com.owncloud.android.lib.resources.OCSRemoteOperation
+import com.owncloud.android.lib.resources.OCSNextcloudRemoteOperation
 import org.apache.commons.httpclient.HttpStatus
 import java.io.IOException
 
 class DashboardGetWidgetItemsRemoteOperation(val id: String, private val limitSize: Int) :
-    OCSRemoteOperation<HashMap<String, List<DashboardWidgetItem>>>() {
+    OCSNextcloudRemoteOperation<HashMap<String, List<DashboardWidgetItem>>>() {
 
     override fun run(client: NextcloudClient): RemoteOperationResult<HashMap<String, List<DashboardWidgetItem>>> {
         lateinit var result: RemoteOperationResult<HashMap<String, List<DashboardWidgetItem>>>
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/dashboard/DashboardListWidgetsRemoteOperation.kt b/library/src/main/java/com/nextcloud/android/lib/resources/dashboard/DashboardListWidgetsRemoteOperation.kt
index 446a12bd5..18e183980 100644
--- a/library/src/main/java/com/nextcloud/android/lib/resources/dashboard/DashboardListWidgetsRemoteOperation.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/dashboard/DashboardListWidgetsRemoteOperation.kt
@@ -27,11 +27,11 @@ import com.nextcloud.common.NextcloudClient
 import com.nextcloud.operations.GetMethod
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import com.owncloud.android.lib.ocs.ServerResponse
-import com.owncloud.android.lib.resources.OCSRemoteOperation
+import com.owncloud.android.lib.resources.OCSNextcloudRemoteOperation
 import org.apache.commons.httpclient.HttpStatus
 import java.io.IOException
 
-class DashboardListWidgetsRemoteOperation : OCSRemoteOperation<Map<String, DashboardWidget>>() {
+class DashboardListWidgetsRemoteOperation : OCSNextcloudRemoteOperation<Map<String, DashboardWidget>>() {
 
     override fun run(client: NextcloudClient): RemoteOperationResult<Map<String, DashboardWidget>> {
         lateinit var result: RemoteOperationResult<Map<String, DashboardWidget>>
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/directediting/DirectEditingCreateFileRemoteOperation.java b/library/src/main/java/com/nextcloud/android/lib/resources/directediting/DirectEditingCreateFileRemoteOperation.java
index 4e9777e6a..db90ded7a 100644
--- a/library/src/main/java/com/nextcloud/android/lib/resources/directediting/DirectEditingCreateFileRemoteOperation.java
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/directediting/DirectEditingCreateFileRemoteOperation.java
@@ -28,7 +28,7 @@
 package com.nextcloud.android.lib.resources.directediting;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -40,7 +40,7 @@
  * Create file with direct editing api
  */
 
-public class DirectEditingCreateFileRemoteOperation extends RemoteOperation<String> {
+public class DirectEditingCreateFileRemoteOperation extends LegacyRemoteOperation<String> {
     private static final String TAG = DirectEditingCreateFileRemoteOperation.class.getSimpleName();
     private static final int SYNC_READ_TIMEOUT = 40000;
     private static final int SYNC_CONNECTION_TIMEOUT = 5000;
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/directediting/DirectEditingOpenFileRemoteOperation.java b/library/src/main/java/com/nextcloud/android/lib/resources/directediting/DirectEditingOpenFileRemoteOperation.java
index 4dadeacb8..d88ffd1cc 100644
--- a/library/src/main/java/com/nextcloud/android/lib/resources/directediting/DirectEditingOpenFileRemoteOperation.java
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/directediting/DirectEditingOpenFileRemoteOperation.java
@@ -28,7 +28,7 @@
 package com.nextcloud.android.lib.resources.directediting;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -40,7 +40,7 @@
  * open file for direct editing
  */
 
-public class DirectEditingOpenFileRemoteOperation extends RemoteOperation {
+public class DirectEditingOpenFileRemoteOperation extends LegacyRemoteOperation {
     private static final String TAG = DirectEditingOpenFileRemoteOperation.class.getSimpleName();
     private static final int SYNC_READ_TIMEOUT = 40000;
     private static final int SYNC_CONNECTION_TIMEOUT = 5000;
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/files/ToggleFileLockRemoteOperation.kt b/library/src/main/java/com/nextcloud/android/lib/resources/files/ToggleFileLockRemoteOperation.kt
index 44d37b108..4558f52b7 100644
--- a/library/src/main/java/com/nextcloud/android/lib/resources/files/ToggleFileLockRemoteOperation.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/files/ToggleFileLockRemoteOperation.kt
@@ -24,7 +24,7 @@ import com.nextcloud.common.NextcloudClient
 import com.nextcloud.common.OkHttpMethodBase
 import com.nextcloud.operations.LockMethod
 import com.nextcloud.operations.UnlockMethod
-import com.owncloud.android.lib.common.operations.RemoteOperation
+import com.owncloud.android.lib.common.operations.NextcloudRemoteOperation
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import com.owncloud.android.lib.common.utils.Log_OC
 import org.apache.commons.httpclient.HttpStatus
@@ -35,7 +35,7 @@ import org.apache.commons.httpclient.HttpStatus
  * @param toLock `true` if file is to be locked, `false` if it is to be unlocked
  */
 class ToggleFileLockRemoteOperation(private val toLock: Boolean, private val filePath: String) :
-    RemoteOperation<Void>() {
+    NextcloudRemoteOperation<Void>() {
     @Suppress("TooGenericExceptionCaught")
     override fun run(client: NextcloudClient): RemoteOperationResult<Void> {
         var method: OkHttpMethodBase? = null
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/groupfolders/GetGroupfoldersRemoteOperation.kt b/library/src/main/java/com/nextcloud/android/lib/resources/groupfolders/GetGroupfoldersRemoteOperation.kt
index 53e6dbbdd..e1501a7e5 100644
--- a/library/src/main/java/com/nextcloud/android/lib/resources/groupfolders/GetGroupfoldersRemoteOperation.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/groupfolders/GetGroupfoldersRemoteOperation.kt
@@ -32,14 +32,14 @@ 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 com.owncloud.android.lib.resources.OCSNextcloudRemoteOperation
 import org.apache.commons.httpclient.HttpStatus
 
 /**
  * Get groupfolders of an user
  */
 class GetGroupfoldersRemoteOperation :
-    OCSRemoteOperation<Map<String, Groupfolder>>() {
+    OCSNextcloudRemoteOperation<Map<String, Groupfolder>>() {
     @Suppress("TooGenericExceptionCaught")
     override fun run(client: NextcloudClient): RemoteOperationResult<Map<String, Groupfolder>> {
         var result: RemoteOperationResult<Map<String, Groupfolder>>
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/profile/GetHoverCardRemoteOperation.kt b/library/src/main/java/com/nextcloud/android/lib/resources/profile/GetHoverCardRemoteOperation.kt
index 45c1e0a71..e78260f8c 100644
--- a/library/src/main/java/com/nextcloud/android/lib/resources/profile/GetHoverCardRemoteOperation.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/profile/GetHoverCardRemoteOperation.kt
@@ -32,13 +32,13 @@ 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 com.owncloud.android.lib.resources.OCSNextcloudRemoteOperation
 import org.apache.commons.httpclient.HttpStatus
 
 /**
  * Get hoverCard of an user
  */
-class GetHoverCardRemoteOperation(private val userId: String) : OCSRemoteOperation<HoverCard?>() {
+class GetHoverCardRemoteOperation(private val userId: String) : OCSNextcloudRemoteOperation<HoverCard?>() {
     @Suppress("TooGenericExceptionCaught")
     override fun run(client: NextcloudClient): RemoteOperationResult<HoverCard?> {
         var result: RemoteOperationResult<HoverCard?>
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/search/UnifiedSearchProvidersRemoteOperation.kt b/library/src/main/java/com/nextcloud/android/lib/resources/search/UnifiedSearchProvidersRemoteOperation.kt
index bac5b837f..e5c4abb1d 100644
--- a/library/src/main/java/com/nextcloud/android/lib/resources/search/UnifiedSearchProvidersRemoteOperation.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/search/UnifiedSearchProvidersRemoteOperation.kt
@@ -30,14 +30,14 @@ import com.owncloud.android.lib.common.SearchProviders
 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.OCSNextcloudRemoteOperation
 import org.apache.commons.httpclient.HttpStatus
 
 /**
  * Get all search providers for unified search
  */
 @Suppress("TooGenericExceptionCaught")
-class UnifiedSearchProvidersRemoteOperation : OCSRemoteOperation<SearchProviders>() {
+class UnifiedSearchProvidersRemoteOperation : OCSNextcloudRemoteOperation<SearchProviders>() {
     companion object {
         private val TAG = UnifiedSearchProvidersRemoteOperation::class.java.simpleName
         private const val ENDPOINT = "/ocs/v2.php/search/providers"
diff --git a/library/src/main/java/com/nextcloud/android/lib/resources/search/UnifiedSearchRemoteOperation.kt b/library/src/main/java/com/nextcloud/android/lib/resources/search/UnifiedSearchRemoteOperation.kt
index 093adaf03..ba9caaf33 100644
--- a/library/src/main/java/com/nextcloud/android/lib/resources/search/UnifiedSearchRemoteOperation.kt
+++ b/library/src/main/java/com/nextcloud/android/lib/resources/search/UnifiedSearchRemoteOperation.kt
@@ -29,7 +29,7 @@ import com.owncloud.android.lib.common.SearchResult
 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.OCSNextcloudRemoteOperation
 import org.apache.commons.httpclient.HttpStatus
 import java.net.URLEncoder
 
@@ -43,7 +43,7 @@ class UnifiedSearchRemoteOperation(
     val cursor: Int? = null,
     val limit: Int = 5
 ) :
-    OCSRemoteOperation<SearchResult>() {
+    OCSNextcloudRemoteOperation<SearchResult>() {
     companion object {
         private val TAG = UnifiedSearchRemoteOperation::class.java.simpleName
         private const val ENDPOINT = "/ocs/v2.php/search/providers/"
diff --git a/library/src/main/java/com/nextcloud/android/lib/richWorkspace/RichWorkspaceDirectEditingRemoteOperation.java b/library/src/main/java/com/nextcloud/android/lib/richWorkspace/RichWorkspaceDirectEditingRemoteOperation.java
index 0f98565a0..3b3e62211 100644
--- a/library/src/main/java/com/nextcloud/android/lib/richWorkspace/RichWorkspaceDirectEditingRemoteOperation.java
+++ b/library/src/main/java/com/nextcloud/android/lib/richWorkspace/RichWorkspaceDirectEditingRemoteOperation.java
@@ -29,7 +29,7 @@
 
 import com.google.gson.GsonBuilder;
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -45,7 +45,7 @@
  * Get direct editing url for rich workspace
  */
 
-public class RichWorkspaceDirectEditingRemoteOperation extends RemoteOperation {
+public class RichWorkspaceDirectEditingRemoteOperation extends LegacyRemoteOperation {
     private static final String TAG = RichWorkspaceDirectEditingRemoteOperation.class.getSimpleName();
     private static final int SYNC_READ_TIMEOUT = 40000;
     private static final int SYNC_CONNECTION_TIMEOUT = 5000;
diff --git a/library/src/main/java/com/nextcloud/common/NextcloudClient.kt b/library/src/main/java/com/nextcloud/common/NextcloudClient.kt
index 16eb9588d..5242deb0f 100644
--- a/library/src/main/java/com/nextcloud/common/NextcloudClient.kt
+++ b/library/src/main/java/com/nextcloud/common/NextcloudClient.kt
@@ -37,7 +37,7 @@ import com.owncloud.android.lib.common.accounts.AccountUtils
 import com.owncloud.android.lib.common.network.AdvancedX509TrustManager
 import com.owncloud.android.lib.common.network.NetworkUtils
 import com.owncloud.android.lib.common.network.RedirectionPath
-import com.owncloud.android.lib.common.operations.RemoteOperation
+import com.owncloud.android.lib.common.operations.NextcloudRemoteOperation
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import com.owncloud.android.lib.common.utils.Log_OC
 import okhttp3.CookieJar
@@ -101,7 +101,7 @@ class NextcloudClient private constructor(
     ) : this(baseUri, userId, credentials, createDefaultClient(context))
 
     @Suppress("TooGenericExceptionCaught")
-    fun <T> execute(remoteOperation: RemoteOperation<T>): RemoteOperationResult<T> {
+    fun <T> execute(remoteOperation: NextcloudRemoteOperation<T>): RemoteOperationResult<T> {
         return try {
             remoteOperation.run(this)
         } catch (ex: Exception) {
diff --git a/library/src/main/java/com/owncloud/android/lib/common/accounts/ExternalLinksOperation.java b/library/src/main/java/com/owncloud/android/lib/common/accounts/ExternalLinksOperation.java
index c1c10ab33..f98e7f5bd 100644
--- a/library/src/main/java/com/owncloud/android/lib/common/accounts/ExternalLinksOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/common/accounts/ExternalLinksOperation.java
@@ -27,28 +27,28 @@
 
 package com.owncloud.android.lib.common.accounts;
 
+import com.nextcloud.common.NextcloudClient;
+import com.nextcloud.operations.GetMethod;
 import com.owncloud.android.lib.common.ExternalLink;
 import com.owncloud.android.lib.common.ExternalLinkType;
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.NextcloudRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.GetCapabilitiesRemoteOperation;
 import com.owncloud.android.lib.resources.status.OCCapability;
 
 import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.NameValuePair;
-import org.apache.commons.httpclient.methods.GetMethod;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 
 /**
  * gets external links provided by 'external' app
  */
 
-public class ExternalLinksOperation extends RemoteOperation {
+public class ExternalLinksOperation extends NextcloudRemoteOperation<ArrayList<ExternalLink>> {
 
     private static final String TAG = ExternalLinksOperation.class.getSimpleName();
 
@@ -68,24 +68,26 @@ public class ExternalLinksOperation extends RemoteOperation {
 
 
     @Override
-    protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result = null;
+    public RemoteOperationResult<ArrayList<ExternalLink>> run(NextcloudClient client) {
+        RemoteOperationResult<ArrayList<ExternalLink>> result = null;
         int status = -1;
         GetMethod get = null;
         String ocsUrl = client.getBaseUri() + OCS_ROUTE_EXTERNAL_LINKS;
 
         try {
             // check capabilities
-            RemoteOperation getCapabilities = new GetCapabilitiesRemoteOperation();
-            RemoteOperationResult capabilitiesResult = getCapabilities.execute(client);
+            NextcloudRemoteOperation getCapabilities = new GetCapabilitiesRemoteOperation();
+            RemoteOperationResult capabilitiesResult = client.execute(getCapabilities);
             OCCapability capability = (OCCapability) capabilitiesResult.getData().get(0);
 
             if (capability.getExternalLinks().isTrue()) {
 
-                get = new GetMethod(ocsUrl);
-                get.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
-                get.setQueryString(new NameValuePair[]{new NameValuePair("format", "json")});
-                status = client.executeMethod(get);
+                get = new GetMethod(ocsUrl, true);
+                HashMap<String, String> parameters = new HashMap<>();
+                parameters.put("format", "json");
+                get.setQueryString(parameters);
+                
+                status = client.execute(get);
 
                 if (isSuccess(status)) {
                     String response = get.getResponseBodyAsString();
@@ -94,13 +96,13 @@ protected RemoteOperationResult run(OwnCloudClient client) {
                     // parse
                     JSONArray links = new JSONObject(response).getJSONObject(NODE_OCS).getJSONArray(NODE_DATA);
 
-                    ArrayList<Object> resultLinks = new ArrayList<>();
+                    ArrayList<ExternalLink> resultLinks = new ArrayList<>();
 
                     for (int i = 0; i < links.length(); i++) {
                         JSONObject link = links.getJSONObject(i);
 
                         if (link != null) {
-                            Integer id = link.getInt(NODE_ID);
+                            int id = link.getInt(NODE_ID);
                             String iconUrl = link.getString(NODE_ICON);
                             String language = "";
                             if (link.has(NODE_LANGUAGE)) {
@@ -137,26 +139,22 @@ protected RemoteOperationResult run(OwnCloudClient client) {
                         }
                     }
 
-                    result = new RemoteOperationResult(true, status, get.getResponseHeaders());
-                    result.setData(resultLinks);
+                    result = new RemoteOperationResult<>(true, get);
+                    result.setResultData(resultLinks);
 
                 } else {
-                    result = new RemoteOperationResult(false, status, get.getResponseHeaders());
+                    result = new RemoteOperationResult<>(false, get);
                     String response = get.getResponseBodyAsString();
                     Log_OC.e(TAG, "Failed response while getting external links ");
-                    if (response != null) {
-                        Log_OC.e(TAG, "*** status code: " + status + " ; response message: " + response);
-                    } else {
-                        Log_OC.e(TAG, "*** status code: " + status);
-                    }
+                    Log_OC.e(TAG, "*** status code: " + status + " ; response message: " + response);
                 }
             } else {
-                result = new RemoteOperationResult(RemoteOperationResult.ResultCode.NOT_AVAILABLE);
+                result = new RemoteOperationResult<>(RemoteOperationResult.ResultCode.NOT_AVAILABLE);
                 Log_OC.d(TAG, "External links disabled");
             }
 
         } catch (Exception e) {
-            result = new RemoteOperationResult(e);
+            result = new RemoteOperationResult<>(e);
             Log_OC.e(TAG, "Exception while getting external links ", e);
         } finally {
             if (get != null) {
diff --git a/library/src/main/java/com/owncloud/android/lib/common/operations/LegacyRemoteOperation.kt b/library/src/main/java/com/owncloud/android/lib/common/operations/LegacyRemoteOperation.kt
new file mode 100644
index 000000000..beada02e2
--- /dev/null
+++ b/library/src/main/java/com/owncloud/android/lib/common/operations/LegacyRemoteOperation.kt
@@ -0,0 +1,192 @@
+/*
+ * Nextcloud Android client application
+ *
+ * @author Tobias Kaminsky
+ * Copyright (C) 2023 Tobias Kaminsky
+ * Copyright (C) 2023 Nextcloud GmbH
+ *  
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *  
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *  
+ */
+
+package com.owncloud.android.lib.common.operations
+
+import android.accounts.Account
+import android.accounts.AccountManager
+import android.accounts.AccountsException
+import android.content.Context
+import com.nextcloud.common.User
+import com.owncloud.android.lib.common.OwnCloudAccount
+import com.owncloud.android.lib.common.OwnCloudClient
+import com.owncloud.android.lib.common.OwnCloudClientFactory
+import com.owncloud.android.lib.common.OwnCloudClientManagerFactory
+import com.owncloud.android.lib.common.accounts.AccountUtils
+import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode
+import com.owncloud.android.lib.common.utils.Log_OC
+import java.io.IOException
+
+@Deprecated("Use NextcloudRemoteOperation instead")
+abstract class LegacyRemoteOperation<T> : RemoteOperation<T>() {
+    private val TAG = LegacyRemoteOperation::class.java.simpleName
+
+    /**
+     * Abstract method to implement the operation in derived classes.
+     */
+    @Deprecated("Use NextcloudRemoteOperation instead")
+    protected abstract fun run(client: OwnCloudClient): RemoteOperationResult<T>
+
+    /**
+     * Synchronously executes the remote operation on the received ownCloud account.
+     *
+     * Do not call this method from the main thread.
+     *
+     * This method should be used whenever an ownCloud account is available, instead of
+     * [.execute].
+     *
+     * @param account   ownCloud account in remote ownCloud server to reach during the
+     * execution of the operation.
+     * @param context   Android context for the component calling the method.
+     * @return Result of the operation.
+     */
+    @Deprecated("")
+    open fun execute(account: Account?, context: Context?): RemoteOperationResult<T> {
+        requireNotNull(account) { "Trying to execute a remote operation with a NULL Account" }
+        requireNotNull(context) { "Trying to execute a remote operation with a NULL Context" }
+        mAccount = account
+        mContext = context.applicationContext
+        mClient = try {
+            val ocAccount = OwnCloudAccount(mAccount, mContext)
+            OwnCloudClientManagerFactory.getDefaultSingleton().getClientFor(ocAccount, mContext)
+        } catch (e: Exception) {
+            Log_OC.e(TAG, "Error while trying to access to " + mAccount.name, e)
+            return RemoteOperationResult(e)
+        }
+        return run(mClient)
+    }
+
+    /**
+     * This is a transitional wrapper around [.execute]
+     * using modern [User] interface instead of platform [Account]
+     */
+    @Deprecated("")
+    open fun execute(user: User, context: Context): RemoteOperationResult<T> {
+        return execute(user.toPlatformAccount(), context)
+    }
+
+    /**
+     * Synchronously executes the remote operation
+     *
+     *
+     * Do not call this method from the main thread.
+     *
+     * @param client Client object to reach an ownCloud server during the execution of the operation.
+     * @return Result of the operation.
+     */
+    @Deprecated("")
+    open fun execute(client: OwnCloudClient): RemoteOperationResult<T> {
+        requireNotNull(client) { "Trying to execute a remote operation with a NULL OwnCloudClient" }
+        mClient = client
+        return run(client)
+    }
+
+    /**
+     * Asynchronous execution of the operation
+     * started by [RemoteOperation.execute],
+     * and result posting.
+     *
+     * TODO refactor && clean the code; now it's a mess
+     */
+    override fun run() {
+        var result: RemoteOperationResult<T>? = null
+        var repeat: Boolean
+        do {
+            try {
+                if (mClient == null) {
+                    mClient = if (mAccount != null && mContext != null) {
+                        /** DEPRECATED BLOCK - will be removed at version 1.0  */
+                        if (mCallerActivity != null) {
+                            OwnCloudClientFactory.createOwnCloudClient(
+                                mAccount, mContext, mCallerActivity
+                            )
+                        } else {
+                            /** EOF DEPRECATED  */
+                            val ocAccount = OwnCloudAccount(mAccount, mContext)
+                            OwnCloudClientManagerFactory.getDefaultSingleton()
+                                .getClientFor(ocAccount, mContext)
+                        }
+                    } else {
+                        throw IllegalStateException(
+                            "Trying to run a remote operation " +
+                                "asynchronously with no client instance or account"
+                        )
+                    }
+                }
+            } catch (e: IOException) {
+                Log_OC.e(
+                    TAG, "Error while trying to access to " + mAccount.name,
+                    AccountsException(
+                        "I/O exception while trying to authorize the account",
+                        e
+                    )
+                )
+                result = RemoteOperationResult(e)
+            } catch (e: AccountsException) {
+                Log_OC.e(TAG, "Error while trying to access to " + mAccount.name, e)
+                result = RemoteOperationResult(e)
+            }
+            if (result == null) result = run(mClient)
+            repeat = false
+            /** DEPRECATED BLOCK - will be removed at version 1.0 ; don't trust in this code
+             * to trigger authentication update  */
+            if (mCallerActivity != null && mAccount != null && mContext != null &&
+                !result.isSuccess && ResultCode.UNAUTHORIZED == result.code
+            ) {
+                /// possible fail due to lack of authorization
+                // in an operation performed in foreground
+                val cred = mClient.credentials
+                if (cred != null) {
+                    /// confirmed : unauthorized operation
+                    val am = AccountManager.get(mContext)
+                    if (cred.authTokenExpires()) {
+                        am.invalidateAuthToken(
+                            mAccount.type,
+                            cred.authToken
+                        )
+                    } else {
+                        am.clearPassword(mAccount)
+                    }
+                    mClient = null
+                    // when repeated, the creation of a new OwnCloudClient after erasing the saved
+                    // credentials will trigger the login activity
+                    repeat = true
+                    result = null
+                }
+            }
+            /** EOF DEPRECATED BLOCK  */
+        } while (repeat)
+        if (mAccount != null && mContext != null) {
+            // Save Client Cookies
+            AccountUtils.saveClient(mClient, mAccount, mContext)
+        }
+        val resultToSend = result
+        if (mListenerHandler != null && mListener != null) {
+            mListenerHandler.post {
+                mListener.onRemoteOperationFinish(
+                    this,
+                    resultToSend
+                )
+            }
+        }
+    }
+}
diff --git a/library/src/main/java/com/owncloud/android/lib/common/operations/NextcloudRemoteOperation.kt b/library/src/main/java/com/owncloud/android/lib/common/operations/NextcloudRemoteOperation.kt
new file mode 100644
index 000000000..e7b51a7d2
--- /dev/null
+++ b/library/src/main/java/com/owncloud/android/lib/common/operations/NextcloudRemoteOperation.kt
@@ -0,0 +1,88 @@
+/*
+ * Nextcloud Android client application
+ *
+ * @author Tobias Kaminsky
+ * Copyright (C) 2023 Tobias Kaminsky
+ * Copyright (C) 2023 Nextcloud GmbH
+ *  
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *  
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *  
+ */
+
+package com.owncloud.android.lib.common.operations
+
+import android.accounts.Account
+import android.content.Context
+import com.nextcloud.common.NextcloudClient
+import com.nextcloud.common.User
+import com.owncloud.android.lib.common.OwnCloudAccount
+import com.owncloud.android.lib.common.OwnCloudClientManagerFactory
+import com.owncloud.android.lib.common.utils.Log_OC
+
+abstract class NextcloudRemoteOperation<T> : RemoteOperation<T>() {
+    private val TAG = NextcloudRemoteOperation::class.java.simpleName
+    
+    /**
+     * Synchronously executes the remote operation on the received ownCloud account.
+     *
+     *
+     * Do not call this method from the main thread.
+     *
+     *
+     * This method should be used whenever an ownCloud account is available, instead of
+     * [.execute].
+     *
+     * @param account ownCloud account in remote ownCloud server to reach during the
+     * execution of the operation.
+     * @param context Android context for the component calling the method.
+     * @return Result of the operation.
+     */
+    private fun executeNextcloudClient(account: Account, context: Context): RemoteOperationResult<T> {
+        mAccount = account
+        mContext = context.applicationContext
+        clientNew = try {
+            val ocAccount = OwnCloudAccount(mAccount, mContext)
+            OwnCloudClientManagerFactory.getDefaultSingleton()
+                .getNextcloudClientFor(ocAccount, mContext)
+        } catch (e: Exception) {
+            Log_OC.e(TAG, "Error while trying to access to " + mAccount.name, e)
+            return RemoteOperationResult(e)
+        }
+        return run(clientNew)
+    }
+
+    /**
+     * This is a transitional wrapper around [.executeNextcloudClient]
+     * using modern [User] interface instead of platform [Account]
+     */
+    fun executeNextcloudClient(user: User, context: Context): RemoteOperationResult<T> {
+        return executeNextcloudClient(user.toPlatformAccount(), context)
+    }
+
+    /**
+     * Synchronously executes the remote operation
+     *
+     * Do not call this method from the main thread.
+     *
+     * @param client    Client object to reach an ownCloud server during the execution of
+     * the operation.
+     * @return Result of the operation.
+     */
+    fun execute(client: NextcloudClient): RemoteOperationResult<T> {
+        clientNew = client
+        return run(client)
+    }
+
+    abstract fun run(client: NextcloudClient): RemoteOperationResult<T>
+}
diff --git a/library/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperation.java
index 1a04b80be..e579d76e4 100644
--- a/library/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperation.java
@@ -25,26 +25,15 @@
 package com.owncloud.android.lib.common.operations;
 
 import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.accounts.AccountsException;
 import android.app.Activity;
 import android.content.Context;
 import android.os.Handler;
 
-import androidx.annotation.NonNull;
-
 import com.nextcloud.common.NextcloudClient;
 import com.nextcloud.common.User;
-import com.owncloud.android.lib.common.OwnCloudAccount;
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.OwnCloudClientFactory;
-import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
-import com.owncloud.android.lib.common.OwnCloudCredentials;
-import com.owncloud.android.lib.common.accounts.AccountUtils;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
-import com.owncloud.android.lib.common.utils.Log_OC;
 
-import java.io.IOException;
+import kotlin.NotImplementedError;
 
 /**
  * Operation which execution involves one or several interactions with an ownCloud server.
@@ -76,155 +65,37 @@ public abstract class RemoteOperation<T> implements Runnable {
     protected static final String JSON_FORMAT = "?format=json";
 
     /** ownCloud account in the remote ownCloud server to operate */
-    private Account mAccount = null;
+    protected Account mAccount = null;
     
     /** Android Application context */
-    private Context mContext = null;
+    protected Context mContext = null;
     
 	/** Object to interact with the remote server */
-	private OwnCloudClient mClient = null;
-    private NextcloudClient clientNew = null;
+	protected OwnCloudClient mClient = null;
+    protected NextcloudClient clientNew = null;
 	
 	/** Callback object to notify about the execution of the remote operation */
-	private OnRemoteOperationListener mListener = null;
+	protected OnRemoteOperationListener mListener = null;
 	
 	/** Handler to the thread where mListener methods will be called */
-	private Handler mListenerHandler = null;
+	protected Handler mListenerHandler = null;
 
 	/** Activity */
-    private Activity mCallerActivity;
-
-
-    /**
-     * Abstract method to implement the operation in derived classes.
-     */
-    @Deprecated
-    protected RemoteOperationResult<T> run(OwnCloudClient client) {
-        Log_OC.d(this, "Not used anymore");
-        throw new UnsupportedOperationException("Not used anymore");
-    }
-
-    public RemoteOperationResult<T> run(NextcloudClient client) {
-        // Once all RemoteOperation implement it, this should be abstract 
-        Log_OC.d(this, "Not yet implemented");
-        throw new UnsupportedOperationException("Not yet implemented");
-    }
-	
-
-    /**
-     * Synchronously executes the remote operation on the received ownCloud account.
-     * 
-     * Do not call this method from the main thread.
-     *
-     * This method should be used whenever an ownCloud account is available, instead of
-     * {@link #execute(OwnCloudClient)}.
-     *
-     * @param account   ownCloud account in remote ownCloud server to reach during the
-     *                  execution of the operation.
-     * @param context   Android context for the component calling the method.
-     * @return Result of the operation.
-     */
-    @Deprecated
-    public RemoteOperationResult<T> execute(Account account, Context context) {
-        if (account == null) {
-            throw new IllegalArgumentException("Trying to execute a remote operation with a NULL Account");
-        }
-        if (context == null) {
-            throw new IllegalArgumentException("Trying to execute a remote operation with a NULL Context");
-        }
-        mAccount = account;
-        mContext = context.getApplicationContext();
-        try {
-            OwnCloudAccount ocAccount = new OwnCloudAccount(mAccount, mContext);
-            mClient = OwnCloudClientManagerFactory.getDefaultSingleton().getClientFor(ocAccount, mContext);
-        } catch (Exception e) {
-            Log_OC.e(TAG, "Error while trying to access to " + mAccount.name, e);
-            return new RemoteOperationResult<T>(e);
-        }
-        return run(mClient);
-    }
-
-    /**
-     * This is a transitional wrapper around {@link #execute(Account, Context)}
-     * using modern {@link User} interface instead of platform {@link Account}
-     */
-    @Deprecated
-    public RemoteOperationResult<T> execute(User user, Context context) {
-        return execute(user.toPlatformAccount(), context);
-    }
-
-    /**
-     * Synchronously executes the remote operation on the received ownCloud account.
-     * <p>
-     * Do not call this method from the main thread.
-     * <p>
-     * This method should be used whenever an ownCloud account is available, instead of
-     * {@link #execute(NextcloudClient)}.
-     *
-     * @param account ownCloud account in remote ownCloud server to reach during the
-     *                execution of the operation.
-     * @param context Android context for the component calling the method.
-     * @return Result of the operation.
-     */
-    public RemoteOperationResult<T> executeNextcloudClient(@NonNull Account account, @NonNull Context context) {
-        mAccount = account;
-        mContext = context.getApplicationContext();
-        try {
-            OwnCloudAccount ocAccount = new OwnCloudAccount(mAccount, mContext);
-            clientNew = OwnCloudClientManagerFactory.getDefaultSingleton().getNextcloudClientFor(ocAccount, mContext);
-        } catch (Exception e) {
-            Log_OC.e(TAG, "Error while trying to access to " + mAccount.name, e);
-            return new RemoteOperationResult<T>(e);
-        }
-        return run(clientNew);
-    }
+    protected Activity mCallerActivity;
 
-    /**
-     * This is a transitional wrapper around {@link #executeNextcloudClient(Account, Context)} 
-     * using modern {@link User} interface instead of platform {@link Account}
-     */
-    public RemoteOperationResult<T> executeNextcloudClient(@NonNull User user, @NonNull Context context) {
-        return executeNextcloudClient(user.toPlatformAccount(), context);
-    }
-
-    /**
-     * Synchronously executes the remote operation
-     * <p>
-     * Do not call this method from the main thread.
-     *
-     * @param client Client object to reach an ownCloud server during the execution of the operation.
-     * @return Result of the operation.
-     */
-    @Deprecated
-    public RemoteOperationResult<T> execute(OwnCloudClient client) {
-        if (client == null) {
-            throw new IllegalArgumentException("Trying to execute a remote operation with a NULL OwnCloudClient");
-        }
-        mClient = client;
 
-        return run(client);
-    }
+   
 
-    /**
-     * Synchronously executes the remote operation
-     *
-     * Do not call this method from the main thread.
-     *
-     * @param client    Client object to reach an ownCloud server during the execution of
-     *                  the operation.
-     * @return Result of the operation.
-     */
-    public RemoteOperationResult<T> execute(@NonNull NextcloudClient client) {
-        clientNew = client;
+  
 
-        return run(client);
-    }
+    
+    
 
     /**
      * Asynchronously executes the remote operation
      * 
      * This method should be used whenever an ownCloud account is available, instead of
-     * {@link #execute(OwnCloudClient)}.
+     * {@link LegacyRemoteOperation#execute(OwnCloudClient)}.
      * 
      * @deprecated 	This method will be removed in version 1.0.
      *  			Use {@link #execute(Account, Context, OnRemoteOperationListener,
@@ -351,99 +222,7 @@ public Thread execute(OwnCloudClient client, OnRemoteOperationListener listener,
 		return runnerThread;
 	}
 	
-	/**
-	 * Asynchronous execution of the operation 
-	 * started by {@link RemoteOperation#execute(OwnCloudClient,
-     *              OnRemoteOperationListener, Handler)},
-	 * and result posting.
-	 * 
-	 * TODO refactor && clean the code; now it's a mess
-	 */
-    @Override
-    public final void run() {
-        RemoteOperationResult<T> result = null;
-        boolean repeat;
-        do {
-            try{
-                if (mClient == null) {
-                    if (mAccount != null && mContext != null) {
-                    	/** DEPRECATED BLOCK - will be removed at version 1.0 */
-                        if (mCallerActivity != null) {
-                            mClient = OwnCloudClientFactory.createOwnCloudClient(
-                            		mAccount, mContext, mCallerActivity);
-                        } else {
-                        /** EOF DEPRECATED */
-                        	OwnCloudAccount ocAccount = new OwnCloudAccount(mAccount, mContext);
-                            mClient = OwnCloudClientManagerFactory.getDefaultSingleton().
-                            		getClientFor(ocAccount, mContext);
-                        }
-                        
-                    } else {
-                        throw new IllegalStateException("Trying to run a remote operation " +
-                                "asynchronously with no client instance or account");
-                    }
-                }
-            
-            } catch (IOException e) {
-                Log_OC.e(TAG, "Error while trying to access to " + mAccount.name,
-                         new AccountsException("I/O exception while trying to authorize the account",
-                                               e));
-                result = new RemoteOperationResult<T>(e);
 
-            } catch (AccountsException e) {
-                Log_OC.e(TAG, "Error while trying to access to " + mAccount.name, e);
-                result = new RemoteOperationResult<T>(e);
-            }
-    	
-            if (result == null)
-                result = run(mClient);
-        
-            repeat = false;
-        	/** DEPRECATED BLOCK - will be removed at version 1.0 ; don't trust in this code 
-        	 * 						to trigger authentication update */
-            if (mCallerActivity != null && mAccount != null && mContext != null &&
-                    !result.isSuccess() &&
-                    ResultCode.UNAUTHORIZED == result.getCode()
-                ) {
-                /// possible fail due to lack of authorization
-                // in an operation performed in foreground
-                OwnCloudCredentials cred = mClient.getCredentials();
-                if (cred != null) {
-                    /// confirmed : unauthorized operation
-                    AccountManager am = AccountManager.get(mContext);
-                    if (cred.authTokenExpires()) {
-                        am.invalidateAuthToken(
-                                mAccount.type, 
-                                cred.getAuthToken()
-                        );
-                    } else {
-                        am.clearPassword(mAccount);
-                    }
-                    mClient = null;
-                    // when repeated, the creation of a new OwnCloudClient after erasing the saved
-                    // credentials will trigger the login activity
-                    repeat = true;
-                    result = null;
-                }
-            }
-            /** EOF DEPRECATED BLOCK **/
-        } while (repeat);
-        
-        if (mAccount != null && mContext != null) {
-        	// Save Client Cookies
-            AccountUtils.saveClient(mClient, mAccount, mContext);
-        }
-        
-        final RemoteOperationResult<T> resultToSend = result;
-        if (mListenerHandler != null && mListener != null) {
-        	mListenerHandler.post(new Runnable() {
-                @Override
-                public void run() {
-                    mListener.onRemoteOperationFinish(RemoteOperation.this, resultToSend);
-                }
-            });
-        }
-    }
 
 
     /**
@@ -455,4 +234,8 @@ public final OwnCloudClient getClient() {
         return mClient;
     }
 
+    @Override
+    public void run() {
+        throw new NotImplementedError("this should never be used!");
+    }
 }
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/OCSNextcloudRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/OCSNextcloudRemoteOperation.java
new file mode 100644
index 000000000..5e709fb91
--- /dev/null
+++ b/library/src/main/java/com/owncloud/android/lib/resources/OCSNextcloudRemoteOperation.java
@@ -0,0 +1,63 @@
+/*
+ * Nextcloud Android client application
+ *
+ * @author Tobias Kaminsky
+ * Copyright (C) 2023 Tobias Kaminsky
+ * Copyright (C) 2023 Nextcloud GmbH
+ *  
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *  
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU Affero General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *  
+ */
+
+package com.owncloud.android.lib.resources;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
+import com.google.gson.reflect.TypeToken;
+import com.nextcloud.common.OkHttpMethodBase;
+import com.owncloud.android.lib.common.operations.NextcloudRemoteOperation;
+
+import org.apache.commons.httpclient.HttpMethodBase;
+
+import java.io.IOException;
+
+/**
+ * Base class for OCS remote operations with convenient methods
+ *
+ * @author Bartosz Przybylski
+ */
+public abstract class OCSNextcloudRemoteOperation<T> extends NextcloudRemoteOperation<T> {
+
+    @Deprecated
+    public <T> T getServerResponse(HttpMethodBase method, TypeToken<T> type) throws IOException {
+        String response = method.getResponseBodyAsString();
+        JsonParser parser = new JsonParser();
+        JsonElement element = parser.parse(response);
+
+        Gson gson = new Gson();
+
+        return gson.fromJson(element, type.getType());
+    }
+
+    public <T> T getServerResponse(OkHttpMethodBase method, TypeToken<T> type) {
+        String response = method.getResponseBodyAsString();
+        JsonParser parser = new JsonParser();
+        JsonElement element = parser.parse(response);
+
+        Gson gson = new Gson();
+
+        return gson.fromJson(element, type.getType());
+    }
+}
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/OCSRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/OCSRemoteOperation.java
index 0c496ea0b..371e8a617 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/OCSRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/OCSRemoteOperation.java
@@ -32,7 +32,7 @@
 import com.google.gson.JsonParser;
 import com.google.gson.reflect.TypeToken;
 import com.nextcloud.common.OkHttpMethodBase;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 
 import org.apache.commons.httpclient.HttpMethodBase;
 
@@ -43,7 +43,7 @@
  *
  * @author Bartosz Przybylski
  */
-public abstract class OCSRemoteOperation<T> extends RemoteOperation<T> {
+public abstract class OCSRemoteOperation<T> extends LegacyRemoteOperation<T> {
 
     @Deprecated
     public <T> T getServerResponse(HttpMethodBase method, TypeToken<T> type) throws IOException {
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/activities/GetActivitiesRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/activities/GetActivitiesRemoteOperation.java
index 01c0e9f9d..000f8d4b0 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/activities/GetActivitiesRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/activities/GetActivitiesRemoteOperation.java
@@ -36,8 +36,7 @@
 import com.google.gson.reflect.TypeToken;
 import com.nextcloud.common.NextcloudClient;
 import com.nextcloud.operations.GetMethod;
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.NextcloudRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.activities.model.Activity;
@@ -46,9 +45,7 @@
 import com.owncloud.android.lib.resources.activities.models.PreviewObject;
 import com.owncloud.android.lib.resources.activities.models.PreviewObjectAdapter;
 
-import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.NameValuePair;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
@@ -61,7 +58,7 @@
  * accessible via the activities endpoint at {@value OCS_ROUTE_V12_AND_UP}, specified at
  * {@link "https://github.com/nextcloud/activity/blob/master/docs/endpoint-v2.md"}.
  */
-public class GetActivitiesRemoteOperation extends RemoteOperation {
+public class GetActivitiesRemoteOperation extends NextcloudRemoteOperation {
 
     private static final String TAG = GetActivitiesRemoteOperation.class.getSimpleName();
 
@@ -163,86 +160,6 @@ public RemoteOperationResult run(NextcloudClient client) {
 
         return result;
     }
-    
-    @Override
-    protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result;
-        int status;
-        org.apache.commons.httpclient.methods.GetMethod get = null;
-        ArrayList<Activity> activities;
-        String url = client.getBaseUri() + OCS_ROUTE_V12_AND_UP;
-        
-        // add filter for fileId, if available
-        if (fileId > 0) {
-            url = url + "/filter";
-        }
-        
-        Log_OC.d(TAG, "URL: " + url);
-
-        try {
-            get = new org.apache.commons.httpclient.methods.GetMethod(url);
-            get.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
-
-            ArrayList<NameValuePair> parameters = new ArrayList<>();
-            parameters.add(new NameValuePair("format", "json"));
-            parameters.add(new NameValuePair("previews", "true"));
-            
-            if (lastGiven != -1) {
-                parameters.add(new NameValuePair("since", String.valueOf(lastGiven)));
-            }
-
-            if (fileId > 0) {
-                parameters.add(new NameValuePair("sort", "desc"));
-                parameters.add(new NameValuePair("object_type", "files"));
-                parameters.add(new NameValuePair("object_id", String.valueOf(fileId)));
-            }
-
-            get.setQueryString(parameters.toArray(new NameValuePair[]{}));
-
-            status = client.executeMethod(get);
-            String response = get.getResponseBodyAsString();
-
-            Header nextPageHeader = get.getResponseHeader("X-Activity-Last-Given");
-            if (nextPageHeader != null) {
-                lastGiven = Integer.parseInt(nextPageHeader.getValue());
-            } else {
-                lastGiven = -1;
-            }
-
-            if (isSuccess(status)) {
-                Log_OC.d(TAG, "Successful response: " + response);
-                result = new RemoteOperationResult(true, status, get.getResponseHeaders());
-                // Parse the response
-                if (response == null) {
-                    activities = new ArrayList<>();
-                } else {
-                    activities = parseResult(response);
-                }
-
-                ArrayList<Object> data = new ArrayList<>();
-                data.add(activities);
-                data.add(lastGiven);
-                result.setData(data);
-            } else {
-                result = new RemoteOperationResult(false, status, get.getResponseHeaders());
-                Log_OC.e(TAG, "Failed response while getting user activities ");
-                if (response != null) {
-                    Log_OC.e(TAG, "*** status code: " + status + " ; response message: " + response);
-                } else {
-                    Log_OC.e(TAG, "*** status code: " + status);
-                }
-            }
-        } catch (IOException e) {
-            result = new RemoteOperationResult(e);
-            Log_OC.e(TAG, "Exception while getting remote activities", e);
-        } finally {
-            if (get != null) {
-                get.releaseConnection();
-            }
-        }
-
-        return result;
-    }
 
     public boolean hasMoreActivities() {
         return lastGiven> 0;
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/comments/CommentFileRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/comments/CommentFileRemoteOperation.java
index 99d72d377..a66431374 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/comments/CommentFileRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/comments/CommentFileRemoteOperation.java
@@ -31,7 +31,7 @@
 
 import com.google.gson.GsonBuilder;
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 
 import org.apache.commons.httpclient.HttpStatus;
@@ -45,7 +45,7 @@
 /**
  * Comment file
  */
-public class CommentFileRemoteOperation extends RemoteOperation {
+public class CommentFileRemoteOperation extends LegacyRemoteOperation {
 
     private static final String TAG = CommentFileRemoteOperation.class.getSimpleName();
     private static final int POST_READ_TIMEOUT = 30000;
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/comments/MarkCommentsAsReadRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/comments/MarkCommentsAsReadRemoteOperation.java
index d6db35f76..4a4df1013 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/comments/MarkCommentsAsReadRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/comments/MarkCommentsAsReadRemoteOperation.java
@@ -29,7 +29,7 @@
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.network.WebdavEntry;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 
 import org.apache.commons.httpclient.HttpStatus;
@@ -44,7 +44,7 @@
 /**
  * Mark all comments for a file as read
  */
-public class MarkCommentsAsReadRemoteOperation extends RemoteOperation {
+public class MarkCommentsAsReadRemoteOperation extends LegacyRemoteOperation {
     private static final String COMMENTS_URL = "/comments/files/";
 
     private final long fileId;
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/e2ee/GetMetadataRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/e2ee/GetMetadataRemoteOperation.java
index bd838cc17..3c5a4f179 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/e2ee/GetMetadataRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/e2ee/GetMetadataRemoteOperation.java
@@ -28,7 +28,7 @@
 package com.owncloud.android.lib.resources.e2ee;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -43,7 +43,7 @@
  * Remote operation performing the fetch of metadata for a folder
  */
 
-public class GetMetadataRemoteOperation extends RemoteOperation {
+public class GetMetadataRemoteOperation extends LegacyRemoteOperation {
 
     private static final String TAG = GetMetadataRemoteOperation.class.getSimpleName();
     private static final int SYNC_READ_TIMEOUT = 40000;
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/e2ee/LockFileRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/e2ee/LockFileRemoteOperation.java
index 42b8d5cdc..9f627f7bc 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/e2ee/LockFileRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/e2ee/LockFileRemoteOperation.java
@@ -28,7 +28,7 @@
 package com.owncloud.android.lib.resources.e2ee;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -42,7 +42,7 @@
 /**
  * Lock a file
  */
-public class LockFileRemoteOperation extends RemoteOperation {
+public class LockFileRemoteOperation extends LegacyRemoteOperation {
 
     private static final String TAG = LockFileRemoteOperation.class.getSimpleName();
     private static final int SYNC_READ_TIMEOUT = 40000;
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/e2ee/StoreMetadataRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/e2ee/StoreMetadataRemoteOperation.java
index c03bddef4..b75b7f6a0 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/e2ee/StoreMetadataRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/e2ee/StoreMetadataRemoteOperation.java
@@ -28,7 +28,7 @@
 package com.owncloud.android.lib.resources.e2ee;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -43,7 +43,7 @@
  * Remote operation to store the folder metadata
  */
 
-public class StoreMetadataRemoteOperation extends RemoteOperation {
+public class StoreMetadataRemoteOperation extends LegacyRemoteOperation {
 
     private static final String TAG = StoreMetadataRemoteOperation.class.getSimpleName();
     private static final int SYNC_READ_TIMEOUT = 40000;
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/e2ee/ToggleEncryptionRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/e2ee/ToggleEncryptionRemoteOperation.java
index 4947a5dc3..e2d00a0e5 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/e2ee/ToggleEncryptionRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/e2ee/ToggleEncryptionRemoteOperation.java
@@ -27,6 +27,7 @@
 package com.owncloud.android.lib.resources.e2ee;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
@@ -42,7 +43,7 @@
  * Set encryption of a folder
  */
 
-public class ToggleEncryptionRemoteOperation extends RemoteOperation {
+public class ToggleEncryptionRemoteOperation extends LegacyRemoteOperation {
 
     private static final String TAG = ToggleEncryptionRemoteOperation.class.getSimpleName();
     private static final int SYNC_READ_TIMEOUT = 40000;
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/e2ee/UnlockFileRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/e2ee/UnlockFileRemoteOperation.java
index 11adca4e1..9363b3650 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/e2ee/UnlockFileRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/e2ee/UnlockFileRemoteOperation.java
@@ -27,7 +27,7 @@
 package com.owncloud.android.lib.resources.e2ee;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -38,7 +38,7 @@
 /**
  * Unlock a file
  */
-public class UnlockFileRemoteOperation extends RemoteOperation {
+public class UnlockFileRemoteOperation extends LegacyRemoteOperation {
 
     private static final String TAG = UnlockFileRemoteOperation.class.getSimpleName();
     private static final int SYNC_READ_TIMEOUT = 40000;
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/e2ee/UpdateMetadataRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/e2ee/UpdateMetadataRemoteOperation.java
index ee9f0e114..adc1877a6 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/e2ee/UpdateMetadataRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/e2ee/UpdateMetadataRemoteOperation.java
@@ -28,7 +28,7 @@
 package com.owncloud.android.lib.resources.e2ee;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -46,7 +46,7 @@
  * Remote operation to update the folder metadata
  */
 
-public class UpdateMetadataRemoteOperation extends RemoteOperation {
+public class UpdateMetadataRemoteOperation extends LegacyRemoteOperation {
 
     private static final String TAG = UpdateMetadataRemoteOperation.class.getSimpleName();
     private static final int SYNC_READ_TIMEOUT = 40000;
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/CheckEtagRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/files/CheckEtagRemoteOperation.java
index 6c3b9d0c5..b2acba213 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/files/CheckEtagRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/files/CheckEtagRemoteOperation.java
@@ -29,7 +29,7 @@
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.network.WebdavUtils;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.common.utils.Log_OC;
@@ -47,7 +47,7 @@
 /**
  * Check if file is up to date, by checking only eTag
  */
-public class CheckEtagRemoteOperation extends RemoteOperation {
+public class CheckEtagRemoteOperation extends LegacyRemoteOperation {
 
     private static final int SYNC_READ_TIMEOUT = 40000;
     private static final int SYNC_CONNECTION_TIMEOUT = 5000;
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/CommentFileOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/files/CommentFileOperation.java
new file mode 100644
index 000000000..9c5a8760a
--- /dev/null
+++ b/library/src/main/java/com/owncloud/android/lib/resources/files/CommentFileOperation.java
@@ -0,0 +1,63 @@
+/*
+ * Nextcloud Android client application
+ *
+ * @author Tobias Kaminsky
+ * Copyright (C) 2018 Tobias Kaminsky
+ * Copyright (C) 2018 Nextcloud GmbH.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.lib.resources.files;
+
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.lib.resources.comments.CommentFileRemoteOperation;
+
+/**
+ * Comment file
+ */
+public class CommentFileOperation extends LegacyRemoteOperation {
+
+    private final String message;
+    private final long fileId;
+
+    /**
+     * Constructor
+     *
+     * @param message Comment to store
+     */
+    public CommentFileOperation(String message, long fileId) {
+        this.message = message;
+        this.fileId = fileId;
+    }
+
+    /**
+     * Performs the operation.
+     *
+     * @param client Client object to communicate with the remote ownCloud server.
+     */
+    @Override
+    protected RemoteOperationResult run(OwnCloudClient client) {
+        RemoteOperationResult result = new CommentFileRemoteOperation(message, fileId).execute(client);
+
+        if (!result.isSuccess()) {
+            Log_OC.e(this, "File with Id " + fileId + " could not be commented");
+        }
+
+        return result;
+    }
+}
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/CopyFileRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/files/CopyFileRemoteOperation.java
index 05db2cdd1..5d4d5696e 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/files/CopyFileRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/files/CopyFileRemoteOperation.java
@@ -27,7 +27,7 @@
 import android.util.Log;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 
@@ -48,7 +48,7 @@
  *
  * @author David A. Velasco
  */
-public class CopyFileRemoteOperation extends RemoteOperation {
+public class CopyFileRemoteOperation extends LegacyRemoteOperation {
 
     private static final String TAG = CopyFileRemoteOperation.class.getSimpleName();
 
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/CreateFileFromTemplateOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/files/CreateFileFromTemplateOperation.java
new file mode 100644
index 000000000..2a5495bf0
--- /dev/null
+++ b/library/src/main/java/com/owncloud/android/lib/resources/files/CreateFileFromTemplateOperation.java
@@ -0,0 +1,95 @@
+/*
+ * Nextcloud Android client application
+ *
+ * @author Tobias Kaminsky
+ * Copyright (C) 2018 Tobias Kaminsky
+ * Copyright (C) 2018 Nextcloud GmbH.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.owncloud.android.lib.resources.files;
+
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.common.utils.Log_OC;
+
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.httpclient.methods.Utf8PostMethod;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+
+public class CreateFileFromTemplateOperation extends LegacyRemoteOperation {
+    private static final String TAG = CreateFileFromTemplateOperation.class.getSimpleName();
+    private static final int SYNC_READ_TIMEOUT = 40000;
+    private static final int SYNC_CONNECTION_TIMEOUT = 5000;
+    private static final String NEW_FROM_TEMPLATE_URL = "/ocs/v2.php/apps/richdocuments/api/v1/templates/new";
+
+    private String path;
+    private long templateId;
+
+    // JSON node names
+    private static final String NODE_OCS = "ocs";
+    private static final String NODE_DATA = "data";
+    private static final String JSON_FORMAT = "?format=json";
+
+    public CreateFileFromTemplateOperation(String path, long templateId) {
+        this.path = path;
+        this.templateId = templateId;
+    }
+
+    protected RemoteOperationResult run(OwnCloudClient client) {
+        RemoteOperationResult result;
+        Utf8PostMethod postMethod = null;
+
+        try {
+
+            postMethod = new Utf8PostMethod(client.getBaseUri() + NEW_FROM_TEMPLATE_URL + JSON_FORMAT);
+            postMethod.setParameter("path", path);
+            postMethod.setParameter("template", String.valueOf(templateId));
+
+            // remote request
+            postMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
+
+            int status = client.executeMethod(postMethod, SYNC_READ_TIMEOUT, SYNC_CONNECTION_TIMEOUT);
+
+            if (status == HttpStatus.SC_OK) {
+                String response = postMethod.getResponseBodyAsString();
+
+                // Parse the response
+                JSONObject respJSON = new JSONObject(response);
+                String url = respJSON.getJSONObject(NODE_OCS).getJSONObject(NODE_DATA).getString("url");
+
+                ArrayList<Object> templateArray = new ArrayList<>();
+                templateArray.add(url);
+
+                result = new RemoteOperationResult(true, postMethod);
+                result.setData(templateArray);
+            } else {
+                result = new RemoteOperationResult(false, postMethod);
+                client.exhaustResponse(postMethod.getResponseBodyAsStream());
+            }
+        } catch (Exception e) {
+            result = new RemoteOperationResult(e);
+            Log_OC.e(TAG, "Create file from template " + templateId + " failed: " + result.getLogMessage(),
+                    result.getException());
+        } finally {
+            if (postMethod != null) {
+                postMethod.releaseConnection();
+            }
+        }
+        return result;
+    }
+}
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/CreateFolderRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/files/CreateFolderRemoteOperation.java
index 48218fbd8..20c53db3b 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/files/CreateFolderRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/files/CreateFolderRemoteOperation.java
@@ -27,7 +27,7 @@
 import android.text.TextUtils;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -41,7 +41,7 @@
  * @author David A. Velasco
  * @author masensio
  */
-public class CreateFolderRemoteOperation extends RemoteOperation {
+public class CreateFolderRemoteOperation extends LegacyRemoteOperation {
 
     private static final String TAG = CreateFolderRemoteOperation.class.getSimpleName();
 
@@ -125,7 +125,7 @@ private RemoteOperationResult createFolder(OwnCloudClient client) {
     }
 
     private RemoteOperationResult createParentFolder(String parentPath, OwnCloudClient client) {
-        RemoteOperation operation = new CreateFolderRemoteOperation(parentPath, createFullPath);
+        LegacyRemoteOperation operation = new CreateFolderRemoteOperation(parentPath, createFullPath);
         return operation.execute(client);
     }
 
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/DownloadFileRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/files/DownloadFileRemoteOperation.java
index 7ce43f018..7d82c5f10 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/files/DownloadFileRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/files/DownloadFileRemoteOperation.java
@@ -27,8 +27,8 @@
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
 import com.owncloud.android.lib.common.network.WebdavUtils;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.OperationCancelledException;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -53,7 +53,7 @@
  * @author masensio
  */
 
-public class DownloadFileRemoteOperation extends RemoteOperation {
+public class DownloadFileRemoteOperation extends LegacyRemoteOperation {
 
     private static final String TAG = DownloadFileRemoteOperation.class.getSimpleName();
 
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
index 471f2882d..349e2769f 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java
@@ -29,7 +29,7 @@
 import com.owncloud.android.lib.common.OwnCloudAnonymousCredentials;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.network.RedirectionPath;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -41,7 +41,7 @@
  * 
  * @author David A. Velasco
  */
-public class ExistenceCheckRemoteOperation extends RemoteOperation {
+public class ExistenceCheckRemoteOperation extends LegacyRemoteOperation {
     
     /** Maximum time to wait for a response from the server in MILLISECONDs.  */
     public static final int TIMEOUT = 50000;
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/FetchTemplateRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/files/FetchTemplateRemoteOperation.java
new file mode 100644
index 000000000..8b32cf62e
--- /dev/null
+++ b/library/src/main/java/com/owncloud/android/lib/resources/files/FetchTemplateRemoteOperation.java
@@ -0,0 +1,104 @@
+/*
+ * Nextcloud Android client application
+ *
+ * @author Tobias Kaminsky
+ * Copyright (C) 2018 Tobias Kaminsky
+ * Copyright (C) 2018 Nextcloud GmbH.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.owncloud.android.lib.resources.files;
+
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.common.utils.Log_OC;
+
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.Locale;
+
+public class FetchTemplateRemoteOperation extends LegacyRemoteOperation {
+    private static final String TAG = FetchTemplateRemoteOperation.class.getSimpleName();
+    private static final int SYNC_READ_TIMEOUT = 40000;
+    private static final int SYNC_CONNECTION_TIMEOUT = 5000;
+    private static final String TEMPLATE_URL = "/ocs/v2.php/apps/richdocuments/api/v1/templates/";
+
+    private RichDocumentsTemplateType type;
+
+    // JSON node names
+    private static final String NODE_OCS = "ocs";
+    private static final String NODE_DATA = "data";
+    private static final String JSON_FORMAT = "?format=json";
+
+    public FetchTemplateRemoteOperation(RichDocumentsTemplateType type) {
+        this.type = type;
+    }
+
+    protected RemoteOperationResult run(OwnCloudClient client) {
+        RemoteOperationResult result;
+        GetMethod getMethod = null;
+
+        try {
+
+            getMethod = new GetMethod(client.getBaseUri() + TEMPLATE_URL + type.toString().toLowerCase(Locale.ENGLISH) +
+                JSON_FORMAT);
+
+            // remote request
+            getMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
+
+            int status = client.executeMethod(getMethod, SYNC_READ_TIMEOUT, SYNC_CONNECTION_TIMEOUT);
+
+            if (status == HttpStatus.SC_OK) {
+                String response = getMethod.getResponseBodyAsString();
+
+                // Parse the response
+                JSONObject respJSON = new JSONObject(response);
+                JSONArray templates = respJSON.getJSONObject(NODE_OCS).getJSONArray(NODE_DATA);
+
+                ArrayList<Object> templateArray = new ArrayList<>();
+
+                for (int i = 0; i < templates.length(); i++) {
+                    JSONObject templateObject = templates.getJSONObject(i);
+
+                    templateArray.add(new Template(templateObject.getLong("id"),
+                                                   templateObject.getString("name"),
+                                                   templateObject.optString("preview"),
+                                                   RichDocumentsTemplateType.valueOf(templateObject.getString("type")
+                                                                           .toUpperCase(Locale.ROOT)),
+                                                   templateObject.getString("extension")));
+                }
+
+                result = new RemoteOperationResult(true, getMethod);
+                result.setData(templateArray);
+            } else {
+                result = new RemoteOperationResult(false, getMethod);
+                client.exhaustResponse(getMethod.getResponseBodyAsStream());
+            }
+        } catch (Exception e) {
+            result = new RemoteOperationResult(e);
+            Log_OC.e(TAG, "Get templates for typ " + type + " failed: " + result.getLogMessage(),
+                result.getException());
+        } finally {
+            if (getMethod != null) {
+                getMethod.releaseConnection();
+            }
+        }
+        return result;
+    }
+}
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/MoveFileRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/files/MoveFileRemoteOperation.java
index 38129a317..8ace1c1f6 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/files/MoveFileRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/files/MoveFileRemoteOperation.java
@@ -27,7 +27,7 @@
 import android.util.Log;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 
@@ -48,7 +48,7 @@
  *
  * @author David A. Velasco
  */
-public class MoveFileRemoteOperation extends RemoteOperation {
+public class MoveFileRemoteOperation extends LegacyRemoteOperation {
 
     private static final String TAG = MoveFileRemoteOperation.class.getSimpleName();
 
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/ReadFileRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/files/ReadFileRemoteOperation.java
index 26c2e45ce..8ec1b62e9 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/files/ReadFileRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/files/ReadFileRemoteOperation.java
@@ -26,7 +26,7 @@
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.network.WebdavEntry;
 import com.owncloud.android.lib.common.network.WebdavUtils;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.files.model.RemoteFile;
@@ -46,7 +46,7 @@
  * @author masensio
  */
 
-public class ReadFileRemoteOperation extends RemoteOperation {
+public class ReadFileRemoteOperation extends LegacyRemoteOperation {
 
     private static final String TAG = ReadFileRemoteOperation.class.getSimpleName();
     private static final int SYNC_READ_TIMEOUT = 40000;
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/ReadFileVersionsRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/files/ReadFileVersionsRemoteOperation.java
index a93790809..e0664dc91 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/files/ReadFileVersionsRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/files/ReadFileVersionsRemoteOperation.java
@@ -30,7 +30,7 @@
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.network.WebdavEntry;
 import com.owncloud.android.lib.common.network.WebdavUtils;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.files.model.FileVersion;
@@ -47,7 +47,7 @@
  * Remote operation performing the read of remote versions on Nextcloud server.
  */
 
-public class ReadFileVersionsRemoteOperation extends RemoteOperation {
+public class ReadFileVersionsRemoteOperation extends LegacyRemoteOperation {
 
     private static final String TAG = ReadFileVersionsRemoteOperation.class.getSimpleName();
 
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/ReadFolderRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/files/ReadFolderRemoteOperation.java
index 9d8b035d3..b3b1ac81b 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/files/ReadFolderRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/files/ReadFolderRemoteOperation.java
@@ -27,6 +27,7 @@
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.network.WebdavEntry;
 import com.owncloud.android.lib.common.network.WebdavUtils;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
@@ -46,7 +47,7 @@
  * @author masensio
  */
 
-public class ReadFolderRemoteOperation extends RemoteOperation {
+public class ReadFolderRemoteOperation extends LegacyRemoteOperation {
 
     private static final String TAG = ReadFolderRemoteOperation.class.getSimpleName();
 
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/RemoveFileRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/files/RemoveFileRemoteOperation.java
index 578492a2b..84ecc5c3c 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/files/RemoveFileRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/files/RemoveFileRemoteOperation.java
@@ -25,7 +25,7 @@
 package com.owncloud.android.lib.resources.files;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -38,7 +38,7 @@
  * @author David A. Velasco
  * @author masensio
  */
-public class RemoveFileRemoteOperation extends RemoteOperation {
+public class RemoveFileRemoteOperation extends LegacyRemoteOperation {
     private static final String TAG = RemoveFileRemoteOperation.class.getSimpleName();
 
     private static final int REMOVE_READ_TIMEOUT = 30000;
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/RenameFileRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/files/RenameFileRemoteOperation.java
index 39c732aa5..3bf554924 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/files/RenameFileRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/files/RenameFileRemoteOperation.java
@@ -25,7 +25,7 @@
 package com.owncloud.android.lib.resources.files;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.common.utils.Log_OC;
@@ -41,7 +41,7 @@
  * @author David A. Velasco
  * @author masensio
  */
-public class RenameFileRemoteOperation extends RemoteOperation {
+public class RenameFileRemoteOperation extends LegacyRemoteOperation {
 
     private static final String TAG = RenameFileRemoteOperation.class.getSimpleName();
 
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/RestoreFileVersionRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/files/RestoreFileVersionRemoteOperation.java
index 21789d769..dd5985488 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/files/RestoreFileVersionRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/files/RestoreFileVersionRemoteOperation.java
@@ -31,7 +31,7 @@
 import android.util.Log;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.resources.files.model.FileVersion;
 
@@ -44,7 +44,7 @@
 /**
  * Restore a {@link FileVersion}.
  */
-public class RestoreFileVersionRemoteOperation extends RemoteOperation {
+public class RestoreFileVersionRemoteOperation extends LegacyRemoteOperation {
 
     private static final String TAG = RestoreFileVersionRemoteOperation.class.getSimpleName();
     private static final int RESTORE_READ_TIMEOUT = 30000;
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/RichDocumentsCreateAssetRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/files/RichDocumentsCreateAssetRemoteOperation.java
new file mode 100644
index 000000000..f51d8a5d9
--- /dev/null
+++ b/library/src/main/java/com/owncloud/android/lib/resources/files/RichDocumentsCreateAssetRemoteOperation.java
@@ -0,0 +1,91 @@
+/*
+ * Nextcloud Android client application
+ *
+ * @author Tobias Kaminsky
+ * Copyright (C) 2018 Tobias Kaminsky
+ * Copyright (C) 2018 Nextcloud GmbH.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.owncloud.android.lib.resources.files;
+
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.common.utils.Log_OC;
+
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.httpclient.methods.Utf8PostMethod;
+import org.json.JSONObject;
+
+/**
+ * Create asset for RichDocuments app from file, which is already stored on Nextcloud server
+ */
+
+public class RichDocumentsCreateAssetRemoteOperation extends LegacyRemoteOperation {
+    private static final String TAG = RichDocumentsCreateAssetRemoteOperation.class.getSimpleName();
+    private static final int SYNC_READ_TIMEOUT = 40000;
+    private static final int SYNC_CONNECTION_TIMEOUT = 5000;
+    private static final String ASSET_URL = "/index.php/apps/richdocuments/assets";
+
+    private static final String NODE_URL = "url";
+    private static final String PARAMETER_PATH = "path";
+    private static final String PARAMETER_FORMAT = "format";
+    private static final String PARAMETER_FORMAT_VALUE = "json";
+
+    private String path;
+
+    public RichDocumentsCreateAssetRemoteOperation(String path) {
+        this.path = path;
+    }
+
+    protected RemoteOperationResult run(OwnCloudClient client) {
+        RemoteOperationResult result;
+        Utf8PostMethod postMethod = null;
+
+        try {
+            postMethod = new Utf8PostMethod(client.getBaseUri() + ASSET_URL);
+            postMethod.setParameter(PARAMETER_PATH, path);
+            postMethod.setParameter(PARAMETER_FORMAT, PARAMETER_FORMAT_VALUE);
+
+            // remote request
+            postMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
+
+            int status = client.executeMethod(postMethod, SYNC_READ_TIMEOUT, SYNC_CONNECTION_TIMEOUT);
+
+            if (status == HttpStatus.SC_OK) {
+                String response = postMethod.getResponseBodyAsString();
+
+                // Parse the response
+                JSONObject respJSON = new JSONObject(response);
+                String url = respJSON.getString(NODE_URL);
+
+                result = new RemoteOperationResult(true, postMethod);
+                result.setSingleData(url);
+            } else {
+                result = new RemoteOperationResult(false, postMethod);
+                client.exhaustResponse(postMethod.getResponseBodyAsStream());
+            }
+        } catch (Exception e) {
+            result = new RemoteOperationResult(e);
+            Log_OC.e(TAG, "Create asset for richdocuments with path " + path + " failed: " + result.getLogMessage(),
+                    result.getException());
+        } finally {
+            if (postMethod != null) {
+                postMethod.releaseConnection();
+            }
+        }
+        return result;
+    }
+}
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/RichDocumentsTemplateType.kt b/library/src/main/java/com/owncloud/android/lib/resources/files/RichDocumentsTemplateType.kt
new file mode 100644
index 000000000..e09fd0469
--- /dev/null
+++ b/library/src/main/java/com/owncloud/android/lib/resources/files/RichDocumentsTemplateType.kt
@@ -0,0 +1,26 @@
+/*
+ *
+ * Nextcloud Android client application
+ *
+ * @author Tobias Kaminsky
+ * Copyright (C) 2023 Tobias Kaminsky
+ * Copyright (C) 2023 Nextcloud GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.owncloud.android.lib.resources.files
+
+enum class RichDocumentsTemplateType {
+    DOCUMENT, SPREADSHEET, PRESENTATION, UNKNOWN
+}
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/RichDocumentsUrlRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/files/RichDocumentsUrlRemoteOperation.java
new file mode 100644
index 000000000..781083453
--- /dev/null
+++ b/library/src/main/java/com/owncloud/android/lib/resources/files/RichDocumentsUrlRemoteOperation.java
@@ -0,0 +1,91 @@
+/*
+ * Nextcloud Android client application
+ *
+ * @author Tobias Kaminsky
+ * Copyright (C) 2018 Tobias Kaminsky
+ * Copyright (C) 2018 Nextcloud GmbH.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.owncloud.android.lib.resources.files;
+
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.common.utils.Log_OC;
+
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.httpclient.methods.Utf8PostMethod;
+import org.json.JSONObject;
+
+/**
+ * Edit a file with Richdocuments. Returns URL which can be shown in WebView.
+ */
+public class RichDocumentsUrlRemoteOperation extends LegacyRemoteOperation {
+    private static final String TAG = RichDocumentsUrlRemoteOperation.class.getSimpleName();
+    private static final int SYNC_READ_TIMEOUT = 40000;
+    private static final int SYNC_CONNECTION_TIMEOUT = 5000;
+    private static final String DOCUMENT_URL = "/ocs/v2.php/apps/richdocuments/api/v1/document";
+    private static final String FILE_ID = "fileId";
+
+    // JSON node names
+    private static final String NODE_OCS = "ocs";
+    private static final String NODE_DATA = "data";
+    private static final String NODE_URL = "url";
+    private static final String JSON_FORMAT = "?format=json";
+
+    private final long fileId;
+
+    public RichDocumentsUrlRemoteOperation(long fileID) {
+        this.fileId = fileID;
+    }
+
+    protected RemoteOperationResult run(OwnCloudClient client) {
+        RemoteOperationResult result;
+        Utf8PostMethod postMethod = null;
+
+        try {
+            postMethod = new Utf8PostMethod(client.getBaseUri() + DOCUMENT_URL + JSON_FORMAT);
+            postMethod.setParameter(FILE_ID, String.valueOf(fileId));
+
+            // remote request
+            postMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
+
+            int status = client.executeMethod(postMethod, SYNC_READ_TIMEOUT, SYNC_CONNECTION_TIMEOUT);
+
+            if (status == HttpStatus.SC_OK) {
+                String response = postMethod.getResponseBodyAsString();
+
+                // Parse the response
+                JSONObject respJSON = new JSONObject(response);
+                String url = respJSON.getJSONObject(NODE_OCS).getJSONObject(NODE_DATA).getString(NODE_URL);
+
+                result = new RemoteOperationResult(true, postMethod);
+                result.setSingleData(url);
+            } else {
+                result = new RemoteOperationResult(false, postMethod);
+                client.exhaustResponse(postMethod.getResponseBodyAsStream());
+            }
+        } catch (Exception e) {
+            result = new RemoteOperationResult(e);
+            Log_OC.e(TAG, "Get rich document url for file with id " + fileId + " failed: " + result.getLogMessage(),
+                     result.getException());
+        } finally {
+            if (postMethod != null) {
+                postMethod.releaseConnection();
+            }
+        }
+        return result;
+    }
+}
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/SearchRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/files/SearchRemoteOperation.java
index 052f25ba7..5c503dff6 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/files/SearchRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/files/SearchRemoteOperation.java
@@ -28,7 +28,7 @@
 package com.owncloud.android.lib.resources.files;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.WebDavFileUtils;
 import com.owncloud.android.lib.resources.files.model.RemoteFile;
@@ -46,7 +46,7 @@
 /**
  * Remote operation performing the search in the Nextcloud server.
  */
-public class SearchRemoteOperation extends RemoteOperation<List<RemoteFile>> {
+public class SearchRemoteOperation extends LegacyRemoteOperation<List<RemoteFile>> {
 
 
     public enum SearchType {
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/StreamMediaFileRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/files/StreamMediaFileRemoteOperation.java
new file mode 100644
index 000000000..e79ffa9f6
--- /dev/null
+++ b/library/src/main/java/com/owncloud/android/lib/resources/files/StreamMediaFileRemoteOperation.java
@@ -0,0 +1,91 @@
+/*
+ * Nextcloud Android client application
+ *
+ * @author Tobias Kaminsky
+ * Copyright (C) 2018 Tobias Kaminsky
+ * Copyright (C) 2018 Nextcloud GmbH.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.owncloud.android.lib.resources.files;
+
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.common.utils.Log_OC;
+
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.httpclient.methods.Utf8PostMethod;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+
+public class StreamMediaFileRemoteOperation extends LegacyRemoteOperation {
+    private static final String TAG = StreamMediaFileRemoteOperation.class.getSimpleName();
+    private static final int SYNC_READ_TIMEOUT = 40000;
+    private static final int SYNC_CONNECTION_TIMEOUT = 5000;
+    private static final String STREAM_MEDIA_URL = "/ocs/v2.php/apps/dav/api/v1/direct";
+
+    private final long fileID;
+
+    // JSON node names
+    private static final String NODE_OCS = "ocs";
+    private static final String NODE_DATA = "data";
+    private static final String NODE_URL = "url";
+    private static final String JSON_FORMAT = "?format=json";
+
+    public StreamMediaFileRemoteOperation(long fileID) {
+        this.fileID = fileID;
+    }
+
+    protected RemoteOperationResult run(OwnCloudClient client) {
+        RemoteOperationResult result;
+        Utf8PostMethod postMethod = null;
+
+        try {
+            postMethod = new Utf8PostMethod(client.getBaseUri() + STREAM_MEDIA_URL + JSON_FORMAT);
+            postMethod.setParameter("fileId", String.valueOf(fileID));
+
+            // remote request
+            postMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
+
+            int status = client.executeMethod(postMethod, SYNC_READ_TIMEOUT, SYNC_CONNECTION_TIMEOUT);
+
+            if (status == HttpStatus.SC_OK) {
+                String response = postMethod.getResponseBodyAsString();
+
+                // Parse the response
+                JSONObject respJSON = new JSONObject(response);
+                String url = respJSON.getJSONObject(NODE_OCS).getJSONObject(NODE_DATA).getString(NODE_URL);
+
+                result = new RemoteOperationResult(true, postMethod);
+                ArrayList<Object> urlArray = new ArrayList<>();
+                urlArray.add(url);
+                result.setData(urlArray);
+            } else {
+                result = new RemoteOperationResult(false, postMethod);
+                client.exhaustResponse(postMethod.getResponseBodyAsStream());
+            }
+        } catch (Exception e) {
+            result = new RemoteOperationResult(e);
+            Log_OC.e(TAG, "Get stream url for file with id " + fileID + " failed: " + result.getLogMessage(),
+                    result.getException());
+        } finally {
+            if (postMethod != null) {
+                postMethod.releaseConnection();
+            }
+        }
+        return result;
+    }
+}
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/Template.kt b/library/src/main/java/com/owncloud/android/lib/resources/files/Template.kt
new file mode 100644
index 000000000..bcffb8c42
--- /dev/null
+++ b/library/src/main/java/com/owncloud/android/lib/resources/files/Template.kt
@@ -0,0 +1,46 @@
+/*
+ * Nextcloud Android client application
+ *
+ * @author Tobias Kaminsky
+ * Copyright (C) 2018 Tobias Kaminsky
+ * Copyright (C) 2018 Nextcloud GmbH.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.owncloud.android.lib.resources.files
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+/**
+ * Template for creating a file from it via RichDocuments app
+ */
+@Parcelize
+data class Template(
+    val id: Long,
+    val name: String,
+    val thumbnailLink: String,
+    val type: RichDocumentsTemplateType,
+    val extension: String
+) : Parcelable {
+    companion object {
+        @JvmStatic
+        fun parse(name: String) = try {
+            RichDocumentsTemplateType.valueOf(name.uppercase())
+        } catch (_: IllegalArgumentException) {
+            RichDocumentsTemplateType.UNKNOWN
+        }
+    }
+}
+
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/ToggleFavoriteRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/files/ToggleFavoriteRemoteOperation.java
index 10261d6c8..10675d102 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/files/ToggleFavoriteRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/files/ToggleFavoriteRemoteOperation.java
@@ -31,7 +31,7 @@
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.network.WebdavEntry;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 
 import org.apache.commons.httpclient.HttpStatus;
@@ -46,7 +46,7 @@
 /**
  * Favorite or unfavorite a file.
  */
-public class ToggleFavoriteRemoteOperation extends RemoteOperation {
+public class ToggleFavoriteRemoteOperation extends LegacyRemoteOperation {
     private boolean makeItFavorited;
     private String filePath;
 
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/UploadFileRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/files/UploadFileRemoteOperation.java
index 268fbdfc8..a148452c7 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/files/UploadFileRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/files/UploadFileRemoteOperation.java
@@ -30,8 +30,8 @@
 import com.owncloud.android.lib.common.network.FileRequestEntity;
 import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
 import com.owncloud.android.lib.common.network.ProgressiveDataTransfer;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.OperationCancelledException;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 
 import org.apache.commons.httpclient.DefaultHttpMethodRetryHandler;
@@ -54,7 +54,7 @@
  * @author masensio
  */
 
-public class UploadFileRemoteOperation extends RemoteOperation<String> {
+public class UploadFileRemoteOperation extends LegacyRemoteOperation<String> {
     private static final String OC_TOTAL_LENGTH_HEADER = "OC-Total-Length";
     private static final String IF_MATCH_HEADER = "If-Match";
     protected static final String RESULT_ETAG_HEADER = "etag";
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/notifications/DeleteAllNotificationsRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/notifications/DeleteAllNotificationsRemoteOperation.java
index fdb27d024..cbb5bffde 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/notifications/DeleteAllNotificationsRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/notifications/DeleteAllNotificationsRemoteOperation.java
@@ -28,7 +28,7 @@
 package com.owncloud.android.lib.resources.notifications;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -39,7 +39,7 @@
  * Delete all notification, specified at 
  * {@link "https://github.com/nextcloud/notifications/blob/master/docs/ocs-endpoint-v2.md"}.
  */
-public class DeleteAllNotificationsRemoteOperation extends RemoteOperation {
+public class DeleteAllNotificationsRemoteOperation extends LegacyRemoteOperation {
 
     // OCS Route
     private static final String OCS_ROUTE_LIST_V12_AND_UP =
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/notifications/DeleteNotificationRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/notifications/DeleteNotificationRemoteOperation.java
index 4f9280fe4..9294ed1e9 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/notifications/DeleteNotificationRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/notifications/DeleteNotificationRemoteOperation.java
@@ -28,7 +28,7 @@
 package com.owncloud.android.lib.resources.notifications;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -39,7 +39,7 @@
  * Delete a notification, specified at
  * {@link "https://github.com/nextcloud/notifications/blob/master/docs/ocs-endpoint-v2.md"}.
  */
-public class DeleteNotificationRemoteOperation extends RemoteOperation {
+public class DeleteNotificationRemoteOperation extends LegacyRemoteOperation {
 
     // OCS Route
     private static final String OCS_ROUTE_LIST_V12_AND_UP =
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/notifications/GetNotificationRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/notifications/GetNotificationRemoteOperation.java
index 2a6ddd3f9..98968395b 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/notifications/GetNotificationRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/notifications/GetNotificationRemoteOperation.java
@@ -32,7 +32,7 @@
 import com.google.gson.JsonParser;
 import com.google.gson.reflect.TypeToken;
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.notifications.models.Notification;
@@ -49,7 +49,7 @@
  * accessible via the notifications endpoint at {@value OCS_ROUTE_LIST_V12_AND_UP}, specified at
  * {@link "https://github.com/nextcloud/notifications/blob/master/docs/ocs-endpoint-v2.md"}.
  */
-public class GetNotificationRemoteOperation extends RemoteOperation<Notification> {
+public class GetNotificationRemoteOperation extends LegacyRemoteOperation<Notification> {
 
     // OCS Route
     private static final String OCS_ROUTE_LIST_V12_AND_UP =
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/notifications/GetNotificationsRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/notifications/GetNotificationsRemoteOperation.java
index 4990931bd..66fc3dcef 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/notifications/GetNotificationsRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/notifications/GetNotificationsRemoteOperation.java
@@ -35,7 +35,7 @@
 import com.google.gson.JsonParser;
 import com.google.gson.reflect.TypeToken;
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.notifications.models.Notification;
@@ -51,7 +51,7 @@
  * accessible via the notifications endpoint at {@value OCS_ROUTE_LIST_V12_AND_UP}, specified at
  * {@link "https://github.com/nextcloud/notifications/blob/master/docs/ocs-endpoint-v2.md"}.
  */
-public class GetNotificationsRemoteOperation extends RemoteOperation<List<Notification>> {
+public class GetNotificationsRemoteOperation extends LegacyRemoteOperation<List<Notification>> {
 
     // OCS Route
     private static final String OCS_ROUTE_LIST_V12_AND_UP =
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/notifications/RegisterAccountDeviceForNotificationsOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/notifications/RegisterAccountDeviceForNotificationsOperation.java
index bb0be4ae0..988059640 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/notifications/RegisterAccountDeviceForNotificationsOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/notifications/RegisterAccountDeviceForNotificationsOperation.java
@@ -32,7 +32,7 @@
 import com.google.gson.JsonParser;
 import com.google.gson.reflect.TypeToken;
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.notifications.models.PushResponse;
@@ -42,7 +42,7 @@
 
 import java.lang.reflect.Type;
 
-public class RegisterAccountDeviceForNotificationsOperation extends RemoteOperation<PushResponse> {
+public class RegisterAccountDeviceForNotificationsOperation extends LegacyRemoteOperation<PushResponse> {
     // OCS Route
     private static final String OCS_ROUTE =
             "/ocs/v2.php/apps/notifications/api/v2/push" + JSON_FORMAT;
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/notifications/UnregisterAccountDeviceForNotificationsOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/notifications/UnregisterAccountDeviceForNotificationsOperation.java
index 97536784a..4e2055375 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/notifications/UnregisterAccountDeviceForNotificationsOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/notifications/UnregisterAccountDeviceForNotificationsOperation.java
@@ -27,14 +27,14 @@
 package com.owncloud.android.lib.resources.notifications;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.methods.DeleteMethod;
 
-public class UnregisterAccountDeviceForNotificationsOperation extends RemoteOperation {
+public class UnregisterAccountDeviceForNotificationsOperation extends LegacyRemoteOperation {
 
     // OCS Route
     private static final String OCS_ROUTE =
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/shares/CreateShareRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/shares/CreateShareRemoteOperation.java
index 359541155..4aba40e85 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/shares/CreateShareRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/shares/CreateShareRemoteOperation.java
@@ -29,7 +29,7 @@
 import android.text.TextUtils;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -42,7 +42,7 @@
 /**
  * Creates a new share.  This allows sharing with a user or group or as a link.
  */
-public class CreateShareRemoteOperation extends RemoteOperation<List<OCShare>> {
+public class CreateShareRemoteOperation extends LegacyRemoteOperation<List<OCShare>> {
 
     private static final String TAG = CreateShareRemoteOperation.class.getSimpleName();
 
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/shares/GetShareRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/shares/GetShareRemoteOperation.java
index 06d06a40e..c96ae9f8e 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/shares/GetShareRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/shares/GetShareRemoteOperation.java
@@ -29,7 +29,7 @@
 import static com.owncloud.android.lib.resources.shares.ShareUtils.SHARING_API_PATH;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -42,7 +42,7 @@
  * Get the data about a Share resource, known its remote ID.
  */
 
-public class GetShareRemoteOperation extends RemoteOperation<List<OCShare>> {
+public class GetShareRemoteOperation extends LegacyRemoteOperation<List<OCShare>> {
 
     private static final String TAG = GetShareRemoteOperation.class.getSimpleName();
 
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/shares/GetShareesRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/shares/GetShareesRemoteOperation.java
index 9e427a260..1cba5bfed 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/shares/GetShareesRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/shares/GetShareesRemoteOperation.java
@@ -30,7 +30,7 @@
 import android.net.Uri;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -62,7 +62,7 @@
  * Status codes:
  *    100 - successful
  */
-public class GetShareesRemoteOperation extends RemoteOperation {
+public class GetShareesRemoteOperation extends LegacyRemoteOperation {
 
     private static final String TAG = GetShareesRemoteOperation.class.getSimpleName();
 
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/shares/GetSharesForFileRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/shares/GetSharesForFileRemoteOperation.java
index 6f4f6487b..14f3a62a7 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/shares/GetSharesForFileRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/shares/GetSharesForFileRemoteOperation.java
@@ -27,7 +27,7 @@
 package com.owncloud.android.lib.resources.shares;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -40,7 +40,7 @@
  * The input is the full path of the desired file.
  * The output is a list of everyone who has the file shared with them.
  */
-public class GetSharesForFileRemoteOperation extends RemoteOperation {
+public class GetSharesForFileRemoteOperation extends LegacyRemoteOperation {
 
     private static final String TAG = GetSharesForFileRemoteOperation.class.getSimpleName();
 
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/shares/GetSharesRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/shares/GetSharesRemoteOperation.java
index 7bf4ebcc3..4fe88b58f 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/shares/GetSharesRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/shares/GetSharesRemoteOperation.java
@@ -29,7 +29,7 @@
 import static com.owncloud.android.lib.resources.shares.ShareUtils.INCLUDE_TAGS;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -41,7 +41,7 @@
 /**
  * Get the data from the server about ALL the known shares owned by the requester.
  */
-public class GetSharesRemoteOperation extends RemoteOperation<List<OCShare>> {
+public class GetSharesRemoteOperation extends LegacyRemoteOperation<List<OCShare>> {
 
     private static final String TAG = GetSharesRemoteOperation.class.getSimpleName();
     private boolean sharedWithMe = false;
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/shares/RemoveShareRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/shares/RemoveShareRemoteOperation.java
index 2146bb9af..d291c55d6 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/shares/RemoveShareRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/shares/RemoveShareRemoteOperation.java
@@ -27,7 +27,7 @@
 package com.owncloud.android.lib.resources.shares;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -38,7 +38,7 @@
  * Remove a share
  */
 
-public class RemoveShareRemoteOperation extends RemoteOperation {
+public class RemoveShareRemoteOperation extends LegacyRemoteOperation {
 
     private static final String TAG = RemoveShareRemoteOperation.class.getSimpleName();
 
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/shares/UpdateShareRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/shares/UpdateShareRemoteOperation.java
index 08cdd55ac..d13634b7d 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/shares/UpdateShareRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/shares/UpdateShareRemoteOperation.java
@@ -29,7 +29,7 @@
 import android.util.Pair;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -51,7 +51,7 @@
  * 
  * Allow updating several parameters, triggering a request to the server per parameter.
  */
-public class UpdateShareRemoteOperation extends RemoteOperation {
+public class UpdateShareRemoteOperation extends LegacyRemoteOperation {
 
     private static final String TAG = GetShareRemoteOperation.class.getSimpleName();
 
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 4717ac639..ddc1634df 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
@@ -30,12 +30,10 @@
 
 import com.nextcloud.common.NextcloudClient;
 import com.nextcloud.operations.GetMethod;
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.NextcloudRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
-import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.HttpStatus;
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -49,7 +47,7 @@
  *
  * Save in Result.getData in a OCCapability object
  */
-public class GetCapabilitiesRemoteOperation extends RemoteOperation {
+public class GetCapabilitiesRemoteOperation extends NextcloudRemoteOperation<OCCapability> {
 
     private static final String TAG = GetCapabilitiesRemoteOperation.class.getSimpleName();
 
@@ -177,8 +175,8 @@ public GetCapabilitiesRemoteOperation(OCCapability currentCapability) {
     }
 
     @Override
-    public RemoteOperationResult run(NextcloudClient client) {
-        RemoteOperationResult result;
+    public RemoteOperationResult<OCCapability> run(NextcloudClient client) {
+        RemoteOperationResult<OCCapability> result;
         int status;
         GetMethod get = null;
 
@@ -200,7 +198,7 @@ public RemoteOperationResult run(NextcloudClient client) {
             if (isNotModified(status)) {
                 Log_OC.d(TAG, "Capabilities not modified");
 
-                result = new RemoteOperationResult(true, get);
+                result = new RemoteOperationResult<>(true, get);
                 result.setSingleData(currentCapability);
 
                 Log_OC.d(TAG, "*** Get Capabilities completed ");
@@ -216,85 +214,16 @@ public RemoteOperationResult run(NextcloudClient client) {
                 }
 
                 // Result
-                result = new RemoteOperationResult(true, get);
-                result.setSingleData(capability);
+                result = new RemoteOperationResult<>(true, get);
+                result.setResultData(capability);
             } else {
-                result = new RemoteOperationResult(false, get);
+                result = new RemoteOperationResult<>(false, get);
                 String response = get.getResponseBodyAsString();
                 Log_OC.e(TAG, "Failed response while getting capabilities from the server ");
-                if (response != null) {
-                    Log_OC.e(TAG, "*** status code: " + status + "; response message: " + response);
-                } else {
-                    Log_OC.e(TAG, "*** status code: " + status);
-                }
-            }
-        } catch (JSONException | IOException e) {
-            result = new RemoteOperationResult(e);
-            Log_OC.e(TAG, "Exception while getting capabilities", e);
-
-        } finally {
-            if (get != null) {
-                get.releaseConnection();
-            }
-        }
-        return result;
-    }
-
-    @Override
-    protected RemoteOperationResult run(OwnCloudClient client) {
-        RemoteOperationResult result;
-        int status;
-        org.apache.commons.httpclient.methods.GetMethod get = null;
-
-        try {
-            Uri requestUri = client.getBaseUri();
-            Uri.Builder uriBuilder = requestUri.buildUpon();
-            uriBuilder.appendEncodedPath(OCS_ROUTE);    // avoid starting "/" in this method
-            uriBuilder.appendQueryParameter(PARAM_FORMAT, VALUE_FORMAT);
-
-            // Get Method
-            get = new org.apache.commons.httpclient.methods.GetMethod(uriBuilder.build().toString());
-            get.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
-
-            if (null != currentCapability && !"".equals(currentCapability.getEtag())) {
-                get.addRequestHeader(OCS_ETAG_HEADER, currentCapability.getEtag());
-            }
-
-            status = client.executeMethod(get);
-
-            if (isNotModified(status)) {
-                Log_OC.d(TAG, "Capabilities not modified");
-
-                result = new RemoteOperationResult(true, get);
-                result.setSingleData(currentCapability);
-
-                Log_OC.d(TAG, "*** Get Capabilities completed ");
-            } else if (isSuccess(status)) {
-                String response = get.getResponseBodyAsString();
-                Log_OC.d(TAG, "Successful response: " + response);
-
-                OCCapability capability = parseResponse(response);
-
-                Header etag = get.getResponseHeader("ETag");
-                if (etag != null) {
-                    capability.setEtag(etag.getValue());
-                }
-
-                // Result
-                result = new RemoteOperationResult(true, get);
-                result.setSingleData(capability);
-            } else {
-                result = new RemoteOperationResult(false, get);
-                String response = get.getResponseBodyAsString();
-                Log_OC.e(TAG, "Failed response while getting capabilities from the server ");
-                if (response != null) {
-                    Log_OC.e(TAG, "*** status code: " + status + "; response message: " + response);
-                } else {
-                    Log_OC.e(TAG, "*** status code: " + status);
-                }
+                Log_OC.e(TAG, "*** status code: " + status + "; response message: " + response);
             }
         } catch (JSONException | IOException e) {
-            result = new RemoteOperationResult(e);
+            result = new RemoteOperationResult<>(e);
             Log_OC.e(TAG, "Exception while getting capabilities", e);
 
         } finally {
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/status/GetStatusRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/status/GetStatusRemoteOperation.java
index 6c71aadfb..91666c6e4 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/status/GetStatusRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/status/GetStatusRemoteOperation.java
@@ -31,7 +31,7 @@
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
 import com.owncloud.android.lib.common.accounts.AccountUtils;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -50,7 +50,7 @@
  * @author David A. Velasco
  * @author masensio
  */
-public class GetStatusRemoteOperation extends RemoteOperation {
+public class GetStatusRemoteOperation extends LegacyRemoteOperation {
 
     /**
      * Maximum time to wait for a response from the server when the connection is being tested, in MILLISECONDs.
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/tags/CreateTagRemoteOperation.kt b/library/src/main/java/com/owncloud/android/lib/resources/tags/CreateTagRemoteOperation.kt
index 6f38426d0..412d95757 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/tags/CreateTagRemoteOperation.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/tags/CreateTagRemoteOperation.kt
@@ -30,13 +30,13 @@ package com.owncloud.android.lib.resources.tags
 import com.google.gson.Gson
 import com.nextcloud.common.NextcloudClient
 import com.nextcloud.operations.PostMethod
-import com.owncloud.android.lib.common.operations.RemoteOperation
+import com.owncloud.android.lib.common.operations.NextcloudRemoteOperation
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.RequestBody
 import org.apache.commons.httpclient.HttpStatus
 
-class CreateTagRemoteOperation(val name: String) : RemoteOperation<Void>() {
+class CreateTagRemoteOperation(val name: String) : NextcloudRemoteOperation<Void>() {
     override fun run(client: NextcloudClient): RemoteOperationResult<Void> {
         val map = HashMap<String, String>()
         map["name"] = name
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/tags/GetTagsRemoteOperation.kt b/library/src/main/java/com/owncloud/android/lib/resources/tags/GetTagsRemoteOperation.kt
index 252308122..620f13b79 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/tags/GetTagsRemoteOperation.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/tags/GetTagsRemoteOperation.kt
@@ -31,14 +31,14 @@ import com.owncloud.android.lib.common.OwnCloudClient
 import com.owncloud.android.lib.common.network.WebdavEntry.Companion.EXTENDED_PROPERTY_NAME_REMOTE_ID
 import com.owncloud.android.lib.common.network.WebdavEntry.Companion.NAMESPACE_OC
 import com.owncloud.android.lib.common.network.WebdavEntry.Companion.SHAREES_DISPLAY_NAME
-import com.owncloud.android.lib.common.operations.RemoteOperation
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import org.apache.commons.httpclient.HttpStatus
 import org.apache.jackrabbit.webdav.client.methods.PropFindMethod
 import org.apache.jackrabbit.webdav.property.DavPropertyNameSet
 import org.apache.jackrabbit.webdav.xml.Namespace
 
-class GetTagsRemoteOperation : RemoteOperation<List<Tag>>() {
+class GetTagsRemoteOperation : LegacyRemoteOperation<List<Tag>>() {
     @Deprecated("Deprecated in Java")
     override fun run(client: OwnCloudClient): RemoteOperationResult<List<Tag>> {
         val ocNamespace = Namespace.getNamespace(NAMESPACE_OC)
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/tags/PutTagRemoteOperation.kt b/library/src/main/java/com/owncloud/android/lib/resources/tags/PutTagRemoteOperation.kt
index eeabc683b..eedb5a785 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/tags/PutTagRemoteOperation.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/tags/PutTagRemoteOperation.kt
@@ -29,13 +29,13 @@ package com.owncloud.android.lib.resources.tags
 
 import com.nextcloud.common.NextcloudClient
 import com.nextcloud.operations.PutMethod
-import com.owncloud.android.lib.common.operations.RemoteOperation
+import com.owncloud.android.lib.common.operations.NextcloudRemoteOperation
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import okhttp3.RequestBody
 import okhttp3.internal.EMPTY_REQUEST
 import org.apache.commons.httpclient.HttpStatus
 
-class PutTagRemoteOperation(val id: String, val fileId: Long) : RemoteOperation<Void>() {
+class PutTagRemoteOperation(val id: String, val fileId: Long) : NextcloudRemoteOperation<Void>() {
     override fun run(client: NextcloudClient): RemoteOperationResult<Void> {
         val empty: RequestBody = EMPTY_REQUEST
         val putMethod = PutMethod(
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/trashbin/EmptyTrashbinRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/trashbin/EmptyTrashbinRemoteOperation.java
index 086ceb618..c1d996140 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/trashbin/EmptyTrashbinRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/trashbin/EmptyTrashbinRemoteOperation.java
@@ -31,7 +31,7 @@
 
 import com.nextcloud.common.NextcloudClient;
 import com.nextcloud.operations.DeleteMethod;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.NextcloudRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 
 import org.apache.commons.httpclient.HttpStatus;
@@ -42,7 +42,7 @@
 /**
  * Empty trashbin.
  */
-public class EmptyTrashbinRemoteOperation extends RemoteOperation<Boolean> {
+public class EmptyTrashbinRemoteOperation extends NextcloudRemoteOperation<Boolean> {
 
     private static final String TAG = EmptyTrashbinRemoteOperation.class.getSimpleName();
 
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/trashbin/ReadTrashbinFolderRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/trashbin/ReadTrashbinFolderRemoteOperation.java
index c4eb18b3a..25be95e92 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/trashbin/ReadTrashbinFolderRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/trashbin/ReadTrashbinFolderRemoteOperation.java
@@ -30,7 +30,7 @@
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.network.WebdavEntry;
 import com.owncloud.android.lib.common.network.WebdavUtils;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.trashbin.model.TrashbinFile;
@@ -48,7 +48,7 @@
  * Remote operation performing the read of remote trashbin folder on Nextcloud server.
  */
 
-public class ReadTrashbinFolderRemoteOperation extends RemoteOperation<List<TrashbinFile>> {
+public class ReadTrashbinFolderRemoteOperation extends LegacyRemoteOperation<List<TrashbinFile>> {
 
     private static final String TAG = ReadTrashbinFolderRemoteOperation.class.getSimpleName();
     
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/trashbin/RemoveTrashbinFileRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/trashbin/RemoveTrashbinFileRemoteOperation.java
index c437821e3..90e0036e9 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/trashbin/RemoveTrashbinFileRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/trashbin/RemoveTrashbinFileRemoteOperation.java
@@ -29,7 +29,7 @@
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.network.WebdavUtils;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -39,7 +39,7 @@
 /**
  * Remote operation performing the removal of a file in trashbin.
  */
-public class RemoveTrashbinFileRemoteOperation extends RemoteOperation {
+public class RemoveTrashbinFileRemoteOperation extends LegacyRemoteOperation {
     private static final String TAG = RemoveTrashbinFileRemoteOperation.class.getSimpleName();
 
     private static final int REMOVE_READ_TIMEOUT = 30000;
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/trashbin/RestoreTrashbinFileRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/trashbin/RestoreTrashbinFileRemoteOperation.java
index 8881ff90c..7b1ffca1d 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/trashbin/RestoreTrashbinFileRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/trashbin/RestoreTrashbinFileRemoteOperation.java
@@ -32,7 +32,7 @@
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.network.WebdavUtils;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.resources.trashbin.model.TrashbinFile;
 
@@ -45,7 +45,7 @@
 /**
  * Restore a {@link TrashbinFile}.
  */
-public class RestoreTrashbinFileRemoteOperation extends RemoteOperation {
+public class RestoreTrashbinFileRemoteOperation extends LegacyRemoteOperation {
 
     private static final String TAG = RestoreTrashbinFileRemoteOperation.class.getSimpleName();
     private static final int RESTORE_READ_TIMEOUT = 30000;
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/users/CheckRemoteWipeRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/users/CheckRemoteWipeRemoteOperation.java
index c0e4771b8..886f74ceb 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/users/CheckRemoteWipeRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/users/CheckRemoteWipeRemoteOperation.java
@@ -28,7 +28,7 @@
 package com.owncloud.android.lib.resources.users;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -41,7 +41,7 @@
  * Remote operation performing check if app token is scheduled for remote wipe
  */
 
-public class CheckRemoteWipeRemoteOperation extends RemoteOperation {
+public class CheckRemoteWipeRemoteOperation extends LegacyRemoteOperation {
 
     private static final String TAG = CheckRemoteWipeRemoteOperation.class.getSimpleName();
     private static final int SYNC_READ_TIMEOUT = 40000;
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/users/ClearStatusMessageRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/users/ClearStatusMessageRemoteOperation.java
index 074221468..ec55a3dc3 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/users/ClearStatusMessageRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/users/ClearStatusMessageRemoteOperation.java
@@ -31,7 +31,7 @@
 import com.nextcloud.operations.DeleteMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.lib.resources.OCSRemoteOperation;
+import com.owncloud.android.lib.resources.OCSNextcloudRemoteOperation;
 
 import org.apache.commons.httpclient.HttpStatus;
 
@@ -40,7 +40,7 @@
  * Remote operation to clear custome status message
  */
 
-public class ClearStatusMessageRemoteOperation extends OCSRemoteOperation {
+public class ClearStatusMessageRemoteOperation extends OCSNextcloudRemoteOperation {
 
     private static final String TAG = ClearStatusMessageRemoteOperation.class.getSimpleName();
     private static final String URL = "/ocs/v2.php/apps/user_status/api/v1/user_status/message";
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/users/ConvertAppTokenRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/users/ConvertAppTokenRemoteOperation.java
index 321dca243..e6c8a96a3 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/users/ConvertAppTokenRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/users/ConvertAppTokenRemoteOperation.java
@@ -33,7 +33,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.OCSNextcloudRemoteOperation;
 
 import org.apache.commons.httpclient.HttpStatus;
 
@@ -44,7 +44,7 @@
  * If the client is authenticating with a real password an app password will be generated and returned.
  */
 
-public class ConvertAppTokenRemoteOperation extends OCSRemoteOperation<String> {
+public class ConvertAppTokenRemoteOperation extends OCSNextcloudRemoteOperation<String> {
 
     private static final String TAG = ConvertAppTokenRemoteOperation.class.getSimpleName();
     private static final String URL = "/ocs/v2.php/core/getapppassword";
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/users/DeleteAppPasswordRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/users/DeleteAppPasswordRemoteOperation.java
index a143507e7..881ef0b11 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/users/DeleteAppPasswordRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/users/DeleteAppPasswordRemoteOperation.java
@@ -29,7 +29,7 @@
 
 import com.nextcloud.common.NextcloudClient;
 import com.nextcloud.operations.DeleteMethod;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.NextcloudRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -40,7 +40,7 @@
  * Remote operation performing deletion of app token
  */
 
-public class DeleteAppPasswordRemoteOperation extends RemoteOperation {
+public class DeleteAppPasswordRemoteOperation extends NextcloudRemoteOperation {
 
     private static final String TAG = DeleteAppPasswordRemoteOperation.class.getSimpleName();
     private static final String URL = "/ocs/v2.php/core/apppassword";
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/users/DeletePrivateKeyOperation.kt b/library/src/main/java/com/owncloud/android/lib/resources/users/DeletePrivateKeyOperation.kt
index 0587160a1..e630cb979 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/users/DeletePrivateKeyOperation.kt
+++ b/library/src/main/java/com/owncloud/android/lib/resources/users/DeletePrivateKeyOperation.kt
@@ -27,7 +27,7 @@
 package com.owncloud.android.lib.resources.users
 
 import com.owncloud.android.lib.common.OwnCloudClient
-import com.owncloud.android.lib.common.operations.RemoteOperation
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import com.owncloud.android.lib.common.utils.Log_OC
 import org.apache.commons.httpclient.HttpStatus
@@ -37,7 +37,7 @@ import java.io.IOException
 /**
  * Remote operation performing to delete the private key for an user
  */
-class DeletePrivateKeyOperation : RemoteOperation<Void>() {
+class DeletePrivateKeyOperation : LegacyRemoteOperation<Void>() {
     /**
      * @param client Client object
      */
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/users/DeletePublicKeyOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/users/DeletePublicKeyOperation.java
index b4a111201..f6da43eb0 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/users/DeletePublicKeyOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/users/DeletePublicKeyOperation.java
@@ -28,7 +28,7 @@
 package com.owncloud.android.lib.resources.users;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -40,7 +40,7 @@
  * Remote operation performing to delete the public key for an user
  */
 
-public class DeletePublicKeyOperation extends RemoteOperation {
+public class DeletePublicKeyOperation extends LegacyRemoteOperation {
 
     private static final String TAG = DeletePublicKeyOperation.class.getSimpleName();
     private static final int SYNC_READ_TIMEOUT = 40000;
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/users/GetPredefinedStatusesRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/users/GetPredefinedStatusesRemoteOperation.java
index ae0370dd0..48a546620 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/users/GetPredefinedStatusesRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/users/GetPredefinedStatusesRemoteOperation.java
@@ -33,7 +33,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.OCSNextcloudRemoteOperation;
 
 import org.apache.commons.httpclient.HttpStatus;
 
@@ -42,7 +42,7 @@
 /**
  * Remote operation to get all predefined statuses
  */
-public class GetPredefinedStatusesRemoteOperation extends OCSRemoteOperation<ArrayList<PredefinedStatus>> {
+public class GetPredefinedStatusesRemoteOperation extends OCSNextcloudRemoteOperation<ArrayList<PredefinedStatus>> {
     private static final String TAG = GetPredefinedStatusesRemoteOperation.class.getSimpleName();
     private static final String GET_STATUS_URL = "/ocs/v2.php/apps/user_status/api/v1/predefined_statuses";
 
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/users/GetPublicKeyOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/users/GetPublicKeyOperation.java
index 977552fdc..d7acb5307 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/users/GetPublicKeyOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/users/GetPublicKeyOperation.java
@@ -28,7 +28,7 @@
 package com.owncloud.android.lib.resources.users;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -41,7 +41,7 @@
  * Remote operation performing the fetch of the public key for an user
  */
 
-public class GetPublicKeyOperation extends RemoteOperation<String> {
+public class GetPublicKeyOperation extends LegacyRemoteOperation<String> {
 
     private static final String TAG = GetPublicKeyOperation.class.getSimpleName();
     private static final int SYNC_READ_TIMEOUT = 40000;
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/users/GetStatusRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/users/GetStatusRemoteOperation.java
index e3b793dd5..8190574cc 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/users/GetStatusRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/users/GetStatusRemoteOperation.java
@@ -33,14 +33,14 @@
 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.OCSNextcloudRemoteOperation;
 
 import org.apache.commons.httpclient.HttpStatus;
 
 /**
  * Remote operation to get status
  */
-public class GetStatusRemoteOperation extends OCSRemoteOperation<Status> {
+public class GetStatusRemoteOperation extends OCSNextcloudRemoteOperation<Status> {
 
     private static final String TAG = GetStatusRemoteOperation.class.getSimpleName();
     private static final String GET_STATUS_URL = "/ocs/v2.php/apps/user_status/api/v1/user_status";
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/users/GetUserAvatarRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/users/GetUserAvatarRemoteOperation.java
index 866f5402c..458397774 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/users/GetUserAvatarRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/users/GetUserAvatarRemoteOperation.java
@@ -28,7 +28,7 @@
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.network.WebdavUtils;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -46,7 +46,7 @@
 /**
  * Gets avatar about the user logged in, if available
  */
-public class GetUserAvatarRemoteOperation extends RemoteOperation {
+public class GetUserAvatarRemoteOperation extends LegacyRemoteOperation {
 
     private static final String TAG = GetUserAvatarRemoteOperation.class.getSimpleName();
 
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/users/GetUserInfoRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/users/GetUserInfoRemoteOperation.java
index e5e9bf36a..a6544bdae 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/users/GetUserInfoRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/users/GetUserInfoRemoteOperation.java
@@ -35,7 +35,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.OCSNextcloudRemoteOperation;
 
 import org.apache.commons.httpclient.HttpStatus;
 
@@ -48,7 +48,7 @@
  * @author David A. Velasco
  * @author Mario Danic
  */
-public class GetUserInfoRemoteOperation extends OCSRemoteOperation<UserInfo> {
+public class GetUserInfoRemoteOperation extends OCSNextcloudRemoteOperation<UserInfo> {
 
     private static final String TAG = GetUserInfoRemoteOperation.class.getSimpleName();
 
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/users/RemoteWipeSuccessRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/users/RemoteWipeSuccessRemoteOperation.java
index 351581dee..5c5e4acb9 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/users/RemoteWipeSuccessRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/users/RemoteWipeSuccessRemoteOperation.java
@@ -28,7 +28,7 @@
 package com.owncloud.android.lib.resources.users;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -40,7 +40,7 @@
  * Remote operation notifying server for successful wipe
  */
 
-public class RemoteWipeSuccessRemoteOperation extends RemoteOperation {
+public class RemoteWipeSuccessRemoteOperation extends LegacyRemoteOperation {
 
     private static final String TAG = RemoteWipeSuccessRemoteOperation.class.getSimpleName();
     private static final int SYNC_READ_TIMEOUT = 40000;
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/users/SendCSROperation.java b/library/src/main/java/com/owncloud/android/lib/resources/users/SendCSROperation.java
index 4d57778d6..a5853c562 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/users/SendCSROperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/users/SendCSROperation.java
@@ -28,7 +28,7 @@
 package com.owncloud.android.lib.resources.users;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -43,7 +43,7 @@
  * Remote operation performing the storage of the public key for an user
  */
 
-public class SendCSROperation extends RemoteOperation {
+public class SendCSROperation extends LegacyRemoteOperation {
 
     private static final String TAG = SendCSROperation.class.getSimpleName();
     private static final int SYNC_READ_TIMEOUT = 40000;
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/users/SetPredefinedCustomStatusMessageRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/users/SetPredefinedCustomStatusMessageRemoteOperation.java
index 84af8c68c..2ce678b61 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/users/SetPredefinedCustomStatusMessageRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/users/SetPredefinedCustomStatusMessageRemoteOperation.java
@@ -31,7 +31,7 @@
 import com.nextcloud.operations.PutMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.lib.resources.OCSRemoteOperation;
+import com.owncloud.android.lib.resources.OCSNextcloudRemoteOperation;
 
 import org.apache.commons.httpclient.HttpStatus;
 
@@ -41,9 +41,9 @@
 import okhttp3.RequestBody;
 
 /**
- * Remote operation performing setting of predefined custome status message
+ * Remote operation performing setting of predefined custom status message
  */
-public class SetPredefinedCustomStatusMessageRemoteOperation extends OCSRemoteOperation<ArrayList<PredefinedStatus>> {
+public class SetPredefinedCustomStatusMessageRemoteOperation extends OCSNextcloudRemoteOperation<ArrayList<PredefinedStatus>> {
 
     private static final String TAG = SetPredefinedCustomStatusMessageRemoteOperation.class.getSimpleName();
     private static final String SET_STATUS_URL = "/ocs/v2.php/apps/user_status/api/v1/user_status/message/predefined";
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/users/SetStatusRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/users/SetStatusRemoteOperation.java
index 010ab8713..cc01ea196 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/users/SetStatusRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/users/SetStatusRemoteOperation.java
@@ -31,7 +31,7 @@
 import com.nextcloud.operations.PutMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.lib.resources.OCSRemoteOperation;
+import com.owncloud.android.lib.resources.OCSNextcloudRemoteOperation;
 
 import org.apache.commons.httpclient.HttpStatus;
 
@@ -41,7 +41,7 @@
 /**
  * Remote operation performing setting of status
  */
-public class SetStatusRemoteOperation extends OCSRemoteOperation<Boolean> {
+public class SetStatusRemoteOperation extends OCSNextcloudRemoteOperation<Boolean> {
 
     private static final String TAG = SetStatusRemoteOperation.class.getSimpleName();
     private static final String SET_STATUS_URL = "/ocs/v2.php/apps/user_status/api/v1/user_status/status";
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/users/SetUserDefinedCustomStatusMessageRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/users/SetUserDefinedCustomStatusMessageRemoteOperation.java
index 8e0e6e77f..920dc0911 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/users/SetUserDefinedCustomStatusMessageRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/users/SetUserDefinedCustomStatusMessageRemoteOperation.java
@@ -30,7 +30,7 @@
 import com.nextcloud.operations.PutMethod;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.lib.resources.OCSRemoteOperation;
+import com.owncloud.android.lib.resources.OCSNextcloudRemoteOperation;
 
 import org.apache.commons.httpclient.HttpStatus;
 
@@ -40,7 +40,7 @@
 /**
  * Remote operation performing setting user defined custom status message
  */
-public class SetUserDefinedCustomStatusMessageRemoteOperation extends OCSRemoteOperation {
+public class SetUserDefinedCustomStatusMessageRemoteOperation extends OCSNextcloudRemoteOperation {
 
     private static final String TAG = SetUserDefinedCustomStatusMessageRemoteOperation.class.getSimpleName();
     private static final String SET_STATUS_URL = "/ocs/v2.php/apps/user_status/api/v1/user_status/message/custom";
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/users/SetUserInfoRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/users/SetUserInfoRemoteOperation.java
index 184b81a19..a938d5c16 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/users/SetUserInfoRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/users/SetUserInfoRemoteOperation.java
@@ -25,7 +25,7 @@
 
 import com.nextcloud.common.NextcloudClient;
 import com.nextcloud.operations.PutMethod;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.NextcloudRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -35,7 +35,7 @@
 import okhttp3.RequestBody;
 
 
-public class SetUserInfoRemoteOperation extends RemoteOperation<Boolean> {
+public class SetUserInfoRemoteOperation extends NextcloudRemoteOperation<Boolean> {
 
     private static final String TAG = SetUserInfoRemoteOperation.class.getSimpleName();
 
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/users/StorePrivateKeyOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/users/StorePrivateKeyOperation.java
index ef4de4092..859f153a2 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/users/StorePrivateKeyOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/users/StorePrivateKeyOperation.java
@@ -28,7 +28,7 @@
 package com.owncloud.android.lib.resources.users;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.LegacyRemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
@@ -43,7 +43,7 @@
  * Remote operation performing the storage of the private key for an user
  */
 
-public class StorePrivateKeyOperation extends RemoteOperation {
+public class StorePrivateKeyOperation extends LegacyRemoteOperation {
 
     private static final String TAG = StorePrivateKeyOperation.class.getSimpleName();
     private static final int SYNC_READ_TIMEOUT = 40000;
diff --git a/scripts/analysis/findbugs-results.txt b/scripts/analysis/findbugs-results.txt
index c147342cb..d88e31369 100644
--- a/scripts/analysis/findbugs-results.txt
+++ b/scripts/analysis/findbugs-results.txt
@@ -1 +1 @@
-81
\ No newline at end of file
+81