From 50387448116ded41918c7acb350ca703394d3b6c Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 6 Jul 2017 14:50:13 -0400 Subject: [PATCH 1/3] =?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) { From ab9770c175dc0ea2c787af3bc7255f13eb816cb7 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 6 Jul 2017 14:54:00 -0400 Subject: [PATCH 2/3] =?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 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index 71e4cc5a8..e1b31a459 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -158,10 +158,11 @@ static NSString *const kURLHostVerifyPrefix = @"verify"; BOOL shouldShowUpgradeLabel = NO; NSString *lastCompletedLaunchAppVersion = AppVersion.instance.lastCompletedLaunchAppVersion; NSString *kLastVersionWithDatabaseViewChange = @"2.13.0"; - BOOL mayNeedUpgrade = ([TSAccountManager isRegistered] && lastCompletedLaunchAppVersion && - [VersionMigrations isVersion:lastCompletedLaunchAppVersion - atLeast:@"2.0.0" - andLessThan:kLastVersionWithDatabaseViewChange]); + BOOL mayNeedUpgrade = ([TSAccountManager isRegistered] + && (!lastCompletedLaunchAppVersion || + [VersionMigrations isVersion:lastCompletedLaunchAppVersion + atLeast:@"2.0.0" + andLessThan:kLastVersionWithDatabaseViewChange])); BOOL hasCompletedUpgrade = (lastCompletedLaunchAppVersion && [VersionMigrations isVersion:lastCompletedLaunchAppVersion atLeast:kLastVersionWithDatabaseViewChange]); From 9aa54cad630b07a08cef730e880fe11c5bbdaa31 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 6 Jul 2017 15:10:47 -0400 Subject: [PATCH 3/3] =?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 | 23 ++++++---------------- Signal/src/environment/VersionMigrations.h | 2 ++ 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index e1b31a459..5d4c987bb 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -155,27 +155,16 @@ static NSString *const kURLHostVerifyPrefix = @"verify"; UIViewController *viewController = [[UIStoryboard storyboardWithName:@"Launch Screen" bundle:nil] instantiateInitialViewController]; - BOOL shouldShowUpgradeLabel = NO; + NSString *lastLaunchedAppVersion = AppVersion.instance.lastAppVersion; NSString *lastCompletedLaunchAppVersion = AppVersion.instance.lastCompletedLaunchAppVersion; + // We added a number of database views in v2.13.0. NSString *kLastVersionWithDatabaseViewChange = @"2.13.0"; - BOOL mayNeedUpgrade = ([TSAccountManager isRegistered] + BOOL mayNeedUpgrade = ([TSAccountManager isRegistered] && lastLaunchedAppVersion && (!lastCompletedLaunchAppVersion || [VersionMigrations isVersion:lastCompletedLaunchAppVersion - atLeast:@"2.0.0" - andLessThan:kLastVersionWithDatabaseViewChange])); - BOOL hasCompletedUpgrade = (lastCompletedLaunchAppVersion && - [VersionMigrations isVersion:lastCompletedLaunchAppVersion atLeast:kLastVersionWithDatabaseViewChange]); - - // We added a number of database views in v2.13.0. - if (mayNeedUpgrade && !hasCompletedUpgrade) { - shouldShowUpgradeLabel = YES; - } - DDLogInfo(@"%@ shouldShowUpgradeLabel: %d, %d -> %d", - self.tag, - mayNeedUpgrade, - hasCompletedUpgrade, - shouldShowUpgradeLabel); - if (shouldShowUpgradeLabel) { + lessThan:kLastVersionWithDatabaseViewChange])); + DDLogInfo(@"%@ mayNeedUpgrade: %d", self.tag, mayNeedUpgrade); + if (mayNeedUpgrade) { UIView *rootView = viewController.view; UIImageView *iconView = nil; for (UIView *subview in viewController.view.subviews) { diff --git a/Signal/src/environment/VersionMigrations.h b/Signal/src/environment/VersionMigrations.h index bc0064fa3..9b9c00f93 100644 --- a/Signal/src/environment/VersionMigrations.h +++ b/Signal/src/environment/VersionMigrations.h @@ -18,4 +18,6 @@ + (BOOL)isVersion:(NSString *)thisVersionString atLeast:(NSString *)thatVersionString; ++ (BOOL)isVersion:(NSString *)thisVersionString lessThan:(NSString *)thatVersionString; + @end