Merge pull request #2000 from nextcloud/feat/add-e2ee-deletion-calls

feat(e2ee): add deletion functions

Author: alperozturk96

library/src/androidTest/java/com/owncloud/android/lib/resources/users/DeleteE2ERemoteOperationIT.kt

@@ -0,0 +1,36 @@
+/*
+ * Nextcloud Android Library
+ *
+ * SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com>
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.owncloud.android.lib.resources.users
+
+import com.owncloud.android.AbstractIT
+import com.owncloud.android.lib.resources.e2ee.DeleteEncryptedFilesRemoteOperation
+import junit.framework.TestCase.assertTrue
+import org.junit.Test
+
+class DeleteE2ERemoteOperationIT : AbstractIT() {
+    @Test
+    fun testDeleteEncryptedFiles() {
+        val sut = DeleteEncryptedFilesRemoteOperation()
+        val result = sut.execute(nextcloudClient)
+        assertTrue(result.isSuccess)
+    }
+
+    @Test
+    fun testDeletePrivateKey() {
+        val sut = DeletePrivateKeyRemoteOperation()
+        val result = sut.execute(nextcloudClient)
+        assertTrue(result.isSuccess)
+    }
+
+    @Test
+    fun testDeletePublicKey() {
+        val sut = DeletePublicKeyRemoteOperation()
+        val result = sut.execute(nextcloudClient)
+        assertTrue(result.isSuccess)
+    }
+}

library/src/main/java/com/owncloud/android/lib/resources/assistant/v1/DeleteTaskRemoteOperationV1.kt

@@ -13,7 +13,6 @@ import com.nextcloud.operations.DeleteMethod
 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
-import com.owncloud.android.lib.resources.users.DeletePrivateKeyRemoteOperation
 import java.io.IOException
 import java.net.HttpURLConnection
 
@@ -42,7 +41,7 @@ class DeleteTaskRemoteOperationV1(
     }
 
     companion object {
-        private val TAG = DeletePrivateKeyRemoteOperation::class.java.simpleName
+        private val TAG = DeleteTaskRemoteOperationV1::class.java.simpleName
         private const val DIRECT_ENDPOINT =
             "/ocs/v2.php/textprocessing/task/"
     }

library/src/main/java/com/owncloud/android/lib/resources/e2ee/DeleteEncryptedFilesRemoteOperation.kt

@@ -0,0 +1,51 @@
+/*
+ * Nextcloud Android Library
+ *
+ * SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com>
+ * SPDX-License-Identifier: MIT
+ */
+
+package com.owncloud.android.lib.resources.e2ee
+
+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.RemoteOperationResult
+import com.owncloud.android.lib.common.utils.Log_OC
+import org.apache.commons.httpclient.HttpStatus
+
+class DeleteEncryptedFilesRemoteOperation : RemoteOperation<Unit>() {
+    @Deprecated("Deprecated in Java")
+    @Suppress("Detekt.TooGenericExceptionCaught", "DEPRECATION")
+    override fun run(client: NextcloudClient): RemoteOperationResult<Unit> {
+        val method =
+            DeleteMethod(uri = client.baseUri.toString() + ENCRYPTED_FILES_URL, useOcsApiRequestHeader = true)
+
+        return try {
+            val status = client.execute(method)
+
+            if (status == HttpStatus.SC_OK) {
+                RemoteOperationResult<Unit>(true, method)
+            } else {
+                RemoteOperationResult<Unit>(false, method).also {
+                    Log_OC.e(
+                        TAG,
+                        "Deleting encrypted files failed: ${method.getResponseBodyAsString()}",
+                        it.exception
+                    )
+                }
+            }
+        } catch (e: Exception) {
+            RemoteOperationResult<Unit>(e).also {
+                Log_OC.e(TAG, "Deleting encrypted files failed: ${it.logMessage}", it.exception)
+            }
+        } finally {
+            method.releaseConnection()
+        }
+    }
+
+    companion object {
+        private val TAG = DeleteEncryptedFilesRemoteOperation::class.java.simpleName
+        private const val ENCRYPTED_FILES_URL = "/ocs/v2.php/apps/end_to_end_encryption/api/v1/encrypted-files"
+    }
+}

