Merge remote-tracking branch 'origin/master' into ghm

Author: a-maurice

Android/firebase_dependencies.gradle

@@ -16,23 +16,27 @@ 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:17.4.4'],
-  'admob' : ['com.google.firebase:firebase-ads:19.2.0',
-             'com.google.android.gms:play-services-measurement-sdk-api:17.4.4'],
-  'analytics' : ['com.google.firebase:firebase-analytics:17.4.4'],
+  'app' : ['com.google.firebase:firebase-analytics:17.5.0'],
+  'admob' : ['com.google.firebase:firebase-ads:19.3.0',
+             'com.google.android.gms:play-services-measurement-sdk-api:17.5.0',
+             'com.google.android.gms:play-services-base:17.4.0'],
+  'analytics' : ['com.google.firebase:firebase-analytics:17.5.0',
+                 'com.google.android.gms:play-services-base:17.4.0'],
   'auth' : ['com.google.firebase:firebase-auth:19.3.2'],
-  'database' : ['com.google.firebase:firebase-database:19.3.1'],
+  'database' : ['com.google.firebase:firebase-database:19.4.0'],
   'dynamic_links' : ['com.google.firebase:firebase-dynamic-links:19.1.0'],
-  'firestore' : ['com.google.firebase:firebase-firestore:21.5.0'],
-  'functions' : ['com.google.firebase:firebase-functions:19.0.2'],
-  'instance_id' : ['com.google.firebase:firebase-iid:20.2.3'],
+  'firestore' : ['com.google.firebase:firebase-firestore:21.6.0'],
+  'functions' : ['com.google.firebase:firebase-functions:19.1.0'],
+  'instance_id' : ['com.google.firebase:firebase-iid:20.2.4'],
   'invites' : ['com.google.firebase:firebase-invites:17.0.0'],
   // Messaging has an additional local dependency to include.
-  'messaging' : ['com.google.firebase:firebase-messaging:20.2.3',
-                 'firebase_cpp_sdk.messaging:messaging_java'],
-  'performance' : ['com.google.firebase:firebase-perf:19.0.7'],
-  'remote_config' : ['com.google.firebase:firebase-config:19.2.0'],
-  'storage' : ['com.google.firebase:firebase-storage:19.1.1']
+  'messaging' : ['com.google.firebase:firebase-messaging:20.2.4',
+                 'firebase_cpp_sdk.messaging:messaging_java',
+                 'androidx.core:core:1.0.1'],
+  'performance' : ['com.google.firebase:firebase-perf:19.0.8'],
+  'remote_config' : ['com.google.firebase:firebase-config:19.2.0',
+                     'com.google.android.gms:play-services-base:17.4.0'],
+  'storage' : ['com.google.firebase:firebase-storage:19.2.0']
 ]
 
 // A map of library to the gradle resources that they depend upon.
@@ -157,4 +161,4 @@ project.afterEvaluate {
       }
     }
   }
-}
+}

admob/admob_resources/build.gradle

