From d011a9bd23a7a592657b693c1a73de5eb38ef1f6 Mon Sep 17 00:00:00 2001 From: Karen Zeng Date: Tue, 13 Oct 2020 12:45:08 -0700 Subject: [PATCH 1/4] Cleanup developer mode variables --- FirebaseRemoteConfig/Sources/FIRRemoteConfig.m | 7 ------- 1 file changed, 7 deletions(-) diff --git a/FirebaseRemoteConfig/Sources/FIRRemoteConfig.m b/FirebaseRemoteConfig/Sources/FIRRemoteConfig.m index 2991fe46819..e37dcf98612 100644 --- a/FirebaseRemoteConfig/Sources/FIRRemoteConfig.m +++ b/FirebaseRemoteConfig/Sources/FIRRemoteConfig.m @@ -34,18 +34,11 @@ NSString *const FIRRemoteConfigErrorDomain = @"com.google.remoteconfig.ErrorDomain"; /// Remote Config Error Info End Time Seconds; NSString *const FIRRemoteConfigThrottledEndTimeInSecondsKey = @"error_throttled_end_time_seconds"; -/// Remote Config Developer Mode Key -static NSString *const kRemoteConfigDeveloperKey = @"_rcn_developer"; /// Minimum required time interval between fetch requests made to the backend. static NSString *const kRemoteConfigMinimumFetchIntervalKey = @"_rcn_minimum_fetch_interval"; /// Timeout value for waiting on a fetch response. static NSString *const kRemoteConfigFetchTimeoutKey = @"_rcn_fetch_timeout"; -@interface FIRRemoteConfigSettings () { - BOOL _developerModeEnabled; -} -@end - @implementation FIRRemoteConfigSettings - (instancetype)init { From e85a566cc107031ba60f2013504c95c65c6d8e79 Mon Sep 17 00:00:00 2001 From: Karen Zeng Date: Tue, 13 Oct 2020 12:50:32 -0700 Subject: [PATCH 2/4] Fix README link --- FirebaseRemoteConfig/README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/FirebaseRemoteConfig/README.md b/FirebaseRemoteConfig/README.md index 9f001f42017..c63d3b07828 100644 --- a/FirebaseRemoteConfig/README.md +++ b/FirebaseRemoteConfig/README.md @@ -6,6 +6,5 @@ Objective-C and Swift. Firebase Remote Config is a cloud service that lets you change the appearance and behavior of your app without requiring users to download an app update. -Please visit [our developer site] -(https://firebase.google.com/docs/remote-config/) for integration instructions, -documentation, support information, and terms of service. +Please visit [our developer site](https://firebase.google.com/docs/remote-config/) +for integration instructions, documentation, support information, and terms of service. From 225b7f1ca4723fdde0825ffa2ed11a4764c485d9 Mon Sep 17 00:00:00 2001 From: Karen Zeng Date: Tue, 13 Oct 2020 13:30:58 -0700 Subject: [PATCH 3/4] Use fully qualified namespace in test to avoid errors --- .../Tests/Unit/RCNUserDefaultsManagerTests.m | 44 ++++++++++--------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/FirebaseRemoteConfig/Tests/Unit/RCNUserDefaultsManagerTests.m b/FirebaseRemoteConfig/Tests/Unit/RCNUserDefaultsManagerTests.m index 835c5d891a1..de2eec2b70d 100644 --- a/FirebaseRemoteConfig/Tests/Unit/RCNUserDefaultsManagerTests.m +++ b/FirebaseRemoteConfig/Tests/Unit/RCNUserDefaultsManagerTests.m @@ -20,6 +20,10 @@ static NSTimeInterval RCNUserDefaultsSampleTimeStamp = 0; +static NSString* const AppName = @"testApp"; +static NSString* const FQNamespace1 = @"testNamespace1:testApp"; +static NSString* const FQNamespace2 = @"testNamespace2:testApp"; + @interface RCNUserDefaultsManagerTests : XCTestCase @end @@ -36,9 +40,9 @@ - (void)setUp { - (void)testUserDefaultsEtagWriteAndRead { RCNUserDefaultsManager* manager = - [[RCNUserDefaultsManager alloc] initWithAppName:@"TESTING" + [[RCNUserDefaultsManager alloc] initWithAppName:AppName bundleID:[NSBundle mainBundle].bundleIdentifier - namespace:@"testNamespace1"]; + namespace:FQNamespace1]; [manager setLastETag:@"eTag1"]; XCTAssertEqualObjects([manager lastETag], @"eTag1"); @@ -48,9 +52,9 @@ - (void)testUserDefaultsEtagWriteAndRead { - (void)testUserDefaultsLastFetchTimeWriteAndRead { RCNUserDefaultsManager* manager = - [[RCNUserDefaultsManager alloc] initWithAppName:@"TESTING" + [[RCNUserDefaultsManager alloc] initWithAppName:AppName bundleID:[NSBundle mainBundle].bundleIdentifier - namespace:@"testNamespace1"]; + namespace:FQNamespace1]; [manager setLastFetchTime:RCNUserDefaultsSampleTimeStamp]; XCTAssertEqual([manager lastFetchTime], RCNUserDefaultsSampleTimeStamp); @@ -60,9 +64,9 @@ - (void)testUserDefaultsLastFetchTimeWriteAndRead { - (void)testUserDefaultsLastETagUpdateTimeWriteAndRead { RCNUserDefaultsManager* manager = - [[RCNUserDefaultsManager alloc] initWithAppName:@"TESTING" + [[RCNUserDefaultsManager alloc] initWithAppName:AppName bundleID:[NSBundle mainBundle].bundleIdentifier - namespace:@"testNamespace1"]; + namespace:FQNamespace1]; [manager setLastETagUpdateTime:RCNUserDefaultsSampleTimeStamp]; XCTAssertEqual([manager lastETagUpdateTime], RCNUserDefaultsSampleTimeStamp); @@ -72,9 +76,9 @@ - (void)testUserDefaultsLastETagUpdateTimeWriteAndRead { - (void)testUserDefaultsLastFetchStatusWriteAndRead { RCNUserDefaultsManager* manager = - [[RCNUserDefaultsManager alloc] initWithAppName:@"TESTING" + [[RCNUserDefaultsManager alloc] initWithAppName:AppName bundleID:[NSBundle mainBundle].bundleIdentifier - namespace:@"testNamespace1"]; + namespace:FQNamespace1]; [manager setLastFetchStatus:@"Success"]; XCTAssertEqualObjects([manager lastFetchStatus], @"Success"); @@ -84,9 +88,9 @@ - (void)testUserDefaultsLastFetchStatusWriteAndRead { - (void)testUserDefaultsisClientThrottledWriteAndRead { RCNUserDefaultsManager* manager = - [[RCNUserDefaultsManager alloc] initWithAppName:@"TESTING" + [[RCNUserDefaultsManager alloc] initWithAppName:AppName bundleID:[NSBundle mainBundle].bundleIdentifier - namespace:@"testNamespace1"]; + namespace:FQNamespace1]; [manager setIsClientThrottledWithExponentialBackoff:YES]; XCTAssertEqual([manager isClientThrottledWithExponentialBackoff], YES); @@ -96,9 +100,9 @@ - (void)testUserDefaultsisClientThrottledWriteAndRead { - (void)testUserDefaultsThrottleEndTimeWriteAndRead { RCNUserDefaultsManager* manager = - [[RCNUserDefaultsManager alloc] initWithAppName:@"TESTING" + [[RCNUserDefaultsManager alloc] initWithAppName:AppName bundleID:[NSBundle mainBundle].bundleIdentifier - namespace:@"testNamespace1"]; + namespace:FQNamespace1]; [manager setThrottleEndTime:RCNUserDefaultsSampleTimeStamp - 7.0]; XCTAssertEqual([manager throttleEndTime], RCNUserDefaultsSampleTimeStamp - 7.0); @@ -108,9 +112,9 @@ - (void)testUserDefaultsThrottleEndTimeWriteAndRead { - (void)testUserDefaultsCurrentThrottlingRetryIntervalWriteAndRead { RCNUserDefaultsManager* manager = - [[RCNUserDefaultsManager alloc] initWithAppName:@"TESTING" + [[RCNUserDefaultsManager alloc] initWithAppName:AppName bundleID:[NSBundle mainBundle].bundleIdentifier - namespace:@"testNamespace1"]; + namespace:FQNamespace1]; [manager setCurrentThrottlingRetryIntervalSeconds:RCNUserDefaultsSampleTimeStamp - 1.0]; XCTAssertEqual([manager currentThrottlingRetryIntervalSeconds], RCNUserDefaultsSampleTimeStamp - 1.0); @@ -122,14 +126,14 @@ - (void)testUserDefaultsCurrentThrottlingRetryIntervalWriteAndRead { - (void)testUserDefaultsForMultipleNamespaces { RCNUserDefaultsManager* manager1 = - [[RCNUserDefaultsManager alloc] initWithAppName:@"TESTING" + [[RCNUserDefaultsManager alloc] initWithAppName:AppName bundleID:[NSBundle mainBundle].bundleIdentifier - namespace:@"testNamespace1"]; + namespace:FQNamespace1]; RCNUserDefaultsManager* manager2 = - [[RCNUserDefaultsManager alloc] initWithAppName:@"TESTING" + [[RCNUserDefaultsManager alloc] initWithAppName:AppName bundleID:[NSBundle mainBundle].bundleIdentifier - namespace:@"testNamespace2"]; + namespace:FQNamespace2]; /// Last ETag. [manager1 setLastETag:@"eTag1ForNamespace1"]; @@ -172,9 +176,9 @@ - (void)testUserDefaultsForMultipleNamespaces { - (void)testUserDefaultsReset { RCNUserDefaultsManager* manager = - [[RCNUserDefaultsManager alloc] initWithAppName:@"TESTING" + [[RCNUserDefaultsManager alloc] initWithAppName:AppName bundleID:[NSBundle mainBundle].bundleIdentifier - namespace:@"testNamespace1"]; + namespace:FQNamespace1]; [manager setLastETag:@"testETag"]; [manager resetUserDefaults]; XCTAssertNil([manager lastETag]); From 690050b8cf07083f36c5bcb259e13d2f54b1242b Mon Sep 17 00:00:00 2001 From: Karen Zeng Date: Tue, 13 Oct 2020 14:38:07 -0700 Subject: [PATCH 4/4] Fix whitespace --- FirebaseRemoteConfig/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FirebaseRemoteConfig/README.md b/FirebaseRemoteConfig/README.md index c63d3b07828..909db17fa0f 100644 --- a/FirebaseRemoteConfig/README.md +++ b/FirebaseRemoteConfig/README.md @@ -6,5 +6,5 @@ Objective-C and Swift. Firebase Remote Config is a cloud service that lets you change the appearance and behavior of your app without requiring users to download an app update. -Please visit [our developer site](https://firebase.google.com/docs/remote-config/) +Please visit [our developer site](https://firebase.google.com/docs/remote-config/) for integration instructions, documentation, support information, and terms of service.