tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] #4263 - fix null pointer on MapboxMapEventManager

Browse Source
This commit is contained in:
Tobrun
2016-03-10 11:57:29 -05:00
parent 64b163ee5d
commit 4cb75a5c36
2 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
View File

@@ -376,7 +376,8 @@ public class MapView extends FrameLayout {
validateTelemetryServiceConfigured();
// Start Telemetry (authorization determined in initial MapboxEventManager constructor)
MapboxEventManager.configureAndStartMapboxEventManager(getContext(), getAccessToken());
MapboxEventManager eventManager = MapboxEventManager.getMapboxEventManager();
eventManager.initialise(getContext(), getAccessToken());
}
// Initialize EGL

45
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java
View File

@@ -84,13 +84,22 @@ public class MapboxEventManager {
/**
* Private Constructor for configuring the single instance per app.
* @param context Application Context
* @param accessToken Access Token used in application, can be overridden by putting staging credentials in AppManifest
*/
private MapboxEventManager(@NonNull Context context, String accessToken) {
super();
private MapboxEventManager() {
}
/**
* Internal setup of MapboxEventsManager. It needs to be called once before @link MapboxEventManager#getMapboxEventManager
* <p/>
* This allows for a cleaner getMapboxEventManager() that doesn't require context and accessToken
*
* @param context The context associated with MapView
* @param accessToken The accessToken to load MapView
*/
public void initialise(@NonNull Context context, @NonNull String accessToken) {
this.context = context.getApplicationContext();
this.accessToken = accessToken;
this.context = context;
// Setup Message Digest
try {
@@ -156,27 +165,15 @@ public class MapboxEventManager {
batteryStatus = context.registerReceiver(null, iFilter);
}
/**
* Internal setup of MapboxEventsManager. It needs to be called once before @link MapboxEventManager#getMapboxEventManager
*
* This allows for a cleaner getMapboxEventManager() that doesn't require context and accessToken
*
* @param context Context
* @param accessToken Access Token
*/
public static void configureAndStartMapboxEventManager(@NonNull Context context, @NonNull String accessToken) {
if (mapboxEventManager != null) {
Log.w(TAG, "Singleton has already been created.");
return;
}
mapboxEventManager = new MapboxEventManager(context.getApplicationContext(), accessToken);
}
/**
* Primary Access method using Singleton pattern
*
* @return MapboxEventManager
*/
public static MapboxEventManager getMapboxEventManager() {
if (mapboxEventManager == null) {
mapboxEventManager = new MapboxEventManager();
}
return mapboxEventManager;
}
@@ -266,15 +263,19 @@ public class MapboxEventManager {
/**
* Push Interactive Events to the system for processing
*
* @param eventWithAttributes Event with attributes
*/
public void pushEvent(Hashtable<String, Object> eventWithAttributes) {
if (context == null || accessToken == null) {
return;
}
if (eventWithAttributes == null) {
return;
}
String eventType = (String)eventWithAttributes.get(MapboxEvent.ATTRIBUTE_EVENT);
String eventType = (String) eventWithAttributes.get(MapboxEvent.ATTRIBUTE_EVENT);
if (TextUtils.isEmpty(eventType)) {
return;
}