Make quoting work again

Signed-off-by: Johannes Marbach <johannesm@element.io>
element-hq · Jun 21, 2022 · fbdd11f · fbdd11f
1 parent a8514ed
commit fbdd11f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
@@ -3687,9 +3687,10 @@ - (void)showAdditionalActionsMenuForEvent:(MXEvent*)selectedEvent inCell:(id<MXK
  MXStrongifyAndReturnIfNil(self);
 
  [self cancelEventSelection];
- 
+
  // Quote the message a la Markdown into the input toolbar composer
- self.inputToolbarView.textMessage = [NSString stringWithFormat:@"%@\n>%@\n\n", self.inputToolbarView.textMessage, selectedComponent.textMessage];
+ 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];

diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
@@ -159,10 +159,7 @@ -(void)customizeViewRendering
 
 - (void)setTextMessage:(NSString *)textMessage
 {
- if (!textMessage)
- {
- [self setAttributedTextMessage:nil];
- }
+ [self setAttributedTextMessage:textMessage ? [[NSAttributedString alloc] initWithString:textMessage] : nil];
 }
 
 - (void)setAttributedTextMessage:(NSAttributedString *)attributedTextMessage

diff --git a/changelog.d/pr-6328.bugfix b/changelog.d/pr-6328.bugfix
@@ -0,0 +1 @@
+Make quoting context menu action work again