From 50387448116ded41918c7acb350ca703394d3b6c Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 6 Jul 2017 14:50:13 -0400 Subject: [PATCH] =?UTF-8?q?Fix=20missing=20=E2=80=9Cdatabase=20upgrade?= =?UTF-8?q?=E2=80=9D=20label=20on=20launch=20screen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit // FREEBIE --- Signal/src/AppDelegate.m | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index b9d9026a9..71e4cc5a8 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -156,12 +156,14 @@ static NSString *const kURLHostVerifyPrefix = @"verify"; [[UIStoryboard storyboardWithName:@"Launch Screen" bundle:nil] instantiateInitialViewController]; BOOL shouldShowUpgradeLabel = NO; - NSString *lastAppVersion = AppVersion.instance.lastAppVersion; NSString *lastCompletedLaunchAppVersion = AppVersion.instance.lastCompletedLaunchAppVersion; - BOOL mayNeedUpgrade = ([TSAccountManager isRegistered] && - [VersionMigrations isVersion:lastAppVersion atLeast:@"2.0.0" andLessThan:@"2.13.0"]); + NSString *kLastVersionWithDatabaseViewChange = @"2.13.0"; + BOOL mayNeedUpgrade = ([TSAccountManager isRegistered] && lastCompletedLaunchAppVersion && + [VersionMigrations isVersion:lastCompletedLaunchAppVersion + atLeast:@"2.0.0" + andLessThan:kLastVersionWithDatabaseViewChange]); BOOL hasCompletedUpgrade = (lastCompletedLaunchAppVersion && - [VersionMigrations isVersion:lastCompletedLaunchAppVersion atLeast:@"2.13.0"]); + [VersionMigrations isVersion:lastCompletedLaunchAppVersion atLeast:kLastVersionWithDatabaseViewChange]); // We added a number of database views in v2.13.0. if (mayNeedUpgrade && !hasCompletedUpgrade) {