feat: implement methods and network operation to delete a space on the server

Author: joragua

owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/SpacesListFragment.kt

@@ -238,6 +238,16 @@ class SpacesListFragment :
             }
         }
 
+        collectLatestLifecycleFlow(spacesListViewModel.deleteSpaceFlow) { event ->
+            event?.let {
+                when (val uiResult = event.peekContent()) {
+                    is UIResult.Success -> { showMessageInSnackbar(getString(R.string.delete_space_correctly)) }
+                    is UIResult.Loading -> { }
+                    is UIResult.Error -> { showErrorInSnackbar(R.string.delete_space_failed, uiResult.error) }
+                }
+            }
+        }
+
         collectLatestLifecycleFlow(spacesListViewModel.menuOptions) { menuOptions ->
             showSpaceMenuOptionsDialog(menuOptions)
         }
@@ -384,7 +394,7 @@ class SpacesListFragment :
                             title = getString(R.string.delete_space_dialog_title, currentSpace.name),
                             message = getString(R.string.delete_space_dialog_message),
                             positiveButtonText = getString(R.string.common_yes),
-                            positiveButtonListener = { _: DialogInterface?, _: Int ->  },
+                            positiveButtonListener = { _: DialogInterface?, _: Int ->  spacesListViewModel.deleteSpace(currentSpace.id) },
                             negativeButtonText = getString(R.string.common_no)
                         )
                     }

owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/SpacesListViewModel.kt

