diff options
| author | Łukasz Paczos <lukas.paczos@gmail.com> | 2019-07-09 12:36:28 +0200 |
|---|---|---|
| committer | Łukasz Paczos <lukasz.paczos@mapbox.com> | 2019-07-11 11:02:24 +0200 |
| commit | 4348169aacfe71eef77a7eb54c1790848d03fa9d (patch) | |
| tree | bb4e75ae26d9862788b99e028bbecbbb5ea2b694 | |
| parent | 348c437c0a3fb177dc53b2a0b0a64e422964b82f (diff) | |
| download | qtlocation-mapboxgl-4348169aacfe71eef77a7eb54c1790848d03fa9d.tar.gz | |
[android] allow setting a null access token in the runtime
3 files changed, 3 insertions, 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 index 01c82ddad4..f384ee7342 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 @@ -85,7 +85,7 @@ public final class Mapbox { /** * 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/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java index cdf197411a..b40246b765 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java @@ -380,7 +380,7 @@ public class FileSource { 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 index ba5f18dbc4..05b57e5d1c 100644 --- 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) { |