keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cleanup before PR

Browse Source
pull/1/head
sdkjfhsdkjhfsdlkjhfsdf 7 years ago
parent bce18637f0
commit 92477c78b7
3 changed files with 70 additions and 206 deletions
Show Stats Download Patch File Download Diff File

25
Signal/src/AppDelegate.m
Unescape Escape View File

@ -53,7 +53,7 @@ static NSString *const kInitialViewControllerIdentifier = @"UserInitialViewContr
static NSString *const kURLSchemeSGNLKey = @"sgnl"; static NSString *const kURLSchemeSGNLKey = @"sgnl";
static NSString *const kURLHostVerifyPrefix = @"verify"; static NSString *const kURLHostVerifyPrefix = @"verify";
@interface AppDelegate () <AttachmentApprovalViewControllerDelegate> @interface AppDelegate ()
@property (nonatomic) UIWindow *screenProtectionWindow; @property (nonatomic) UIWindow *screenProtectionWindow;
@property (nonatomic) BOOL hasInitialRootViewController; @property (nonatomic) BOOL hasInitialRootViewController;
@ -805,21 +805,10 @@ static NSString *const kURLHostVerifyPrefix = @"verify";
DDLogInfo(@"Presenting initial root view controller"); DDLogInfo(@"Presenting initial root view controller");
if ([TSAccountManager isRegistered]) { if ([TSAccountManager isRegistered]) {
// DO NOT COMMIT
// SignalAttachment *_Nullable attachment = [SignalAttachment attachmentFromPasteboard];
// if (!attachment.hasError) {
// AttachmentApprovalViewController *approvalVC =
// [[AttachmentApprovalViewController alloc] initWithAttachment:attachment delegate:self];
// UINavigationController *approvalNavController =
// [[UINavigationController alloc] initWithRootViewController:approvalVC];
// approvalNavController.navigationBarHidden = YES;
// self.window.rootViewController = approvalNavController;
// } else {
HomeViewController *homeView = [HomeViewController new]; HomeViewController *homeView = [HomeViewController new];
SignalsNavigationController *navigationController = SignalsNavigationController *navigationController =
[[SignalsNavigationController alloc] initWithRootViewController:homeView]; [[SignalsNavigationController alloc] initWithRootViewController:homeView];
self.window.rootViewController = navigationController; self.window.rootViewController = navigationController;
// }
} else { } else {
RegistrationViewController *viewController = [RegistrationViewController new]; RegistrationViewController *viewController = [RegistrationViewController new];
OWSNavigationController *navigationController = OWSNavigationController *navigationController =
@ -831,16 +820,4 @@ static NSString *const kURLHostVerifyPrefix = @"verify";
[AppUpdateNag.sharedInstance showAppUpgradeNagIfNecessary]; [AppUpdateNag.sharedInstance showAppUpgradeNagIfNecessary];
} }
- (void)didApproveAttachmentWithAttachment:(SignalAttachment *_Nonnull)attachment
{
DDLogVerbose(@"%@ in %s", self.logTag, __PRETTY_FUNCTION__);
[self.window.rootViewController dismissViewControllerAnimated:YES completion:nil];
}
- (void)didCancelAttachmentWithAttachment:(SignalAttachment *_Nonnull)attachment
{
DDLogVerbose(@"%@ in %s", self.logTag, __PRETTY_FUNCTION__);
[self.window.rootViewController dismissViewControllerAnimated:YES completion:nil];
}
@end @end

235
Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
Unescape Escape View File