library/src/main/java/com/owncloud/android/lib/resources/users/DeletePrivateKeyRemoteOperation.kt

@@ -15,27 +15,22 @@ import com.owncloud.android.lib.common.utils.Log_OC
 import java.io.IOException
 import java.net.HttpURLConnection
 
-/**
- * Remote operation performing to delete the private key for an user
- */
-class DeletePrivateKeyRemoteOperation : RemoteOperation<Void>() {
-    /**
-     * @param client Client object
-     */
-    override fun run(client: NextcloudClient): RemoteOperationResult<Void> {
+class DeletePrivateKeyRemoteOperation : RemoteOperation<Unit>() {
+    @Deprecated("Deprecated in Java")
+    @Suppress("Detekt.TooGenericExceptionCaught", "DEPRECATION")
+    override fun run(client: NextcloudClient): RemoteOperationResult<Unit> {
         var postMethod: DeleteMethod? = null
-        var result: RemoteOperationResult<Void>
+        var result: RemoteOperationResult<Unit>
         try {
-            // remote request
             postMethod =
                 DeleteMethod(
                     client.baseUri.toString() + PRIVATE_KEY_URL,
                     true
                 )
             val status = client.execute(postMethod)
-            result = RemoteOperationResult<Void>(status == HttpURLConnection.HTTP_OK, postMethod)
+            result = RemoteOperationResult<Unit>(status == HttpURLConnection.HTTP_OK, postMethod)
         } catch (e: IOException) {
-            result = RemoteOperationResult<Void>(e)
+            result = RemoteOperationResult<Unit>(e)
             Log_OC.e(TAG, "Deletion of private key failed: " + result.logMessage, result.exception)
         } finally {
             postMethod?.releaseConnection()

library/src/main/java/com/owncloud/android/lib/resources/users/DeletePublicKeyRemoteOperation.java

@@ -0,0 +1,49 @@
+/*
+ * Nextcloud Android Library
+ *
+ * SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2017 Tobias Kaminsky <tobias@kaminsky.me>
+ * SPDX-License-Identifier: MIT
+ */
+package com.owncloud.android.lib.resources.users
+
+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.RemoteOperationResult
+import com.owncloud.android.lib.common.utils.Log_OC
+import java.net.HttpURLConnection
+
+class DeletePublicKeyRemoteOperation : RemoteOperation<Unit>() {
+    @Deprecated("Deprecated in Java")
+    @Suppress("Detekt.TooGenericExceptionCaught", "DEPRECATION")
+    override fun run(client: NextcloudClient): RemoteOperationResult<Unit> {
+        var postMethod: DeleteMethod? = null
+        var result: RemoteOperationResult<Unit>
+
+        try {
+            postMethod = DeleteMethod(client.baseUri.toString() + PUBLIC_KEY_URL, true)
+            postMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE)
+
+            val status = client.execute(postMethod)
+
+            result = RemoteOperationResult<Unit>(status == HttpURLConnection.HTTP_OK, postMethod)
+        } catch (e: Exception) {
+            result = RemoteOperationResult<Unit>(e)
+            Log_OC.e(
+                TAG,
+                "Deletion of public key failed: " + result.getLogMessage(),
+                result.exception
+            )
+        } finally {
+            postMethod?.releaseConnection()
+        }
+        return result
+    }
+
+    companion object {
+        private val TAG: String = DeletePublicKeyRemoteOperation::class.java.getSimpleName()
+        private const val PUBLIC_KEY_URL =
+            "/ocs/v2.php/apps/end_to_end_encryption/api/v1/public-key"
+    }
+}