fix(location): fix location issue. (#154)

* fix(location): fix location issue.

Author: Enuviel

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

@@ -54,6 +54,7 @@ public class ActionManager {
   private static final String LEANPLUM_LOCAL_PUSH_HELPER =
       "com.leanplum.internal.LeanplumLocalPushHelper";
   private static final String PREFERENCES_NAME = "__leanplum_messaging__";
+  private static boolean loggedLocationManagerFailure = false;
 
   public static class MessageMatchResult {
     public boolean matchedTrigger;
@@ -68,29 +69,21 @@ public static synchronized ActionManager getInstance() {
     return instance;
   }
 
-  private static boolean loggedLocationManagerFailure = false;
-
   public static LocationManager getLocationManager() {
     if (Util.hasPlayServices()) {
       try {
-        Class<?> googleApiClientClass =
-            Class.forName("com.google.android.gms.common.api.GoogleApiClient");
-        if (googleApiClientClass != null
-            && Modifier.isAbstract(googleApiClientClass.getModifiers())
-            && Modifier.isAbstract(
-            googleApiClientClass.getMethod("isConnected").getModifiers())
-            && Class.forName("com.google.android.gms.location.LocationServices") != null) {
-          // Reflection here prevents linker errors
-          // in Google Play Services is not used in the client app.
-          return (LocationManager) Class
-              .forName("com.leanplum.LocationManagerImplementation")
-              .getMethod("instance").invoke(null);
-        }
+        // Reflection here prevents linker errors
+        // if Google Play Services is not used in the client app.
+        return (LocationManager) Class
+            .forName("com.leanplum.LocationManagerImplementation")
+            .getMethod("instance").invoke(null);
       } catch (Throwable t) {
         if (!loggedLocationManagerFailure) {
-          Log.e("Geofencing support requires Google Play Services v8.1 and higher.\n" +
+          Log.w("Geofencing support requires leanplum-location module and Google Play " +
+              "Services v8.1 and higher.\n" +
               "Add this to your build.gradle file:\n" +
-              "compile ('com.google.android.gms:play-services-location:8.3.0+')");
+              "implementation 'com.google.android.gms:play-services-location:8.3.0+'\n" +
+              "implementation 'com.leanplum:leanplum-location:+'");
           loggedLocationManagerFailure = true;
         }
       }
@@ -136,7 +129,6 @@ public boolean onResponse(ActionContext actionContext) {
                 .getDeclaredMethod("scheduleLocalPush", ActionContext.class, String.class,
                     long.class).invoke(new Object(), actionContext, messageId, eta);
           } catch (Throwable throwable) {
-            Log.e("scheduleLocalPush problem",throwable);
             return false;
           }
         } catch (Throwable t) {

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

@@ -101,10 +101,16 @@ class LocationManagerImplementation implements
   private static LocationManagerImplementation instance;
 
   public static synchronized LocationManager instance() {
-    if (instance == null) {
-      instance = new LocationManagerImplementation();
+    try {
+      if (LocationServices.API != null) {
+        if (instance == null) {
+          instance = new LocationManagerImplementation();
+        }
+        return instance;
+      }
+    } catch (Throwable ignored) {
     }
-    return instance;
+    return null;
   }
 
   private LocationManagerImplementation() {
@@ -287,11 +293,8 @@ private void updateTrackedGeofences() {
     }
     trackedGeofenceIds = new ArrayList<>();
     if (toBeTrackedGeofences != null && toBeTrackedGeofences.size() > 0) {
-      GeofencingRequest request = new GeofencingRequest.Builder()
-          .addGeofences(toBeTrackedGeofences)
-          .build();
       LocationServices.GeofencingApi.addGeofences(googleApiClient,
-          request, getTransitionPendingIntent());
+          toBeTrackedGeofences, getTransitionPendingIntent());
       for (Geofence geofence : toBeTrackedGeofences) {
         if (geofence != null && geofence.getRequestId() != null) {
           trackedGeofenceIds.add(geofence.getRequestId());