@capacitor-community/admob 8.0.0 → 8.1.0

package/android/src/main/java/com/getcapacitor/community/admob/interstitial/AdInterstitialExecutor.java

@@ -6,6 +6,7 @@ import androidx.core.util.Supplier;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.community.admob.helpers.AdViewIdHelper;
+import com.getcapacitor.community.admob.helpers.FullscreenPluginCallback;
 import com.getcapacitor.community.admob.helpers.RequestHelper;
 import com.getcapacitor.community.admob.models.AdMobPluginError;
 import com.getcapacitor.community.admob.models.AdOptions;
@@ -13,10 +14,13 @@ import com.getcapacitor.community.admob.models.Executor;
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.interstitial.InterstitialAd;
 import com.google.android.gms.common.util.BiConsumer;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 public class AdInterstitialExecutor extends Executor {
 
-    public static InterstitialAd interstitialAd;
+    public static final Map<String, InterstitialAd> preparedAds = new LinkedHashMap<>();
+    public static String lastPreparedAdId;
 
     InterstitialAdCallbackAndListeners adCallbackAndListeners;
 
@@ -54,7 +58,11 @@ public class AdInterstitialExecutor extends Executor {
     }
 
     public void showInterstitial(final PluginCall call, BiConsumer<String, JSObject> notifyListenersFunction) {
-        if (interstitialAd == null) {
+        String requestedAdId = call.getString("adId");
+        String adId = requestedAdId != null ? requestedAdId : lastPreparedAdId;
+        InterstitialAd ad = adId != null ? preparedAds.get(adId) : null;
+
+        if (ad == null) {
             String errorMessage = "No Interstitial can be shown. It was not prepared or maybe it failed to be prepared.";
             call.reject(errorMessage);
             AdMobPluginError errorObject = new AdMobPluginError(-1, errorMessage);
@@ -62,11 +70,21 @@ public class AdInterstitialExecutor extends Executor {
             return;
         }
 
+        final InterstitialAd adToShow = ad;
         activitySupplier
             .get()
             .runOnUiThread(() -> {
                 try {
-                    interstitialAd.show(activitySupplier.get());
+                    adToShow.setFullScreenContentCallback(
+                        new FullscreenPluginCallback(InterstitialAdPluginPluginEvent.INSTANCE, notifyListenersFunction, () -> {
+                            preparedAds.remove(adId);
+                            if (adId != null && adId.equals(lastPreparedAdId)) {
+                                lastPreparedAdId = null;
+                                for (String remainingAdId : preparedAds.keySet()) lastPreparedAdId = remainingAdId;
+                            }
+                        })
+                    );
+                    adToShow.show(activitySupplier.get());
                     call.resolve();
                 } catch (Exception ex) {
                     call.reject(ex.getLocalizedMessage(), ex);

package/android/src/main/java/com/getcapacitor/community/admob/interstitial/InterstitialAdCallbackAndListeners.kt

@@ -4,6 +4,7 @@ import com.getcapacitor.JSObject
 import com.getcapacitor.PluginCall
 import com.getcapacitor.community.admob.helpers.FullscreenPluginCallback
 import com.getcapacitor.community.admob.models.AdMobPluginError
+import com.getcapacitor.community.admob.models.AdMobRevenueData
 import com.google.android.gms.ads.LoadAdError
 import com.google.android.gms.ads.interstitial.InterstitialAd
 import com.google.android.gms.ads.interstitial.InterstitialAdLoadCallback
@@ -20,7 +21,16 @@ object InterstitialAdCallbackAndListeners {
                 ad.fullScreenContentCallback = FullscreenPluginCallback(InterstitialAdPluginPluginEvent, notifyListenersFunction)
                 ad.setImmersiveMode(immersiveMode ?: false)
 
-                AdInterstitialExecutor.interstitialAd = ad
+                ad.setOnPaidEventListener { adValue ->
+                    val responseInfo = ad.responseInfo
+                    val networkName = responseInfo?.mediationAdapterClassName ?: ""
+                    val impressionId = responseInfo?.responseId ?: ""
+                    val revenueData = AdMobRevenueData(adValue, ad.adUnitId, networkName, impressionId)
+                    notifyListenersFunction.accept(InterstitialAdPluginPluginEvent.AdImpression, revenueData)
+                }
+
+                AdInterstitialExecutor.preparedAds[ad.adUnitId] = ad
+                AdInterstitialExecutor.lastPreparedAdId = ad.adUnitId
 
                 val adInfo = JSObject()
                 adInfo.put("adUnitId", ad.adUnitId)
@@ -37,4 +47,4 @@ object InterstitialAdCallbackAndListeners {
             }
         }
     }
-}
+}

package/android/src/main/java/com/getcapacitor/community/admob/interstitial/InterstitialAdPluginPluginEvent.kt

@@ -8,4 +8,5 @@ object InterstitialAdPluginPluginEvent: LoadPluginEventNames {
     override val Showed = "interstitialAdShowed"
     override val FailedToShow = "interstitialAdFailedToShow"
     override val Dismissed = "interstitialAdDismissed"
+    const val AdImpression = "interstitialAdImpression"
 }

package/android/src/main/java/com/getcapacitor/community/admob/models/AdMobRevenueData.kt

@@ -0,0 +1,15 @@
+package com.getcapacitor.community.admob.models
+
+import com.getcapacitor.JSObject
+import com.google.android.gms.ads.AdValue
+
+class AdMobRevenueData(adValue: AdValue, adUnitId: String, networkName: String, impressionId: String) : JSObject() {
+    init {
+        put("adUnitId", adUnitId)
+        put("valueMicros", adValue.valueMicros)
+        put("currencyCode", adValue.currencyCode)
+        put("precision", adValue.precisionType)
+        put("networkName", networkName)
+        put("impressionId", impressionId)
+    }
+}

package/android/src/main/java/com/getcapacitor/community/admob/models/AdOptions.java

@@ -28,6 +28,7 @@ public abstract class AdOptions {
     public static final String INTERSTITIAL_TESTER_ID = "ca-app-pub-3940256099942544/1033173712";
     public static final String REWARD_VIDEO_TESTER_ID = "ca-app-pub-3940256099942544/5224354917";
     public static final String REWARD_INTERSTITIAL_TESTER_ID = "ca-app-pub-3940256099942544/5354046379";
+    public static final String APP_OPEN_TESTER_ID = "ca-app-pub-3940256099942544/9257395921";
 
     /**
      * The position of the ad, it can be TOP_CENTER,
@@ -148,6 +149,15 @@ public abstract class AdOptions {
             };
         }
 
+        public AdOptions createAppOpenOptions(PluginCall call) {
+            return new AdOptions(call) {
+                @Override
+                public String getTestingId() {
+                    return AdOptions.APP_OPEN_TESTER_ID;
+                }
+            };
+        }
+
         public AdOptions createGenericOptions(PluginCall call, final String testingID) {
             return new AdOptions(call) {
                 @Override

package/android/src/main/java/com/getcapacitor/community/admob/rewarded/AdRewardExecutor.java

@@ -7,6 +7,7 @@ import com.getcapacitor.JSObject;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
 import com.getcapacitor.community.admob.helpers.AdViewIdHelper;
+import com.getcapacitor.community.admob.helpers.FullscreenPluginCallback;
 import com.getcapacitor.community.admob.helpers.RequestHelper;
 import com.getcapacitor.community.admob.models.AdMobPluginError;
 import com.getcapacitor.community.admob.models.AdOptions;
@@ -14,10 +15,13 @@ import com.getcapacitor.community.admob.models.Executor;
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.rewarded.RewardedAd;
 import com.google.android.gms.common.util.BiConsumer;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 public class AdRewardExecutor extends Executor {
 
-    public static RewardedAd mRewardedAd;
+    public static final Map<String, RewardedAd> preparedAds = new LinkedHashMap<>();
+    public static String lastPreparedAdId;
 
     public AdRewardExecutor(
         Supplier<Context> contextSupplier,
@@ -52,7 +56,11 @@ public class AdRewardExecutor extends Executor {
 
     @PluginMethod
     public void showRewardVideoAd(final PluginCall call, BiConsumer<String, JSObject> notifyListenersFunction) {
-        if (mRewardedAd == null) {
+        String requestedAdId = call.getString("adId");
+        String adId = requestedAdId != null ? requestedAdId : lastPreparedAdId;
+        RewardedAd ad = adId != null ? preparedAds.get(adId) : null;
+
+        if (ad == null) {
             String errorMessage = "No Reward Video Ad can be shown. It was not prepared or maybe it failed to be prepared.";
             call.reject(errorMessage);
             AdMobPluginError errorObject = new AdMobPluginError(-1, errorMessage);
@@ -64,7 +72,16 @@ public class AdRewardExecutor extends Executor {
             activitySupplier
                 .get()
                 .runOnUiThread(() -> {
-                    mRewardedAd.show(
+                    ad.setFullScreenContentCallback(
+                        new FullscreenPluginCallback(RewardAdPluginEvents.INSTANCE, notifyListenersFunction, () -> {
+                            preparedAds.remove(adId);
+                            if (adId != null && adId.equals(lastPreparedAdId)) {
+                                lastPreparedAdId = null;
+                                for (String remainingAdId : preparedAds.keySet()) lastPreparedAdId = remainingAdId;
+                            }
+                        })
+                    );
+                    ad.show(
                         activitySupplier.get(),
                         RewardedAdCallbackAndListeners.INSTANCE.getOnUserEarnedRewardListener(call, notifyListenersFunction)
                     );

package/android/src/main/java/com/getcapacitor/community/admob/rewarded/RewardAdPluginEvents.kt

@@ -9,4 +9,5 @@ object RewardAdPluginEvents: LoadPluginEventNames {
     override val Showed = "onRewardedVideoAdShowed"
     override val FailedToShow = "onRewardedVideoAdFailedToShow"
     override val Dismissed = "onRewardedVideoAdDismissed"
+    const val AdImpression = "onRewardedVideoAdImpression"
 }

package/android/src/main/java/com/getcapacitor/community/admob/rewarded/RewardedAdCallbackAndListeners.kt

@@ -4,6 +4,7 @@ import com.getcapacitor.JSObject
 import com.getcapacitor.PluginCall
 import com.getcapacitor.community.admob.helpers.FullscreenPluginCallback
 import com.getcapacitor.community.admob.models.AdMobPluginError
+import com.getcapacitor.community.admob.models.AdMobRevenueData
 import com.getcapacitor.community.admob.models.AdOptions
 import com.google.android.gms.ads.LoadAdError
 import com.google.android.gms.ads.OnUserEarnedRewardListener
@@ -30,11 +31,17 @@ object RewardedAdCallbackAndListeners {
             override fun onAdLoaded(ad: RewardedAd) {
                 val immersiveMode = call.getBoolean("immersiveMode")
                 ad.setImmersiveMode(immersiveMode ?: false)
-
-                AdRewardExecutor.mRewardedAd = ad
-                AdRewardExecutor.mRewardedAd.fullScreenContentCallback = FullscreenPluginCallback(
+                ad.fullScreenContentCallback = FullscreenPluginCallback(
                         RewardAdPluginEvents, notifyListenersFunction)
 
+                ad.setOnPaidEventListener { adValue ->
+                    val responseInfo = ad.responseInfo
+                    val networkName = responseInfo?.mediationAdapterClassName ?: ""
+                    val impressionId = responseInfo?.responseId ?: ""
+                    val revenueData = AdMobRevenueData(adValue, ad.adUnitId, networkName, impressionId)
+                    notifyListenersFunction.accept(RewardAdPluginEvents.AdImpression, revenueData)
+                }
+
                 if(adOptions.ssvInfo.hasInfo){
                     val ssvOptions = ServerSideVerificationOptions.Builder()
                     adOptions.ssvInfo.customData?.let {
@@ -44,9 +51,12 @@ object RewardedAdCallbackAndListeners {
                     adOptions.ssvInfo.userId?.let {
                         ssvOptions.setUserId(it)
                     }
-                    AdRewardExecutor.mRewardedAd.setServerSideVerificationOptions(ssvOptions.build())
+                    ad.setServerSideVerificationOptions(ssvOptions.build())
                 }
 
+                AdRewardExecutor.preparedAds[ad.adUnitId] = ad
+                AdRewardExecutor.lastPreparedAdId = ad.adUnitId
+
                 val adInfo = JSObject()
                 adInfo.put("adUnitId", ad.adUnitId)
                 call.resolve(adInfo)

package/android/src/main/java/com/getcapacitor/community/admob/rewardedinterstitial/AdRewardInterstitialExecutor.java

@@ -7,6 +7,7 @@ import com.getcapacitor.JSObject;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
 import com.getcapacitor.community.admob.helpers.AdViewIdHelper;
+import com.getcapacitor.community.admob.helpers.FullscreenPluginCallback;
 import com.getcapacitor.community.admob.helpers.RequestHelper;
 import com.getcapacitor.community.admob.models.AdMobPluginError;
 import com.getcapacitor.community.admob.models.AdOptions;
@@ -14,10 +15,13 @@ import com.getcapacitor.community.admob.models.Executor;
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.rewardedinterstitial.RewardedInterstitialAd;
 import com.google.android.gms.common.util.BiConsumer;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 public class AdRewardInterstitialExecutor extends Executor {
 
-    public static RewardedInterstitialAd mRewardedInterstitialAd;
+    public static final Map<String, RewardedInterstitialAd> preparedAds = new LinkedHashMap<>();
+    public static String lastPreparedAdId;
 
     public AdRewardInterstitialExecutor(
         Supplier<Context> contextSupplier,
@@ -56,7 +60,11 @@ public class AdRewardInterstitialExecutor extends Executor {
 
     @PluginMethod
     public void showRewardInterstitialAd(final PluginCall call, BiConsumer<String, JSObject> notifyListenersFunction) {
-        if (mRewardedInterstitialAd == null) {
+        String requestedAdId = call.getString("adId");
+        String adId = requestedAdId != null ? requestedAdId : lastPreparedAdId;
+        RewardedInterstitialAd ad = adId != null ? preparedAds.get(adId) : null;
+
+        if (ad == null) {
             String errorMessage = "No Reward Interstitial Video Ad can be shown. It was not prepared or maybe it failed to be prepared.";
             call.reject(errorMessage);
             AdMobPluginError errorObject = new AdMobPluginError(-1, errorMessage);
@@ -68,7 +76,16 @@ public class AdRewardInterstitialExecutor extends Executor {
             activitySupplier
                 .get()
                 .runOnUiThread(() -> {
-                    mRewardedInterstitialAd.show(
+                    ad.setFullScreenContentCallback(
+                        new FullscreenPluginCallback(RewardInterstitialAdPluginEvents.INSTANCE, notifyListenersFunction, () -> {
+                            preparedAds.remove(adId);
+                            if (adId != null && adId.equals(lastPreparedAdId)) {
+                                lastPreparedAdId = null;
+                                for (String remainingAdId : preparedAds.keySet()) lastPreparedAdId = remainingAdId;
+                            }
+                        })
+                    );
+                    ad.show(
                         activitySupplier.get(),
                         RewardedInterstitialAdCallbackAndListeners.INSTANCE.getOnUserEarnedRewardListener(call, notifyListenersFunction)
                     );

package/android/src/main/java/com/getcapacitor/community/admob/rewardedinterstitial/RewardInterstitialAdPluginEvents.kt

@@ -9,4 +9,5 @@ object RewardInterstitialAdPluginEvents: LoadPluginEventNames {
     override val Showed = "onRewardedInterstitialAdShowed"
     override val FailedToShow = "onRewardedInterstitialAdFailedToShow"
     override val Dismissed = "onRewardedInterstitialAdDismissed"
+    const val AdImpression = "onRewardedInterstitialAdImpression"
 }

package/android/src/main/java/com/getcapacitor/community/admob/rewardedinterstitial/RewardedInterstitialAdCallbackAndListeners.kt

@@ -4,6 +4,7 @@ import com.getcapacitor.JSObject
 import com.getcapacitor.PluginCall
 import com.getcapacitor.community.admob.helpers.FullscreenPluginCallback
 import com.getcapacitor.community.admob.models.AdMobPluginError
+import com.getcapacitor.community.admob.models.AdMobRevenueData
 import com.getcapacitor.community.admob.models.AdOptions
 import com.google.android.gms.ads.LoadAdError
 import com.google.android.gms.ads.OnUserEarnedRewardListener
@@ -27,10 +28,20 @@ object RewardedInterstitialAdCallbackAndListeners {
     fun getRewardedAdLoadCallback(call: PluginCall, notifyListenersFunction: BiConsumer<String, JSObject>, adOptions: AdOptions): RewardedInterstitialAdLoadCallback {
         return object : RewardedInterstitialAdLoadCallback() {
             override fun onAdLoaded(ad: RewardedInterstitialAd) {
-                AdRewardInterstitialExecutor.mRewardedInterstitialAd = ad
-                AdRewardInterstitialExecutor.mRewardedInterstitialAd.fullScreenContentCallback = FullscreenPluginCallback(
+                ad.fullScreenContentCallback = FullscreenPluginCallback(
                         RewardInterstitialAdPluginEvents, notifyListenersFunction)
 
+                ad.setOnPaidEventListener { adValue ->
+                    val responseInfo = ad.responseInfo
+                    val networkName = responseInfo?.mediationAdapterClassName ?: ""
+                    val impressionId = responseInfo?.responseId ?: ""
+                    val revenueData = AdMobRevenueData(adValue, ad.adUnitId, networkName, impressionId)
+                    notifyListenersFunction.accept(RewardInterstitialAdPluginEvents.AdImpression, revenueData)
+                }
+
+                AdRewardInterstitialExecutor.preparedAds[ad.adUnitId] = ad
+                AdRewardInterstitialExecutor.lastPreparedAdId = ad.adUnitId
+
                 val adInfo = JSObject()
                 adInfo.put("adUnitId", ad.adUnitId)
                 call.resolve(adInfo)
@@ -47,4 +58,4 @@ object RewardedInterstitialAdCallbackAndListeners {
         }
     }
 
-}
+}