From e8a697a3b78236ea3a6b43d107e2397266bc4fd5 Mon Sep 17 00:00:00 2001
From: xyzcancer <xyzcancer@gmail.com>
Date: Thu, 25 Jun 2026 14:17:33 +0400
Subject: [PATCH 1/3] feat: add profile, product counters, category and
 collection read methods

DEV-3362
---
 .../demo/CatalogReadIntegrationTest.kt        |  50 +++++++
 .../com/personalization/demo/MainActivity.kt  | 127 ++++++++++++++++++
 .../src/main/res/layout/activity_main.xml     |  28 ++++
 demo-app/src/main/res/values/strings.xml      |  12 ++
 .../main/kotlin/com/personalization/SDK.kt    |  12 ++
 .../api/managers/CategoryManager.kt           |  32 +++++
 .../api/managers/CollectionManager.kt         |  32 +++++
 .../api/managers/ProductsManager.kt           |  15 +++
 .../api/managers/ProfileManager.kt            |  20 +++
 .../responses/category/CategoryResponse.kt    |  35 +++++
 .../collection/CollectionResponse.kt          |  14 ++
 .../counters/ProductCountersResponse.kt       |  33 +++++
 .../responses/profile/GetProfileResponse.kt   |  36 +++++
 .../com/personalization/di/SdkModule.kt       |  30 +++++
 .../category/impl/CategoryManagerImpl.kt      |  63 +++++++++
 .../collection/impl/CollectionManagerImpl.kt  |  61 +++++++++
 .../products/impl/ProductsManagerImpl.kt      |  29 ++++
 .../profile/impl/ProfileManagerImpl.kt        |  43 ++++++
 .../category/impl/CategoryManagerImplTest.kt  | 113 ++++++++++++++++
 .../impl/CollectionManagerImplTest.kt         | 109 +++++++++++++++
 .../products/impl/ProductsManagerImplTest.kt  |  92 +++++++++++++
 .../profile/impl/ProfileManagerImplTest.kt    |  92 +++++++++++++
 22 files changed, 1078 insertions(+)
 create mode 100644 demo-app/src/androidTest/java/com/personalization/demo/CatalogReadIntegrationTest.kt
 create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/api/managers/CategoryManager.kt
 create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/api/managers/CollectionManager.kt
 create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/api/managers/ProfileManager.kt
 create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/api/responses/category/CategoryResponse.kt
 create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/api/responses/collection/CollectionResponse.kt
 create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/api/responses/products/counters/ProductCountersResponse.kt
 create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/api/responses/profile/GetProfileResponse.kt
 create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/features/category/impl/CategoryManagerImpl.kt
 create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/features/collection/impl/CollectionManagerImpl.kt
 create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/features/profile/impl/ProfileManagerImpl.kt
 create mode 100644 personalization-sdk/src/test/kotlin/com/personalization/features/category/impl/CategoryManagerImplTest.kt
 create mode 100644 personalization-sdk/src/test/kotlin/com/personalization/features/collection/impl/CollectionManagerImplTest.kt
 create mode 100644 personalization-sdk/src/test/kotlin/com/personalization/features/products/impl/ProductsManagerImplTest.kt
 create mode 100644 personalization-sdk/src/test/kotlin/com/personalization/features/profile/impl/ProfileManagerImplTest.kt

diff --git a/demo-app/src/androidTest/java/com/personalization/demo/CatalogReadIntegrationTest.kt b/demo-app/src/androidTest/java/com/personalization/demo/CatalogReadIntegrationTest.kt
new file mode 100644
index 00000000..2c2960dc
--- /dev/null
+++ b/demo-app/src/androidTest/java/com/personalization/demo/CatalogReadIntegrationTest.kt
@@ -0,0 +1,50 @@
+package com.personalization.demo
+
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.scrollTo
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * On-device E2E for the catalog/profile read demo buttons. Launches [MainActivity]
+ * (real production Firebase + SDK init) and taps the buttons, exercising
+ * `profileManager.getProfile`, `productsManager.getProductCounters` and
+ * `categoryManager.getCategory` against the live REES46 API on the emulator.
+ *
+ * Mirrors [LoyaltyIntegrationTest]: asserts the real on-device code path runs without crashing.
+ */
+@RunWith(AndroidJUnit4::class)
+class CatalogReadIntegrationTest {
+
+    @get:Rule
+    val activityRule = ActivityScenarioRule(MainActivity::class.java)
+
+    @Test
+    fun getProfile_tapButton_noCrash() {
+        onView(withId(R.id.btnGetProfile)).perform(scrollTo(), click())
+        Thread.sleep(3000)
+    }
+
+    @Test
+    fun getProductCounters_tapButton_noCrash() {
+        onView(withId(R.id.btnGetProductCounters)).perform(scrollTo(), click())
+        Thread.sleep(3000)
+    }
+
+    @Test
+    fun getCategory_tapButton_noCrash() {
+        onView(withId(R.id.btnGetCategory)).perform(scrollTo(), click())
+        Thread.sleep(3000)
+    }
+
+    @Test
+    fun getCollection_tapButton_noCrash() {
+        onView(withId(R.id.btnGetCollection)).perform(scrollTo(), click())
+        Thread.sleep(3000)
+    }
+}
diff --git a/demo-app/src/main/java/com/personalization/demo/MainActivity.kt b/demo-app/src/main/java/com/personalization/demo/MainActivity.kt
index 9131b62c..484d9ceb 100644
--- a/demo-app/src/main/java/com/personalization/demo/MainActivity.kt
+++ b/demo-app/src/main/java/com/personalization/demo/MainActivity.kt
@@ -53,6 +53,12 @@ class MainActivity : AppCompatActivity() {
         const val LAST_NAME = "User"
     }
 
