Do not hide own media (#6898)

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

@@ -550,7 +550,7 @@ class MessagesPresenter(
             val replyToDetails = loadReplyDetails(targetEvent.eventId).map(permalinkParser)
             val composerMode = MessageComposerMode.Reply(
                 replyToDetails = replyToDetails,
-                hideImage = timelineProtectionState.hideMediaContent(targetEvent.eventId),
+                hideImage = timelineProtectionState.hideMediaContent(targetEvent.eventId, targetEvent.isMine),
             )
             composerState.eventSink(
                 MessageComposerEvent.SetMode(composerMode)

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListView.kt

@@ -284,7 +284,7 @@ private fun TimelineItemEventContentViewWrapper(
     } else {
         TimelineItemEventContentView(
             content = event.content,
-            hideMediaContent = timelineProtectionState.hideMediaContent(event.eventId),
+            hideMediaContent = timelineProtectionState.hideMediaContent(event.eventId, event.isMine),
             onShowContentClick = { timelineProtectionState.eventSink(TimelineProtectionEvent.ShowContent(event.eventId)) },
             onLinkClick = onLinkClick,
             onLinkLongClick = onLinkLongClick,

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

@@ -63,7 +63,7 @@ fun TimelineItemGroupedEventsRow(
         { event, contentModifier, onContentLayoutChange ->
             TimelineItemEventContentView(
                 content = event.content,
-                hideMediaContent = timelineProtectionState.hideMediaContent(event.eventId),
+                hideMediaContent = timelineProtectionState.hideMediaContent(event.eventId, event.isMine),
                 onShowContentClick = { timelineProtectionState.eventSink(TimelineProtectionEvent.ShowContent(event.eventId)) },
                 onLinkClick = onLinkClick,
                 onLinkLongClick = onLinkLongClick,
@@ -136,7 +136,7 @@ private fun TimelineItemGroupedEventsRowContent(
         { event, contentModifier, onContentLayoutChange ->
             TimelineItemEventContentView(
                 content = event.content,
-                hideMediaContent = timelineProtectionState.hideMediaContent(event.eventId),
+                hideMediaContent = timelineProtectionState.hideMediaContent(event.eventId, event.isMine),
                 onShowContentClick = { timelineProtectionState.eventSink(TimelineProtectionEvent.ShowContent(event.eventId)) },
                 onLinkClick = onLinkClick,
                 onLinkLongClick = onLinkLongClick,

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

@@ -78,7 +78,7 @@ internal fun TimelineItemRow(
         { event, contentModifier, onContentLayoutChange ->
             TimelineItemEventContentView(
                 content = event.content,
-                hideMediaContent = timelineProtectionState.hideMediaContent(event.eventId),
+                hideMediaContent = timelineProtectionState.hideMediaContent(event.eventId, event.isMine),
                 onShowContentClick = { timelineProtectionState.eventSink(TimelineProtectionEvent.ShowContent(event.eventId)) },
                 onContentClick = { onContentClick(event) },
                 onLongClick = { onLongClick(event) },

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

@@ -34,26 +34,32 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt
  */
 fun TimelineItem.mustBeProtected(): Boolean {
     return when (this) {
-        is TimelineItem.Event -> when (content) {
+        is TimelineItem.Event -> {
-            is TimelineItemImageContent,
+            if (isMine) {
-            is TimelineItemVideoContent,
+                false
-            is TimelineItemStickerContent -> true
+            } else {
-            is TimelineItemAudioContent,
+                when (content) {
-            is TimelineItemRtcNotificationContent,
+                    is TimelineItemImageContent,
-            is TimelineItemEncryptedContent,
+                    is TimelineItemVideoContent,
-            is TimelineItemFileContent,
+                    is TimelineItemStickerContent -> true
-            TimelineItemLegacyCallInviteContent,
+                    is TimelineItemAudioContent,
-            is TimelineItemLocationContent,
+                    is TimelineItemRtcNotificationContent,
-            is TimelineItemPollContent,
+                    is TimelineItemEncryptedContent,
-            TimelineItemRedactedContent,
+                    is TimelineItemFileContent,
-            is TimelineItemProfileChangeContent,
+                    TimelineItemLegacyCallInviteContent,
-            is TimelineItemRoomMembershipContent,
+                    is TimelineItemLocationContent,
-            is TimelineItemStateEventContent,
+                    is TimelineItemPollContent,
-            is TimelineItemEmoteContent,
+                    TimelineItemRedactedContent,
-            is TimelineItemNoticeContent,
+                    is TimelineItemProfileChangeContent,
-            is TimelineItemTextContent,
+                    is TimelineItemRoomMembershipContent,
-            TimelineItemUnknownContent,
+                    is TimelineItemStateEventContent,
-            is TimelineItemVoiceContent -> false
+                    is TimelineItemEmoteContent,
+                    is TimelineItemNoticeContent,
+                    is TimelineItemTextContent,
+                    TimelineItemUnknownContent,
+                    is TimelineItemVoiceContent -> false
+                }
+            }
         }
         is TimelineItem.Virtual -> false
         is TimelineItem.GroupedEvents -> false

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

@@ -16,9 +16,13 @@ data class TimelineProtectionState(
     val protectionState: ProtectionState,
     val eventSink: (TimelineProtectionEvent) -> Unit,
 ) {
-    fun hideMediaContent(eventId: EventId?) = when (protectionState) {
+    fun hideMediaContent(eventId: EventId?, isMine: Boolean = false) = if (isMine) {
-        is ProtectionState.RenderAll -> false
+        false
-        is ProtectionState.RenderOnly -> eventId !in protectionState.eventIds
+    } else {
+        when (protectionState) {
+            is ProtectionState.RenderAll -> false
+            is ProtectionState.RenderOnly -> eventId !in protectionState.eventIds
+        }
     }
 }
 

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

@@ -42,4 +42,19 @@ class TimelineProtectionStateTest {
         assertThat(sut.hideMediaContent(AN_EVENT_ID)).isFalse()
         assertThat(sut.hideMediaContent(AN_EVENT_ID_2)).isTrue()
     }
+
+    @Test
+    fun `when isMine is true, hideMediaContent always returns false regardless of state`() {
+        val sutRenderAll = aTimelineProtectionState(
+            protectionState = ProtectionState.RenderAll
+        )
+        assertThat(sutRenderAll.hideMediaContent(null, isMine = true)).isFalse()
+        assertThat(sutRenderAll.hideMediaContent(AN_EVENT_ID, isMine = true)).isFalse()
+
+        val sutRenderOnly = aTimelineProtectionState(
+            protectionState = ProtectionState.RenderOnly(persistentSetOf())
+        )
+        assertThat(sutRenderOnly.hideMediaContent(null, isMine = true)).isFalse()
+        assertThat(sutRenderOnly.hideMediaContent(AN_EVENT_ID, isMine = true)).isFalse()
+    }
 }