chore: [SDK-5146] drop fcm= from the FID census header

Cohort is gs/snd/def/flag plus the subscription identifier shape, not
the library version. Keep a bad AGP parse or header value from failing
the request.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: AR Abdul Azeez

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/device/impl/FidEnv.kt

@@ -17,7 +17,6 @@ internal const val HTTP_FID_ENV_HEADER_KEY = "OneSignal-Fid-Env"
 internal data class FidEnvSnapshot(
     val googleServices: Boolean,
     val agpVersion: String?,
-    val fcmVersion: String?,
     val fidFlag: Boolean,
     val defaultFirebaseApp: Boolean,
     val firebaseInitProvider: Boolean,
@@ -29,7 +28,6 @@ internal data class FidEnvSnapshot(
         listOf(
             "gs=${googleServices.toBit()}",
             "agp=${agpVersion.sanitized()}",
-            "fcm=${fcmVersion.sanitized()}",
             "flag=${fidFlag.toBit()}",
             "def=${defaultFirebaseApp.toBit()}",
             "prov=${firebaseInitProvider.toBit()}",
@@ -40,12 +38,17 @@ internal data class FidEnvSnapshot(
 }
 
 internal fun sanitizeToken(value: String): String =
-    value.filter { it.isLetterOrDigit() || it in "._+-" }.take(MAX_TOKEN_CHARS).ifEmpty { "-" }
+    value.filter { it in TOKEN_CHARS }.take(MAX_TOKEN_CHARS).ifEmpty { "-" }
 
+@Suppress("TooGenericExceptionCaught")
 internal fun parseAgpVersion(propertiesText: String): String? {
-    val props = Properties()
-    props.load(propertiesText.reader())
-    return props.getProperty("androidGradlePluginVersion")?.takeIf { it.isNotBlank() }
+    return try {
+        val props = Properties()
+        props.load(propertiesText.reader())
+        props.getProperty("androidGradlePluginVersion")?.takeIf { it.isNotBlank() }
+    } catch (_: Exception) {
+        null
+    }
 }
 
 internal fun senderMatch(
@@ -78,7 +81,6 @@ internal class AndroidFidEnvReader(
         return FidEnvSnapshot(
             googleServices = !googleAppId.isNullOrBlank(),
             agpVersion = readApkEntry(AGP_METADATA_PATH)?.let { parseAgpVersion(it) },
-            fcmVersion = firebaseMessagingVersion(),
             fidFlag = AndroidUtils.getManifestMetaBoolean(context, FID_FLAG),
             defaultFirebaseApp = false,
             firebaseInitProvider = hasFirebaseInitProvider(),
@@ -117,15 +119,6 @@ internal class AndroidFidEnvReader(
         }
     }
 
-    @Suppress("TooGenericExceptionCaught")
-    private fun firebaseMessagingVersion(): String? {
-        return try {
-            Class.forName(FIREBASE_MESSAGING_BUILD_CONFIG).getField("VERSION_NAME").get(null) as? String
-        } catch (_: Throwable) {
-            null
-        }
-    }
-
     @Suppress("TooGenericExceptionCaught", "UNCHECKED_CAST")
     private fun hasDefaultFirebaseApp(): Boolean {
         return try {
@@ -168,7 +161,6 @@ internal class AndroidFidEnvReader(
         private const val FID_FLAG = "firebase_messaging_installation_id_enabled"
         private const val FIREBASE_INIT_PROVIDER = "com.google.firebase.provider.FirebaseInitProvider"
         private const val AGP_METADATA_PATH = "META-INF/com/android/build/gradle/app-metadata.properties"
-        private const val FIREBASE_MESSAGING_BUILD_CONFIG = "com.google.firebase.messaging.BuildConfig"
         private const val FIREBASE_APP = "com.google.firebase.FirebaseApp"
         private const val DEFAULT_APP_NAME = "[DEFAULT]"
     }
@@ -197,6 +189,7 @@ internal class FidEnvService(
 }
 
 private const val MAX_TOKEN_CHARS = 32
+private const val TOKEN_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789._+-"
 
 private fun Boolean.toBit(): String = if (this) "1" else "0"
 

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/http/impl/HttpClient.kt

@@ -154,7 +154,10 @@ internal class HttpClient(
 
                     val fidEnv = _fidEnv.headerValue()
                     if (fidEnv.isNotEmpty()) {
-                        con.setRequestProperty(HTTP_FID_ENV_HEADER_KEY, fidEnv)
+                        try {
+                            con.setRequestProperty(HTTP_FID_ENV_HEADER_KEY, fidEnv)
+                        } catch (_: IllegalArgumentException) {
+                        }
                     }
 
                     if (jsonBody != null) {

OneSignalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/device/FidEnvTests.kt

@@ -13,7 +13,6 @@ class FidEnvTests : FunSpec({
             FidEnvSnapshot(
                 googleServices = true,
                 agpVersion = "8.8.2",
-                fcmVersion = "24.0.0",
                 fidFlag = false,
                 defaultFirebaseApp = true,
                 firebaseInitProvider = true,
@@ -22,15 +21,14 @@ class FidEnvTests : FunSpec({
                 senderMatch = true,
             ).toHeaderValue()
 
-        header shouldBe "gs=1;agp=8.8.2;fcm=24.0.0;flag=0;def=1;prov=1;min=24;tgt=35;snd=1"
+        header shouldBe "gs=1;agp=8.8.2;flag=0;def=1;prov=1;min=24;tgt=35;snd=1"
     }
 
     test("header uses dashes for unknown optional fields") {
         val header =
             FidEnvSnapshot(
                 googleServices = false,
                 agpVersion = null,
-                fcmVersion = null,
                 fidFlag = false,
                 defaultFirebaseApp = false,
                 firebaseInitProvider = false,
@@ -39,12 +37,13 @@ class FidEnvTests : FunSpec({
                 senderMatch = null,
             ).toHeaderValue()
 
-        header shouldBe "gs=0;agp=-;fcm=-;flag=0;def=0;prov=0;min=-;tgt=-;snd=-"
+        header shouldBe "gs=0;agp=-;flag=0;def=0;prov=0;min=-;tgt=-;snd=-"
     }
 
     test("sanitizeToken strips header-unsafe characters and caps length") {
         sanitizeToken("8.8.2-alpha01") shouldBe "8.8.2-alpha01"
         sanitizeToken("8.8.2 injected\nX-Other: 1") shouldBe "8.8.2injectedX-Other1"
+        sanitizeToken("8.8.2\u00e9") shouldBe "8.8.2"
         sanitizeToken(" ".repeat(40)) shouldBe "-"
         sanitizeToken("a".repeat(40)).length shouldBe 32
     }
@@ -62,6 +61,10 @@ class FidEnvTests : FunSpec({
         parseAgpVersion("appMetadataVersion=1.1\n") shouldBe null
     }
 
+    test("parseAgpVersion returns null for malformed properties") {
+        parseAgpVersion("androidGradlePluginVersion=\\uXXXX") shouldBe null
+    }
+
     test("senderMatch is unknown until dashboard sender is available") {
         senderMatch("123", null) shouldBe null
         senderMatch(null, null) shouldBe null

OneSignalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/http/HttpClientTests.kt

@@ -320,6 +320,6 @@ internal class FakeFidEnv(
     override fun headerValue(): String = value
 
     companion object {
-        const val VALUE = "gs=0;agp=8.8.2;fcm=-;flag=0;def=0;prov=0;min=21;tgt=34;snd=-"
+        const val VALUE = "gs=0;agp=8.8.2;flag=0;def=0;prov=0;min=21;tgt=34;snd=-"
     }
 }