Merge pull request #492 from firebase/feature/rc_rest_update

[RemoteConfig] Fix iOS SetConfigSettings

Author: cynthiajoan

remote_config/integration_test/src/integration_test.cc

@@ -348,9 +348,9 @@ TEST_F(FirebaseRemoteConfigTest, TestFetch) {
 TEST_F(FirebaseRemoteConfigTest, TestFetchInterval) {
   ASSERT_NE(rc_, nullptr);
   EXPECT_TRUE(WaitForCompletion(
-      RunWithRetry([](RemoteConfig* rc) { return rc->Fetch(); }, rc_),
-      "Fetch"));
-  EXPECT_TRUE(WaitForCompletion(rc_->Activate(), "Activate"));
+      RunWithRetry([](RemoteConfig* rc) { return rc->FetchAndActivate(); },
+                   rc_),
+      "FetchAndActivate"));
   uint64_t current_fetch_time = rc_->GetInfo().fetch_time;
   // Making sure the config settings's fetch interval is 12 hours
   EXPECT_TRUE(WaitForCompletion(SetDefaultConfigSettings(rc_),
@@ -360,18 +360,15 @@ TEST_F(FirebaseRemoteConfigTest, TestFetchInterval) {
       RunWithRetry([](RemoteConfig* rc) { return rc->Fetch(); }, rc_),
       "Fetch"));
   EXPECT_EQ(current_fetch_time, rc_->GetInfo().fetch_time);
-#if !(TARGET_OS_IPHONE)  // iOS failed to set configSettings
   // Update fetch interval to 0
   EXPECT_TRUE(WaitForCompletion(SetZeroIntervalConfigSettings(rc_),
                                 "SetZeroIntervalConfigSettings"));
-  LogDebug("Current Fetch Interval: %lld",
-           rc_->GetConfigSettings().minimum_fetch_interval_in_milliseconds);
+  EXPECT_EQ(0, rc_->GetConfigSettings().minimum_fetch_interval_in_milliseconds);
   // Third fetch, this should operate the real fetch and update the fetch time.
   EXPECT_TRUE(WaitForCompletion(
       RunWithRetry([](RemoteConfig* rc) { return rc->Fetch(); }, rc_),
       "Fetch"));
   EXPECT_NE(current_fetch_time, rc_->GetInfo().fetch_time);
-#endif
 }
 
 }  // namespace firebase_testapp_automated

remote_config/src/ios/remote_config_ios.mm

@@ -347,13 +347,16 @@ static int64_t FutureCompleteWithError(NSError *error, ReferenceCountedFutureImp
 
 Future<void> RemoteConfigInternal::SetConfigSettings(ConfigSettings settings) {
   const auto handle = future_impl_.SafeAlloc<void>(kRemoteConfigFnSetConfigSettings);
-  FIRRemoteConfigSettings *config_settings = impl().configSettings;
-  config_settings.minimumFetchInterval =
+  FIRRemoteConfigSettings *newConfigSettings = [[FIRRemoteConfigSettings alloc] init];
+  newConfigSettings.minimumFetchInterval =
       static_cast<NSTimeInterval>(settings.minimum_fetch_interval_in_milliseconds /
                                   ::firebase::internal::kMillisecondsPerSecond);
-  config_settings.fetchTimeout = static_cast<NSTimeInterval>(
+  newConfigSettings.fetchTimeout = static_cast<NSTimeInterval>(
       settings.fetch_timeout_in_milliseconds / ::firebase::internal::kMillisecondsPerSecond);
-  future_impl_.Complete(handle, kFutureStatusSuccess);
+  dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+    [impl() setConfigSettings:newConfigSettings];
+    future_impl_.Complete(handle, kFutureStatusSuccess);
+  });
   return MakeFuture<void>(&future_impl_, handle);
 }