Merge branch 'charlesmchen/saveMediaVsNonMedia'

pull/1/head
Matthew Chen 7 years ago
commit 707112a1c6

@ -100,9 +100,11 @@ extension ConversationViewItem {
if self.hasMediaActionContent { if self.hasMediaActionContent {
let copyMediaAction = MessageActionBuilder.copyMedia(conversationViewItem: self, delegate: delegate) let copyMediaAction = MessageActionBuilder.copyMedia(conversationViewItem: self, delegate: delegate)
actions.append(copyMediaAction) actions.append(copyMediaAction)
if self.canSaveMedia() {
let saveMediaAction = MessageActionBuilder.saveMedia(conversationViewItem: self, delegate: delegate) let saveMediaAction = MessageActionBuilder.saveMedia(conversationViewItem: self, delegate: delegate)
actions.append(saveMediaAction) actions.append(saveMediaAction)
} }
}
let deleteAction = MessageActionBuilder.deleteMessage(conversationViewItem: self, delegate: delegate) let deleteAction = MessageActionBuilder.deleteMessage(conversationViewItem: self, delegate: delegate)
actions.append(deleteAction) actions.append(deleteAction)

@ -121,6 +121,8 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType);
- (void)saveMediaAction; - (void)saveMediaAction;
- (void)deleteAction; - (void)deleteAction;
- (BOOL)canSaveMedia;
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END

Loading…
Cancel
Save