From c8e7eb903c33b9c6842984935b176d9245feef75 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 30 Jan 2018 16:56:43 -0500 Subject: [PATCH] Add protocol context to protocol kit. --- SignalServiceKit/src/Messages/OWSIdentityManager.m | 1 - SignalServiceKit/src/Security/OWSRecipientIdentity.m | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/SignalServiceKit/src/Messages/OWSIdentityManager.m b/SignalServiceKit/src/Messages/OWSIdentityManager.m index e43ff3b8f..d9083a651 100644 --- a/SignalServiceKit/src/Messages/OWSIdentityManager.m +++ b/SignalServiceKit/src/Messages/OWSIdentityManager.m @@ -578,7 +578,6 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa { OWSAssert(message); OWSAssert(message.verificationForRecipientId.length > 0); - OWSAssertIsOnMainThread(); TSContactThread *contactThread = [TSContactThread getOrCreateThreadWithContactId:message.verificationForRecipientId]; diff --git a/SignalServiceKit/src/Security/OWSRecipientIdentity.m b/SignalServiceKit/src/Security/OWSRecipientIdentity.m index 997a16576..d4fa4959a 100644 --- a/SignalServiceKit/src/Security/OWSRecipientIdentity.m +++ b/SignalServiceKit/src/Security/OWSRecipientIdentity.m @@ -128,6 +128,8 @@ OWSSignalServiceProtosVerifiedState OWSVerificationStateToProtoState(OWSVerifica - (void)saveWithTransaction:(YapDatabaseReadWriteTransaction *)transaction { + // For consistency, we should only access instances of this class on + // non-caching connections. OWSAssert(!transaction.connection.objectCacheEnabled); [super saveWithTransaction:transaction]; @@ -135,6 +137,8 @@ OWSSignalServiceProtosVerifiedState OWSVerificationStateToProtoState(OWSVerifica - (void)removeWithTransaction:(YapDatabaseReadWriteTransaction *)transaction { + // For consistency, we should only access instances of this class on + // non-caching connections. OWSAssert(!transaction.connection.objectCacheEnabled); [super removeWithTransaction:transaction]; @@ -142,6 +146,8 @@ OWSSignalServiceProtosVerifiedState OWSVerificationStateToProtoState(OWSVerifica - (void)touchWithTransaction:(YapDatabaseReadWriteTransaction *)transaction { + // For consistency, we should only access instances of this class on + // non-caching connections. OWSAssert(!transaction.connection.objectCacheEnabled); [super touchWithTransaction:transaction]; @@ -150,6 +156,8 @@ OWSSignalServiceProtosVerifiedState OWSVerificationStateToProtoState(OWSVerifica + (nullable instancetype)fetchObjectWithUniqueID:(NSString *)uniqueID transaction:(YapDatabaseReadTransaction *)transaction { + // For consistency, we should only access instances of this class on + // non-caching connections. OWSAssert(!transaction.connection.objectCacheEnabled); return [super fetchObjectWithUniqueID:uniqueID transaction:transaction];