Merge pull request #32 from Winfooz/mhamdan/handle-multiple-embedded/…

…2018-11-11 Handle null string
Winfooz · Nov 14, 2018 · 2ae7d1d · 2ae7d1d
2 parents 388641b + 7c6453c
commit 2ae7d1d
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/annotations/gradle.properties b/annotations/gradle.properties
@@ -3,4 +3,4 @@ POM_DESCRIPTION=Annotations for use in your project
 POM_BINTRAY_NAME=com.winfooz.winanalytics:annotations
 POM_ARTIFACT_ID=annotations
 POM_PACKAGING=jar
-POM_VERSION=1.0.7-beta
+POM_VERSION=1.0.8-beta
diff --git a/compiler/gradle.properties b/compiler/gradle.properties
@@ -3,4 +3,4 @@ POM_DESCRIPTION=For proccess annotations and generate code
 POM_BINTRAY_NAME=com.winfooz.winanalytics:compiler
 POM_ARTIFACT_ID=compiler
 POM_PACKAGING=jar
-POM_VERSION=1.0.7-beta
+POM_VERSION=1.0.8-beta
diff --git a/winanalytics/gradle.properties b/winanalytics/gradle.properties
@@ -3,4 +3,4 @@ POM_DESCRIPTION=For log analytics to firebase,fabric,mixpanel etc...
 POM_BINTRAY_NAME=com.winfooz.winanalytics:winanalytics
 POM_ARTIFACT_ID=winanalytics
 POM_PACKAGING=jar
-POM_VERSION=1.0.7-beta
+POM_VERSION=1.0.8-beta
diff --git a/winanalytics/src/main/java/com/winfooz/winanalytics/FabricAnalytics.kt b/winanalytics/src/main/java/com/winfooz/winanalytics/FabricAnalytics.kt
@@ -9,7 +9,7 @@ class FabricAnalytics(private val context: Context) : Analytics {
     override fun log(data: Pair<String, MutableMap<String, String>>) {
         val event = CustomEvent(data.first)
         data.second.keys.forEach {
-            if (data.second[it] != null && data.second[it]?.isNotEmpty() == true) {
+            if (data.second[it] != null && data.second[it]?.isNotEmpty() == true && data.second[it]?.equals("null") == false) {
                 event.putCustomAttribute(it, data.second[it])
             }
         }

diff --git a/winanalytics/src/main/java/com/winfooz/winanalytics/FirebaseAnalytics.kt b/winanalytics/src/main/java/com/winfooz/winanalytics/FirebaseAnalytics.kt
@@ -11,7 +11,7 @@ class FirebaseAnalytics(private val context: Context) : Analytics {
     override fun log(data: Pair<String, MutableMap<String, String>>) {
         val bundle = Bundle()
         data.second.keys.forEach {
-            if (data.second[it] != null && data.second[it]?.isNotEmpty() == true) {
+            if (data.second[it] != null && data.second[it]?.isNotEmpty() == true && data.second[it]?.equals("null") == false) {
                 bundle.putString(it, data.second[it])
             }
         }

diff --git a/winanalytics/src/main/java/com/winfooz/winanalytics/MixPanelAnalytics.kt b/winanalytics/src/main/java/com/winfooz/winanalytics/MixPanelAnalytics.kt
@@ -11,7 +11,7 @@ class MixPanelAnalytics(private val context: Context, private val token: String)
         try {
             val jsonObject = JSONObject()
             data.second.keys.forEach {
-                if (data.second[it] != null && data.second[it]?.isNotEmpty() == true) {
+                if (data.second[it] != null && data.second[it]?.isNotEmpty() == true && data.second[it]?.equals("null") == false) {
                     jsonObject.put(it, data.second[it])
                 }
             }