From b2e25fa7e9fd07ac56416231b54227c07515299c Mon Sep 17 00:00:00 2001 From: Nicolas Mauri Date: Tue, 21 Nov 2023 14:47:49 +0100 Subject: [PATCH] =?UTF-8?q?Fix:=20Remove=20the=20=E2=80=9CQuote=E2=80=9D?= =?UTF-8?q?=20action=20from=20the=20menu=20of=20the=20selected=20message.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Room/EventMenu/EventMenuItemType.swift | 1 - Riot/Modules/Room/RoomViewController.m | 20 ------------------- changelog.d/7691.bugfix | 1 + 3 files changed, 1 insertion(+), 21 deletions(-) create mode 100644 changelog.d/7691.bugfix diff --git a/Riot/Modules/Room/EventMenu/EventMenuItemType.swift b/Riot/Modules/Room/EventMenu/EventMenuItemType.swift index c15d2fbdb..c8893858e 100644 --- a/Riot/Modules/Room/EventMenu/EventMenuItemType.swift +++ b/Riot/Modules/Room/EventMenu/EventMenuItemType.swift @@ -25,7 +25,6 @@ enum EventMenuItemType: Int { case cancelSending case cancelDownloading case saveMedia - case quote case forward case permalink case share diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m index b5d5f5665..37cc5a766 100644 --- a/Riot/Modules/Room/RoomViewController.m +++ b/Riot/Modules/Room/RoomViewController.m @@ -4056,26 +4056,6 @@ static CGSize kThreadListBarButtonItemImageSize; [self cancelEventSelection]; }]]; } - - if (!isJitsiCallEvent && !selectedEvent.isTimelinePollEvent && - selectedEvent.eventType != MXEventTypeBeaconInfo) - { - [self.eventMenuBuilder addItemWithType:EventMenuItemTypeQuote - action:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionQuote] - style:UIAlertActionStyleDefault - handler:^(UIAlertAction * action) { - MXStrongifyAndReturnIfNil(self); - - [self cancelEventSelection]; - - // Quote the message a la Markdown into the input toolbar composer - NSString *prefix = [self.inputToolbarView.textMessage length] ? [NSString stringWithFormat:@"%@\n", self.inputToolbarView.textMessage] : @""; - self.inputToolbarView.textMessage = [NSString stringWithFormat:@"%@>%@\n\n", prefix, selectedComponent.textMessage]; - - // And display the keyboard - [self.inputToolbarView becomeFirstResponder]; - }]]; - } if (selectedEvent.sentState == MXEventSentStateSent && !selectedEvent.isTimelinePollEvent && diff --git a/changelog.d/7691.bugfix b/changelog.d/7691.bugfix new file mode 100644 index 000000000..b41d40b33 --- /dev/null +++ b/changelog.d/7691.bugfix @@ -0,0 +1 @@ +The "Quote" action has been removed from the menu of the selected message.