@@ -45,8 +45,8 @@ android {
 }
 
 dependencies {
-  implementation 'com.google.firebase:firebase-analytics:17.4.4'
-  implementation 'com.google.firebase:firebase-ads:19.2.0'
+  implementation 'com.google.firebase:firebase-analytics:17.5.0'
+  implementation 'com.google.firebase:firebase-ads:19.3.0'
 }
 
 afterEvaluate {

admob/src/include/firebase/admob/types.h

@@ -72,6 +72,8 @@ enum AdMobError {
   /// An attempt has been made to show an ad on an Android Activity that has
   /// no window token (such as one that's not done initializing).
   kAdMobErrorNoWindowToken,
+  /// Fallback error for any unidentified cases.
+  kAdMobErrorUnknown,
 };
 #ifdef INTERNAL_EXPERIMENTAL
 // LINT.ThenChange(//depot_firebase_cpp/admob/client/cpp/src_java/com/google/firebase/admob/internal/cpp/ConstantsHelper.java)

admob/src_java/com/google/firebase/admob/internal/cpp/ConstantsHelper.java

@@ -40,6 +40,8 @@ public final class ConstantsHelper {
   public static final int CALLBACK_ERROR_NO_FILL = 7;
 
   public static final int CALLBACK_ERROR_NO_WINDOW_TOKEN = 8;
+
+  public static final int CALLBACK_ERROR_UNKNOWN = 9;
   // LINT.ThenChange(//depot_firebase_cpp/admob/client/cpp/src/include/firebase/admob/types.h)
 
   /**
@@ -68,6 +70,8 @@ public final class ConstantsHelper {
 
   public static final String CALLBACK_ERROR_MESSAGE_NO_WINDOW_TOKEN =
       "Android Activity does not have a window token.";
+
+  public static final String CALLBACK_ERROR_MESSAGE_UNKNOWN = "Unknown error occurred.";
   // LINT.ThenChange(//depot_firebase_cpp/admob/client/cpp/src/include/firebase/admob/types.h)
 
   /** Types of notifications to send back to the C++ side for listeners updates. */

admob/src_java/com/google/firebase/admob/internal/cpp/InterstitialAdHelper.java

@@ -92,14 +92,22 @@ public void run() {
             int errorCode;
             String errorMessage;
             if (mInterstitial == null) {
-              errorCode = ConstantsHelper.CALLBACK_ERROR_NONE;
-              errorMessage = ConstantsHelper.CALLBACK_ERROR_MESSAGE_NONE;
-              mInterstitial = new InterstitialAd(mActivity);
-              mInterstitial.setAdUnitId(mAdUnitId);
-              mInterstitial.setAdListener(new InterstitialAdListener());
+              try {
+                mInterstitial = new InterstitialAd(mActivity);
+                mInterstitial.setAdUnitId(mAdUnitId);
+                mInterstitial.setAdListener(new InterstitialAdListener());
+                errorCode = ConstantsHelper.CALLBACK_ERROR_NONE;
+                errorMessage = ConstantsHelper.CALLBACK_ERROR_MESSAGE_NONE;
+              } catch (IllegalStateException e) {
+                mInterstitial = null;
+                // This exception can be thrown if the ad unit ID was already set.
+                errorCode = ConstantsHelper.CALLBACK_ERROR_ALREADY_INITIALIZED;
+                errorMessage = ConstantsHelper.CALLBACK_ERROR_MESSAGE_ALREADY_INITIALIZED;
+              }
             } else {
               errorCode = ConstantsHelper.CALLBACK_ERROR_ALREADY_INITIALIZED;
               errorMessage = ConstantsHelper.CALLBACK_ERROR_MESSAGE_ALREADY_INITIALIZED;
+
             }
 
             completeInterstitialAdFutureCallback(callbackDataPtr, errorCode, errorMessage);
@@ -152,7 +160,17 @@ public void run() {
                 mLoadAdCallbackDataPtr = CPP_NULLPTR;
               }
             } else {
-              mInterstitial.loadAd(request);
+              try {
+                mInterstitial.loadAd(request);
+              } catch (IllegalStateException e) {
+                synchronized (mInterstitialLock) {
+                  completeInterstitialAdFutureCallback(
+                      mLoadAdCallbackDataPtr,
+                      ConstantsHelper.CALLBACK_ERROR_UNINITIALIZED,
+                      ConstantsHelper.CALLBACK_ERROR_MESSAGE_UNINITIALIZED);
+                  mLoadAdCallbackDataPtr = CPP_NULLPTR;
+                }
+              }
             }
           }
         });
