[android] - expose setAccesToken on Mapbox.javaupstream/tvn-expose-set-accestoken

2 files changed, 25 insertions, 1 deletions

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
    */
@@ -79,6 +79,15 @@ public final class Mapbox {
   }
 
   /**
+   * Set the current active accessToken.
+   */
+  public static void setAccessToken(String accessToken) {
+    validateMapbox();
+    INSTANCE.accessToken = accessToken;
+    FileSource.getInstance(getApplicationContext()).setAccessToken(accessToken);
+  }
+
+  /**
    * Application context
    *
    * @return the 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