Remove unnecessary code from wrapper (#514)

Author: hborisoff

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

@@ -1672,7 +1672,9 @@ private static void setTrafficSourceInfoInternal(HashMap<String, Object> params)
    */
   public static void track(final String event, double value, String info,
       Map<String, ?> params) {
-    MigrationManager.getWrapper().track(event, value, info, params);
+    LeanplumInternal.addStartIssuedHandler(() -> {
+      MigrationManager.getWrapper().track(event, value, info, params);
+    });
     LeanplumInternal.track(event, value, info, params, null);
   }
 
@@ -1698,7 +1700,9 @@ public static void trackPurchase(final String event, double value, String curren
         requestArgs.put(Constants.Params.IAP_CURRENCY_CODE, currencyCode);
       }
 
-      MigrationManager.getWrapper().trackPurchase(event, value, currencyCode, params);
+      LeanplumInternal.addStartIssuedHandler(() -> {
+        MigrationManager.getWrapper().trackPurchase(event, value, currencyCode, params);
+      });
       LeanplumInternal.track(event, value, null, params, requestArgs);
     } catch (Throwable t) {
       Log.exception(t);
@@ -1768,17 +1772,19 @@ public static void trackGooglePlayPurchase(String eventName, String item, long p
     }
     modifiedParams.put(Constants.Params.IAP_ITEM, item);
 
-    if (MigrationManager.trackGooglePlayPurchases()) {
-      MigrationManager.getWrapper().trackGooglePlayPurchase(
-          eventName,
-          item,
-          priceMicros / 1000000.0,
-          currencyCode,
-          purchaseData,
-          dataSignature,
-          params
-      );
-    }
+    LeanplumInternal.addStartIssuedHandler(() -> {
+      if (MigrationManager.trackGooglePlayPurchases()) {
+        MigrationManager.getWrapper().trackGooglePlayPurchase(
+            eventName,
+            item,
+            priceMicros / 1000000.0,
+            currencyCode,
+            purchaseData,
+            dataSignature,
+            params
+        );
+      }
+    });
     LeanplumInternal.track(eventName, priceMicros / 1000000.0, null, modifiedParams, requestArgs);
   }
 

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

@@ -28,12 +28,17 @@ object MigrationManager {
 
   @JvmStatic
   fun updateWrapper() {
+    if (Constants.isNoop()) {
+      wrapper = NullWrapper
+      return
+    }
+
     if (getState().useCleverTap()
       && (wrapper == NullWrapper || wrapper == StaticMethodsWrapper)
     ) {
       wrapper = WrapperFactory.createWrapper(cleverTapInstanceCallback)
     } else if (wrapper != NullWrapper && !getState().useCleverTap()) {
-      wrapper = WrapperFactory.createNullWrapper()
+      wrapper = NullWrapper
     }
   }
 

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

@@ -6,8 +6,6 @@ import com.clevertap.android.sdk.ActivityLifecycleCallback
 import com.clevertap.android.sdk.CleverTapAPI
 import com.clevertap.android.sdk.CleverTapInstanceConfig
 import com.leanplum.callbacks.CleverTapInstanceCallback
-import com.leanplum.internal.Constants
-import com.leanplum.internal.LeanplumInternal
 import com.leanplum.internal.Log
 import com.leanplum.migration.MigrationConstants
 import com.leanplum.migration.MigrationManager
@@ -99,7 +97,6 @@ internal class CTWrapper(
     info: String?,
     params: Map<String, Any?>?
   ) {
-    if (Constants.isNoop()) return
     if (event == null) return
 
     val properties =
@@ -112,10 +109,8 @@ internal class CTWrapper(
       properties[MigrationConstants.INFO_PARAM] = info
     }
 
-    LeanplumInternal.addStartIssuedHandler {
-      Log.d("Wrapper: Leanplum.track will call pushEvent with $event and $properties")
-      cleverTapInstance?.pushEvent(event, properties)
-    }
+    Log.d("Wrapper: Leanplum.track will call pushEvent with $event and $properties")
+    cleverTapInstance?.pushEvent(event, properties)
   }
 
   /**
@@ -127,8 +122,6 @@ internal class CTWrapper(
     currencyCode: String?,
     params: Map<String, Any?>?
   ) {
-    if (Constants.isNoop()) return
-
     val filteredParams =
       params?.mapValues(::mapNotSupportedValues)?.toMutableMap()
         ?: mutableMapOf()
@@ -143,10 +136,8 @@ internal class CTWrapper(
 
     val items = arrayListOf<HashMap<String, Any?>>()
 
-    LeanplumInternal.addStartIssuedHandler {
-      Log.d("Wrapper: Leanplum.trackPurchase will call pushChargedEvent with $details and $items")
-      cleverTapInstance?.pushChargedEvent(details, items)
-    }
+    Log.d("Wrapper: Leanplum.trackPurchase will call pushChargedEvent with $details and $items")
+    cleverTapInstance?.pushChargedEvent(details, items)
   }
 
   /**
@@ -161,8 +152,6 @@ internal class CTWrapper(
     dataSignature: String?,
     params: Map<String, Any?>?
   ) {
-    if (Constants.isNoop()) return
-
     val filteredParams =
       params?.mapValues(::mapNotSupportedValues)?.toMutableMap()
         ?: mutableMapOf()
@@ -178,10 +167,8 @@ internal class CTWrapper(
 
     val items = arrayListOf<HashMap<String, Any?>>()
 
-    LeanplumInternal.addStartIssuedHandler {
-      Log.d("Wrapper: Leanplum.trackGooglePlayPurchase will call pushChargedEvent with $details and $items")
-      cleverTapInstance?.pushChargedEvent(details, items)
-    }
+    Log.d("Wrapper: Leanplum.trackGooglePlayPurchase will call pushChargedEvent with $details and $items")
+    cleverTapInstance?.pushChargedEvent(details, items)
   }
 
   /**

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

@@ -79,14 +79,7 @@ internal class IdentityManager(
     }
   }
 
-  private fun identity(): String {
-    return when (val userId = userId) {
-      deviceId -> deviceId
-      else -> userId
-    }
-  }
-
-  fun profile() = mapOf(MigrationConstants.IDENTITY to identity())
+  fun profile() = mapOf(MigrationConstants.IDENTITY to userId)
 
   fun setUserId(userId: String) {
     if (state == ANONYMOUS) {

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

@@ -2,6 +2,7 @@ package com.leanplum.migration.wrapper
 
 import com.leanplum.Leanplum
 import com.leanplum.callbacks.CleverTapInstanceCallback
+import com.leanplum.internal.Constants
 import com.leanplum.internal.LeanplumInternal
 import com.leanplum.migration.model.MigrationConfig
 
@@ -33,7 +34,4 @@ internal object WrapperFactory {
     }
   }
 
-  fun createNullWrapper(): IWrapper {
-    return NullWrapper
-  }
 }