Use hasInstance on public static getters of Mapbox.java (#128)

mapbox · Jan 7, 2020 · 2da60d2 · 2da60d2
1 parent d8fc70e
commit 2da60d2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java b/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
@@ -115,7 +115,7 @@ public static void setAccessToken(String accessToken) {
    * @return the SKU token
    */
   public static String getSkuToken() {
-    if (INSTANCE.accounts == null) {
+    if (!hasInstance() || INSTANCE.accounts == null) {
       throw new MapboxConfigurationException(
         "A valid access token parameter is required when using a Mapbox service."
           + "\nPlease see https://www.mapbox.com/help/create-api-access-token/ to learn how to create one."
@@ -179,7 +179,7 @@ private static void initializeTelemetry() {
    */
   @Nullable
   public static TelemetryDefinition getTelemetry() {
-    return INSTANCE.telemetry;
+    return hasInstance() ? INSTANCE.telemetry : null;
   }
 
   /**