|
|
|
@ -685,7 +685,7 @@ typedef enum : NSUInteger {
|
|
|
|
[result addObject:recipientId];
|
|
|
|
[result addObject:recipientId];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
return [result copy];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
- (void)ensureBannerState
|
|
|
|
- (void)ensureBannerState
|
|
|
|
@ -838,7 +838,7 @@ typedef enum : NSUInteger {
|
|
|
|
preferredStyle:UIAlertControllerStyleActionSheet];
|
|
|
|
preferredStyle:UIAlertControllerStyleActionSheet];
|
|
|
|
|
|
|
|
|
|
|
|
__weak MessagesViewController *weakSelf = self;
|
|
|
|
__weak MessagesViewController *weakSelf = self;
|
|
|
|
UIAlertAction *unblockAction = [UIAlertAction
|
|
|
|
UIAlertAction *verifyAction = [UIAlertAction
|
|
|
|
actionWithTitle:
|
|
|
|
actionWithTitle:
|
|
|
|
NSLocalizedString(@"VERIFY_PRIVACY",
|
|
|
|
NSLocalizedString(@"VERIFY_PRIVACY",
|
|
|
|
@"Label for button or row which allows users to verify the safety number of another user.")
|
|
|
|
@"Label for button or row which allows users to verify the safety number of another user.")
|
|
|
|
@ -846,7 +846,7 @@ typedef enum : NSUInteger {
|
|
|
|
handler:^(UIAlertAction *_Nonnull action) {
|
|
|
|
handler:^(UIAlertAction *_Nonnull action) {
|
|
|
|
[weakSelf showConversationSettingsAndShowVerification:YES];
|
|
|
|
[weakSelf showConversationSettingsAndShowVerification:YES];
|
|
|
|
}];
|
|
|
|
}];
|
|
|
|
[actionSheetController addAction:unblockAction];
|
|
|
|
[actionSheetController addAction:verifyAction];
|
|
|
|
|
|
|
|
|
|
|
|
UIAlertAction *dismissAction =
|
|
|
|
UIAlertAction *dismissAction =
|
|
|
|
[UIAlertAction actionWithTitle:NSLocalizedString(@"DISMISS_BUTTON_TEXT",
|
|
|
|
[UIAlertAction actionWithTitle:NSLocalizedString(@"DISMISS_BUTTON_TEXT",
|
|
|
|
@ -882,7 +882,7 @@ typedef enum : NSUInteger {
|
|
|
|
[OWSIdentityManager.sharedManager setVerificationState:OWSVerificationStateDefault
|
|
|
|
[OWSIdentityManager.sharedManager setVerificationState:OWSVerificationStateDefault
|
|
|
|
identityKey:identityKey
|
|
|
|
identityKey:identityKey
|
|
|
|
recipientId:recipientId
|
|
|
|
recipientId:recipientId
|
|
|
|
sendSyncMessage:YES];
|
|
|
|
isUserInitiatedChange:YES];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -1308,7 +1308,7 @@ typedef enum : NSUInteger {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Bubbles
|
|
|
|
// Bubbles
|
|
|
|
self.collectionView.collectionViewLayout.bubbleSizeCalculator = [[OWSMessagesBubblesSizeCalculator alloc] init];
|
|
|
|
self.collectionView.collectionViewLayout.bubbleSizeCalculator = [OWSMessagesBubblesSizeCalculator new];
|
|
|
|
JSQMessagesBubbleImageFactory *bubbleFactory = [[JSQMessagesBubbleImageFactory alloc] init];
|
|
|
|
JSQMessagesBubbleImageFactory *bubbleFactory = [[JSQMessagesBubbleImageFactory alloc] init];
|
|
|
|
self.incomingBubbleImageData =
|
|
|
|
self.incomingBubbleImageData =
|
|
|
|
[bubbleFactory incomingMessagesBubbleImageWithColor:[UIColor jsq_messageBubbleLightGrayColor]];
|
|
|
|
[bubbleFactory incomingMessagesBubbleImageWithColor:[UIColor jsq_messageBubbleLightGrayColor]];
|
|
|
|
@ -1341,7 +1341,7 @@ typedef enum : NSUInteger {
|
|
|
|
// return from FingerprintViewController.
|
|
|
|
// return from FingerprintViewController.
|
|
|
|
[self dismissKeyBoard];
|
|
|
|
[self dismissKeyBoard];
|
|
|
|
|
|
|
|
|
|
|
|
[FingerprintViewController showVerificationViewFromViewController:self recipientId:recipientId];
|
|
|
|
[FingerprintViewController presentFromViewController:self recipientId:recipientId];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#pragma mark - Calls
|
|
|
|
#pragma mark - Calls
|
|
|
|
|
Matthew Chen
8 years ago