Merge branch 'mkirk/delete-system-messages'

Signal/src/ViewControllers/ConversationView/MessagesViewController.m

@@ -1531,6 +1531,24 @@ typedef enum : NSUInteger {
     return YES;
 }
 
+- (BOOL)collectionView:(UICollectionView *)collectionView
+      canPerformAction:(SEL)action
+    forItemAtIndexPath:(NSIndexPath *)indexPath
+            withSender:(id)sender
+{
+    id<OWSMessageData> messageData = [self messageAtIndexPath:indexPath];
+    return [messageData canPerformEditingAction:action];
+}
+
+- (void)collectionView:(UICollectionView *)collectionView
+         performAction:(SEL)action
+    forItemAtIndexPath:(NSIndexPath *)indexPath
+            withSender:(id)sender
+{
+    id<OWSMessageData> messageData = [self messageAtIndexPath:indexPath];
+    [messageData performEditingAction:action];
+}
+
 - (void)collectionView:(UICollectionView *)collectionView
        willDisplayCell:(UICollectionViewCell *)cell
     forItemAtIndexPath:(NSIndexPath *)indexPath
@@ -2653,6 +2671,23 @@ typedef enum : NSUInteger {
     }
 }
 
+- (void)didLongPressSystemMessageCell:(OWSSystemMessageCell *)systemMessageCell;
+{
+    OWSAssert([NSThread isMainThread]);
+    OWSAssert(systemMessageCell);
+    OWSAssert(systemMessageCell.interaction);
+
+    DDLogDebug(@"%@ long pressed system message cell: %@", self.tag, systemMessageCell);
+
+    [systemMessageCell becomeFirstResponder];
+
+    UIMenuController *theMenu = [UIMenuController sharedMenuController];
+    CGRect targetRect = [systemMessageCell.titleLabel.superview convertRect:systemMessageCell.titleLabel.frame
+                                                                     toView:systemMessageCell];
+    [theMenu setTargetRect:targetRect inView:systemMessageCell];
+    [theMenu setMenuVisible:YES animated:YES];
+}
+
 #pragma mark - ContactEditingDelegate
 
 - (void)didFinishEditingContact
@@ -3694,24 +3729,6 @@ typedef enum : NSUInteger {
     }];
 }
 
-- (BOOL)collectionView:(UICollectionView *)collectionView
-      canPerformAction:(SEL)action
-    forItemAtIndexPath:(NSIndexPath *)indexPath
-            withSender:(id)sender
-{
-    id<OWSMessageData> messageData = [self messageAtIndexPath:indexPath];
-    return [messageData canPerformEditingAction:action];
-}
-
-- (void)collectionView:(UICollectionView *)collectionView
-         performAction:(SEL)action
-    forItemAtIndexPath:(NSIndexPath *)indexPath
-            withSender:(id)sender
-{
-    id<OWSMessageData> messageData = [self messageAtIndexPath:indexPath];
-    [messageData performEditingAction:action];
-}
-
 - (void)updateGroupModelTo:(TSGroupModel *)newGroupModel successCompletion:(void (^_Nullable)())successCompletion
 {
     __block TSGroupThread *groupThread;

Signal/src/views/OWSSystemMessageCell.h

@@ -8,10 +8,12 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @class TSInteraction;
+@class OWSSystemMessageCell;
 
 @protocol OWSSystemMessageCellDelegate <NSObject>
 
 - (void)didTapSystemMessageWithInteraction:(TSInteraction *)interaction;
+- (void)didLongPressSystemMessageCell:(OWSSystemMessageCell *)systemMessageCell;
 
 @end
 
@@ -21,6 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, weak) id<OWSSystemMessageCellDelegate> systemMessageCellDelegate;
 
+@property (nonatomic, readonly) UILabel *titleLabel;
 @property (nonatomic, nullable, readonly) TSInteraction *interaction;
 
 - (void)configureWithInteraction:(TSInteraction *)interaction;

Signal/src/views/OWSSystemMessageCell.m

@@ -72,6 +72,10 @@ NS_ASSUME_NONNULL_BEGIN
     UITapGestureRecognizer *tap =
         [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTapGesture:)];
     [self addGestureRecognizer:tap];
+
+    UILongPressGestureRecognizer *longPress =
+        [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(handleLongPressGesture:)];
+    [self addGestureRecognizer:longPress];
 }
 
 + (NSString *)cellReuseIdentifier
@@ -290,6 +294,21 @@ NS_ASSUME_NONNULL_BEGIN
     self.interaction = nil;
 }
 
+#pragma mark - editing
+
+- (BOOL)canBecomeFirstResponder
+{
+    return YES;
+}
+
+- (void)delete:(nullable id)sender
+{
+    DDLogInfo(@"%@ chose delete", self.logTag);
+    OWSAssert(self.interaction);
+
+    [self.interaction remove];
+}
+
 #pragma mark - Gesture recognizers
 
 - (void)handleTapGesture:(UITapGestureRecognizer *)tap
@@ -299,6 +318,26 @@ NS_ASSUME_NONNULL_BEGIN
     [self.systemMessageCellDelegate didTapSystemMessageWithInteraction:self.interaction];
 }
 
+- (void)handleLongPressGesture:(UILongPressGestureRecognizer *)longPress
+{
+    OWSAssert(self.interaction);
+    if (longPress.state == UIGestureRecognizerStateBegan) {
+        [self.systemMessageCellDelegate didLongPressSystemMessageCell:self];
+    }
+}
+
+#pragma mark - Logging
+
++ (NSString *)logTag
+{
+    return [NSString stringWithFormat:@"[%@]", self.class];
+}
+
+- (NSString *)logTag
+{
+    return self.class.logTag;
+}
+
 @end
 
 NS_ASSUME_NONNULL_END