Skip to content

Commit 27cb88d

Browse files
committed
Fix broken API changes: use Room.latestEvent, which will keep its name, but it'll be using the logic previously in Room.newLatestEvent
1 parent 67dee7b commit 27cb88d

File tree

3 files changed

+4
-11
lines changed

3 files changed

+4
-11
lines changed

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryFactory.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class RoomSummaryFactory(
2424
) {
2525
suspend fun create(room: Room): RoomSummary {
2626
val roomInfo = room.roomInfo().let(roomInfoMapper::map)
27-
val latestEvent = room.newLatestEvent().use { event ->
27+
val latestEvent = room.latestEvent().use { event ->
2828
when (event) {
2929
is RustLatestEventValue.None -> LatestEventValue.None
3030
is RustLatestEventValue.Local -> LatestEventValue.Local(

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiRoom.kt

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import io.element.android.libraries.matrix.api.core.RoomId
1212
import io.element.android.libraries.matrix.impl.fixtures.factories.aRustRoomInfo
1313
import io.element.android.libraries.matrix.test.A_ROOM_ID
1414
import io.element.android.tests.testutils.lambda.lambdaError
15-
import org.matrix.rustcomponents.sdk.EventTimelineItem
1615
import org.matrix.rustcomponents.sdk.LatestEventValue
1716
import org.matrix.rustcomponents.sdk.NoHandle
1817
import org.matrix.rustcomponents.sdk.Room
@@ -25,8 +24,7 @@ class FakeFfiRoom(
2524
private val getMembers: () -> RoomMembersIterator = { lambdaError() },
2625
private val getMembersNoSync: () -> RoomMembersIterator = { lambdaError() },
2726
private val leaveLambda: () -> Unit = { lambdaError() },
28-
private val latestEventLambda: () -> EventTimelineItem? = { lambdaError() },
29-
private val newLatestEventLambda: () -> LatestEventValue = { lambdaError() },
27+
private val latestEventLambda: () -> LatestEventValue = { lambdaError() },
3028
private val suggestedRoleForUserLambda: (String) -> RoomMemberRole = { lambdaError() },
3129
private val roomInfo: RoomInfo = aRustRoomInfo(id = roomId.value),
3230
) : Room(NoHandle) {
@@ -50,18 +48,14 @@ class FakeFfiRoom(
5048
return roomInfo
5149
}
5250

53-
override suspend fun latestEvent(): EventTimelineItem? {
51+
override suspend fun latestEvent(): LatestEventValue {
5452
return latestEventLambda()
5553
}
5654

5755
override suspend fun suggestedRoleForUser(userId: String): RoomMemberRole {
5856
return suggestedRoleForUserLambda(userId)
5957
}
6058

61-
override suspend fun newLatestEvent(): LatestEventValue {
62-
return newLatestEventLambda()
63-
}
64-
6559
override fun close() {
6660
// No-op
6761
}

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryListProcessorTest.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,7 @@ class RoomSummaryListProcessorTest {
174174

175175
private fun aRustRoom(roomId: RoomId = A_ROOM_ID) = FakeFfiRoom(
176176
roomId = roomId,
177-
latestEventLambda = { null },
178-
newLatestEventLambda = { LatestEventValue.None }
177+
latestEventLambda = { LatestEventValue.None }
179178
)
180179

181180
private fun TestScope.createProcessor() = RoomSummaryListProcessor(

0 commit comments

Comments
 (0)