BF: Reply of reply with unexpected newlines renders badly

element-hq/element-ios/issues/2086 Use a more NSRegularExpression thing to fix it
matrix-org · Oct 31, 2018 · 8e47691 · 8e47691
1 parent de019bf
commit 8e47691
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/MatrixSDK/Data/MXRoom.m b/MatrixSDK/Data/MXRoom.m
@@ -1938,7 +1938,9 @@ - (NSString*)replyMessageFormattedBodyFromEventToReply:(MXEvent*)eventToReply
     if (isSenderMessageAReplyTo)
     {
         NSError *error = nil;
-        NSRegularExpression *replyRegex = [NSRegularExpression regularExpressionWithPattern:@"^<mx-reply>[\\s\\S]*</mx-reply>" options:NSRegularExpressionCaseInsensitive error:&error];
+        NSRegularExpression *replyRegex = [NSRegularExpression regularExpressionWithPattern:@"^<mx-reply>.*</mx-reply>"
+                                                                                    options:NSRegularExpressionCaseInsensitive | NSRegularExpressionDotMatchesLineSeparators
+                                                                                      error:&error];
         NSString *senderMessageFormattedBodyWithoutReply = [replyRegex stringByReplacingMatchesInString:senderMessageFormattedBody options:0 range:NSMakeRange(0, senderMessageFormattedBody.length) withTemplate:@""];
 
         if (error)