Merge branch 'charlesmchen/showUpgradeLabel' into hotfix/2.13.4.0

Signal/src/AppDelegate.m

@@ -155,24 +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 *lastAppVersion = AppVersion.instance.lastAppVersion;
     NSString *lastCompletedLaunchAppVersion = AppVersion.instance.lastCompletedLaunchAppVersion;
-    BOOL mayNeedUpgrade = ([TSAccountManager isRegistered] &&
-        [VersionMigrations isVersion:lastAppVersion atLeast:@"2.0.0" andLessThan:@"2.13.0"]);
-    BOOL hasCompletedUpgrade = (lastCompletedLaunchAppVersion &&
-        [VersionMigrations isVersion:lastCompletedLaunchAppVersion atLeast:@"2.13.0"]);
-
     // We added a number of database views in v2.13.0.
-    if (mayNeedUpgrade && !hasCompletedUpgrade) {
+    NSString *kLastVersionWithDatabaseViewChange = @"2.13.0";
-        shouldShowUpgradeLabel = YES;
+    BOOL mayNeedUpgrade = ([TSAccountManager isRegistered] && lastLaunchedAppVersion
-    }
+        && (!lastCompletedLaunchAppVersion ||
-    DDLogInfo(@"%@ shouldShowUpgradeLabel: %d, %d -> %d",
+               [VersionMigrations isVersion:lastCompletedLaunchAppVersion
-        self.tag,
+                                   lessThan:kLastVersionWithDatabaseViewChange]));
-        mayNeedUpgrade,
+    DDLogInfo(@"%@ mayNeedUpgrade: %d", self.tag, mayNeedUpgrade);
-        hasCompletedUpgrade,
+    if (mayNeedUpgrade) {
-        shouldShowUpgradeLabel);
-    if (shouldShowUpgradeLabel) {
         UIView *rootView = viewController.view;
         UIImageView *iconView = nil;
         for (UIView *subview in viewController.view.subviews) {

Signal/src/environment/VersionMigrations.h

@@ -18,4 +18,6 @@
 
 + (BOOL)isVersion:(NSString *)thisVersionString atLeast:(NSString *)thatVersionString;
 
++ (BOOL)isVersion:(NSString *)thisVersionString lessThan:(NSString *)thatVersionString;
+
 @end