Bump CT SDK version to fix logger and UTM Visited (#516)

Author: hborisoff

AndroidSDKCore/build.gradle

@@ -42,7 +42,7 @@ dependencies {
     api "androidx.legacy:legacy-support-v4:1.0.0"
     api "androidx.appcompat:appcompat:${APPCOMPAT_LIBRARY_VERSION}"
 
-    api "com.clevertap.android:clevertap-android-sdk:4.6.3"
+    api "com.clevertap.android:clevertap-android-sdk:4.6.4"
 }
 
 task generateJavadoc(type: Javadoc) {

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

@@ -46,6 +46,10 @@ public static void setLogLevel(int level) {
     Log.level = level;
   }
 
+  public static int getLogLevel() {
+    return level;
+  }
+
   public static void e(String msg, Object... args) {
     log(LogType.ERROR, msg, args);
   }

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

@@ -1,9 +1,11 @@
 package com.leanplum.migration
 
+import com.clevertap.android.sdk.CleverTapAPI
+import com.leanplum.internal.Log
+
 object MigrationConstants {
   const val IDENTITY = "Identity"
   const val STATE_PREFIX = "state_"
-  const val UTM_VISITED = "UTM Visited"
 
   const val CHARGED_EVENT_PARAM = "event"
   const val VALUE_PARAM = "value"
@@ -12,4 +14,12 @@ object MigrationConstants {
   const val GP_PURCHASE_DATA_PARAM = "googlePlayPurchaseData"
   const val GP_PURCHASE_DATA_SIGNATURE_PARAM = "googlePlayPurchaseDataSignature"
   const val IAP_ITEM_PARAM = "item"
+
+  fun mapLogLevel(lpLevel: Int): CleverTapAPI.LogLevel = when (lpLevel) {
+    Log.Level.OFF -> CleverTapAPI.LogLevel.OFF
+    Log.Level.ERROR -> CleverTapAPI.LogLevel.INFO
+    Log.Level.INFO -> CleverTapAPI.LogLevel.INFO
+    Log.Level.DEBUG -> CleverTapAPI.LogLevel.VERBOSE
+    else -> CleverTapAPI.LogLevel.INFO
+  }
 }

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

@@ -33,12 +33,17 @@ internal class CTWrapper(
   override fun launch(context: Context, callback: CleverTapInstanceCallback?) {
     instanceCallback = callback
 
+    val lpLevel = Log.getLogLevel()
+    val ctLevel = MigrationConstants.mapLogLevel(lpLevel).intValue()
+
     val config = CleverTapInstanceConfig.createInstance(
       context,
       accountId,
       accountToken,
       accountRegion).apply {
       enableCustomCleverTapId = true
+      debugLevel = ctLevel // set instance log level
+      setLogLevel(lpLevel) // set static log level, arg needs to be Leanplum's level
     }
 
     val cleverTapId = identityManager.cleverTapId()
@@ -228,21 +233,12 @@ internal class CTWrapper(
   }
 
   override fun setTrafficSourceInfo(info: Map<String, String>) {
-    val event = MigrationConstants.UTM_VISITED
-    val properties = info.mapKeys { (key, _) ->
-      when (key) {
-        "publisherId" -> "utm_source_id"
-        "publisherName" -> "utm_source"
-        "publisherSubPublisher" -> "utm_medium"
-        "publisherSubSite" -> "utm_subscribe.site"
-        "publisherSubCampaign" -> "utm_campaign"
-        "publisherSubAdGroup" -> "utm_sourcepublisher.ad_group"
-        "publisherSubAd" -> "utm_SourcePublisher.ad"
-        else -> key
-      }
-    }
-    Log.d("Wrapper: Leanplum.setTrafficSourceInfo will call pushEvent with $event and $properties")
-    cleverTapInstance?.pushEvent(event, properties)
+    val source = info["publisherName"]
+    val medium = info["publisherSubPublisher"]
+    val campaign = info["publisherSubCampaign"]
+    Log.d("Wrapper: Leanplum.setTrafficSourceInfo will call pushInstallReferrer with " +
+        "$source, $medium, and $campaign")
+    cleverTapInstance?.pushInstallReferrer(source, medium, campaign)
   }
 
 }

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

@@ -53,6 +53,6 @@ interface IWrapper {
 
   fun registerLifecycleCallback(app: Application) = Unit
 
-  fun setLogLevel(level: Int) = Unit
+  fun setLogLevel(lpLevel: Int) = Unit
 
 }

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

@@ -4,6 +4,7 @@ import android.app.Application
 import com.clevertap.android.sdk.ActivityLifecycleCallback
 import com.clevertap.android.sdk.CleverTapAPI
 import com.leanplum.internal.Log
+import com.leanplum.migration.MigrationConstants
 
 /**
  * Singleton wrapping the static utility methods of CT SDK, used as a delegate from [CTWrapper].
@@ -17,14 +18,8 @@ object StaticMethodsWrapper : IWrapper {
     ActivityLifecycleCallback.register(app)
   }
 
-  override fun setLogLevel(level: Int) {
-    when(level) {
-      Log.Level.OFF -> CleverTapAPI.setDebugLevel(CleverTapAPI.LogLevel.OFF)
-      Log.Level.ERROR -> CleverTapAPI.setDebugLevel(CleverTapAPI.LogLevel.INFO)
-      Log.Level.INFO -> CleverTapAPI.setDebugLevel(CleverTapAPI.LogLevel.INFO)
-      Log.Level.DEBUG -> CleverTapAPI.setDebugLevel(CleverTapAPI.LogLevel.VERBOSE)
-      else -> Unit
-    }
+  override fun setLogLevel(lpLevel: Int) {
+    CleverTapAPI.setDebugLevel(MigrationConstants.mapLogLevel(lpLevel))
   }
 
 }