From cf397108910179d0e9e33c4a7146a54b7ac02e55 Mon Sep 17 00:00:00 2001 From: Alfonso Grillo Date: Tue, 18 Jul 2023 17:54:42 +0200 Subject: [PATCH] =?UTF-8?q?Remove=20=E2=80=9Dcopy=E2=80=9D=20action=20for?= =?UTF-8?q?=20location=20events=20(#1355)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Hide ”copy” action for location events * Cleanup --- ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift | 2 +- .../TimelineItems/EventBasedTimelineItemProtocol.swift | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift b/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift index 7f02b9e77..2a11cfeb0 100644 --- a/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift +++ b/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift @@ -411,7 +411,7 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol actions.append(.edit) } - if item.isMessage { + if item.isMessage, !item.isLocation { actions.append(.copy) } diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/EventBasedTimelineItemProtocol.swift b/ElementX/Sources/Services/Timeline/TimelineItems/EventBasedTimelineItemProtocol.swift index 3b38ef624..a18870f1d 100644 --- a/ElementX/Sources/Services/Timeline/TimelineItems/EventBasedTimelineItemProtocol.swift +++ b/ElementX/Sources/Services/Timeline/TimelineItems/EventBasedTimelineItemProtocol.swift @@ -42,6 +42,10 @@ extension EventBasedTimelineItemProtocol { self is EventBasedMessageTimelineItemProtocol } + var isLocation: Bool { + self is LocationRoomTimelineItem + } + var isRedacted: Bool { self is RedactedRoomTimelineItem }