From ecf7ef61f4de36ecfafcb8eac2f4cfff07e244be Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael.code@endoftheworl.de>
Date: Tue, 6 Jun 2017 15:43:42 -0400
Subject: [PATCH] update identity manager names

// FREEBIE
---
 src/Messages/OWSIdentityManager.h | 5 +++--
 src/Messages/OWSIdentityManager.m | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Messages/OWSIdentityManager.h b/src/Messages/OWSIdentityManager.h
index 702fb013f..547be0c6d 100644
--- a/src/Messages/OWSIdentityManager.h
+++ b/src/Messages/OWSIdentityManager.h
@@ -26,7 +26,7 @@ extern NSString *const kNSNotificationName_IdentityStateDidChange;
  * @param   recipientId unique stable identifier for the recipient, e.g. e164 phone number
  * @returns if the recipient's current identity is trusted.
  */
-- (BOOL)isCurrentIdentityTrustedForSendingWithRecipientId:(NSString *)recipientId;
+- (BOOL)isCurrentIdentityTrustedForSendingToRecipientId:(NSString *)recipientId;
 
 - (void)generateNewIdentityKey;
 
@@ -44,7 +44,8 @@ extern NSString *const kNSNotificationName_IdentityStateDidChange;
  * @returns nil if the recipient does not exist, or if the recipient exists and is OWSVerificationStateVerified or
  * OWSVerificationStateDefault else return the no longer verified identity
  */
-- (OWSRecipientIdentity *)noLongerVerifiedIdentityForRecipientId:(NSString *)recipientId;
+- (nullable OWSRecipientIdentity *)noLongerVerifiedIdentityForRecipientId:(NSString *)recipientId
+    NS_SWIFT_NAME(noLongerVerifiedIdentity(recipientId:));
 
 @end
 
diff --git a/src/Messages/OWSIdentityManager.m b/src/Messages/OWSIdentityManager.m
index c9dcd9f59..182974fbf 100644
--- a/src/Messages/OWSIdentityManager.m
+++ b/src/Messages/OWSIdentityManager.m
@@ -77,7 +77,7 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
     return self;
 }
 
-- (BOOL)isCurrentIdentityTrustedForSendingWithRecipientId:(NSString *)recipientId
+- (BOOL)isCurrentIdentityTrustedForSendingToRecipientId:(NSString *)recipientId
 {
     OWSAssert(recipientId.length > 0);
 
@@ -235,7 +235,7 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
     }
 }
 
-- (OWSRecipientIdentity *)noLongerVerifiedIdentityForRecipientId:(NSString *)recipientId
+- (nullable OWSRecipientIdentity *)noLongerVerifiedIdentityForRecipientId:(NSString *)recipientId
 {
     OWSAssert(recipientId.length > 0);