Streamline SignalRecipient.

SignalServiceKit/src/Contacts/SignalRecipient.h

@@ -15,14 +15,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (instancetype)selfRecipient;
 
-+ (SignalRecipient *)ensureRecipientExistsWithRegisteredRecipientId:(NSString *)recipientId
-                                                        transaction:(YapDatabaseReadWriteTransaction *)transaction;
-
-+ (SignalRecipient *)ensureRecipientExistsWithRecipientId:(NSString *)recipientId
-                                              transaction:(YapDatabaseReadWriteTransaction *)transaction;
-
 + (nullable instancetype)registeredRecipientForRecipientId:(NSString *)recipientId
                                                transaction:(YapDatabaseReadTransaction *)transaction;
++ (instancetype)getOrCreatedUnsavedRecipientForRecipientId:(NSString *)recipientId
+                                               transaction:(YapDatabaseReadTransaction *)transaction;
 
 - (void)addDevices:(NSSet *)set;
 - (void)removeDevices:(NSSet *)set;

SignalServiceKit/src/Contacts/SignalRecipient.m

@@ -31,32 +31,19 @@ NS_ASSUME_NONNULL_BEGIN
     [super removeWithTransaction:transaction];
 }
 
-+ (SignalRecipient *)ensureRecipientExistsWithRegisteredRecipientId:(NSString *)recipientId
++ (instancetype)getOrCreatedUnsavedRecipientForRecipientId:(NSString *)recipientId
-                                                        transaction:(YapDatabaseReadWriteTransaction *)transaction
+                                               transaction:(YapDatabaseReadTransaction *)transaction
 {
-    SignalRecipient *recipient = [self ensureRecipientExistsWithRecipientId:recipientId transaction:transaction];
+    OWSAssert(transaction);
-    if (recipient.mayBeUnregistered) {
+    OWSAssert(recipientId.length > 0);
-        recipient.mayBeUnregistered = NO;
+    
-        [recipient saveWithTransaction:transaction];
+    SignalRecipient *_Nullable recipient = [self registeredRecipientForRecipientId:recipientId transaction:transaction];
+    if (!recipient) {
+        recipient = [[self alloc] initWithTextSecureIdentifier:recipientId];
     }
     return recipient;
 }
 
-+ (SignalRecipient *)ensureRecipientExistsWithRecipientId:(NSString *)recipientId
-                                              transaction:(YapDatabaseReadWriteTransaction *)transaction
-{
-    SignalRecipient *_Nullable recipient = [self recipientForRecipientId:recipientId transaction:transaction];
-    if (recipient) {
-        return recipient;
-    }
-
-    DDLogDebug(@"%@ creating recipient: %@", self.logTag, recipientId);
-
-    recipient = [[self alloc] initWithTextSecureIdentifier:recipientId];
-    [recipient saveWithTransaction:transaction];
-    return recipient;
-}
-
 - (instancetype)initWithTextSecureIdentifier:(NSString *)textSecureIdentifier
 {
     self = [super initWithUniqueId:textSecureIdentifier];

SignalServiceKit/src/Contacts/Threads/TSContactThread.m

@@ -39,9 +39,6 @@ NS_ASSUME_NONNULL_BEGIN
         [thread saveWithTransaction:transaction];
     }
 
-    // TODO: Do we need to _eagerly_ ensure a SignalRecipient instance exists?
-    [SignalRecipient ensureRecipientExistsWithRecipientId:contactId transaction:transaction];
-
     return thread;
 }
 

SignalServiceKit/src/Messages/OWSMessageSender.m

@@ -454,8 +454,8 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
     NSMutableArray<SignalRecipient *> *recipients = [NSMutableArray new];
     [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
         for (NSString *recipientId in recipientIds) {
-            SignalRecipient *recipient =
+            SignalRecipient *recipient = [SignalRecipient getOrCreatedUnsavedRecipientForRecipientId:recipientId
-                [SignalRecipient ensureRecipientExistsWithRecipientId:recipientId transaction:transaction];
+                                                                                          transaction:transaction];
             [recipients addObject:recipient];
         }
     }];
@@ -555,11 +555,10 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
                 return;
             }
 
-            __block SignalRecipient *recipient;
+            NSArray<SignalRecipient *> *recipients =
-            [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+            [self signalRecipientsForRecipientIds:@[recipientContactId] message:message];
-                recipient =
+            OWSAssert(recipients.count == 1);
-                    [SignalRecipient ensureRecipientExistsWithRecipientId:recipientContactId transaction:transaction];
+            SignalRecipient *recipient = recipients.firstObject;
-            }];
 
             if (!recipient) {
                 NSError *error = OWSErrorMakeFailedToSendOutgoingMessageError();