Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 9 Projects Releases Packages Wiki Activity Actions

knock requests : fix breaking api

Browse source
This commit is contained in:
ganfra 2024-12-18 18:04:30 +01:00
parent 01f7fc20f4
commit 627aa6395f
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt
View file

@ -78,8 +78,7 @@ import kotlinx.coroutines.flow.onStart
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import org.matrix.rustcomponents.sdk.DateDividerMode import org.matrix.rustcomponents.sdk.DateDividerMode
import org.matrix.rustcomponents.sdk.IdentityStatusChangeListener import org.matrix.rustcomponents.sdk.IdentityStatusChangeListener
import org.matrix.rustcomponents.sdk.JoinRequest import org.matrix.rustcomponents.sdk.KnockRequestsListener
import org.matrix.rustcomponents.sdk.JoinRequestsListener
import org.matrix.rustcomponents.sdk.RoomInfo import org.matrix.rustcomponents.sdk.RoomInfo
import org.matrix.rustcomponents.sdk.RoomInfoListener import org.matrix.rustcomponents.sdk.RoomInfoListener
import org.matrix.rustcomponents.sdk.RoomListItem import org.matrix.rustcomponents.sdk.RoomListItem
@ -95,6 +94,7 @@ import uniffi.matrix_sdk.RoomPowerLevelChanges
import java.io.File import java.io.File
import kotlin.coroutines.cancellation.CancellationException import kotlin.coroutines.cancellation.CancellationException
import org.matrix.rustcomponents.sdk.IdentityStatusChange as RustIdentityStateChange import org.matrix.rustcomponents.sdk.IdentityStatusChange as RustIdentityStateChange
import org.matrix.rustcomponents.sdk.KnockRequest as InnerKnockRequest
import org.matrix.rustcomponents.sdk.Room as InnerRoom import org.matrix.rustcomponents.sdk.Room as InnerRoom
import org.matrix.rustcomponents.sdk.Timeline as InnerTimeline import org.matrix.rustcomponents.sdk.Timeline as InnerTimeline
@ -162,8 +162,8 @@ class RustMatrixRoom(
} }
override val knockRequestsFlow: Flow<List<KnockRequest>> = mxCallbackFlow { override val knockRequestsFlow: Flow<List<KnockRequest>> = mxCallbackFlow {
innerRoom.subscribeToJoinRequests(object : JoinRequestsListener { innerRoom.subscribeToKnockRequests(object : KnockRequestsListener {
override fun call(joinRequests: List<JoinRequest>) { override fun call(joinRequests: List<InnerKnockRequest>) {
val knockRequests = joinRequests.map { RustKnockRequest(it) } val knockRequests = joinRequests.map { RustKnockRequest(it) }
channel.trySend(knockRequests) channel.trySend(knockRequests)
} }

4
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/knock/RustKnockRequest.kt
View file

@ -10,10 +10,10 @@ package io.element.android.libraries.matrix.impl.room.knock
import io.element.android.libraries.matrix.api.core.EventId import io.element.android.libraries.matrix.api.core.EventId
import io.element.android.libraries.matrix.api.core.UserId import io.element.android.libraries.matrix.api.core.UserId
import io.element.android.libraries.matrix.api.room.knock.KnockRequest import io.element.android.libraries.matrix.api.room.knock.KnockRequest
import org.matrix.rustcomponents.sdk.JoinRequest import org.matrix.rustcomponents.sdk.KnockRequest as InnerKnockRequest
class RustKnockRequest( class RustKnockRequest(
private val inner: JoinRequest, private val inner: InnerKnockRequest,
) : KnockRequest { ) : KnockRequest {
override val eventId: EventId = EventId(inner.eventId) override val eventId: EventId = EventId(inner.eventId)
override val userId: UserId = UserId(inner.userId) override val userId: UserId = UserId(inner.userId)