From 1868c5803758f2c4fc66e1dbc07d7b57908509df Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 8 Aug 2018 13:53:24 -0400 Subject: [PATCH 1/2] Converge appLaunchTime. --- Signal/src/util/OWSOrphanDataCleaner.m | 2 +- SignalServiceKit/src/Util/AppVersion.h | 2 -- SignalServiceKit/src/Util/AppVersion.m | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Signal/src/util/OWSOrphanDataCleaner.m b/Signal/src/util/OWSOrphanDataCleaner.m index b2e58e8e5..133a3f6c5 100644 --- a/Signal/src/util/OWSOrphanDataCleaner.m +++ b/Signal/src/util/OWSOrphanDataCleaner.m @@ -590,7 +590,7 @@ typedef void (^OrphanDataBlock)(OWSOrphanData *); // We need to avoid cleaning up new attachments and files that are still in the process of // being created/written, so we don't clean up anything recent. const NSTimeInterval kMinimumOrphanAgeSeconds = CurrentAppContext().isRunningTests ? 0.f : 15 * kMinuteInterval; - NSDate *appLaunchTime = AppVersion.sharedInstance.appLaunchTime; + NSDate *appLaunchTime = CurrentAppContext().appLaunchTime; NSTimeInterval thresholdTimestamp = appLaunchTime.timeIntervalSince1970 - kMinimumOrphanAgeSeconds; NSDate *thresholdDate = [NSDate dateWithTimeIntervalSince1970:thresholdTimestamp]; [databaseConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { diff --git a/SignalServiceKit/src/Util/AppVersion.h b/SignalServiceKit/src/Util/AppVersion.h index 71da4ce72..02699caf5 100755 --- a/SignalServiceKit/src/Util/AppVersion.h +++ b/SignalServiceKit/src/Util/AppVersion.h @@ -14,8 +14,6 @@ @property (atomic, readonly) NSString *lastCompletedLaunchMainAppVersion; @property (atomic, readonly) NSString *lastCompletedLaunchSAEAppVersion; -@property (atomic, readonly) NSDate *appLaunchTime; - - (instancetype)init NS_UNAVAILABLE; + (instancetype)sharedInstance; diff --git a/SignalServiceKit/src/Util/AppVersion.m b/SignalServiceKit/src/Util/AppVersion.m index ff9901825..395692d90 100755 --- a/SignalServiceKit/src/Util/AppVersion.m +++ b/SignalServiceKit/src/Util/AppVersion.m @@ -43,8 +43,6 @@ NSString *const kNSUserDefaults_LastCompletedLaunchAppVersion_SAE - (void)configure { OWSAssertIsOnMainThread(); - _appLaunchTime = [NSDate new]; - self.currentAppVersion = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"]; // The version of the app when it was first launched. From 5d3b0f793970b048fcec67fc97ef623d49e61db7 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 8 Aug 2018 14:44:04 -0400 Subject: [PATCH 2/2] "Bump build to 2.29.0.0." --- Signal/Signal-Info.plist | 4 ++-- SignalShareExtension/Info.plist | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 189d8069b..b9c03055a 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -21,7 +21,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.28.1 + 2.29.0 CFBundleSignature ???? CFBundleURLTypes @@ -38,7 +38,7 @@ CFBundleVersion - 2.28.1.5 + 2.29.0.0 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index cc5fdfd3c..4dc69287a 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 2.28.1 + 2.29.0 CFBundleVersion - 2.28.1.5 + 2.29.0.0 ITSAppUsesNonExemptEncryption NSAppTransportSecurity