Respond to post-holiday code reviews.

// FREEBIE
pull/1/head
Matthew Chen 8 years ago
parent bd440f0878
commit 90c4ba27bf

@ -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

@ -6,7 +6,7 @@ NS_ASSUME_NONNULL_BEGIN
@interface FingerprintViewController : UIViewController @interface FingerprintViewController : UIViewController
+ (void)showVerificationViewFromViewController:(UIViewController *)viewController recipientId:(NSString *)recipientId; + (void)presentFromViewController:(UIViewController *)viewController recipientId:(NSString *)recipientId;
@end @end

@ -89,7 +89,7 @@ typedef void (^CustomLayoutBlock)();
@implementation FingerprintViewController @implementation FingerprintViewController
+ (void)showVerificationViewFromViewController:(UIViewController *)viewController recipientId:(NSString *)recipientId + (void)presentFromViewController:(UIViewController *)viewController recipientId:(NSString *)recipientId
{ {
OWSAssert(recipientId.length > 0); OWSAssert(recipientId.length > 0);

@ -679,7 +679,7 @@ NS_ASSUME_NONNULL_BEGIN
NSString *recipientId = self.thread.contactIdentifier; NSString *recipientId = self.thread.contactIdentifier;
OWSAssert(recipientId.length > 0); OWSAssert(recipientId.length > 0);
[FingerprintViewController showVerificationViewFromViewController:self recipientId:recipientId]; [FingerprintViewController presentFromViewController:self recipientId:recipientId];
} }
- (void)showGroupMembersView - (void)showGroupMembersView

@ -86,7 +86,7 @@ class SafetyNumberConfirmationAlert: NSObject {
Logger.info("\(self.TAG) Missing frontmostViewController") Logger.info("\(self.TAG) Missing frontmostViewController")
return return
} }
FingerprintViewController.showVerificationView(from:fromViewController, recipientId:theirRecipientId) FingerprintViewController.present(from:fromViewController, recipientId:theirRecipientId)
} }
private func untrustedIdentityForSending(recipientIds: [String]) -> OWSRecipientIdentity? { private func untrustedIdentityForSending(recipientIds: [String]) -> OWSRecipientIdentity? {

@ -317,7 +317,7 @@ NS_ASSUME_NONNULL_BEGIN
{ {
OWSAssert(recipientId.length > 0); OWSAssert(recipientId.length > 0);
[FingerprintViewController showVerificationViewFromViewController:self recipientId:recipientId]; [FingerprintViewController presentFromViewController:self recipientId:recipientId];
} }
#pragma mark - ContactsViewHelperDelegate #pragma mark - ContactsViewHelperDelegate

Loading…
Cancel
Save