MapboxAccountManager refactor, removal deprecated accesstoken (#7462)

* [android] - move object ownership, move depenencies and responsibility.

* [android] - MapboxAccountManager refactor, removal deprecated accesstoken.

2 files changed, 7 insertions, 28 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/InvalidAccessTokenException.java
index 9f95826ba3..95851fc1d2 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/InvalidAccessTokenException.java
@@ -1,23 +1,24 @@
 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 MapView#setAccessToken(String)}
+ * 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)
- * @see MapView#setAccessToken(String)
+ * @see com.mapbox.mapboxsdk.Mapbox#getInstance(Context, String)
  */
 public class InvalidAccessTokenException extends RuntimeException {
 
   public InvalidAccessTokenException() {
-    super("\nUsing MapView requires setting a valid access token. Use setAccessToken on Mapview to provide one. "
+    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."
       + "\nMore information in this guide https://www.mapbox.com/help/first-steps-android-sdk/#access-tokens.");
   }
-
 }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/MapboxAccountManagerNotStartedException.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/MapboxAccountManagerNotStartedException.java
deleted file mode 100644
index e1179b4aa9..0000000000
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/MapboxAccountManagerNotStartedException.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.mapbox.mapboxsdk.exceptions;
-
-import android.os.Bundle;
-
-import com.mapbox.mapboxsdk.MapboxAccountManager;
-import com.mapbox.mapboxsdk.maps.MapView;
-
-/**
- * A MapboxAccountManagerNotStartedException is thrown by {@link com.mapbox.mapboxsdk.maps.MapView}
- * when {@link MapboxAccountManager} is not started before {@link MapView#onCreate(Bundle)}.
- *
- * @see MapView#onCreate(Bundle)
- * @see MapboxAccountManager#start(android.content.Context, String)
- */
-public class MapboxAccountManagerNotStartedException extends RuntimeException {
-
-  public MapboxAccountManagerNotStartedException() {
-    super("\nMapboxAccountManager was not started correctly. Use MapboxAccountManager#start(Context, String) to"
-      + "initialise. "
-      + "\nMore information in this guide https://www.mapbox.com/help/first-steps-android-sdk/#access-tokens.");
-  }
-}