From 05100b1143d2afc8c4358e539649c3bc1abb51ee Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Wed, 20 Dec 2017 11:32:48 -0500
Subject: [PATCH] Respond to CR.

---
 SignalServiceKit/src/Storage/OWSStorage.m       | 4 +++-
 SignalServiceKit/src/Storage/TSStorageManager.m | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/SignalServiceKit/src/Storage/OWSStorage.m b/SignalServiceKit/src/Storage/OWSStorage.m
index 18dc5be3f..683406e88 100644
--- a/SignalServiceKit/src/Storage/OWSStorage.m
+++ b/SignalServiceKit/src/Storage/OWSStorage.m
@@ -257,7 +257,9 @@ static NSString *keychainDBPassAccount = @"TSDatabasePass";
             OWSProdCritical([OWSAnalyticsEvents storageErrorCouldNotLoadDatabase]);
 
             // Try to reset app by deleting all databases.
-            [OWSStorage deleteDatabaseFiles];
+            //
+            // TODO: Possibly clean up all app files.
+            //            [OWSStorage deleteDatabaseFiles];
 
             if (![self tryToLoadDatabase]) {
                 OWSProdCritical([OWSAnalyticsEvents storageErrorCouldNotLoadDatabaseSecondAttempt]);
diff --git a/SignalServiceKit/src/Storage/TSStorageManager.m b/SignalServiceKit/src/Storage/TSStorageManager.m
index 695d91e17..edc20851a 100644
--- a/SignalServiceKit/src/Storage/TSStorageManager.m
+++ b/SignalServiceKit/src/Storage/TSStorageManager.m
@@ -26,8 +26,8 @@ NSString *const TSStorageManagerExceptionName_CouldNotCreateDatabaseDirectory
 
 @interface TSStorageManager ()
 
-@property (nonatomic, readonly) YapDatabaseConnection *dbReadConnection;
-@property (nonatomic, readonly) YapDatabaseConnection *dbReadWriteConnection;
+@property (nonatomic, readonly, nullable) YapDatabaseConnection *dbReadConnection;
+@property (nonatomic, readonly, nullable) YapDatabaseConnection *dbReadWriteConnection;
 
 @property (atomic) BOOL areAsyncRegistrationsComplete;
 @property (atomic) BOOL areSyncRegistrationsComplete;