MapboxAccountManager refactor, removal deprecated accesstoken (#7462)

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

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

1 files changed, 5 insertions, 6 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java
index ef6b9670db..2c6251638a 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java
@@ -6,10 +6,8 @@ import android.content.pm.PackageInfo;
 import android.os.Build;
 import android.text.TextUtils;
 
-import timber.log.Timber;
-
 import com.mapbox.mapboxsdk.BuildConfig;
-import com.mapbox.mapboxsdk.MapboxAccountManager;
+import com.mapbox.mapboxsdk.Mapbox;
 import com.mapbox.mapboxsdk.constants.MapboxConstants;
 
 import java.io.IOException;
@@ -29,6 +27,7 @@ import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 import okhttp3.internal.Util;
+import timber.log.Timber;
 
 class HTTPRequest implements Callback {
 
@@ -58,7 +57,7 @@ class HTTPRequest implements Callback {
 
     try {
       // Don't try a request if we aren't connected
-      if (!MapboxAccountManager.getInstance().isConnected()) {
+      if (!Mapbox.isConnected()) {
         throw new NoRouteToHostException("No Internet connection available.");
       }
 
@@ -196,11 +195,11 @@ class HTTPRequest implements Callback {
 
   private String getApplicationIdentifier() {
     try {
-      Context context = MapboxAccountManager.getInstance().getApplicationContext();
+      Context context = Mapbox.getApplicationContext();
       PackageInfo packageInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
       return String.format("%s/%s (%s)", context.getPackageName(), packageInfo.versionName, packageInfo.versionCode);
     } catch (Exception exception) {
       return "";
     }
   }
-}
+}
\ No newline at end of file