Android pinned to new version

Author: DellaBitta

Android/firebase_dependencies.gradle

@@ -17,8 +17,8 @@ import org.gradle.util.ConfigureUtil;
 // A map of library to the dependencies that need to be added for it.
 def firebaseDependenciesMap = [
   'app' : ['com.google.firebase:firebase-analytics:19.0.0'],
-  'admob' : ['com.google.firebase:firebase-ads:19.8.0',
-             'com.google.firebase:firebase-analytics:19.0.0',
+  'admob' : ['com.google.firebase:firebase-ads:20.1.0',
+             'com.google.android.gms:play-services-measurement-sdk-api:19.0.0',
              'com.google.android.gms:play-services-base:17.6.0'],
   'analytics' : ['com.google.firebase:firebase-analytics:19.0.0',
                  'com.google.android.gms:play-services-base:17.6.0'],

admob/CMakeLists.txt

@@ -20,11 +20,7 @@ set(common_SRCS
     src/common/banner_view.cc
     src/common/banner_view_internal.cc
     src/common/interstitial_ad.cc
-    src/common/interstitial_ad_internal.cc
-    src/common/native_express_ad_view.cc
-    src/common/native_express_ad_view_internal.cc
-    src/common/rewarded_video.cc
-    src/common/rewarded_video_internal.cc)
+    src/common/interstitial_ad_internal.cc)
 
 # Define the resource build needed for Android
 firebase_cpp_gradle(":admob:admob_resources:generateDexJarRelease"
@@ -40,22 +36,16 @@ set(android_SRCS
     src/android/ad_request_converter.cc
     src/android/admob_android.cc
     src/android/banner_view_internal_android.cc
-    src/android/interstitial_ad_internal_android.cc
-    src/android/native_express_ad_view_internal_android.cc
-    src/android/rewarded_video_internal_android.cc)
+    src/android/interstitial_ad_internal_android.cc)
 
 # Source files used by the iOS implementation.
 set(ios_SRCS
     src/ios/FADBannerView.mm
     src/ios/FADInterstitialDelegate.mm
-    src/ios/FADNativeExpressAdView.mm
     src/ios/FADRequest.mm
-    src/ios/FADRewardBasedVideoAdDelegate.mm
     src/ios/admob_ios.mm
     src/ios/banner_view_internal_ios.mm
-    src/ios/interstitial_ad_internal_ios.mm
-    src/ios/native_express_ad_view_internal_ios.mm
-    src/ios/rewarded_video_internal_ios.mm)
+    src/ios/interstitial_ad_internal_ios.mm)
 
 # Source files used by the stub implementation.
 set(stub_SRCS

admob/admob_resources/AndroidManifest.xml

@@ -3,4 +3,10 @@
           package="com.google.FirebaseCppSdkBuild">
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-sdk android:minSdkVersion="3"/>
+   <application>
+        <!-- Sample AdMob App ID: ca-app-pub-3940256099942544~3347511713 -->
+        <meta-data
+            android:name="com.google.android.gms.ads.1:190496035492:android:1bc9896c15afba0c"
+            android:value="ca-app-pub-3940256099942544~3347511713"/>
+    </application>
 </manifest>

admob/admob_resources/build.gradle

@@ -46,7 +46,7 @@ android {
 
 dependencies {
   implementation 'com.google.firebase:firebase-analytics:19.0.0'
-  implementation 'com.google.firebase:firebase-ads:19.8.0'
+  implementation 'com.google.firebase:firebase-ads:20.1.0'
 }
 
 afterEvaluate {

admob/integration_test/src/integration_test.cc

@@ -62,11 +62,9 @@ const char* kAdMobAppID = "ca-app-pub-3940256099942544~1458002511";
 #if defined(__ANDROID__)
 const char* kBannerAdUnit = "ca-app-pub-3940256099942544/6300978111";
 const char* kInterstitialAdUnit = "ca-app-pub-3940256099942544/1033173712";
-const char* kRewardedVideoAdUnit = "ca-app-pub-3940256099942544/5224354917";
 #else
 const char* kBannerAdUnit = "ca-app-pub-3940256099942544/2934735716";
 const char* kInterstitialAdUnit = "ca-app-pub-3940256099942544/4411468910";
-const char* kRewardedVideoAdUnit = "ca-app-pub-3940256099942544/1712485313";
 #endif
 
 using app_framework::LogDebug;
@@ -108,11 +106,11 @@ void FirebaseAdMobTest::SetUpTestSuite() {
   LogDebug("Initializing AdMob.");
 
   ::firebase::ModuleInitializer initializer;
-  initializer.Initialize(
-      shared_app_, nullptr, [](::firebase::App* app, void* /* userdata */) {
-        LogDebug("Try to initialize AdMob");
-        return ::firebase::admob::Initialize(*app, kAdMobAppID);
-      });
+  initializer.Initialize(shared_app_, nullptr,
+                         [](::firebase::App* app, void* /* userdata */) {
+                           LogDebug("Try to initialize AdMob");
+                           return ::firebase::admob::Initialize(*app);
+                         });
 
   WaitForCompletion(initializer.InitializeLastResult(), "Initialize");
 
@@ -147,31 +145,11 @@ firebase::admob::AdRequest FirebaseAdMobTest::GetAdRequest() {
   // Sample keywords to use in making the request.
   static const char* kKeywords[] = {"AdMob", "C++", "Fun"};
 
-  // Sample birthday value to use in making the request.
-  static const int kBirthdayDay = 10;
-  static const int kBirthdayMonth = 11;
-  static const int kBirthdayYear = 1976;
-
   // Sample test device IDs to use in making the request.
   static const char* kTestDeviceIDs[] = {"2077ef9a63d2b398840261c8221a0c9b",
                                          "098fe087d987c9a878965454a65654d7"};
 
   firebase::admob::AdRequest request;
-  // If the app is aware of the user's gender, it can be added to the targeting
-  // information. Otherwise, "unknown" should be used.
-  request.gender = firebase::admob::kGenderUnknown;
-
-  // This value allows publishers to specify whether they would like the request
-  // to be treated as child-directed for purposes of the Children’s Online
-  // Privacy Protection Act (COPPA).
-  // See http://business.ftc.gov/privacy-and-security/childrens-privacy.
-  request.tagged_for_child_directed_treatment =
-      firebase::admob::kChildDirectedTreatmentStateTagged;
-
-  // The user's birthday, if known. Note that months are indexed from one.
-  request.birthday_day = kBirthdayDay;
-  request.birthday_month = kBirthdayMonth;
-  request.birthday_year = kBirthdayYear;
 
   // Additional keywords to be used in targeting.
   request.keyword_count = sizeof(kKeywords) / sizeof(kKeywords[0]);
@@ -332,8 +310,8 @@ TEST_F(FirebaseAdMobTest, TestBannerView) {
   WaitForCompletion(banner->Hide(), "Hide 2");
   expected_presentation_states.push_back(
       firebase::admob::BannerView::kPresentationStateHidden);
-
   delete banner;
+
   expected_presentation_states.push_back(
       firebase::admob::BannerView::kPresentationStateHidden);
   expected_num_bounding_box_changes++;
@@ -394,18 +372,20 @@ TEST_F(FirebaseAdMobTest, TestInterstitialAd) {
 
   firebase::admob::InterstitialAd* interstitial =
       new firebase::admob::InterstitialAd();
+
   WaitForCompletion(interstitial->Initialize(app_framework::GetWindowContext(),
                                              kInterstitialAdUnit),
                     "Initialize");
+
   TestInterstitialAdListener interstitial_listener;
   interstitial->SetListener(&interstitial_listener);
 
   firebase::admob::AdRequest request = GetAdRequest();
   // When the InterstitialAd is initialized, load an ad.
   WaitForCompletion(interstitial->LoadAd(request), "LoadAd");
+
   std::vector<firebase::admob::InterstitialAd::PresentationState>
       expected_presentation_states;
-
   WaitForCompletion(interstitial->Show(), "Show");
   expected_presentation_states.push_back(
       firebase::admob::InterstitialAd::PresentationState::
@@ -416,6 +396,7 @@ TEST_F(FirebaseAdMobTest, TestInterstitialAd) {
              kPresentationStateHidden) {
     app_framework::ProcessEvents(1000);
   }
+
   expected_presentation_states.push_back(
       firebase::admob::InterstitialAd::PresentationState::
           kPresentationStateHidden);
@@ -426,78 +407,6 @@ TEST_F(FirebaseAdMobTest, TestInterstitialAd) {
   delete interstitial;
 }
 
-// A simple listener to help test changes to rewarded video state.
-class TestRewardedVideoListener
-    : public firebase::admob::rewarded_video::Listener {
- public:
-  TestRewardedVideoListener() { got_reward_ = false; }
-  void OnRewarded(firebase::admob::rewarded_video::RewardItem reward) override {
-    got_reward_ = true;
-    reward_type_ = reward.reward_type;
-    reward_amount_ = reward.amount;
-  }
-  void OnPresentationStateChanged(
-      firebase::admob::rewarded_video::PresentationState state) override {
-    presentation_states_.push_back(state);
-  }
-  bool got_reward_;
-  std::string reward_type_;
-  float reward_amount_;
-  std::vector<firebase::admob::rewarded_video::PresentationState>
-      presentation_states_;
-};
-
-TEST_F(FirebaseAdMobTest, TestRewardedVideoAd) {
-  TEST_REQUIRES_USER_INTERACTION;
-
-  namespace rewarded_video = firebase::admob::rewarded_video;
-  WaitForCompletion(rewarded_video::Initialize(), "Initialize");
-
-  TestRewardedVideoListener rewarded_listener;
-  rewarded_video::SetListener(&rewarded_listener);
-
-  firebase::admob::AdRequest request = GetAdRequest();
-  WaitForCompletion(rewarded_video::LoadAd(kRewardedVideoAdUnit, request),
-                    "LoadAd");
-
-  std::vector<rewarded_video::PresentationState> expected_presentation_states;
-
-  WaitForCompletion(rewarded_video::Show(app_framework::GetWindowContext()),
-                    "Show");
-
-  expected_presentation_states.push_back(
-      rewarded_video::PresentationState::kPresentationStateCoveringUI);
-  expected_presentation_states.push_back(
-      rewarded_video::PresentationState::kPresentationStateVideoHasStarted);
-
-  // Wait a moment, then pause, then resume.
-  ProcessEvents(1000);
-  WaitForCompletion(rewarded_video::Pause(), "Pause");
-  ProcessEvents(1000);
-  WaitForCompletion(rewarded_video::Resume(), "Resume");
-
-#if defined(__ANDROID__) || TARGET_OS_IPHONE
-  // Wait for video to complete.
-  while (
-      rewarded_listener.presentation_states_.back() !=
-      rewarded_video::PresentationState::kPresentationStateVideoHasCompleted) {
-    ProcessEvents(1000);
-  }
-  expected_presentation_states.push_back(
-      rewarded_video::PresentationState::kPresentationStateVideoHasCompleted);
-
-  EXPECT_TRUE(rewarded_listener.got_reward_);
-  EXPECT_NE(rewarded_listener.reward_type_, "");
-  EXPECT_NE(rewarded_listener.reward_amount_, 0);
-  LogDebug("Got reward: %.02f %s", rewarded_listener.reward_amount_,
-           rewarded_listener.reward_type_.c_str());
-
-  EXPECT_EQ(rewarded_listener.presentation_states_,
-            expected_presentation_states);
-#endif
-  rewarded_video::Destroy();
-}
-
 #if defined(ANDROID) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)
 // Test runs & compiles for phones only.
 

admob/src/android/ad_request_converter.cc

@@ -42,50 +42,19 @@ METHOD_LOOKUP_DEFINITION(ad_request_builder,
                          ADREQUESTBUILDER_METHODS);
 
 METHOD_LOOKUP_DEFINITION(
-    ad_request_helper, "com/google/firebase/admob/internal/cpp/AdRequestHelper",
-    ADREQUESTHELPER_METHODS);
+    request_config_builder,
+    PROGUARD_KEEP_CLASS
+    "com/google/android/gms/ads/RequestConfiguration$Builder",
+    REQUESTCONFIGURATIONBUILDER_METHODS);
 
 AdRequestConverter::AdRequestConverter(AdRequest request) {
-  JNIEnv* env = ::firebase::admob::GetJNI();
+  ConvertRequestConfiguration(request);
 
+  JNIEnv* env = ::firebase::admob::GetJNI();
   jobject builder = env->NewObject(
       ad_request_builder::GetClass(),
       ad_request_builder::GetMethodId(ad_request_builder::kConstructor));
 
-  // Gender.
-
-  builder = util::ContinueBuilder(
-      env, builder,
-      env->CallObjectMethod(
-          builder,
-          ad_request_builder::GetMethodId(ad_request_builder::kSetGender),
-          static_cast<int>(request.gender)));
-
-  // Child-drected treatment.
-  if (request.tagged_for_child_directed_treatment !=
-      kChildDirectedTreatmentStateUnknown) {
-    builder = util::ContinueBuilder(
-        env, builder,
-        env->CallObjectMethod(
-            builder,
-            ad_request_builder::GetMethodId(
-                ad_request_builder::kTagForChildDirectedTreatment),
-            (request.tagged_for_child_directed_treatment ==
-             kChildDirectedTreatmentStateTagged)));
-  }
-
-  // Test devices.
-  for (int i = 0; i < request.test_device_id_count; i++) {
-    jstring test_device_str = env->NewStringUTF(request.test_device_ids[i]);
-    builder = util::ContinueBuilder(
-        env, builder,
-        env->CallObjectMethod(
-            builder,
-            ad_request_builder::GetMethodId(ad_request_builder::kAddTestDevice),
-            test_device_str));
-    env->DeleteLocalRef(test_device_str);
-  }
-
   // Keywords.
   for (int i = 0; i < request.keyword_count; i++) {
     jstring keyword_str = env->NewStringUTF(request.keywords[i]);
@@ -98,34 +67,7 @@ AdRequestConverter::AdRequestConverter(AdRequest request) {
     env->DeleteLocalRef(keyword_str);
   }
 
-  // Birthday.
-  jobject request_helper = env->NewObject(
-      ad_request_helper::GetClass(),
-      ad_request_helper::GetMethodId(ad_request_helper::kConstructor));
-
-  jobject date_ref = env->CallObjectMethod(
-      request_helper,
-      ad_request_helper::GetMethodId(ad_request_helper::kCreateDate),
-      static_cast<jint>(request.birthday_year),
-      static_cast<jint>(request.birthday_month),
-      static_cast<jint>(request.birthday_day));
-
-  env->DeleteLocalRef(request_helper);
-
-  if (date_ref != nullptr) {
-    builder = util::ContinueBuilder(
-        env, builder,
-        env->CallObjectMethod(
-            builder,
-            ad_request_builder::GetMethodId(ad_request_builder::kSetBirthday),
-            date_ref));
-  } else {
-    LogWarning(
-        "Skipping invalid AdRequest birthday fields (Y: %d, M: %d, D: %d).",
-        request.birthday_year, request.birthday_month, request.birthday_day);
-  }
-
-  // Extras.
+  // Network Extras.
   if (request.extras_count > 0) {
     jobject extras_bundle =
         env->NewObject(util::bundle::GetClass(),
@@ -180,7 +122,6 @@ AdRequestConverter::AdRequestConverter(AdRequest request) {
   // Build request and load ad.
   jobject java_request_ref = env->CallObjectMethod(
       builder, ad_request_builder::GetMethodId(ad_request_builder::kBuild));
-
   env->DeleteLocalRef(builder);
 
   java_request_ = env->NewGlobalRef(java_request_ref);
@@ -194,5 +135,38 @@ AdRequestConverter::~AdRequestConverter() {
 
 jobject AdRequestConverter::GetJavaRequestObject() { return java_request_; }
 
+void AdRequestConverter::ConvertRequestConfiguration(AdRequest request) const {
+  JNIEnv* env = ::firebase::admob::GetJNI();
+  jobject builder = env->NewObject(request_config_builder::GetClass(),
+                                   request_config_builder::GetMethodId(
+                                       request_config_builder::kConstructor));
+  // Test DeviceIds
+  if (request.test_device_id_count > 0) {
+    std::vector<std::string> test_devices_vector;
+    for (int i = 0; i < request.test_device_id_count; i++) {
+      test_devices_vector.push_back(request.test_device_ids[i]);
+    }
+    jobject test_device_list =
+        util::StdVectorToJavaList(env, test_devices_vector);
+    builder = util::ContinueBuilder(
+        env, builder,
+        env->CallObjectMethod(builder,
+                              request_config_builder::GetMethodId(
+                                  request_config_builder::kSetTestDeviceIds),
+                              test_device_list));
+    env->DeleteLocalRef(test_device_list);
+
+    // Build request configuration.
+    jobject request_configuration = env->CallObjectMethod(
+        builder,
+        request_config_builder::GetMethodId(request_config_builder::kBuild));
+    env->DeleteLocalRef(builder);
+    env->CallStaticVoidMethod(
+        mobile_ads::GetClass(),
+        mobile_ads::GetMethodId(mobile_ads::kSetRequestConfiguration),
+        request_configuration);
+  }
+}
+
 }  // namespace admob
-}  // namespace firebase
+}  // namespace firebase