[android] allow setting a null access token in the runtime

mapbox · Jul 11, 2019 · 4348169 · 4348169
1 parent 348c437
commit 4348169
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 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
@@ -85,7 +85,7 @@ public static String getAccessToken() {
   /**
    * Set the current active accessToken.
    */
-  public static void setAccessToken(String accessToken) {
+  public static void setAccessToken(@Nullable String accessToken) {
     validateMapbox();
     INSTANCE.accessToken = accessToken;
 

diff --git a/...orm/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java b/...orm/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java
@@ -380,7 +380,7 @@ private FileSource(String cachePath, AssetManager assetManager) {
   public native void deactivate();
 
   @Keep
-  public native void setAccessToken(@NonNull String accessToken);
+  public native void setAccessToken(@Nullable String accessToken);
 
   @NonNull
   @Keep

diff --git a/platform/android/src/file_source.cpp b/platform/android/src/file_source.cpp
@@ -48,7 +48,7 @@ jni::Local<jni::String> FileSource::getAccessToken(jni::JNIEnv& env) {
 }
 
 void FileSource::setAccessToken(jni::JNIEnv& env, const jni::String& token) {
-    fileSource->setAccessToken(jni::Make<std::string>(env, token));
+    fileSource->setAccessToken(token ? jni::Make<std::string>(env, token) : "");
 }
 
 void FileSource::setAPIBaseUrl(jni::JNIEnv& env, const jni::String& url) {
-Original file line number
+Diff line change
@@ Expand Up @@
       public native void deactivate();
       @Keep
-      public native void setAccessToken(@NonNull String accessToken);
+      public native void setAccessToken(@Nullable String accessToken);
       @NonNull
       @Keep
@@ Expand Down @@