mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-02 12:07:28 +00:00
Merge branch 'develop' into feature/valere/timeline_active_call_rendering
This commit is contained in:
+6
@@ -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,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user