Remove unused call thumbnail code

// FREEBIE
pull/1/head
Michael Kirk 9 years ago
parent e930574b1b
commit f7f1b6877b

@ -14,7 +14,6 @@ typedef enum : NSUInteger {
kGroupUpdate = 6
} CallStatus;
@interface OWSCall : NSObject <JSQMessageData, NSCoding, NSCopying>
/*
@ -22,7 +21,6 @@ typedef enum : NSUInteger {
*/
@property (copy, nonatomic, readonly) NSString *senderId;
/*
* Returns the display name for user who initiated the call
*/
@ -44,18 +42,11 @@ typedef enum : NSUInteger {
*/
@property (nonatomic) TSMessageAdapterType messageType;
/*
* User can configure whether a thumbnail is used in the display of this cell or not
*/
@property (nonatomic) BOOL useThumbnail;
/**
* String to be displayed
*/
@property (nonatomic, copy) NSString *detailString;
#pragma mark - Initialization
- (instancetype)initWithCallerId:(NSString *)callerId
@ -66,6 +57,4 @@ typedef enum : NSUInteger {
- (NSString *)dateText;
- (UIImage *)thumbnailImage;
@end

@ -2,7 +2,6 @@
// Portions Copyright (c) 2016 Open Whisper Systems. All rights reserved.
#import "OWSCall.h"
#import <JSQMessagesViewController/JSQMessagesTimestampFormatter.h>
#import <JSQMessagesViewController/UIImage+JSQMessages.h>
@ -57,35 +56,6 @@
return [dateFormatter stringFromDate:_date];
}
- (UIImage *)thumbnailImage
{
// This relies on those assets being in the project
if (!_useThumbnail) {
return nil;
}
switch (_status) {
case kCallOutgoing:
return [UIImage imageNamed:@"statCallOutgoing--blue"];
break;
case kCallIncoming:
case kCallMissed:
return [UIImage imageNamed:@"statCallIncoming--blue"];
break;
case kGroupUpdate:
return [UIImage imageNamed:@"statRefreshedGroup--blue"];
break;
case kGroupUpdateLeft:
return [UIImage imageNamed:@"statLeftGroup--blue"];
break;
case kGroupUpdateJoin:
return [UIImage imageNamed:@"statJoinedGroup--blue"];
break;
default:
return nil;
break;
}
}
#pragma mark - NSObject
- (BOOL)isEqual:(id)object

@ -138,7 +138,6 @@
adapter.messageBody = @"Placeholder for TSCalls";
adapter.messageType = TSCallAdapter;
OWSCall *call = [self owsCallForTSCall:(TSCall *)interaction thread:(TSContactThread *)thread];
call.useThumbnail = NO; // disables use of iconography to represent group update actions
return call;
} else if ([interaction isKindOfClass:[TSInfoMessage class]]) {
TSInfoMessage *infoMessage = (TSInfoMessage *)interaction;
@ -160,7 +159,6 @@
date:nil
status:status
displayString:@""];
call.useThumbnail = NO; // disables use of iconography to represent group update actions
return call;
}
} else {

@ -840,18 +840,6 @@ typedef enum : NSUInteger {
const NSRange range = NSMakeRange([text length],[[call dateText] length]);
[attributedText setAttributes:subAttrs range:range];
BOOL isOutgoing = [self.senderId isEqualToString:call.senderId];
if (isOutgoing)
{
callCell.outgoingCallImageView.image = [call thumbnailImage];
} else {
callCell.incomingCallImageView.image = [call thumbnailImage];
}
} else {
// TODO wrt comment, does it make sense to receive a group meta message in a *call* or was this copy/paste misfire?
// A group meta message
callCell.incomingCallImageView.image = [call thumbnailImage];
}
callCell.cellLabel.attributedText = attributedText;
callCell.cellLabel.numberOfLines = 0; // uses as many lines as it needs

Loading…
Cancel
Save