update use of futures in initialization

Author: DellaBitta

admob/integration_test/src/integration_test.cc

@@ -177,7 +177,6 @@ firebase::admob::AdRequest FirebaseAdMobTest::GetAdRequest() {
 }
 
 // Test cases below.
-
 TEST_F(FirebaseAdMobTest, TestGetAdRequest) { GetAdRequest(); }
 
 // A simple listener to help test changes to a BannerView.
@@ -354,6 +353,29 @@ TEST_F(FirebaseAdMobTest, TestBannerView) {
 #endif
 }
 
+TEST_F(FirebaseAdMobTest, TestBannerViewAlreadyInitialized) {
+  static const int kBannerWidth = 320;
+  static const int kBannerHeight = 50;
+
+  firebase::admob::AdSize banner_ad_size;
+  banner_ad_size.ad_size_type = firebase::admob::kAdSizeStandard;
+  banner_ad_size.width = kBannerWidth;
+  banner_ad_size.height = kBannerHeight;
+
+  firebase::admob::BannerView* banner = new firebase::admob::BannerView();
+
+  firebase::Future<void> first_initialize = banner->Initialize(
+      app_framework::GetWindowContext(), kBannerAdUnit, banner_ad_size);
+  firebase::Future<void> second_initialize = banner->Initialize(
+      app_framework::GetWindowContext(), kBannerAdUnit, banner_ad_size);
+
+  WaitForCompletion(second_initialize, "Second Initialize",
+                    firebase::admob::kAdMobErrorAlreadyInitialized);
+  WaitForCompletion(first_initialize, "First Initialize");
+
+  delete banner;
+}
+
 // A simple listener to help test changes to a InterstitialAd.
 class TestInterstitialAdListener
     : public firebase::admob::InterstitialAd::Listener {

admob/src/android/banner_view_internal_android.cc

@@ -144,7 +144,17 @@ void InitializeBannerViewOnMainThread(void* data) {
   JNIEnv* env = GetJNI();
   FIREBASE_ASSERT(env != nullptr);
 
-  jstring ad_unit_id_str = env->NewStringUTF(call_data->ad_unit_id.c_str());
+  jstring ad_unit_id_str =
+      static_cast<jstring>(::firebase::admob::GetJNI()->CallObjectMethod(
+          call_data->ad_view, ad_view::GetMethodId(ad_view::kGetAdUnitId)));
+  if (ad_unit_id_str != nullptr) {
+    CompleteFuture(kAdMobErrorAlreadyInitialized, "",
+                   call_data->callback_data->future_handle,
+                   call_data->callback_data->future_data);
+    return;
+  }
+
+  ad_unit_id_str = env->NewStringUTF(call_data->ad_unit_id.c_str());
   env->CallVoidMethod(call_data->ad_view,
                       ad_view::GetMethodId(ad_view::kSetAdUnitId),
                       ad_unit_id_str);
@@ -206,11 +216,15 @@ Future<void> BannerViewInternalAndroid::Initialize(AdParent parent,
       CreateFutureCallbackData(&future_data_, kBannerViewFnInitialize);
 
   if (initialized_) {
-    CompleteFuture(kAdMobErrorAlreadyInitialized, "Ad is already initialized.",
-                   callback_data->future_handle, callback_data->future_data);
-    return GetLastResult(kBannerViewFnInitialize);
+    future_data_.future_impl.Complete(callback_data->future_handle,
+                                      kAdMobErrorAlreadyInitialized,
+                                      "Ad is already initialized.");
+    return Future<void>(&future_data_.future_impl,
+                        callback_data->future_handle);
   }
 
+  initialized_ = true;
+
   JNIEnv* env = ::firebase::admob::GetJNI();
   jobject activity = ::firebase::admob::GetActivity();
 

admob/src/android/banner_view_internal_android.h

@@ -53,8 +53,9 @@ METHOD_LOOKUP_DECLARATION(banner_view_helper_ad_view_listener,
 // clang-format off
 #define AD_VIEW_METHODS(X)                                             \
   X(Constructor, "<init>", "(Landroid/content/Context;)V"),            \
+  X(GetAdUnitId, "getAdUnitId", "()Ljava/lang/String;"),               \
   X(SetAdSize, "setAdSize", "(Lcom/google/android/gms/ads/AdSize;)V"), \
-  X(SetAdUnitId, "setAdUnitId", "(Ljava/lang/String;)V"),               \
+  X(SetAdUnitId, "setAdUnitId", "(Ljava/lang/String;)V"),              \
   X(SetAdListener, "setAdListener",                                    \
     "(Lcom/google/android/gms/ads/AdListener;)V")
 // clang-format on

admob/src/ios/banner_view_internal_ios.h

@@ -56,6 +56,9 @@ class BannerViewInternalIOS : public BannerViewInternal {
   /// closures).
   FutureHandle future_handle_for_load_;
 
+  /// Prevents duplicate invocations of initailize on the BannerView.
+  bool initialized_;
+
   /// The FADBannerView object. Declared as an "id" type to avoid referencing an
   /// Objective-C++ class in this header.
   id banner_view_;

admob/src/ios/banner_view_internal_ios.mm

@@ -28,6 +28,7 @@
 BannerViewInternalIOS::BannerViewInternalIOS(BannerView* base)
     : BannerViewInternal(base),
       future_handle_for_load_(ReferenceCountedFutureImpl::kInvalidHandle),
+      initialized_(false),
       banner_view_(nil),
       destroy_mutex_(Mutex::kModeNonRecursive) {}
 
@@ -39,15 +40,24 @@
 
 Future<void> BannerViewInternalIOS::Initialize(AdParent parent, const char* ad_unit_id,
                                                AdSize size) {
-  const firebase::FutureHandle handle = CreateFuture(kBannerViewFnInitialize, &future_data_);
-  dispatch_async(dispatch_get_main_queue(), ^{
-    banner_view_ = [[FADBannerView alloc] initWithView:parent
+  FutureCallbackData* callback_data =
+      CreateFutureCallbackData(&future_data_, kBannerViewFnInitialize);
+  if(initialized_) {
+    future_data_.future_impl.Complete(callback_data->future_handle,
+                                      kAdMobErrorAlreadyInitialized,
+                                      "Ad is already initialized.");
+  } else {
+    initialized_ = true;
+    dispatch_async(dispatch_get_main_queue(), ^{
+      banner_view_ = [[FADBannerView alloc] initWithView:parent
                                               adUnitID:@(ad_unit_id)
                                                 adSize:size
                                     internalBannerView:this];
-    CompleteFuture(kAdMobErrorNone, nullptr, handle, &future_data_);
-  });
-  return GetLastResult(kBannerViewFnInitialize);
+    future_data_.future_impl.Complete(callback_data->future_handle,
+                                      kAdMobErrorNone);
+    });
+  }
+  return Future<void>(&future_data_.future_impl, callback_data->future_handle);
 }
 
 Future<void> BannerViewInternalIOS::LoadAd(const AdRequest& request) {