Merge pull request #2202 from element-hq/feature/bma/removeReadReceiptFlag

Remove ReadReceipts feature flag.

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt

@@ -40,8 +40,6 @@ import io.element.android.features.poll.api.actions.EndPollAction
 import io.element.android.features.poll.api.actions.SendPollResponseAction
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
-import io.element.android.libraries.featureflag.api.FeatureFlagService
-import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.encryption.BackupState
 import io.element.android.libraries.matrix.api.encryption.EncryptionService
@@ -71,7 +69,6 @@ class TimelinePresenter @AssistedInject constructor(
     @Assisted private val navigator: MessagesNavigator,
     private val verificationService: SessionVerificationService,
     private val encryptionService: EncryptionService,
-    private val featureFlagService: FeatureFlagService,
     private val redactedVoiceMessageManager: RedactedVoiceMessageManager,
     private val sendPollResponseAction: SendPollResponseAction,
     private val endPollAction: EndPollAction,
@@ -114,7 +111,6 @@ class TimelinePresenter @AssistedInject constructor(
             }
         }
 
-        val readReceiptsEnabled by featureFlagService.isFeatureEnabledFlow(FeatureFlags.ReadReceipts).collectAsState(initial = false)
         val membersState by room.membersStateFlow.collectAsState()
 
         fun handleEvents(event: TimelineEvents) {
@@ -158,12 +154,7 @@ class TimelinePresenter @AssistedInject constructor(
                 .onEach {
                     timelineItemsFactory.replaceWith(
                         timelineItems = it,
-                        roomMembers = if (readReceiptsEnabled) {
-                            membersState.roomMembers().orEmpty()
-                        } else {
-                            // Give an empty list to not affect performance
-                            emptyList()
-                        }
+                        roomMembers = membersState.roomMembers().orEmpty()
                     )
                 }
                 .onEach { timelineItems ->
@@ -189,7 +180,6 @@ class TimelinePresenter @AssistedInject constructor(
             highlightedEventId = highlightedEventId.value,
             paginationState = paginationState,
             timelineItems = timelineItems,
-            showReadReceipts = readReceiptsEnabled,
             newEventState = newItemState.value,
             sessionState = sessionState,
             eventSink = { handleEvents(it) }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineState.kt

@@ -28,7 +28,6 @@ import kotlinx.collections.immutable.ImmutableList
 data class TimelineState(
     val timelineItems: ImmutableList<TimelineItem>,
     val timelineRoomInfo: TimelineRoomInfo,
-    val showReadReceipts: Boolean,
     val highlightedEventId: EventId?,
     val paginationState: MatrixTimeline.PaginationState,
     val newEventState: NewEventState,

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineStateProvider.kt

@@ -48,7 +48,6 @@ import kotlin.random.Random
 fun aTimelineState(timelineItems: ImmutableList<TimelineItem> = persistentListOf()) = TimelineState(
     timelineItems = timelineItems,
     timelineRoomInfo = aTimelineRoomInfo(),
-    showReadReceipts = false,
     paginationState = MatrixTimeline.PaginationState(
         isBackPaginating = false,
         hasMoreToLoadBackwards = true,
@@ -190,13 +189,16 @@ internal fun aTimelineItemReadReceipts(): TimelineItemReadReceipts {
     )
 }
 
-internal fun aGroupedEvents(id: Long = 0): TimelineItem.GroupedEvents {
+internal fun aGroupedEvents(
+    id: Long = 0,
+    withReadReceipts: Boolean = false,
+): TimelineItem.GroupedEvents {
     val event1 = aTimelineItemEvent(
         isMine = true,
         content = aTimelineItemStateEventContent(),
         groupPosition = TimelineItemGroupPosition.None,
         readReceiptState = TimelineItemReadReceipts(
-            receipts = listOf(aReadReceiptData(0)).toPersistentList(),
+            receipts = (if (withReadReceipts) listOf(aReadReceiptData(0)) else emptyList()).toImmutableList()
         ),
     )
     val event2 = aTimelineItemEvent(
@@ -204,7 +206,7 @@ internal fun aGroupedEvents(id: Long = 0): TimelineItem.GroupedEvents {
         content = aTimelineItemStateEventContent(body = "Another state event"),
         groupPosition = TimelineItemGroupPosition.None,
         readReceiptState = TimelineItemReadReceipts(
-            receipts = listOf(aReadReceiptData(1)).toPersistentList(),
+            receipts = (if (withReadReceipts) listOf(aReadReceiptData(1)) else emptyList()).toImmutableList()
         ),
     )
     val events = listOf(event1, event2)

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt

@@ -119,7 +119,6 @@ fun TimelineView(
                 TimelineItemRow(
                     timelineItem = timelineItem,
                     timelineRoomInfo = state.timelineRoomInfo,
-                    showReadReceipts = state.showReadReceipts,
                     isLastOutgoingMessage = (timelineItem as? TimelineItem.Event)?.isMine == true &&
                         state.timelineItems.first().identifier() == timelineItem.identifier(),
                     highlightedItem = state.highlightedEventId?.value,

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/ATimelineItemEventRow.kt

@@ -26,13 +26,11 @@ import io.element.android.features.messages.impl.timeline.model.TimelineItem
 internal fun ATimelineItemEventRow(
     event: TimelineItem.Event,
     timelineRoomInfo: TimelineRoomInfo = aTimelineRoomInfo(),
-    showReadReceipts: Boolean = false,
     isLastOutgoingMessage: Boolean = false,
     isHighlighted: Boolean = false,
 ) = TimelineItemEventRow(
     event = event,
     timelineRoomInfo = timelineRoomInfo,
-    showReadReceipts = showReadReceipts,
     isLastOutgoingMessage = isLastOutgoingMessage,
     isHighlighted = isHighlighted,
     onClick = {},

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt

@@ -114,7 +114,6 @@ import kotlin.math.roundToInt
 fun TimelineItemEventRow(
     event: TimelineItem.Event,
     timelineRoomInfo: TimelineRoomInfo,
-    showReadReceipts: Boolean,
     isLastOutgoingMessage: Boolean,
     isHighlighted: Boolean,
     onClick: () -> Unit,
@@ -224,7 +223,6 @@ fun TimelineItemEventRow(
                 isLastOutgoingMessage = isLastOutgoingMessage,
                 receipts = event.readReceiptState.receipts,
             ),
-            showReadReceipts = showReadReceipts,
             onReadReceiptsClicked = { onReadReceiptClick(event) },
             modifier = Modifier.padding(top = 4.dp),
         )

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowWithRRPreview.kt

@@ -47,7 +47,6 @@ internal fun TimelineItemEventRowWithRRPreview(
                 timelineItemReactions = aTimelineItemReactions(count = 0),
                 readReceiptState = TimelineItemReadReceipts(state.receipts),
             ),
-            showReadReceipts = true,
             isLastOutgoingMessage = false,
         )
         // A message from current user
@@ -61,7 +60,6 @@ internal fun TimelineItemEventRowWithRRPreview(
                 timelineItemReactions = aTimelineItemReactions(count = 0),
                 readReceiptState = TimelineItemReadReceipts(state.receipts),
             ),
-            showReadReceipts = true,
             isLastOutgoingMessage = false,
         )
         // Another message from current user
@@ -75,7 +73,6 @@ internal fun TimelineItemEventRowWithRRPreview(
                 timelineItemReactions = aTimelineItemReactions(count = 0),
                 readReceiptState = TimelineItemReadReceipts(state.receipts),
             ),
-            showReadReceipts = true,
             isLastOutgoingMessage = true,
         )
     }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemGroupedEventsRow.kt

@@ -43,7 +43,6 @@ import io.element.android.libraries.matrix.api.core.UserId
 fun TimelineItemGroupedEventsRow(
     timelineItem: TimelineItem.GroupedEvents,
     timelineRoomInfo: TimelineRoomInfo,
-    showReadReceipts: Boolean,
     isLastOutgoingMessage: Boolean,
     highlightedItem: String?,
     sessionState: SessionState,
@@ -71,7 +70,6 @@ fun TimelineItemGroupedEventsRow(
         timelineItem = timelineItem,
         timelineRoomInfo = timelineRoomInfo,
         highlightedItem = highlightedItem,
-        showReadReceipts = showReadReceipts,
         isLastOutgoingMessage = isLastOutgoingMessage,
         sessionState = sessionState,
         onClick = onClick,
@@ -95,7 +93,6 @@ private fun TimelineItemGroupedEventsRowContent(
     timelineItem: TimelineItem.GroupedEvents,
     timelineRoomInfo: TimelineRoomInfo,
     highlightedItem: String?,
-    showReadReceipts: Boolean,
     isLastOutgoingMessage: Boolean,
     sessionState: SessionState,
     onClick: (TimelineItem.Event) -> Unit,
@@ -127,7 +124,6 @@ private fun TimelineItemGroupedEventsRowContent(
                     TimelineItemRow(
                         timelineItem = subGroupEvent,
                         timelineRoomInfo = timelineRoomInfo,
-                        showReadReceipts = showReadReceipts,
                         isLastOutgoingMessage = isLastOutgoingMessage,
                         highlightedItem = highlightedItem,
                         sessionState = sessionState,
@@ -145,14 +141,13 @@ private fun TimelineItemGroupedEventsRowContent(
                     )
                 }
             }
-        } else if (showReadReceipts) {
+        } else {
             TimelineItemReadReceiptView(
                 state = ReadReceiptViewState(
                     sendState = null,
                     isLastOutgoingMessage = false,
                     receipts = timelineItem.aggregatedReadReceipts,
                 ),
-                showReadReceipts = true,
                 onReadReceiptsClicked = onExpandGroupClick
             )
         }
@@ -165,10 +160,9 @@ internal fun TimelineItemGroupedEventsRowContentExpandedPreview() = ElementPrevi
     TimelineItemGroupedEventsRowContent(
         isExpanded = true,
         onExpandGroupClick = {},
-        timelineItem = aGroupedEvents(),
+        timelineItem = aGroupedEvents(withReadReceipts = true),
         timelineRoomInfo = aTimelineRoomInfo(),
         highlightedItem = null,
-        showReadReceipts = true,
         isLastOutgoingMessage = false,
         sessionState = aSessionState(),
         onClick = {},
@@ -190,10 +184,9 @@ internal fun TimelineItemGroupedEventsRowContentCollapsePreview() = ElementPrevi
     TimelineItemGroupedEventsRowContent(
         isExpanded = false,
         onExpandGroupClick = {},
-        timelineItem = aGroupedEvents(),
+        timelineItem = aGroupedEvents(withReadReceipts = true),
         timelineRoomInfo = aTimelineRoomInfo(),
         highlightedItem = null,
-        showReadReceipts = true,
         isLastOutgoingMessage = false,
         sessionState = aSessionState(),
         onClick = {},

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemRow.kt

@@ -30,7 +30,6 @@ import io.element.android.libraries.matrix.api.core.UserId
 internal fun TimelineItemRow(
     timelineItem: TimelineItem,
     timelineRoomInfo: TimelineRoomInfo,
-    showReadReceipts: Boolean,
     isLastOutgoingMessage: Boolean,
     highlightedItem: String?,
     sessionState: SessionState,
@@ -59,7 +58,6 @@ internal fun TimelineItemRow(
             if (timelineItem.content is TimelineItemStateContent) {
                 TimelineItemStateEventRow(
                     event = timelineItem,
-                    showReadReceipts = showReadReceipts,
                     isLastOutgoingMessage = isLastOutgoingMessage,
                     isHighlighted = highlightedItem == timelineItem.identifier(),
                     onClick = { onClick(timelineItem) },
@@ -72,7 +70,6 @@ internal fun TimelineItemRow(
                 TimelineItemEventRow(
                     event = timelineItem,
                     timelineRoomInfo = timelineRoomInfo,
-                    showReadReceipts = showReadReceipts,
                     isLastOutgoingMessage = isLastOutgoingMessage,
                     isHighlighted = highlightedItem == timelineItem.identifier(),
                     onClick = { onClick(timelineItem) },
@@ -94,7 +91,6 @@ internal fun TimelineItemRow(
             TimelineItemGroupedEventsRow(
                 timelineItem = timelineItem,
                 timelineRoomInfo = timelineRoomInfo,
-                showReadReceipts = showReadReceipts,
                 isLastOutgoingMessage = isLastOutgoingMessage,
                 highlightedItem = highlightedItem,
                 sessionState = sessionState,

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemStateEventRow.kt

@@ -47,7 +47,6 @@ import kotlinx.collections.immutable.toPersistentList
 @Composable
 fun TimelineItemStateEventRow(
     event: TimelineItem.Event,
-    showReadReceipts: Boolean,
     isLastOutgoingMessage: Boolean,
     isHighlighted: Boolean,
     onClick: () -> Unit,
@@ -91,7 +90,6 @@ fun TimelineItemStateEventRow(
                 isLastOutgoingMessage = isLastOutgoingMessage,
                 receipts = event.readReceiptState.receipts,
             ),
-            showReadReceipts = showReadReceipts,
             onReadReceiptsClicked = { onReadReceiptsClick(event) },
         )
     }
@@ -109,7 +107,6 @@ internal fun TimelineItemStateEventRowPreview() = ElementPreview {
                 receipts = listOf(aReadReceiptData(0)).toPersistentList(),
             )
         ),
-        showReadReceipts = true,
         isLastOutgoingMessage = false,
         isHighlighted = false,
         onClick = {},

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/TimelineItemReadReceiptView.kt

@@ -58,23 +58,20 @@ import kotlinx.collections.immutable.ImmutableList
 @Composable
 fun TimelineItemReadReceiptView(
     state: ReadReceiptViewState,
-    showReadReceipts: Boolean,
     onReadReceiptsClicked: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     if (state.receipts.isNotEmpty()) {
-        if (showReadReceipts) {
-            ReadReceiptsRow(modifier = modifier) {
-                ReadReceiptsAvatars(
-                    receipts = state.receipts,
-                    modifier = Modifier
-                        .clip(RoundedCornerShape(4.dp))
-                        .clickable {
-                            onReadReceiptsClicked()
-                        }
-                        .padding(2.dp)
-                )
-            }
+        ReadReceiptsRow(modifier = modifier) {
+            ReadReceiptsAvatars(
+                receipts = state.receipts,
+                modifier = Modifier
+                    .clip(RoundedCornerShape(4.dp))
+                    .clickable {
+                        onReadReceiptsClicked()
+                    }
+                    .padding(2.dp)
+            )
         }
     } else {
         when (state.sendState) {
@@ -209,7 +206,6 @@ internal fun TimelineItemReactionsViewPreview(
 ) = ElementPreview {
     TimelineItemReadReceiptView(
         state = state,
-        showReadReceipts = true,
         onReadReceiptsClicked = {},
     )
 }

features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt

@@ -684,7 +684,6 @@ class MessagesPresenterTest {
             navigator = navigator,
             encryptionService = FakeEncryptionService(),
             verificationService = FakeSessionVerificationService(),
-            featureFlagService = FakeFeatureFlagService(),
             redactedVoiceMessageManager = FakeRedactedVoiceMessageManager(),
             endPollAction = FakeEndPollAction(),
             sendPollResponseAction = FakeSendPollResponseAction(),

features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt

@@ -35,7 +35,6 @@ import io.element.android.features.poll.api.actions.SendPollResponseAction
 import io.element.android.features.poll.test.actions.FakeEndPollAction
 import io.element.android.features.poll.test.actions.FakeSendPollResponseAction
 import io.element.android.libraries.featureflag.api.FeatureFlags
-import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
 import io.element.android.libraries.matrix.api.timeline.MatrixTimeline
 import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
 import io.element.android.libraries.matrix.api.timeline.item.event.EventReaction
@@ -88,7 +87,7 @@ class TimelinePresenterTest {
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
-            val initialState = awaitFirstItem()
+            val initialState = awaitItem()
             assertThat(initialState.paginationState.hasMoreToLoadBackwards).isTrue()
             assertThat(initialState.paginationState.isBackPaginating).isFalse()
             initialState.eventSink.invoke(TimelineEvents.LoadMore)
@@ -132,8 +131,6 @@ class TimelinePresenterTest {
         }.test {
             assertThat(timeline.sendReadReceiptCount).isEqualTo(0)
             val initialState = awaitFirstItem()
-            // Wait for timeline items to be populated
-            skipItems(1)
             awaitWithLatch { latch ->
                 timeline.sendReadReceiptLatch = latch
                 initialState.eventSink.invoke(TimelineEvents.OnScrollFinished(0))
@@ -156,8 +153,6 @@ class TimelinePresenterTest {
         }.test {
             assertThat(timeline.sendReadReceiptCount).isEqualTo(0)
             val initialState = awaitFirstItem()
-            // Wait for timeline items to be populated
-            skipItems(1)
             awaitWithLatch { latch ->
                 timeline.sendReadReceiptLatch = latch
                 initialState.eventSink.invoke(TimelineEvents.OnScrollFinished(1))
@@ -180,8 +175,6 @@ class TimelinePresenterTest {
         }.test {
             assertThat(timeline.sendReadReceiptCount).isEqualTo(0)
             val initialState = awaitFirstItem()
-            // Wait for timeline items to be populated
-            skipItems(1)
             awaitWithLatch { latch ->
                 timeline.sendReadReceiptLatch = latch
                 initialState.eventSink.invoke(TimelineEvents.OnScrollFinished(0))
@@ -353,8 +346,7 @@ class TimelinePresenterTest {
             presenter.present()
         }.test {
             assertThat(redactedVoiceMessageManager.invocations.size).isEqualTo(0)
-            awaitFirstItem()
-            awaitItem().let {
+            awaitFirstItem().let {
                 assertThat(it.timelineItems).isNotEmpty()
             }
             assertThat(redactedVoiceMessageManager.invocations.size).isEqualTo(1)
@@ -385,7 +377,6 @@ class TimelinePresenterTest {
             navigator = messagesNavigator,
             encryptionService = FakeEncryptionService(),
             verificationService = FakeSessionVerificationService(),
-            featureFlagService = FakeFeatureFlagService(),
             redactedVoiceMessageManager = redactedVoiceMessageManager,
             endPollAction = endPollAction,
             sendPollResponseAction = sendPollResponseAction,

libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt

@@ -75,11 +75,4 @@ enum class FeatureFlags(
         defaultValue = true,
         isFinished = false,
     ),
-    ReadReceipts(
-        key = "feature.readreceipts",
-        title = "Show read receipts",
-        description = null,
-        defaultValue = true,
-        isFinished = false,
-    ),
 }

libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/StaticFeatureFlagProvider.kt

@@ -40,7 +40,6 @@ class StaticFeatureFlagProvider @Inject constructor() :
                 FeatureFlags.PinUnlock -> true
                 FeatureFlags.Mentions -> true
                 FeatureFlags.SecureStorage -> true
-                FeatureFlags.ReadReceipts -> true
             }
         } else {
             false