diff options
author | Julian Rex <julian.rex@mapbox.com> | 2019-04-24 14:40:45 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-24 14:40:45 -0400 |
commit | 43553c37e98225d7951d0abb694b080075c1b4c4 (patch) | |
tree | f50aa8236a9116fff317421da3bf81e35074ebc5 /platform/ios | |
parent | 88a652542715c595105589e8356754e11245e699 (diff) | |
download | qtlocation-mapboxgl-43553c37e98225d7951d0abb694b080075c1b4c4.tar.gz |
[ios] Enable/Disable sku token handling (#14467)
Diffstat (limited to 'platform/ios')
-rw-r--r-- | platform/ios/src/MGLMapboxEvents.m | 5 | ||||
-rw-r--r-- | platform/ios/vendor/mapbox-accounts-ios/MBXSKUToken.h | 6 | ||||
-rw-r--r-- | platform/ios/vendor/mapbox-accounts-ios/libmbxaccounts.a | bin | 48440 -> 62456 bytes |
3 files changed, 8 insertions, 3 deletions
diff --git a/platform/ios/src/MGLMapboxEvents.m b/platform/ios/src/MGLMapboxEvents.m index 5cbb178c2c..bb16f77f98 100644 --- a/platform/ios/src/MGLMapboxEvents.m +++ b/platform/ios/src/MGLMapboxEvents.m @@ -1,6 +1,7 @@ #import "MGLMapboxEvents.h" #import "MBXSKUToken.h" #import "NSBundle+MGLAdditions.h" +#import "MGLAccountManager_Private.h" static NSString * const MGLAPIClientUserAgentBase = @"mapbox-maps-ios"; static NSString * const MGLMapboxAccountType = @"MGLMapboxAccountType"; @@ -144,7 +145,9 @@ static NSString * const MGLVariableGeofence = @"VariableGeofence"; [[MGLMapboxEvents sharedInstance] eventsManager].baseURL = [MGLMapboxEvents sharedInstance].baseURL; } - [[MGLMapboxEvents sharedInstance] eventsManager].skuId = MBXAccountsSKUIDMaps; + if (MGLAccountManager.isAccountsSDKEnabled) { + [[self sharedInstance] eventsManager].skuId = MBXAccountsMapsSKUIDMaps; + } [self flush]; }); diff --git a/platform/ios/vendor/mapbox-accounts-ios/MBXSKUToken.h b/platform/ios/vendor/mapbox-accounts-ios/MBXSKUToken.h index 3a812c89ad..e83ffd2288 100644 --- a/platform/ios/vendor/mapbox-accounts-ios/MBXSKUToken.h +++ b/platform/ios/vendor/mapbox-accounts-ios/MBXSKUToken.h @@ -2,11 +2,13 @@ NS_ASSUME_NONNULL_BEGIN -extern NSString *const MBXAccountsSKUIDMaps; +extern NSString *const MBXAccountsMapsSKUIDMaps; +extern NSString *const MBXAccountsNavigationSKUIDMaps; @interface MBXSKUToken : NSObject -+ (NSString *)skuToken; +@property (class, nonatomic, readonly) NSString *mapsToken; +@property (class, nonatomic, readonly) NSString *navigationToken; @end diff --git a/platform/ios/vendor/mapbox-accounts-ios/libmbxaccounts.a b/platform/ios/vendor/mapbox-accounts-ios/libmbxaccounts.a Binary files differindex e18e8ef4ef..678265bf35 100644 --- a/platform/ios/vendor/mapbox-accounts-ios/libmbxaccounts.a +++ b/platform/ios/vendor/mapbox-accounts-ios/libmbxaccounts.a |