Move internal Crashlytics changes to Github (#6535)

Move *most* internal Crashlytics changes to Github
firebase · Sep 28, 2020 · 806c67c · 806c67c
1 parent 91688b4
commit 806c67c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/Crashlytics/Crashlytics/DataCollection/FIRCLSDataCollectionArbiter.m b/Crashlytics/Crashlytics/DataCollection/FIRCLSDataCollectionArbiter.m
@@ -101,8 +101,11 @@ + (BOOL)isCrashlyticsCollectionEnabledWithApp:(FIRApp *)app withAppInfo:(NSDicti
       [firebaseCrashlyticsCollectionEnabled isKindOfClass:[NSNumber class]]) {
     return [firebaseCrashlyticsCollectionEnabled boolValue];
   }
-
+#ifdef CRASHLYTICS_INTERNAL
+  return NO;
+#else
   return [app isDataCollectionDefaultEnabled];
+#endif
 }
 
 - (BOOL)isCrashlyticsCollectionEnabled {

diff --git a/Crashlytics/Crashlytics/Models/FIRCLSSettings.m b/Crashlytics/Crashlytics/Models/FIRCLSSettings.m
@@ -304,6 +304,9 @@ - (BOOL)collectReportsEnabled {
 }
 
 - (BOOL)shouldUseNewReportEndpoint {
+#ifdef CRASHLYTICS_INTERNAL
+  return YES;
+#else
   NSNumber *value = [self appSettings][@"report_upload_variant"];
 
   // Default to use the new endpoint when settings were not successfully fetched
@@ -316,6 +319,7 @@ - (BOOL)shouldUseNewReportEndpoint {
   // 1 - Legacy
   // 2 - New
   return value.intValue == 2;
+#endif
 }
 
 #pragma mark - Optional Limit Overrides

diff --git a/Crashlytics/UnitTests/FIRCLSDataCollectionArbiterTest.m b/Crashlytics/UnitTests/FIRCLSDataCollectionArbiterTest.m
@@ -49,12 +49,15 @@ - (void)tearDown {
   [super tearDown];
 }
 
-// If you do nothing, it should be YES. We should not be turning Fabric
-// customers off by default
 - (void)testNothingSet {
   self.fakeApp.isDefaultCollectionEnabled = YES;
   FIRCLSDataCollectionArbiter *arbiter = [self arbiterWithDictionary:@{}];
+#ifdef CRASHLYTICS_INTERNAL
+  XCTAssertFalse([arbiter isCrashlyticsCollectionEnabled]);
+#else
+  // It should be YES by default for 3P users.
   XCTAssertTrue([arbiter isCrashlyticsCollectionEnabled]);
+#endif
 }
 
 - (void)testOnlyStickyOff {

diff --git a/Crashlytics/UnitTests/FIRCLSSettingsTests.m b/Crashlytics/UnitTests/FIRCLSSettingsTests.m
@@ -489,7 +489,11 @@ - (void)testLegacyReportEndpointSettings {
   [self.settings cacheSettingsWithGoogleAppID:TestGoogleAppID currentTimestamp:currentTimestamp];
 
   XCTAssertNil(error, "%@", error);
+#ifdef CRASHLYTICS_INTERNAL
+  XCTAssertTrue(self.settings.shouldUseNewReportEndpoint);
+#else
   XCTAssertFalse(self.settings.shouldUseNewReportEndpoint);
+#endif
 }
 
 - (void)testLegacyReportEndpointSettingsWithNonExistentKey {