@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
@interface BubbleMaskingView : UIView @interface BubbleMaskingView : UIView
@property (nonatomic) BOOL isOutgoing; @property (nonatomic) BOOL isOutgoing;
@property (nonatomic) BOOL hasCaption; @property (nonatomic) BOOL hideTail;
@property (nonatomic, nullable, weak) UIView *maskedSubview; @property (nonatomic, nullable, weak) UIView *maskedSubview;
@end @end
@ -64,7 +64,7 @@ NS_ASSUME_NONNULL_BEGIN
// Since the caption has it's own tail, the media bubble looks better // Since the caption has it's own tail, the media bubble looks better
// without a tail. // without a tail.
if (self.hasCaption) { if (self.hideTail) {
self.layoutMargins = UIEdgeInsetsMake(0, 0, 2, 8); self.layoutMargins = UIEdgeInsetsMake(0, 0, 2, 8);
maskedSubview.clipsToBounds = YES; maskedSubview.clipsToBounds = YES;
maskedSubview.layer.cornerRadius = 10; maskedSubview.layer.cornerRadius = 10;
@ -149,15 +149,13 @@ NS_ASSUME_NONNULL_BEGIN
// The nullable properties are created as needed. // The nullable properties are created as needed.
// The non-nullable properties are so frequently used that it's easier // The non-nullable properties are so frequently used that it's easier
// to always keep one around. // to always keep one around.
//@property (nonatomic) BubbleMaskingView *payloadView; @property (nonatomic) UIView *payloadView;
@property (nonatomic) UIView *myPayloadView;
@property (nonatomic) BubbleMaskingView *mediaMaskingView; @property (nonatomic) BubbleMaskingView *mediaMaskingView;
//@property (nonatomic) BubbleMaskingView *textMaskingView;
@property (nonatomic) UILabel *dateHeaderLabel; @property (nonatomic) UILabel *dateHeaderLabel;
@property (nonatomic) OWSMessageTextView *textView; @property (nonatomic) OWSMessageTextView *textView;
@property (nonatomic, nullable) UIImageView *failedSendBadgeView; @property (nonatomic, nullable) UIImageView *failedSendBadgeView;
@property (nonatomic, nullable) UILabel *tapForMoreLabel; @property (nonatomic, nullable) UILabel *tapForMoreLabel;
@property (nonatomic, nullable) UIImageView *myBubbleImageView; @property (nonatomic, nullable) UIImageView *textBubbleImageView;
@property (nonatomic, nullable) AttachmentUploadView *attachmentUploadView; @property (nonatomic, nullable) AttachmentUploadView *attachmentUploadView;
@property (nonatomic, nullable) UIImageView *stillImageView; @property (nonatomic, nullable) UIImageView *stillImageView;
@property (nonatomic, nullable) YYAnimatedImageView *animatedImageView; @property (nonatomic, nullable) YYAnimatedImageView *animatedImageView;
@ -173,8 +171,6 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, nullable) NSMutableArray<NSLayoutConstraint *> *contentConstraints; @property (nonatomic, nullable) NSMutableArray<NSLayoutConstraint *> *contentConstraints;
@property (nonatomic, nullable) NSArray<NSLayoutConstraint *> *footerConstraints; @property (nonatomic, nullable) NSArray<NSLayoutConstraint *> *footerConstraints;
@property (nonatomic) BOOL isPresentingMenuController; @property (nonatomic) BOOL isPresentingMenuController;
//@property (nonatomic) NSLayoutConstraint *textViewWidthConstraint;
//@property (nonatomic) NSLayoutConstraint *textViewHeightConstraint;
@end @end
@ -199,21 +195,13 @@ NS_ASSUME_NONNULL_BEGIN
self.layoutMargins = UIEdgeInsetsZero; self.layoutMargins = UIEdgeInsetsZero;
self.contentView.layoutMargins = UIEdgeInsetsZero; self.contentView.layoutMargins = UIEdgeInsetsZero;
// self.payloadView = [BubbleMaskingView new]; self.payloadView = [UIView new];
// self.payloadView.layoutMargins = UIEdgeInsetsZero; self.payloadView.layoutMargins = UIEdgeInsetsZero;
// [self.contentView addSubview:self.payloadView]; [self.contentView addSubview:self.payloadView];
self.myPayloadView = [UIView new];
self.myPayloadView.layoutMargins = UIEdgeInsetsZero;
[self.contentView addSubview:self.myPayloadView];
self.mediaMaskingView = [BubbleMaskingView new]; self.mediaMaskingView = [BubbleMaskingView new];
self.mediaMaskingView.layoutMargins = UIEdgeInsetsZero; self.mediaMaskingView.layoutMargins = UIEdgeInsetsZero;
[self.myPayloadView addSubview:self.mediaMaskingView]; [self.payloadView addSubview:self.mediaMaskingView];
// self.textMaskingView = [BubbleMaskingView new];
// self.textMaskingView.layoutMargins = UIEdgeInsetsZero;
// [self.myPayloadView addSubview:self.textMaskingView];
self.footerView = [UIView containerView]; self.footerView = [UIView containerView];
[self.contentView addSubview:self.footerView]; [self.contentView addSubview:self.footerView];
@ -224,14 +212,12 @@ NS_ASSUME_NONNULL_BEGIN
self.dateHeaderLabel.textColor = [UIColor lightGrayColor]; self.dateHeaderLabel.textColor = [UIColor lightGrayColor];
[self.contentView addSubview:self.dateHeaderLabel]; [self.contentView addSubview:self.dateHeaderLabel];
self.myBubbleImageView = [UIImageView new]; self.textBubbleImageView = [UIImageView new];
self.myBubbleImageView.layoutMargins = UIEdgeInsetsZero; self.textBubbleImageView.layoutMargins = UIEdgeInsetsZero;
// Enable userInteractionEnabled so that links in textView work. // Enable userInteractionEnabled so that links in textView work.
self.myBubbleImageView.userInteractionEnabled = YES; self.textBubbleImageView.userInteractionEnabled = YES;
// [self.textMaskingView addSubview:self.bubbleImageView];
[self.myPayloadView addSubview:self.myBubbleImageView]; [self.payloadView addSubview:self.textBubbleImageView];
// [self.myBubbleImageView autoPinEdgeToSuperviewEdge:ALEdgeTop];
// [self.myBubbleImageView autoPinEdgeToSuperviewEdge:ALEdgeBottom];
self.textView = [OWSMessageTextView new]; self.textView = [OWSMessageTextView new];
self.textView.backgroundColor = [UIColor clearColor]; self.textView.backgroundColor = [UIColor clearColor];
@ -241,10 +227,8 @@ NS_ASSUME_NONNULL_BEGIN
self.textView.textContainerInset = UIEdgeInsetsZero; self.textView.textContainerInset = UIEdgeInsetsZero;
self.textView.contentInset = UIEdgeInsetsZero; self.textView.contentInset = UIEdgeInsetsZero;
self.textView.scrollEnabled = NO; self.textView.scrollEnabled = NO;
// self.textViewWidthConstraint = [self.textView autoSetDimension:ALDimensionWidth toSize:0];
// self.textViewHeightConstraint = [self.textView autoSetDimension:ALDimensionHeight toSize:0];
[self.myBubbleImageView addSubview:self.textView]; [self.textBubbleImageView addSubview:self.textView];
OWSAssert(self.textView.superview); OWSAssert(self.textView.superview);
@ -254,26 +238,20 @@ NS_ASSUME_NONNULL_BEGIN
[self.footerView addSubview:self.footerLabel]; [self.footerView addSubview:self.footerLabel];
// Hide these views by default. // Hide these views by default.
self.myBubbleImageView.hidden = YES; self.textBubbleImageView.hidden = YES;
self.textView.hidden = YES; self.textView.hidden = YES;
self.dateHeaderLabel.hidden = YES; self.dateHeaderLabel.hidden = YES;
self.footerLabel.hidden = YES; self.footerLabel.hidden = YES;
[self.myPayloadView autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:self.dateHeaderLabel]; [self.payloadView autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:self.dateHeaderLabel];
[self.footerView autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:self.myPayloadView]; [self.footerView autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:self.payloadView];
[self.mediaMaskingView autoPinEdgeToSuperviewEdge:ALEdgeTop]; [self.mediaMaskingView autoPinEdgeToSuperviewEdge:ALEdgeTop];
[self.mediaMaskingView autoPinEdgeToSuperviewEdge:ALEdgeLeading]; [self.mediaMaskingView autoPinEdgeToSuperviewEdge:ALEdgeLeading];
[self.mediaMaskingView autoPinEdgeToSuperviewEdge:ALEdgeTrailing]; [self.mediaMaskingView autoPinEdgeToSuperviewEdge:ALEdgeTrailing];
[self.myBubbleImageView autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:self.mediaMaskingView]; [self.textBubbleImageView autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:self.mediaMaskingView];
[self.myBubbleImageView autoPinEdgeToSuperviewEdge:ALEdgeBottom]; [self.textBubbleImageView autoPinEdgeToSuperviewEdge:ALEdgeBottom];
// want sized to fit...
// [self.textMaskingView autoPinEdgeToSuperviewEdge:ALEdgeLeading];
// [self.textMaskingView autoPinEdgeToSuperviewEdge:ALEdgeTrailing];
// [self.footerView autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:self.textMaskingView];
// [self.footerView autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:self.myBubbleImageView];
[self.footerView autoPinEdgeToSuperviewEdge:ALEdgeBottom]; [self.footerView autoPinEdgeToSuperviewEdge:ALEdgeBottom];
[self.footerView autoPinWidthToSuperview]; [self.footerView autoPinWidthToSuperview];
@ -412,15 +390,15 @@ NS_ASSUME_NONNULL_BEGIN
[self.contentView addSubview:self.failedSendBadgeView]; [self.contentView addSubview:self.failedSendBadgeView];
self.payloadConstraints = @[ self.payloadConstraints = @[
[self.myPayloadView autoPinLeadingToSuperview], [self.payloadView autoPinLeadingToSuperview],
[self.failedSendBadgeView autoPinLeadingToTrailingOfView:self.myPayloadView], [self.failedSendBadgeView autoPinLeadingToTrailingOfView:self.payloadView],
[self.failedSendBadgeView autoPinTrailingToSuperview], [self.failedSendBadgeView autoPinTrailingToSuperview],
[self.failedSendBadgeView autoAlignAxis:ALAxisHorizontal toSameAxisOfView:self.myPayloadView], [self.failedSendBadgeView autoAlignAxis:ALAxisHorizontal toSameAxisOfView:self.payloadView],
[self.failedSendBadgeView autoSetDimension:ALDimensionWidth toSize:self.failedSendBadgeSize], [self.failedSendBadgeView autoSetDimension:ALDimensionWidth toSize:self.failedSendBadgeSize],
[self.failedSendBadgeView autoSetDimension:ALDimensionHeight toSize:self.failedSendBadgeSize], [self.failedSendBadgeView autoSetDimension:ALDimensionHeight toSize:self.failedSendBadgeSize],
]; ];
} else { } else {
self.payloadConstraints = [self.myPayloadView autoPinWidthToSuperview]; self.payloadConstraints = [self.payloadView autoPinWidthToSuperview];
} }
JSQMessagesBubbleImage *_Nullable bubbleImageData; JSQMessagesBubbleImage *_Nullable bubbleImageData;
@ -429,7 +407,7 @@ NS_ASSUME_NONNULL_BEGIN
bubbleImageData = [self.bubbleFactory bubbleWithMessage:message]; bubbleImageData = [self.bubbleFactory bubbleWithMessage:message];
} }
self.myBubbleImageView.image = bubbleImageData.messageBubbleImage; self.textBubbleImageView.image = bubbleImageData.messageBubbleImage;
[self updateDateHeader]; [self updateDateHeader];
[self updateFooter]; [self updateFooter];
@ -439,11 +417,11 @@ NS_ASSUME_NONNULL_BEGIN
OWSFail(@"Unknown cell type for viewItem: %@", self.viewItem); OWSFail(@"Unknown cell type for viewItem: %@", self.viewItem);
break; break;
case OWSMessageCellType_TextMessage: case OWSMessageCellType_TextMessage:
[self loadForStandaloneTextDisplay]; [self loadForTextDisplay];
break; break;
case OWSMessageCellType_OversizeTextMessage: case OWSMessageCellType_OversizeTextMessage:
OWSAssert(self.viewItem.attachmentStream); OWSAssert(self.viewItem.attachmentStream);
[self loadForStandaloneTextDisplay]; [self loadForTextDisplay];
break; break;
case OWSMessageCellType_StillImage: case OWSMessageCellType_StillImage:
OWSAssert(self.viewItem.attachmentStream); OWSAssert(self.viewItem.attachmentStream);
@ -466,7 +444,7 @@ NS_ASSUME_NONNULL_BEGIN
self.attachmentView = self.attachmentView =
[[OWSGenericAttachmentView alloc] initWithAttachment:self.attachmentStream isIncoming:self.isIncoming]; [[OWSGenericAttachmentView alloc] initWithAttachment:self.attachmentStream isIncoming:self.isIncoming];
[self.attachmentView createContents]; [self.attachmentView createContents];
[self replaceBubbleWithView:self.attachmentView]; [self setMediaView:self.attachmentView];
[self addAttachmentUploadViewIfNecessary:self.attachmentView]; [self addAttachmentUploadViewIfNecessary:self.attachmentView];
[self addCaptionIfNecessary]; [self addCaptionIfNecessary];
break; break;
@ -757,30 +735,30 @@ NS_ASSUME_NONNULL_BEGIN
return [UIFont systemFontOfSize:12.0f]; return [UIFont systemFontOfSize:12.0f];
} }
- (void)loadCaptionForAttachmentView - (void)loadForTextDisplay
{ {
[self loadForStandaloneTextDisplay]; self.textBubbleImageView.hidden = NO;
return; self.textView.hidden = NO;
// [self loadForTextDisplay]; self.textView.text = self.displayableText.displayText;
// self.textView.textColor = self.textColor;
// NSMutableArray *accumulatedConstraints = [self.contentConstraints mutableCopy];
// [accumulatedConstraints addObjectsFromArray:@[
// [self.myBubbleImageView autoPinEdgeToSuperviewEdge:(self.isIncoming ? ALEdgeLeading : ALEdgeTrailing)],
//// [self.myBubbleImageView autoPinEdgeToSuperviewEdge:(self.isIncoming ? ALEdgeTrailing :
/// ALEdgeLeading)withInset:0 /
/// relation:NSLayoutRelationGreaterThanOrEqual],
// [self.textView autoPinLeadingToSuperviewWithMargin:self.textLeadingMargin],
// [self.textView autoPinTrailingToSuperviewWithMargin:self.textTrailingMargin],
// [self.textView autoPinEdgeToSuperviewEdge:ALEdgeTop withInset:self.textVMargin],
// [self.textView autoPinEdgeToSuperviewEdge:ALEdgeBottom withInset:self.textVMargin],
// ]];
//
// self.contentConstraints = [accumulatedConstraints copy];
}
- (void)loadForStandaloneTextDisplay // Honor dynamic type in the message bodies.
{ self.textView.font = [self textMessageFont];
[self loadForTextDisplay]; self.textView.linkTextAttributes = @{
NSForegroundColorAttributeName : self.textColor,
NSUnderlineStyleAttributeName : @(NSUnderlineStyleSingle | NSUnderlinePatternSolid)
};
self.textView.dataDetectorTypes
= (UIDataDetectorTypeLink | UIDataDetectorTypeAddress | UIDataDetectorTypeCalendarEvent);
if (self.viewItem.interaction.interactionType == OWSInteractionType_OutgoingMessage) {
// Ignore taps on links in outgoing messages that haven't been sent yet, as
// this interferes with "tap to retry".
TSOutgoingMessage *outgoingMessage = (TSOutgoingMessage *)self.viewItem.interaction;
self.textView.shouldIgnoreEvents = outgoingMessage.messageState != TSOutgoingMessageStateSentToService;
} else {
self.textView.shouldIgnoreEvents = NO;
}
if (self.displayableText.isTextTruncated) { if (self.displayableText.isTextTruncated) {
self.tapForMoreLabel = [UILabel new]; self.tapForMoreLabel = [UILabel new];
@ -789,7 +767,7 @@ NS_ASSUME_NONNULL_BEGIN
self.tapForMoreLabel.font = [self tapForMoreFont]; self.tapForMoreLabel.font = [self tapForMoreFont];
self.tapForMoreLabel.textColor = [self.textColor colorWithAlphaComponent:0.85]; self.tapForMoreLabel.textColor = [self.textColor colorWithAlphaComponent:0.85];
self.tapForMoreLabel.textAlignment = [self.tapForMoreLabel textAlignmentUnnatural]; self.tapForMoreLabel.textAlignment = [self.tapForMoreLabel textAlignmentUnnatural];
[self.myBubbleImageView addSubview:self.tapForMoreLabel]; [self.textBubbleImageView addSubview:self.tapForMoreLabel];
[self.contentConstraints addObjectsFromArray:@[ [self.contentConstraints addObjectsFromArray:@[
[self.textView autoPinLeadingToSuperviewWithMargin:self.textLeadingMargin], [self.textView autoPinLeadingToSuperviewWithMargin:self.textLeadingMargin],
@ -803,72 +781,18 @@ NS_ASSUME_NONNULL_BEGIN
[self.tapForMoreLabel autoSetDimension:ALDimensionHeight toSize:self.tapForMoreHeight], [self.tapForMoreLabel autoSetDimension:ALDimensionHeight toSize:self.tapForMoreHeight],
]]; ]];
} else { } else {
// __block NSLayoutConstraint *tryToGrow;
//
// [NSLayoutConstraint autoSetPriority:UILayoutPriorityDefaultLow forConstraints:^{
// tryToGrow = [self.myBubbleImageView autoPinEdgeToSuperviewEdge:(self.isIncoming ? ALEdgeTrailing :
// ALEdgeLeading) withInset:0];
// }];
OWSAssert(self.contentWidth); OWSAssert(self.contentWidth);
CGSize textBubbleSize = [self textBubbleSizeForContentWidth:self.contentWidth]; CGSize textBubbleSize = [self textBubbleSizeForContentWidth:self.contentWidth];
[self.contentConstraints addObjectsFromArray:@[ [self.contentConstraints addObjectsFromArray:@[
[self.myBubbleImageView autoSetDimension:ALDimensionWidth toSize:textBubbleSize.width], [self.textBubbleImageView autoSetDimension:ALDimensionWidth toSize:textBubbleSize.width],
[self.myBubbleImageView autoSetDimension:ALDimensionHeight toSize:textBubbleSize.height], [self.textBubbleImageView autoSetDimension:ALDimensionHeight toSize:textBubbleSize.height],
[self.myBubbleImageView autoPinEdgeToSuperviewEdge:(self.isIncoming ? ALEdgeLeading : ALEdgeTrailing)], [self.textBubbleImageView autoPinEdgeToSuperviewEdge:(self.isIncoming ? ALEdgeLeading : ALEdgeTrailing)],
[self.textView autoPinLeadingToSuperviewWithMargin:self.textLeadingMargin], [self.textView autoPinLeadingToSuperviewWithMargin:self.textLeadingMargin],
[self.textView autoPinTrailingToSuperviewWithMargin:self.textTrailingMargin], [self.textView autoPinTrailingToSuperviewWithMargin:self.textTrailingMargin],
[self.textView autoPinEdgeToSuperviewEdge:ALEdgeTop withInset:self.textVMargin], [self.textView autoPinEdgeToSuperviewEdge:ALEdgeTop withInset:self.textVMargin],
[self.textView autoPinEdgeToSuperviewEdge:ALEdgeBottom withInset:self.textVMargin], [self.textView autoPinEdgeToSuperviewEdge:ALEdgeBottom withInset:self.textVMargin],
]]; ]];
// self.contentConstraints = @[
// [self.myBubbleImageView autoPinEdgeToSuperviewEdge:(self.isIncoming ? ALEdgeLeading :
// ALEdgeTrailing)],
//// [self.myBubbleImageView
//// autoPinEdgeToSuperviewEdge:(self.isIncoming ? ALEdgeTrailing : ALEdgeLeading)withInset:0
//// relation:NSLayoutRelationGreaterThanOrEqual],
//
// [self.textView autoPinLeadingToSuperviewWithMargin:self.textLeadingMargin],
// [self.textView autoPinTrailingToSuperviewWithMargin:self.textTrailingMargin],
// [self.textView autoPinEdgeToSuperviewEdge:ALEdgeTop withInset:self.textVMargin],
// [self.textView autoPinEdgeToSuperviewEdge:ALEdgeBottom withInset:self.textVMargin],
// ];
}
}
- (void)loadForTextDisplay
{
self.myBubbleImageView.hidden = NO;
self.textView.hidden = NO;
self.textView.text = self.displayableText.displayText;
self.textView.textColor = self.textColor;
// [self.textView setCompressionResistanceHigh];
// [self.textView setContentCompressionResistancePriority:UILayoutPriorityRequired
// forAxis:UILayoutConstraintAxisHorizontal]; [self.textView
// setContentCompressionResistancePriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisVertical];
// [self.textView setContentHuggingPriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisHorizontal];
// [self.textView setContentHuggingPriority:UILayoutPriorityDefaultHigh forAxis:UILayoutConstraintAxisVertical];
// Honor dynamic type in the message bodies.
self.textView.font = [self textMessageFont];
self.textView.linkTextAttributes = @{
NSForegroundColorAttributeName : self.textColor,
NSUnderlineStyleAttributeName : @(NSUnderlineStyleSingle | NSUnderlinePatternSolid)
};
self.textView.dataDetectorTypes
= (UIDataDetectorTypeLink | UIDataDetectorTypeAddress | UIDataDetectorTypeCalendarEvent);
if (self.viewItem.interaction.interactionType == OWSInteractionType_OutgoingMessage) {
// Ignore taps on links in outgoing messages that haven't been sent yet, as
// this interferes with "tap to retry".
TSOutgoingMessage *outgoingMessage = (TSOutgoingMessage *)self.viewItem.interaction;
self.textView.shouldIgnoreEvents = outgoingMessage.messageState != TSOutgoingMessageStateSentToService;
} else {
self.textView.shouldIgnoreEvents = NO;
} }
} }
@ -885,7 +809,7 @@ NS_ASSUME_NONNULL_BEGIN
// some performance cost. // some performance cost.
self.stillImageView.layer.minificationFilter = kCAFilterTrilinear; self.stillImageView.layer.minificationFilter = kCAFilterTrilinear;
self.stillImageView.layer.magnificationFilter = kCAFilterTrilinear; self.stillImageView.layer.magnificationFilter = kCAFilterTrilinear;
[self replaceBubbleWithView:self.stillImageView]; [self setMediaView:self.stillImageView];
[self addAttachmentUploadViewIfNecessary:self.stillImageView]; [self addAttachmentUploadViewIfNecessary:self.stillImageView];
[self addCaptionIfNecessary]; [self addCaptionIfNecessary];
} }
@ -899,7 +823,7 @@ NS_ASSUME_NONNULL_BEGIN
// We need to specify a contentMode since the size of the image // We need to specify a contentMode since the size of the image
// might not match the aspect ratio of the view. // might not match the aspect ratio of the view.
self.animatedImageView.contentMode = UIViewContentModeScaleAspectFill; self.animatedImageView.contentMode = UIViewContentModeScaleAspectFill;
[self replaceBubbleWithView:self.animatedImageView]; [self setMediaView:self.animatedImageView];
[self addAttachmentUploadViewIfNecessary:self.animatedImageView]; [self addAttachmentUploadViewIfNecessary:self.animatedImageView];
[self addCaptionIfNecessary]; [self addCaptionIfNecessary];
} }
@ -907,9 +831,9 @@ NS_ASSUME_NONNULL_BEGIN
- (void)addCaptionIfNecessary - (void)addCaptionIfNecessary
{ {
if (self.viewItem.hasText) { if (self.viewItem.hasText) {
[self loadCaptionForAttachmentView]; [self loadForTextDisplay];
} else { } else {
[self.contentConstraints addObject:[self.myBubbleImageView autoSetDimension:ALDimensionHeight toSize:0]]; [self.contentConstraints addObject:[self.textBubbleImageView autoSetDimension:ALDimensionHeight toSize:0]];
} }
} }
@ -923,7 +847,7 @@ NS_ASSUME_NONNULL_BEGIN
viewItem:self.viewItem]; viewItem:self.viewItem];
self.viewItem.lastAudioMessageView = self.audioMessageView; self.viewItem.lastAudioMessageView = self.audioMessageView;
[self.audioMessageView createContents]; [self.audioMessageView createContents];
[self replaceBubbleWithView:self.audioMessageView]; [self setMediaView:self.audioMessageView];
[self addAttachmentUploadViewIfNecessary:self.audioMessageView]; [self addAttachmentUploadViewIfNecessary:self.audioMessageView];
[self addCaptionIfNecessary]; [self addCaptionIfNecessary];
} }
@ -941,7 +865,7 @@ NS_ASSUME_NONNULL_BEGIN
// some performance cost. // some performance cost.
self.stillImageView.layer.minificationFilter = kCAFilterTrilinear; self.stillImageView.layer.minificationFilter = kCAFilterTrilinear;
self.stillImageView.layer.magnificationFilter = kCAFilterTrilinear; self.stillImageView.layer.magnificationFilter = kCAFilterTrilinear;
[self replaceBubbleWithView:self.stillImageView]; [self setMediaView:self.stillImageView];
UIImage *videoPlayIcon = [UIImage imageNamed:@"play_button"]; UIImage *videoPlayIcon = [UIImage imageNamed:@"play_button"];
UIImageView *videoPlayButton = [[UIImageView alloc] initWithImage:videoPlayIcon]; UIImageView *videoPlayButton = [[UIImageView alloc] initWithImage:videoPlayIcon];
@ -972,7 +896,7 @@ NS_ASSUME_NONNULL_BEGIN
self.customView.backgroundColor = [UIColor grayColor]; self.customView.backgroundColor = [UIColor grayColor];
break; break;
} }
[self replaceBubbleWithView:self.customView]; [self setMediaView:self.customView];
self.attachmentPointerView = self.attachmentPointerView =
[[AttachmentPointerView alloc] initWithAttachmentPointer:self.attachmentPointer isIncoming:self.isIncoming]; [[AttachmentPointerView alloc] initWithAttachmentPointer:self.attachmentPointer isIncoming:self.isIncoming];
@ -982,12 +906,11 @@ NS_ASSUME_NONNULL_BEGIN
[self addCaptionIfNecessary]; [self addCaptionIfNecessary];
} }
- (void)replaceBubbleWithView:(UIView *)view - (void)setMediaView:(UIView *)view
{ {
OWSAssert(view); OWSAssert(view);
// FIXME why disable? make sure we can interact with both media and caption view.userInteractionEnabled = NO;
// view.userInteractionEnabled = NO;
[self.mediaMaskingView addSubview:view]; [self.mediaMaskingView addSubview:view];
[self.contentConstraints addObjectsFromArray:[view autoPinEdgesToSuperviewMargins]]; [self.contentConstraints addObjectsFromArray:[view autoPinEdgesToSuperviewMargins]];
[self cropMediaViewToBubbbleShape:view]; [self cropMediaViewToBubbbleShape:view];
@ -1025,7 +948,8 @@ NS_ASSUME_NONNULL_BEGIN
OWSAssert(view.superview == self.mediaMaskingView); OWSAssert(view.superview == self.mediaMaskingView);
self.mediaMaskingView.isOutgoing = self.isOutgoing; self.mediaMaskingView.isOutgoing = self.isOutgoing;
self.mediaMaskingView.hasCaption = self.viewItem.hasText; // Hide tail on attachments followed by a caption
self.mediaMaskingView.hideTail = self.viewItem.hasText;
self.mediaMaskingView.maskedSubview = view; self.mediaMaskingView.maskedSubview = view;
[self.mediaMaskingView updateMask]; [self.mediaMaskingView updateMask];
} }
@ -1038,7 +962,7 @@ NS_ASSUME_NONNULL_BEGIN
self.customView = [UIView new]; self.customView = [UIView new];
self.customView.backgroundColor = [UIColor colorWithWhite:0.85f alpha:1.f]; self.customView.backgroundColor = [UIColor colorWithWhite:0.85f alpha:1.f];
self.customView.userInteractionEnabled = NO; self.customView.userInteractionEnabled = NO;
[self.myPayloadView addSubview:self.customView]; [self.payloadView addSubview:self.customView];
[self.contentConstraints addObjectsFromArray:[self.customView autoPinToSuperviewEdges]]; [self.contentConstraints addObjectsFromArray:[self.customView autoPinToSuperviewEdges]];
[self cropMediaViewToBubbbleShape:self.customView]; [self cropMediaViewToBubbbleShape:self.customView];
} }
@ -1061,9 +985,6 @@ NS_ASSUME_NONNULL_BEGIN
CGSize textViewSize = CGSizeMake((CGFloat)ceil(textSize.width + leftMargin + rightMargin), CGSize textViewSize = CGSizeMake((CGFloat)ceil(textSize.width + leftMargin + rightMargin),
(CGFloat)ceil(textSize.height + textVMargin * 2 + tapForMoreHeight)); (CGFloat)ceil(textSize.height + textVMargin * 2 + tapForMoreHeight));
// self.textViewWidthConstraint.constant = textViewSize.width;
// self.textViewHeightConstraint.constant = textViewSize.height;
//
return textViewSize; return textViewSize;
} }
@ -1082,24 +1003,10 @@ NS_ASSUME_NONNULL_BEGIN
CGSize textContentSize = CGSizeZero; CGSize textContentSize = CGSizeZero;
if (self.viewItem.hasText) { if (self.viewItem.hasText) {
// BOOL isRTL = self.isRTL;
// CGFloat leftMargin = isRTL ? self.textTrailingMargin : self.textLeadingMargin;
// CGFloat rightMargin = isRTL ? self.textLeadingMargin : self.textTrailingMargin;
// CGFloat textVMargin = self.textVMargin;
// const int maxTextWidth = (int)floor(maxMessageWidth - (leftMargin + rightMargin));
//
// self.textView.text = self.displayableText.displayText;
// // Honor dynamic type in the message bodies.
// self.textView.font = [self textMessageFont];
// CGSize textSize = [self.textView sizeThatFits:CGSizeMake(maxTextWidth, CGFLOAT_MAX)];
// CGFloat tapForMoreHeight = (self.displayableText.isTextTruncated ? [self tapForMoreHeight] : 0.f);
// textContentSize = CGSizeMake((CGFloat)ceil(textSize.width + leftMargin + rightMargin),
// (CGFloat)ceil(textSize.height + textVMargin * 2 + tapForMoreHeight));
textContentSize = [self textBubbleSizeForContentWidth:contentWidth]; textContentSize = [self textBubbleSizeForContentWidth:contentWidth];
} }
switch (self.cellType) { switch (self.cellType) {
case OWSMessageCellType_Unknown:
case OWSMessageCellType_TextMessage: case OWSMessageCellType_TextMessage:
case OWSMessageCellType_OversizeTextMessage: { case OWSMessageCellType_OversizeTextMessage: {
break; break;
@ -1240,20 +1147,16 @@ NS_ASSUME_NONNULL_BEGIN
self.textView.text = nil; self.textView.text = nil;
self.textView.hidden = YES; self.textView.hidden = YES;
self.textView.dataDetectorTypes = UIDataDetectorTypeNone; self.textView.dataDetectorTypes = UIDataDetectorTypeNone;
// self.textViewWidthConstraint.constant = 0;
// self.textViewHeightConstraint.constant = 0;
[self.failedSendBadgeView removeFromSuperview]; [self.failedSendBadgeView removeFromSuperview];
self.failedSendBadgeView = nil; self.failedSendBadgeView = nil;
[self.tapForMoreLabel removeFromSuperview]; [self.tapForMoreLabel removeFromSuperview];
self.tapForMoreLabel = nil; self.tapForMoreLabel = nil;
self.footerLabel.text = nil; self.footerLabel.text = nil;
self.footerLabel.hidden = YES; self.footerLabel.hidden = YES;
self.myBubbleImageView.image = nil; self.textBubbleImageView.image = nil;
self.myBubbleImageView.hidden = YES; self.textBubbleImageView.hidden = YES;
// self.payloadView.maskedSubview = nil;
self.mediaMaskingView.maskedSubview = nil; self.mediaMaskingView.maskedSubview = nil;
self.mediaMaskingView.hasCaption = NO; self.mediaMaskingView.hideTail = NO;
// self.textMaskingView.maskedSubview = nil;
self.mediaMaskingView.layoutMargins = UIEdgeInsetsZero; self.mediaMaskingView.layoutMargins = UIEdgeInsetsZero;
[self.stillImageView removeFromSuperview]; [self.stillImageView removeFromSuperview];

16
SignalServiceKit/src/Messages/OWSMessageManager.m
Unescape Escape View File

@ -1054,22 +1054,6 @@ NS_ASSUME_NONNULL_BEGIN
DDLogDebug(@"%@ shouldMarkMessageAsRead: %d (%@)", self.logTag, shouldMarkMessageAsRead, envelope.source); DDLogDebug(@"%@ shouldMarkMessageAsRead: %d (%@)", self.logTag, shouldMarkMessageAsRead, envelope.source);
// // Other clients allow attachments to be sent along with body, we want the text displayed as a separate
// // message
// if ([attachmentIds count] > 0 && body != nil && body.length > 0) {
// // We want the text to be displayed under the attachment.
// uint64_t textMessageTimestamp = timestamp + 1;
// TSIncomingMessage *textMessage = [[TSIncomingMessage alloc] initWithTimestamp:textMessageTimestamp
// inThread:thread
// authorId:envelope.source
// sourceDeviceId:envelope.sourceDevice
// messageBody:body
// attachmentIds:@[]
// expiresInSeconds:dataMessage.expireTimer];
// DDLogDebug(@"%@ incoming extra text message: %@", self.logTag, incomingMessage.debugDescription);
// [textMessage saveWithTransaction:transaction];
// }
// In case we already have a read receipt for this new message (this happens sometimes). // In case we already have a read receipt for this new message (this happens sometimes).
[OWSReadReceiptManager.sharedManager applyEarlyReadReceiptsForIncomingMessage:incomingMessage [OWSReadReceiptManager.sharedManager applyEarlyReadReceiptsForIncomingMessage:incomingMessage
transaction:transaction]; transaction:transaction];

Write Preview
Loading…
Cancel
Save