Merged element 1.10.9 into bum

2026-04-20 08:32:53 +02:00 · 2023-04-11 11:46:44 +02:00
parent 58ffe96adf ef9c3c4316
commit 6068b228a7
73 changed files with 4351 additions and 979 deletions
@@ -1362,14 +1362,21 @@ static NSString *const kRepliedTextPattern = @"<mx-reply>.*<blockquote>.*<br>(.*
                        {
                            body = body? body : [VectorL10n noticeFileAttachment];
                            
-                            NSDictionary *fileInfo = contentToUse[@"info"];
+                            NSDictionary *fileInfo;
+                            MXJSONModelSetDictionary(fileInfo, contentToUse[@"info"]);
                            if (fileInfo)
                            {
-                                NSNumber *fileSize = fileInfo[@"size"];
+                                NSNumber *fileSize;
+                                MXJSONModelSetNumber(fileSize, fileInfo[@"size"])
                                if (fileSize)
                                {
                                    body = [NSString stringWithFormat:@"%@ (%@)", body, [MXTools fileSizeToString: fileSize.longValue]];
                                }
+                                else
+                                {
+                                    MXLogDebug(@"[MXKEventFormatter] Warning: Unsupported m.file format: %@", event.description);
+                                    *error = MXKEventFormatterErrorUnsupported;
+                                }
                            }
                        }
                        else