Merge branch 'master' into feat/add-gaid-support

rees46 · Jan 10, 2025 · ddc4352 · ddc4352
2 parents 242ad48 + 5d68371
commit ddc4352
Show file tree

Hide file tree

Showing 4 changed files with 89 additions and 5 deletions.
diff --git a/personalization-sdk/build.gradle b/personalization-sdk/build.gradle
@@ -6,7 +6,7 @@ plugins {
     id 'kotlin-kapt'
 }
 
-version='2.0.49'
+version='2.0.50'
 
 android {
     compileSdkVersion 34

diff --git a/personalization-sdk/src/main/kotlin/com/personalization/SDK.kt b/personalization-sdk/src/main/kotlin/com/personalization/SDK.kt
@@ -15,6 +15,7 @@ import com.personalization.api.managers.ProductsManager
 import com.personalization.api.managers.RecommendationManager
 import com.personalization.api.managers.SearchManager
 import com.personalization.api.managers.TrackEventManager
+import com.personalization.api.params.ProfileParams
 import com.personalization.di.AppModule
 import com.personalization.di.DaggerSdkComponent
 import com.personalization.features.notification.data.mapper.toNotificationData
@@ -222,8 +223,8 @@ open class SDK {
      *
      * @param data profile data
      */
-    fun profile(data: HashMap<String, String>, listener: OnApiCallbackListener? = null) {
-        sendAsync(SET_PROFILE_FIELD, JSONObject(data.toMap()), listener)
+    fun profile(data: ProfileParams, listener: OnApiCallbackListener? = null) {
+        sendAsync(SET_PROFILE_FIELD, data.toJson(), listener)
     }
 
     /**

diff --git a/personalization-sdk/src/main/kotlin/com/personalization/api/params/ProfileParams.kt b/personalization-sdk/src/main/kotlin/com/personalization/api/params/ProfileParams.kt
@@ -0,0 +1,81 @@
+package com.personalization.api.params
+
+import org.json.JSONObject
+import java.util.Date
+
+//TODO use data loader
+class ProfileParams private constructor(
+    private val params: JSONObject = JSONObject()
+) {
+
+    class Builder {
+
+        private val params: JSONObject = JSONObject()
+
+        fun put(param: String, value: String): Builder {
+            params.put(param, value)
+            return this
+        }
+
+        fun put(param: String, value: Int): Builder {
+            params.put(param, value)
+            return this
+        }
+
+        fun put(param: String, value: Float): Builder {
+            params.put(param, value)
+            return this
+        }
+
+        fun put(param: String, value: Date): Builder {
+            params.put(param, value)
+            return this
+        }
+
+        fun put(param: String, value: Boolean): Builder {
+            params.put(param, value)
+            return this
+        }
+
+        fun put(param: String, value: JSONObject): Builder {
+            params.put(param, value)
+            return this
+        }
+
+        fun put(param: String, value: Array<String>): Builder {
+            params.put(param, value)
+            return this
+        }
+
+        fun put(param: String, value: Array<Int>): Builder {
+            params.put(param, value)
+            return this
+        }
+
+        fun put(param: String, value: Array<Float>): Builder {
+            params.put(param, value)
+            return this
+        }
+
+        fun put(param: String, value: Array<Date>): Builder {
+            params.put(param, value)
+            return this
+        }
+
+        fun put(param: String, value: Array<Boolean>): Builder {
+            params.put(param, value)
+            return this
+        }
+
+        fun put(param: String, value: Array<JSONObject>): Builder {
+            params.put(param, value)
+            return this
+        }
+
+        fun build(): ProfileParams {
+            return ProfileParams(params)
+        }
+    }
+
+    fun toJson(): JSONObject = params
+}
diff --git a/sample/src/main/kotlin/com/personalization/sample/AbstractMainActivity.kt b/sample/src/main/kotlin/com/personalization/sample/AbstractMainActivity.kt
@@ -16,6 +16,7 @@ import androidx.core.app.ActivityCompat
 import com.personalization.OnClickListener
 import com.personalization.Product
 import com.personalization.SDK
+import com.personalization.api.params.ProfileParams
 import com.personalization.stories.views.StoriesView
 
 abstract class AbstractMainActivity<out T : SDK> internal constructor(
@@ -71,8 +72,9 @@ abstract class AbstractMainActivity<out T : SDK> internal constructor(
 
         button.setOnClickListener {
             if (emailEditText.text.toString().isNotEmpty()) {
-                val params = HashMap<String, String>()
-                params["email"] = emailEditText.text.toString()
+                val params = ProfileParams.Builder()
+                    .put("email", emailEditText.toString())
+                    .build()
                 sdk.profile(params)
                 Toast.makeText(applicationContext, "Email sent", Toast.LENGTH_LONG).show()
             }