diff --git a/SignalMessaging/contacts/OWSContactsManager.m b/SignalMessaging/contacts/OWSContactsManager.m index 53c5017406..7c293b6a1c 100644 --- a/SignalMessaging/contacts/OWSContactsManager.m +++ b/SignalMessaging/contacts/OWSContactsManager.m @@ -345,9 +345,22 @@ NSString *const OWSContactsManagerKeyNextFullIntersectionDate = @"OWSContactsMan if (isRegularlyScheduledRun) { NSMutableSet *newSignalRecipients = [registeredRecipients mutableCopy]; [newSignalRecipients minusSet:existingRegisteredRecipients]; - // Not for first time users - if (existingRegisteredRecipients.count > 0 && newSignalRecipients.count > 0) { - [OWSNewAccountDiscovery.shared discoveredNewRecipients:newSignalRecipients]; + + if (newSignalRecipients.count == 0) { + OWSLogInfo(@"No new recipients."); + } else { + __block NSSet *_Nullable lastKnownContactPhoneNumbers; + [self.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) { + lastKnownContactPhoneNumbers = + [transaction objectForKey:OWSContactsManagerKeyLastKnownContactPhoneNumbers + inCollection:OWSContactsManagerCollection]; + }]; + + if (lastKnownContactPhoneNumbers != nil && lastKnownContactPhoneNumbers.count > 0) { + [OWSNewAccountDiscovery.shared discoveredNewRecipients:newSignalRecipients]; + } else { + OWSLogInfo(@"skipping new recipient notification for first successful contact sync."); + } } }