From a3b16812ecce608e5d2d53404a5be4879f46850b Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 1 Aug 2017 12:39:10 -0400 Subject: [PATCH] Add convenience category for YapDatabaseConnection. // FREEBIE --- Signal/src/AppDelegate.m | 3 +-- Signal/src/util/AppUpdateNag.m | 16 ++++++++-------- .../src/Messages/OWSDisappearingMessagesJob.m | 3 --- .../Messages/OWSIncomingMessageReadObserver.h | 8 ++++---- .../Messages/OWSIncomingMessageReadObserver.m | 3 +-- 5 files changed, 14 insertions(+), 19 deletions(-) diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index 79438d5ee..367869aad 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -244,8 +244,7 @@ static NSString *const kURLHostVerifyPrefix = @"verify"; }]; self.incomingMessageReadObserver = - [[OWSIncomingMessageReadObserver alloc] initWithStorageManager:[TSStorageManager sharedManager] - messageSender:[Environment getCurrent].messageSender]; + [[OWSIncomingMessageReadObserver alloc] initWithMessageSender:[Environment getCurrent].messageSender]; [self.incomingMessageReadObserver startObserving]; self.staleNotificationObserver = [OWSStaleNotificationObserver new]; diff --git a/Signal/src/util/AppUpdateNag.m b/Signal/src/util/AppUpdateNag.m index 111c8afae..cf33e81e6 100644 --- a/Signal/src/util/AppUpdateNag.m +++ b/Signal/src/util/AppUpdateNag.m @@ -14,7 +14,7 @@ NSString *const TSStorageManagerAppUpgradeNagDate = @"TSStorageManagerAppUpgrade @interface AppUpdateNag () -@property (nonatomic, readonly) TSStorageManager *storageManager; +@property (nonatomic, readonly) YapDatabaseConnection *dbConnection; @end @@ -49,7 +49,7 @@ NSString *const TSStorageManagerAppUpgradeNagDate = @"TSStorageManagerAppUpgrade OWSAssert(storageManager); - _storageManager = storageManager; + _dbConnection = storageManager.newDatabaseConnection; OWSSingletonAssert(); @@ -68,9 +68,9 @@ NSString *const TSStorageManagerAppUpgradeNagDate = @"TSStorageManagerAppUpgrade if (!canPresent) { return; } - - NSDate *lastNagDate = [[TSStorageManager sharedManager] dateForKey:TSStorageManagerAppUpgradeNagDate - inCollection:TSStorageManagerAppUpgradeNagCollection]; + + NSDate *lastNagDate = [self.dbConnection dateForKey:TSStorageManagerAppUpgradeNagDate + inCollection:TSStorageManagerAppUpgradeNagCollection]; const NSTimeInterval kNagFrequency = kDayInterval * 14; BOOL canNag = (!lastNagDate || fabs(lastNagDate.timeIntervalSinceNow) > kNagFrequency); if (!canNag) { @@ -96,9 +96,9 @@ NSString *const TSStorageManagerAppUpgradeNagDate = @"TSStorageManagerAppUpgrade { DDLogInfo(@"%@ %s", self.tag, __PRETTY_FUNCTION__); - [[TSStorageManager sharedManager] setDate:[NSDate new] - forKey:TSStorageManagerAppUpgradeNagDate - inCollection:TSStorageManagerAppUpgradeNagCollection]; + [self.dbConnection setDate:[NSDate new] + forKey:TSStorageManagerAppUpgradeNagDate + inCollection:TSStorageManagerAppUpgradeNagCollection]; } - (void)appUpdaterUserDidLaunchAppStore diff --git a/SignalServiceKit/src/Messages/OWSDisappearingMessagesJob.m b/SignalServiceKit/src/Messages/OWSDisappearingMessagesJob.m index 269ac80ea..9bee45deb 100644 --- a/SignalServiceKit/src/Messages/OWSDisappearingMessagesJob.m +++ b/SignalServiceKit/src/Messages/OWSDisappearingMessagesJob.m @@ -18,8 +18,6 @@ NS_ASSUME_NONNULL_BEGIN @interface OWSDisappearingMessagesJob () -@property (nonatomic, readonly) TSStorageManager *storageManager; - @property (nonatomic, readonly) YapDatabaseConnection *databaseConnection; @property (nonatomic, readonly) OWSDisappearingMessagesFinder *disappearingMessagesFinder; @@ -52,7 +50,6 @@ NS_ASSUME_NONNULL_BEGIN return self; } - _storageManager = storageManager; _databaseConnection = storageManager.newDatabaseConnection; _disappearingMessagesFinder = [OWSDisappearingMessagesFinder new]; diff --git a/SignalServiceKit/src/Messages/OWSIncomingMessageReadObserver.h b/SignalServiceKit/src/Messages/OWSIncomingMessageReadObserver.h index 2067031a9..f33cf5480 100644 --- a/SignalServiceKit/src/Messages/OWSIncomingMessageReadObserver.h +++ b/SignalServiceKit/src/Messages/OWSIncomingMessageReadObserver.h @@ -1,5 +1,6 @@ -// Created by Michael Kirk on 9/24/16. -// Copyright © 2016 Open Whisper Systems. All rights reserved. +// +// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// NS_ASSUME_NONNULL_BEGIN @@ -9,8 +10,7 @@ NS_ASSUME_NONNULL_BEGIN @interface OWSIncomingMessageReadObserver : NSObject - (instancetype)init NS_UNAVAILABLE; -- (instancetype)initWithStorageManager:(TSStorageManager *)storageManager - messageSender:(OWSMessageSender *)messageSender NS_DESIGNATED_INITIALIZER; +- (instancetype)initWithMessageSender:(OWSMessageSender *)messageSender NS_DESIGNATED_INITIALIZER; - (void)startObserving; diff --git a/SignalServiceKit/src/Messages/OWSIncomingMessageReadObserver.m b/SignalServiceKit/src/Messages/OWSIncomingMessageReadObserver.m index 20c581e4d..81c21de35 100644 --- a/SignalServiceKit/src/Messages/OWSIncomingMessageReadObserver.m +++ b/SignalServiceKit/src/Messages/OWSIncomingMessageReadObserver.m @@ -23,8 +23,7 @@ NS_ASSUME_NONNULL_BEGIN [[NSNotificationCenter defaultCenter] removeObserver:self]; } -- (instancetype)initWithStorageManager:(TSStorageManager *)storageManager - messageSender:(OWSMessageSender *)messageSender +- (instancetype)initWithMessageSender:(OWSMessageSender *)messageSender { self = [super init]; if (!self) {