CR: move property to method to clearly avoid Mantle serialization

Also some formatting cleanup and extra asserts

// FREEBIE
pull/1/head
Michael Kirk 8 years ago
parent 4d8429186d
commit eafc370bbe

@ -19,11 +19,11 @@ NS_ASSUME_NONNULL_BEGIN
@interface OWSMessageProcessingJob : TSYapDatabaseObject @interface OWSMessageProcessingJob : TSYapDatabaseObject
@property (nonatomic, readonly) OWSSignalServiceProtosEnvelope *envelopeProto;
@property (nonatomic, readonly) NSDate *createdAt; @property (nonatomic, readonly) NSDate *createdAt;
- (instancetype)initWithEnvelope:(OWSSignalServiceProtosEnvelope *)envelope NS_DESIGNATED_INITIALIZER; - (instancetype)initWithEnvelope:(OWSSignalServiceProtosEnvelope *)envelope NS_DESIGNATED_INITIALIZER;
- (instancetype)initWithUniqueId:(NSString *)uniqueId NS_UNAVAILABLE; - (instancetype)initWithUniqueId:(NSString *)uniqueId NS_UNAVAILABLE;
- (OWSSignalServiceProtosEnvelope *)envelopeProto;
@end @end
@ -33,11 +33,12 @@ NS_ASSUME_NONNULL_BEGIN
@end @end
// TODO rename?
@implementation OWSMessageProcessingJob @implementation OWSMessageProcessingJob
- (instancetype)initWithEnvelope:(OWSSignalServiceProtosEnvelope *)envelope - (instancetype)initWithEnvelope:(OWSSignalServiceProtosEnvelope *)envelope
{ {
OWSAssert(envelope);
self = [super initWithUniqueId:[NSUUID new].UUIDString]; self = [super initWithUniqueId:[NSUUID new].UUIDString];
if (!self) { if (!self) {
return self; return self;
@ -119,7 +120,6 @@ NSString *const OWSMessageProcessingJobFinderExtensionGroup = @"OWSMessageProces
+ (YapDatabaseView *)databaseExension + (YapDatabaseView *)databaseExension
{ {
YapDatabaseViewSorting *sorting = YapDatabaseViewSorting *sorting =
[YapDatabaseViewSorting withObjectBlock:^NSComparisonResult(YapDatabaseReadTransaction *transaction, [YapDatabaseViewSorting withObjectBlock:^NSComparisonResult(YapDatabaseReadTransaction *transaction,
NSString *group, NSString *group,
@ -131,12 +131,14 @@ NSString *const OWSMessageProcessingJobFinderExtensionGroup = @"OWSMessageProces
id object2) { id object2) {
if (![object1 isKindOfClass:[OWSMessageProcessingJob class]]) { if (![object1 isKindOfClass:[OWSMessageProcessingJob class]]) {
OWSFail(@"Unexpected object: %@ in collection: %@", object1, collection1) return NSOrderedSame; OWSFail(@"Unexpected object: %@ in collection: %@", [object1 class], collection1);
return NSOrderedSame;
} }
OWSMessageProcessingJob *job1 = (OWSMessageProcessingJob *)object1; OWSMessageProcessingJob *job1 = (OWSMessageProcessingJob *)object1;
if (![object2 isKindOfClass:[OWSMessageProcessingJob class]]) { if (![object2 isKindOfClass:[OWSMessageProcessingJob class]]) {
OWSFail(@"Unexpected object: %@ in collection: %@", object2, collection2) return NSOrderedSame; OWSFail(@"Unexpected object: %@ in collection: %@", [object2 class], collection2);
return NSOrderedSame;
} }
OWSMessageProcessingJob *job2 = (OWSMessageProcessingJob *)object2; OWSMessageProcessingJob *job2 = (OWSMessageProcessingJob *)object2;
@ -149,7 +151,8 @@ NSString *const OWSMessageProcessingJobFinderExtensionGroup = @"OWSMessageProces
NSString *_Nonnull key, NSString *_Nonnull key,
id _Nonnull object) { id _Nonnull object) {
if (![object isKindOfClass:[OWSMessageProcessingJob class]]) { if (![object isKindOfClass:[OWSMessageProcessingJob class]]) {
OWSFail(@"Unexpected object: %@ in collection: %@", object, collection) return nil; OWSFail(@"Unexpected object: %@ in collection: %@", object, collection);
return nil;
} }
// Arbitrary string - all in the same group. We're only using the view for sorting. // Arbitrary string - all in the same group. We're only using the view for sorting.
@ -168,6 +171,7 @@ NSString *const OWSMessageProcessingJobFinderExtensionGroup = @"OWSMessageProces
{ {
YapDatabaseView *existingView = [database registeredExtension:OWSMessageProcessingJobFinderExtensionName]; YapDatabaseView *existingView = [database registeredExtension:OWSMessageProcessingJobFinderExtensionName];
if (existingView) { if (existingView) {
OWSFail(@"%@ was already initailized.", OWSMessageProcessingJobFinderExtensionName);
// already initialized // already initialized
return; return;
} }

Loading…
Cancel
Save