BF: Reply of reply with unexpected newlines renders badly

element-hq/element-ios/issues/2086
matrix-org · Oct 31, 2018 · de019bf · de019bf
1 parent 975443b
commit de019bf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -14,6 +14,7 @@ Bug fix:
 * MXEvent: Move `invite_room_state` to the correct place in the client-server API (vector-im/riot-ios/issues/2010).
 * MXRoomSummaryUpdater: Fix minor issue in updateSummaryAvatar method.
 * Left room is still displayed as "Empty room" in rooms list (vector-im/riot-ios/issues/2082).
+* Reply of reply with unexpected newlines renders badly (vector-im/riot-ios/issues/2086).
 
 Changes in Matrix iOS SDK in 0.11.5 (2018-10-05)
 ===============================================

diff --git a/MatrixSDK/Data/MXRoom.m b/MatrixSDK/Data/MXRoom.m
@@ -1938,7 +1938,7 @@ - (NSString*)replyMessageFormattedBodyFromEventToReply:(MXEvent*)eventToReply
     if (isSenderMessageAReplyTo)
     {
         NSError *error = nil;
-        NSRegularExpression *replyRegex = [NSRegularExpression regularExpressionWithPattern:@"^<mx-reply>.*</mx-reply>" options:NSRegularExpressionCaseInsensitive error:&error];
+        NSRegularExpression *replyRegex = [NSRegularExpression regularExpressionWithPattern:@"^<mx-reply>[\\s\\S]*</mx-reply>" options:NSRegularExpressionCaseInsensitive error:&error];
         NSString *senderMessageFormattedBodyWithoutReply = [replyRegex stringByReplacingMatchesInString:senderMessageFormattedBody options:0 range:NSMakeRange(0, senderMessageFormattedBody.length) withTemplate:@""];
 
         if (error)