Add convenience category for YapDatabaseConnection.

// FREEBIE

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];

Signal/src/util/AppUpdateNag.m

@@ -14,7 +14,7 @@ NSString *const TSStorageManagerAppUpgradeNagDate = @"TSStorageManagerAppUpgrade
 
 @interface AppUpdateNag () <ATAppUpdaterDelegate>
 
-@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();
 
@@ -69,8 +69,8 @@ NSString *const TSStorageManagerAppUpgradeNagDate = @"TSStorageManagerAppUpgrade
         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

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];
 

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;
 

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) {