diff options
author | Jason Wray <jason@mapbox.com> | 2019-05-14 15:39:24 -0700 |
---|---|---|
committer | Jason Wray <friedbunny@users.noreply.github.com> | 2019-05-15 11:22:04 -0700 |
commit | 7f45afaedd42f214f9967223ec747e9cd142632e (patch) | |
tree | c85826280ced03a572fc02e54685d5bec5d15589 /platform/darwin/src/MGLAccountManager.m | |
parent | 66e896fab930f995556865ec19b9553c7b57d1cf (diff) | |
download | qtlocation-mapboxgl-7f45afaedd42f214f9967223ec747e9cd142632e.tar.gz |
Revert "[ios] CP #14467 - Enable/Disable sku token handling (#14502)"
This reverts commit 4920cec4d9b5abf7a8d7a56924e07b562e10c40b.
Diffstat (limited to 'platform/darwin/src/MGLAccountManager.m')
-rw-r--r-- | platform/darwin/src/MGLAccountManager.m | 43 |
1 files changed, 8 insertions, 35 deletions
diff --git a/platform/darwin/src/MGLAccountManager.m b/platform/darwin/src/MGLAccountManager.m index edcfbbcdf0..0566605323 100644 --- a/platform/darwin/src/MGLAccountManager.m +++ b/platform/darwin/src/MGLAccountManager.m @@ -10,8 +10,6 @@ #import "MBXSKUToken.h" #endif -static BOOL _MGLAccountsSDKEnabled; - @interface MGLAccountManager () @property (atomic) NSString *accessToken; @@ -21,6 +19,7 @@ static BOOL _MGLAccountsSDKEnabled; @property (atomic) NSString *skuToken; @property (atomic) NSDate *skuTokenExpiration; #endif + @end @implementation MGLAccountManager @@ -33,7 +32,7 @@ static BOOL _MGLAccountsSDKEnabled; if (accessToken.length) { self.accessToken = accessToken; } - + NSString *apiBaseURL = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"MGLMapboxAPIBaseURL"]; // If apiBaseURL is not a valid URL, [NSURL URLWithString:] will be `nil`. @@ -42,17 +41,7 @@ static BOOL _MGLAccountsSDKEnabled; } #if TARGET_OS_IPHONE || TARGET_OS_SIMULATOR - // TODO: Use MGL_OBJC_DYNAMIC_CAST (that requires moving the macro, where it - // doesn't require a C++ header) - NSNumber *accountsSDKNumber = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"MGLMapboxAccountsSDKEnabled"]; - if ([accountsSDKNumber isKindOfClass:[NSNumber class]]) { - _MGLAccountsSDKEnabled = ((NSNumber*)accountsSDKNumber).boolValue; - } - - if (self.isAccountsSDKEnabled) { - self.skuToken = MBXSKUToken.mapsToken; - } - + self.skuToken = [MBXSKUToken skuToken]; #endif } @@ -112,31 +101,15 @@ static BOOL _MGLAccountsSDKEnabled; #if TARGET_OS_IPHONE || TARGET_OS_SIMULATOR -+ (BOOL)isAccountsSDKEnabled { - return _MGLAccountsSDKEnabled; -} - + (void)setSkuToken:(NSString *)skuToken { - if (MGLAccountManager.isAccountsSDKEnabled) { - NSTimeInterval oneHour = 60 * 60; // TODO: make this const - MGLAccountManager.sharedManager.skuTokenExpiration = [NSDate dateWithTimeIntervalSinceNow:oneHour]; - MGLAccountManager.sharedManager.skuToken = skuToken; - } - else { - MGLAccountManager.sharedManager.skuTokenExpiration = [NSDate distantFuture]; - MGLAccountManager.sharedManager.skuToken = nil; - } + NSTimeInterval oneHour = 60 * 60; // TODO: make this const + MGLAccountManager.sharedManager.skuTokenExpiration = [NSDate dateWithTimeIntervalSinceNow:oneHour]; + + MGLAccountManager.sharedManager.skuToken = skuToken; } + (NSString *)skuToken { - if (MGLAccountManager.isAccountsSDKEnabled) { - return [MGLAccountManager.sharedManager isSKUTokenExpired] ? - MBXSKUToken.mapsToken : - MGLAccountManager.sharedManager.skuToken; - } - else { - return nil; - } + return [MGLAccountManager.sharedManager isSKUTokenExpired] ? [MBXSKUToken skuToken] : MGLAccountManager.sharedManager.skuToken; } - (BOOL)isSKUTokenExpired { |