Hide Read Receipt if the user set Rended Read Receipt to false (actually disabled the "Share presence" toggle)

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

@@ -106,6 +106,7 @@ class TimelinePresenter @AssistedInject constructor(
         val keyBackupState by encryptionService.backupStateStateFlow.collectAsState()
 
         val isSendPublicReadReceiptsEnabled by sessionPreferencesStore.isSendPublicReadReceiptsEnabled().collectAsState(initial = true)
+        val renderReadReceipts by sessionPreferencesStore.isRenderReadReceiptsEnabled().collectAsState(initial = true)
 
         val sessionState by remember {
             derivedStateOf {
@@ -183,6 +184,7 @@ class TimelinePresenter @AssistedInject constructor(
             highlightedEventId = highlightedEventId.value,
             paginationState = paginationState,
             timelineItems = timelineItems,
+            renderReadReceipts = renderReadReceipts,
             newEventState = newItemState.value,
             sessionState = sessionState,
             eventSink = { handleEvents(it) }

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

@@ -28,6 +28,7 @@ import kotlinx.collections.immutable.ImmutableList
 data class TimelineState(
     val timelineItems: ImmutableList<TimelineItem>,
     val timelineRoomInfo: TimelineRoomInfo,
+    val renderReadReceipts: 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,6 +48,7 @@ import kotlin.random.Random
 fun aTimelineState(timelineItems: ImmutableList<TimelineItem> = persistentListOf()) = TimelineState(
     timelineItems = timelineItems,
     timelineRoomInfo = aTimelineRoomInfo(),
+    renderReadReceipts = false,
     paginationState = MatrixTimeline.PaginationState(
         isBackPaginating = false,
         hasMoreToLoadBackwards = true,

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

@@ -120,6 +120,7 @@ fun TimelineView(
                 TimelineItemRow(
                     timelineItem = timelineItem,
                     timelineRoomInfo = state.timelineRoomInfo,
+                    renderReadReceipts = state.renderReadReceipts,
                     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,11 +26,13 @@ import io.element.android.features.messages.impl.timeline.model.TimelineItem
 internal fun ATimelineItemEventRow(
     event: TimelineItem.Event,
     timelineRoomInfo: TimelineRoomInfo = aTimelineRoomInfo(),
+    renderReadReceipts: Boolean = false,
     isLastOutgoingMessage: Boolean = false,
     isHighlighted: Boolean = false,
 ) = TimelineItemEventRow(
     event = event,
     timelineRoomInfo = timelineRoomInfo,
+    renderReadReceipts = renderReadReceipts,
     isLastOutgoingMessage = isLastOutgoingMessage,
     isHighlighted = isHighlighted,
     onClick = {},

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

@@ -114,6 +114,7 @@ import kotlin.math.roundToInt
 fun TimelineItemEventRow(
     event: TimelineItem.Event,
     timelineRoomInfo: TimelineRoomInfo,
+    renderReadReceipts: Boolean,
     isLastOutgoingMessage: Boolean,
     isHighlighted: Boolean,
     onClick: () -> Unit,
@@ -223,6 +224,7 @@ fun TimelineItemEventRow(
                 isLastOutgoingMessage = isLastOutgoingMessage,
                 receipts = event.readReceiptState.receipts,
             ),
+            renderReadReceipts = renderReadReceipts,
             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,6 +47,7 @@ internal fun TimelineItemEventRowWithRRPreview(
                 timelineItemReactions = aTimelineItemReactions(count = 0),
                 readReceiptState = TimelineItemReadReceipts(state.receipts),
             ),
+            renderReadReceipts = true,
             isLastOutgoingMessage = false,
         )
         // A message from current user
@@ -60,6 +61,7 @@ internal fun TimelineItemEventRowWithRRPreview(
                 timelineItemReactions = aTimelineItemReactions(count = 0),
                 readReceiptState = TimelineItemReadReceipts(state.receipts),
             ),
+            renderReadReceipts = true,
             isLastOutgoingMessage = false,
         )
         // Another message from current user
@@ -73,6 +75,7 @@ internal fun TimelineItemEventRowWithRRPreview(
                 timelineItemReactions = aTimelineItemReactions(count = 0),
                 readReceiptState = TimelineItemReadReceipts(state.receipts),
             ),
+            renderReadReceipts = true,
             isLastOutgoingMessage = true,
         )
     }

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

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

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

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

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

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

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

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