misc(power level) : clean up code

ganfra · ganfra · commit 5d2008cfe980 · 2025-12-10T11:26:07.000+01:00
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt
@@ -99,6 +99,7 @@ import timber.log.Timber
 import kotlin.time.Duration.Companion.seconds
 import io.element.android.libraries.core.mimetype.MimeTypes.Any as AnyMimeTypes
 
+@Suppress("LargeClass")
 @AssistedInject
 class MessageComposerPresenter(
     @Assisted private val navigator: MessagesNavigator,
@@ -397,7 +398,7 @@ class MessageComposerPresenter(
             val currentUserId = room.sessionId
 
             suspend fun canSendRoomMention(): Boolean {
-                val userCanSendAtRoom = room.roomPermissions().use(false){ perms ->
+                val userCanSendAtRoom = room.roomPermissions().use(false) { perms ->
                     perms.canOwnUserTriggerRoomNotification()
                 }
                 return !room.isDm() && userCanSendAtRoom
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
@@ -39,7 +39,6 @@ import io.element.android.features.poll.api.actions.EndPollAction
 import io.element.android.features.poll.api.actions.SendPollResponseAction
 import io.element.android.features.roomcall.api.RoomCallState
 import io.element.android.libraries.architecture.Presenter
-import io.element.android.libraries.core.bool.orFalse
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.di.annotations.SessionCoroutineScope
 import io.element.android.libraries.featureflag.api.FeatureFlagService
@@ -96,6 +95,7 @@ class TimelinePresenter(
     private val analyticsService: AnalyticsService,
 ) : Presenter<TimelineState> {
     private val tag = "TimelinePresenter"
+
     @AssistedFactory
     interface Factory {
         fun create(
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt
@@ -1234,13 +1234,13 @@ class MessagesPresenterTest {
         canPinUnpin: Boolean = true,
     ) = FakeRoomPermissions(
         canSendState = { type ->
-            when(type){
+            when (type) {
                 StateEventType.CALL_MEMBER -> canStartCall
                 else -> lambdaError()
             }
         },
         canSendMessage = { type ->
-            when(type){
+            when (type) {
                 MessageEventType.RoomMessage -> canSendMessage
                 MessageEventType.Reaction -> canSendReaction
                 else -> lambdaError()
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListPresenterTest.kt
@@ -22,8 +22,6 @@ import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatch
 import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.room.JoinedRoom
-import io.element.android.libraries.matrix.api.room.MessageEventType
-import io.element.android.libraries.matrix.api.room.StateEventType
 import io.element.android.libraries.matrix.api.sync.SyncService
 import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
 import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugInfo
@@ -41,7 +39,6 @@ import io.element.android.libraries.matrix.test.timeline.anEventTimelineItem
 import io.element.android.services.analytics.api.AnalyticsService
 import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.tests.testutils.lambda.assert
-import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
 import io.element.android.tests.testutils.test
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt
@@ -8,8 +8,6 @@
 
 package io.element.android.features.messages.impl.timeline
 
-import app.cash.molecule.RecompositionMode
-import app.cash.molecule.moleculeFlow
 import app.cash.turbine.ReceiveTurbine
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
@@ -37,7 +35,6 @@ import io.element.android.libraries.matrix.api.core.UniqueId
 import io.element.android.libraries.matrix.api.core.asEventId
 import io.element.android.libraries.matrix.api.room.MessageEventType
 import io.element.android.libraries.matrix.api.room.RoomMembersState
-import io.element.android.libraries.matrix.api.room.StateEventType
 import io.element.android.libraries.matrix.api.room.tombstone.PredecessorRoom
 import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
 import io.element.android.libraries.matrix.api.timeline.ReceiptType
@@ -988,7 +985,7 @@ class TimelinePresenterTest {
         canPinUnpin: Boolean = false,
     ) = FakeRoomPermissions(
         canSendMessage = { type ->
-            when(type){
+            when (type) {
                 MessageEventType.RoomMessage -> canSendMessage
                 MessageEventType.Reaction -> canSendReaction
                 else -> lambdaError()
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/MatrixRoomFixture.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/MatrixRoomFixture.kt
@@ -13,7 +13,6 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.RoomMember
-import io.element.android.libraries.matrix.api.room.StateEventType
 import io.element.android.libraries.matrix.api.room.join.JoinRule
 import io.element.android.libraries.matrix.api.room.powerlevels.RoomPermissions
 import io.element.android.libraries.matrix.test.AN_AVATAR_URL
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenterTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenterTest.kt
@@ -634,7 +634,7 @@ class RoomDetailsPresenterTest {
         canChangeTopic: Boolean = true,
         canChangeAvatar: Boolean = true,
         canChangePowerLevels: Boolean = true,
-    ) : RoomPermissions{
+    ): RoomPermissions {
         return FakeRoomPermissions(
             canInvite = canInvite,
             canKick = canKick,
@@ -656,5 +656,4 @@ class RoomDetailsPresenterTest {
             }
         )
     }
-
 }
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenterTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenterTest.kt
@@ -12,7 +12,6 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.features.roommembermoderation.api.RoomMemberModerationState
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
-import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
@@ -181,7 +180,6 @@ class RoomMemberListPresenterTest {
         }
     }
 
-
     @Test
     fun `present - RoomMemberSelected will open the moderation options`() = runTest {
         val presenter = createPresenter(
diff --git a/features/roomdetailsedit/api/src/main/kotlin/io/element/android/features/roomdetailsedit/api/RoomDetailsEditPermissions.kt b/features/roomdetailsedit/api/src/main/kotlin/io/element/android/features/roomdetailsedit/api/RoomDetailsEditPermissions.kt
@@ -14,7 +14,7 @@ data class RoomDetailsEditPermissions(
     val canEditName: Boolean,
     val canEditTopic: Boolean,
     val canEditAvatar: Boolean,
-){
+) {
     val hasAny = canEditName ||
         canEditTopic ||
         canEditAvatar
diff --git a/features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditPresenter.kt b/features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditPresenter.kt
@@ -59,7 +59,6 @@ class RoomDetailsEditPresenter(
     @Composable
     override fun present(): RoomDetailsEditState {
         val cameraPermissionState = cameraPermissionPresenter.present()
-        val roomSyncUpdateFlow = room.syncUpdateFlow.collectAsState()
         val roomInfo by room.roomInfoFlow.collectAsState()
         val roomAvatarUri = roomInfo.avatarUrl
         var roomAvatarUriEdited by rememberSaveable { mutableStateOf<String?>(null) }
@@ -94,7 +93,7 @@ class RoomDetailsEditPresenter(
             }
         }
 
-        val permissions by room.permissionsAsState(RoomDetailsEditPermissions.DEFAULT){perms ->
+        val permissions by room.permissionsAsState(RoomDetailsEditPermissions.DEFAULT) { perms ->
             perms.roomDetailsEditPermissions()
         }
 
diff --git a/features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/root/UserProfilePresenter.kt b/features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/root/UserProfilePresenter.kt
@@ -76,7 +76,7 @@ class UserProfilePresenter(
                     roomId
                         ?.let { client.getRoom(it) }
                         ?.use { room ->
-                            room.roomPermissions().use(false){ perms -> perms.canCall()}
+                            room.roomPermissions().use(false) { perms -> perms.canCall() }
                         }
                         .orFalse()
             }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/RoomPermissions.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/RoomPermissions.kt
@@ -18,7 +18,6 @@ import io.element.android.libraries.matrix.api.room.StateEventType
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
-import timber.log.Timber
 
 /**
  * Provides information about the permissions of users in a room.
@@ -150,7 +149,15 @@ fun <T> Result<RoomPermissions>.use(default: T, block: (RoomPermissions) -> T):
 
 fun <T> BaseRoom.permissionsFlow(default: T, block: (RoomPermissions) -> T): Flow<T> {
     return roomInfoFlow
-        .map { info -> info.roomPowerLevels }
+        .map { info ->
+            // If the user is a privileged creator, we return a constant hashcode to avoid recomputing permissions
+            // each time the power levels change (as they have all permissions).
+            if (info.privilegedCreatorRole && info.creators.contains(sessionId)) {
+                Long.MAX_VALUE
+            } else {
+                info.roomPowerLevels?.hashCode() ?: 0L
+            }
+        }
         .distinctUntilChanged()
         .map {
             roomPermissions().use(default, block)
@@ -160,7 +167,6 @@ fun <T> BaseRoom.permissionsFlow(default: T, block: (RoomPermissions) -> T): Flo
 @Composable
 fun <T> BaseRoom.permissionsAsState(default: T, block: (RoomPermissions) -> T): State<T> {
     return remember(this, default, block) {
-        Timber.d("Computing permissionsAsState for room $roomId with default=$default")
         permissionsFlow(default, block)
     }.collectAsState(default)
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustBaseRoom.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustBaseRoom.kt
@@ -18,12 +18,10 @@ import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.BaseRoom
-import io.element.android.libraries.matrix.api.room.MessageEventType
 import io.element.android.libraries.matrix.api.room.RoomInfo
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
-import io.element.android.libraries.matrix.api.room.StateEventType
 import io.element.android.libraries.matrix.api.room.draft.ComposerDraft
 import io.element.android.libraries.matrix.api.room.powerlevels.RoomPermissions
 import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevelsValues
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeBaseRoom.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeBaseRoom.kt
@@ -15,11 +15,9 @@ import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.BaseRoom
-import io.element.android.libraries.matrix.api.room.MessageEventType
 import io.element.android.libraries.matrix.api.room.RoomInfo
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomMembersState
-import io.element.android.libraries.matrix.api.room.StateEventType
 import io.element.android.libraries.matrix.api.room.draft.ComposerDraft
 import io.element.android.libraries.matrix.api.room.powerlevels.RoomPermissions
 import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevelsValues
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/powerlevels/FakeRoomPermissions.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/powerlevels/FakeRoomPermissions.kt
@@ -32,7 +32,6 @@ data class FakeRoomPermissions(
     private val canUserSendMessage: (UserId, MessageEventType) -> Boolean = { _, _ -> false },
     private val canUserSendState: (UserId, StateEventType) -> Boolean = { _, _ -> false },
 ) : RoomPermissions {
-
     override fun canOwnUserBan(): Boolean = canBan
     override fun canOwnUserInvite(): Boolean = canInvite
     override fun canOwnUserKick(): Boolean = canKick
@@ -57,4 +56,3 @@ data class FakeRoomPermissions(
         // no-op for the fake
     }
 }
-
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenter.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenter.kt
@@ -207,7 +207,6 @@ class MediaGalleryPresenter(
             CommonStrings.error_unknown
         }
     }
-
 }
 
 private fun GroupedMediaItems?.find(eventId: EventId?): MediaItem.Event? {

Original file line number	Diff line number	Diff line change
`@@ -634,7 +634,7 @@ class RoomDetailsPresenterTest {`
`634`	`634`	`canChangeTopic: Boolean = true,`
`635`	`635`	`canChangeAvatar: Boolean = true,`
`636`	`636`	`canChangePowerLevels: Boolean = true,`
`637`		`- ) : RoomPermissions{`
	`637`	`+ ): RoomPermissions {`
`638`	`638`	`return FakeRoomPermissions(`
`639`	`639`	`canInvite = canInvite,`
`640`	`640`	`canKick = canKick,`
`@@ -656,5 +656,4 @@ class RoomDetailsPresenterTest {`
`656`	`656`	`}`
`657`	`657`	`)`
`658`	`658`	`}`
`659`		`-`
`660`	`659`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ import com.google.common.truth.Truth.assertThat`
`12`	`12`	`import io.element.android.features.roommembermoderation.api.RoomMemberModerationState`
`13`	`13`	`import io.element.android.libraries.architecture.Presenter`
`14`	`14`	`import io.element.android.libraries.core.coroutine.CoroutineDispatchers`
`15`		`-import io.element.android.libraries.matrix.api.core.UserId`
`16`	`15`	`import io.element.android.libraries.matrix.api.room.JoinedRoom`
`17`	`16`	`import io.element.android.libraries.matrix.api.room.RoomMembersState`
`18`	`17`	`import io.element.android.libraries.matrix.api.room.RoomMembershipState`
`@@ -181,7 +180,6 @@ class RoomMemberListPresenterTest {`
`181`	`180`	`}`
`182`	`181`	`}`
`183`	`182`
`184`		`-`
`185`	`183`	`@Test`
`186`	`184`	fun `present - RoomMemberSelected will open the moderation options`() = runTest {
`187`	`185`	`val presenter = createPresenter(`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,6 @@ class RoomDetailsEditPresenter(`
`59`	`59`	`@Composable`
`60`	`60`	`override fun present(): RoomDetailsEditState {`
`61`	`61`	`val cameraPermissionState = cameraPermissionPresenter.present()`
`62`		`- val roomSyncUpdateFlow = room.syncUpdateFlow.collectAsState()`
`63`	`62`	`val roomInfo by room.roomInfoFlow.collectAsState()`
`64`	`63`	`val roomAvatarUri = roomInfo.avatarUrl`
`65`	`64`	`var roomAvatarUriEdited by rememberSaveable { mutableStateOf<String?>(null) }`
`@@ -94,7 +93,7 @@ class RoomDetailsEditPresenter(`
`94`	`93`	`}`
`95`	`94`	`}`
`96`	`95`
`97`		`- val permissions by room.permissionsAsState(RoomDetailsEditPermissions.DEFAULT){perms ->`
	`96`	`+ val permissions by room.permissionsAsState(RoomDetailsEditPermissions.DEFAULT) { perms ->`
`98`	`97`	`perms.roomDetailsEditPermissions()`
`99`	`98`	`}`
`100`	`99`