Merge pull request #7713 from vector-im/nicolasm/PSB-427_remove-quote…

…-menu-action Fix: Remove the “Quote” action from the menu of the selected message.
element-hq · Nov 22, 2023 · 611b604 · 611b604
2 parents d088e98 + b2e25fa
commit 611b604
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 21 deletions.
diff --git 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
@@ -4056,26 +4056,6 @@ - (void)showAdditionalActionsMenuForEvent:(MXEvent*)selectedEvent inCell:(id<MXK
                 [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
@@ -0,0 +1 @@
+The "Quote" action has been removed from the menu of the selected message.