|
|
|
@ -68,12 +68,14 @@ NSString *const OWSContactsManagerSignalAccountsDidChangeNotification
|
|
|
|
|
- (void)loadSignalAccountsFromCache
|
|
|
|
|
{
|
|
|
|
|
__block NSMutableArray<SignalAccount *> *signalAccounts;
|
|
|
|
|
[self.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction * _Nonnull transaction) {
|
|
|
|
|
signalAccounts = [[NSMutableArray alloc] initWithCapacity:[SignalAccount numberOfKeysInCollectionWithTransaction:transaction]];
|
|
|
|
|
|
|
|
|
|
[SignalAccount enumerateCollectionObjectsWithTransaction:transaction usingBlock:^(SignalAccount *signalAccount, BOOL * _Nonnull stop) {
|
|
|
|
|
[signalAccounts addObject:signalAccount];
|
|
|
|
|
}];
|
|
|
|
|
[self.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
|
|
|
|
|
signalAccounts = [[NSMutableArray alloc]
|
|
|
|
|
initWithCapacity:[SignalAccount numberOfKeysInCollectionWithTransaction:transaction]];
|
|
|
|
|
|
|
|
|
|
[SignalAccount enumerateCollectionObjectsWithTransaction:transaction
|
|
|
|
|
usingBlock:^(SignalAccount *signalAccount, BOOL *_Nonnull stop) {
|
|
|
|
|
[signalAccounts addObject:signalAccount];
|
|
|
|
|
}];
|
|
|
|
|
}];
|
|
|
|
|
|
|
|
|
|
[self updateSignalAccounts:signalAccounts];
|
|
|
|
@ -593,8 +595,8 @@ NSString *const OWSContactsManagerSignalAccountsDidChangeNotification
|
|
|
|
|
// If contact intersection hasn't completed, it might exist on disk
|
|
|
|
|
// even if it doesn't exist in memory yet.
|
|
|
|
|
if (!signalAccount) {
|
|
|
|
|
[self.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction * _Nonnull transaction) {
|
|
|
|
|
signalAccount = [SignalAccount fetchObjectWithUniqueID:recipientId transaction: transaction];
|
|
|
|
|
[self.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
|
|
|
|
|
signalAccount = [SignalAccount fetchObjectWithUniqueID:recipientId transaction:transaction];
|
|
|
|
|
}];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|