Remove all elements after a failed request (#390)

* rename isReadyForEvent -> isInitializedAndEnabled for clarity

* remove unnecessary logging

* remove all elements when we cannot perform a network request

* checkstyle once again

Author: zugaldia

mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/MapboxTelemetry.java

@@ -387,7 +387,7 @@ public void onLocationChanged(Location location) {
     LocalBroadcastManager.getInstance(context.getApplicationContext()).sendBroadcast(intent);
   }
 
-  private boolean isReadyForEvent() {
+  private boolean isInitializedAndEnabled() {
     return initialized && isTelemetryEnabled();
   }
 
@@ -410,7 +410,7 @@ private void putEventOnQueue(@NonNull Hashtable<String, Object> event) {
    */
   protected void addLocationEvent(Location location) {
     // Only add events when we're properly initialized and the user has opted-in
-    if (!isReadyForEvent()) {
+    if (!isInitializedAndEnabled()) {
       return;
     }
 
@@ -454,7 +454,7 @@ protected void addLocationEvent(Location location) {
    */
   public void pushEvent(Hashtable<String, Object> eventWithAttributes) {
     // Only add events when we're properly initialized and the user has opted-in
-    if (!isReadyForEvent()) {
+    if (!isInitializedAndEnabled()) {
       return;
     }
 
@@ -510,13 +510,24 @@ public void pushEvent(Hashtable<String, Object> eventWithAttributes) {
    * Immediately attempt to send all events data in the queue to the server.
    */
   private void flushEventsQueueImmediately(boolean hasTurnstileEvent) {
-    boolean doRequest = hasTurnstileEvent || isReadyForEvent();
-    if (events.size() > 0 && ConnectivityReceiver.isConnected(context) && doRequest) {
-      client.sendEvents(events, this);
-      for (TelemetryListener listener : telemetryListeners) {
-        listener.onSendEvents(events.size());
+    if (initialized && events.size() > 0) {
+      if (ConnectivityReceiver.isConnected(context)) {
+        if (hasTurnstileEvent || isTelemetryEnabled()) {
+          client.sendEvents(events, this);
+          for (TelemetryListener listener : telemetryListeners) {
+            listener.onSendEvents(events.size());
+          }
+        } else {
+          // Not enabled or doesn't include turnstile event
+          events.removeAllElements();
+        }
+      } else {
+        // No network connection
+        events.removeAllElements();
       }
-    } else if (withShutDown) {
+    }
+
+    if (withShutDown) {
       shutdownTelemetry();
     }
   }

mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/TelemetryLocationReceiver.java

@@ -5,23 +5,18 @@
 import android.content.Intent;
 import android.location.Location;
 import android.location.LocationManager;
-import android.util.Log;
 
 /**
  * The TelemetryService will register for updates sent to this TelemetryLocationReceiver.
  * Messages are sent locally using a LocalBroadcastManager.
  */
 public class TelemetryLocationReceiver extends BroadcastReceiver {
 
-  private static final String LOG_TAG = TelemetryLocationReceiver.class.getSimpleName();
-
   public static final String INTENT_STRING =
     "com.mapbox.services.android.telemetry.location.TelemetryLocationReceiver";
 
   @Override
   public void onReceive(Context context, Intent intent) {
-    Log.v(LOG_TAG, "Event received.");
-
     // See https://github.com/mapbox/mapbox-gl-native/issues/6934
     if (intent == null || intent.getExtras() == null) {
       return;