wip

Signed-off-by: tobiasKaminsky <[email protected]>

Author: tobiasKaminsky

.idea/codeStyles/Project.xml

@@ -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

gradle/wrapper/gradle-wrapper.properties

@@ -27,18 +27,17 @@
 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
 
 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)

library/src/androidTest/java/com/owncloud/android/lib/common/accounts/ExternalLinksOperationIT.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>>>

library/src/main/java/com/nextcloud/android/lib/resources/dashboard/DashboardGetWidgetItemsRemoteOperation.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>>

library/src/main/java/com/nextcloud/android/lib/resources/dashboard/DashboardListWidgetsRemoteOperation.kt

@@ -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;

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 @@
  * 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;

library/src/main/java/com/nextcloud/android/lib/resources/directediting/DirectEditingOpenFileRemoteOperation.java

@@ -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

library/src/main/java/com/nextcloud/android/lib/resources/files/ToggleFileLockRemoteOperation.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>>

library/src/main/java/com/nextcloud/android/lib/resources/groupfolders/GetGroupfoldersRemoteOperation.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?>