refactor: use a permission set instead of individual permissions to filter options

Author: joragua

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

@@ -44,6 +44,7 @@ import com.owncloud.android.databinding.SpacesListFragmentBinding
 import com.owncloud.android.domain.files.model.FileListOption
 import com.owncloud.android.domain.spaces.model.OCSpace
 import com.owncloud.android.domain.spaces.model.SpaceMenuOption
+import com.owncloud.android.domain.user.model.UserPermissions
 import com.owncloud.android.extensions.collectLatestLifecycleFlow
 import com.owncloud.android.extensions.showErrorInSnackbar
 import com.owncloud.android.extensions.showMessageInSnackbar
@@ -71,7 +72,7 @@ class SpacesListFragment :
     private val binding get() = _binding!!
 
     private var isMultiPersonal = false
-    private var editSpacesPermission = false
+    private var userPermissions = mutableSetOf<UserPermissions>()
     private var editQuotaPermission = false
     private lateinit var currentSpace: OCSpace
 
@@ -181,7 +182,7 @@ class SpacesListFragment :
                         Timber.d("The permissions for $accountName are: ${uiResult.data}")
                         uiResult.data?.let {
                             binding.fabCreateSpace.isVisible = it.contains(DRIVES_CREATE_ALL_PERMISSION)
-                            editSpacesPermission = it.contains(DRIVES_READ_WRITE_ALL_PERMISSION)
+                            if(it.contains(DRIVES_READ_WRITE_ALL_PERMISSION)) userPermissions.add(UserPermissions.CAN_EDIT_SPACES)
                             editQuotaPermission = it.contains(DRIVES_READ_WRITE_PROJECT_QUOTA_ALL_PERMISSION)
                         }
                     }
@@ -243,7 +244,7 @@ class SpacesListFragment :
 
     override fun onThreeDotButtonClick(ocSpace: OCSpace) {
         currentSpace = ocSpace
-        spacesListViewModel.filterMenuOptions(ocSpace, editSpacesPermission)
+        spacesListViewModel.filterMenuOptions(ocSpace, userPermissions)
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {

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

@@ -37,6 +37,7 @@ import com.owncloud.android.domain.spaces.usecases.GetPersonalAndProjectSpacesWi
 import com.owncloud.android.domain.spaces.usecases.GetPersonalSpacesWithSpecialsForAccountAsStreamUseCase
 import com.owncloud.android.domain.spaces.usecases.GetProjectSpacesWithSpecialsForAccountAsStreamUseCase
 import com.owncloud.android.domain.spaces.usecases.RefreshSpacesFromServerAsyncUseCase
+import com.owncloud.android.domain.user.model.UserPermissions
 import com.owncloud.android.domain.user.usecases.GetUserIdAsyncUseCase
 import com.owncloud.android.domain.user.usecases.GetUserPermissionsAsyncUseCase
 import com.owncloud.android.domain.utils.Event
@@ -176,13 +177,13 @@ class SpacesListViewModel(
         }
     }
 
-    fun filterMenuOptions(space: OCSpace, editSpacesPermission: Boolean) {
+    fun filterMenuOptions(space: OCSpace, userPermissions: Set<UserPermissions>) {
         viewModelScope.launch(coroutinesDispatcherProvider.io) {
             val result = filterSpaceMenuOptionsUseCase(
                 FilterSpaceMenuOptionsUseCase.Params(
                     accountName = accountName,
                     space = space,
-                    editSpacesPermission = editSpacesPermission
+                    userPermissions = userPermissions
                 )
             )
             _menuOptions.emit(result)

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

@@ -24,6 +24,7 @@ import com.owncloud.android.domain.BaseUseCase
 import com.owncloud.android.domain.UseCaseResult
 import com.owncloud.android.domain.spaces.model.OCSpace
 import com.owncloud.android.domain.spaces.model.SpaceMenuOption
+import com.owncloud.android.domain.user.model.UserPermissions
 
 class FilterSpaceMenuOptionsUseCase(
     private val getSpacePermissionsAsyncUseCase: GetSpacePermissionsAsyncUseCase,
@@ -32,15 +33,10 @@ class FilterSpaceMenuOptionsUseCase(
     override fun run(params: Params): MutableList<SpaceMenuOption> {
         val optionsToShow = mutableListOf<SpaceMenuOption>()
 
-        val editPermission = if (params.editSpacesPermission) {
-            true
-        } else {
-            when (val spacePermissionsResult =
-                getSpacePermissionsAsyncUseCase(GetSpacePermissionsAsyncUseCase.Params(params.accountName, params.space.id))) {
-                is UseCaseResult.Success -> DRIVES_MANAGE_PERMISSION in spacePermissionsResult.data
-                is UseCaseResult.Error -> false
-            }
-        }
+        val spacePermissionsResult = getSpacePermissionsAsyncUseCase(GetSpacePermissionsAsyncUseCase.Params(params.accountName, params.space.id))
+
+        val editPermission =
+            (UserPermissions.CAN_EDIT_SPACES in params.userPermissions || hasSpacePermission(spacePermissionsResult, DRIVES_MANAGE_PERMISSION))
 
         if (editPermission) {
             optionsToShow.add(SpaceMenuOption.EDIT)
@@ -49,10 +45,16 @@ class FilterSpaceMenuOptionsUseCase(
         return optionsToShow
     }
 
+    private fun hasSpacePermission(spacePermissions: UseCaseResult<List<String>>, requiredPermission: String) =
+        when (spacePermissions) {
+            is UseCaseResult.Success -> requiredPermission in spacePermissions.data
+            is UseCaseResult.Error -> false
+        }
+
     data class Params(
         val accountName: String,
         val space: OCSpace,
-        val editSpacesPermission: Boolean
+        val userPermissions: Set<UserPermissions>
     )
 
     companion object {

owncloudDomain/src/main/java/com/owncloud/android/domain/user/model/UserPermissions.kt

@@ -0,0 +1,25 @@
+/**
+ * ownCloud Android client application
+ *
+ * @author Jorge Aguado Recio
+ *
+ * Copyright (C) 2025 ownCloud GmbH.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.domain.user.model
+
+enum class UserPermissions {
+    CAN_EDIT_SPACES
+}