@@ -222,6 +240,9 @@ public void onAdFailedToLoad(int errorCode) {
           callbackErrorCode = ConstantsHelper.CALLBACK_ERROR_NO_FILL;
           callbackErrorMessage = ConstantsHelper.CALLBACK_ERROR_MESSAGE_NO_FILL;
           break;
+        default:
+          callbackErrorCode = ConstantsHelper.CALLBACK_ERROR_UNKNOWN;
+          callbackErrorMessage = ConstantsHelper.CALLBACK_ERROR_MESSAGE_UNKNOWN;
       }
 
       synchronized (mInterstitialLock) {
@@ -233,11 +254,6 @@ public void onAdFailedToLoad(int errorCode) {
       super.onAdFailedToLoad(errorCode);
     }
 
-    @Override
-    public void onAdLeftApplication() {
-      super.onAdLeftApplication();
-    }
-
     @Override
     public void onAdLoaded() {
       synchronized (mInterstitialLock) {

analytics/ios_headers/FIREventNames.h

@@ -69,6 +69,21 @@ static NSString *const kFIREventAddToCart NS_SWIFT_NAME(AnalyticsEventAddToCart)
 static NSString *const kFIREventAddToWishlist NS_SWIFT_NAME(AnalyticsEventAddToWishlist) =
     @"add_to_wishlist";
 
+/// Ad Impression event. This event signifies when a user sees an ad impression. Note: If you supply
+/// the @c kFIRParameterValue parameter, you must also supply the @c kFIRParameterCurrency parameter
+/// so that revenue metrics can be computed accurately. Params:
+///
+/// <ul>
+///     <li>@c kFIRParameterAdPlatform (NSString) (optional)</li>
+///     <li>@c kFIRParameterAdFormat (NSString) (optional)</li>
+///     <li>@c kFIRParameterAdSource (NSString) (optional)</li>
+///     <li>@c kFIRParameterAdUnitName (NSString) (optional)</li>
+///     <li>@c kFIRParameterCurrency (NSString) (optional)</li>
+///     <li>@c kFIRParameterValue (double as NSNumber) (optional)</li>
+/// </ul>
+static NSString *const kFIREventAdImpression NS_SWIFT_NAME(AnalyticsEventAdImpression) =
+    @"ad_impression";
+
 /// App Open event. By logging this event when an App becomes active, developers can understand how
 /// often users leave and return during the course of a Session. Although Sessions are automatically
 /// reported, this event can provide further clarification around the continuous engagement of

analytics/ios_headers/FIRParameterNames.h

@@ -39,6 +39,17 @@
 static NSString *const kFIRParameterAchievementID NS_SWIFT_NAME(AnalyticsParameterAchievementID) =
     @"achievement_id";
 
+/// The ad format (e.g. Banner, Interstitial, Rewarded, Native, Rewarded Interstitial, Instream).
+/// (NSString).
+/// <pre>
+///     NSDictionary *params = @{
+///       kFIRParameterAdFormat : @"Banner",
+///       // ...
+///     };
+/// </pre>
+static NSString *const kFIRParameterAdFormat NS_SWIFT_NAME(AnalyticsParameterAdFormat) =
+    @"ad_format";
+
 /// Ad Network Click ID (NSString). Used for network-specific click IDs which vary in format.
 /// <pre>
 ///     NSDictionary *params = @{
@@ -49,6 +60,36 @@ static NSString *const kFIRParameterAchievementID NS_SWIFT_NAME(AnalyticsParamet
 static NSString *const kFIRParameterAdNetworkClickID
     NS_SWIFT_NAME(AnalyticsParameterAdNetworkClickID) = @"aclid";
 
+/// The ad platform (e.g. MoPub, IronSource) (NSString).
+/// <pre>
+///     NSDictionary *params = @{
+///       kFIRParameterAdPlatform : @"MoPub",
+///       // ...
+///     };
+/// </pre>
+static NSString *const kFIRParameterAdPlatform NS_SWIFT_NAME(AnalyticsParameterAdPlatform) =
+    @"ad_platform";
+
+/// The ad source (e.g. AdColony) (NSString).
+/// <pre>
+///     NSDictionary *params = @{
+///       kFIRParameterAdSource : @"AdColony",
+///       // ...
+///     };
+/// </pre>
+static NSString *const kFIRParameterAdSource NS_SWIFT_NAME(AnalyticsParameterAdSource) =
+    @"ad_source";
+
+/// The ad unit name (e.g. Banner_03) (NSString).
+/// <pre>
+///     NSDictionary *params = @{
+///       kFIRParameterAdUnitName : @"Banner_03",
+///       // ...
+///     };
+/// </pre>
+static NSString *const kFIRParameterAdUnitName NS_SWIFT_NAME(AnalyticsParameterAdUnitName) =
+    @"ad_unit_name";
+
 /// A product affiliation to designate a supplying company or brick and mortar store location
 /// (NSString). <pre>
 ///     NSDictionary *params = @{

app/app_resources/build.gradle

@@ -46,7 +46,7 @@ android {
 }
 
 dependencies {
-  implementation 'com.google.firebase:firebase-analytics:17.4.4'
+  implementation 'com.google.firebase:firebase-analytics:17.5.0'
 }
 
 afterEvaluate {

app/google_api_resources/build.gradle

@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-  implementation 'com.google.firebase:firebase-analytics:17.4.4'
+  implementation 'com.google.firebase:firebase-analytics:17.5.0'
   implementation project(':app:app_resources')
 }
 

app/invites_resources/build.gradle

@@ -45,7 +45,7 @@ android {
 }
 
 dependencies {
-  implementation 'com.google.firebase:firebase-analytics:17.4.4'
+  implementation 'com.google.firebase:firebase-analytics:17.5.0'
   implementation 'com.google.firebase:firebase-dynamic-links:19.1.0'
   implementation project(':app:app_resources')
 }