Updated Android Dispatchers

Author: sofakingforever

android-analytics/kit-answers/src/main/java/com/sofakingforever/analytics/kits/answers/AnswersDispatcherImpl.kt

@@ -2,16 +2,15 @@ package com.sofakingforever.analytics.kits.answers
 
 import android.content.Context
 import com.crashlytics.android.answers.Answers
-import com.sofakingforever.analytics.AnalyticsDispatcher
+import com.sofakingforever.analytics.android.AndroidAnalyticsDispatcher
 import com.sofakingforever.analytics.events.SetUserProperties
-import com.sofakingforever.analytics.events.SetUserProperty
 import io.fabric.sdk.android.Fabric
 import io.fabric.sdk.android.Kit
 
 /**
  * @property - fabricKits - if you use this property, you must include a new Answers instance
  */
-class AnswersDispatcherImpl(override val init: Boolean, private vararg val fabricKits: Kit<*> = arrayOf(Answers())) : AnalyticsDispatcher {
+class AnswersDispatcherImpl(override val init: Boolean, override val context: Context, private vararg val fabricKits: Kit<*> = arrayOf(Answers())) : AndroidAnalyticsDispatcher {
 
 
     override val dispatcherName: String = DispatcherName
@@ -20,7 +19,7 @@ class AnswersDispatcherImpl(override val init: Boolean, private vararg val fabri
 
     private val instance: Answers by lazy { Answers.getInstance() }
 
-    override fun initDispatcher(context: Context) {
+    override fun initDispatcher() {
         // init Fabric with Answers, and any additonal fabric kits supplied
         Fabric.with(context, *fabricKits)
     }
@@ -33,10 +32,6 @@ class AnswersDispatcherImpl(override val init: Boolean, private vararg val fabri
         instance.logContentView(contentView.createAnswersEvent())
     }
 
-    override fun trackInviteEvent(inviteEvent: com.sofakingforever.analytics.events.InviteEvent) {
-        instance.logInvite(inviteEvent.createAnswersInviteEvent())
-    }
-
     override fun setUserProperties(properties: SetUserProperties) {
         // Answers doesn't support this
     }
@@ -66,10 +61,6 @@ class AnswersDispatcherImpl(override val init: Boolean, private vararg val fabri
         return com.crashlytics.android.answers.ContentViewEvent().putContentName(this.getViewName(kit))
     }
 
-    private fun com.sofakingforever.analytics.events.InviteEvent.createAnswersInviteEvent(): com.crashlytics.android.answers.InviteEvent {
-        return com.crashlytics.android.answers.InviteEvent().putMethod(this.getInviteMethod()).putCustomAttribute("shareVia", this.shareVia)
-    }
-
     companion object {
         const val DispatcherName = "DefaultAnswersDispatcher"
     }

android-analytics/kit-firebase/src/main/java/com/sofakingforever/analytics/kits/firebase/FirebaseDispatcherImpl.kt

@@ -3,21 +3,23 @@ package com.sofakingforever.analytics.kits.firebase
 import android.content.Context
 import android.os.Bundle
 import com.google.firebase.analytics.FirebaseAnalytics
-import com.sofakingforever.analytics.AnalyticsDispatcher
-import com.sofakingforever.analytics.events.*
+import com.sofakingforever.analytics.android.AndroidAnalyticsDispatcher
+import com.sofakingforever.analytics.events.ContentViewEvent
+import com.sofakingforever.analytics.events.CustomEvent
+import com.sofakingforever.analytics.events.SetUserProperties
 
-class FirebaseDispatcherImpl(override val init: Boolean) : AnalyticsDispatcher {
+class FirebaseDispatcherImpl(override val init: Boolean, override val context: Context) : AndroidAnalyticsDispatcher {
 
     override val dispatcherName: String = DispatcherName
 
-    constructor() : this(true)
+    constructor(context: Context) : this(true, context)
 
     override val kit = FirebaseKit.instance
 
     var firebaseAnalytics: FirebaseAnalytics? = null
 
 
-    override fun initDispatcher(context: Context) {
+    override fun initDispatcher() {
         firebaseAnalytics = FirebaseAnalytics.getInstance(context)
     }
 
@@ -30,9 +32,6 @@ class FirebaseDispatcherImpl(override val init: Boolean) : AnalyticsDispatcher {
         firebaseAnalytics?.logEvent("contentView_" + contentView.getViewName(kit).firebaseFriendly(), Bundle.EMPTY)
     }
 
-    override fun trackInviteEvent(inviteEvent: InviteEvent) {
-        firebaseAnalytics?.logEvent(FirebaseAnalytics.Event.SHARE, inviteEvent.getBundle())
-    }
     override fun setUserProperties(properties: SetUserProperties) {
         properties.getUserProperties(kit).forEach {
             firebaseAnalytics?.setUserProperty(it.key, it.value.toString())
@@ -51,27 +50,17 @@ class FirebaseDispatcherImpl(override val init: Boolean) : AnalyticsDispatcher {
 
     }
 
-
-    private fun InviteEvent.getBundle(): Bundle {
-        val bundle = Bundle()
-
-        bundle.putString("packageName", packageName)
-        bundle.putString("appName", getInviteMethod())
-
-        return bundle
-    }
-
     private fun CustomEvent.getBundle(): Bundle {
         val bundle = Bundle()
 
         getParameters(kit).forEach {
             when {
-                // numbers
+            // numbers
                 it.value is Int -> bundle.putInt(it.key, it.value as Int)
                 it.value is Float -> bundle.putFloat(it.key, it.value as Float)
                 it.value is Double -> bundle.putDouble(it.key, it.value as Double)
                 it.value is Long -> bundle.putLong(it.key, it.value as Long)
-                // other stuff
+            // other stuff
                 it.value is String -> bundle.putString(it.key, it.value as String)
                 it.value is Boolean -> bundle.putBoolean(it.key, it.value as Boolean)
 

android-analytics/kit-flurry/src/main/java/com/sofakingforever/analytics/kits/flurry/FlurryDispatcherImpl.kt

@@ -2,21 +2,20 @@ package com.sofakingforever.analytics.kits.flurry
 
 import android.content.Context
 import com.flurry.android.FlurryAgent
-import com.sofakingforever.analytics.AnalyticsDispatcher
+import com.sofakingforever.analytics.android.AndroidAnalyticsDispatcher
 import com.sofakingforever.analytics.events.ContentViewEvent
 import com.sofakingforever.analytics.events.CustomEvent
-import com.sofakingforever.analytics.events.InviteEvent
 import com.sofakingforever.analytics.events.SetUserProperties
 
-class FlurryDispatcherImpl(val apiKey: String) : AnalyticsDispatcher {
+class FlurryDispatcherImpl(override val context: Context, val apiKey: String) : AndroidAnalyticsDispatcher {
 
     override val dispatcherName: String = DispatcherName
 
     override val init: Boolean = true
 
     override val kit = FlurryKit.instance
 
-    override fun initDispatcher(context: Context) {
+    override fun initDispatcher() {
         FlurryAgent.Builder()
                 .withLogEnabled(true)
                 .build(context, apiKey)
@@ -33,11 +32,6 @@ class FlurryDispatcherImpl(val apiKey: String) : AnalyticsDispatcher {
         FlurryAgent.logEvent("contentView_" + contentView.getViewName(kit))
     }
 
-    override fun trackInviteEvent(inviteEvent: InviteEvent) {
-        FlurryAgent.logEvent("inviteEvent_" + inviteEvent.packageName)
-
-    }
-
     override fun setUserProperties(properties: SetUserProperties) {
         // Flurry doesn't support this
     }

android-analytics/kit-mixpanel/src/main/java/com/sofakingforever/analytics/kits/mixpanel/MixPanelDispatcherImpl.kt

@@ -2,15 +2,14 @@ package com.sofakingforever.analytics.kits.mixpanel
 
 import android.content.Context
 import com.mixpanel.android.mpmetrics.MixpanelAPI
-import com.sofakingforever.analytics.AnalyticsDispatcher
 import com.sofakingforever.analytics.AnalyticsKit
+import com.sofakingforever.analytics.android.AndroidAnalyticsDispatcher
 import com.sofakingforever.analytics.events.ContentViewEvent
 import com.sofakingforever.analytics.events.CustomEvent
-import com.sofakingforever.analytics.events.InviteEvent
 import com.sofakingforever.analytics.events.SetUserProperties
 
 
-class MixPanelDispatcherImpl(override val init: Boolean = false, private val projectToken: String? = null) : AnalyticsDispatcher {
+class MixPanelDispatcherImpl(override val init: Boolean = false, override val context: Context, private val projectToken: String? = null) : AndroidAnalyticsDispatcher {
 
 
     override val dispatcherName: String = DispatcherName
@@ -20,7 +19,7 @@ class MixPanelDispatcherImpl(override val init: Boolean = false, private val pro
 
     private lateinit var mixpanel: MixpanelAPI
 
-    override fun initDispatcher(context: Context) {
+    override fun initDispatcher() {
         mixpanel = MixpanelAPI.getInstance(context, projectToken)
     }
 
@@ -32,10 +31,6 @@ class MixPanelDispatcherImpl(override val init: Boolean = false, private val pro
         mixpanel.trackMap(event.getEventName(kit), event.getParameters(kit))
     }
 
-    override fun trackInviteEvent(inviteEvent: InviteEvent) {
-        // not implementing for mixpanel
-    }
-
     override fun setUserProperties(properties: SetUserProperties) {
         mixpanel.people.setMap(properties.getUserProperties(kit))
     }