diff options
| author | Łukasz Paczos <lukas.paczos@gmail.com> | 2019-07-09 12:36:28 +0200 |
|---|---|---|
| committer | Łukasz Paczos <lukas.paczos@gmail.com> | 2019-07-09 13:37:08 +0200 |
| commit | 400301129c5d223d0ad0b552c02349193179aedc (patch) | |
| tree | e86d4632c2fd821ac7e7b266fa2d424acbeb981a | |
| parent | 9fe11f01710e94c6572ea9cecf40a7beb1975000 (diff) | |
| download | qtlocation-mapboxgl-upstream/lp-token-and-accounts-manager-15063.tar.gz | |
[android] allow setting a null access token in the runtimeupstream/lp-token-and-accounts-manager-15063
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) { |