Merge pull request #3670 from element-hq/feature/bma/fixCanInviteRefresh

Fix issue on canInvite refresh.
element-hq · Oct 15, 2024 · b2ea39e · b2ea39e
2 parents bfc1b88 + e5a8180
commit b2ea39e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/...in/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt b/...in/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt
@@ -12,7 +12,6 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
@@ -28,8 +27,8 @@ import io.element.android.libraries.designsystem.theme.components.SearchBarResul
 import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
-import io.element.android.libraries.matrix.api.room.powerlevels.canInvite
 import io.element.android.libraries.matrix.api.room.roomMembers
+import io.element.android.libraries.matrix.ui.room.canInviteAsState
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.withContext
@@ -56,9 +55,8 @@ class RoomMemberListPresenter @AssistedInject constructor(
         var isSearchActive by rememberSaveable { mutableStateOf(false) }
 
         val membersState by room.membersStateFlow.collectAsState()
-        val canInvite by produceState(initialValue = false, key1 = membersState) {
-            value = room.canInvite().getOrElse { false }
-        }
+        val syncUpdateFlow = room.syncUpdateFlow.collectAsState()
+        val canInvite by room.canInviteAsState(syncUpdateFlow.value)
 
         val roomModerationState = roomMembersModerationPresenter.present()
 

diff --git a/...s/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomState.kt b/...s/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomState.kt
@@ -15,6 +15,7 @@ import androidx.compose.runtime.produceState
 import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.MessageEventType
 import io.element.android.libraries.matrix.api.room.RoomMember
+import io.element.android.libraries.matrix.api.room.powerlevels.canInvite
 import io.element.android.libraries.matrix.api.room.powerlevels.canRedactOther
 import io.element.android.libraries.matrix.api.room.powerlevels.canRedactOwn
 import io.element.android.libraries.matrix.api.room.powerlevels.canSendMessage
@@ -26,6 +27,13 @@ fun MatrixRoom.canSendMessageAsState(type: MessageEventType, updateKey: Long): S
     }
 }
 
+@Composable
+fun MatrixRoom.canInviteAsState(updateKey: Long): State<Boolean> {
+    return produceState(initialValue = false, key1 = updateKey) {
+        value = canInvite().getOrElse { false }
+    }
+}
+
 @Composable
 fun MatrixRoom.canRedactOwnAsState(updateKey: Long): State<Boolean> {
     return produceState(initialValue = false, key1 = updateKey) {