Merge branch '1ec5-plist-1535'

1 files changed, 15 insertions, 17 deletions

diff --git a/ios/app/MBXAppDelegate.m b/ios/app/MBXAppDelegate.m
index dc04105083..b09235a278 100644
--- a/ios/app/MBXAppDelegate.m
+++ b/ios/app/MBXAppDelegate.m
@@ -6,24 +6,22 @@
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
-    // Set Access Token
-    NSString *accessToken = [[NSProcessInfo processInfo] environment][@"MAPBOX_ACCESS_TOKEN"];
-    if (accessToken) {
-        // Store to preferences so that we can launch the app later on without having to specify
-        // token.
-        [[NSUserDefaults standardUserDefaults] setObject:accessToken forKey:@"access_token"];
-    } else {
-        // Try to retrieve from preferences, maybe we've stored them there previously and can reuse
-        // the token.
-        accessToken = [[NSUserDefaults standardUserDefaults] objectForKey:@"access_token"];
-    }
-    if ( ! accessToken) NSLog(@"No access token set. Mapbox vector tiles won't work.");
-
-    // Signal To SDK That Opt Out Is In App UI
-//    [MGLAccountManager setMapboxMetricsEnabledSettingShownInApp:YES];
+    // Set access token, unless MGLAccountManager already read it in from Info.plist.
+    if ( ! [MGLAccountManager accessToken]) {
+        NSString *accessToken = [[NSProcessInfo processInfo] environment][@"MAPBOX_ACCESS_TOKEN"];
+        if (accessToken) {
+            // Store to preferences so that we can launch the app later on without having to specify
+            // token.
+            [[NSUserDefaults standardUserDefaults] setObject:accessToken forKey:@"access_token"];
+        } else {
+            // Try to retrieve from preferences, maybe we've stored them there previously and can reuse
+            // the token.
+            accessToken = [[NSUserDefaults standardUserDefaults] objectForKey:@"access_token"];
+        }
+        if ( ! accessToken) NSLog(@"No access token set. Mapbox vector tiles won't work.");
 
-    // Start Mapbox GL SDK
-    [MGLAccountManager setAccessToken:accessToken];
+        [MGLAccountManager setAccessToken:accessToken];
+    }
 
     self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
     self.window.rootViewController = [[UINavigationController alloc] initWithRootViewController:[MBXViewController new]];