Integrate Latest @ 128857522

- Implement Google Play services checker in sample apps. - Updated sample project gradle dependencies to 9.4.0 and added play-services-base dependency. - Make the sample apps able to handle orientation changes without restarting. CL: 128857522

Author: jonsimantov

admob/testapp/AndroidManifest.xml

@@ -9,7 +9,8 @@
  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
  <application android:label="@string/app_name">
  <activity android:name="android.app.NativeActivity"
- android:screenOrientation="portrait">
+ android:screenOrientation="portrait"
+ android:configChanges="orientation|screenSize">
  <meta-data android:name="android.app.lib_name"
  android:value="android_main" />
  <intent-filter>

admob/testapp/build.gradle

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

admob/testapp/src/common_main.cc

@@ -28,12 +28,11 @@ class LoggingBannerViewListener : public firebase::admob::BannerView::Listener {
  LoggingBannerViewListener() {}
  void OnPresentationStateChanged(
  firebase::admob::BannerView* banner_view,
- firebase::admob::BannerView::PresentationState new_state) {
+ firebase::admob::BannerView::PresentationState new_state) override {
  ::LogMessage("BannerView PresentationState has changed to %d.", new_state);
  }
-
  void OnBoundingBoxChanged(firebase::admob::BannerView* banner_view,
- firebase::admob::BoundingBox new_box) {
+ firebase::admob::BoundingBox new_box) override {
  ::LogMessage(
  "BannerView BoundingBox has changed to (x: %d, y: %d, width: %d, "
  "height %d).",
@@ -48,7 +47,7 @@ class LoggingInterstitialAdListener
  LoggingInterstitialAdListener() {}
  void OnPresentationStateChanged(
  firebase::admob::InterstitialAd* interstitial_ad,
- firebase::admob::InterstitialAd::PresentationState new_state) {
+ firebase::admob::InterstitialAd::PresentationState new_state) override {
  ::LogMessage("InterstitialAd PresentationState has changed to %d.",
  new_state);
  }
@@ -81,44 +80,36 @@ static const int kBirthdayYear = 1976;
 
 static void WaitForFutureCompletion(firebase::FutureBase future) {
  while (!ProcessEvents(1000)) {
- if (future.Status() != ::firebase::kFutureStatusPending) {
+ if (future.Status() != firebase::kFutureStatusPending) {
  break;
  }
  }
 
- if (future.Error() != ::firebase::admob::kAdMobErrorNone) {
+ if (future.Error() != firebase::admob::kAdMobErrorNone) {
  LogMessage("Action failed with error code %d and message \"%s\".",
  future.Error(), future.ErrorMessage());
  }
 }
 
 // Execute all methods of the C++ admob API.
 extern "C" int common_main(int argc, const char* argv[]) {
- namespace admob = ::firebase::admob;
- ::firebase::App* app;
+ firebase::App* app;
  LogMessage("Initializing the AdMob library.");
- do {
+
 #if defined(__ANDROID__)
-  app = ::firebase::App::Create(::firebase::AppOptions(), GetJniEnv(),
-   GetActivity());
+ app =
+ firebase::App::Create(firebase::AppOptions(), GetJniEnv(), GetActivity());
 #else
-  app = ::firebase::App::Create(::firebase::AppOptions());
+ app = firebase::App::Create(firebase::AppOptions());
 #endif // defined(__ANDROID__)
 
- if (app == nullptr) {
- LogMessage("Couldn't create firebase app, try again.");
- // Wait a few moments, and try to create app again.
- ProcessEvents(1000);
- }
- } while (app == nullptr);
-
  LogMessage("Created the Firebase App %x.",
  static_cast<int>(reinterpret_cast<intptr_t>(app)));
 
  LogMessage("Initializing the AdMob with Firebase API.");
- admob::Initialize(*app);
+ firebase::admob::Initialize(*app);
 
- ::firebase::admob::AdRequest request;
+ 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;
@@ -141,7 +132,7 @@ extern "C" int common_main(int argc, const char* argv[]) {
 
  // "Extra" key value pairs can be added to the request as well. Typically
  // these are used when testing new features.
- static const ::firebase::admob::KeyValuePair kRequestExtras[] = {
+ static const firebase::admob::KeyValuePair kRequestExtras[] = {
  {"the_name_of_an_extra", "the_value_for_that_extra"}};
  request.extras_count = sizeof(kRequestExtras) / sizeof(kRequestExtras[0]);
  request.extras = kRequestExtras;
@@ -155,18 +146,18 @@ extern "C" int common_main(int argc, const char* argv[]) {
  // Device IDs can be obtained by checking the logcat or the Xcode log while
  // debugging. They appear as a long string of hex characters.
  request.test_device_id_count =
- sizeof(kTestDeviceIDs) / sizeof(kTestDeviceIDs);
+ sizeof(kTestDeviceIDs) / sizeof(kTestDeviceIDs[0]);
  request.test_device_ids = kTestDeviceIDs;
 
  // Create an ad size for the BannerView.
- admob::AdSize ad_size;
- ad_size.ad_size_type = admob::kAdSizeStandard;
+ firebase::admob::AdSize ad_size;
+ ad_size.ad_size_type = firebase::admob::kAdSizeStandard;
  ad_size.width = kBannerWidth;
  ad_size.height = kBannerHeight;
 
  LogMessage("Creating the BannerView.");
  LoggingBannerViewListener banner_listener;
- ::firebase::admob::BannerView* banner = new admob::BannerView();
+ firebase::admob::BannerView* banner = new firebase::admob::BannerView();
  banner->SetListener(&banner_listener);
  banner->Initialize(GetWindowContext(), kBannerAdUnit, ad_size);
 
@@ -186,32 +177,32 @@ extern "C" int common_main(int argc, const char* argv[]) {
 
  // Move to each of the six pre-defined positions.
  LogMessage("Moving the banner ad to top-center.");
- banner->MoveTo(admob::BannerView::kPositionTop);
+ banner->MoveTo(firebase::admob::BannerView::kPositionTop);
 
  WaitForFutureCompletion(banner->MoveToLastResult());
 
  LogMessage("Moving the banner ad to top-left.");
- banner->MoveTo(admob::BannerView::kPositionTopLeft);
+ banner->MoveTo(firebase::admob::BannerView::kPositionTopLeft);
 
  WaitForFutureCompletion(banner->MoveToLastResult());
 
  LogMessage("Moving the banner ad to top-right.");
- banner->MoveTo(admob::BannerView::kPositionTopRight);
+ banner->MoveTo(firebase::admob::BannerView::kPositionTopRight);
 
  WaitForFutureCompletion(banner->MoveToLastResult());
 
  LogMessage("Moving the banner ad to bottom-center.");
- banner->MoveTo(admob::BannerView::kPositionBottom);
+ banner->MoveTo(firebase::admob::BannerView::kPositionBottom);
 
  WaitForFutureCompletion(banner->MoveToLastResult());
 
  LogMessage("Moving the banner ad to bottom-left.");
- banner->MoveTo(admob::BannerView::kPositionBottomLeft);
+ banner->MoveTo(firebase::admob::BannerView::kPositionBottomLeft);
 
  WaitForFutureCompletion(banner->MoveToLastResult());
 
  LogMessage("Moving the banner ad to bottom-right.");
- banner->MoveTo(admob::BannerView::kPositionBottomRight);
+ banner->MoveTo(firebase::admob::BannerView::kPositionBottomRight);
 
  WaitForFutureCompletion(banner->MoveToLastResult());
 
@@ -248,10 +239,16 @@ extern "C" int common_main(int argc, const char* argv[]) {
 
  WaitForFutureCompletion(banner->MoveToLastResult());
 
+ LogMessage("Hiding the banner ad now that we're done with it.");
+ banner->Hide();
+
+ WaitForFutureCompletion(banner->HideLastResult());
+
  // Create and test InterstitialAd.
  LogMessage("Creating the InterstitialAd.");
  LoggingInterstitialAdListener interstitial_listener;
- ::firebase::admob::InterstitialAd* interstitial = new admob::InterstitialAd();
+ firebase::admob::InterstitialAd* interstitial =
+ new firebase::admob::InterstitialAd();
  interstitial->SetListener(&interstitial_listener);
  interstitial->Initialize(GetWindowContext(), kInterstitialAdUnit);
 
@@ -267,13 +264,24 @@ extern "C" int common_main(int argc, const char* argv[]) {
  LogMessage("Showing the interstitial ad.");
  interstitial->Show();
 
+ WaitForFutureCompletion(interstitial->ShowLastResult());
+
+ // Wait for the user to close the interstitial.
+ while (interstitial->GetPresentationState() !=
+ firebase::admob::InterstitialAd::PresentationState::
+ kPresentationStateHidden) {
+ ProcessEvents(1000);
+ }
+
+ LogMessage("Done!");
+
  // Wait until the user kills the app.
  while (!ProcessEvents(1000)) {
  }
 
- delete interstitial;
  delete banner;
- admob::Terminate();
+ delete interstitial;
+ firebase::admob::Terminate();
  delete app;
 
  return 0;

analytics/testapp/AndroidManifest.xml

@@ -8,7 +8,9 @@
  <uses-permission android:name="android.permission.WAKE_LOCK" />
  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
  <application android:label="@string/app_name">
- <activity android:name="android.app.NativeActivity">
+ <activity android:name="android.app.NativeActivity"
+ android:screenOrientation="portrait"
+ android:configChanges="orientation|screenSize">
  <meta-data android:name="android.app.lib_name"
  android:value="android_main" />
  <intent-filter>

analytics/testapp/build.gradle

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

auth/testapp/AndroidManifest.xml

@@ -9,7 +9,8 @@
  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
  <application android:label="@string/app_name">
  <activity android:name="android.app.NativeActivity"
- android:screenOrientation="portrait">
+ android:screenOrientation="portrait"
+ android:configChanges="orientation|screenSize">
  <meta-data android:name="android.app.lib_name"
  android:value="android_main" />
  <intent-filter>

auth/testapp/build.gradle

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

auth/testapp/src/common_main.cc

@@ -19,6 +19,7 @@
 
 #include "firebase/app.h"
 #include "firebase/auth.h"
+#include "google_play_services/availability.h"
 
 // Thin OS abstraction layer.
 #include "main.h" // NOLINT
@@ -219,25 +220,52 @@ class UserLogin {
 extern "C" int common_main(int argc, const char* argv[]) {
  App* app;
  LogMessage("Starting Auth tests.");
- do {
-// Create the App wrapper.
+ // Create the App wrapper.
+
 #if defined(__ANDROID__)
-  app = App::Create(AppOptions(), GetJniEnv(), GetActivity());
+ app = App::Create(AppOptions(), GetJniEnv(), GetActivity());
 #else
-  app = App::Create(AppOptions());
+ app = App::Create(AppOptions());
 #endif // defined(__ANDROID__)
 
- if (app == nullptr) {
- LogMessage("Couldn't create firebase app, try again.");
- // Wait a few moments, and try to create app again.
- ProcessEvents(1000);
- }
- } while (app == nullptr);
-
  LogMessage("Created the Firebase app %x.",
  static_cast<int>(reinterpret_cast<intptr_t>(app)));
  // Create the Auth class for that App.
- Auth* auth = Auth::GetAuth(app);
+ ::firebase::InitResult init_result;
+ bool try_again;
+ Auth* auth;
+ do {
+ try_again = false;
+ auth = Auth::GetAuth(app, &init_result);
+
+#if defined(__ANDROID__)
+ // On Android, we need to update or activate Google Play services
+ // before we can initialize this Firebase module.
+ if (init_result == firebase::kInitResultFailedMissingDependency) {
+ LogMessage("Google Play services unavailable, trying to fix.");
+ firebase::Future<void> make_available =
+ google_play_services::MakeAvailable(app->GetJNIEnv(),
+ app->activity());
+ while (make_available.Status() != ::firebase::kFutureStatusComplete) {
+ if (ProcessEvents(100)) return 1; // Return if exit was triggered.
+ }
+
+ if (make_available.Error() == 0) {
+ LogMessage("Google Play services now available, continuing.");
+ try_again = true;
+ } else {
+ LogMessage("Google Play services still unavailable.");
+ }
+ }
+#endif // defined(__ANDROID__)
+ } while (try_again);
+
+ if (init_result != firebase::kInitResultSuccess) {
+ LogMessage("Failed to initialize Auth, exiting.");
+ ProcessEvents(2000);
+ return 1;
+ }
+
  LogMessage("Created the Auth %x class for the Firebase app.",
  static_cast<int>(reinterpret_cast<intptr_t>(auth)));
 

invites/testapp/AndroidManifest.xml

@@ -6,7 +6,9 @@
  <uses-permission android:name="android.permission.INTERNET" />
  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
  <application android:label="@string/app_name">
- <activity android:name="android.app.NativeActivity">
+ <activity android:name="android.app.NativeActivity"
+ android:screenOrientation="portrait"
+ android:configChanges="orientation|screenSize">
  <meta-data android:name="android.app.lib_name"
  android:value="android_main" />
  <intent-filter>

invites/testapp/build.gradle

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