Merge branch 'charlesmchen/backgroundVsMigration'

This commit is contained in:
Matthew Chen 2018-02-22 16:21:54 -05:00
commit e0793a0eae

View File

@ -254,6 +254,8 @@ static NSString *const kURLHostVerifyPrefix = @"verify";
return YES;
}
OWSBackgroundTask *_Nullable backgroundTask = [OWSBackgroundTask backgroundTaskWithLabelStr:__PRETTY_FUNCTION__];
if ([NSFileManager.defaultManager fileExistsAtPath:TSStorageManager.legacyDatabaseFilePath]) {
DDLogInfo(@"%@ Legacy Database file size: %@",
self.logTag,
@ -288,6 +290,8 @@ static NSString *const kURLHostVerifyPrefix = @"verify";
return NO;
}
backgroundTask = nil;
return YES;
}