Fix conflicts
This commit is contained in:
parent
d509b3324c
commit
15fe9edfbd
|
@ -1930,14 +1930,11 @@ class TimelineFragment @Inject constructor(
|
||||||
timelineViewModel.handle(RoomDetailAction.TapOnFailedToDecrypt(informationData.eventId))
|
timelineViewModel.handle(RoomDetailAction.TapOnFailedToDecrypt(informationData.eventId))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else -> {
|
|
||||||
onThreadSummaryClicked(informationData.eventId, isRootThreadEvent)
|
|
||||||
}
|
|
||||||
is MessageLocationContent -> {
|
is MessageLocationContent -> {
|
||||||
handleShowLocationPreview(messageContent, informationData.senderId)
|
handleShowLocationPreview(messageContent, informationData.senderId)
|
||||||
}
|
}
|
||||||
else -> {
|
else -> {
|
||||||
Timber.d("No click action defined for this message content")
|
onThreadSummaryClicked(informationData.eventId, isRootThreadEvent)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue