E2-10024 multi-channel geofence (#285)

* add trackGeofence

* intermediate

* add trackGeofence to Leanplum.java, call trackGeofence in locationImplementation, add featureflag and counters

* refactor makeTrackArgs

* add tests and some changes

* minor change in locationimplementation

* create enum for geofence event names

* rename to geofenceEventType

Author: gg4race

AndroidSDKCore/src/main/java/com/leanplum/Leanplum.java

@@ -25,7 +25,6 @@
 import android.content.Context;
 import android.location.Location;
 import android.os.AsyncTask;
-import android.os.Message;
 import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
 
@@ -54,6 +53,7 @@
 import com.leanplum.internal.Util.DeviceIdInfo;
 import com.leanplum.internal.VarCache;
 import com.leanplum.messagetemplates.MessageTemplates;
+import com.leanplum.models.GeofenceEventType;
 import com.leanplum.models.MessageArchiveData;
 import com.leanplum.utils.BuildUtil;
 import com.leanplum.utils.SharedPreferencesUtil;
@@ -1857,6 +1857,16 @@ public static void track(String event, double value, String info) {
    * @param params Key-value pairs with metrics or data associated with the state. Parameters can be
    * strings or numbers. You can use up to 200 different parameter names in your app.
    */
+
+  public static void trackGeofence(GeofenceEventType event, String info) {
+    if (featureFlagManager().isFeatureFlagEnabled("track_geofence")) {
+      LeanplumInternal.trackGeofence(event, 0.0, info, null, null);
+      countAggregator().incrementCount("track_geofence");
+    } else {
+      countAggregator().incrementCount("track_geofence_disabled");
+    }
+  }
+
   public static void advanceTo(final String state, String info, final Map<String, ?> params) {
     if (Constants.isNoop()) {
       return;

AndroidSDKCore/src/main/java/com/leanplum/internal/Constants.java

@@ -116,6 +116,7 @@ public static class Methods {
     public static final String START = "start";
     public static final String STOP = "stop";
     public static final String TRACK = "track";
+    public static final String TRACK_GEOFENCE = "trackGeofence";
     public static final String UPLOAD_FILE = "uploadFile";
   }
 

AndroidSDKCore/src/main/java/com/leanplum/internal/LeanplumInternal.java

@@ -34,6 +34,7 @@
 import com.leanplum.callbacks.ActionCallback;
 import com.leanplum.callbacks.StartCallback;
 import com.leanplum.callbacks.VariablesChangedCallback;
+import com.leanplum.models.GeofenceEventType;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -270,36 +271,55 @@ public void variablesChanged() {
     }
   }
 
+  private static Map<String, Object> makeTrackArgs(final String event, double value, String info,
+      Map<String, ?> params, Map<String, String> args) {
+    final Map<String, Object> requestParams = new HashMap<>();
+    if (args != null) {
+      requestParams.putAll(args);
+    }
+    requestParams.put(Constants.Params.VALUE, Double.toString(value));
+    requestParams.put(Constants.Params.INFO, info);
+    if (event != null) {
+      requestParams.put(Constants.Params.EVENT, event);
+    }
+    if (params != null) {
+      params = validateAttributes(params, "params", false);
+      requestParams.put(Constants.Params.PARAMS, JsonConverter.toJson(params));
+    }
+    if (!inForeground || LeanplumActivityHelper.isActivityPaused()) {
+      requestParams.put("allowOffline", Boolean.TRUE.toString());
+    }
+    return requestParams;
+  }
+
   public static void track(final String event, double value, String info,
       Map<String, ?> params, Map<String, String> args) {
     if (Constants.isNoop()) {
       return;
     }
 
     try {
-      final Map<String, Object> requestParams = new HashMap<>();
-      if (args != null) {
-        requestParams.putAll(args);
-      }
-      requestParams.put(Constants.Params.VALUE, Double.toString(value));
-      requestParams.put(Constants.Params.INFO, info);
-      if (event != null) {
-        requestParams.put(Constants.Params.EVENT, event);
-      }
-      if (params != null) {
-        params = validateAttributes(params, "params", false);
-        requestParams.put(Constants.Params.PARAMS, JsonConverter.toJson(params));
-      }
-      if (!inForeground || LeanplumActivityHelper.isActivityPaused()) {
-        requestParams.put("allowOffline", Boolean.TRUE.toString());
-      }
-
+      final Map<String, Object> requestParams = makeTrackArgs(event, value, info, params, args);
       trackInternalWhenStarted(event, params, requestParams);
     } catch (Throwable t) {
       Util.handleException(t);
     }
   }
 
+  public static void trackGeofence(final GeofenceEventType event, double value, String info,
+      Map<String, ?> params, Map<String, String> args) {
+    if (Constants.isNoop()) {
+      return;
+    }
+
+    try {
+      final Map<String, Object> requestParams = makeTrackArgs(event.getName(), value, info, params, args);
+      RequestOld.post(Constants.Methods.TRACK_GEOFENCE, requestParams).send();
+    } catch (Throwable t) {
+      Util.handleException(t);
+    }
+  }
+
   /**
    * Performs the track operation once Leanplum has started. If Leanplum is already started, perform
    * the track immediately.

AndroidSDKCore/src/main/java/com/leanplum/models/GeofenceEventType.java

@@ -0,0 +1,16 @@
+package com.leanplum.models;
+
+public enum GeofenceEventType {
+  ENTER_REGION("enter_region"),
+  EXIT_REGION("exit_region");
+
+  private final String name;
+
+  GeofenceEventType(String name) {
+    this.name = name;
+  }
+
+  public String getName() {
+    return this.name;
+  }
+}

AndroidSDKLocation/src/main/java/com/leanplum/LocationManagerImplementation.java

@@ -36,7 +36,6 @@
 import com.google.android.gms.common.api.GoogleApiClient.OnConnectionFailedListener;
 import com.google.android.gms.location.Geofence;
 import com.google.android.gms.location.Geofence.Builder;
-import com.google.android.gms.location.GeofencingRequest;
 import com.google.android.gms.location.LocationListener;
 import com.google.android.gms.location.LocationRequest;
 import com.google.android.gms.location.LocationServices;
@@ -46,6 +45,7 @@
 import com.leanplum.internal.LeanplumMessageMatchFilter;
 import com.leanplum.internal.Log;
 import com.leanplum.internal.Util;
+import com.leanplum.models.GeofenceEventType;
 import com.leanplum.utils.SharedPreferencesUtil;
 
 import java.util.ArrayList;
@@ -297,7 +297,8 @@ private void updateTrackedGeofences() {
           toBeTrackedGeofences, getTransitionPendingIntent());
       for (Geofence geofence : toBeTrackedGeofences) {
         if (geofence != null && geofence.getRequestId() != null) {
-          trackedGeofenceIds.add(geofence.getRequestId());
+          String geofenceId = geofence.getRequestId();
+          trackedGeofenceIds.add(geofenceId);
           //TODO: stateBeforeBackground doesn't get persisted.
           // If the app goes to the background and terminates, stateBeforeBackground will be reset.
           if (isInBackground && !Util.isInBackground() && stateBeforeBackground != null
@@ -306,14 +307,16 @@ private void updateTrackedGeofences() {
               // TODO(aleks): This would not work for in-app messages if we have the same geolocation
               // triggering it, as a locally triggered push notification.
               && !backgroundGeofences.contains(geofence)) {
-            Number lastStatus = (Number) stateBeforeBackground.get(geofence.getRequestId());
-            Number currentStatus = (Number) lastKnownState.get(geofence.getRequestId());
+            Number lastStatus = (Number) stateBeforeBackground.get(geofenceId);
+            Number currentStatus = (Number) lastKnownState.get(geofenceId);
             if (currentStatus != null && lastStatus != null) {
               if (GeofenceStatus.shouldTriggerEnteredGeofence(lastStatus, currentStatus)) {
                 maybePerformActions(geofence, "enterRegion");
+                Leanplum.trackGeofence(GeofenceEventType.ENTER_REGION, geofenceId);
               }
               if (GeofenceStatus.shouldTriggerExitedGeofence(lastStatus, currentStatus)) {
                 maybePerformActions(geofence, "exitRegion");
+                Leanplum.trackGeofence(GeofenceEventType.EXIT_REGION, geofenceId);
               }
             }
           }
@@ -336,27 +339,30 @@ private List<Geofence> getToBeTrackedGeofences() {
 
   void updateStatusForGeofences(List<Geofence> geofences, int transitionType) {
     for (Geofence geofence : geofences) {
-      if (!trackedGeofenceIds.contains(geofence.getRequestId()) &&
-          geofence.getRequestId().startsWith("__leanplum")) {
+      String geofenceId = geofence.getRequestId();
+      if (!trackedGeofenceIds.contains(geofenceId) &&
+          geofenceId.startsWith("__leanplum")) {
         ArrayList<String> geofencesToRemove = new ArrayList<>();
-        geofencesToRemove.add(geofence.getRequestId());
+        geofencesToRemove.add(geofenceId);
         if (googleApiClient != null && googleApiClient.isConnected()) {
           LocationServices.GeofencingApi.removeGeofences(googleApiClient, geofencesToRemove);
         }
         continue;
       }
-      Number currentStatus = (Number) lastKnownState.get(geofence.getRequestId());
+      Number currentStatus = (Number) lastKnownState.get(geofenceId);
       if (currentStatus != null) {
         if (GeofenceStatus.shouldTriggerEnteredGeofence(currentStatus,
             getStatusForTransitionType(transitionType))) {
           maybePerformActions(geofence, "enterRegion");
+          Leanplum.trackGeofence(GeofenceEventType.ENTER_REGION, geofenceId);
         }
         if (GeofenceStatus.shouldTriggerExitedGeofence(currentStatus,
             getStatusForTransitionType(transitionType))) {
           maybePerformActions(geofence, "exitRegion");
+          Leanplum.trackGeofence(GeofenceEventType.EXIT_REGION, geofenceId);
         }
       }
-      lastKnownState.put(geofence.getRequestId(),
+      lastKnownState.put(geofenceId,
           getStatusForTransitionType(transitionType));
     }
     saveLastKnownRegionState();

AndroidSDKTests/src/test/java/com/leanplum/LeanplumTest.java

@@ -45,13 +45,13 @@
 import com.leanplum.internal.RequestOld;
 import com.leanplum.internal.Util;
 import com.leanplum.internal.VarCache;
+import com.leanplum.models.GeofenceEventType;
 import com.leanplum.models.MessageArchiveData;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Test;
-import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.robolectric.RuntimeEnvironment;
 
@@ -82,7 +82,6 @@
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.only;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.when;
 import static org.powermock.api.mockito.PowerMockito.doNothing;
@@ -684,6 +683,21 @@ public void onRequest(String httpMethod, String apiMethod, Map<String, Object> p
       }
     });
     Leanplum.trackPurchase(eventName, 1.99, "USD", new HashMap<String, Objects>());
+
+    // Validate request for track geofence with event name and info
+    RequestHelper.addRequestHandler(new RequestHelper.RequestHandler() {
+      @Override
+      public void onRequest(String httpMethod, String apiMethod, Map<String, Object> params) {
+        assertEquals(Constants.Methods.TRACK_GEOFENCE, apiMethod);
+
+        String requestEventName = (String) params.get("event");
+        String requestEventInfo = (String) params.get("info");
+
+        assertEquals(GeofenceEventType.ENTER_REGION.getName(), requestEventName);
+        assertEquals(String.valueOf(eventInfo), requestEventInfo);
+      }
+    });
+    Leanplum.trackGeofence(GeofenceEventType.ENTER_REGION, eventInfo);
   }
 
   @Test