diff options
author | Jason Wray <friedbunny@users.noreply.github.com> | 2019-06-05 23:13:34 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-05 23:13:34 -0700 |
commit | bd3d19f5bdd7ac8e801fd3737a25a8b802e426ef (patch) | |
tree | 9a2c5c50cc6e856f0cd6b98a46e57705f015bf1e /platform/ios | |
parent | 36361192b1b55a272b6115876ffe18be55f6b964 (diff) | |
download | qtlocation-mapboxgl-bd3d19f5bdd7ac8e801fd3737a25a8b802e426ef.tar.gz |
[ios] Update libmbxaccounts for navigation SDK override (#14802)
* Use a stringy selector... yerg.
* Bump to libmbxaccounts 1.0.0
Diffstat (limited to 'platform/ios')
-rw-r--r-- | platform/ios/src/MGLMapboxEvents.m | 2 | ||||
-rw-r--r-- | platform/ios/vendor/mapbox-accounts-ios/MBXSKUToken.h | 30 | ||||
-rw-r--r-- | platform/ios/vendor/mapbox-accounts-ios/libmbxaccounts.a | bin | 74248 -> 96784 bytes |
3 files changed, 20 insertions, 12 deletions
diff --git a/platform/ios/src/MGLMapboxEvents.m b/platform/ios/src/MGLMapboxEvents.m index d5814dab46..edf1dffa40 100644 --- a/platform/ios/src/MGLMapboxEvents.m +++ b/platform/ios/src/MGLMapboxEvents.m @@ -145,7 +145,7 @@ static NSString * const MGLVariableGeofence = @"VariableGeofence"; [[MGLMapboxEvents sharedInstance] eventsManager].baseURL = [MGLMapboxEvents sharedInstance].baseURL; } - [[self sharedInstance] eventsManager].skuId = MBXAccountsSKUIDMaps; + [[self sharedInstance] eventsManager].skuId = MBXAccountsSKUIDMapsUser; [self flush]; }); diff --git a/platform/ios/vendor/mapbox-accounts-ios/MBXSKUToken.h b/platform/ios/vendor/mapbox-accounts-ios/MBXSKUToken.h index 8a02d9641c..c93b323b06 100644 --- a/platform/ios/vendor/mapbox-accounts-ios/MBXSKUToken.h +++ b/platform/ios/vendor/mapbox-accounts-ios/MBXSKUToken.h @@ -3,25 +3,33 @@ NS_ASSUME_NONNULL_BEGIN typedef NSString *MBXAccountsSKUID NS_TYPED_ENUM; -FOUNDATION_EXTERN const MBXAccountsSKUID MBXAccountsSKUIDMaps; -FOUNDATION_EXTERN const MBXAccountsSKUID MBXAccountsSKUIDNavigation; +FOUNDATION_EXTERN const MBXAccountsSKUID MBXAccountsSKUIDMapsUser; +FOUNDATION_EXTERN const MBXAccountsSKUID MBXAccountsSKUIDNavigationUser; +FOUNDATION_EXTERN const MBXAccountsSKUID MBXAccountsSKUIDNavigationSession; -typedef NS_ENUM(NSInteger, MBXAccountsSKUType) { - MBXAccountsSKUTypeUser, - MBXAccountsSKUTypeSession -}; @interface MBXSKUToken : NSObject /** - Generates a token for the given identifier and type. + Activates a specific SKU identifier. - @param skuId The sku identifier, e.g. maps or navigation. - @param type The type of token, e.g. user or session. + Defaults to `MBXAccountsSKUIDMapsUser`. - @return A SKU token for use with API requests. + See https://www.mapbox.com/pricing/ for more information */ -+ (NSString *)tokenForSKUID:(MBXAccountsSKUID)skuId type:(MBXAccountsSKUType)type NS_SWIFT_NAME(token(for:type:)); ++ (void)activateSKUID:(MBXAccountsSKUID)skuId; + +/** + Resets the current session. Calling this method has no effect unless the type + of the SKU id is of kind session. + */ ++ (void)resetSession; + +/** + Returns the current SKU token. `+[MBXSKUToken activateSKUID:]` must be called + before accessing this property unless an `MBXAccountsSKUIDMapsUser` token is preferred. + */ +@property (class, nonatomic, readonly) NSString *skuToken; @end diff --git a/platform/ios/vendor/mapbox-accounts-ios/libmbxaccounts.a b/platform/ios/vendor/mapbox-accounts-ios/libmbxaccounts.a Binary files differindex b57e17d47f..5cecc4c790 100644 --- a/platform/ios/vendor/mapbox-accounts-ios/libmbxaccounts.a +++ b/platform/ios/vendor/mapbox-accounts-ios/libmbxaccounts.a |