diff options
| author | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-02-13 11:40:40 -0500 |
|---|---|---|
| committer | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-02-13 11:40:40 -0500 |
| commit | b68266953fab505ad257c7ab471a75eb9bd634bc (patch) | |
| tree | 0fb029e6b2a967a678a69993bd0e018291143f92 /platform/ios/src/MGLMapboxEvents.m | |
| parent | 44ca0a5ec4979138514e8dda10dd1b1173dd0db1 (diff) | |
| parent | 3a0c87b1b4d4f2789a2ca5e995a79a7bad4f761f (diff) | |
| download | qtlocation-mapboxgl-b68266953fab505ad257c7ab471a75eb9bd634bc.tar.gz | |
Merge tag 'ios-v3.7.4' into master
# Conflicts:
# include/mbgl/style/conversion/tileset.hpp
# include/mbgl/util/tileset.hpp
# platform/android/CHANGELOG.md
# platform/android/MapboxGLAndroidSDK/gradle.properties
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
# platform/ios/CHANGELOG.md
# platform/ios/ios.xcodeproj/project.pbxproj
# platform/macos/CHANGELOG.md
# src/mbgl/layout/symbol_projection.cpp
# src/mbgl/renderer/tile_pyramid.cpp
# src/mbgl/style/conversion/tileset.cpp
Diffstat (limited to 'platform/ios/src/MGLMapboxEvents.m')
| -rw-r--r-- | platform/ios/src/MGLMapboxEvents.m | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/platform/ios/src/MGLMapboxEvents.m b/platform/ios/src/MGLMapboxEvents.m index d59972f5bf..273af5b3bc 100644 --- a/platform/ios/src/MGLMapboxEvents.m +++ b/platform/ios/src/MGLMapboxEvents.m @@ -6,6 +6,7 @@ #import "NSException+MGLAdditions.h" #import "MGLAPIClient.h" #import "MGLLocationManager.h" +#import "MGLTelemetryConfig.h" #include <mbgl/storage/reachability.h> #include <sys/sysctl.h> @@ -172,6 +173,8 @@ const NSTimeInterval MGLFlushInterval = 180; - (instancetype) init { self = [super init]; if (self) { + [MGLTelemetryConfig.sharedConfig configurationFromKey:[[NSUserDefaults standardUserDefaults] objectForKey:MGLMapboxMetricsProfile]]; + _currentAccountTypeValue = @0; _currentMetricsEnabledValue = YES; |