Integrate Latest @ 133875437

Changes to all: - Update Firebase C++ samples to use Firebase version 9.6.0 on Android. - Use ModuleInitializer to initialize Firebase C++ modules which require Play services. Changes to admob/testapp ... - Add publisher-provided AdMob App ID to Initialize call. - Add Rewarded Video to the AdMob C++ testapp. Changes to auth/testapp ... - Suppress error on Delete() in invalid case. - Add sample code for email verification functions. Changes to invites/testapp ... - Modify Firebase Invites C++ sample to support iOS 10. Changes to messaging/testapp ... - Add sample code for retrieving the notification payload. Changes to remote_config/testapp ... - Add sample code for GetKeysByPrefix. CL: 133875437

Author: jonsimantov

admob/testapp/build.gradle

@@ -89,8 +89,8 @@ android {
 
 dependencies {
  compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.google.firebase:firebase-ads:9.4.0'
- compile 'com.google.android.gms:play-services-base:9.4.0'
+ compile 'com.google.firebase:firebase-ads:9.6.0'
+ compile 'com.google.android.gms:play-services-base:9.6.0'
 }
 
 apply plugin: 'com.google.gms.google-services'

admob/testapp/readme.md

@@ -59,6 +59,8 @@ Getting Started
  dismiss the interstitial ad to see the banner ad. The output of the app can
  be viewed via the console. To view the conscole in Xcode, select
  "View --> Debug Area --> Activate Console" from the menu.
+ - For Rewarded Video, you must supply your own ad unit. Learn more in the
+ [Rewarded Video C++ guide](http://firebase.google.com/docs/admob/cpp/rewarded-video).
 
 ### Android
  - Register your Android app with Firebase.
@@ -110,6 +112,8 @@ Getting Started
  - While this is happening, information from the device log will be written
  to an onscreen TextView.
  - Logcat can also be used as normal.
+ - For Rewarded Video, you must supply your own ad unit. Learn more in the
+ [Rewarded Video C++ guide](http://firebase.google.com/docs/admob/cpp/rewarded-video).
 
 Support
 -------

admob/testapp/src/common_main.cc

@@ -15,6 +15,7 @@
 #include "firebase/admob.h"
 #include "firebase/admob/banner_view.h"
 #include "firebase/admob/interstitial_ad.h"
+#include "firebase/admob/rewarded_video.h"
 #include "firebase/admob/types.h"
 #include "firebase/app.h"
 #include "firebase/future.h"
@@ -28,15 +29,15 @@ class LoggingBannerViewListener : public firebase::admob::BannerView::Listener {
  LoggingBannerViewListener() {}
  void OnPresentationStateChanged(
  firebase::admob::BannerView* banner_view,
- firebase::admob::BannerView::PresentationState new_state) override {
- ::LogMessage("BannerView PresentationState has changed to %d.", new_state);
+ firebase::admob::BannerView::PresentationState state) override {
+ ::LogMessage("BannerView PresentationState has changed to %d.", state);
  }
  void OnBoundingBoxChanged(firebase::admob::BannerView* banner_view,
- firebase::admob::BoundingBox new_box) override {
+ firebase::admob::BoundingBox box) override {
  ::LogMessage(
  "BannerView BoundingBox has changed to (x: %d, y: %d, width: %d, "
  "height %d).",
- new_box.x, new_box.y, new_box.width, new_box.height);
+ box.x, box.y, box.width, box.height);
  }
 };
 
@@ -47,19 +48,42 @@ class LoggingInterstitialAdListener
  LoggingInterstitialAdListener() {}
  void OnPresentationStateChanged(
  firebase::admob::InterstitialAd* interstitial_ad,
- firebase::admob::InterstitialAd::PresentationState new_state) override {
- ::LogMessage("InterstitialAd PresentationState has changed to %d.",
- new_state);
+ firebase::admob::InterstitialAd::PresentationState state) override {
+ ::LogMessage("InterstitialAd PresentationState has changed to %d.", state);
  }
 };
 
+// A simple listener that logs changes to rewarded video state.
+class LoggingRewardedVideoListener
+ : public firebase::admob::rewarded_video::Listener {
+ public:
+ LoggingRewardedVideoListener() {}
+ void OnRewarded(firebase::admob::rewarded_video::RewardItem reward) override {
+ ::LogMessage("Rewarding user with %f %s.", reward.amount,
+ reward.reward_type.c_str());
+ }
+ void OnPresentationStateChanged(
+ firebase::admob::rewarded_video::PresentationState state) override {
+ ::LogMessage("Rewarded video PresentationState has changed to %d.", state);
+ }
+};
+
+// The AdMob app IDs for the test app.
+#if defined(__ANDROID__)
+const char* kAdMobAppID = "ca-app-pub-3940256099942544~3347511713";
+#else
+const char* kAdMobAppID = "ca-app-pub-3940256099942544~1458002511";
+#endif
+
 // These ad units are configured to always serve test ads.
 #if defined(__ANDROID__)
 const char* kBannerAdUnit = "ca-app-pub-3940256099942544/6300978111";
 const char* kInterstitialAdUnit = "ca-app-pub-3940256099942544/1033173712";
+const char* kRewardedVideoAdUnit = "YOUR_REWARDED_VIDEO_AD_UNIT_ID";
 #else
 const char* kBannerAdUnit = "ca-app-pub-3940256099942544/2934735716";
 const char* kInterstitialAdUnit = "ca-app-pub-3940256099942544/4411468910";
+const char* kRewardedVideoAdUnit = "YOUR_REWARDED_VIDEO_AD_UNIT_ID";
 #endif
 
 // Standard mobile banner size is 320x50.
@@ -86,7 +110,7 @@ static void WaitForFutureCompletion(firebase::FutureBase future) {
  }
 
  if (future.Error() != firebase::admob::kAdMobErrorNone) {
- LogMessage("Action failed with error code %d and message \"%s\".",
+ LogMessage("ERROR: Action failed with error code %d and message \"%s\".",
  future.Error(), future.ErrorMessage());
  }
 }
@@ -107,7 +131,7 @@ extern "C" int common_main(int argc, const char* argv[]) {
  static_cast<int>(reinterpret_cast<intptr_t>(app)));
 
  LogMessage("Initializing the AdMob with Firebase API.");
- firebase::admob::Initialize(*app);
+ firebase::admob::Initialize(*app, kAdMobAppID);
 
  firebase::admob::AdRequest request;
  // If the app is aware of the user's gender, it can be added to the targeting
@@ -156,13 +180,15 @@ extern "C" int common_main(int argc, const char* argv[]) {
  ad_size.height = kBannerHeight;
 
  LogMessage("Creating the BannerView.");
- LoggingBannerViewListener banner_listener;
  firebase::admob::BannerView* banner = new firebase::admob::BannerView();
- banner->SetListener(&banner_listener);
  banner->Initialize(GetWindowContext(), kBannerAdUnit, ad_size);
 
  WaitForFutureCompletion(banner->InitializeLastResult());
 
+ // Set the listener.
+ LoggingBannerViewListener banner_listener;
+ banner->SetListener(&banner_listener);
+
  // Make the BannerView visible.
  LogMessage("Showing the banner ad.");
  banner->Show();
@@ -246,14 +272,16 @@ extern "C" int common_main(int argc, const char* argv[]) {
 
  // Create and test InterstitialAd.
  LogMessage("Creating the InterstitialAd.");
- LoggingInterstitialAdListener interstitial_listener;
  firebase::admob::InterstitialAd* interstitial =
  new firebase::admob::InterstitialAd();
- interstitial->SetListener(&interstitial_listener);
  interstitial->Initialize(GetWindowContext(), kInterstitialAdUnit);
 
  WaitForFutureCompletion(interstitial->InitializeLastResult());
 
+ // Set the listener.
+ LoggingInterstitialAdListener interstitial_listener;
+ interstitial->SetListener(&interstitial_listener);
+
  // When the InterstitialAd is initialized, load an ad.
  LogMessage("Loading an interstitial ad.");
  interstitial->LoadAd(request);
@@ -273,6 +301,52 @@ extern "C" int common_main(int argc, const char* argv[]) {
  ProcessEvents(1000);
  }
 
+ // Start up rewarded video ads and associated mediation adapters.
+ LogMessage("Initializing rewarded video.");
+ namespace rewarded_video = firebase::admob::rewarded_video;
+ rewarded_video::Initialize();
+
+ WaitForFutureCompletion(rewarded_video::InitializeLastResult());
+
+ LogMessage("Setting rewarded video listener.");
+ LoggingRewardedVideoListener rewarded_listener;
+ rewarded_video::SetListener(&rewarded_listener);
+
+ LogMessage("Loading a rewarded video ad.");
+ rewarded_video::LoadAd(kRewardedVideoAdUnit, request);
+
+ WaitForFutureCompletion(rewarded_video::LoadAdLastResult());
+
+ // If an ad has loaded, show it. If the user watches all the way through, the
+ // LoggingRewardedVideoListener will log a reward!
+ if (rewarded_video::LoadAdLastResult().Error() ==
+ firebase::admob::kAdMobErrorNone) {
+ LogMessage("Showing a rewarded video ad.");
+ rewarded_video::Show(GetWindowContext());
+
+ WaitForFutureCompletion(rewarded_video::ShowLastResult());
+
+ // Normally Pause and Resume would be called in response to the app pausing
+ // or losing focus. This is just a test.
+ LogMessage("Pausing.");
+ rewarded_video::Pause();
+
+ WaitForFutureCompletion(rewarded_video::PauseLastResult());
+
+ LogMessage("Resuming.");
+ rewarded_video::Resume();
+
+ WaitForFutureCompletion(rewarded_video::ResumeLastResult());
+ } else {
+ // Rewarded Video returned an error. This might be because the
+ // developer did not put their Rewarded Video ad unit into
+ // kRewardedVideoAdUnit above.
+ LogMessage("WARNING: Is your Rewarded Video ad unit ID correct?");
+ LogMessage(
+ "Ensure kRewardedVideoAdUnit is set to your own Rewarded Video ad unit "
+ "ID in src/common_main.cc.");
+ }
+
  LogMessage("Done!");
 
  // Wait until the user kills the app.
@@ -281,6 +355,7 @@ extern "C" int common_main(int argc, const char* argv[]) {
 
  delete banner;
  delete interstitial;
+ rewarded_video::Destroy();
  firebase::admob::Terminate();
  delete app;
 

analytics/testapp/build.gradle

@@ -90,8 +90,8 @@ android {
 
 dependencies {
  compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.google.firebase:firebase-analytics:9.4.0'
- compile 'com.google.android.gms:play-services-base:9.4.0'
+ compile 'com.google.firebase:firebase-analytics:9.6.0'
+ compile 'com.google.android.gms:play-services-base:9.6.0'
 }
 
 apply plugin: 'com.google.gms.google-services'

analytics/testapp/src/android/java/com/google/firebase/example/LoggingUtils.java

@@ -33,6 +33,7 @@ public static void initLogWindow(Activity activity) {
  LinearLayout linearLayout = new LinearLayout(activity);
  ScrollView scrollView = new ScrollView(activity);
  TextView textView = new TextView(activity);
+ textView.setTag("Logger");
  linearLayout.addView(scrollView);
  scrollView.addView(textView);
  Window window = activity.getWindow();

analytics/testapp/src/ios/ios_main.mm

@@ -101,6 +101,7 @@ - (BOOL)application:(UIApplication*)application
 
  g_text_view = [[UITextView alloc] initWithFrame:viewController.view.bounds];
 
+ g_text_view.accessibilityIdentifier = @"Logger";
  g_text_view.editable = NO;
  g_text_view.scrollEnabled = YES;
  g_text_view.userInteractionEnabled = YES;

auth/testapp/build.gradle

@@ -90,8 +90,8 @@ android {
 
 dependencies {
  compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.google.firebase:firebase-auth:9.4.0'
- compile 'com.google.android.gms:play-services-base:9.4.0'
+ compile 'com.google.firebase:firebase-auth:9.6.0'
+ compile 'com.google.android.gms:play-services-base:9.6.0'
 }
 
 apply plugin: 'com.google.gms.google-services'

auth/testapp/src/android/java/com/google/firebase/example/LoggingUtils.java

@@ -33,6 +33,7 @@ public static void initLogWindow(Activity activity) {
  LinearLayout linearLayout = new LinearLayout(activity);
  ScrollView scrollView = new ScrollView(activity);
  TextView textView = new TextView(activity);
+ textView.setTag("Logger");
  linearLayout.addView(scrollView);
  scrollView.addView(textView);
  Window window = activity.getWindow();