[android] - avoid nullpointer by validating Mapbox.java creation when validating accessTokens. (#8680)

1 files changed, 7 insertions, 10 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/InvalidAccessTokenException.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/MapboxConfigurationException.java
index 95851fc1d2..74bceb196c 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/InvalidAccessTokenException.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/MapboxConfigurationException.java
@@ -1,21 +1,18 @@
 package com.mapbox.mapboxsdk.exceptions;
 
 import android.content.Context;
-import android.os.Bundle;
-
-import com.mapbox.mapboxsdk.maps.MapView;
 
 /**
- * A {@code InvalidAccessTokenException} is thrown by {@link com.mapbox.mapboxsdk.maps.MapboxMap}
- * when there is either no access token set before {@link MapView#onCreate(Bundle)} or an invalid access token
- * is set in {@link com.mapbox.mapboxsdk.Mapbox#getInstance(Context, String)}
- *
- * @see MapView#onCreate(Bundle)
+ * A MapboxConfigurationException is thrown by MapboxMap when the SDK hasn't been properly initialised.
+ * <p>
+ * This occurs either when {@link com.mapbox.mapboxsdk.Mapbox} is not correctly initialised or the provided access token
+ * through {@link com.mapbox.mapboxsdk.Mapbox#getInstance(Context, String)} isn't valid.
+ * </p>
  * @see com.mapbox.mapboxsdk.Mapbox#getInstance(Context, String)
  */
-public class InvalidAccessTokenException extends RuntimeException {
+public class MapboxConfigurationException extends RuntimeException {
 
-  public InvalidAccessTokenException() {
+  public MapboxConfigurationException() {
     super("\nUsing MapView requires setting a valid access token. Use Mapbox.getInstance(Context context, "
       + "String accessToken) to provide one. "
       + "\nPlease see https://www.mapbox.com/help/create-api-access-token/ to learn how to create one."