From c937aaaf8487956382c452da5845c70e10710761 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 15 Feb 2018 15:47:15 -0500 Subject: [PATCH] Improve handling of the not migrated case. --- SignalServiceKit/src/Storage/TSStorageManager.h | 2 -- SignalServiceKit/src/Storage/TSStorageManager.m | 7 ------- 2 files changed, 9 deletions(-) diff --git a/SignalServiceKit/src/Storage/TSStorageManager.h b/SignalServiceKit/src/Storage/TSStorageManager.h index 483697694..7f6eb5041 100644 --- a/SignalServiceKit/src/Storage/TSStorageManager.h +++ b/SignalServiceKit/src/Storage/TSStorageManager.h @@ -29,8 +29,6 @@ void runAsyncRegistrationsForStorage(OWSStorage *storage); + (NSString *)legacyDatabaseFilePath_SHM; + (NSString *)legacyDatabaseFilePath_WAL; -+ (BOOL)hasLegacyOrSharedDatabase; - @end NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Storage/TSStorageManager.m b/SignalServiceKit/src/Storage/TSStorageManager.m index d56cdda2a..47d2775ed 100644 --- a/SignalServiceKit/src/Storage/TSStorageManager.m +++ b/SignalServiceKit/src/Storage/TSStorageManager.m @@ -261,13 +261,6 @@ void runAsyncRegistrationsForStorage(OWSStorage *storage) return TSStorageManager.sharedManager.dbReadWriteConnection; } -+ (BOOL)hasLegacyOrSharedDatabase -{ - NSFileManager *fileManager = [NSFileManager defaultManager]; - return ([fileManager fileExistsAtPath:self.legacyDatabaseFilePath] || - [fileManager fileExistsAtPath:self.sharedDataDatabaseFilePath]); -} - @end NS_ASSUME_NONNULL_END