From 90c4ba27bf0ccb5573f2c2392e3628008f338eaf Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Thu, 15 Jun 2017 16:20:33 -0400
Subject: [PATCH] Respond to post-holiday code reviews.

// FREEBIE
---
 .../ViewControllers/ConversationView/MessagesViewController.m   | 2 +-
 Signal/src/ViewControllers/FingerprintViewController.h          | 2 +-
 Signal/src/ViewControllers/FingerprintViewController.m          | 2 +-
 .../OWSConversationSettingsTableViewController.m                | 2 +-
 Signal/src/ViewControllers/SafetyNumberConfirmationAlert.swift  | 2 +-
 Signal/src/ViewControllers/ShowGroupMembersViewController.m     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/MessagesViewController.m b/Signal/src/ViewControllers/ConversationView/MessagesViewController.m
index a4e3b87cc..0b3af7343 100644
--- a/Signal/src/ViewControllers/ConversationView/MessagesViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/MessagesViewController.m
@@ -1341,7 +1341,7 @@ typedef enum : NSUInteger {
     // return from FingerprintViewController.
     [self dismissKeyBoard];
 
-    [FingerprintViewController showVerificationViewFromViewController:self recipientId:recipientId];
+    [FingerprintViewController presentFromViewController:self recipientId:recipientId];
 }
 
 #pragma mark - Calls
diff --git a/Signal/src/ViewControllers/FingerprintViewController.h b/Signal/src/ViewControllers/FingerprintViewController.h
index e612cd3ae..43642b75e 100644
--- a/Signal/src/ViewControllers/FingerprintViewController.h
+++ b/Signal/src/ViewControllers/FingerprintViewController.h
@@ -6,7 +6,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface FingerprintViewController : UIViewController
 
-+ (void)showVerificationViewFromViewController:(UIViewController *)viewController recipientId:(NSString *)recipientId;
++ (void)presentFromViewController:(UIViewController *)viewController recipientId:(NSString *)recipientId;
 
 @end
 
diff --git a/Signal/src/ViewControllers/FingerprintViewController.m b/Signal/src/ViewControllers/FingerprintViewController.m
index 2286dd8f0..747b2fe8b 100644
--- a/Signal/src/ViewControllers/FingerprintViewController.m
+++ b/Signal/src/ViewControllers/FingerprintViewController.m
@@ -89,7 +89,7 @@ typedef void (^CustomLayoutBlock)();
 
 @implementation FingerprintViewController
 
-+ (void)showVerificationViewFromViewController:(UIViewController *)viewController recipientId:(NSString *)recipientId
++ (void)presentFromViewController:(UIViewController *)viewController recipientId:(NSString *)recipientId
 {
     OWSAssert(recipientId.length > 0);
 
diff --git a/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m b/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m
index 24fac89c0..dcca82967 100644
--- a/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m
+++ b/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m
@@ -679,7 +679,7 @@ NS_ASSUME_NONNULL_BEGIN
     NSString *recipientId = self.thread.contactIdentifier;
     OWSAssert(recipientId.length > 0);
 
-    [FingerprintViewController showVerificationViewFromViewController:self recipientId:recipientId];
+    [FingerprintViewController presentFromViewController:self recipientId:recipientId];
 }
 
 - (void)showGroupMembersView
diff --git a/Signal/src/ViewControllers/SafetyNumberConfirmationAlert.swift b/Signal/src/ViewControllers/SafetyNumberConfirmationAlert.swift
index 44f2ac1aa..311f1b9fc 100644
--- a/Signal/src/ViewControllers/SafetyNumberConfirmationAlert.swift
+++ b/Signal/src/ViewControllers/SafetyNumberConfirmationAlert.swift
@@ -86,7 +86,7 @@ class SafetyNumberConfirmationAlert: NSObject {
             Logger.info("\(self.TAG) Missing frontmostViewController")
             return
         }
-        FingerprintViewController.showVerificationView(from:fromViewController, recipientId:theirRecipientId)
+        FingerprintViewController.present(from:fromViewController, recipientId:theirRecipientId)
     }
 
     private func untrustedIdentityForSending(recipientIds: [String]) -> OWSRecipientIdentity? {
diff --git a/Signal/src/ViewControllers/ShowGroupMembersViewController.m b/Signal/src/ViewControllers/ShowGroupMembersViewController.m
index 54751c95c..76a0bf93f 100644
--- a/Signal/src/ViewControllers/ShowGroupMembersViewController.m
+++ b/Signal/src/ViewControllers/ShowGroupMembersViewController.m
@@ -317,7 +317,7 @@ NS_ASSUME_NONNULL_BEGIN
 {
     OWSAssert(recipientId.length > 0);
 
-    [FingerprintViewController showVerificationViewFromViewController:self recipientId:recipientId];
+    [FingerprintViewController presentFromViewController:self recipientId:recipientId];
 }
 
 #pragma mark - ContactsViewHelperDelegate