MapboxAccountManager refactor, removal deprecated accesstoken (#7462)

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

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

1 files changed, 1 insertions, 57 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java
index c0052f8364..09b87333b6 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java
@@ -1,23 +1,18 @@
 package com.mapbox.mapboxsdk.maps;
 
 import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.content.ContextCompat;
-import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.mapbox.mapboxsdk.MapboxAccountManager;
 import com.mapbox.mapboxsdk.R;
 import com.mapbox.mapboxsdk.constants.MapboxConstants;
-import com.mapbox.mapboxsdk.exceptions.InvalidAccessTokenException;
 
 /**
  * Support Fragment wrapper around a map view.
@@ -81,24 +76,6 @@ public class SupportMapFragment extends Fragment {
       options = bundle.getParcelable(MapboxConstants.FRAG_ARG_MAPBOXMAPOPTIONS);
     }
 
-    // Assign an AccessToken if needed
-    if (options == null || options.getAccessToken() == null) {
-      String token = null;
-      if (MapboxAccountManager.getInstance() != null) {
-        token = MapboxAccountManager.getInstance().getAccessToken();
-      } else {
-        token = getToken(inflater.getContext());
-      }
-      if (TextUtils.isEmpty(token)) {
-        throw new InvalidAccessTokenException();
-      }
-      if (options == null) {
-        options = new MapboxMapOptions().accessToken(token);
-      } else {
-        options.accessToken(token);
-      }
-    }
-
     Drawable foregroundDrawable = options.getMyLocationForegroundDrawable();
     Drawable foregroundBearingDrawable = options.getMyLocationForegroundBearingDrawable();
     if (foregroundDrawable == null || foregroundBearingDrawable == null) {
@@ -119,39 +96,6 @@ public class SupportMapFragment extends Fragment {
   }
 
   /**
-   * <p>
-   * Returns the Mapbox access token set in the app resources.
-   * </p>
-   * It will first search the application manifest for a {@link MapboxConstants#KEY_META_DATA_MANIFEST}
-   * meta-data value. If not found it will then attempt to load the access token from the
-   * {@code res/raw/token.txt} development file.
-   *
-   * @param context The {@link Context} of the {@link android.app.Activity} or {@link android.app.Fragment}.
-   * @return The Mapbox access token or null if not found.
-   * @see MapboxConstants#KEY_META_DATA_MANIFEST
-   * @deprecated As of release 4.1.0, replaced by
-   * {@link com.mapbox.mapboxsdk.MapboxAccountManager#start(Context, String)}
-   */
-  @Deprecated
-  private String getToken(@NonNull Context context) {
-    try {
-      // read out AndroidManifest
-      PackageManager packageManager = context.getPackageManager();
-      ApplicationInfo appInfo = packageManager.getApplicationInfo(context.getPackageName(),
-        PackageManager.GET_META_DATA);
-      String token = appInfo.metaData.getString(MapboxConstants.KEY_META_DATA_MANIFEST);
-      if (token == null || token.isEmpty()) {
-        throw new IllegalArgumentException();
-      }
-      return token;
-    } catch (Exception exception) {
-      // use fallback on string resource, used for development
-      int tokenResId = context.getResources().getIdentifier("mapbox_access_token", "string", context.getPackageName());
-      return tokenResId != 0 ? context.getString(tokenResId) : null;
-    }
-  }
-
-  /**
    * Called when the fragment view hierarchy is created.
    *
    * @param view               The content view of the fragment
@@ -237,4 +181,4 @@ public class SupportMapFragment extends Fragment {
   public void getMapAsync(@NonNull final OnMapReadyCallback onMapReadyCallback) {
     this.onMapReadyCallback = onMapReadyCallback;
   }
-}
+}
\ No newline at end of file