fixed tracking bug

Author: heart

pam-android-kotlin/src/main/java/ai/pams/android/kotlin/Pam.kt

@@ -22,9 +22,7 @@ import com.google.firebase.messaging.FirebaseMessaging
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonSyntaxException
 import com.google.gson.annotations.SerializedName
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.*
 import java.util.*
 
 data class PamResponse(
@@ -274,8 +272,8 @@ class Pam {
     private var sharedPreferences: SharedPreferences? = null
 
     init {
-        queueTrackerManager.onNext = { eventName, payload, trackerCallback ->
-            postTracker(eventName, payload, trackerCallback)
+        queueTrackerManager.onNext = { eventName, delayAfterPost, payload, trackerCallback ->
+            postTracker(eventName, delayAfterPost, payload, trackerCallback)
         }
     }
 
@@ -478,28 +476,56 @@ class Pam {
     }
 
     fun userLogin(customerID: String, callBack: (() -> Unit)? = null) {
+        val delay = 3000L
+
+        val deleteMedia = mapOf(
+            "_delete_media" to mapOf(
+                "android_notification" to ""
+            )
+        )
+        track("delete_media",deleteMedia, delay, null)
+
         custID = customerID
         saveValue(SaveKey.CustomerID, customerID)
-        track("login") {
+        track("login", null, delayAfterPost = 2000L) {
             callBack?.invoke()
         }
+
+        readValue(SaveKey.PushKey)?.let{ deviceToken->
+            track(
+                "save_push", mapOf(
+                    "android_notification" to deviceToken
+                )
+            )
+        }
     }
 
     fun userLogout(callBack: (() -> Unit)? = null) {
-        val payload = mapOf(
+
+        val deleteMediaPayload = mapOf(
             "_delete_media" to mapOf(
                 "android_notification" to ""
             )
         )
 
-        track("logout", payload) {
+        val delay = 3000L
+
+        track("logout", deleteMediaPayload,delay) {
             this.custID = null
             this.loginContactID = null
             this.removeValue(SaveKey.CustomerID)
             this.removeValue(SaveKey.LoginContactID)
             callBack?.invoke()
         }
 
+        readValue(SaveKey.PushKey)?.let{ deviceToken->
+            track(
+                "save_push", mapOf(
+                    "android_notification" to deviceToken
+                )
+            )
+        }
+
     }
 
     private fun setDeviceToken(deviceToken: String) {
@@ -514,15 +540,15 @@ class Pam {
     fun track(
         eventName: String,
         payload: Map<String, Any>? = null,
+        delayAfterPost: Long,
         trackerCallback: TrackerCallback?
     ) {
-
         val contactID = Pam.getContactID() ?: ""
         if(eventName == "allow_consent" || eventName == "save_push"){
-            this.queueTrackerManager.enqueue(eventName, payload, trackerCallback)
+            this.queueTrackerManager.enqueue(eventName, payload, delayAfterPost, trackerCallback)
             return
         }else if(contactID != "" && allowTracking){
-            this.queueTrackerManager.enqueue(eventName, payload, trackerCallback)
+            this.queueTrackerManager.enqueue(eventName, payload, delayAfterPost, trackerCallback)
             return
         }
 
@@ -536,6 +562,14 @@ class Pam {
         }
     }
 
+    fun track(
+        eventName: String,
+        payload: Map<String, Any>? = null,
+        trackerCallback: TrackerCallback?
+    ) {
+        track(eventName, payload, 0L ,trackerCallback)
+    }
+
     fun isUserLoggedin(): Boolean {
         if (custID == null) {
             custID = readValue(SaveKey.CustomerID)
@@ -617,6 +651,7 @@ class Pam {
 
     private fun postTracker(
         eventName: String,
+        delayAfterPost: Long,
         payload: Map<String, Any>?,
         trackerCallBack: TrackerCallback? = null
     ) {
@@ -653,13 +688,24 @@ class Pam {
                     }
                 }
 
-                val task = CoroutineScope(Dispatchers.Main)
-                task.launch {
+                CoroutineScope(Dispatchers.Default).launch {
+
                     response?.let{
-                        trackerCallBack?.invoke(it)
+                        withContext(Dispatchers.Main){
+                            trackerCallBack?.invoke(it)
+                        }
+                    }
+
+                    if(delayAfterPost > 0L) {
+                        delay(delayAfterPost)
                     }
-                    queueTrackerManager.next()
+
+                    withContext(Dispatchers.Main){
+                        queueTrackerManager.next()
+                    }
+
                 }
+
             } catch (e: JsonSyntaxException) {
 
             }

pam-android-kotlin/src/main/java/ai/pams/android/kotlin/models/notification/NotificationIist.kt

@@ -64,7 +64,7 @@ class NotificationList(
                         pixel = jsonItem.optString("pixel"),
                         thumbnailUrl = jsonItem.optString("thumbnail_url"),
                         title = jsonItem.optString("title"),
-                        url = jsonItem.optString("title"),
+                        url = jsonItem.optString("url"),
                         popupType = jsonPayload?.optString("popupType")
                     )
                     item.parseFlex(context)

pam-android-kotlin/src/main/java/ai/pams/android/kotlin/queue/QueueTrackerManager.kt

@@ -4,18 +4,23 @@ import ai.pams.android.kotlin.Pam
 import ai.pams.android.kotlin.TrackerCallback
 import android.util.Log
 
-typealias QueueTrackerCallback = (String, Map<String, Any>?, TrackerCallback?) -> Unit
+typealias QueueTrackerCallback = (String, Long, Map<String, Any>?, TrackerCallback?) -> Unit
 
-class TrackingQueue(val eventName:String, val payload: Map<String, Any>? = null, val trackerCallback: TrackerCallback? = null)
+class TrackingQueue(
+    val eventName: String,
+    val delayAfterPost: Long,
+    val payload: Map<String, Any>? = null,
+    val trackerCallback: TrackerCallback? = null
+)
 
 class QueueTrackerManager() {
     private var isProcessing: Boolean = false
     private val queue = mutableListOf<TrackingQueue>()
 
     var onNext: QueueTrackerCallback? = null
 
-    fun enqueue(eventName: String, payload: Map<String, Any>? = null, trackerCallback:TrackerCallback? = null) {
-        val tracking = TrackingQueue(eventName, payload, trackerCallback)
+    fun enqueue(eventName: String, payload: Map<String, Any>? = null, delayAfterPost: Long = 0L, trackerCallback:TrackerCallback? = null) {
+        val tracking = TrackingQueue(eventName, delayAfterPost, payload, trackerCallback)
         this.queue.add(tracking)
         if(Pam.shared.isLogEnable){
             Log.d("PAM", "1.Track = $eventName   isProcessing=$isProcessing")
@@ -36,7 +41,7 @@ class QueueTrackerManager() {
             if(Pam.shared.isLogEnable){
                 Log.d("PAM", "Queue = ${queue.size}")
             }
-            onNext?.invoke(task.eventName, task.payload, task.trackerCallback)
+            onNext?.invoke(task.eventName, task.delayAfterPost, task.payload, task.trackerCallback)
         } else {
             this.isProcessing = false
             if(Pam.shared.isLogEnable){