Start MiPush without Google Play (#447)

* Start MiPush without Google Play

* Fix unit tests

Author: hborisoff

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

@@ -630,18 +630,14 @@ public void run() {
    * Checks for leanplum notifications modules and if someone present - invoke onStart method.
    */
   private static void checkAndStartNotificationsModules() {
-    if (Util.hasPlayServices()) {
-      try {
-        Log.d("Trying to starting LeanplumPushService");
+    try {
+      Log.d("Trying to start LeanplumPushService");
 
-        Class.forName(LEANPLUM_PUSH_SERVICE)
-            .getDeclaredMethod("onStart")
-            .invoke(null);
-      } catch (Throwable ignored) {
-        // ignored
-      }
-    } else {
-      Log.d("No valid Google Play Services APK found.");
+      Class.forName(LEANPLUM_PUSH_SERVICE)
+          .getDeclaredMethod("onStart")
+          .invoke(null);
+    } catch (Throwable ignored) {
+      // ignored
     }
   }
 

AndroidSDKPush/src/main/java/com/leanplum/PushProviders.java

@@ -71,6 +71,11 @@ public void run() {
   }
 
   private static IPushProvider createFcm() {
+    if (!Util.hasPlayServices()) {
+      Log.i("No valid Google Play Services APK found. FCM will not initialize.");
+      return null;
+    }
+
     try {
       IPushProvider fcmProvider =
           (IPushProvider) Class.forName(FCM_PROVIDER_CLASS).getConstructor().newInstance();

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

@@ -117,11 +117,12 @@ public class LeanplumPushServiceTest {
    */
   @Before
   public void setUp() {
-    mockStatic(LeanplumPushService.class);
+    mockStatic(Util.class);
     spy(LeanplumPushService.class);
-    spy(Util.class);
     spy(PushProviders.class);
 
+    when(Util.hasPlayServices()).thenReturn(true);
+
     this.context = RuntimeEnvironment.application;
     assertNotNull(this.context);
     Leanplum.setApplicationContext(this.context);