Fixed a bug to honor data collection flags before Firebase app was configured. (#11372)

visumickey · web-flow · commit c559a68b8e8c · 2023-06-01T08:19:39.000-07:00
diff --git a/FirebasePerformance/CHANGELOG.md b/FirebasePerformance/CHANGELOG.md
@@ -1,3 +1,6 @@
+# Unreleased
+- [fixed] Fixed a bug to disable data collection if the data collection was disabled before Firebase application was configured.
+
 # 10.9.0
 - [fixed] Fixed a memory leak when generating session events (#11027).
 
diff --git a/FirebasePerformance/Sources/FIRPerformance.m b/FirebasePerformance/Sources/FIRPerformance.m
@@ -86,10 +86,7 @@ - (BOOL)isDataCollectionEnabled {
 }
 
 - (void)setDataCollectionEnabled:(BOOL)dataCollectionEnabled {
-  BOOL performanceDataCollectionEnabled = self.dataCollectionEnabled;
-  if (performanceDataCollectionEnabled != dataCollectionEnabled) {
-    [[FPRConfigurations sharedInstance] setDataCollectionEnabled:dataCollectionEnabled];
-  }
+  [[FPRConfigurations sharedInstance] setDataCollectionEnabled:dataCollectionEnabled];
 }
 
 - (BOOL)isInstrumentationEnabled {

Original file line number	Diff line number	Diff line change
`@@ -86,10 +86,7 @@ - (BOOL)isDataCollectionEnabled {`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`- (void)setDataCollectionEnabled:(BOOL)dataCollectionEnabled {`
`89`		`- BOOL performanceDataCollectionEnabled = self.dataCollectionEnabled;`
`90`		`- if (performanceDataCollectionEnabled != dataCollectionEnabled) {`
`91`		`- [[FPRConfigurations sharedInstance] setDataCollectionEnabled:dataCollectionEnabled];`
`92`		`- }`
	`89`	`+ [[FPRConfigurations sharedInstance] setDataCollectionEnabled:dataCollectionEnabled];`
`93`	`90`	`}`
`94`	`91`
`95`	`92`	`- (BOOL)isInstrumentationEnabled {`