Merge branch 'charlesmchen/editMenuVsAttachmentUpload'

This commit is contained in:
Matthew Chen 2017-04-11 18:07:45 -04:00
commit 21f5bc2fce
1 changed files with 4 additions and 0 deletions

View File

@ -256,6 +256,10 @@ NS_ASSUME_NONNULL_BEGIN
- (BOOL)canPerformEditingAction:(SEL)action
{
if ([self attachmentStream] && ![self attachmentStream].isUploaded) {
return NO;
}
// Deletes are always handled by TSMessageAdapter
if (action == @selector(delete:)) {
return YES;