Merge branch 'charlesmchen/justOnceContactStore'

7 years ago · 20ea6b8d31
parent 5713a0e306 3ccee7ffda
commit 20ea6b8d31
1 changed files with 2 additions and 1 deletions
--- a/Signal/src/contact/OWSContactsManager.m
+++ b/Signal/src/contact/OWSContactsManager.m
@ -87,7 +87,8 @@ NSString *const OWSContactsManagerSignalRecipientsDidChangeNotification =
 }

 - (void)doAfterEnvironmentInitSetup {
-    if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(9, 0)) {
+    if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(9, 0) &&
+        !self.contactStore) {
        OWSAssert(!self.contactStore);
        self.contactStore = [[CNContactStore alloc] init];
        [self.contactStore requestAccessForEntityType:CNEntityTypeContacts