@@ -97,6 +97,9 @@ class SpacesListViewModel(
     private val _enableSpaceFlow = MutableSharedFlow<Event<UIResult<Unit>>?>()
     val enableSpaceFlow: SharedFlow<Event<UIResult<Unit>>?> = _enableSpaceFlow
 
+    private val _deleteSpaceFlow = MutableSharedFlow<Event<UIResult<Unit>>?>()
+    val deleteSpaceFlow: SharedFlow<Event<UIResult<Unit>>?> = _deleteSpaceFlow
+
     init {
         viewModelScope.launch(coroutinesDispatcherProvider.io) {
             refreshSpacesFromServer()
@@ -202,7 +205,7 @@ class SpacesListViewModel(
 
     fun disableSpace(spaceId: String){
         viewModelScope.launch(coroutinesDispatcherProvider.io) {
-            when (val result = disableSpaceUseCase(DisableSpaceUseCase.Params(accountName, spaceId))) {
+            when (val result = disableSpaceUseCase(DisableSpaceUseCase.Params(accountName, spaceId, false))) {
                 is UseCaseResult.Success -> _disableSpaceFlow.emit(Event(UIResult.Success(result.getDataOrNull())))
                 is UseCaseResult.Error -> _disableSpaceFlow.emit(Event(UIResult.Error(error = result.getThrowableOrNull())))
             }
@@ -220,6 +223,16 @@ class SpacesListViewModel(
         }
     }
 
+    fun deleteSpace(spaceId: String){
+        viewModelScope.launch(coroutinesDispatcherProvider.io) {
+            when (val result = disableSpaceUseCase(DisableSpaceUseCase.Params(accountName, spaceId, true))) {
+                is UseCaseResult.Success -> _deleteSpaceFlow.emit(Event(UIResult.Success(result.getDataOrNull())))
+                is UseCaseResult.Error -> _deleteSpaceFlow.emit(Event(UIResult.Error(error = result.getThrowableOrNull())))
+            }
+            refreshSpacesFromServerAsyncUseCase(RefreshSpacesFromServerAsyncUseCase.Params(accountName))
+        }
+    }
+
     data class SpacesListUiState(
         val spaces: List<OCSpace>,
         val rootFolderFromSelectedSpace: OCFile? = null,

owncloudApp/src/main/res/values/strings.xml

@@ -866,6 +866,8 @@
     <string name="delete_space">Delete space</string>
     <string name="delete_space_dialog_title">Do you really want to delete the space: %1$s?</string>
     <string name="delete_space_dialog_message">If you delete the selected space, it can no longer be accessed and files will be deleted from the server.</string>
+    <string name="delete_space_correctly">Space deleted correctly</string>
+    <string name="delete_space_failed">Space could not be deleted</string>
 
     <string name="feedback_dialog_get_in_contact_description"><![CDATA[ Ask for help in our <a href=\"%1$s\"><b>forum</b></a> or contribute in our <a href=\"%2$s\"><b>GitHub repo</b></a>]]></string>
 

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/spaces/DisableRemoteSpaceOperation.kt

@@ -30,7 +30,8 @@ import timber.log.Timber
 import java.net.URL
 
 class DisableRemoteSpaceOperation(
-    private val spaceId: String
+    private val spaceId: String,
+    private val deleteMode: Boolean
 ): RemoteOperation<Unit>() {
     override fun run(client: OwnCloudClient): RemoteOperationResult<Unit> {
         var result: RemoteOperationResult<Unit>
@@ -40,7 +41,9 @@ class DisableRemoteSpaceOperation(
                 appendEncodedPath(spaceId)
             }
 
-            val deleteMethod = DeleteMethod(URL(uriBuilder.build().toString()))
+            val deleteMethod = DeleteMethod(URL(uriBuilder.build().toString())).apply {
+                if (deleteMode) addRequestHeader(PURGE_HEADER, PURGE_HEADER_VALUE)
+            }
 
             val status = client.executeHttpMethod(deleteMethod)
 
@@ -51,17 +54,19 @@ class DisableRemoteSpaceOperation(
                 result = RemoteOperationResult(ResultCode.OK)
             } else {
                 result = RemoteOperationResult(deleteMethod)
-                Timber.e("Failed response while disabling the space; status code: $status, response: $response")
+                Timber.e("Failed response while disabling/deleting the space; status code: $status, response: $response")
             }
         } catch (e: Exception) {
             result = RemoteOperationResult(e)
-            Timber.e(e, "Exception while disabling the space $spaceId")
+            Timber.e(e, "Exception while disabling/deleting the space $spaceId")
         }
         return result
     }
 
     companion object {
         private const val GRAPH_API_SPACES_PATH = "graph/v1.0/drives/"
+        private const val PURGE_HEADER = "Purge"
+        private const val PURGE_HEADER_VALUE = "T"
     }
 
 }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/spaces/services/OCSpacesService.kt

@@ -45,8 +45,8 @@ class OCSpacesService(override val client: OwnCloudClient) : SpacesService {
     override fun editSpace(spaceId: String, spaceName: String, spaceSubtitle: String, spaceQuota: Long?): RemoteOperationResult<SpaceResponse> =
         EditRemoteSpaceOperation(spaceId, spaceName, spaceSubtitle, spaceQuota).execute(client)
 
-    override fun disableSpace(spaceId: String): RemoteOperationResult<Unit> =
-        DisableRemoteSpaceOperation(spaceId).execute(client)
+    override fun disableSpace(spaceId: String, deleteMode: Boolean): RemoteOperationResult<Unit> =
+        DisableRemoteSpaceOperation(spaceId, deleteMode).execute(client)
 
     override fun enableSpace(spaceId: String): RemoteOperationResult<SpaceResponse> =
         EnableRemoteSpaceOperation(spaceId).execute(client)

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/spaces/services/SpacesService.kt

@@ -31,6 +31,6 @@ interface SpacesService : Service {
     fun createSpace(spaceName: String, spaceSubtitle: String, spaceQuota: Long): RemoteOperationResult<SpaceResponse>
     fun getSpacePermissions(spaceId: String): RemoteOperationResult<List<String>>
     fun editSpace(spaceId: String, spaceName: String, spaceSubtitle: String, spaceQuota: Long?): RemoteOperationResult<SpaceResponse>
-    fun disableSpace(spaceId: String): RemoteOperationResult<Unit>
+    fun disableSpace(spaceId: String, deleteMode: Boolean): RemoteOperationResult<Unit>
     fun enableSpace(spaceId: String): RemoteOperationResult<SpaceResponse>
 }

owncloudData/src/main/java/com/owncloud/android/data/spaces/datasources/RemoteSpacesDataSource.kt

@@ -27,6 +27,6 @@ interface RemoteSpacesDataSource {
     fun createSpace(accountName: String, spaceName: String, spaceSubtitle: String, spaceQuota: Long): OCSpace
     fun getSpacePermissions(accountName: String, spaceId: String): List<String>
     fun editSpace(accountName: String, spaceId: String, spaceName: String, spaceSubtitle: String, spaceQuota: Long?): OCSpace
-    fun disableSpace(accountName: String, spaceId: String)
+    fun disableSpace(accountName: String, spaceId: String, deleteMode: Boolean)
     fun enableSpace(accountName: String, spaceId: String)
 }

owncloudData/src/main/java/com/owncloud/android/data/spaces/datasources/implementation/OCRemoteSpacesDataSource.kt

@@ -63,8 +63,8 @@ class OCRemoteSpacesDataSource(
         return spaceResponse.toModel(accountName)
     }
 
-    override fun disableSpace(accountName: String, spaceId: String) {
-        executeRemoteOperation { clientManager.getSpacesService(accountName).disableSpace(spaceId) }
+    override fun disableSpace(accountName: String, spaceId: String, deleteMode: Boolean) {
+        executeRemoteOperation { clientManager.getSpacesService(accountName).disableSpace(spaceId, deleteMode) }
     }
 
     override fun enableSpace(accountName: String, spaceId: String) {

owncloudData/src/main/java/com/owncloud/android/data/spaces/repository/OCSpacesRepository.kt

@@ -88,8 +88,8 @@ class OCSpacesRepository(
         remoteSpacesDataSource.editSpace(accountName, spaceId, spaceName, spaceSubtitle, spaceQuota)
     }
 
-    override fun disableSpace(accountName: String, spaceId: String) {
-        remoteSpacesDataSource.disableSpace(accountName, spaceId)
+    override fun disableSpace(accountName: String, spaceId: String, deleteMode: Boolean) {
+        remoteSpacesDataSource.disableSpace(accountName, spaceId, deleteMode)
     }
 
     override fun enableSpace(accountName: String, spaceId: String) {

owncloudDomain/src/main/java/com/owncloud/android/domain/spaces/SpacesRepository.kt

@@ -37,6 +37,6 @@ interface SpacesRepository {
     fun getWebDavUrlForSpace(accountName: String, spaceId: String?): String?
     fun createSpace(accountName: String, spaceName: String, spaceSubtitle: String, spaceQuota: Long)
     fun editSpace(accountName: String, spaceId: String, spaceName: String, spaceSubtitle: String, spaceQuota: Long?)
-    fun disableSpace(accountName: String, spaceId: String)
+    fun disableSpace(accountName: String, spaceId: String, deleteMode: Boolean)
     fun enableSpace(accountName: String, spaceId: String)
 }