Skip to content

Commit 2d52424

Browse files
feat: Remove trackingID from iOS (#1775)
* feat: Remove trackingID from iOS * feat: Remove trackingID from iOS --------- Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
1 parent bc7fb54 commit 2d52424

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

app/src/app_ios.mm

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,6 @@ static void PlatformOptionsToAppOptions(FIROptions* platform_options, AppOptions
7171
const char* value = platform_options.databaseURL.UTF8String;
7272
if (value) app_options->set_database_url(value);
7373
}
74-
if (!strlen(app_options->ga_tracking_id())) {
75-
const char* value = platform_options.trackingID.UTF8String;
76-
if (value) app_options->set_ga_tracking_id(value);
77-
}
7874
if (!strlen(app_options->storage_bucket())) {
7975
const char* value = platform_options.storageBucket.UTF8String;
8076
if (value) app_options->set_storage_bucket(value);
@@ -107,9 +103,6 @@ static void PlatformOptionsToAppOptions(FIROptions* platform_options, AppOptions
107103
if (strlen(app_options.database_url())) {
108104
platform_options.databaseURL = @(app_options.database_url());
109105
}
110-
if (strlen(app_options.ga_tracking_id())) {
111-
platform_options.trackingID = @(app_options.ga_tracking_id());
112-
}
113106
if (strlen(app_options.storage_bucket())) {
114107
platform_options.storageBucket = @(app_options.storage_bucket());
115108
}

app/tests/app_test.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,11 +207,13 @@ TEST_F(AppTest, TestSetDatabaseUrl) {
207207
EXPECT_STREQ("http://abc-xyz-123.firebaseio.com", options.database_url());
208208
}
209209

210+
#ifndef __APPLE__
210211
TEST_F(AppTest, TestSetGaTrackingId) {
211212
AppOptions options;
212213
options.set_ga_tracking_id("UA-12345678-1");
213214
EXPECT_STREQ("UA-12345678-1", options.ga_tracking_id());
214215
}
216+
#endif // __APPLE__
215217

216218
TEST_F(AppTest, TestSetStorageBucket) {
217219
AppOptions options;
@@ -241,10 +243,12 @@ TEST_F(AppTest, LoadDefault) {
241243
EXPECT_STREQ("fake messaging sender id from resource",
242244
options.messaging_sender_id());
243245
EXPECT_STREQ("fake database url from resource", options.database_url());
246+
#ifndef __APPLE__
244247
#if FIREBASE_PLATFORM_IOS || FIREBASE_PLATFORM_TVOS
245248
// GA tracking ID can currently only be configured on iOS.
246249
EXPECT_STREQ("fake ga tracking id from resource", options.ga_tracking_id());
247250
#endif // FIREBASE_PLATFORM_IOS
251+
#endif // __APPLE__
248252
EXPECT_STREQ("fake storage bucket from resource", options.storage_bucket());
249253
EXPECT_STREQ("fake project id from resource", options.project_id());
250254
#if !FIREBASE_PLATFORM_IOS

0 commit comments

Comments
 (0)