+    private object DemoCatalogConstants {
+        const val ITEM_ID = "300275"
+        const val CATEGORY_SLUG = "smartfony-i-gadzhety"
+        const val COLLECTION_ID = "1"
+    }
+
     private object DemoProductViewConstants {
         const val PRODUCT_ID = "demo-product-view-001"
         const val DEMO_PRICE = 2499.99
@@ -152,6 +158,127 @@ class MainActivity : AppCompatActivity() {
         findViewById<Button>(R.id.btnLoyaltyStatus).setOnClickListener {
             loyaltyStatus()
         }
+
+        findViewById<Button>(R.id.btnGetProfile).setOnClickListener {
+            getProfile()
+        }
+
+        findViewById<Button>(R.id.btnGetProductCounters).setOnClickListener {
+            getProductCounters()
+        }
+
+        findViewById<Button>(R.id.btnGetCategory).setOnClickListener {
+            getCategory()
+        }
+
+        findViewById<Button>(R.id.btnGetCollection).setOnClickListener {
+            getCollection()
+        }
+    }
+
+    private fun getCollection() {
+        sdk.collectionManager.getCollection(
+            collectionId = DemoCatalogConstants.COLLECTION_ID,
+            onSuccess = { response ->
+                runOnUiThread {
+                    Toast.makeText(
+                        this,
+                        getString(R.string.get_collection_ok, "products=${response.products.size}"),
+                        Toast.LENGTH_LONG,
+                    ).show()
+                }
+            },
+            onError = { code, msg ->
+                runOnUiThread {
+                    Toast.makeText(
+                        this,
+                        "${getString(R.string.get_collection_fail)}: $code $msg",
+                        Toast.LENGTH_LONG,
+                    ).show()
+                }
+            },
+        )
+    }
+
+    private fun getProfile() {
+        sdk.profileManager.getProfile(
+            onSuccess = { response ->
+                runOnUiThread {
+                    Toast.makeText(
+                        this,
+                        getString(
+                            R.string.get_profile_ok,
+                            "id=${response.id}, hasEmail=${response.hasEmail}, gender=${response.gender ?: "—"}",
+                        ),
+                        Toast.LENGTH_LONG,
+                    ).show()
+                }
+            },
+            onError = { code, msg ->
+                runOnUiThread {
+                    Toast.makeText(
+                        this,
+                        "${getString(R.string.get_profile_fail)}: $code $msg",
+                        Toast.LENGTH_LONG,
+                    ).show()
+                }
+            },
+        )
+    }
+
+    private fun getProductCounters() {
+        sdk.productsManager.getProductCounters(
+            item = DemoCatalogConstants.ITEM_ID,
+            onSuccess = { response ->
+                runOnUiThread {
+                    Toast.makeText(
+                        this,
+                        getString(
+                            R.string.get_product_counters_ok,
+                            "now.view=${response.now?.view}, price_drop=${response.triggers?.priceDrop}",
+                        ),
+                        Toast.LENGTH_LONG,
+                    ).show()
+                }
+            },
+            onError = { code, msg ->
+                runOnUiThread {
+                    Toast.makeText(
+                        this,
+                        "${getString(R.string.get_product_counters_fail)}: $code $msg",
+                        Toast.LENGTH_LONG,
+                    ).show()
+                }
+            },
+        )
+    }
+
+    private fun getCategory() {
+        sdk.categoryManager.getCategory(
+            category = DemoCatalogConstants.CATEGORY_SLUG,
+            limit = 5,
+            onSuccess = { response ->
+                runOnUiThread {
+                    Toast.makeText(
+                        this,
+                        getString(
+                            R.string.get_category_ok,
+                            "total=${response.productsTotal}, products=${response.products.size}",
+                        ),
+                        Toast.LENGTH_LONG,
+                    ).show()
+                }
+            },
+            onError = { code, msg ->
+                runOnUiThread {
+                    Toast.makeText(
+                        this,
+                        "${getString(R.string.get_category_fail)}: $code $msg",
+                        Toast.LENGTH_LONG,
+                    ).show()
+                }
+            },
+        )
     }
 
     private fun loyaltyJoin() {
diff --git a/demo-app/src/main/res/layout/activity_main.xml b/demo-app/src/main/res/layout/activity_main.xml
index bb0b042c..f8869f5d 100644
--- a/demo-app/src/main/res/layout/activity_main.xml
+++ b/demo-app/src/main/res/layout/activity_main.xml
@@ -102,6 +102,34 @@
         android:text="@string/loyalty_status"
         android:layout_marginTop="16dp" />
 
+    <Button
+        android:id="@+id/btnGetProfile"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/get_profile"
+        android:layout_marginTop="24dp" />
+
+    <Button
+        android:id="@+id/btnGetProductCounters"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/get_product_counters"
+        android:layout_marginTop="16dp" />
+
+    <Button
+        android:id="@+id/btnGetCategory"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/get_category"
+        android:layout_marginTop="16dp" />
+
+    <Button
+        android:id="@+id/btnGetCollection"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/get_collection"
+        android:layout_marginTop="16dp" />
+
     </LinearLayout>
 
 </ScrollView>
diff --git a/demo-app/src/main/res/values/strings.xml b/demo-app/src/main/res/values/strings.xml
index 0b5960b2..305ce1c3 100644
--- a/demo-app/src/main/res/values/strings.xml
+++ b/demo-app/src/main/res/values/strings.xml
@@ -34,6 +34,18 @@
     <string name="loyalty_status">Loyalty: status</string>
     <string name="loyalty_status_ok">loyalty status: %1$s</string>
     <string name="loyalty_status_fail">loyalty status failed</string>
+    <string name="get_profile">Profile: get</string>
+    <string name="get_profile_ok">profile: %1$s</string>
+    <string name="get_profile_fail">getProfile failed</string>
+    <string name="get_product_counters">Products: counters</string>
+    <string name="get_product_counters_ok">counters: %1$s</string>
+    <string name="get_product_counters_fail">getProductCounters failed</string>
+    <string name="get_category">Category: list</string>
+    <string name="get_category_ok">category: %1$s</string>
+    <string name="get_category_fail">getCategory failed</string>
+    <string name="get_collection">Collection: get</string>
+    <string name="get_collection_ok">collection: %1$s</string>
+    <string name="get_collection_fail">getCollection failed</string>
 </resources>
 
 
diff --git a/personalization-sdk/src/main/kotlin/com/personalization/SDK.kt b/personalization-sdk/src/main/kotlin/com/personalization/SDK.kt
index 08380f7b..8f454967 100644
--- a/personalization-sdk/src/main/kotlin/com/personalization/SDK.kt
+++ b/personalization-sdk/src/main/kotlin/com/personalization/SDK.kt
@@ -11,10 +11,13 @@ import com.personalization.Params.TrackEvent
 import com.personalization.api.OnApiCallbackListener
 import com.personalization.api.models.purchase.PurchaseTrackingRequest
 import com.personalization.api.managers.CartManager
+import com.personalization.api.managers.CategoryManager
+import com.personalization.api.managers.CollectionManager
 import com.personalization.api.managers.InAppNotificationManager
 import com.personalization.api.managers.LoyaltyManager
 import com.personalization.api.managers.OrdersManager
 import com.personalization.api.managers.ProductsManager
+import com.personalization.api.managers.ProfileManager
 import com.personalization.api.managers.PredictManager
 import com.personalization.api.managers.RecommendationManager
 import com.personalization.api.managers.SearchManager
@@ -92,6 +95,15 @@ open class SDK {
     @Inject
     lateinit var loyaltyManager: LoyaltyManager
 
+    @Inject
+    lateinit var profileManager: ProfileManager
+
+    @Inject
+    lateinit var categoryManager: CategoryManager
+
+    @Inject
+    lateinit var collectionManager: CollectionManager
+
     @Inject
     lateinit var inAppNotificationManager: InAppNotificationManager
 
diff --git a/personalization-sdk/src/main/kotlin/com/personalization/api/managers/CategoryManager.kt b/personalization-sdk/src/main/kotlin/com/personalization/api/managers/CategoryManager.kt
new file mode 100644
index 00000000..0c00a84e
--- /dev/null
+++ b/personalization-sdk/src/main/kotlin/com/personalization/api/managers/CategoryManager.kt
@@ -0,0 +1,32 @@
+package com.personalization.api.managers
+
+import com.personalization.api.responses.category.CategoryResponse
+
+interface CategoryManager {
+
+    /**
+     * Fetch a category listing (`GET /category/{category}`).
+     *
+     * The shop and device are identified automatically by the SDK's configured
+     * `shop_id` / `did`. [category] is the category slug (not a numeric id).
+     *
+     * @param category Category slug (path segment)
+     * @param limit Max products to return
+     * @param page Page number
+     * @param brands Comma-separated brand filter
+     * @param locations Comma-separated locations filter
+     * @param filters Arbitrary facet filters
+     * @param onSuccess Callback with the parsed category response
+     * @param onError Callback for error
+     */
+    fun getCategory(
+        category: String,
+        limit: Int? = null,
+        page: Int? = null,
+        brands: String? = null,
+        locations: String? = null,
+        filters: Map<String, Any>? = null,
+        onSuccess: (CategoryResponse) -> Unit,
+        onError: (Int, String?) -> Unit = { _: Int, _: String? -> }
+    )
+}
diff --git a/personalization-sdk/src/main/kotlin/com/personalization/api/managers/CollectionManager.kt b/personalization-sdk/src/main/kotlin/com/personalization/api/managers/CollectionManager.kt
new file mode 100644
index 00000000..9f518658
--- /dev/null
+++ b/personalization-sdk/src/main/kotlin/com/personalization/api/managers/CollectionManager.kt
@@ -0,0 +1,32 @@
+package com.personalization.api.managers
+
+import com.personalization.api.responses.collection.CollectionResponse
+
+interface CollectionManager {
+
+    /**
+     * Fetch a configured product collection (`GET /collection/{id}`).
+     *
+     * The shop and device are identified automatically by the SDK's configured
+     * `shop_id` / `did`. The collection id is configured in the dashboard.
+     *
+     * @param collectionId Collection id (path segment)
+     * @param location Optional user location
+     * @param email Optional user email
+     * @param phone Optional user phone
+     * @param externalId Optional user external id
+     * @param loyaltyId Optional user loyalty id
+     * @param onSuccess Callback with the parsed collection
+     * @param onError Callback for error
+     */
+    fun getCollection(
+        collectionId: String,
+        location: String? = null,
+        email: String? = null,
+        phone: String? = null,
+        externalId: String? = null,
+        loyaltyId: String? = null,
+        onSuccess: (CollectionResponse) -> Unit,
+        onError: (Int, String?) -> Unit = { _: Int, _: String? -> }
+    )
+}
diff --git a/personalization-sdk/src/main/kotlin/com/personalization/api/managers/ProductsManager.kt b/personalization-sdk/src/main/kotlin/com/personalization/api/managers/ProductsManager.kt
index 1709d8af..a0951d99 100644
--- a/personalization-sdk/src/main/kotlin/com/personalization/api/managers/ProductsManager.kt
+++ b/personalization-sdk/src/main/kotlin/com/personalization/api/managers/ProductsManager.kt
@@ -1,6 +1,7 @@
 package com.personalization.api.managers
 
 import com.personalization.api.OnApiCallbackListener
+import com.personalization.api.responses.products.counters.ProductCountersResponse
 
 interface ProductsManager {
 
@@ -19,4 +20,18 @@ interface ProductsManager {
         itemId: String,
         listener: OnApiCallbackListener?
     )
+
+    /**
+     * Fetch view/cart/purchase counters and trigger counts for a product
+     * (`GET /products/counters`).
+     *
+     * @param item Product item id
+     * @param onSuccess Callback with the parsed counters
+     * @param onError Callback for error
+     */
+    fun getProductCounters(
+        item: String,
+        onSuccess: (ProductCountersResponse) -> Unit,
+        onError: (Int, String?) -> Unit = { _: Int, _: String? -> }
+    )
 }
diff --git a/personalization-sdk/src/main/kotlin/com/personalization/api/managers/ProfileManager.kt b/personalization-sdk/src/main/kotlin/com/personalization/api/managers/ProfileManager.kt
new file mode 100644
index 00000000..e1a24784
--- /dev/null
+++ b/personalization-sdk/src/main/kotlin/com/personalization/api/managers/ProfileManager.kt
@@ -0,0 +1,20 @@
+package com.personalization.api.managers
+
+import com.personalization.api.responses.profile.GetProfileResponse
+
+interface ProfileManager {
+
+    /**
+     * Fetch the stored user profile (`GET /profile`).
+     *
+     * The shop and device are identified automatically by the SDK's configured
+     * `shop_id` / `did`; no parameters are required.
+     *
+     * @param onSuccess Callback with the parsed profile
+     * @param onError Callback for error
+     */
+    fun getProfile(
+        onSuccess: (GetProfileResponse) -> Unit,
+        onError: (Int, String?) -> Unit = { _: Int, _: String? -> }
+    )
+}
diff --git a/personalization-sdk/src/main/kotlin/com/personalization/api/responses/category/CategoryResponse.kt b/personalization-sdk/src/main/kotlin/com/personalization/api/responses/category/CategoryResponse.kt
new file mode 100644
index 00000000..5aef8073
--- /dev/null
+++ b/personalization-sdk/src/main/kotlin/com/personalization/api/responses/category/CategoryResponse.kt
@@ -0,0 +1,35 @@
+package com.personalization.api.responses.category
+
+import com.google.gson.JsonObject
+import com.google.gson.annotations.SerializedName
+import com.personalization.api.responses.product.Product
+import com.personalization.api.responses.search.Brand
+import com.personalization.api.responses.search.Category
+import com.personalization.api.responses.search.PriceRange
+import com.personalization.api.responses.search.PriceRanges
+
+/**
+ * Response for the `GET /category/{category}` request.
+ *
+ * Mirrors the full-search payload: the matched products plus faceting metadata
+ * (brands, price ranges, nested categories). The raw `filters` object is kept as
+ * a [JsonObject] because its shape is shop-specific.
+ */
+data class CategoryResponse(
+    @SerializedName("products_total")
+    val productsTotal: Int = 0,
+    @SerializedName("products")
+    val products: List<Product> = emptyList(),
+    @SerializedName("brands")
+    val brands: List<Brand> = emptyList(),
+    @SerializedName("categories")
+    val categories: List<Category> = emptyList(),
+    @SerializedName("price_range")
+    val priceRange: PriceRange? = null,
+    @SerializedName("price_ranges")
+    val priceRanges: List<PriceRanges> = emptyList(),
+    @SerializedName("price_median")
+    val priceMedian: Double? = null,
+    @SerializedName("filters")
+    val filters: JsonObject? = null
+)
diff --git a/personalization-sdk/src/main/kotlin/com/personalization/api/responses/collection/CollectionResponse.kt b/personalization-sdk/src/main/kotlin/com/personalization/api/responses/collection/CollectionResponse.kt
new file mode 100644
index 00000000..9c57100c
--- /dev/null
+++ b/personalization-sdk/src/main/kotlin/com/personalization/api/responses/collection/CollectionResponse.kt
@@ -0,0 +1,14 @@
+package com.personalization.api.responses.collection
+
+import com.google.gson.annotations.SerializedName
+import com.personalization.api.responses.product.Product
+
+/**
+ * Response for the `GET /collection/{id}` request.
+ *
+ * The endpoint returns a configured product collection as `{ "products": [...] }`.
+ */
+data class CollectionResponse(
+    @SerializedName("products")
+    val products: List<Product> = emptyList()
+)
diff --git a/personalization-sdk/src/main/kotlin/com/personalization/api/responses/products/counters/ProductCountersResponse.kt b/personalization-sdk/src/main/kotlin/com/personalization/api/responses/products/counters/ProductCountersResponse.kt
new file mode 100644
index 00000000..05f1f884
--- /dev/null
+++ b/personalization-sdk/src/main/kotlin/com/personalization/api/responses/products/counters/ProductCountersResponse.kt
@@ -0,0 +1,33 @@
+package com.personalization.api.responses.products.counters
+
+import com.google.gson.annotations.SerializedName
+
+/**
+ * Response for the `GET /products/counters` request.
+ *
+ * Envelope: `{ "daily": {...}, "now": {...}, "triggers": {...} }`.
+ */
+data class ProductCountersResponse(
+    @SerializedName("daily")
+    val daily: ProductCounter? = null,
+    @SerializedName("now")
+    val now: ProductCounter? = null,
+    @SerializedName("triggers")
+    val triggers: ProductCounterTriggers? = null
+)
+
+data class ProductCounter(
+    @SerializedName("view")
+    val view: Int = 0,
+    @SerializedName("cart")
+    val cart: Int = 0,
+    @SerializedName("purchase")
+    val purchase: Int = 0
+)
+
+data class ProductCounterTriggers(
+    @SerializedName("back_in_stock")
+    val backInStock: Int = 0,
+    @SerializedName("price_drop")
+    val priceDrop: Int = 0
+)
diff --git a/personalization-sdk/src/main/kotlin/com/personalization/api/responses/profile/GetProfileResponse.kt b/personalization-sdk/src/main/kotlin/com/personalization/api/responses/profile/GetProfileResponse.kt
new file mode 100644
index 00000000..2e737d47
--- /dev/null
+++ b/personalization-sdk/src/main/kotlin/com/personalization/api/responses/profile/GetProfileResponse.kt
@@ -0,0 +1,36 @@
+package com.personalization.api.responses.profile
+
+import com.google.gson.JsonObject
+import com.google.gson.annotations.SerializedName
+
+/**
+ * Response for the `GET /profile` request.
+ *
+ * The endpoint returns the stored user profile. Only the most common fields are
+ * typed here; the open-ended `custom_properties` map is kept as a raw [JsonObject]
+ * because its shape is shop-specific.
+ */
+data class GetProfileResponse(
+    @SerializedName("id")
+    val id: String? = null,
+    @SerializedName("email")
+    val email: String? = null,
+    @SerializedName("phone")
+    val phone: String? = null,
+    @SerializedName("first_name")
+    val firstName: String? = null,
+    @SerializedName("last_name")
+    val lastName: String? = null,
+    @SerializedName("has_email")
+    val hasEmail: Boolean? = null,
+    @SerializedName("email_registered_at")
+    val emailRegisteredAt: String? = null,
+    @SerializedName("gender")
+    val gender: String? = null,
+    @SerializedName("computed_gender")
+    val computedGender: String? = null,
+    @SerializedName("bought_something")
+    val boughtSomething: Boolean? = null,
+    @SerializedName("custom_properties")
+    val customProperties: JsonObject? = null
+)
diff --git a/personalization-sdk/src/main/kotlin/com/personalization/di/SdkModule.kt b/personalization-sdk/src/main/kotlin/com/personalization/di/SdkModule.kt
index 39e8003e..9d918030 100644
--- a/personalization-sdk/src/main/kotlin/com/personalization/di/SdkModule.kt
+++ b/personalization-sdk/src/main/kotlin/com/personalization/di/SdkModule.kt
@@ -3,21 +3,27 @@ package com.personalization.di
 import android.content.Context
 import com.personalization.RegisterManager
 import com.personalization.api.managers.CartManager
+import com.personalization.api.managers.CategoryManager
+import com.personalization.api.managers.CollectionManager
 import com.personalization.api.managers.InAppNotificationManager
 import com.personalization.api.managers.LoyaltyManager
 import com.personalization.api.managers.OrdersManager
 import com.personalization.api.managers.ProductsManager
+import com.personalization.api.managers.ProfileManager
 import com.personalization.api.managers.RecommendationManager
 import com.personalization.api.managers.PredictManager
 import com.personalization.api.managers.SearchManager
 import com.personalization.api.managers.TrackEventManager
 import com.personalization.features.cart.CartManagerImpl
+import com.personalization.features.category.impl.CategoryManagerImpl
+import com.personalization.features.collection.impl.CollectionManagerImpl
 import com.personalization.features.inAppNotification.impl.InAppNotificationManagerImpl
 import com.personalization.features.notification.domain.data.NotificationDataExtractor
 import com.personalization.features.loyalty.impl.LoyaltyManagerImpl
 import com.personalization.features.orders.impl.OrdersManagerImpl
 import com.personalization.features.predict.impl.PredictManagerImpl
 import com.personalization.features.products.impl.ProductsManagerImpl
+import com.personalization.features.profile.impl.ProfileManagerImpl
 import com.personalization.features.recommendation.impl.RecommendationManagerImpl
 import com.personalization.features.search.impl.SearchManagerImpl
 import com.personalization.features.trackEvent.impl.TrackEventManagerImpl
@@ -139,6 +145,30 @@ class SdkModule {
         sendNetworkMethodUseCase = sendNetworkMethodUseCase
     )
 
+    @Singleton
+    @Provides
+    fun provideProfileManager(
+        sendNetworkMethodUseCase: SendNetworkMethodUseCase
+    ): ProfileManager = ProfileManagerImpl(
+        sendNetworkMethodUseCase = sendNetworkMethodUseCase
+    )
+
+    @Singleton
+    @Provides
+    fun provideCategoryManager(
+        sendNetworkMethodUseCase: SendNetworkMethodUseCase
+    ): CategoryManager = CategoryManagerImpl(
+        sendNetworkMethodUseCase = sendNetworkMethodUseCase
+    )
+
+    @Singleton
+    @Provides
+    fun provideCollectionManager(
+        sendNetworkMethodUseCase: SendNetworkMethodUseCase
+    ): CollectionManager = CollectionManagerImpl(
+        sendNetworkMethodUseCase = sendNetworkMethodUseCase
+    )
+
     @Singleton
     @Provides
     fun provideInAppNotificationManager(
diff --git a/personalization-sdk/src/main/kotlin/com/personalization/features/category/impl/CategoryManagerImpl.kt b/personalization-sdk/src/main/kotlin/com/personalization/features/category/impl/CategoryManagerImpl.kt
new file mode 100644
index 00000000..11f6efee
--- /dev/null
+++ b/personalization-sdk/src/main/kotlin/com/personalization/features/category/impl/CategoryManagerImpl.kt
@@ -0,0 +1,63 @@
+package com.personalization.features.category.impl
+
+import com.google.gson.Gson
+import com.personalization.Params
+import com.personalization.api.OnApiCallbackListener
+import com.personalization.api.managers.CategoryManager
+import com.personalization.api.responses.category.CategoryResponse
+import com.personalization.sdk.domain.usecases.network.SendNetworkMethodUseCase
+import javax.inject.Inject
+import org.json.JSONObject
+
+internal class CategoryManagerImpl @Inject constructor(
+    private val sendNetworkMethodUseCase: SendNetworkMethodUseCase
+) : CategoryManager {
+
+    override fun getCategory(
+        category: String,
+        limit: Int?,
+        page: Int?,
+        brands: String?,
+        locations: String?,
+        filters: Map<String, Any>?,
+        onSuccess: (CategoryResponse) -> Unit,
+        onError: (Int, String?) -> Unit
+    ) {
+        val params = Params()
+        limit?.let { params.put(LIMIT_KEY, it) }
+        page?.let { params.put(PAGE_KEY, it) }
+        brands?.let { params.put(BRANDS_KEY, it) }
+        locations?.let { params.put(LOCATIONS_KEY, it) }
+        filters?.takeIf { it.isNotEmpty() }?.let {
+            params.put(FILTERS_KEY, JSONObject(it).toString())
+        }
+
+        sendNetworkMethodUseCase.getAsync(
+            "$CATEGORY_REQUEST/$category",
+            params.build(),
+            object : OnApiCallbackListener() {
+                override fun onSuccess(response: JSONObject?) {
+                    val parsed = Gson().fromJson(
+                        response.toString(),
+                        CategoryResponse::class.java
+                    )
+                    onSuccess(parsed ?: CategoryResponse())
+                }
+
+                override fun onError(code: Int, msg: String?) {
+                    onError(code, msg)
+                }
+            }
+        )
+    }
+
+    companion object {
+        const val CATEGORY_REQUEST = "category"
+
+        private const val LIMIT_KEY = "limit"
+        private const val PAGE_KEY = "page"
+        private const val BRANDS_KEY = "brands"
+        private const val LOCATIONS_KEY = "locations"
+        private const val FILTERS_KEY = "filters"
+    }
+}
diff --git a/personalization-sdk/src/main/kotlin/com/personalization/features/collection/impl/CollectionManagerImpl.kt b/personalization-sdk/src/main/kotlin/com/personalization/features/collection/impl/CollectionManagerImpl.kt
new file mode 100644
index 00000000..ee1d7b3b
--- /dev/null
+++ b/personalization-sdk/src/main/kotlin/com/personalization/features/collection/impl/CollectionManagerImpl.kt
@@ -0,0 +1,61 @@
+package com.personalization.features.collection.impl
+
+import com.google.gson.Gson
+import com.personalization.Params
+import com.personalization.api.OnApiCallbackListener
+import com.personalization.api.managers.CollectionManager
+import com.personalization.api.responses.collection.CollectionResponse
+import com.personalization.sdk.domain.usecases.network.SendNetworkMethodUseCase
+import javax.inject.Inject
+import org.json.JSONObject
+
+internal class CollectionManagerImpl @Inject constructor(
+    private val sendNetworkMethodUseCase: SendNetworkMethodUseCase
+) : CollectionManager {
+
+    override fun getCollection(
+        collectionId: String,
+        location: String?,
+        email: String?,
+        phone: String?,
+        externalId: String?,
+        loyaltyId: String?,
+        onSuccess: (CollectionResponse) -> Unit,
+        onError: (Int, String?) -> Unit
+    ) {
+        val params = Params()
+        location?.let { params.put(LOCATION_KEY, it) }
+        email?.let { params.put(EMAIL_KEY, it) }
+        phone?.let { params.put(PHONE_KEY, it) }
+        externalId?.let { params.put(EXTERNAL_ID_KEY, it) }
+        loyaltyId?.let { params.put(LOYALTY_ID_KEY, it) }
+
+        sendNetworkMethodUseCase.getAsync(
+            "$COLLECTION_REQUEST/$collectionId",
+            params.build(),
+            object : OnApiCallbackListener() {
+                override fun onSuccess(response: JSONObject?) {
+                    val parsed = Gson().fromJson(
+                        response.toString(),
+                        CollectionResponse::class.java
+                    )
+                    onSuccess(parsed ?: CollectionResponse())
+                }
+
+                override fun onError(code: Int, msg: String?) {
+                    onError(code, msg)
+                }
+            }
+        )
+    }
+
+    companion object {
+        const val COLLECTION_REQUEST = "collection"
+
+        private const val LOCATION_KEY = "location"
+        private const val EMAIL_KEY = "email"
+        private const val PHONE_KEY = "phone"
+        private const val EXTERNAL_ID_KEY = "external_id"
+        private const val LOYALTY_ID_KEY = "loyalty_id"
+    }
+}
diff --git a/personalization-sdk/src/main/kotlin/com/personalization/features/products/impl/ProductsManagerImpl.kt b/personalization-sdk/src/main/kotlin/com/personalization/features/products/impl/ProductsManagerImpl.kt
index 8326edbd..87381645 100644
--- a/personalization-sdk/src/main/kotlin/com/personalization/features/products/impl/ProductsManagerImpl.kt
+++ b/personalization-sdk/src/main/kotlin/com/personalization/features/products/impl/ProductsManagerImpl.kt
@@ -1,8 +1,10 @@
 package com.personalization.features.products.impl
 
+import com.google.gson.Gson
 import com.personalization.Params
 import com.personalization.api.OnApiCallbackListener
 import com.personalization.api.managers.ProductsManager
+import com.personalization.api.responses.products.counters.ProductCountersResponse
 import com.personalization.sdk.domain.usecases.network.SendNetworkMethodUseCase
 import org.json.JSONObject
 import javax.inject.Inject
@@ -49,6 +51,30 @@ internal class ProductsManagerImpl @Inject constructor(
         )
     }
 
+    override fun getProductCounters(
+        item: String,
+        onSuccess: (ProductCountersResponse) -> Unit,
+        onError: (Int, String?) -> Unit
+    ) {
+        sendNetworkMethodUseCase.getAsync(
+            method = GET_PRODUCT_COUNTERS_REQUEST,
+            params = Params().apply { put(ITEM_KEY, item) }.build(),
+            listener = object : OnApiCallbackListener() {
+                override fun onSuccess(response: JSONObject?) {
+                    val parsed = Gson().fromJson(
+                        response.toString(),
+                        ProductCountersResponse::class.java
+                    )
+                    onSuccess(parsed ?: ProductCountersResponse())
+                }
+
+                override fun onError(code: Int, msg: String?) {
+                    onError(code, msg)
+                }
+            }
+        )
+    }
+
     private fun Params.buildParams(
         itemId: String? = null,
         brands: String? = null,
@@ -76,6 +102,9 @@ internal class ProductsManagerImpl @Inject constructor(
     companion object {
         const val GET_PRODUCT_LIST_REQUEST = "products"
         const val GET_PRODUCT_INFO_REQUEST = "products/get"
+        const val GET_PRODUCT_COUNTERS_REQUEST = "products/counters"
+
+        private const val ITEM_KEY = "item"
 
         private const val LIMIT_KEY = "limit"
         private const val PAGE_KEY = "page"
diff --git a/personalization-sdk/src/main/kotlin/com/personalization/features/profile/impl/ProfileManagerImpl.kt b/personalization-sdk/src/main/kotlin/com/personalization/features/profile/impl/ProfileManagerImpl.kt
new file mode 100644
index 00000000..e89bb732
--- /dev/null
+++ b/personalization-sdk/src/main/kotlin/com/personalization/features/profile/impl/ProfileManagerImpl.kt
@@ -0,0 +1,43 @@
+package com.personalization.features.profile.impl
+
+import com.google.gson.Gson
+import com.personalization.Params
+import com.personalization.api.OnApiCallbackListener
+import com.personalization.api.managers.ProfileManager
+import com.personalization.api.responses.profile.GetProfileResponse
+import com.personalization.sdk.domain.usecases.network.SendNetworkMethodUseCase
+import javax.inject.Inject
+import org.json.JSONObject
+
+internal class ProfileManagerImpl @Inject constructor(
+    private val sendNetworkMethodUseCase: SendNetworkMethodUseCase
+) : ProfileManager {
+
+    override fun getProfile(
+        onSuccess: (GetProfileResponse) -> Unit,
+        onError: (Int, String?) -> Unit
+    ) {
+        // shop_id and did are injected automatically by the network layer.
+        sendNetworkMethodUseCase.getAsync(
+            GET_PROFILE_REQUEST,
+            Params().build(),
+            object : OnApiCallbackListener() {
+                override fun onSuccess(response: JSONObject?) {
+                    val parsed = Gson().fromJson(
+                        response.toString(),
+                        GetProfileResponse::class.java
+                    )
+                    onSuccess(parsed ?: GetProfileResponse())
+                }
+
+                override fun onError(code: Int, msg: String?) {
+                    onError(code, msg)
+                }
+            }
+        )
+    }
+
+    companion object {
+        const val GET_PROFILE_REQUEST = "profile"
+    }
+}
diff --git a/personalization-sdk/src/test/kotlin/com/personalization/features/category/impl/CategoryManagerImplTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/features/category/impl/CategoryManagerImplTest.kt
new file mode 100644
index 00000000..036b1560
--- /dev/null
+++ b/personalization-sdk/src/test/kotlin/com/personalization/features/category/impl/CategoryManagerImplTest.kt
@@ -0,0 +1,113 @@
+package com.personalization.features.category.impl
+
+import com.personalization.api.OnApiCallbackListener
+import com.personalization.api.responses.category.CategoryResponse
+import com.personalization.sdk.domain.usecases.network.SendNetworkMethodUseCase
+import io.mockk.Runs
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.slot
+import io.mockk.verify
+import org.json.JSONObject
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [28])
+class CategoryManagerImplTest {
+
+    private lateinit var sendNetworkMethodUseCase: SendNetworkMethodUseCase
+    private lateinit var impl: CategoryManagerImpl
+
+    @Before
+    fun setUp() {
+        sendNetworkMethodUseCase = mockk(relaxed = true)
+        impl = CategoryManagerImpl(sendNetworkMethodUseCase)
+    }
+
+    @Test
+    fun getCategory_getsFromCategoryEndpoint_withSlugAndParams() {
+        val methodSlot = slot<String>()
+        val paramsSlot = slot<JSONObject>()
+        every {
+            sendNetworkMethodUseCase.getAsync(capture(methodSlot), capture(paramsSlot), any())
+        } just Runs
+
+        impl.getCategory(
+            category = "smartfony-i-gadzhety",
+            limit = 10,
+            page = 2,
+            brands = "Apple",
+            onSuccess = {}
+        )
+
+        verify(exactly = 1) { sendNetworkMethodUseCase.getAsync(any(), any(), any()) }
+        assertEquals("category/smartfony-i-gadzhety", methodSlot.captured)
+        val body = paramsSlot.captured
+        assertEquals(10, body.getInt("limit"))
+        assertEquals(2, body.getInt("page"))
+        assertEquals("Apple", body.getString("brands"))
+    }
+
+    @Test
+    fun getCategory_omitsOptionalParams_whenNull() {
+        val paramsSlot = slot<JSONObject>()
+        every {
+            sendNetworkMethodUseCase.getAsync(any(), capture(paramsSlot), any())
+        } just Runs
+
+        impl.getCategory(category = "smartfony-i-gadzhety", onSuccess = {})
+
+        val body = paramsSlot.captured
+        assertEquals(0, body.length())
+    }
+
+    @Test
+    fun getCategory_parsesProductsAndTotal_andInvokesOnSuccess() {
+        val listenerSlot = slot<OnApiCallbackListener>()
+        every {
+            sendNetworkMethodUseCase.getAsync(any(), any(), capture(listenerSlot))
+        } just Runs
+
+        var result: CategoryResponse? = null
+        impl.getCategory(category = "smartfony-i-gadzhety", onSuccess = { result = it })
+
+        listenerSlot.captured.onSuccess(
+            JSONObject(
+                """{"products_total":2208,"products":[{"id":"300275","name":"Phone"}],"brands":[{"name":"Apple","count":12}]}"""
+            )
+        )
+
+        assertEquals(2208, result?.productsTotal)
+        assertEquals(1, result?.products?.size)
+        assertEquals("300275", result?.products?.first()?.id)
+        assertEquals("Apple", result?.brands?.first()?.name)
+    }
+
+    @Test
+    fun getCategory_forwardsError() {
+        val listenerSlot = slot<OnApiCallbackListener>()
+        every {
+            sendNetworkMethodUseCase.getAsync(any(), any(), capture(listenerSlot))
+        } just Runs
+
+        var code = 0
+        var msg: String? = null
+        impl.getCategory(
+            category = "unknown",
+            onSuccess = {},
+            onError = { c, m -> code = c; msg = m }
+        )
+
+        listenerSlot.captured.onError(404, "not found")
+
+        assertEquals(404, code)
+        assertTrue(msg!!.contains("not found"))
+    }
+}
diff --git a/personalization-sdk/src/test/kotlin/com/personalization/features/collection/impl/CollectionManagerImplTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/features/collection/impl/CollectionManagerImplTest.kt
new file mode 100644
index 00000000..c71c6819
--- /dev/null
+++ b/personalization-sdk/src/test/kotlin/com/personalization/features/collection/impl/CollectionManagerImplTest.kt
@@ -0,0 +1,109 @@
+package com.personalization.features.collection.impl
+
+import com.personalization.api.OnApiCallbackListener
+import com.personalization.api.responses.collection.CollectionResponse
+import com.personalization.sdk.domain.usecases.network.SendNetworkMethodUseCase
+import io.mockk.Runs
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.slot
+import io.mockk.verify
+import org.json.JSONObject
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [28])
+class CollectionManagerImplTest {
+
+    private lateinit var sendNetworkMethodUseCase: SendNetworkMethodUseCase
+    private lateinit var impl: CollectionManagerImpl
+
+    @Before
+    fun setUp() {
+        sendNetworkMethodUseCase = mockk(relaxed = true)
+        impl = CollectionManagerImpl(sendNetworkMethodUseCase)
+    }
+
+    @Test
+    fun getCollection_getsFromCollectionEndpoint_withIdAndOptionalParams() {
+        val methodSlot = slot<String>()
+        val paramsSlot = slot<JSONObject>()
+        every {
+            sendNetworkMethodUseCase.getAsync(capture(methodSlot), capture(paramsSlot), any())
+        } just Runs
+
+        impl.getCollection(
+            collectionId = "1",
+            email = "demo@rees46.ru",
+            loyaltyId = "loyal-7",
+            onSuccess = {}
+        )
+
+        verify(exactly = 1) { sendNetworkMethodUseCase.getAsync(any(), any(), any()) }
+        assertEquals("collection/1", methodSlot.captured)
+        val body = paramsSlot.captured
+        assertEquals("demo@rees46.ru", body.getString("email"))
+        assertEquals("loyal-7", body.getString("loyalty_id"))
+    }
+
+    @Test
+    fun getCollection_omitsOptionalParams_whenNull() {
+        val paramsSlot = slot<JSONObject>()
+        every {
+            sendNetworkMethodUseCase.getAsync(any(), capture(paramsSlot), any())
+        } just Runs
+
+        impl.getCollection(collectionId = "1", onSuccess = {})
+
+        assertEquals(0, paramsSlot.captured.length())
+    }
+
+    @Test
+    fun getCollection_parsesProducts_andInvokesOnSuccess() {
+        val listenerSlot = slot<OnApiCallbackListener>()
+        every {
+            sendNetworkMethodUseCase.getAsync(any(), any(), capture(listenerSlot))
+        } just Runs
+
+        var result: CollectionResponse? = null
+        impl.getCollection(collectionId = "1", onSuccess = { result = it })
+
+        listenerSlot.captured.onSuccess(
+            JSONObject(
+                """{"products":[{"id":"868","_id":"131887","name":"Logitech H150","brand":"Logitech","price":14990}]}"""
+            )
+        )
+
+        assertEquals(1, result?.products?.size)
+        assertEquals("868", result?.products?.first()?.id)
+        assertEquals("Logitech", result?.products?.first()?.brand)
+    }
+
+    @Test
+    fun getCollection_forwardsError() {
+        val listenerSlot = slot<OnApiCallbackListener>()
+        every {
+            sendNetworkMethodUseCase.getAsync(any(), any(), capture(listenerSlot))
+        } just Runs
+
+        var code = 0
+        var msg: String? = null
+        impl.getCollection(
+            collectionId = "999",
+            onSuccess = {},
+            onError = { c, m -> code = c; msg = m }
+        )
+
+        listenerSlot.captured.onError(404, "not found")
+
+        assertEquals(404, code)
+        assertTrue(msg!!.contains("not found"))
+    }
+}
diff --git a/personalization-sdk/src/test/kotlin/com/personalization/features/products/impl/ProductsManagerImplTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/features/products/impl/ProductsManagerImplTest.kt
new file mode 100644
index 00000000..aa8d7732
--- /dev/null
+++ b/personalization-sdk/src/test/kotlin/com/personalization/features/products/impl/ProductsManagerImplTest.kt
@@ -0,0 +1,92 @@
+package com.personalization.features.products.impl
+
+import com.personalization.api.OnApiCallbackListener
+import com.personalization.api.responses.products.counters.ProductCountersResponse
+import com.personalization.sdk.domain.usecases.network.SendNetworkMethodUseCase
+import io.mockk.Runs
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.slot
+import io.mockk.verify
+import org.json.JSONObject
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [28])
+class ProductsManagerImplTest {
+
+    private lateinit var sendNetworkMethodUseCase: SendNetworkMethodUseCase
+    private lateinit var impl: ProductsManagerImpl
+
+    @Before
+    fun setUp() {
+        sendNetworkMethodUseCase = mockk(relaxed = true)
+        impl = ProductsManagerImpl(sendNetworkMethodUseCase)
+    }
+
+    @Test
+    fun getProductCounters_getsFromCountersEndpoint_withItem() {
+        val methodSlot = slot<String>()
+        val paramsSlot = slot<JSONObject>()
+        every {
+            sendNetworkMethodUseCase.getAsync(capture(methodSlot), capture(paramsSlot), any())
+        } just Runs
+
+        impl.getProductCounters(item = "300275", onSuccess = {})
+
+        verify(exactly = 1) { sendNetworkMethodUseCase.getAsync(any(), any(), any()) }
+        assertEquals(ProductsManagerImpl.GET_PRODUCT_COUNTERS_REQUEST, methodSlot.captured)
+        assertEquals("300275", paramsSlot.captured.getString("item"))
+    }
+
+    @Test
+    fun getProductCounters_parsesCounters_andInvokesOnSuccess() {
+        val listenerSlot = slot<OnApiCallbackListener>()
+        every {
+            sendNetworkMethodUseCase.getAsync(any(), any(), capture(listenerSlot))
+        } just Runs
+
+        var result: ProductCountersResponse? = null
+        impl.getProductCounters(item = "300275", onSuccess = { result = it })
+
+        listenerSlot.captured.onSuccess(
+            JSONObject(
+                """{"daily":{"view":3,"cart":1,"purchase":0},"now":{"view":5,"cart":0,"purchase":0},"triggers":{"back_in_stock":0,"price_drop":10}}"""
+            )
+        )
+
+        assertEquals(3, result?.daily?.view)
+        assertEquals(1, result?.daily?.cart)
+        assertEquals(5, result?.now?.view)
+        assertEquals(10, result?.triggers?.priceDrop)
+        assertEquals(0, result?.triggers?.backInStock)
+    }
+
+    @Test
+    fun getProductCounters_forwardsError() {
+        val listenerSlot = slot<OnApiCallbackListener>()
+        every {
+            sendNetworkMethodUseCase.getAsync(any(), any(), capture(listenerSlot))
+        } just Runs
+
+        var code = 0
+        var msg: String? = null
+        impl.getProductCounters(
+            item = "300275",
+            onSuccess = {},
+            onError = { c, m -> code = c; msg = m }
+        )
+
+        listenerSlot.captured.onError(404, "not found")
+
+        assertEquals(404, code)
+        assertTrue(msg!!.contains("not found"))
+    }
+}
diff --git a/personalization-sdk/src/test/kotlin/com/personalization/features/profile/impl/ProfileManagerImplTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/features/profile/impl/ProfileManagerImplTest.kt
new file mode 100644
index 00000000..83272ec2
--- /dev/null
+++ b/personalization-sdk/src/test/kotlin/com/personalization/features/profile/impl/ProfileManagerImplTest.kt
@@ -0,0 +1,92 @@
+package com.personalization.features.profile.impl
+
+import com.personalization.api.OnApiCallbackListener
+import com.personalization.api.responses.profile.GetProfileResponse
+import com.personalization.sdk.domain.usecases.network.SendNetworkMethodUseCase
+import io.mockk.Runs
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.slot
+import io.mockk.verify
+import org.json.JSONObject
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [28])
+class ProfileManagerImplTest {
+
+    private lateinit var sendNetworkMethodUseCase: SendNetworkMethodUseCase
+    private lateinit var impl: ProfileManagerImpl
+
+    @Before
+    fun setUp() {
+        sendNetworkMethodUseCase = mockk(relaxed = true)
+        impl = ProfileManagerImpl(sendNetworkMethodUseCase)
+    }
+
+    @Test
+    fun getProfile_getsFromProfileEndpoint_withoutExplicitParams() {
+        val paramsSlot = slot<JSONObject>()
+        every {
+            sendNetworkMethodUseCase.getAsync(any(), capture(paramsSlot), any())
+        } just Runs
+
+        impl.getProfile(onSuccess = {})
+
+        verify(exactly = 1) {
+            sendNetworkMethodUseCase.getAsync(
+                ProfileManagerImpl.GET_PROFILE_REQUEST,
+                any(),
+                any()
+            )
+        }
+        // shop_id and did are appended later by the network layer, not here.
+        assertEquals(0, paramsSlot.captured.length())
+    }
+
+    @Test
+    fun getProfile_parsesResponse_andInvokesOnSuccess() {
+        val listenerSlot = slot<OnApiCallbackListener>()
+        every {
+            sendNetworkMethodUseCase.getAsync(any(), any(), capture(listenerSlot))
+        } just Runs
+
+        var result: GetProfileResponse? = null
+        impl.getProfile(onSuccess = { result = it })
+
+        listenerSlot.captured.onSuccess(
+            JSONObject(
+                """{"id":"8001909","has_email":false,"computed_gender":null,"gender":null,"bought_something":false,"custom_properties":{"vip":"1"}}"""
+            )
+        )
+
+        assertEquals("8001909", result?.id)
+        assertEquals(false, result?.hasEmail)
+        assertEquals(false, result?.boughtSomething)
+        assertEquals("1", result?.customProperties?.get("vip")?.asString)
+    }
+
+    @Test
+    fun getProfile_forwardsError() {
+        val listenerSlot = slot<OnApiCallbackListener>()
+        every {
+            sendNetworkMethodUseCase.getAsync(any(), any(), capture(listenerSlot))
+        } just Runs
+
+        var code = 0
+        var msg: String? = null
+        impl.getProfile(onSuccess = {}, onError = { c, m -> code = c; msg = m })
+
+        listenerSlot.captured.onError(400, "bad request")
+
+        assertEquals(400, code)
+        assertTrue(msg!!.contains("bad request"))
+    }
+}

From 15b26fccf10dcc9542e8e1fbb368eac4e3eac521 Mon Sep 17 00:00:00 2001
From: xyzcancer <xyzcancer@gmail.com>
Date: Fri, 26 Jun 2026 15:04:56 +0400
Subject: [PATCH 2/3] fix(push): route notifications to the initialized SDK
 instance and harden delivery

The documented `SDK().initialize()` now registers itself as the companion
`instance` that FirebaseMessagingService delivers pushes to, so the documented
initialization receives pushes without an UninitializedPropertyAccessException.
Guard notificationReceived() before initialize() and wrap onMessageReceived in
try/catch so a malformed or early push can never crash the host app. Adds
robustness tests covering both paths.

Demo app: display pushes with a standard BigPicture notification (matching the
React Native demo), request POST_NOTIFICATIONS at runtime, surface the FCM token
in a copyable header, and add a crash interceptor for the tester.
---
 demo-app/build.gradle                         |   7 +
 demo-app/src/main/AndroidManifest.xml         |   2 +
 .../personalization/demo/DemoApplication.kt   | 142 ++++++++-
 .../com/personalization/demo/MainActivity.kt  | 121 +++++++-
 .../src/main/res/layout/activity_main.xml     | 293 ++++++++++--------
 demo-app/src/main/res/values/strings.xml      |   6 +
 .../com/personalization/MessagingService.kt   |  22 +-
 .../main/kotlin/com/personalization/SDK.kt    |  36 ++-
 .../MessagingServicePushRobustnessTest.kt     |  41 +++
 9 files changed, 516 insertions(+), 154 deletions(-)
 create mode 100644 personalization-sdk/src/test/kotlin/com/personalization/MessagingServicePushRobustnessTest.kt

diff --git a/demo-app/build.gradle b/demo-app/build.gradle
index c569e864..6fce698d 100644
--- a/demo-app/build.gradle
+++ b/demo-app/build.gradle
@@ -3,6 +3,13 @@ plugins {
     id 'org.jetbrains.kotlin.android'
 }
 
+// Process google-services.json (untracked, local-only) so Firebase/FCM is configured
+// and the push token can be fetched. Applied conditionally to keep the build green
+// in CI or for contributors who don't have the file.
+if (file('google-services.json').exists()) {
+    apply plugin: 'com.google.gms.google-services'
+}
+
 android {
     namespace 'com.personalization.demo'
     compileSdkVersion 34
diff --git a/demo-app/src/main/AndroidManifest.xml b/demo-app/src/main/AndroidManifest.xml
index a8abb8a0..d383d9b4 100644
--- a/demo-app/src/main/AndroidManifest.xml
+++ b/demo-app/src/main/AndroidManifest.xml
@@ -3,6 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <!-- Android 13+ requires this (granted at runtime) for any notification to be shown. -->
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application
         android:name=".DemoApplication"
diff --git a/demo-app/src/main/java/com/personalization/demo/DemoApplication.kt b/demo-app/src/main/java/com/personalization/demo/DemoApplication.kt
index 3c888d51..38afa6af 100644
--- a/demo-app/src/main/java/com/personalization/demo/DemoApplication.kt
+++ b/demo-app/src/main/java/com/personalization/demo/DemoApplication.kt
@@ -1,17 +1,155 @@
 package com.personalization.demo
 
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
 import android.content.Context
+import android.content.Intent
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.os.Build
+import androidx.core.app.NotificationCompat
 import androidx.multidex.MultiDexApplication
 import com.google.firebase.FirebaseApp
+import com.personalization.SDK
+import com.personalization.sdk.data.models.dto.notification.NotificationData
+import java.io.PrintWriter
+import java.io.StringWriter
+import java.net.URL
 
 class DemoApplication : MultiDexApplication() {
-    
+
+    lateinit var sdk: SDK
+
     override fun onCreate() {
+        // Capture any uncaught crash (including ones in MessagingService while a push is
+        // handled — it runs in this process) so MainActivity can show it for the tester.
+        installCrashHandler()
         super.onCreate()
         // Initialize Firebase if not already initialized
         if (FirebaseApp.getApps(this).isEmpty()) {
             FirebaseApp.initializeApp(this)
         }
+        initSdk()
     }
-}
 
+    private fun initSdk() {
+        // Official initialization (per docs): create the SDK once in Application.onCreate so it is
+        // ready in every process start — including the cold process FCM starts just to deliver a
+        // push.
+        try {
+            sdk = SDK()
+            sdk.initialize(
+                context = applicationContext,
+                shopId = BuildConfig.SHOP_ID,
+            )
+        } catch (e: Exception) {
+            e.printStackTrace()
+            return
+        }
+
+        createPushChannel()
+
+        // Displaying a push is the host app's responsibility: the SDK delivers the parsed
+        // NotificationData via setOnMessageListener, and the host posts the notification. We build a
+        // standard BigPicture notification — the same approach the React Native demo uses (notifee
+        // AndroidStyle.BIGPICTURE): title and body are visible without expanding, the image is shown
+        // as the big picture, and tapping opens the app. Set in Application so it also works when FCM
+        // delivers a push to a cold process. Image download runs off the main thread.
+        sdk.setOnMessageListener { data ->
+            Thread { showPushNotification(data) }.start()
+        }
+    }
+
+    private fun createPushChannel() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            // IMPORTANCE_HIGH so the push appears as a heads-up pop-up with sound.
+            val channel = NotificationChannel(
+                PUSH_CHANNEL_ID,
+                getString(R.string.push_channel_name),
+                NotificationManager.IMPORTANCE_HIGH,
+            )
+            getSystemService(NotificationManager::class.java)
+                ?.createNotificationChannel(channel)
+        }
+    }
+
+    /**
+     * Builds and posts a standard BigPicture notification from the SDK push data — the native
+     * equivalent of the React Native demo's notifee BIGPICTURE notification.
+     */
+    private fun showPushNotification(data: NotificationData) {
+        val bigPicture = data.image?.split(",")?.firstOrNull()?.trim()?.let(::loadBitmap)
+        val largeIcon = data.icon?.trim()?.takeIf { it.isNotEmpty() }?.let(::loadBitmap)
+
+        val builder = NotificationCompat.Builder(this, PUSH_CHANNEL_ID)
+            .setSmallIcon(com.personalization.R.drawable.ic_notification_logo)
+            .setContentTitle(data.title)
+            .setContentText(data.body)
+            .setAutoCancel(true)
+            .setPriority(NotificationCompat.PRIORITY_HIGH)
+            .setDefaults(NotificationCompat.DEFAULT_ALL)
+            .setContentIntent(buildContentIntent(data))
+
+        if (largeIcon != null) builder.setLargeIcon(largeIcon)
+        if (bigPicture != null) {
+            builder.setStyle(
+                NotificationCompat.BigPictureStyle()
+                    .bigPicture(bigPicture)
+                    .bigLargeIcon(null as Bitmap?),
+            )
+        }
+
+        getSystemService(NotificationManager::class.java)
+            ?.notify((data.title.orEmpty() + data.body.orEmpty()).hashCode(), builder.build())
+    }
+
+    /** Tapping opens MainActivity, carrying the push type/id so it can report the click to the SDK. */
+    private fun buildContentIntent(data: NotificationData): PendingIntent {
+        val intent = Intent(this, MainActivity::class.java).apply {
+            putExtra("NOTIFICATION_TYPE", data.type)
+            putExtra("NOTIFICATION_ID", data.id)
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK or
+                Intent.FLAG_ACTIVITY_CLEAR_TOP or
+                Intent.FLAG_ACTIVITY_SINGLE_TOP
+        }
+        return PendingIntent.getActivity(
+            this,
+            (data.id ?: (data.title.orEmpty() + data.body.orEmpty())).hashCode(),
+            intent,
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
+        )
+    }
+
+    private fun loadBitmap(url: String): Bitmap? = try {
+        URL(url).openStream().use { BitmapFactory.decodeStream(it) }
+    } catch (e: Exception) {
+        e.printStackTrace()
+        null
+    }
+
+    private fun installCrashHandler() {
+        val previous = Thread.getDefaultUncaughtExceptionHandler()
+        Thread.setDefaultUncaughtExceptionHandler { thread, throwable ->
+            try {
+                val stack = StringWriter().also { throwable.printStackTrace(PrintWriter(it)) }
+                val text = "Thread: ${thread.name}\n\n$stack"
+                // commit() is synchronous — it must persist before the process is killed.
+                getSharedPreferences(CRASH_PREFS, Context.MODE_PRIVATE)
+                    .edit()
+                    .putString(KEY_LAST_CRASH, text)
+                    .commit()
+            } catch (_: Throwable) {
+                // Never let the crash handler itself throw.
+            }
+            // Let the default handler run so the OS still reports/kills as usual.
+            previous?.uncaughtException(thread, throwable)
+        }
+    }
+
+    companion object {
+        const val CRASH_PREFS = "demo_crash"
+        const val KEY_LAST_CRASH = "last_crash"
+        const val PUSH_CHANNEL_ID = "demo_push"
+    }
+}
diff --git a/demo-app/src/main/java/com/personalization/demo/MainActivity.kt b/demo-app/src/main/java/com/personalization/demo/MainActivity.kt
index 484d9ceb..d6c2c7e2 100644
--- a/demo-app/src/main/java/com/personalization/demo/MainActivity.kt
+++ b/demo-app/src/main/java/com/personalization/demo/MainActivity.kt
@@ -1,10 +1,22 @@
 package com.personalization.demo
 
