From 09cac18420aa047a3972131197ec6d3c5ab6f731 Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Thu, 18 Feb 2016 10:44:28 -0600 Subject: [PATCH] [android] #3897 - Refactoring check that determines when to send turnstile event --- .../src/main/java/com/mapbox/mapboxsdk/maps/MapView.java | 1 - .../com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java index 248fb2841..67d67bba3 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java @@ -399,7 +399,6 @@ public class MapView extends FrameLayout { evt.put(MapboxEvent.KEY_LATITUDE, mMapboxMap.getCameraPosition().target.getLatitude()); evt.put(MapboxEvent.KEY_LONGITUDE, mMapboxMap.getCameraPosition().target.getLongitude()); evt.put(MapboxEvent.KEY_ZOOM, mMapboxMap.getCameraPosition().zoom); - // TODO - Punting on Push Enabled Key due to iOS nature for now MapboxEventManager.getMapboxEventManager(getContext()).pushEvent(evt); } } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java index 205cc73e9..b4db36a96 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java @@ -242,7 +242,8 @@ public class MapboxEventManager { return; } - if (eventWithAttributes.get(MapboxEvent.TYPE_MAP_LOAD) != null) { + String eventType = (String)eventWithAttributes.get(MapboxEvent.ATTRIBUTE_EVENT); + if (!TextUtils.isEmpty(eventType) && eventType.equalsIgnoreCase(MapboxEvent.TYPE_MAP_LOAD)) { pushTurnstileEvent(); } @@ -268,6 +269,7 @@ public class MapboxEventManager { // Send to Server Immediately new FlushTheEventsTask().execute(); + Log.d(TAG, "turnstile event pushed."); } /** @@ -499,7 +501,7 @@ public class MapboxEventManager { .post(body) .build(); Response response = client.newCall(request).execute(); - Log.i(TAG, "Response Code from Mapbox Events Server: " + response.code() + " for " + events.size() + " events sent in."); + Log.d(TAG, "Response Code from Mapbox Events Server: " + response.code() + " for " + events.size() + " events sent in."); // Reset Events // ============