Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 23:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6328 from vector-im/johannes/quoting

Browse source 
Make quoting context menu action work again
This commit is contained in:
Johannes Marbach 2022-06-21 21:05:57 +02:00 committed by GitHub
commit 03d37b5923
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Riot/Modules/Room/RoomViewController.m
View file

@ -3708,9 +3708,10 @@ static CGSize kThreadListBarButtonItemImageSize;
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];

5
Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
View file

@ -159,10 +159,7 @@ static const NSTimeInterval kActionMenuComposerHeightAnimationDuration = .3;
- (void)setTextMessage:(NSString *)textMessage
{
if (!textMessage)
{
[self setAttributedTextMessage:nil];
}
[self setAttributedTextMessage:textMessage ? [[NSAttributedString alloc] initWithString:textMessage] : nil];
}
- (void)setAttributedTextMessage:(NSAttributedString *)attributedTextMessage

1
changelog.d/pr-6328.bugfix Normal file
View file

@ -0,0 +1 @@
Make quoting context menu action work again