+import android.Manifest
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Build
 import android.os.Bundle
 import android.widget.Button
+import android.widget.TextView
 import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
 import com.google.firebase.FirebaseApp
+import com.google.firebase.messaging.FirebaseMessaging
 import com.personalization.Params
 import com.personalization.Params.TrackEvent
 import com.personalization.SDK
@@ -23,6 +35,7 @@ import com.personalization.sdk.data.models.dto.popUp.Position
 class MainActivity : AppCompatActivity() {
 
     private lateinit var sdk: SDK
+    private var pushToken: String? = null
 
     private object DemoTrackEventConstants {
         /** Same value as SDK client-side validation errors for custom field key collisions. */
@@ -88,19 +101,10 @@ class MainActivity : AppCompatActivity() {
             e.printStackTrace()
         }
 
-        // Initialize SDK
-        try {
-            sdk = SDK()
-            sdk.initialize(
-                context = this,
-                shopId = BuildConfig.SHOP_ID,
-                apiDomain = "api.rees46.ru",
-                autoSendPushToken = false
-            )
-        } catch (e: Exception) {
-            e.printStackTrace()
-            // Continue even if SDK initialization fails for demo purposes
-        }
+        // The SDK singleton (SDK.instance) is initialized in DemoApplication.onCreate so it is
+        // ready in every process — including the cold process FCM starts to deliver a push.
+        // Reuse that same initialized instance here (do NOT create a new SDK()).
+        sdk = SDK.instance
 
         // Initialize fragment manager for popups
         sdk.inAppNotificationManager.initFragmentManager(supportFragmentManager)
@@ -174,6 +178,97 @@ class MainActivity : AppCompatActivity() {
         findViewById<Button>(R.id.btnGetCollection).setOnClickListener {
             getCollection()
         }
+
+        findViewById<Button>(R.id.btnCopyToken).setOnClickListener {
+            copyPushToken()
+        }
+
+        ensureNotificationPermission()
+        loadPushToken()
+        showLastCrashIfAny()
+        // App may have been opened by tapping a push — report the click to the SDK.
+        handleNotificationClick(intent)
+    }
+
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        setIntent(intent)
+        handleNotificationClick(intent)
+    }
+
+    /**
+     * When the app is opened by tapping an SDK push, the launch intent carries the notification's
+     * type/id. Forward them to the SDK so it can send `track/clicked`. Guarded so normal launches
+     * (no push extras) don't trigger spurious tracking.
+     */
+    private fun handleNotificationClick(intent: Intent?) {
+        val extras = intent?.extras ?: return
+        val hasPushExtras = extras.getString("NOTIFICATION_TYPE") != null ||
+            extras.getString("NOTIFICATION_ID") != null
+        if (!hasPushExtras) return
+        sdk.notificationClicked(extras)
+    }
+
+    /** If the previous run crashed (e.g. while handling a push), show the saved stack with Copy. */
+    private fun showLastCrashIfAny() {
+        val prefs = getSharedPreferences(DemoApplication.CRASH_PREFS, Context.MODE_PRIVATE)
+        val crash = prefs.getString(DemoApplication.KEY_LAST_CRASH, null) ?: return
+        AlertDialog.Builder(this)
+            .setTitle("Last crash")
+            .setMessage(crash)
+            .setPositiveButton("Copy") { _, _ ->
+                val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+                clipboard.setPrimaryClip(ClipData.newPlainText("crash", crash))
+                Toast.makeText(this, "Crash copied", Toast.LENGTH_SHORT).show()
+            }
+            .setNegativeButton("Clear") { _, _ ->
+                prefs.edit().remove(DemoApplication.KEY_LAST_CRASH).apply()
+            }
+            .show()
+    }
+
+    /** Android 13+ requires the POST_NOTIFICATIONS runtime permission for any notification to show. */
+    private fun ensureNotificationPermission() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
+            ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) !=
+            PackageManager.PERMISSION_GRANTED
+        ) {
+            ActivityCompat.requestPermissions(
+                this,
+                arrayOf(Manifest.permission.POST_NOTIFICATIONS),
+                /* requestCode = */ 1001,
+            )
+        }
+    }
+
+    /**
+     * Loads the FCM push token and shows it in the always-visible header so a tester can
+     * read and copy it. Registration to the shop happens via autoSendPushToken on init.
+     */
+    private fun loadPushToken() {
+        val tokenView = findViewById<TextView>(R.id.tvPushToken)
+        FirebaseMessaging.getInstance().token.addOnCompleteListener { task ->
+            runOnUiThread {
+                if (task.isSuccessful) {
+                    pushToken = task.result
+                    tokenView.text = task.result
+                } else {
+                    tokenView.text =
+                        getString(R.string.push_token_error, task.exception?.message ?: "unknown")
+                }
+            }
+        }
+    }
+
+    private fun copyPushToken() {
+        val token = pushToken
+        if (token.isNullOrEmpty()) {
+            Toast.makeText(this, R.string.push_token_waiting, Toast.LENGTH_SHORT).show()
+            return
+        }
+        val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+        clipboard.setPrimaryClip(ClipData.newPlainText("FCM token", token))
+        Toast.makeText(this, R.string.push_token_copied, Toast.LENGTH_SHORT).show()
     }
 
     private fun getCollection() {
diff --git a/demo-app/src/main/res/layout/activity_main.xml b/demo-app/src/main/res/layout/activity_main.xml
index f8869f5d..d4d3319f 100644
--- a/demo-app/src/main/res/layout/activity_main.xml
+++ b/demo-app/src/main/res/layout/activity_main.xml
@@ -1,137 +1,176 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fillViewport="true">
+    android:orientation="vertical">
 
+    <!-- Registered push token, always visible at the top of the screen + Copy. -->
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="16dp"
-        android:gravity="center">
-
-    <Button
-        android:id="@+id/btnShowTestPopup"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/show_test_popup"
-        android:layout_marginTop="32dp" />
-
-    <Button
-        android:id="@+id/btnTrackEventCustomFields"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/track_event_custom_fields"
-        android:layout_marginTop="16dp" />
-
-    <Button
-        android:id="@+id/btnTrackEventCollision"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/track_event_reserved_collision"
-        android:layout_marginTop="16dp" />
-
-    <Button
-        android:id="@+id/btnTrackViewNoParams"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/track_view_no_params"
-        android:layout_marginTop="24dp" />
-
-    <Button
-        android:id="@+id/btnTrackViewWithParams"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/track_view_with_params"
-        android:layout_marginTop="16dp" />
-
-    <Button
-        android:id="@+id/btnPredictDidOnly"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/predict_did_only"
-        android:layout_marginTop="24dp" />
-
-    <Button
-        android:id="@+id/btnPredictWithEmail"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/predict_with_email"
-        android:layout_marginTop="16dp" />
-
-    <Button
-        android:id="@+id/btnTrackPurchaseMinimal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/track_purchase_minimal"
-        android:layout_marginTop="24dp" />
-
-    <Button
-        android:id="@+id/btnTrackPurchaseFull"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/track_purchase_full"
-        android:layout_marginTop="16dp" />
-
-    <Button
-        android:id="@+id/btnGetLastOrderProducts"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/get_last_order_products"
-        android:layout_marginTop="24dp" />
-
-    <Button
-        android:id="@+id/btnGetUserOrders"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/get_user_orders"
-        android:layout_marginTop="16dp" />
-
-    <Button
-        android:id="@+id/btnLoyaltyJoin"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/loyalty_join"
-        android:layout_marginTop="24dp" />
-
-    <Button
-        android:id="@+id/btnLoyaltyStatus"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/loyalty_status"
-        android:layout_marginTop="16dp" />
-
-    <Button
-        android:id="@+id/btnGetProfile"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/get_profile"
-        android:layout_marginTop="24dp" />
-
-    <Button
-        android:id="@+id/btnGetProductCounters"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/get_product_counters"
-        android:layout_marginTop="16dp" />
-
-    <Button
-        android:id="@+id/btnGetCategory"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/get_category"
-        android:layout_marginTop="16dp" />
-
-    <Button
-        android:id="@+id/btnGetCollection"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/get_collection"
-        android:layout_marginTop="16dp" />
-
+        android:background="#EEEEEE"
+        android:padding="12dp">
+
+        <TextView
+            android:id="@+id/tvPushTokenLabel"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/push_token_label"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/tvPushToken"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:text="@string/push_token_waiting"
+            android:textIsSelectable="true"
+            android:maxLines="4"
+            android:ellipsize="end" />
+
+        <Button
+            android:id="@+id/btnCopyToken"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/push_token_copy" />
     </LinearLayout>
 
-</ScrollView>
-
-
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:fillViewport="true">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="16dp"
+            android:gravity="center">
+
+        <Button
+            android:id="@+id/btnShowTestPopup"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/show_test_popup"
+            android:layout_marginTop="16dp" />
+
+        <Button
+            android:id="@+id/btnTrackEventCustomFields"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/track_event_custom_fields"
+            android:layout_marginTop="16dp" />
+
+        <Button
+            android:id="@+id/btnTrackEventCollision"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/track_event_reserved_collision"
+            android:layout_marginTop="16dp" />
+
+        <Button
+            android:id="@+id/btnTrackViewNoParams"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/track_view_no_params"
+            android:layout_marginTop="24dp" />
+
+        <Button
+            android:id="@+id/btnTrackViewWithParams"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/track_view_with_params"
+            android:layout_marginTop="16dp" />
+
+        <Button
+            android:id="@+id/btnPredictDidOnly"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/predict_did_only"
+            android:layout_marginTop="24dp" />
+
+        <Button
+            android:id="@+id/btnPredictWithEmail"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/predict_with_email"
+            android:layout_marginTop="16dp" />
+
+        <Button
+            android:id="@+id/btnTrackPurchaseMinimal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/track_purchase_minimal"
+            android:layout_marginTop="24dp" />
+
+        <Button
+            android:id="@+id/btnTrackPurchaseFull"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/track_purchase_full"
+            android:layout_marginTop="16dp" />
+
+        <Button
+            android:id="@+id/btnGetLastOrderProducts"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/get_last_order_products"
+            android:layout_marginTop="24dp" />
+
+        <Button
+            android:id="@+id/btnGetUserOrders"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/get_user_orders"
+            android:layout_marginTop="16dp" />
+
+        <Button
+            android:id="@+id/btnLoyaltyJoin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/loyalty_join"
+            android:layout_marginTop="24dp" />
+
+        <Button
+            android:id="@+id/btnLoyaltyStatus"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/loyalty_status"
+            android:layout_marginTop="16dp" />
+
+        <Button
+            android:id="@+id/btnGetProfile"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/get_profile"
+            android:layout_marginTop="24dp" />
+
+        <Button
+            android:id="@+id/btnGetProductCounters"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/get_product_counters"
+            android:layout_marginTop="16dp" />
+
+        <Button
+            android:id="@+id/btnGetCategory"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/get_category"
+            android:layout_marginTop="16dp" />
+
+        <Button
+            android:id="@+id/btnGetCollection"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/get_collection"
+            android:layout_marginTop="16dp" />
+
+        </LinearLayout>
+
+    </ScrollView>
+
+</LinearLayout>
diff --git a/demo-app/src/main/res/values/strings.xml b/demo-app/src/main/res/values/strings.xml
index 305ce1c3..3218db06 100644
--- a/demo-app/src/main/res/values/strings.xml
+++ b/demo-app/src/main/res/values/strings.xml
@@ -46,6 +46,12 @@
     <string name="get_collection">Collection: get</string>
     <string name="get_collection_ok">collection: %1$s</string>
     <string name="get_collection_fail">getCollection failed</string>
+    <string name="push_token_label">Registered push token:</string>
+    <string name="push_token_waiting">waiting for token…</string>
+    <string name="push_token_copy">Copy token</string>
+    <string name="push_token_copied">Token copied to clipboard</string>
+    <string name="push_token_error">FCM token error: %1$s</string>
+    <string name="push_channel_name">Push notifications</string>
 </resources>
 
 
diff --git a/personalization-sdk/src/main/kotlin/com/personalization/MessagingService.kt b/personalization-sdk/src/main/kotlin/com/personalization/MessagingService.kt
index 34ddcc41..9e08bd95 100644
--- a/personalization-sdk/src/main/kotlin/com/personalization/MessagingService.kt
+++ b/personalization-sdk/src/main/kotlin/com/personalization/MessagingService.kt
@@ -11,16 +11,20 @@ class MessagingService : FirebaseMessagingService() {
     }
 
     override fun onMessageReceived(remoteMessage: RemoteMessage) {
-        // Check if message contains a data payload.
+        // Never let a failure handling a push propagate to the FCM thread and crash the host app.
+        try {
+            // Check if message contains a data payload.
+            if (remoteMessage.data.isNotEmpty()) {
+                SDK.debug("Message data payload: ${remoteMessage.data}")
+                SDK.onMessage(remoteMessage)
+            }
 
-        if (remoteMessage.data.isNotEmpty()) {
-            SDK.debug("Message data payload: ${remoteMessage.data}")
-            SDK.onMessage(remoteMessage)
-        }
-
-        // Check if message contains a notification payload.
-        if (remoteMessage.notification != null) {
-            SDK.debug("Message Notification Body: ${remoteMessage.notification?.body.orEmpty()}")
+            // Check if message contains a notification payload.
+            if (remoteMessage.notification != null) {
+                SDK.debug("Message Notification Body: ${remoteMessage.notification?.body.orEmpty()}")
+            }
+        } catch (throwable: Throwable) {
+            SDK.error("Failed to handle push message", throwable)
         }
     }
 }
diff --git a/personalization-sdk/src/main/kotlin/com/personalization/SDK.kt b/personalization-sdk/src/main/kotlin/com/personalization/SDK.kt
index 8f454967..56c9daf2 100644
--- a/personalization-sdk/src/main/kotlin/com/personalization/SDK.kt
+++ b/personalization-sdk/src/main/kotlin/com/personalization/SDK.kt
@@ -59,6 +59,15 @@ open class SDK {
     private var onMessageListener: OnMessageListener? = null
     private var search: Search = Search(JSONObject())
 
+    /**
+     * True once initialize() has wired the Dagger graph. A push can reach the SDK in a process
+     * where initialize() never ran (FCM cold start, or the host integrated the SDK incorrectly),
+     * so the push path checks this flag to avoid crashing the host app with
+     * UninitializedPropertyAccessException.
+     */
+    @Volatile
+    private var isSdkInitialized: Boolean = false
+
     @Inject
     internal lateinit var initializeAdvertisingIdUseCase: InitializeAdvertisingIdUseCase
 
@@ -190,6 +199,11 @@ open class SDK {
             needReInitialization = needReInitialization
         )
 
+        isSdkInitialized = true
+        // Route incoming pushes (SDK.onMessage -> instance) to THIS initialized SDK, so the
+        // documented `SDK().initialize()` usage works without crashing or being ignored.
+        currentInstance = this@SDK
+
         CoroutineScope(Dispatchers.IO).launch {
             val advertisingId = initializeAdvertisingIdUseCase.invoke()
 
@@ -858,6 +872,13 @@ open class SDK {
      * @param data from data notification
      */
     fun notificationReceived(data: Map<String, String>) {
+        if (!isSdkInitialized) {
+            warn(
+                "notificationReceived() called before SDK.initialize(); ignoring. " +
+                    "Initialize SDK.instance in Application.onCreate so push delivery works in a cold process."
+            )
+            return
+        }
         val params = JSONObject()
         try {
             val type = data[TYPE_FIELD]
@@ -914,9 +935,18 @@ open class SDK {
         private const val ADD_FIELD = "add"
         private const val ID_FIELD = "id"
 
-        val instance: SDK by lazy {
-            SDK()
-        }
+        @Volatile
+        private var currentInstance: SDK? = null
+
+        /**
+         * The SDK that receives push callbacks (see [onMessage]). Set to whichever SDK was last
+         * passed to [initialize], so the documented `SDK().initialize()` usage routes incoming
+         * pushes to that initialized instance (otherwise the push hit a different, lazily-created
+         * object that was never initialized). Falls back to a lazily-created instance if a push is
+         * delivered before initialize() ran — that instance is guarded and won't crash the host.
+         */
+        val instance: SDK
+            get() = currentInstance ?: SDK().also { currentInstance = it }
 
         fun userAgent(): String {
             return PERSONALIZATION_SDK + BuildConfig.FLAVOR.uppercase(Locale.getDefault()) + ", v" + BuildConfig.VERSION_NAME
diff --git a/personalization-sdk/src/test/kotlin/com/personalization/MessagingServicePushRobustnessTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/MessagingServicePushRobustnessTest.kt
new file mode 100644
index 00000000..62a8ba67
--- /dev/null
+++ b/personalization-sdk/src/test/kotlin/com/personalization/MessagingServicePushRobustnessTest.kt
@@ -0,0 +1,41 @@
+package com.personalization
+
+import com.google.firebase.messaging.RemoteMessage
+import io.mockk.every
+import io.mockk.mockk
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+
+/**
+ * A push can reach the SDK in a process where initialize() never ran — e.g. the cold process FCM
+ * spins up just to deliver a message, or a host that integrated the SDK incorrectly. In that state
+ * the Dagger-injected fields (sendNetworkMethodUseCase, …) are not set, and the push path used to
+ * crash the host app with UninitializedPropertyAccessException.
+ *
+ * These tests pin the contract: handling a push on an uninitialized SDK must NOT throw.
+ */
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [28])
+class MessagingServicePushRobustnessTest {
+
+    @Test
+    fun notificationReceived_onUninitializedSdk_doesNotThrow() {
+        val sdk = SDK() // initialize() never called
+
+        // Before the guard this threw UninitializedPropertyAccessException: sendNetworkMethodUseCase.
+        sdk.notificationReceived(mapOf("type" to "stored_product", "id" to "123"))
+    }
+
+    @Test
+    fun onMessageReceived_onUninitializedSdk_doesNotCrashHost() {
+        val service = MessagingService()
+        val remoteMessage = mockk<RemoteMessage>(relaxed = true)
+        every { remoteMessage.data } returns mapOf("type" to "stored_product", "id" to "123")
+        every { remoteMessage.notification } returns null
+
+        // The FCM callback must never let an SDK failure crash the host app's messaging thread.
+        service.onMessageReceived(remoteMessage)
+    }
+}

From 2ed9ba7f99c8dc9e36c0e6321d50558216553181 Mon Sep 17 00:00:00 2001
From: xyzcancer <xyzcancer@gmail.com>
Date: Fri, 26 Jun 2026 16:42:15 +0400
Subject: [PATCH 3/3] fix(demo): use ContextCompat.getSystemService to support
 minSdk 19

Context#getSystemService(Class) requires API 23, but the demo's minSdk is 19,
which failed the lint NewApi check on CI. Use ContextCompat.getSystemService
instead, which is safe on all supported API levels.
---
 .../main/java/com/personalization/demo/DemoApplication.kt    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/demo-app/src/main/java/com/personalization/demo/DemoApplication.kt b/demo-app/src/main/java/com/personalization/demo/DemoApplication.kt
index 38afa6af..0e2a1aa4 100644
--- a/demo-app/src/main/java/com/personalization/demo/DemoApplication.kt
+++ b/demo-app/src/main/java/com/personalization/demo/DemoApplication.kt
@@ -9,6 +9,7 @@ import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.os.Build
 import androidx.core.app.NotificationCompat
+import androidx.core.content.ContextCompat
 import androidx.multidex.MultiDexApplication
 import com.google.firebase.FirebaseApp
 import com.personalization.SDK
@@ -69,7 +70,7 @@ class DemoApplication : MultiDexApplication() {
                 getString(R.string.push_channel_name),
                 NotificationManager.IMPORTANCE_HIGH,
             )
-            getSystemService(NotificationManager::class.java)
+            ContextCompat.getSystemService(this, NotificationManager::class.java)
                 ?.createNotificationChannel(channel)
         }
     }
@@ -100,7 +101,7 @@ class DemoApplication : MultiDexApplication() {
             )
         }
 
-        getSystemService(NotificationManager::class.java)
+        ContextCompat.getSystemService(this, NotificationManager::class.java)
             ?.notify((data.title.orEmpty() + data.body.orEmpty()).hashCode(), builder.build())
     }