react-native-google-mobile-ads 8.0.0 → 8.0.1

package/android/src/main/java/io/invertase/googlemobileads/ReactNativeGoogleMobileAdsFullScreenAdModule.kt

@@ -18,6 +18,7 @@ package io.invertase.googlemobileads
  */
 
 import android.app.Activity
+import android.util.Log
 import android.util.SparseArray
 import com.facebook.react.bridge.*
 import com.google.android.gms.ads.AdLoadCallback
@@ -143,88 +144,104 @@ abstract class ReactNativeGoogleMobileAdsFullScreenAdModule<T>(
     private val adRequestOptions: ReadableMap
   ) : AdLoadCallback<T>() {
     override fun onAdLoaded(ad: T) {
-      val adHelper = ReactNativeGoogleMobileAdsAdHelper(ad)
-      var eventType = ReactNativeGoogleMobileAdsEvent.GOOGLE_MOBILE_ADS_EVENT_LOADED
-      var data: WritableMap? = null
+      try {
+        val adHelper = ReactNativeGoogleMobileAdsAdHelper(ad)
+        var eventType = ReactNativeGoogleMobileAdsEvent.GOOGLE_MOBILE_ADS_EVENT_LOADED
+        var data: WritableMap? = null
 
-      if (ad is RewardedAd || ad is RewardedInterstitialAd) {
-        eventType = ReactNativeGoogleMobileAdsEvent.GOOGLE_MOBILE_ADS_EVENT_REWARDED_LOADED
+        if (ad is RewardedAd || ad is RewardedInterstitialAd) {
+          eventType = ReactNativeGoogleMobileAdsEvent.GOOGLE_MOBILE_ADS_EVENT_REWARDED_LOADED
 
-        val rewardItem = adHelper.rewardItem
-        data = Arguments.createMap()
-        data.putString("type", rewardItem.type)
-        data.putInt("amount", rewardItem.amount)
+          val rewardItem = adHelper.rewardItem
+          data = Arguments.createMap()
+          data.putString("type", rewardItem.type)
+          data.putInt("amount", rewardItem.amount)
 
-        adRequestOptions.getMap("serverSideVerificationOptions")
-          ?.let { serverSideVerificationOptions ->
-            val options =
-              ServerSideVerificationOptions.Builder()
-            serverSideVerificationOptions.getString("userId")?.let {
-              options.setUserId(it)
+          adRequestOptions.getMap("serverSideVerificationOptions")
+            ?.let { serverSideVerificationOptions ->
+              val options =
+                ServerSideVerificationOptions.Builder()
+              serverSideVerificationOptions.getString("userId")?.let {
+                options.setUserId(it)
+              }
+              serverSideVerificationOptions.getString("customData")?.let {
+                options.setCustomData(it)
+              }
+              adHelper.setServerSideVerificationOptions(options.build())
             }
-            serverSideVerificationOptions.getString("customData")?.let {
-              options.setCustomData(it)
-            }
-            adHelper.setServerSideVerificationOptions(options.build())
-          }
-      }
-
-      if (ad is AdManagerInterstitialAd) {
-        adHelper.setAppEventListener { name, eventData ->
-          val payload = Arguments.createMap()
-          payload.putString("name", name)
-          payload.putString("data", eventData)
-          sendAdEvent(
-            GOOGLE_MOBILE_ADS_EVENT_APP_EVENT,
-            requestId,
-            adUnitId,
-            null,
-            payload
-          )
         }
-      }
-
-      val fullScreenContentCallback: FullScreenContentCallback =
-        object : FullScreenContentCallback() {
-          override fun onAdShowedFullScreenContent() {
-            sendAdEvent(ReactNativeGoogleMobileAdsEvent.GOOGLE_MOBILE_ADS_EVENT_OPENED)
-          }
-
-          override fun onAdDismissedFullScreenContent() {
-            sendAdEvent(ReactNativeGoogleMobileAdsEvent.GOOGLE_MOBILE_ADS_EVENT_CLOSED)
-          }
 
-          override fun onAdClicked() {
-            sendAdEvent(ReactNativeGoogleMobileAdsEvent.GOOGLE_MOBILE_ADS_EVENT_CLICKED)
-          }
-
-          override fun onAdImpression() {
-            // Not Implemented Yet
-          }
-
-          private fun sendAdEvent(type: String) {
+        if (ad is AdManagerInterstitialAd) {
+          adHelper.setAppEventListener { name, eventData ->
+            val payload = Arguments.createMap()
+            payload.putString("name", name)
+            payload.putString("data", eventData)
             sendAdEvent(
-              type,
+              GOOGLE_MOBILE_ADS_EVENT_APP_EVENT,
               requestId,
               adUnitId,
               null,
-              null
+              payload
             )
           }
         }
-      adHelper.setFullScreenContentCallback(fullScreenContentCallback)
 
-      adArray.put(
-        requestId,
-        ad
-      )
-      sendAdEvent(
-        eventType,
-        requestId,
-        adUnitId,
-        null,
-        data
-      )
+        val fullScreenContentCallback: FullScreenContentCallback =
+          object : FullScreenContentCallback() {
+            override fun onAdShowedFullScreenContent() {
+              sendAdEvent(ReactNativeGoogleMobileAdsEvent.GOOGLE_MOBILE_ADS_EVENT_OPENED)
+            }
+
+            override fun onAdDismissedFullScreenContent() {
+              sendAdEvent(ReactNativeGoogleMobileAdsEvent.GOOGLE_MOBILE_ADS_EVENT_CLOSED)
+            }
+
+            override fun onAdClicked() {
+              sendAdEvent(ReactNativeGoogleMobileAdsEvent.GOOGLE_MOBILE_ADS_EVENT_CLICKED)
+            }
+
+            override fun onAdImpression() {
+              // Not Implemented Yet
+            }
+
+            private fun sendAdEvent(type: String) {
+              sendAdEvent(
+                type,
+                requestId,
+                adUnitId,
+                null,
+                null
+              )
+            }
+          }
+        adHelper.setFullScreenContentCallback(fullScreenContentCallback)
+
+        adArray.put(
+          requestId,
+          ad
+        )
+        sendAdEvent(
+          eventType,
+          requestId,
+          adUnitId,
+          null,
+          data
+        )
+      } catch (e: Exception) {
+          Log.w("RNGoogleMobileAds", "Unknown error on load")
+          Log.w("RNGoogleMobileAds", e)
+        val error = Arguments.createMap()
+        error.putString("code", "internal")
+        error.putString("message", e.message)
+        sendAdEvent(
+          ReactNativeGoogleMobileAdsEvent.GOOGLE_MOBILE_ADS_EVENT_ERROR,
+          requestId,
+          adUnitId,
+          error,
+          null
+        )
+
+      }
     }
 
     override fun onAdFailedToLoad(loadAdError: LoadAdError) {

package/lib/commonjs/version.js

@@ -5,6 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = void 0;
 // Generated by genversion.
-const version = '8.0.0';
+const version = '8.0.1';
 exports.version = version;
 //# sourceMappingURL=version.js.map

package/lib/commonjs/version.js.map

@@ -1 +1 @@
-{"version":3,"sources":["version.ts"],"names":["version"],"mappings":";;;;;;AAAA;AACO,MAAMA,OAAO,GAAG,OAAhB","sourcesContent":["// Generated by genversion.\nexport const version = '8.0.0';\n"]}
+{"version":3,"sources":["version.ts"],"names":["version"],"mappings":";;;;;;AAAA;AACO,MAAMA,OAAO,GAAG,OAAhB","sourcesContent":["// Generated by genversion.\nexport const version = '8.0.1';\n"]}

package/lib/module/version.js

@@ -1,3 +1,3 @@
 // Generated by genversion.
-export const version = '8.0.0';
+export const version = '8.0.1';
 //# sourceMappingURL=version.js.map

package/lib/module/version.js.map

@@ -1 +1 @@
-{"version":3,"sources":["version.ts"],"names":["version"],"mappings":"AAAA;AACA,OAAO,MAAMA,OAAO,GAAG,OAAhB","sourcesContent":["// Generated by genversion.\nexport const version = '8.0.0';\n"]}
+{"version":3,"sources":["version.ts"],"names":["version"],"mappings":"AAAA;AACA,OAAO,MAAMA,OAAO,GAAG,OAAhB","sourcesContent":["// Generated by genversion.\nexport const version = '8.0.1';\n"]}

package/lib/typescript/index.d.ts

@@ -1,4 +1,4 @@
-export declare const SDK_VERSION = "8.0.0";
+export declare const SDK_VERSION = "8.0.1";
 export { default, MobileAds } from './MobileAds';
 export { AdsConsentDebugGeography } from './AdsConsentDebugGeography';
 export { AdsConsentPurposes } from './AdsConsentPurposes';

package/lib/typescript/version.d.ts

@@ -1 +1 @@
-export declare const version = "8.0.0";
+export declare const version = "8.0.1";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-google-mobile-ads",
-  "version": "8.0.0",
+  "version": "8.0.1",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Google Mobile Ads is an easy way to monetize mobile apps with targeted, in-app advertising.",
   "main": "lib/commonjs/index.js",
@@ -41,7 +41,7 @@
   ],
   "sdkVersions": {
     "ios": {
-      "googleMobileAds": "9.6.0",
+      "googleMobileAds": "9.9.0",
       "googleUmp": "2.0.0"
     },
     "android": {
@@ -49,7 +49,7 @@
       "targetSdk": 30,
       "compileSdk": 31,
       "buildTools": "31.0.0",
-      "googleMobileAds": "21.0.0",
+      "googleMobileAds": "21.1.0",
       "googleUmp": "2.0.0"
     }
   },

package/src/version.ts

@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = '8.0.0';
+export const version = '8.0.1';