From 0540f5954e5cfff6c0b7c27070268e4a561dc782 Mon Sep 17 00:00:00 2001 From: Tobrun Date: Fri, 16 Nov 2018 17:04:16 +0100 Subject: [android] - expose setAccesToken on Mapbox.java --- .../src/main/java/com/mapbox/mapboxsdk/Mapbox.java | 11 ++++++++++- .../java/com/mapbox/mapboxsdk/maps/MapboxTest.java | 15 +++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java index 61b0d85e2b..b761c85e1c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java @@ -68,7 +68,7 @@ public final class Mapbox { } /** - * Access token for this application. + * Get the current active access token for this application. * * @return Mapbox access token */ @@ -78,6 +78,15 @@ public final class Mapbox { return INSTANCE.accessToken; } + /** + * Set the current active accessToken. + */ + public static void setAccessToken(String accessToken) { + validateMapbox(); + INSTANCE.accessToken = accessToken; + FileSource.getInstance(getApplicationContext()).setAccessToken(accessToken); + } + /** * Application context * diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxTest.java index 3648aaeebe..7c84a92ae0 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapboxTest.java @@ -6,10 +6,14 @@ import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity; import org.junit.Test; import static junit.framework.Assert.assertFalse; +import static junit.framework.Assert.assertSame; import static junit.framework.Assert.assertTrue; public class MapboxTest extends BaseActivityTest { + private static final String ACCESS_TOKEN = "pk.0000000001"; + private static final String ACCESS_TOKEN_2 = "pk.0000000002"; + @Override protected Class getActivityClass() { return EspressoTestActivity.class; @@ -30,4 +34,15 @@ public class MapboxTest extends BaseActivityTest { Mapbox.setConnected(null); assertTrue(Mapbox.isConnected()); } + + @Test + public void setAccessToken() { + validateTestSetup(); + String realToken = Mapbox.getAccessToken(); + Mapbox.setAccessToken(ACCESS_TOKEN); + assertSame(ACCESS_TOKEN, Mapbox.getAccessToken()); + Mapbox.setAccessToken(ACCESS_TOKEN_2); + assertSame(ACCESS_TOKEN_2, Mapbox.getAccessToken()); + Mapbox.setAccessToken(realToken); + } } \ No newline at end of file -- cgit v1.2.1