fix: multiple fixes

Author: xyznaveen

CHANGELOG.md

@@ -5,7 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.13.1] - 2026-03-15
+## [1.14.0] - 2026-04-18
+
+### Fixed
+
+- Improve settings parsing ability, don't store invalid setting received from server.
+- Bugfix: `batch-events-v2` network calls not respecting the passed `gateway` url.
+- Platform type not being sent in network calls.
+
+## [1.13.1] - 2026-04-15
 
 ### Fixed
 

fme-android/src/main/java/com/vwo/models/request/EventArchQueryParams/EventBatchQueryParams.kt

@@ -15,7 +15,9 @@
  */
 package com.vwo.models.request.EventArchQueryParams
 
+import com.vwo.constants.Constants
 import com.vwo.utils.SDKMetaUtil
+import kotlin.collections.set
 
 /**
  * Represents query parameters for event batch requests.*
@@ -43,5 +45,7 @@ class EventBatchQueryParams(private val sdkKey: String, private val accountId: S
         this["a"] = accountId
         this["sn"] = SDKMetaUtil.sdkName
         this["sv"] = SDKMetaUtil.sdkVersion
+        this["pt"] = Constants.PLATFORM
     }
+
 }

fme-android/src/main/java/com/vwo/packages/network_layer/manager/BatchManager.kt

@@ -109,7 +109,6 @@ internal object BatchManager {
                 }
                 result = isUploaded && result
                 if ((isUploaded && count > 0) || !isUploaded) {
-                    Log.d("Swapnil", "Batch uploading success/failed ${firstItem.accountId} ${firstItem.sdkKey} count=$count")
                     batchServiceContainer?.getLoggerService()?.log(
                         LogLevelEnum.INFO,
                         "BATCH_PROCESSING_FINISHED",

fme-android/src/main/java/com/vwo/services/BatchUploader.kt

@@ -35,19 +35,7 @@ internal object BatchUploader {
     /**
      * The network timeout for requests, in milliseconds.
      */
