letro/letro-android
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

change(invites) : fix compilation after last changes

Browse Source
This commit is contained in:
ganfra
2025-03-04 14:51:16 +01:00
parent d72cbffecc
commit c3407250eb
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/AcceptDeclineInvitePresenter.kt
View File

@@ -121,9 +121,8 @@ class AcceptDeclineInvitePresenter @Inject constructor(
client.getPendingRoom(inviteData.roomId)?.use {
it.leave().getOrThrow()
}
val senderId = inviteData.senderId
if (blockUser && senderId != null) {
client.ignoreUser(senderId).getOrThrow()
if (blockUser) {
client.ignoreUser(inviteData.senderId).getOrThrow()
}
notificationCleaner.clearMembershipNotificationForRoom(client.sessionId, inviteData.roomId)
inviteData.roomId

4
features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenterTest.kt
View File

@@ -167,9 +167,9 @@ class JoinRoomPresenterTest {
awaitItem().also { state ->
state.eventSink(JoinRoomEvents.AcceptInvite)
state.eventSink(JoinRoomEvents.DeclineInvite)
state.eventSink(JoinRoomEvents.DeclineInvite(false))
val inviteData = state.contentState.toInviteData()!!
val inviteData = state.contentState.toInviteData()
assert(eventSinkRecorder)
.isCalledExactly(2)

19
features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomViewTest.kt
View File

@@ -139,7 +139,7 @@ class JoinRoomViewTest {
}
@Test
fun `clicking on Accept invitation IsInvited room emits the expected Event`() {
fun `clicking on Accept when JoinAuthorisationStatus is IsInvited emits the expected Event`() {
val eventsRecorder = EventsRecorder<JoinRoomEvents>()
rule.setJoinRoomView(
aJoinRoomState(
@@ -152,7 +152,7 @@ class JoinRoomViewTest {
}
@Test
fun `clicking on Decline invitation on IsInvited room emits the expected Event`() {
fun `clicking on Decline when JoinAuthorisationStatus is IsInvited emits the expected Event`() {
val eventsRecorder = EventsRecorder<JoinRoomEvents>()
rule.setJoinRoomView(
aJoinRoomState(
@@ -161,7 +161,20 @@ class JoinRoomViewTest {
),
)
rule.clickOn(CommonStrings.action_decline)
eventsRecorder.assertSingle(JoinRoomEvents.DeclineInvite)
eventsRecorder.assertSingle(JoinRoomEvents.DeclineInvite(false))
}
@Test
fun `clicking on Decline and block when JoinAuthorisationStatus is IsInvited emits the expected Event`() {
val eventsRecorder = EventsRecorder<JoinRoomEvents>()
rule.setJoinRoomView(
aJoinRoomState(
contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.IsInvited(null)),
eventSink = eventsRecorder,
),
)
rule.clickOn(R.string.screen_join_room_decline_and_block_button_title)
eventsRecorder.assertSingle(JoinRoomEvents.DeclineInvite(true))
}
@Test