Merge pull request #5 from segment-integrations/development

LIBMOBILE-1157

Author: RawatRaveena

lib/src/main/java/com/segment/analytics/kotlin/destinations/quantcast/QuantcastDestination.kt

@@ -1,6 +1,9 @@
 package com.segment.analytics.kotlin.destinations.quantcast
 
 import android.app.Activity
+import android.app.Application
+import android.os.Bundle
+import android.util.Log
 import com.quantcast.measurement.service.QuantcastClient
 import com.segment.analytics.kotlin.android.plugins.AndroidLifecycle
 import com.segment.analytics.kotlin.core.*
@@ -32,6 +35,11 @@ class QuantcastDestination : DestinationPlugin(), AndroidLifecycle {
         this.quantcastSettings =
             settings.destinationSettings(key, QuantcastSettings.serializer())
         if (type == Plugin.UpdateType.Initial) {
+            QuantcastClient.startQuantcast(
+                analytics.configuration.application as Application?,
+                quantcastSettings?.apiKey,
+                null,
+                null)
             analytics.log("QuantcastClient.enableLogging(true)")
             QuantcastClient.enableLogging(true)
         }
@@ -55,9 +63,12 @@ class QuantcastDestination : DestinationPlugin(), AndroidLifecycle {
 
     override fun onActivityStarted(activity: Activity?) {
         super.onActivityStarted(activity)
-        analytics.log(
-            "QuantcastClient.activityStart(activity, ${quantcastSettings?.apiKey}, null, null)")
-        QuantcastClient.activityStart(activity, quantcastSettings?.apiKey, null, null)
+        if(quantcastSettings != null) {
+            QuantcastClient.activityStart(activity)
+            analytics.log(
+                "QuantcastClient.activityStart(activity)"
+            )
+        }
     }
 
     override fun onActivityStopped(activity: Activity?) {
@@ -66,6 +77,10 @@ class QuantcastDestination : DestinationPlugin(), AndroidLifecycle {
         QuantcastClient.activityStop()
     }
 
+    override fun onActivityCreated(activity: Activity?, savedInstanceState: Bundle?) {
+        super.onActivityCreated(activity, savedInstanceState)
+    }
+
     private fun quantcastLogEvent(event: String) {
         analytics.log("QuantcastClient.logEvent($event)")
         QuantcastClient.logEvent(event)

lib/src/test/kotlin/com/segment/analytics/kotlin/destinations/quantcast/QuantcastDestinationTests.kt

@@ -65,6 +65,8 @@ class QuantcastDestinationTests {
 
     @Test
     fun `settings are updated correctly`() {
+        every { QuantcastClient.startQuantcast(mockApplication, "APIKEY1234567890", null, null) } answers { }
+
         // An Quantcast example settings
         val quantcastSettings: Settings = sampleQuantcastSettings
         mockedQuantcastDestination.update(quantcastSettings, Plugin.UpdateType.Initial)
@@ -82,17 +84,16 @@ class QuantcastDestinationTests {
 
     @Test
     fun `activity started handled correctly`() {
-        val quantcastSettings: Settings = sampleQuantcastSettings
-        mockedQuantcastDestination.update(quantcastSettings, Plugin.UpdateType.Initial)
+        val settings = mockkClass(QuantcastSettings::class)
+        mockedQuantcastDestination.quantcastSettings = settings
         val activity: Activity = mockkClass(Activity::class)
         val intent: Intent = mockkClass(Intent::class)
         every { activity.intent } returns intent
         every { activity.applicationContext } returns mockedContext
         every { mockedContext.checkCallingOrSelfPermission("android.permission.WAKE_LOCK") } returns -1
-
         mockedQuantcastDestination.onActivityStarted(activity)
         verify {
-            QuantcastClient.activityStart(activity, "APIKEY1234567890", null, null)
+            QuantcastClient.activityStart(activity)
         }
     }