ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-04 10:32:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken API changes: use Room.latestEvent, which will keep its name, but it'll be using the logic previously in Room.newLatestEvent

Browse Source
This commit is contained in:
Jorge Martín
2025-12-10 15:55:44 +01:00
committed by Jorge Martin Espinosa
parent 67dee7bb5f
commit 27cb88d88e
3 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryFactory.kt
+1 -1
View File
@@ -24,7 +24,7 @@ class RoomSummaryFactory(
) { ) {
suspend fun create(room: Room): RoomSummary { suspend fun create(room: Room): RoomSummary {
val roomInfo = room.roomInfo().let(roomInfoMapper::map) val roomInfo = room.roomInfo().let(roomInfoMapper::map)
val latestEvent = room.newLatestEvent().use { event -> val latestEvent = room.latestEvent().use { event ->
when (event) { when (event) {
is RustLatestEventValue.None -> LatestEventValue.None is RustLatestEventValue.None -> LatestEventValue.None
is RustLatestEventValue.Local -> LatestEventValue.Local( is RustLatestEventValue.Local -> LatestEventValue.Local(
libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiRoom.kt
+2 -8
View File
@@ -12,7 +12,6 @@ import io.element.android.libraries.matrix.api.core.RoomId
import io.element.android.libraries.matrix.impl.fixtures.factories.aRustRoomInfo import io.element.android.libraries.matrix.impl.fixtures.factories.aRustRoomInfo
import io.element.android.libraries.matrix.test.A_ROOM_ID import io.element.android.libraries.matrix.test.A_ROOM_ID
import io.element.android.tests.testutils.lambda.lambdaError import io.element.android.tests.testutils.lambda.lambdaError
import org.matrix.rustcomponents.sdk.EventTimelineItem
import org.matrix.rustcomponents.sdk.LatestEventValue import org.matrix.rustcomponents.sdk.LatestEventValue
import org.matrix.rustcomponents.sdk.NoHandle import org.matrix.rustcomponents.sdk.NoHandle
import org.matrix.rustcomponents.sdk.Room import org.matrix.rustcomponents.sdk.Room
@@ -25,8 +24,7 @@ class FakeFfiRoom(
private val getMembers: () -> RoomMembersIterator = { lambdaError() }, private val getMembers: () -> RoomMembersIterator = { lambdaError() },
private val getMembersNoSync: () -> RoomMembersIterator = { lambdaError() }, private val getMembersNoSync: () -> RoomMembersIterator = { lambdaError() },
private val leaveLambda: () -> Unit = { lambdaError() }, private val leaveLambda: () -> Unit = { lambdaError() },
private val latestEventLambda: () -> EventTimelineItem? = { lambdaError() }, private val latestEventLambda: () -> LatestEventValue = { lambdaError() },
private val newLatestEventLambda: () -> LatestEventValue = { lambdaError() },
private val suggestedRoleForUserLambda: (String) -> RoomMemberRole = { lambdaError() }, private val suggestedRoleForUserLambda: (String) -> RoomMemberRole = { lambdaError() },
private val roomInfo: RoomInfo = aRustRoomInfo(id = roomId.value), private val roomInfo: RoomInfo = aRustRoomInfo(id = roomId.value),
) : Room(NoHandle) { ) : Room(NoHandle) {
@@ -50,7 +48,7 @@ class FakeFfiRoom(
return roomInfo return roomInfo
} }
override suspend fun latestEvent(): EventTimelineItem? { override suspend fun latestEvent(): LatestEventValue {
return latestEventLambda() return latestEventLambda()
} }
@@ -58,10 +56,6 @@ class FakeFfiRoom(
return suggestedRoleForUserLambda(userId) return suggestedRoleForUserLambda(userId)
} }
override suspend fun newLatestEvent(): LatestEventValue {
return newLatestEventLambda()
}
override fun close() { override fun close() {
// No-op // No-op
} }
libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryListProcessorTest.kt
+1 -2
View File
@@ -174,8 +174,7 @@ class RoomSummaryListProcessorTest {
private fun aRustRoom(roomId: RoomId = A_ROOM_ID) = FakeFfiRoom( private fun aRustRoom(roomId: RoomId = A_ROOM_ID) = FakeFfiRoom(
roomId = roomId, roomId = roomId,
latestEventLambda = { null }, latestEventLambda = { LatestEventValue.None }
newLatestEventLambda = { LatestEventValue.None }
) )
private fun TestScope.createProcessor() = RoomSummaryListProcessor( private fun TestScope.createProcessor() = RoomSummaryListProcessor(