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

Merge pull request #5936 from kaylendog/kaylendog/history-sharing/algorithm

Browse source 
Show history visibility banner strictly for `shared` rooms instead of `invited`.
This commit is contained in:
Benoit Marty 2025-12-19 15:14:36 +01:00 • committed by GitHub
commit bdaa95bae5
2 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/historyvisible/HistoryVisibleStatePresenter.kt
View file

@ -20,7 +20,6 @@ import io.element.android.libraries.matrix.api.core.RoomId
import io.element.android.libraries.matrix.api.room.JoinedRoom import io.element.android.libraries.matrix.api.room.JoinedRoom
import io.element.android.libraries.matrix.api.room.history.RoomHistoryVisibility import io.element.android.libraries.matrix.api.room.history.RoomHistoryVisibility
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.coroutineScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@Inject @Inject
@ -35,11 +34,14 @@ class HistoryVisibleStatePresenter(
val roomInfo by room.roomInfoFlow.collectAsState() val roomInfo by room.roomInfoFlow.collectAsState()
// Implicitly assume the alert is initially acknowledged to avoid flashes in UI. // Implicitly assume the alert is initially acknowledged to avoid flashes in UI.
val acknowledged by repository.hasAcknowledged(room.roomId).collectAsState(initial = true) val acknowledged by repository.hasAcknowledged(room.roomId).collectAsState(initial = true)
val isHistoryVisible = roomInfo.historyVisibility == RoomHistoryVisibility.Shared || roomInfo.historyVisibility == RoomHistoryVisibility.WorldReadable
val coroutineScope = rememberCoroutineScope() val coroutineScope = rememberCoroutineScope()
LaunchedEffect(roomInfo.historyVisibility, acknowledged) { LaunchedEffect(isHistoryVisible, acknowledged) {
if (roomInfo.historyVisibility == RoomHistoryVisibility.Joined && acknowledged) { if (!isHistoryVisible && acknowledged) {
// Clear the dismissed flag, if it is set to ensure that if a room is changed public -> private -> public,
// we show the banner again when it is set back to public.
repository.setAcknowledged(room.roomId, false) repository.setAcknowledged(room.roomId, false)
} }
} }
@ -51,7 +53,7 @@ class HistoryVisibleStatePresenter(
} }
return HistoryVisibleState( return HistoryVisibleState(
showAlert = isFeatureEnabled && roomInfo.historyVisibility != RoomHistoryVisibility.Joined && roomInfo.isEncrypted == true && !acknowledged, showAlert = isFeatureEnabled && isHistoryVisible && roomInfo.isEncrypted == true && !acknowledged,
eventSink = ::handleEvent, eventSink = ::handleEvent,
) )
} }

14
features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/historyvisible/HistoryVisibleStatePresenterTest.kt
View file

@ -28,7 +28,7 @@ class HistoryVisibleStatePresenterTest {
@Test @Test
fun `present - not visible if feature disabled`() = runTest { fun `present - not visible if feature disabled`() = runTest {
val room = FakeJoinedRoom() val room = FakeJoinedRoom()
room.givenRoomInfo(aRoomInfo(historyVisibility = RoomHistoryVisibility.Joined, isEncrypted = true)) room.givenRoomInfo(aRoomInfo(historyVisibility = RoomHistoryVisibility.Shared, isEncrypted = true))
val presenter = createHistoryVisibleStatePresenter(room, enabled = false, acknowledged = false) val presenter = createHistoryVisibleStatePresenter(room, enabled = false, acknowledged = false)
presenter.test { presenter.test {
assertThat(awaitLastSequentialItem().showAlert).isFalse() assertThat(awaitLastSequentialItem().showAlert).isFalse()
@ -48,7 +48,17 @@ class HistoryVisibleStatePresenterTest {
@Test @Test
fun `present - initial with room joined, encrypted`() = runTest { fun `present - initial with room joined, encrypted`() = runTest {
val room = FakeJoinedRoom() val room = FakeJoinedRoom()
room.givenRoomInfo(aRoomInfo(historyVisibility = RoomHistoryVisibility.Joined, isEncrypted = false)) room.givenRoomInfo(aRoomInfo(historyVisibility = RoomHistoryVisibility.Joined, isEncrypted = true))
val presenter = createHistoryVisibleStatePresenter(room)
presenter.test {
assertThat(awaitLastSequentialItem().showAlert).isFalse()
}
}
@Test
fun `present - initial with room invited, encrypted`() = runTest {
val room = FakeJoinedRoom()
room.givenRoomInfo(aRoomInfo(historyVisibility = RoomHistoryVisibility.Invited, isEncrypted = true))
val presenter = createHistoryVisibleStatePresenter(room) val presenter = createHistoryVisibleStatePresenter(room)
presenter.test { presenter.test {
assertThat(awaitLastSequentialItem().showAlert).isFalse() assertThat(awaitLastSequentialItem().showAlert).isFalse()