fix(admob): improve defense logic to prevent multiple calls (#4849)

invertase · Feb 5, 2021 · 5a71ad7 · 5a71ad7 · vercel · Feb 5, 2021
1 parent 129dc6a
commit 5a71ad7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/packages/admob/lib/ads/InterstitialAd.js b/packages/admob/lib/ads/InterstitialAd.js
@@ -45,11 +45,11 @@ export default class InterstitialAd extends MobileAd {
 
   load() {
     // Prevent multiple load calls
-    if (this._loaded) {
+    if (this._loaded || this._isLoadCalled) {
       return;
     }
 
-    this._loaded = true;
+    this._isLoadCalled = true;
     this._admob.native.interstitialLoad(this._requestId, this._adUnitId, this._requestOptions);
   }
 

diff --git a/packages/admob/lib/ads/MobileAd.js b/packages/admob/lib/ads/MobileAd.js
@@ -28,6 +28,7 @@ export default class MobileAd {
     this._requestOptions = requestOptions;
 
     this._loaded = false;
+    this._isLoadCalled = false;
     this._onAdEventHandler = null;
 
     this._nativeListener = admob.emitter.addListener(
@@ -45,6 +46,7 @@ export default class MobileAd {
 
     if (type === AdEventType.CLOSED || type === RewardedAdEventType.CLOSED) {
       this._loaded = false;
+      this._isLoadCalled = false;
     }
 
     if (this._onAdEventHandler) {

diff --git a/packages/admob/lib/ads/RewardedAd.js b/packages/admob/lib/ads/RewardedAd.js
@@ -45,11 +45,11 @@ export default class RewardedAd extends MobileAd {
 
   load() {
     // Prevent multiple load calls
-    if (this._loaded) {
+    if (this._loaded || this._isLoadCalled) {
       return;
     }
 
-    this._loaded = true;
+    this._isLoadCalled = true;
     this._admob.native.rewardedLoad(this._requestId, this._adUnitId, this._requestOptions);
   }