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

interstitial SN confirmation for attachments/voicenotes 

// FREEBIE
This commit is contained in:
Michael Kirk 2017-05-26 16:56:24 -07:00
parent 47783a9df0
commit 2d7f03a1c8
1 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Signal/src/ViewControllers/MessagesViewController.m
View File

@ -1702,7 +1702,6 @@ typedef enum : NSUInteger {
return;
}
[self.outboundCallInitiator initiateCallWithRecipientId:self.thread.contactIdentifier];
}
@ -3706,6 +3705,20 @@ typedef enum : NSUInteger {
return;
}
OWSRecipientIdentity *unconfirmedIdentityThatShouldBlockSending = [self unconfirmedIdentityThatShouldBlockSending];
if (unconfirmedIdentityThatShouldBlockSending != nil) {
__weak MessagesViewController *weakSelf = self;
[self showConfirmIdentityUIForRecipientIdentity:unconfirmedIdentityThatShouldBlockSending
confirmationText:NSLocalizedString(@"CONFIRMATION_TITLE",
@"Generic button text to proceed with an action")
completion:^(BOOL didConfirmedIdentity) {
if (didConfirmedIdentity) {
[weakSelf didPressAccessoryButton:nil];
}
}];
return;
}
UIAlertController *actionSheetController = [UIAlertController alertControllerWithTitle:nil
message:nil
preferredStyle:UIAlertControllerStyleActionSheet];
@ -3946,6 +3959,23 @@ typedef enum : NSUInteger {
return;
}
OWSRecipientIdentity *unconfirmedIdentityThatShouldBlockSending =
[self unconfirmedIdentityThatShouldBlockSending];
if (unconfirmedIdentityThatShouldBlockSending != nil) {
__weak MessagesViewController *weakSelf = self;
[self showConfirmIdentityUIForRecipientIdentity:unconfirmedIdentityThatShouldBlockSending
confirmationText:NSLocalizedString(
@"SAFETY_NUMBER_CHANGED_CONFIRM_SEND_ACTION",
@"button title to confirm sending to a recipient whose "
@"safety number recently changed")
completion:^(BOOL didConfirmedIdentity) {
if (didConfirmedIdentity) {
[weakSelf tryToSendAttachmentIfApproved:attachment];
}
}];
return;
}
if (attachment == nil || [attachment hasError]) {
DDLogWarn(@"%@ %s Invalid attachment: %@.",
self.tag,