Fix crash in media gallery

monal-im · Jan 3, 2025 · 5eff626 · 5eff626
1 parent fce545f
commit 5eff626
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Monal/Classes/MediaGallery.swift b/Monal/Classes/MediaGallery.swift
@@ -204,7 +204,7 @@ struct ImageViewerWrapper: View {
 
     var body: some View {
         Group {
-            if let _ = info["mimeType"] as? String {
+            if let _ = info["mimeType"] as? String, (info["needsDownloading"] as! NSNumber).boolValue != true {
                 try? ImageViewer(delegate: dismisser, info: info)
             } else {
                 Text("Invalid file data")

diff --git a/Monal/Classes/chatViewController.m b/Monal/Classes/chatViewController.m
@@ -2378,7 +2378,10 @@ -(void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
             } else  {
                 dispatch_async(dispatch_get_main_queue(), ^{
                     NSDictionary* selectedItem = [MLFiletransfer getFileInfoForMessage:[self.messageList objectAtIndex:indexPath.row]];
-                    NSMutableArray* allItems = [[DataLayer sharedInstance] allAttachmentsFromContact:self.contact.contactJid forAccount:self.contact.accountID];
+                    NSMutableArray* allItems = [NSMutableArray new];
+                    for(NSDictionary* info in [[DataLayer sharedInstance] allAttachmentsFromContact:self.contact.contactJid forAccount:self.contact.accountID])
+                        if(!(((NSNumber*)nilDefault(info["needsDownloading"], YES)).boolValue) && ([info[@"mimeType"] hasPrefix:@"image/"] || [info[@"mimeType"] hasPrefix:@"video/"])
+                            [allItems addObject:entry];
                     UIViewController* imageViewer = [[SwiftuiInterface new] makeImageViewerForCurrentItem:selectedItem allItems:allItems];
                     imageViewer.modalPresentationStyle = UIModalPresentationOverFullScreen;
                     [self presentViewController:imageViewer animated:YES completion:^{}];
@@ -2388,7 +2391,8 @@ -(void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
     }
 }
 
--(void) closePhotos {
+-(void) closePhotos
+{
     [self.navigationController dismissViewControllerAnimated:YES completion:nil];
 }