Fix "save non-media attachment" crash.

7 years ago · 7cc8674201
parent df0046d098
commit 7cc8674201
2 changed files with 6 additions and 2 deletions
--- a/Signal/src/Models/MessageActions.swift
+++ b/Signal/src/Models/MessageActions.swift
@ -100,9 +100,11 @@ extension ConversationViewItem {
        if self.hasMediaActionContent {
            let copyMediaAction = MessageActionBuilder.copyMedia(conversationViewItem: self, delegate: delegate)
            actions.append(copyMediaAction)
+            if self.canSaveMedia() {
                let saveMediaAction = MessageActionBuilder.saveMedia(conversationViewItem: self, delegate: delegate)
                actions.append(saveMediaAction)
            }
+        }

        let deleteAction = MessageActionBuilder.deleteMessage(conversationViewItem: self, delegate: delegate)
        actions.append(deleteAction)
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h
@ -121,6 +121,8 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType);
 - (void)saveMediaAction;
 - (void)deleteAction;

+- (BOOL)canSaveMedia;
+
@end

 NS_ASSUME_NONNULL_END