Merge pull request #783 from qonversion/release-nocodes/1.6.0

shameondev · web-flow · commit 155fce2686a9 · 2026-03-10T18:36:06.000+03:00
No-Codes Release 1.6.0
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
                 versionCode: 1
         ]
         nocodes = [
-                versionName: "1.5.2",
+                versionName: "1.6.0",
                 versionCode: 1
         ]
     }
diff --git a/fastlane/report.xml b/fastlane/report.xml
@@ -5,7 +5,7 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.0002">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000241">
         
       </testcase>
     
diff --git a/nocodes/src/main/java/io/qonversion/nocodes/dto/QAction.kt b/nocodes/src/main/java/io/qonversion/nocodes/dto/QAction.kt
@@ -4,7 +4,8 @@ import io.qonversion.nocodes.error.NoCodesError
 
 data class QAction(
     val type: Type,
-    val parameters: Map<Parameter, Any>? = null
+    val parameters: Map<Parameter, Any>? = null,
+    val rawParameters: Map<String, Any>? = null
 ) {
     var error: NoCodesError? = null
 
@@ -20,7 +21,8 @@ data class QAction(
         Close("close"),
         CloseAll("closeAll"),
         LoadProducts("getProducts"),
-        ShowScreen("showScreen");
+        ShowScreen("showScreen"),
+        ScreenAnalytics("screenAnalytics");
 
         companion object {
             fun from(type: String?): Type {
@@ -37,7 +39,9 @@ data class QAction(
         Deeplink("deeplink"),
         ProductId("productId"),
         ProductIds("productIds"),
-        ScreenId("screenId");
+        ScreenId("screenId"),
+        AnalyticsType("type"),
+        PageIndex("page_index");
 
         companion object {
             fun from(key: String?) = entries.find { it.key == key }
diff --git a/nocodes/src/main/java/io/qonversion/nocodes/internal/NoCodesInternal.kt b/nocodes/src/main/java/io/qonversion/nocodes/internal/NoCodesInternal.kt
@@ -14,6 +14,7 @@ import io.qonversion.nocodes.internal.dto.config.PurchaseDelegateWithCallbacksAd
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 
 internal class NoCodesInternal(
     private val internalConfig: InternalConfig,
@@ -23,6 +24,7 @@ internal class NoCodesInternal(
 
     private val screenController = dependenciesAssembly.screenController()
     private val screenService = dependenciesAssembly.screenService()
+    private val screenEventsService = dependenciesAssembly.screenEventsService()
     private val logger = dependenciesAssembly.logger()
 
     init {
@@ -60,6 +62,9 @@ internal class NoCodesInternal(
     }
 
     override fun close() {
+        runBlocking {
+            screenEventsService.flushAndWait()
+        }
         screenController.close()
     }
 
diff --git a/nocodes/src/main/java/io/qonversion/nocodes/internal/common/mappers/ActionMapper.kt b/nocodes/src/main/java/io/qonversion/nocodes/internal/common/mappers/ActionMapper.kt
@@ -9,21 +9,26 @@ internal class ActionMapper : Mapper<QAction> {
         val type = QAction.Type.from(typeString)
 
         var parameters: MutableMap<QAction.Parameter, Any>? = null
+        var rawParameters: MutableMap<String, Any>? = null
+
         if (data.containsKey("parameters")) {
             parameters = mutableMapOf()
+            rawParameters = mutableMapOf()
             val parametersMap = data["parameters"] as? Map<*, *>
             parametersMap?.forEach { (key, value) ->
-                key.takeIf { it is String }
-                    ?.let { QAction.Parameter.from(it as String) }
-                    ?.let { parameter ->
-                        value?.let { parameters[parameter] = value }
+                if (key is String && value != null) {
+                    rawParameters[key] = value // Always preserve raw
+                    QAction.Parameter.from(key)?.let { parameter ->
+                        parameters[parameter] = value
                     }
+                }
             }
         }
 
         return QAction(
             type,
             parameters,
+            rawParameters,
         )
     }
 }
diff --git a/nocodes/src/main/java/io/qonversion/nocodes/internal/di/controllers/ControllersAssemblyImpl.kt b/nocodes/src/main/java/io/qonversion/nocodes/internal/di/controllers/ControllersAssemblyImpl.kt
@@ -35,6 +35,7 @@ internal class ControllersAssemblyImpl(
             miscAssembly.noCodesDelegateProvider(),
             miscAssembly.jsonSerializer(),
             mappersAssembly.actionMapper(),
+            servicesAssembly.screenEventsService(),
             { miscAssembly.customLocale() },
             { miscAssembly.theme() }
         )
diff --git a/nocodes/src/main/java/io/qonversion/nocodes/internal/di/services/ServicesAssembly.kt b/nocodes/src/main/java/io/qonversion/nocodes/internal/di/services/ServicesAssembly.kt
@@ -2,6 +2,7 @@ package io.qonversion.nocodes.internal.di.services
 
 import io.qonversion.nocodes.internal.screen.service.FallbackService
 import io.qonversion.nocodes.internal.screen.service.ImagePreloader
+import io.qonversion.nocodes.internal.screen.service.ScreenEventsService
 import io.qonversion.nocodes.internal.screen.service.ScreenService
 
 internal interface ServicesAssembly {
@@ -11,4 +12,6 @@ internal interface ServicesAssembly {
     fun fallbackService(): FallbackService?
 
     fun imagePreloader(): ImagePreloader
+
+    fun screenEventsService(): ScreenEventsService
 }
diff --git a/nocodes/src/main/java/io/qonversion/nocodes/internal/di/services/ServicesAssemblyImpl.kt b/nocodes/src/main/java/io/qonversion/nocodes/internal/di/services/ServicesAssemblyImpl.kt
@@ -8,6 +8,8 @@ import io.qonversion.nocodes.internal.screen.service.FallbackService
 import io.qonversion.nocodes.internal.screen.service.FallbackServiceImpl
 import io.qonversion.nocodes.internal.screen.service.ImagePreloader
 import io.qonversion.nocodes.internal.screen.service.ImagePreloaderImpl
+import io.qonversion.nocodes.internal.screen.service.ScreenEventsService
+import io.qonversion.nocodes.internal.screen.service.ScreenEventsServiceImpl
 import io.qonversion.nocodes.internal.screen.service.ScreenService
 import io.qonversion.nocodes.internal.screen.service.ScreenServiceImpl
 import io.qonversion.nocodes.internal.utils.FallbackUtils
@@ -56,4 +58,16 @@ internal class ServicesAssemblyImpl(
     override fun imagePreloader(): ImagePreloader {
         return imagePreloaderInstance
     }
+
+    private val screenEventsServiceInstance by lazy {
+        ScreenEventsServiceImpl(
+            networkAssembly.requestConfigurator(),
+            networkAssembly.exponentialApiInteractor(),
+            miscAssembly.logger()
+        )
+    }
+
+    override fun screenEventsService(): ScreenEventsService {
+        return screenEventsServiceInstance
+    }
 }
diff --git a/nocodes/src/main/java/io/qonversion/nocodes/internal/dto/ScreenEvent.kt b/nocodes/src/main/java/io/qonversion/nocodes/internal/dto/ScreenEvent.kt
@@ -0,0 +1,7 @@
+package io.qonversion.nocodes.internal.dto
+
+internal data class ScreenEvent(
+    val data: Map<String, Any>
+) {
+    fun toMap(): Map<String, Any> = data
+}
diff --git a/nocodes/src/main/java/io/qonversion/nocodes/internal/dto/ScreenEventType.kt b/nocodes/src/main/java/io/qonversion/nocodes/internal/dto/ScreenEventType.kt
@@ -0,0 +1,11 @@
+package io.qonversion.nocodes.internal.dto
+
+/**
+ * SDK-originated screen lifecycle events only.
+ * JS-originated events (e.g. CTA taps, page views) are passed through
+ * via [ScreenEvent] without validation against this enum.
+ */
+internal enum class ScreenEventType(val value: String) {
+    ScreenShown("screen_shown"),
+    ScreenClosed("screen_closed");
+}
diff --git a/nocodes/src/main/java/io/qonversion/nocodes/internal/networkLayer/requestConfigurator/ApiEndpoint.kt b/nocodes/src/main/java/io/qonversion/nocodes/internal/networkLayer/requestConfigurator/ApiEndpoint.kt
@@ -3,4 +3,6 @@ package io.qonversion.nocodes.internal.networkLayer.requestConfigurator
 internal enum class ApiEndpoint(val path: String) {
     Screens("screens"),
     Contexts("contexts"),
+    Users("users"),
+    ScreenEvents("screen-events"),
 }
diff --git a/nocodes/src/main/java/io/qonversion/nocodes/internal/networkLayer/requestConfigurator/RequestConfigurator.kt b/nocodes/src/main/java/io/qonversion/nocodes/internal/networkLayer/requestConfigurator/RequestConfigurator.kt
@@ -9,4 +9,6 @@ internal interface RequestConfigurator {
     fun configureScreenRequestById(screenId: String): Request
 
     fun configurePreloadScreensRequest(): Request
+
+    fun configureScreenEventsRequest(uid: String, body: Map<String, Any?>): Request
 }
diff --git a/nocodes/src/main/java/io/qonversion/nocodes/internal/networkLayer/requestConfigurator/RequestConfiguratorImpl.kt b/nocodes/src/main/java/io/qonversion/nocodes/internal/networkLayer/requestConfigurator/RequestConfiguratorImpl.kt
@@ -25,4 +25,13 @@ internal class RequestConfiguratorImpl(
 
         return Request.get("${baseUrl}v3/${ApiEndpoint.Screens.path}?preload=true", headers)
     }
+
+    override fun configureScreenEventsRequest(uid: String, body: Map<String, Any?>): Request {
+        val headers = headerBuilder.buildCommonHeaders()
+        return Request.post(
+            "${baseUrl}v3/${ApiEndpoint.Users.path}/$uid/${ApiEndpoint.ScreenEvents.path}",
+            headers,
+            body
+        )
+    }
 }
diff --git a/nocodes/src/main/java/io/qonversion/nocodes/internal/screen/service/ScreenEventsService.kt b/nocodes/src/main/java/io/qonversion/nocodes/internal/screen/service/ScreenEventsService.kt
@@ -0,0 +1,9 @@
+package io.qonversion.nocodes.internal.screen.service
+
+import io.qonversion.nocodes.internal.dto.ScreenEvent
+
+internal interface ScreenEventsService {
+    fun track(event: ScreenEvent)
+    fun flush()
+    suspend fun flushAndWait()
+}
diff --git a/nocodes/src/main/java/io/qonversion/nocodes/internal/screen/service/ScreenEventsServiceImpl.kt b/nocodes/src/main/java/io/qonversion/nocodes/internal/screen/service/ScreenEventsServiceImpl.kt
@@ -0,0 +1,176 @@
+package io.qonversion.nocodes.internal.screen.service
+
+import com.qonversion.android.sdk.Qonversion
+import com.qonversion.android.sdk.dto.QUser
+import com.qonversion.android.sdk.dto.QonversionError
+import com.qonversion.android.sdk.listeners.QonversionUserCallback
+import io.qonversion.nocodes.error.ErrorCode
+import io.qonversion.nocodes.error.NoCodesException
+import io.qonversion.nocodes.internal.dto.ScreenEvent
+import io.qonversion.nocodes.internal.logger.Logger
+import io.qonversion.nocodes.internal.networkLayer.apiInteractor.ApiInteractor
+import io.qonversion.nocodes.internal.networkLayer.requestConfigurator.RequestConfigurator
+import io.qonversion.nocodes.internal.networkLayer.dto.Response
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
+
+internal class ScreenEventsServiceImpl(
+    private val requestConfigurator: RequestConfigurator,
+    private val apiInteractor: ApiInteractor,
+    private val logger: Logger,
+    private val scope: CoroutineScope = CoroutineScope(Dispatchers.IO)
+) : ScreenEventsService {
+
+    private val lock = Any()
+    private val buffer = mutableListOf<ScreenEvent>()
+    private var isFlushing = false
+    @Volatile
+    private var cachedUserId: String? = null
+
+    override fun track(event: ScreenEvent) {
+        var shouldFlush = false
+        synchronized(lock) {
+            buffer.add(event)
+            shouldFlush = buffer.size >= BATCH_SIZE
+        }
+        logger.verbose("ScreenEventsService -> tracked event: ${event.data["type"] ?: "unknown"}")
+        if (shouldFlush) {
+            flush()
+        }
+    }
+
+    override fun flush() {
+        val eventsToSend: List<ScreenEvent>
+        synchronized(lock) {
+            if (isFlushing || buffer.isEmpty()) return
+            isFlushing = true
+            eventsToSend = buffer.toList()
+            buffer.clear()
+        }
+
+        scope.launch {
+            sendEvents(eventsToSend)
+        }
+    }
+
+    @Suppress("TooGenericExceptionCaught")
+    override suspend fun flushAndWait() {
+        repeat(MAX_FLUSH_ATTEMPTS) {
+            val eventsToSend = waitAndDrainBuffer() ?: return
+
+            try {
+                doSendEvents(eventsToSend, reBufferOnFailure = false)
+            } catch (e: Exception) {
+                logger.error("ScreenEventsService -> flushAndWait failed: $e")
+            } finally {
+                synchronized(lock) {
+                    isFlushing = false
+                }
+            }
+        }
+    }
+
+    private suspend fun waitAndDrainBuffer(): List<ScreenEvent>? {
+        while (true) {
+            var ready = false
+            var events: List<ScreenEvent>? = null
+            synchronized(lock) {
+                if (!isFlushing) {
+                    ready = true
+                    if (buffer.isNotEmpty()) {
+                        isFlushing = true
+                        events = buffer.toList()
+                        buffer.clear()
+                    }
+                }
+            }
+            if (ready) return events
+            delay(FLUSH_WAIT_DELAY_MS)
+        }
+    }
+
+    private suspend fun sendEvents(eventsToSend: List<ScreenEvent>) {
+        try {
+            doSendEvents(eventsToSend, reBufferOnFailure = true)
+        } finally {
+            val shouldFlushAgain: Boolean
+            synchronized(lock) {
+                isFlushing = false
+                shouldFlushAgain = buffer.isNotEmpty()
+            }
+            if (shouldFlushAgain) {
+                flush()
+            }
+        }
+    }
+
+    private suspend fun doSendEvents(
+        eventsToSend: List<ScreenEvent>,
+        reBufferOnFailure: Boolean = true
+    ) {
+        try {
+            val uid = getUserId()
+            val eventMaps = eventsToSend.map { it.toMap() }
+            val body = mapOf<String, Any?>("events" to eventMaps)
+            val request = requestConfigurator.configureScreenEventsRequest(uid, body)
+            val response = apiInteractor.execute(request)
+
+            if (response is Response.Error) {
+                logger.error("ScreenEventsService -> failed to send events: ${response.message}")
+                if (reBufferOnFailure) {
+                    reBuffer(eventsToSend)
+                }
+            } else {
+                logger.verbose("ScreenEventsService -> sent ${eventsToSend.size} events")
+            }
+        } catch (@Suppress("TooGenericExceptionCaught") e: Exception) {
+            logger.error("ScreenEventsService -> failed to send events: $e")
+            if (reBufferOnFailure) {
+                reBuffer(eventsToSend)
+            }
+        }
+    }
+
+    private suspend fun getUserId(): String {
+        cachedUserId?.let { return it }
+
+        return suspendCancellableCoroutine { continuation ->
+            Qonversion.shared.userInfo(object : QonversionUserCallback {
+                override fun onSuccess(user: QUser) {
+                    cachedUserId = user.qonversionId
+                    continuation.resume(user.qonversionId)
+                }
+
+                override fun onError(error: QonversionError) {
+                    continuation.resumeWithException(
+                        NoCodesException(ErrorCode.BackendError, "Failed to get user info: ${error.description}")
+                    )
+                }
+            })
+        }
+    }
+
+    private fun reBuffer(events: List<ScreenEvent>) {
+        synchronized(lock) {
+            buffer.addAll(0, events)
+            if (buffer.size > MAX_BUFFER_SIZE) {
+                // Keep oldest (failed) events, trim newest
+                while (buffer.size > MAX_BUFFER_SIZE) {
+                    buffer.removeAt(buffer.size - 1)
+                }
+            }
+        }
+    }
+
+    companion object {
+        private const val BATCH_SIZE = 10
+        private const val MAX_BUFFER_SIZE = 100
+        private const val MAX_FLUSH_ATTEMPTS = 3
+        private const val FLUSH_WAIT_DELAY_MS = 50L
+    }
+}
diff --git a/nocodes/src/main/java/io/qonversion/nocodes/internal/screen/view/ScreenContract.kt b/nocodes/src/main/java/io/qonversion/nocodes/internal/screen/view/ScreenContract.kt
@@ -29,5 +29,7 @@ internal class ScreenContract {
         fun onStart(contextKey: String?, screenId: String?)
 
         fun onWebViewMessageReceived(message: String)
+
+        fun onScreenClosed()
     }
 }
diff --git a/nocodes/src/main/java/io/qonversion/nocodes/internal/screen/view/ScreenFragment.kt b/nocodes/src/main/java/io/qonversion/nocodes/internal/screen/view/ScreenFragment.kt
diff --git a/nocodes/src/main/java/io/qonversion/nocodes/internal/screen/view/ScreenPresenter.kt b/nocodes/src/main/java/io/qonversion/nocodes/internal/screen/view/ScreenPresenter.kt

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ buildscript {`
`10`	`10`	`versionCode: 1`
`11`	`11`	`]`
`12`	`12`	`nocodes = [`
`13`		`- versionName: "1.5.2",`
	`13`	`+ versionName: "1.6.0",`
`14`	`14`	`versionCode: 1`
`15`	`15`	`]`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`
`7`	`7`
`8`		`- <testcase classname="fastlane.lanes" name="0: default_platform" time="0.0002">`
	`8`	`+ <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000241">`
`9`	`9`
`10`	`10`	`</testcase>`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -9,21 +9,26 @@ internal class ActionMapper : Mapper<QAction> {`
`9`	`9`	`val type = QAction.Type.from(typeString)`
`10`	`10`
`11`	`11`	`var parameters: MutableMap<QAction.Parameter, Any>? = null`
	`12`	`+ var rawParameters: MutableMap<String, Any>? = null`
	`13`	`+`
`12`	`14`	`if (data.containsKey("parameters")) {`
`13`	`15`	`parameters = mutableMapOf()`
	`16`	`+ rawParameters = mutableMapOf()`
`14`	`17`	`val parametersMap = data["parameters"] as? Map<, >`
`15`	`18`	`parametersMap?.forEach { (key, value) ->`
`16`		`- key.takeIf { it is String }`
`17`		`- ?.let { QAction.Parameter.from(it as String) }`
`18`		`- ?.let { parameter ->`
`19`		`- value?.let { parameters[parameter] = value }`
	`19`	`+ if (key is String && value != null) {`
	`20`	`+ rawParameters[key] = value // Always preserve raw`
	`21`	`+ QAction.Parameter.from(key)?.let { parameter ->`
	`22`	`+ parameters[parameter] = value`
`20`	`23`	`}`
	`24`	`+ }`
`21`	`25`	`}`
`22`	`26`	`}`
`23`	`27`
`24`	`28`	`return QAction(`
`25`	`29`	`type,`
`26`	`30`	`parameters,`
	`31`	`+ rawParameters,`
`27`	`32`	`)`
`28`	`33`	`}`
`29`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ internal class ControllersAssemblyImpl(`
`35`	`35`	`miscAssembly.noCodesDelegateProvider(),`
`36`	`36`	`miscAssembly.jsonSerializer(),`
`37`	`37`	`mappersAssembly.actionMapper(),`
	`38`	`+ servicesAssembly.screenEventsService(),`
`38`	`39`	`{ miscAssembly.customLocale() },`
`39`	`40`	`{ miscAssembly.theme() }`
`40`	`41`	`)`