From 7cc86742018ce322eab6f9fc1710643dc9316e7a Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Tue, 7 Aug 2018 17:38:59 -0400
Subject: [PATCH] Fix "save non-media attachment" crash.

---
 Signal/src/Models/MessageActions.swift                      | 6 ++++--
 .../ViewControllers/ConversationView/ConversationViewItem.h | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Signal/src/Models/MessageActions.swift b/Signal/src/Models/MessageActions.swift
index c35c0a05b..f4471d71a 100644
--- a/Signal/src/Models/MessageActions.swift
+++ b/Signal/src/Models/MessageActions.swift
@@ -100,8 +100,10 @@ extension ConversationViewItem {
         if self.hasMediaActionContent {
             let copyMediaAction = MessageActionBuilder.copyMedia(conversationViewItem: self, delegate: delegate)
             actions.append(copyMediaAction)
-            let saveMediaAction = MessageActionBuilder.saveMedia(conversationViewItem: self, delegate: delegate)
-            actions.append(saveMediaAction)
+            if self.canSaveMedia() {
+                let saveMediaAction = MessageActionBuilder.saveMedia(conversationViewItem: self, delegate: delegate)
+                actions.append(saveMediaAction)
+            }
         }
 
         let deleteAction = MessageActionBuilder.deleteMessage(conversationViewItem: self, delegate: delegate)
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h
index 94c2b0fc8..46f5bbf81 100644
--- 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