From 81b2b57703a40fd47827b658660ea96b8a9ab422 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 9 Apr 2018 12:02:35 -0400 Subject: [PATCH] CR: add comments, make atomic // FREEBIE --- SignalMessaging/Models/OWSQuotedReplyModel.h | 1 + SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.m | 1 + SignalServiceKit/src/Util/OWSOperation.m | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/SignalMessaging/Models/OWSQuotedReplyModel.h b/SignalMessaging/Models/OWSQuotedReplyModel.h index 75eb2250f..b5c2cc856 100644 --- a/SignalMessaging/Models/OWSQuotedReplyModel.h +++ b/SignalMessaging/Models/OWSQuotedReplyModel.h @@ -37,6 +37,7 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)initWithQuotedMessage:(TSQuotedMessage *)quotedMessage transaction:(YapDatabaseReadTransaction *)transaction; +// Builds a not-yet-sent QuotedReplyModel + (nullable instancetype)quotedReplyForMessage:(TSMessage *)message transaction:(YapDatabaseReadTransaction *)transaction; diff --git a/SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.m b/SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.m index a32048e15..5e9544bac 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.m +++ b/SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.m @@ -300,6 +300,7 @@ NS_ASSUME_NONNULL_BEGIN return [streamIds copy]; } +// Before sending, persist a thumbnail attachment derived from the quoted attachment - (NSArray *)createThumbnailAttachmentsIfNecessaryWithTransaction: (YapDatabaseReadWriteTransaction *)transaction { diff --git a/SignalServiceKit/src/Util/OWSOperation.m b/SignalServiceKit/src/Util/OWSOperation.m index b3883e39e..a5d2bab33 100644 --- a/SignalServiceKit/src/Util/OWSOperation.m +++ b/SignalServiceKit/src/Util/OWSOperation.m @@ -13,7 +13,7 @@ NSString *const OWSOperationKeyIsFinished = @"isFinished"; @interface OWSOperation () -@property (nonatomic) OWSOperationState operationState; +@property (atomic) OWSOperationState operationState; @property (nonatomic) OWSBackgroundTask *backgroundTask; @end