Removed use of deprecated FutureHandle in Remote Config

Also:
- Removed use of deprecated activate method in FIRRemoteConfig
- Changed Android activate method to pass a couple of the future handle
  class rather than type punning to a void*.
PiperOrigin-RevId: 264714930

Author: smiles

remote_config/src/desktop/remote_config_desktop.cc

@@ -364,7 +364,7 @@ const ConfigInfo& RemoteConfigDesktop::GetInfo() const {
 
 void RemoteConfigDesktop::AsyncFetch() {
   fetch_thread_ = std::thread([this]() {
-    FutureHandle handle;
+    SafeFutureHandle<void> handle;
     while (fetch_channel_.Get()) {
       RemoteConfigREST* rest = nullptr;
 
@@ -425,7 +425,7 @@ Future<void> RemoteConfigDesktop::Fetch(uint64_t cache_expiration_in_seconds) {
       ((cache_expiration_in_seconds == 0) ||
        (cache_expiration_timestamp < milliseconds_since_epoch))) {
     ReferenceCountedFutureImpl* api = FutureData::Get()->api();
-    fetch_handle_ = api->Alloc<void>(kRemoteConfigFnFetch);
+    fetch_handle_ = api->SafeAlloc<void>(kRemoteConfigFnFetch);
     is_fetch_process_have_task_ = true;
     fetch_channel_.Put();
     cache_expiration_in_seconds_ = cache_expiration_in_seconds;

remote_config/src/desktop/remote_config_desktop.h

@@ -19,6 +19,7 @@
 #include <string>
 #include <thread>  // NOLINT
 
+#include "app/src/reference_counted_future_impl.h"
 #include "firebase/app.h"
 #include "firebase/future.h"
 #include "remote_config/src/desktop/config_data.h"
@@ -178,7 +179,7 @@ class RemoteConfigDesktop {
 
   // Create new FutureHandle when it's possible to start fetching and complete
   // future with `fetch_handle_` after fetching.
-  FutureHandle fetch_handle_;
+  firebase::SafeFutureHandle<void> fetch_handle_;
 
   // Last value of `Fetch` function argument. Update only if we will fetch.
   uint64_t cache_expiration_in_seconds_;

remote_config/src/remote_config_android.cc

@@ -665,30 +665,32 @@ static void FutureCallback(JNIEnv* env, jobject result,
   }
   // If the API has being shut down this will be nullptr.
   FutureData* future_data = FutureData::Get();
+  auto* future_handle =
+      reinterpret_cast<SafeFutureHandle<void>*>(callback_data);
   if (future_data) {
-    future_data->api()->Complete(reinterpret_cast<FutureHandle>(callback_data),
+    future_data->api()->Complete(*future_handle,
                                  success ? kFetchFutureStatusSuccess
                                  : kFetchFutureStatusFailure);
   }
+  delete future_handle;
 }
 
 Future<void> Fetch(uint64_t cache_expiration_in_seconds) {
   FIREBASE_ASSERT_RETURN(FetchLastResult(), internal::IsInitialized());
   // Create the future.
   ReferenceCountedFutureImpl* api = FutureData::Get()->api();
-  const FutureHandle handle = api->Alloc<void>(kRemoteConfigFnFetch);
+  const auto handle = api->SafeAlloc<void>(kRemoteConfigFnFetch);
   JNIEnv* env = g_app->GetJNIEnv();
   jobject task = env->CallObjectMethod(
       g_remote_config_class_instance, config::GetMethodId(config::kFetch),
       static_cast<jlong>(cache_expiration_in_seconds));
 
-  util::RegisterCallbackOnTask(env, task, FutureCallback,
-                               *(reinterpret_cast<void* const*>(&handle)),
-                               kApiIdentifier);
+  util::RegisterCallbackOnTask(
+      env, task, FutureCallback, new SafeFutureHandle<void>(handle),
+      kApiIdentifier);
 
   env->DeleteLocalRef(task);
-  return static_cast<const Future<void>&>(
-      api->LastResult(kRemoteConfigFnFetch));
+  return MakeFuture<void>(api, handle);
 }
 
 Future<void> FetchLastResult() {

remote_config/src/remote_config_ios.mm

@@ -151,7 +151,9 @@ void SetDefaults(const ConfigKeyValueVariant *defaults, size_t number_of_default
   FIREBASE_ASSERT_RETURN(std::string(), internal::IsInitialized());
   switch (setting) {
   case kConfigSettingDeveloperMode:
-    return g_remote_config_instance.configSettings.isDeveloperModeEnabled ? "1" : "0";
+    // This setting is deprecated.
+    LogWarning("Remote Config: Developer mode setting is deprecated.");
+    return "1";
   default:
     LogError("Remote Config: GetConfigSetting called with unknown setting: %d", setting);
     return std::string();
@@ -161,8 +163,7 @@ void SetDefaults(const ConfigKeyValueVariant *defaults, size_t number_of_default
 void SetConfigSetting(ConfigSetting setting, const char *value) {
   switch (setting) {
   case kConfigSettingDeveloperMode:
-    g_remote_config_instance.configSettings =
-        [[FIRRemoteConfigSettings alloc] initWithDeveloperModeEnabled:@(value).boolValue];
+    LogWarning("Remote Config: Developer mode setting is deprecated.");
     break;
   default:
     LogError("Remote Config: SetConfigSetting called with unknown setting: %d", setting);
@@ -309,7 +310,7 @@ static void CheckDoubleConversion(FIRRemoteConfigValue *value, ValueInfo *info)
 Future<void> Fetch(uint64_t cache_expiration_in_seconds) {
   FIREBASE_ASSERT_RETURN(FetchLastResult(), internal::IsInitialized());
   ReferenceCountedFutureImpl *api = FutureData::Get()->api();
-  const FutureHandle handle = api->Alloc<void>(kRemoteConfigFnFetch);
+  const auto handle = api->SafeAlloc<void>(kRemoteConfigFnFetch);
 
   FIRRemoteConfigFetchCompletion completion = ^(FIRRemoteConfigFetchStatus status, NSError *error) {
     if (error) {
@@ -327,13 +328,13 @@ static void CheckDoubleConversion(FIRRemoteConfigValue *value, ValueInfo *info)
                         "Fetch encountered an error.");
     } else {
       // Everything worked!
-      api->Complete(handle, kFetchFutureStatusSuccess, nullptr);
+      api->Complete(handle, kFetchFutureStatusSuccess);
     }
   };
   [g_remote_config_instance fetchWithExpirationDuration:cache_expiration_in_seconds
                                       completionHandler:completion];
 
-  return static_cast<const Future<void> &>(api->LastResult(kRemoteConfigFnFetch));
+  return MakeFuture<void>(api, handle);
 }
 
 Future<void> FetchLastResult() {
@@ -344,7 +345,14 @@ static void CheckDoubleConversion(FIRRemoteConfigValue *value, ValueInfo *info)
 
 bool ActivateFetched() {
   FIREBASE_ASSERT_RETURN(false, internal::IsInitialized());
-  return static_cast<bool>([g_remote_config_instance activateFetched]);
+  __block bool succeeded = true;
+  __block dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+  [g_remote_config_instance activateWithCompletionHandler:^(NSError *_Nullable error) {
+      if (error) succeeded = false;
+      dispatch_semaphore_signal(semaphore);
+    }];
+  dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
+  return succeeded;
 }
 
 const ConfigInfo &GetInfo() {