From a5eb9a111981e2d97df30bac11f3dca052cb3d33 Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Wed, 16 Jul 2025 16:02:40 +0000 Subject: [PATCH 1/2] feat: Remove trackingID from iOS --- app/src/app_ios.mm | 7 ------- app/tests/app_test.cc | 4 ++++ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/src/app_ios.mm b/app/src/app_ios.mm index dbe53d90b4..088da02ead 100644 --- a/app/src/app_ios.mm +++ b/app/src/app_ios.mm @@ -71,10 +71,6 @@ static void PlatformOptionsToAppOptions(FIROptions* platform_options, AppOptions const char* value = platform_options.databaseURL.UTF8String; if (value) app_options->set_database_url(value); } - if (!strlen(app_options->ga_tracking_id())) { - const char* value = platform_options.trackingID.UTF8String; - if (value) app_options->set_ga_tracking_id(value); - } if (!strlen(app_options->storage_bucket())) { const char* value = platform_options.storageBucket.UTF8String; if (value) app_options->set_storage_bucket(value); @@ -107,9 +103,6 @@ static void PlatformOptionsToAppOptions(FIROptions* platform_options, AppOptions if (strlen(app_options.database_url())) { platform_options.databaseURL = @(app_options.database_url()); } - if (strlen(app_options.ga_tracking_id())) { - platform_options.trackingID = @(app_options.ga_tracking_id()); - } if (strlen(app_options.storage_bucket())) { platform_options.storageBucket = @(app_options.storage_bucket()); } diff --git a/app/tests/app_test.cc b/app/tests/app_test.cc index 95502c86e0..0a02111074 100644 --- a/app/tests/app_test.cc +++ b/app/tests/app_test.cc @@ -207,11 +207,13 @@ TEST_F(AppTest, TestSetDatabaseUrl) { EXPECT_STREQ("http://abc-xyz-123.firebaseio.com", options.database_url()); } +#ifndef __APPLE__ TEST_F(AppTest, TestSetGaTrackingId) { AppOptions options; options.set_ga_tracking_id("UA-12345678-1"); EXPECT_STREQ("UA-12345678-1", options.ga_tracking_id()); } +#endif // __APPLE__ TEST_F(AppTest, TestSetStorageBucket) { AppOptions options; @@ -241,10 +243,12 @@ TEST_F(AppTest, LoadDefault) { EXPECT_STREQ("fake messaging sender id from resource", options.messaging_sender_id()); EXPECT_STREQ("fake database url from resource", options.database_url()); +#ifndef __APPLE__ #if FIREBASE_PLATFORM_IOS || FIREBASE_PLATFORM_TVOS // GA tracking ID can currently only be configured on iOS. EXPECT_STREQ("fake ga tracking id from resource", options.ga_tracking_id()); #endif // FIREBASE_PLATFORM_IOS +#endif // __APPLE__ EXPECT_STREQ("fake storage bucket from resource", options.storage_bucket()); EXPECT_STREQ("fake project id from resource", options.project_id()); #if !FIREBASE_PLATFORM_IOS From 78f41b017f77dc8a0761c10aec10b261aa41d255 Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Wed, 16 Jul 2025 16:18:01 +0000 Subject: [PATCH 2/2] feat: Remove trackingID from iOS --- app/tests/app_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/tests/app_test.cc b/app/tests/app_test.cc index 0a02111074..5e532fa523 100644 --- a/app/tests/app_test.cc +++ b/app/tests/app_test.cc @@ -248,7 +248,7 @@ TEST_F(AppTest, LoadDefault) { // GA tracking ID can currently only be configured on iOS. EXPECT_STREQ("fake ga tracking id from resource", options.ga_tracking_id()); #endif // FIREBASE_PLATFORM_IOS -#endif // __APPLE__ +#endif // __APPLE__ EXPECT_STREQ("fake storage bucket from resource", options.storage_bucket()); EXPECT_STREQ("fake project id from resource", options.project_id()); #if !FIREBASE_PLATFORM_IOS