Call notifications are deletable

// FREEBIE

Author: michaelkirk

Signal/src/Models/OWSCall.h

@@ -4,6 +4,10 @@
 #import "OWSMessageData.h"
 #import "TSMessageAdapter.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
+@class TSCall;
+
 typedef enum : NSUInteger {
     kCallOutgoing = 1,
     kCallIncoming = 2,
@@ -15,6 +19,18 @@ typedef enum : NSUInteger {
 
 @interface OWSCall : NSObject <OWSMessageData, NSCoding, NSCopying>
 
+#pragma mark - Initialization
+
+- (instancetype)initWithCallRecord:(TSCall *)callRecord;
+
+- (instancetype)initWithCallerId:(NSString *)callerId
+               callerDisplayName:(NSString *)callerDisplayName
+                            date:(nullable NSDate *)date
+                          status:(CallStatus)status
+                   displayString:(NSString *)detailString NS_DESIGNATED_INITIALIZER;
+
+- (instancetype)init NS_UNAVAILABLE;
+
 /*
  * Returns the string Id of the user who initiated the call
  */
@@ -41,14 +57,8 @@ typedef enum : NSUInteger {
  */
 @property (nonatomic, copy) NSString *detailString;
 
-#pragma mark - Initialization
-
-- (instancetype)initWithCallerId:(NSString *)callerId
-               callerDisplayName:(NSString *)callerDisplayName
-                            date:(NSDate *)date
-                          status:(CallStatus)status
-                   displayString:(NSString *)detailString NS_DESIGNATED_INITIALIZER;
-
 - (NSString *)dateText;
 
 @end
+
+NS_ASSUME_NONNULL_END

Signal/src/Models/OWSCall.m

@@ -2,8 +2,13 @@
 //  Portions Copyright (c) 2016 Open Whisper Systems. All rights reserved.
 
 #import "OWSCall.h"
+#import "TSCall.h"
+#import "TSContactThread.h"
 #import <JSQMessagesViewController/JSQMessagesTimestampFormatter.h>
 #import <JSQMessagesViewController/UIImage+JSQMessages.h>
+#import <SignalServiceKit/TSCall.h>
+
+NS_ASSUME_NONNULL_BEGIN
 
 @interface OWSCall ()
 
@@ -13,26 +18,76 @@ @interface OWSCall ()
 @property (nonatomic) BOOL shouldStartExpireTimer;
 @property (nonatomic) uint64_t expiresAtSeconds;
 @property (nonatomic) uint32_t expiresInSeconds;
+@property (nonatomic) TSInteraction *interaction;
 
 @end
 
 @implementation OWSCall
 
 #pragma mark - Initialzation
 
-- (id)init
+- (instancetype)initWithCallRecord:(TSCall *)callRecord
 {
-    NSAssert(NO,
-        @"%s is not a valid initializer for %@. Use %@ instead",
-        __PRETTY_FUNCTION__,
-        [self class],
-        NSStringFromSelector(@selector(initWithCallerId:callerDisplayName:date:status:displayString:)));
-    return [self initWithCallerId:nil callerDisplayName:nil date:nil status:0 displayString:nil];
+    TSThread *thread = callRecord.thread;
+    TSContactThread *contactThread;
+    if ([thread isKindOfClass:[TSContactThread class]]) {
+        contactThread = (TSContactThread *)thread;
+    } else {
+        DDLogError(@"%@ Unexpected thread type: %@", self.tag, thread);
+    }
+
+
+    CallStatus status = 0;
+    switch (callRecord.callType) {
+        case RPRecentCallTypeOutgoing:
+            status = kCallOutgoing;
+            break;
+        case RPRecentCallTypeMissed:
+            status = kCallMissed;
+            break;
+        case RPRecentCallTypeIncoming:
+            status = kCallIncoming;
+            break;
+        default:
+            status = kCallIncoming;
+            break;
+    }
+
+    NSString *name = contactThread.name;
+    NSString *detailString;
+    switch (status) {
+        case kCallMissed:
+            detailString = [NSString stringWithFormat:NSLocalizedString(@"MSGVIEW_MISSED_CALL", nil), name];
+            break;
+        case kCallIncoming:
+            detailString = [NSString stringWithFormat:NSLocalizedString(@"MSGVIEW_RECEIVED_CALL", nil), name];
+            break;
+        case kCallOutgoing:
+            detailString = [NSString stringWithFormat:NSLocalizedString(@"MSGVIEW_YOU_CALLED", nil), name];
+            break;
+        default:
+            detailString = @"";
+            break;
+    }
+
+    self = [self initWithCallerId:contactThread.contactIdentifier
+                callerDisplayName:name
+                             date:callRecord.date
+                           status:status
+                    displayString:detailString];
+
+    if (!self) {
+        return self;
+    }
+
+    _interaction = callRecord;
+
+    return self;
 }
 
 - (instancetype)initWithCallerId:(NSString *)senderId
                callerDisplayName:(NSString *)senderDisplayName
-                            date:(NSDate *)date
+                            date:(nullable NSDate *)date
                           status:(CallStatus)status
                    displayString:(NSString *)detailString
 {
@@ -105,11 +160,18 @@ - (NSString *)description
 
 - (BOOL)canPerformEditingAction:(SEL)action
 {
-    return NO;
+    return action == @selector(delete:);
 }
 
 - (void)performEditingAction:(SEL)action
 {
+    // Deletes are always handled by TSMessageAdapter
+    if (action == @selector(delete:)) {
+        DDLogDebug(@"%@ Deleting interaction with uniqueId: %@", self.tag, self.interaction.uniqueId);
+        [self.interaction remove];
+        return;
+    }
+
     // Shouldn't get here, as only supported actions should be exposed via canPerformEditingAction
     NSString *actionString = NSStringFromSelector(action);
     DDLogError(@"%@ '%@' action unsupported", self.tag, actionString);
@@ -124,7 +186,7 @@ - (BOOL)isMediaMessage
 
 #pragma mark - NSCoding
 
-- (instancetype)initWithCoder:(NSCoder *)aDecoder
+- (nullable instancetype)initWithCoder:(NSCoder *)aDecoder
 {
     NSString *senderId = [aDecoder decodeObjectForKey:NSStringFromSelector(@selector(senderId))];
     NSString *senderDisplayName = [aDecoder decodeObjectForKey:NSStringFromSelector(@selector(senderDisplayName))];
@@ -149,7 +211,7 @@ - (void)encodeWithCoder:(NSCoder *)aCoder
 
 #pragma mark - NSCopying
 
-- (instancetype)copyWithZone:(NSZone *)zone
+- (instancetype)copyWithZone:(nullable NSZone *)zone
 {
     return [[[self class] allocWithZone:zone] initWithCallerId:self.senderId
                                              callerDisplayName:self.senderDisplayName
@@ -181,3 +243,5 @@ - (NSString *)tag
 }
 
 @end
+
+NS_ASSUME_NONNULL_END

Signal/src/Models/OWSMessagesBubblesSizeCalculator.m

@@ -1,6 +1,7 @@
 //  Copyright (c) 2016 Open Whisper Systems. All rights reserved.
 
 #import "OWSMessagesBubblesSizeCalculator.h"
+#import "OWSCall.h"
 #import "OWSDisplayedMessageCollectionViewCell.h"
 #import "TSMessageAdapter.h"
 #import "UIFont+OWS.h"
@@ -49,6 +50,10 @@ - (CGSize)messageBubbleSizeForMessageData:(id<JSQMessageData>)messageData
         }
     }
 
+    if ([messageData isKindOfClass:[OWSCall class]]) {
+        return [self messageBubbleSizeForCallData:messageData atIndexPath:indexPath withLayout:layout];
+    }
+
     CGSize size;
     // BEGIN HACK iOS10EmojiBug see: https://github.com/WhisperSystems/Signal-iOS/issues/1368
     BOOL isIOS10OrGreater =
@@ -243,6 +248,39 @@ - (CGSize)messageBubbleSizeForInfoMessageData:(id<JSQMessageData>)messageData
     return finalSize;
 }
 
+- (CGSize)messageBubbleSizeForCallData:(id<JSQMessageData>)messageData
+                           atIndexPath:(NSIndexPath *)indexPath
+                            withLayout:(JSQMessagesCollectionViewFlowLayout *)layout
+{
+    NSValue *cachedSize = [self.cache objectForKey:@([messageData messageHash])];
+    if (cachedSize != nil) {
+        return [cachedSize CGSizeValue];
+    }
+
+    CGFloat horizontalInsetsTotal = 0.0;
+    CGFloat maximumTextWidth = [self textBubbleWidthForLayout:layout] - horizontalInsetsTotal;
+
+    CGRect stringRect = [[messageData text]
+        boundingRectWithSize:CGSizeMake(maximumTextWidth, CGFLOAT_MAX)
+                     options:(NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading)
+                  attributes:@{
+                      NSFontAttributeName : [UIFont ows_dynamicTypeBodyFont]
+                  } // Hack to use a slightly larger than actual font, because I'm seeing messages with higher line
+                    // count get clipped.
+                     context:nil];
+
+    CGSize stringSize = CGRectIntegral(stringRect).size;
+
+    CGFloat verticalInsets = 0;
+    CGFloat finalWidth = maximumTextWidth + horizontalInsetsTotal;
+
+    CGSize finalSize = CGSizeMake(finalWidth, stringSize.height + verticalInsets);
+
+    [self.cache setObject:[NSValue valueWithCGSize:finalSize] forKey:@([messageData messageHash])];
+
+    return finalSize;
+}
+
 @end
 
 NS_ASSUME_NONNULL_END

Signal/src/Models/TSMessageAdapaters/OWSMessageData.h

@@ -19,6 +19,7 @@ typedef NS_ENUM(NSInteger, TSMessageAdapterType) {
 @protocol OWSMessageData <JSQMessageData, OWSMessageEditing>
 
 @property (nonatomic, readonly) TSMessageAdapterType messageType;
+@property (nonatomic, readonly) TSInteraction *interaction;
 @property (nonatomic, readonly) BOOL isExpiringMessage;
 @property (nonatomic, readonly) BOOL shouldStartExpireTimer;
 @property (nonatomic, readonly) uint64_t expiresAtSeconds;

Signal/src/Models/TSMessageAdapaters/OWSMessageEditing.h

@@ -1,6 +1,8 @@
 //  Copyright © 2016 Open Whisper Systems. All rights reserved.
 //  Created by Michael Kirk on 3/11/16.
 
+@class TSInteraction;
+
 NS_ASSUME_NONNULL_BEGIN
 
 @protocol OWSMessageEditing <NSObject>

Signal/src/Models/TSMessageAdapaters/TSMessageAdapter.h

@@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (id<OWSMessageData>)messageViewDataWithInteraction:(TSInteraction *)interaction inThread:(TSThread *)thread;
 
-@property TSInteraction *interaction;
+@property (nonatomic) TSInteraction *interaction;
 
 @end
 

Signal/src/Models/TSMessageAdapaters/TSMessageAdapter.m

@@ -169,10 +169,8 @@ - (instancetype)initWithInteraction:(TSInteraction *)interaction
             }
         }
     } else if ([interaction isKindOfClass:[TSCall class]]) {
-        adapter.messageBody = @"Placeholder for TSCalls";
-        adapter.messageType = TSCallAdapter;
-        OWSCall *call       = [self owsCallForTSCall:(TSCall *)interaction thread:(TSContactThread *)thread];
-        return call;
+        TSCall *callRecord = (TSCall *)interaction;
+        return [[OWSCall alloc] initWithCallRecord:callRecord];
     } else if ([interaction isKindOfClass:[TSInfoMessage class]]) {
         TSInfoMessage *infoMessage = (TSInfoMessage *)interaction;
         adapter.infoMessageType    = infoMessage.messageType;
@@ -209,48 +207,6 @@ - (instancetype)initWithInteraction:(TSInteraction *)interaction
     return adapter;
 }
 
-+ (OWSCall *)owsCallForTSCall:(TSCall *)call thread:(TSContactThread *)thread {
-    CallStatus status      = 0;
-    NSString *name         = thread.name;
-    NSString *detailString = @"";
-
-    switch (call.callType) {
-        case RPRecentCallTypeOutgoing:
-            status = kCallOutgoing;
-            break;
-        case RPRecentCallTypeMissed:
-            status = kCallMissed;
-            break;
-        case RPRecentCallTypeIncoming:
-            status = kCallIncoming;
-            break;
-        default:
-            status = kCallIncoming;
-            break;
-    }
-
-    switch (status) {
-        case kCallMissed:
-            detailString = [NSString stringWithFormat:NSLocalizedString(@"MSGVIEW_MISSED_CALL", nil), name];
-            break;
-        case kCallIncoming:
-            detailString = [NSString stringWithFormat:NSLocalizedString(@"MSGVIEW_RECEIVED_CALL", nil), name];
-            break;
-        case kCallOutgoing:
-            detailString = [NSString stringWithFormat:NSLocalizedString(@"MSGVIEW_YOU_CALLED", nil), name];
-            break;
-        default:
-            break;
-    }
-
-    OWSCall *owsCall = [[OWSCall alloc] initWithCallerId:thread.contactIdentifier
-                                       callerDisplayName:thread.name
-                                                    date:call.date
-                                                  status:status
-                                           displayString:detailString];
-    return owsCall;
-}
-
 - (NSString *)senderId {
     if (_senderId) {
         return _senderId;

Signal/src/view controllers/MessagesViewController.m

@@ -829,12 +829,18 @@ - (OWSCallCollectionViewCell *)loadCallCellForCall:(OWSCall *)call atIndexPath:(
         [attributedText setAttributes:@{ NSFontAttributeName: regularFont }
                                 range:range];
     }
-    callCell.cellLabel.attributedText = attributedText;
-    callCell.cellLabel.numberOfLines = 0; // uses as many lines as it needs
-    callCell.cellLabel.textColor = [UIColor ows_materialBlueColor];
+    callCell.textView.text = nil;
+    callCell.textView.attributedText = attributedText;
 
+    callCell.textView.textAlignment = NSTextAlignmentCenter;
+    callCell.textView.textColor = [UIColor ows_materialBlueColor];
     callCell.layer.shouldRasterize = YES;
     callCell.layer.rasterizationScale = [UIScreen mainScreen].scale;
+
+    // Disable text selectability. Specifying this in prepareForReuse/awakeFromNib was not sufficient.
+    callCell.textView.userInteractionEnabled = NO;
+    callCell.textView.selectable = NO;
+
     return callCell;
 }
 
@@ -865,6 +871,7 @@ - (OWSDisplayedMessageCollectionViewCell *)loadInfoMessageCellForMessage:(OWSInf
     // Disable text selectability. Specifying this in prepareForReuse/awakeFromNib was not sufficient.
     infoCell.textView.userInteractionEnabled = NO;
     infoCell.textView.selectable = NO;
+
     infoCell.messageBubbleContainerView.layer.borderColor = [[UIColor ows_infoMessageBorderColor] CGColor];
     infoCell.headerImageView.image = [UIImage imageNamed:@"warning_white"];
 
@@ -876,9 +883,11 @@ - (OWSDisplayedMessageCollectionViewCell *)loadErrorMessageCellForMessage:(OWSEr
 {
     OWSDisplayedMessageCollectionViewCell *errorCell = [self loadDisplayedMessageCollectionViewCellForIndexPath:indexPath];
     errorCell.textView.text = [errorMessage text];
+
     // Disable text selectability. Specifying this in prepareForReuse/awakeFromNib was not sufficient.
     errorCell.textView.userInteractionEnabled = NO;
     errorCell.textView.selectable = NO;
+
     errorCell.messageBubbleContainerView.layer.borderColor = [[UIColor ows_errorMessageBorderColor] CGColor];
     errorCell.headerImageView.image = [UIImage imageNamed:@"error_white"];