summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2015-05-12 16:16:48 -0700
committerMinh Nguyễn <mxn@1ec5.org>2015-05-12 16:16:48 -0700
commit7ed31065ed9fb165d2467d17668fa7fe724d566a (patch)
tree8d4e10825fd93c77ab4ee6f39b3a912263311019 /platform
parent9850488253341653429c13d9254ecee9f87346f1 (diff)
downloadqtlocation-mapboxgl-7ed31065ed9fb165d2467d17668fa7fe724d566a.tar.gz
Cleaned up in-app opt-out property
Renamed the property to be consistent with the public class methods. Also removed a spurious #import of a .m file.
Diffstat (limited to 'platform')
-rw-r--r--platform/ios/MGLAccountManager.m10
-rw-r--r--platform/ios/MGLMapboxEvents.m1
2 files changed, 5 insertions, 6 deletions
diff --git a/platform/ios/MGLAccountManager.m b/platform/ios/MGLAccountManager.m
index 0539fb9dca..9490e91bae 100644
--- a/platform/ios/MGLAccountManager.m
+++ b/platform/ios/MGLAccountManager.m
@@ -6,7 +6,7 @@
@interface MGLAccountManager()
-@property (atomic) BOOL showsOptOutInApp;
+@property (atomic) BOOL mapboxMetricsEnabledSettingShownInApp;
@property (atomic) NSString *accessToken;
@end
@@ -24,7 +24,7 @@ static MGLAccountManager *_sharedManager;
if ( ! NSProcessInfo.processInfo.mgl_isInterfaceBuilderDesignablesAgent) {
void (^setupBlock)() = ^{
_sharedManager = [[self alloc] init];
- _sharedManager.showsOptOutInApp = NO;
+ _sharedManager.mapboxMetricsEnabledSettingShownInApp = NO;
};
if ( ! [[NSThread currentThread] isMainThread]) {
dispatch_sync(dispatch_get_main_queue(), ^{
@@ -39,12 +39,12 @@ static MGLAccountManager *_sharedManager;
return _sharedManager;
}
-+ (void) setMapboxMetricsEnabledSettingShownInApp:(BOOL)showsOptOut {
- [MGLAccountManager sharedManager].showsOptOutInApp = showsOptOut;
++ (void) setMapboxMetricsEnabledSettingShownInApp:(BOOL)shown {
+ [MGLAccountManager sharedManager].mapboxMetricsEnabledSettingShownInApp = shown;
}
+ (BOOL) mapboxMetricsEnabledSettingShownInApp {
- return [MGLAccountManager sharedManager].showsOptOutInApp;
+ return [MGLAccountManager sharedManager].mapboxMetricsEnabledSettingShownInApp;
}
+ (void) setAccessToken:(NSString *) accessToken {
diff --git a/platform/ios/MGLMapboxEvents.m b/platform/ios/MGLMapboxEvents.m
index 12ed243592..fb94479723 100644
--- a/platform/ios/MGLMapboxEvents.m
+++ b/platform/ios/MGLMapboxEvents.m
@@ -10,7 +10,6 @@
#import "NSProcessInfo+MGLAdditions.h"
#import "NSBundle+MGLAdditions.h"
#import "NSException+MGLAdditions.h"
-#import "MGLAccountManager.m"
#include <sys/sysctl.h>