diff options
author | Tobrun <tobrun@mapbox.com> | 2018-05-25 11:42:57 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-25 11:42:57 +0200 |
commit | 7710934ff0a2223ae502f6ddce8080f8cf61c9b7 (patch) | |
tree | 2859653b6ee847f4e183a66a91c3c712b6b76636 /platform/android/MapboxGLAndroidSDKTestApp/src/main | |
parent | 7d050c4cdaf65dedad5ffc740c8819b5aa4e1d47 (diff) | |
download | qtlocation-mapboxgl-7710934ff0a2223ae502f6ddce8080f8cf61c9b7.tar.gz |
[android] - remove requirement of having a mapbox access token (#12001)
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main')
-rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapboxApplication.java | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapboxApplication.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapboxApplication.java index fa13959112..a06a489388 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapboxApplication.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapboxApplication.java @@ -3,12 +3,10 @@ package com.mapbox.mapboxsdk.testapp; import android.app.Application; import android.os.StrictMode; import android.text.TextUtils; - import com.mapbox.mapboxsdk.Mapbox; import com.mapbox.mapboxsdk.maps.Telemetry; import com.mapbox.mapboxsdk.testapp.utils.TokenUtils; import com.squareup.leakcanary.LeakCanary; - import timber.log.Timber; import static timber.log.Timber.DebugTree; @@ -30,16 +28,31 @@ public class MapboxApplication extends Application { @Override public void onCreate() { super.onCreate(); + if (!initializeLeakCanary()) { + return; + } + initializeLogger(); + initializeStrictMode(); + initializeMapbox(); + } + private boolean initializeLeakCanary() { if (LeakCanary.isInAnalyzerProcess(this)) { // This process is dedicated to LeakCanary for heap analysis. // You should not init your app in this process. - return; + return false; } LeakCanary.install(this); + return true; + } - initializeLogger(); + private void initializeLogger() { + if (BuildConfig.DEBUG) { + Timber.plant(new DebugTree()); + } + } + private void initializeStrictMode() { StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder() .detectDiskReads() .detectDiskWrites() @@ -51,20 +64,18 @@ public class MapboxApplication extends Application { .penaltyLog() .penaltyDeath() .build()); + } - String mapboxAccessToken = TokenUtils.getMapboxAccessToken(getApplicationContext()); - if (TextUtils.isEmpty(mapboxAccessToken) || mapboxAccessToken.equals(DEFAULT_MAPBOX_ACCESS_TOKEN)) { - Timber.e(ACCESS_TOKEN_NOT_SET_MESSAGE); - } - - Mapbox.getInstance(getApplicationContext(), mapboxAccessToken); - + private void initializeMapbox() { + String accessToken = TokenUtils.getMapboxAccessToken(getApplicationContext()); + validateAccessToken(accessToken); + Mapbox.getInstance(getApplicationContext(), accessToken); Telemetry.updateDebugLoggingEnabled(true); } - private void initializeLogger() { - if (BuildConfig.DEBUG) { - Timber.plant(new DebugTree()); + private static void validateAccessToken(String accessToken) { + if (TextUtils.isEmpty(accessToken) || accessToken.equals(DEFAULT_MAPBOX_ACCESS_TOKEN)) { + Timber.e(ACCESS_TOKEN_NOT_SET_MESSAGE); } } } |