Merge branch 'develop' into feature/valere/timeline_active_call_rendering

This commit is contained in:
Valere
2026-07-15 16:22:26 +02:00
4 changed files with 23 additions and 5 deletions
@@ -12,6 +12,8 @@ import io.element.android.libraries.matrix.api.core.UserId
import org.matrix.rustcomponents.sdk.MembershipState
import org.matrix.rustcomponents.sdk.PowerLevel
import org.matrix.rustcomponents.sdk.RoomMember
import org.matrix.rustcomponents.sdk.UserCall
import org.matrix.rustcomponents.sdk.UserStatus
import uniffi.matrix_sdk.RoomMemberRole
internal fun aRustRoomMember(
@@ -25,6 +27,8 @@ internal fun aRustRoomMember(
role: RoomMemberRole = RoomMemberRole.USER,
membershipChangeReason: String? = null,
isServiceMember: Boolean = false,
status: UserStatus? = null,
call: UserCall? = null,
) = RoomMember(
userId = userId.value,
displayName = displayName,
@@ -36,4 +40,6 @@ internal fun aRustRoomMember(
suggestedRoleForPowerLevel = role,
membershipChangeReason = membershipChangeReason,
isServiceMember = isServiceMember,
status = status,
call = call,
)