From 27700ef78fcb93c5d39193668663eeb342f5ad20 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 11 Oct 2018 09:36:47 -0400 Subject: [PATCH] Revert AppVersion singleton. --- SignalMessaging/environment/AppSetup.m | 3 --- SignalServiceKit/src/SSKEnvironment.h | 3 --- SignalServiceKit/src/SSKEnvironment.m | 4 ---- SignalServiceKit/src/Tests/MockSSKEnvironment.m | 3 --- SignalServiceKit/src/Util/AppVersion.h | 2 ++ SignalServiceKit/src/Util/AppVersion.m | 13 ++++++++----- 6 files changed, 10 insertions(+), 18 deletions(-) diff --git a/SignalMessaging/environment/AppSetup.m b/SignalMessaging/environment/AppSetup.m index dfe143bd0..5ad6b95b6 100644 --- a/SignalMessaging/environment/AppSetup.m +++ b/SignalMessaging/environment/AppSetup.m @@ -10,7 +10,6 @@ #import #import #import -#import #import #import #import @@ -71,7 +70,6 @@ NS_ASSUME_NONNULL_BEGIN TSSocketManager *socketManager = [[TSSocketManager alloc] init]; TSAccountManager *tsAccountManager = [[TSAccountManager alloc] initWithPrimaryStorage:primaryStorage]; OWS2FAManager *ows2FAManager = [[OWS2FAManager alloc] initWithPrimaryStorage:primaryStorage]; - AppVersion *appVersion = [[AppVersion alloc] init]; AppReadiness *appReadiness = [[AppReadiness alloc] initDefault]; OWSDisappearingMessagesJob *disappearingMessagesJob = [[OWSDisappearingMessagesJob alloc] initWithPrimaryStorage:primaryStorage]; @@ -95,7 +93,6 @@ NS_ASSUME_NONNULL_BEGIN socketManager:socketManager tsAccountManager:tsAccountManager ows2FAManager:ows2FAManager - appVersion:appVersion appReadiness:appReadiness disappearingMessagesJob:disappearingMessagesJob contactDiscoveryService:contactDiscoveryService]]; diff --git a/SignalServiceKit/src/SSKEnvironment.h b/SignalServiceKit/src/SSKEnvironment.h index b0f4517d7..875bce181 100644 --- a/SignalServiceKit/src/SSKEnvironment.h +++ b/SignalServiceKit/src/SSKEnvironment.h @@ -5,7 +5,6 @@ NS_ASSUME_NONNULL_BEGIN @class AppReadiness; -@class AppVersion; @class ContactDiscoveryService; @class ContactsUpdater; @class OWS2FAManager; @@ -47,7 +46,6 @@ NS_ASSUME_NONNULL_BEGIN socketManager:(TSSocketManager *)socketManager tsAccountManager:(TSAccountManager *)tsAccountManager ows2FAManager:(OWS2FAManager *)ows2FAManager - appVersion:(AppVersion *)appVersion appReadiness:(AppReadiness *)appReadiness disappearingMessagesJob:(OWSDisappearingMessagesJob *)disappearingMessagesJob contactDiscoveryService:(ContactDiscoveryService *)contactDiscoveryService NS_DESIGNATED_INITIALIZER; @@ -79,7 +77,6 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, readonly) TSSocketManager *socketManager; @property (nonatomic, readonly) TSAccountManager *tsAccountManager; @property (nonatomic, readonly) OWS2FAManager *ows2FAManager; -@property (nonatomic, readonly) AppVersion *appVersion; @property (nonatomic, readonly) AppReadiness *appReadiness; @property (nonatomic, readonly) OWSDisappearingMessagesJob *disappearingMessagesJob; @property (nonatomic, readonly) ContactDiscoveryService *contactDiscoveryService; diff --git a/SignalServiceKit/src/SSKEnvironment.m b/SignalServiceKit/src/SSKEnvironment.m index e163eb85b..a0e323682 100644 --- a/SignalServiceKit/src/SSKEnvironment.m +++ b/SignalServiceKit/src/SSKEnvironment.m @@ -28,7 +28,6 @@ static SSKEnvironment *sharedSSKEnvironment; @property (nonatomic) TSSocketManager *socketManager; @property (nonatomic) TSAccountManager *tsAccountManager; @property (nonatomic) OWS2FAManager *ows2FAManager; -@property (nonatomic) AppVersion *appVersion; @property (nonatomic) AppReadiness *appReadiness; @property (nonatomic) OWSDisappearingMessagesJob *disappearingMessagesJob; @property (nonatomic) ContactDiscoveryService *contactDiscoveryService; @@ -59,7 +58,6 @@ static SSKEnvironment *sharedSSKEnvironment; socketManager:(TSSocketManager *)socketManager tsAccountManager:(TSAccountManager *)tsAccountManager ows2FAManager:(OWS2FAManager *)ows2FAManager - appVersion:(AppVersion *)appVersion appReadiness:(AppReadiness *)appReadiness disappearingMessagesJob:(OWSDisappearingMessagesJob *)disappearingMessagesJob contactDiscoveryService:(ContactDiscoveryService *)contactDiscoveryService { @@ -84,7 +82,6 @@ static SSKEnvironment *sharedSSKEnvironment; OWSAssertDebug(socketManager); OWSAssertDebug(tsAccountManager); OWSAssertDebug(ows2FAManager); - OWSAssertDebug(appVersion); OWSAssertDebug(appReadiness); OWSAssertDebug(disappearingMessagesJob); OWSAssertDebug(contactDiscoveryService); @@ -105,7 +102,6 @@ static SSKEnvironment *sharedSSKEnvironment; _socketManager = socketManager; _tsAccountManager = tsAccountManager; _ows2FAManager = ows2FAManager; - _appVersion = appVersion; _appReadiness = appReadiness; _disappearingMessagesJob = disappearingMessagesJob; _contactDiscoveryService = contactDiscoveryService; diff --git a/SignalServiceKit/src/Tests/MockSSKEnvironment.m b/SignalServiceKit/src/Tests/MockSSKEnvironment.m index 098a761a3..b9865295d 100644 --- a/SignalServiceKit/src/Tests/MockSSKEnvironment.m +++ b/SignalServiceKit/src/Tests/MockSSKEnvironment.m @@ -4,7 +4,6 @@ #import "MockSSKEnvironment.h" #import "AppReadiness.h" -#import "AppVersion.h" #import "ContactDiscoveryService.h" #import "OWS2FAManager.h" #import "OWSBatchMessageProcessor.h" @@ -66,7 +65,6 @@ NS_ASSUME_NONNULL_BEGIN TSSocketManager *socketManager = [[TSSocketManager alloc] init]; TSAccountManager *tsAccountManager = [[TSAccountManager alloc] initWithPrimaryStorage:primaryStorage]; OWS2FAManager *ows2FAManager = [[OWS2FAManager alloc] initWithPrimaryStorage:primaryStorage]; - AppVersion *appVersion = [[AppVersion alloc] init]; AppReadiness *appReadiness = [[AppReadiness alloc] initDefault]; OWSDisappearingMessagesJob *disappearingMessagesJob = [[OWSDisappearingMessagesJob alloc] initWithPrimaryStorage:primaryStorage]; @@ -88,7 +86,6 @@ NS_ASSUME_NONNULL_BEGIN socketManager:socketManager tsAccountManager:tsAccountManager ows2FAManager:ows2FAManager - appVersion:appVersion appReadiness:appReadiness disappearingMessagesJob:disappearingMessagesJob contactDiscoveryService:contactDiscoveryService]; diff --git a/SignalServiceKit/src/Util/AppVersion.h b/SignalServiceKit/src/Util/AppVersion.h index 697adc1a2..02699caf5 100755 --- a/SignalServiceKit/src/Util/AppVersion.h +++ b/SignalServiceKit/src/Util/AppVersion.h @@ -14,6 +14,8 @@ @property (atomic, readonly) NSString *lastCompletedLaunchMainAppVersion; @property (atomic, readonly) NSString *lastCompletedLaunchSAEAppVersion; +- (instancetype)init NS_UNAVAILABLE; + + (instancetype)sharedInstance; - (void)mainAppLaunchDidComplete; diff --git a/SignalServiceKit/src/Util/AppVersion.m b/SignalServiceKit/src/Util/AppVersion.m index 1841b616a..faef959ac 100755 --- a/SignalServiceKit/src/Util/AppVersion.m +++ b/SignalServiceKit/src/Util/AppVersion.m @@ -3,8 +3,7 @@ // #import "AppVersion.h" -#import "NSUserDefaults+OWS.h" -#import "SSKEnvironment.h" +#import NSString *const kNSUserDefaults_FirstAppVersion = @"kNSUserDefaults_FirstAppVersion"; NSString *const kNSUserDefaults_LastAppVersion = @"kNSUserDefaults_LastVersion"; @@ -32,9 +31,13 @@ NSString *const kNSUserDefaults_LastCompletedLaunchAppVersion_SAE + (instancetype)sharedInstance { - OWSAssertDebug(SSKEnvironment.shared.appVersion); - - return SSKEnvironment.shared.appVersion; + static AppVersion *instance = nil; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + instance = [AppVersion new]; + [instance configure]; + }); + return instance; } - (void)configure {