Merge pull request #3985 from owncloud/remove_drives_permission_parsing

Remove permission parsing from spaces.

Author: abelgardep

owncloud-android-library

@@ -164,7 +164,6 @@ class OCLocalSpacesDataSource(
                     SpaceRoot(
                         eTag = spaceRootEntity.eTag,
                         id = spaceRootEntity.id,
-                        permissions = null,
                         webDavUrl = spaceRootEntity.webDavUrl,
                         deleted = spaceRootEntity.deleteState?.let { SpaceDeleted(state = it) },
                     )

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

@@ -24,16 +24,12 @@ import com.owncloud.android.data.spaces.datasources.RemoteSpacesDataSource
 import com.owncloud.android.domain.spaces.model.OCSpace
 import com.owncloud.android.domain.spaces.model.SpaceDeleted
 import com.owncloud.android.domain.spaces.model.SpaceFile
-import com.owncloud.android.domain.spaces.model.SpaceGrantedToIdentities
 import com.owncloud.android.domain.spaces.model.SpaceOwner
-import com.owncloud.android.domain.spaces.model.SpacePermission
-import com.owncloud.android.domain.spaces.model.SpacePermissionIdentity
 import com.owncloud.android.domain.spaces.model.SpaceQuota
 import com.owncloud.android.domain.spaces.model.SpaceRoot
 import com.owncloud.android.domain.spaces.model.SpaceSpecial
 import com.owncloud.android.domain.spaces.model.SpaceSpecialFolder
 import com.owncloud.android.domain.spaces.model.SpaceUser
-import com.owncloud.android.lib.resources.spaces.responses.IdentityPermissionResponse
 import com.owncloud.android.lib.resources.spaces.responses.SpaceResponse
 
 class OCRemoteSpacesDataSource(
@@ -73,17 +69,6 @@ class OCRemoteSpacesDataSource(
             root = SpaceRoot(
                 eTag = root.eTag,
                 id = root.id,
-                permissions = root.permissions?.map { permissionsResponse ->
-                    SpacePermission(
-                        grantedToIdentities = permissionsResponse.getGrantedToIdentitiesResponse().map { grantedToResponse ->
-                            SpaceGrantedToIdentities(
-                                user = grantedToResponse.user?.toModel(),
-                                group = grantedToResponse.group?.toModel(),
-                            )
-                        },
-                        roles = permissionsResponse.roles,
-                    )
-                },
                 webDavUrl = root.webDavUrl,
                 deleted = root.deleted?.let { SpaceDeleted(state = it.state) }
             ),
@@ -102,11 +87,4 @@ class OCRemoteSpacesDataSource(
                 )
             }
         )
-
-    private fun IdentityPermissionResponse.toModel() =
-        SpacePermissionIdentity(
-            id = this.id,
-            displayName = this.displayName,
-        )
-
 }

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

@@ -71,7 +71,6 @@ data class SpaceQuota(
 data class SpaceRoot(
     val eTag: String?,
     val id: String,
-    val permissions: List<SpacePermission>?,
     val webDavUrl: String,
     val deleted: SpaceDeleted?,
 )
@@ -99,21 +98,6 @@ data class SpaceFile(
     val mimeType: String
 )
 
-data class SpacePermission(
-    val grantedToIdentities: List<SpaceGrantedToIdentities>,
-    val roles: List<String>
-)
-
-data class SpaceGrantedToIdentities(
-    val user: SpacePermissionIdentity?,
-    val group: SpacePermissionIdentity?,
-)
-
-data class SpacePermissionIdentity(
-    val id: String,
-    val displayName: String?,
-)
-
 data class SpaceSpecialFolder(
     val name: String
 )

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

@@ -81,7 +81,6 @@ val OC_SPACE_PROJECT_WITH_IMAGE = OCSpace(
     root = SpaceRoot(
         eTag = "989c7968dbbbde8c5fd9849b9123c384",
         id = "8871f4f3-fc6f-4a66-8bed-62f175f76f38$0aa0e03c-ec36-498c-bb9f-857315568199",
-        permissions = null,
         webDavUrl = "https://server.com/dav/spaces/8871f4f3-fc6f-4a66-8bed-62f175f76f38$0aa0e03c-ec36-498c-bb9f-857315568199",
         deleted = null
     ),
@@ -99,7 +98,6 @@ val OC_SPACE_PROJECT_WITHOUT_IMAGE = OC_SPACE_PROJECT_WITH_IMAGE.copy(
     root = SpaceRoot(
         eTag = "989c7968dbbbde8c5fd9849b9123c384",
         id = "8871f4f3-fc6f-4a66-8bed-62f175f76f38$0aa0e03c-ec36-498c-bb9f-1234566789",
-        permissions = null,
         webDavUrl = "https://server.com/dav/spaces/8871f4f3-fc6f-4a66-8bed-62f175f76f38$0aa0e03c-ec36-498c-bb9f-1234566789",
         deleted = null
     ),
@@ -125,7 +123,6 @@ val OC_SPACE_PROJECT_DISABLED = OC_SPACE_PROJECT_WITH_IMAGE.copy(
     root = SpaceRoot(
         eTag = "989c7968dbbbde8c5fd9849b9123c384",
         id = "8871f4f3-fc6f-4a66-8bed-62f175f76f38$0aa0e03c-ec36-498c-bb9f-857315568199",
-        permissions = null,
         webDavUrl = "https://server.com/dav/spaces/8871f4f3-fc6f-4a66-8bed-62f175f76f38$0aa0e03c-ec36-498c-bb9f-857315568199",
         deleted = SpaceDeleted(
             state = "trashed"