signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Merge branch 'charlesmchen/shareContactSinglePresentation'

Browse Source
This commit is contained in:
Matthew Chen 2018-05-10 13:17:43 -04:00
commit 46ce2d6f80
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Signal/src/ViewControllers/ConversationView/ConversationViewController.m
View File

@ -4995,8 +4995,6 @@ interactionControllerForAnimationController:(id<UIViewControllerAnimatedTransiti
DDLogDebug(@"%@ in %s with contact: %@", self.logTag, __PRETTY_FUNCTION__, contact);
[self dismissViewControllerAnimated:YES completion:nil];
OWSContact *_Nullable contactShareRecord = [OWSContacts contactForSystemContact:contact.cnContact];
if (!contactShareRecord) {
DDLogError(@"%@ Could not convert system contact.", self.logTag);
@ -5024,11 +5022,8 @@ interactionControllerForAnimationController:(id<UIViewControllerAnimatedTransiti
[[ApproveContactShareViewController alloc] initWithContactShare:contactShare
contactsManager:self.contactsManager
delegate:self];
UINavigationController *navigationController =
[[UINavigationController alloc] initWithRootViewController:approveContactShare];
[self dismissKeyBoard];
[self presentViewController:navigationController animated:YES completion:nil];
OWSAssert(contactsPicker.navigationController);
[contactsPicker.navigationController pushViewController:approveContactShare animated:YES];
}
- (void)contactsPicker:(ContactsPicker *)contactsPicker didSelectMultipleContacts:(NSArray<Contact *> *)contacts