From 15fe9edfbd4eac0ed75ab14b2fc4a8a72e89947c Mon Sep 17 00:00:00 2001 From: ariskotsomitopoulos Date: Mon, 31 Jan 2022 16:21:46 +0200 Subject: [PATCH] Fix conflicts --- .../vector/app/features/home/room/detail/TimelineFragment.kt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt index 18625431e1..afbe641c93 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt @@ -1930,14 +1930,11 @@ class TimelineFragment @Inject constructor( timelineViewModel.handle(RoomDetailAction.TapOnFailedToDecrypt(informationData.eventId)) } } - else -> { - onThreadSummaryClicked(informationData.eventId, isRootThreadEvent) - } is MessageLocationContent -> { handleShowLocationPreview(messageContent, informationData.senderId) } else -> { - Timber.d("No click action defined for this message content") + onThreadSummaryClicked(informationData.eventId, isRootThreadEvent) } } }