Merge pull request #1529 from matrix-org/aringenbach/6446_fix_formatt…

…ed_body_content Fix formatted_body content for unformatted events
matrix-org · Jul 18, 2022 · f6f1f15 · f6f1f15
2 parents 5d74d03 + 12f9bbb
commit f6f1f15
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/MatrixSDK/Aggregations/MXAggregatedEditsUpdater.m b/MatrixSDK/Aggregations/MXAggregatedEditsUpdater.m
@@ -103,13 +103,19 @@ - (MXHTTPOperation*)replaceTextMessageEvent:(MXEvent*)event
 
             // This enables editing replies that don't provide a fallback mx-reply body.
             compatibilityText = [NSString stringWithFormat:@"* %@", text];
-            compatibilityFormattedText = [NSString stringWithFormat:@"* %@", formattedText];
+            if (formattedText.length > 0)
+            {
+                compatibilityFormattedText = [NSString stringWithFormat:@"* %@", formattedText];
+            }
         }
     }
     else
     {
         compatibilityText = [NSString stringWithFormat:@"* %@", text];
-        compatibilityFormattedText = [NSString stringWithFormat:@"* %@", formattedText];
+        if (formattedText.length > 0)
+        {
+            compatibilityFormattedText = [NSString stringWithFormat:@"* %@", formattedText];
+        }
     }
 
     NSMutableDictionary *content = [NSMutableDictionary new];
@@ -128,7 +134,7 @@ - (MXHTTPOperation*)replaceTextMessageEvent:(MXEvent*)event
 
     NSMutableDictionary *newContent = [NSMutableDictionary dictionaryWithDictionary:@{ kMXMessageTypeKey: messageType,
                                                                                        kMXMessageBodyKey: text }];
-    if (formattedText)
+    if (formattedText.length > 0)
     {
         [newContent addEntriesFromDictionary:@{
             @"formatted_body": formattedText,

diff --git a/changelog.d/6446.bugfix b/changelog.d/6446.bugfix
@@ -0,0 +1 @@
+Fix formatted_body content for unformatted events