ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-10-31 16:22:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7352 from hayaksi1/fix/6189-no-call-in-empty-dm

Browse Source 
Do not offer to start a call in a DM with no other member
This commit is contained in:
Benoit Marty
2026-08-11 16:21:02 +02:00
committed by GitHub
parent 2e7f3f1371 7f56c15fb8
commit bea89fee41
2 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/roomcall/impl/src/main/kotlin/io/element/android/features/roomcall/impl/RoomCallStatePresenter.kt
+7 -4
View File
@@ -60,10 +60,13 @@ class RoomCallStatePresenter(
isUserLocallyInTheCall = isUserLocallyInTheCall,
isAudioCall = roomInfo.activeCallIntentConsensus.isAudio(),
)
else -> RoomCallState.StandBy(
canStartCall = canJoinCall,
isDM = roomInfo.isDm
)
else -> {
val isEmptyDm = roomInfo.isDm && roomInfo.activeMembersCount <= 1
RoomCallState.StandBy(
canStartCall = canJoinCall && !isEmptyDm,
isDM = roomInfo.isDm
)
}
}
}
}
features/roomcall/impl/src/test/kotlin/io/element/android/features/roomcall/impl/RoomCallStatePresenterTest.kt
+36
View File
@@ -49,6 +49,42 @@ class RoomCallStatePresenterTest {
}
}
@Test
fun `present - a DM with no other member cannot start a call`() = runTest {
val room = FakeJoinedRoom(
baseRoom = FakeBaseRoom(
initialRoomInfo = aRoomInfo(isDm = true, activeMembersCount = 1, joinedMembersCount = 1),
roomPermissions = roomPermissions(true),
)
)
val presenter = createRoomCallStatePresenter(joinedRoom = room)
presenter.test {
skipItems(1)
assertThat(awaitItem()).isEqualTo(
RoomCallState.StandBy(
canStartCall = false,
isDM = true
)
)
}
}
@Test
fun `present - a DM becomes callable once the other member is active`() = runTest {
val baseRoom = FakeBaseRoom(
initialRoomInfo = aRoomInfo(isDm = true, activeMembersCount = 1, joinedMembersCount = 1),
roomPermissions = roomPermissions(true),
)
val room = FakeJoinedRoom(baseRoom = baseRoom)
val presenter = createRoomCallStatePresenter(joinedRoom = room)
presenter.test {
skipItems(1)
assertThat(awaitItem()).isEqualTo(RoomCallState.StandBy(canStartCall = false, isDM = true))
baseRoom.givenRoomInfo(aRoomInfo(isDm = true, activeMembersCount = 2, joinedMembersCount = 2))
assertThat(awaitItem()).isEqualTo(RoomCallState.StandBy(canStartCall = true, isDM = true))
}
}
@Test
fun `present - element call not available`() = runTest {
val room = FakeJoinedRoom(