MapboxAccountManager refactor, removal deprecated accesstoken (#7462)

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

* [android] - MapboxAccountManager refactor, removal deprecated accesstoken.
This commit is contained in:
Tobrun
2016-12-17 20:25:16 +01:00
committed by GitHub
parent 20b958301e
commit 83f1350747
28 changed files with 989 additions and 1287 deletions

View File

@@ -166,4 +166,4 @@ public class CameraInternalApiTest {
MapViewUtils.setLatLng(mapboxMap, new LatLng(1.1, 2.2));
}
}
}
}

View File

@@ -3,7 +3,7 @@ package com.mapbox.mapboxsdk.testapp;
import android.app.Application;
import android.os.StrictMode;
import com.mapbox.mapboxsdk.MapboxAccountManager;
import com.mapbox.mapboxsdk.Mapbox;
import com.squareup.leakcanary.LeakCanary;
import timber.log.Timber;
@@ -37,7 +37,7 @@ public class MapboxApplication extends Application {
.penaltyDeath()
.build());
MapboxAccountManager.start(getApplicationContext(), getString(R.string.mapbox_access_token));
Mapbox.getInstance(getApplicationContext(), getString(R.string.mapbox_access_token));
}
private void initializeLogger() {

View File

@@ -6,16 +6,13 @@ import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.text.TextUtils;
import timber.log.Timber;
import android.view.MenuItem;
import android.view.View;
import android.widget.Button;
import android.widget.ProgressBar;
import android.widget.Toast;
import com.mapbox.mapboxsdk.MapboxAccountManager;
import com.mapbox.mapboxsdk.Mapbox;
import com.mapbox.mapboxsdk.camera.CameraPosition;
import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
import com.mapbox.mapboxsdk.constants.MapboxConstants;
@@ -37,6 +34,8 @@ import com.mapbox.mapboxsdk.testapp.utils.OfflineUtils;
import java.util.ArrayList;
import timber.log.Timber;
public class OfflineActivity extends AppCompatActivity
implements OfflineDownloadRegionDialog.DownloadRegionDialogListener {
@@ -78,12 +77,12 @@ public class OfflineActivity extends AppCompatActivity
actionBar.setDisplayShowHomeEnabled(true);
}
// You can use MapboxAccountManager.setConnected(Boolean) to manually set the connectivity
// You can use Mapbox.setConnected(Boolean) to manually set the connectivity
// state of your app. This will override any checks performed via the ConnectivityManager.
//MapboxAccountManager.getInstance().setConnected(false);
Boolean connected = MapboxAccountManager.getInstance().isConnected();
//Mapbox.getInstance().setConnected(false);
Boolean connected = Mapbox.isConnected();
Timber.d(String.format(MapboxConstants.MAPBOX_LOCALE,
"MapboxAccountManager is connected: %b", connected));
"Mapbox is connected: %b", connected));
// Set up map
mapView = (MapView) findViewById(R.id.mapView);
@@ -186,7 +185,6 @@ public class OfflineActivity extends AppCompatActivity
/*
* Buttons logic
*/
private void handleDownloadRegion() {
Timber.d("handleDownloadRegion");
@@ -234,7 +232,6 @@ public class OfflineActivity extends AppCompatActivity
/*
* Dialogs
*/
@Override
public void onDownloadRegionDialogPositiveClick(final String regionName) {
if (TextUtils.isEmpty(regionName)) {
@@ -318,7 +315,6 @@ public class OfflineActivity extends AppCompatActivity
/*
* Progress bar
*/
private void startProgress() {
// Disable buttons
downloadRegion.setEnabled(false);
@@ -353,5 +349,4 @@ public class OfflineActivity extends AppCompatActivity
// Show a toast
Toast.makeText(OfflineActivity.this, message, Toast.LENGTH_LONG).show();
}
}
}

View File

@@ -177,21 +177,14 @@ public class MapboxMapOptionsTest {
@Test
public void testMyLocationForegroundTint() {
assertEquals(Color.BLUE,
new MapboxMapOptions().myLocationForegroundTintColor(Color.BLUE).getMyLocationForegroundTintColor());
assertEquals(Color.BLUE, new MapboxMapOptions()
.myLocationForegroundTintColor(Color.BLUE).getMyLocationForegroundTintColor());
}
@Test
public void testMyLocationBackgroundTint() {
assertEquals(Color.BLUE,
new MapboxMapOptions().myLocationBackgroundTintColor(Color.BLUE).getMyLocationBackgroundTintColor());
}
@Test
public void testAccessToken() {
assertNull(new MapboxMapOptions().getAccessToken());
assertEquals("test", new MapboxMapOptions().accessToken("test").getAccessToken());
assertNotEquals("nottest", new MapboxMapOptions().accessToken("test").getStyle());
assertEquals(Color.BLUE, new MapboxMapOptions()
.myLocationBackgroundTintColor(Color.BLUE).getMyLocationBackgroundTintColor());
}
}