-    private val networkTimeout = Constants.SETTINGS_TIMEOUT.toInt()
-    /**
-     * The hostname of the server to which requests are sent.
-     */
-    private val hostname = Constants.HOST_NAME
-    /**
-     * The protocol used for requests (e.g., "https").
-     */
-    private val protocol: String = Constants.HTTPS_PROTOCOL
-    /**
-     * The port number used for requests.
-     */
-    private val port = 0
+    private const val NETWORK_TIMEOUT = Constants.SETTINGS_TIMEOUT.toInt()
 
     /**
      * Uploads an event batch to the server.
@@ -65,16 +53,16 @@ internal object BatchUploader {
         val options = EventBatchQueryParams(sdkKey = sdkKey, accountId = accountId.toString()).queryParams
         val header = mutableMapOf("Authorization" to sdkKey)
         val request = RequestModel(
-            hostname,
-            "POST",
-            Constants.EVENT_BATCH_ENDPOINT,
-            options,
-            body,
-            header,
-            protocol,
-            port
+            url = getFinalUrl(serviceContainer = serviceContainer),
+            method = "POST",
+            path = Constants.EVENT_BATCH_ENDPOINT,
+            query = options,
+            body = body,
+            headers = header,
+            scheme = Constants.HTTPS_PROTOCOL,
+            port = 0
         )
-        request.timeout = networkTimeout
+        request.timeout = NETWORK_TIMEOUT
         val response = NetworkManager.post(request, serviceContainer)
         if (response?.statusCode != 200) {
             serviceContainer?.getLoggerService()?.log(
@@ -85,4 +73,12 @@ internal object BatchUploader {
         }
         return true
     }
+
+    private fun getFinalUrl(serviceContainer: ServiceContainer?): String {
+        val collectionPrefix = serviceContainer?.getSettings()?.collectionPrefix
+        if (!collectionPrefix.isNullOrEmpty()) {
+            return "${Constants.HOST_NAME}/$collectionPrefix"
+        }
+        return Constants.HOST_NAME
+    }
 }

fme-android/src/main/java/com/vwo/services/SettingsManager.kt

@@ -34,6 +34,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import java.net.URL
+import kotlin.collections.set
 
 /**
  * Manages settings for the VWO SDK.
@@ -125,10 +126,8 @@ class SettingsManager(internal val options: VWOInitOptions) {
                     }
                 }
             } else {
-                responseString = fetchSettings()
-                if (!responseString.isNullOrEmpty()) {
-                    updateSettingsCache(responseString)
-                } else if (cachedSettingsAllowed()) {
+                responseString = fetchAndCacheServerSettings()
+                if (responseString == null && cachedSettingsAllowed()) {
                     //Return settings even if it is expired - SDK should work as long as there is setting in cache.
                     responseString = getCachedSetting()
                 }
@@ -151,10 +150,20 @@ class SettingsManager(internal val options: VWOInitOptions) {
 
     private fun fetchAndCacheServerSettings(): String? {
         val response: String? = fetchSettings()
-        if (response != null) {
+        if (response != null && isJSONValidSettings(response)) {
             updateSettingsCache(response)
+            return response
+        }
+        return null
+    }
+
+    private fun isJSONValidSettings(response: String): Boolean {
+        return try {
+            val settings = VWOClient.objectMapper.readValue(response, Settings::class.java)
+            SettingsSchema().isSettingsValid(settings)
+        } catch (_: Exception) {
+            false
         }
-        return response
     }
 
     private fun updateSettingsCache(responseString: String) {
@@ -203,6 +212,7 @@ class SettingsManager(internal val options: VWOInitOptions) {
         }
         options["sn"] = SDKMetaUtil.sdkName
         options["sv"] = SDKMetaUtil.sdkVersion
+        options["pt"] = Constants.PLATFORM
 
         try {
             val startTime = System.currentTimeMillis()

fme-android/src/main/java/com/vwo/utils/GatewayServiceUtil.kt

@@ -42,7 +42,7 @@ object GatewayServiceUtil {
         var responseString: String? = null
         try {
             val request = RequestModel(
-                serviceContainer.getBaseUrl(),
+                serviceContainer.getSettingsManager()?.hostname ?: "",
                 "GET",
                 endpoint,
                 queryParams,

fme-android/src/main/java/com/vwo/utils/NetworkUtil.kt

@@ -39,6 +39,7 @@ import com.vwo.packages.network_layer.manager.NetworkManager
 import com.vwo.packages.network_layer.models.RequestModel
 import com.vwo.providers.StorageProvider
 import java.util.Calendar
+import kotlin.collections.set
 
 /**
  * Provides network-related utility functions.
@@ -94,6 +95,7 @@ class NetworkUtil {
 
             requestQueryParams.queryParams["sn"] = SDKMetaUtil.sdkName
             requestQueryParams.queryParams["sv"] = SDKMetaUtil.sdkVersion
+            requestQueryParams.queryParams["pt"] = Constants.PLATFORM
             return requestQueryParams.queryParams
         }
 
@@ -566,14 +568,14 @@ class NetworkUtil {
                 NetworkManager.attachClient()
                 val headers = createHeaders(null, null)
                 val request = RequestModel(
-                    serviceContainer.getBaseUrl(),
-                    "POST",
-                    UrlEnum.EVENTS.url,
-                    queryParams,
-                    payload,
-                    headers,
-                    serviceContainer.getSettingsManager()?.protocol,
-                    serviceContainer.getSettingsManager()?.port ?: 0
+                    url = serviceContainer.getBaseUrl(),
+                    method = "POST",
+                    path = UrlEnum.EVENTS.url,
+                    query = queryParams,
+                    body = payload,
+                    headers = headers,
+                    scheme = serviceContainer.getSettingsManager()?.protocol,
+                    port = serviceContainer.getSettingsManager()?.port ?: 0
                 )
                 request.eventName = eventName
                 NetworkManager.postAsync(request, serviceContainer)
@@ -600,14 +602,14 @@ class NetworkUtil {
                 NetworkManager.attachClient()
                 val headers = createHeaders(null, null)
                 val request = RequestModel(
-                    Constants.HOST_NAME,
-                    "POST",
-                    UrlEnum.EVENTS.url,
-                    properties,
-                    payload,
-                    headers,
-                    Constants.HTTPS_PROTOCOL,
-                    0
+                    url = serviceContainer.getBaseUrl(),
+                    method = "POST",
+                    path = UrlEnum.EVENTS.url,
+                    query = properties,
+                    body = payload,
+                    headers = headers,
+                    scheme = serviceContainer.getSettingsManager()?.protocol,
+                    port = serviceContainer.getSettingsManager()?.port ?:0
                 )
                 request.eventName = eventName
                 NetworkManager.postAsync(request, serviceContainer)

fme-android/src/test/java/com/vwo/models/request/EventArchQueryParams/EventBatchQueryParamsTest.kt

@@ -57,12 +57,13 @@ class EventBatchQueryParamsTest {
     @Test
     fun `test queryParams contains all required parameters`() {
         // Assert
-        assertEquals(5, eventBatchQueryParams.queryParams.size)
+        assertEquals(6, eventBatchQueryParams.queryParams.size)
         assertNotNull(eventBatchQueryParams.queryParams["i"])
         assertNotNull(eventBatchQueryParams.queryParams["env"])
         assertNotNull(eventBatchQueryParams.queryParams["a"])
         assertNotNull(eventBatchQueryParams.queryParams["sv"])
-        assertNotNull(eventBatchQueryParams.queryParams["sv"])
+        assertNotNull(eventBatchQueryParams.queryParams["sn"])
+        assertNotNull(eventBatchQueryParams.queryParams["pt"])
     }
 
     @Test

fme-android/src/test/java/com/vwo/utils/GatewayServiceUtilTest.kt

@@ -64,7 +64,6 @@ class GatewayServiceUtilTest {
         settingsManager.port = 443
 
         // Set up the mock ServiceContainer to return expected values
-        `when`(mockServiceContainer.getBaseUrl()).thenReturn("test.vwo.com")
         `when`(mockServiceContainer.getSettingsManager()).thenReturn(settingsManager)
 
         NetworkManager.attachClient(mockNetworkClient)

gradle.properties

@@ -25,8 +25,8 @@ android.nonTransitiveRClass=true
 # Project Information
 POM_NAME=VWO FME Android SDK
 POM_ARTIFACT_ID=vwo-fme-android-sdk
-VERSION_NAME=1.13.1
-VERSION_CODE=33
+VERSION_NAME=1.14.0
+VERSION_CODE=34
 GROUP=com.vwo.sdk
 
 # POM Details