Release 7.5.0 (#566)

* Update hms consumer proguard rules

* Remove info event property from CT migration (#567)

* Fix CT migration app launch (#568)

* Set version to 7.5.0

Author: vasct

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

@@ -1676,9 +1676,7 @@ private static void setTrafficSourceInfoInternal(HashMap<String, Object> params)
    */
   public static void track(final String event, double value, String info,
       Map<String, ?> params) {
-    LeanplumInternal.addStartIssuedHandler(() -> {
-      MigrationManager.getWrapper().track(event, value, info, params);
-    });
+    LeanplumInternal.addStartIssuedHandler(() -> MigrationManager.getWrapper().track(event, value, params));
     LeanplumInternal.track(event, value, info, params, null);
   }
 
@@ -1919,14 +1917,14 @@ public static void advanceTo(final String state, String info, final Map<String,
       }
 
       if (LeanplumInternal.issuedStart()) {
-        MigrationManager.getWrapper().advanceTo(state, info, params);
+        MigrationManager.getWrapper().advanceTo(state, params);
         advanceToInternal(state, validatedParams, requestParams);
       } else {
         LeanplumInternal.addStartIssuedHandler(new Runnable() {
           @Override
           public void run() {
             try {
-              MigrationManager.getWrapper().advanceTo(state, info, params);
+              MigrationManager.getWrapper().advanceTo(state, params);
               advanceToInternal(state, validatedParams, requestParams);
             } catch (Throwable t) {
               Log.exception(t);

AndroidSDKCore/src/main/java/com/leanplum/migration/MigrationConstants.kt

@@ -33,7 +33,6 @@ object MigrationConstants {
   const val CHARGED_EVENT_PARAM = "event"
   const val VALUE_PARAM = "value"
   const val CURRENCY_CODE_PARAM = "currencyCode"
-  const val INFO_PARAM = "info"
   const val GP_PURCHASE_DATA_PARAM = "googlePlayPurchaseData"
   const val GP_PURCHASE_DATA_SIGNATURE_PARAM = "googlePlayPurchaseDataSignature"
   const val IAP_ITEM_PARAM = "item"

AndroidSDKCore/src/main/java/com/leanplum/migration/wrapper/CTWrapper.kt

@@ -30,6 +30,7 @@ import com.clevertap.android.sdk.CleverTapAPI
 import com.clevertap.android.sdk.CleverTapInstanceConfig
 import com.clevertap.android.sdk.pushnotification.PushConstants
 import com.clevertap.android.sdk.pushnotification.PushNotificationHandler
+import com.leanplum.LeanplumActivityHelper
 import com.leanplum.callbacks.CleverTapInstanceCallback
 import com.leanplum.internal.Constants
 import com.leanplum.internal.Log
@@ -92,6 +93,12 @@ internal class CTWrapper(
       setLibrary("Leanplum")
       if (!ActivityLifecycleCallback.registered) {
         ActivityLifecycleCallback.register(context.applicationContext as? Application)
+        if (!LeanplumActivityHelper.isActivityPaused() && !CleverTapAPI.isAppForeground()) {
+          // Trigger onActivityResumed because onResume of ActivityLifecycle has already been executed
+          // in this case. This could happen on first start with ct migration. This method will also
+          // trigger App Launched if it was not send already.
+          CleverTapAPI.onActivityResumed(LeanplumActivityHelper.getCurrentActivity())
+        }
       }
       if (identityManager.isAnonymous()) {
         Log.d("Wrapper: identity not set for anonymous user")
@@ -103,8 +110,6 @@ internal class CTWrapper(
       Log.d("Wrapper: CleverTap instance created by Leanplum")
     }
     if (firstTimeStart) {
-      // Track App Launched event, because onResume of activity has been executed before first run
-      sendAppLaunchedEvent()
       // Send tokens in same session, because often a restart is needed for CT SDK to get them
       sendPushTokens(context)
     }
@@ -205,7 +210,6 @@ internal class CTWrapper(
   override fun track(
     event: String?,
     value: Double,
-    info: String?,
     params: Map<String, Any?>?
   ) {
     if (event == null) return
@@ -219,10 +223,6 @@ internal class CTWrapper(
 
     properties[MigrationConstants.VALUE_PARAM] = value
 
-    if (info != null) {
-      properties[MigrationConstants.INFO_PARAM] = info
-    }
-
     Log.d("Wrapper: Leanplum.track will call pushEvent with $event and $properties")
     cleverTapInstance?.pushEvent(event, properties)
   }
@@ -288,18 +288,14 @@ internal class CTWrapper(
   /**
    * LP doesn't allow iterables in params.
    */
-  override fun advanceTo(state: String?, info: String?, params: Map<String, Any?>?) {
+  override fun advanceTo(state: String?, params: Map<String, Any?>?) {
     if (state == null) return;
 
     val event = MigrationConstants.STATE_PREFIX + state
     val properties =
       params?.mapValues(::mapNotSupportedValues)?.toMutableMap()
         ?: mutableMapOf()
 
-    if (info != null) {
-      properties[MigrationConstants.INFO_PARAM] = info
-    }
-
     Log.d("Wrapper: Leanplum.advance will call pushEvent with $event and $properties")
     cleverTapInstance?.pushEvent(event, properties)
   }

AndroidSDKCore/src/main/java/com/leanplum/migration/wrapper/IWrapper.kt

@@ -44,7 +44,6 @@ interface IWrapper {
   fun track(
     event: String?,
     value: Double,
-    info: String?,
     params: Map<String, Any?>?,
   ) = Unit
 
@@ -65,7 +64,7 @@ interface IWrapper {
     params: Map<String, Any?>?,
   ) = Unit
 
-  fun advanceTo(state: String?, info: String?, params: Map<String, Any?>?) = Unit
+  fun advanceTo(state: String?, params: Map<String, Any?>?) = Unit
 
   fun setUserAttributes(attributes: Map<String, Any?>?) = Unit
 

AndroidSDKHms/consumer-proguard-rules.pro

@@ -6,5 +6,6 @@
 -keep class com.leanplum.** { *; }
 -dontwarn com.leanplum.**
 
--keep class com.huawei.updatesdk.**{*;}
--keep class com.huawei.hms.**{*;}
+-keep class com.huawei.**{*;}
+-keep class com.hianalytics.android.**{*;}
+-dontwarn com.huawei.**

sdk-version.txt

@@ -1 +1 @@
-7.5.0-beta2
+7.5.0