Release/5.6.1 (#448)

* bump beta (other versions are used)

* release 5.6.1

* Fix possible NPE when Leanplum.getContext is null. Crash is in Util.hasPlayServices

* Remove unnecessary unit tests

* bump beta

* release 5.6.1

Author: hborisoff

AndroidSDKMiPush/src/main/java/com/leanplum/LeanplumMiPushProvider.java

@@ -34,18 +34,11 @@
  */
 class LeanplumMiPushProvider extends LeanplumCloudMessagingProvider {
 
-  boolean appRegistered = false;
-
   /**
    * Constructor called by reflection.
    */
   public LeanplumMiPushProvider() {
-    if (Leanplum.getContext() != null) {
-      // there is theoretical possibility for context to be null
-      registerApp(Leanplum.getContext());
-    } else {
-      Log.e("MiPush app not registered because context is null");
-    }
+    registerApp(Leanplum.getContext());
   }
 
   private void registerApp(@NonNull Context context) {
@@ -60,7 +53,6 @@ private void registerApp(@NonNull Context context) {
 
     Log.d("Calling MiPushClient.registerPush");
     MiPushClient.registerPush(context, miAppId, miAppKey);
-    appRegistered = true;
   }
 
   @Override
@@ -86,10 +78,6 @@ public void updateRegistrationId() {
     if (Leanplum.getContext() == null)
       return;
 
-    if (!appRegistered) {
-      registerApp(Leanplum.getContext());
-    }
-
     String regId = MiPushClient.getRegId(Leanplum.getContext());
     if (!TextUtils.isEmpty(regId)) {
       setRegistrationId(regId);

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

@@ -663,6 +663,7 @@ public static void unregister() {
    * Call this when Leanplum starts. This method will call by reflection from AndroidSDKCore.
    */
   static void onStart() {
+    pushProviders.init();
     pushProviders.updateRegistrationIdsAndBackend();
   }
 

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

@@ -22,7 +22,6 @@
 package com.leanplum;
 
 import android.content.Context;
-import android.os.Build;
 import android.text.TextUtils;
 import androidx.annotation.VisibleForTesting;
 import com.leanplum.internal.APIConfig;
@@ -31,16 +30,30 @@
 import com.leanplum.internal.OperationQueue;
 import com.leanplum.internal.Util;
 import com.leanplum.utils.SharedPreferencesUtil;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 class PushProviders {
   private static String FCM_PROVIDER_CLASS = "com.leanplum.LeanplumFcmProvider";
   private static String MIPUSH_PROVIDER_CLASS = "com.leanplum.LeanplumMiPushProvider";
 
-  private final Map<PushProviderType, IPushProvider> providers = new HashMap<>();
+  private final Map<PushProviderType, IPushProvider> providers = new ConcurrentHashMap<>();
+  private boolean initialized = false;
 
   public PushProviders() {
+    init();
+  }
+
+  public synchronized void init() { // synchronize access to 'initialized' variable
+    if (initialized) {
+      return;
+    }
+
+    if (Leanplum.getContext() == null) {
+      // init() method will be called for second time from LeanplumPushService.onStart
+      return;
+    }
+
     IPushProvider fcm = createFcm();
     if (fcm != null) {
       providers.put(PushProviderType.FCM, fcm);
@@ -50,6 +63,8 @@ public PushProviders() {
     if (miPush != null) {
       providers.put(PushProviderType.MIPUSH, miPush);
     }
+
+    initialized = true;
   }
 
   public void updateRegistrationIdsAndBackend() {

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

@@ -116,22 +116,4 @@ public void testParsePayloadMessage() {
     assertEquals(nestedItem, handler.parsePayload("{\"lp_version\":\"1\", \"lp_channel\":{\"importance\":3,\"name\":\"rondo-channel\",\"id\":\"123\"}, \"lp_message\":\"Push message goes here.\", \"_lpm\":\"4700540011347968\", \"_lpx\":{\"__name__\":\"Request App Rating\"}}"));
   }
 
-  @Test
-  public void testSetApplicationFail() {
-    String appId = "";
-    String appKey = "";
-    LeanplumMiPushHandler.setApplication(appId, appKey);
-    LeanplumMiPushProvider provider = new LeanplumMiPushProvider();
-    assertFalse(provider.appRegistered);
-  }
-
-  @Test
-  public void testSetApplication() {
-    String appId = "id";
-    String appKey = "key";
-    LeanplumMiPushHandler.setApplication(appId, appKey);
-    LeanplumMiPushProvider provider = new LeanplumMiPushProvider();
-    assertTrue(provider.appRegistered);
-  }
-
 }

sdk-version.txt

@@ -1 +1 @@
-5.6.0
+5.6.1