@capacitor-community/admob 8.0.1 → 8.1.0

package/ios/Sources/AdMobPlugin/Interstitial/AdInterstitialExecutor.swift

@@ -4,7 +4,9 @@ import GoogleMobileAds
 
 class AdInterstitialExecutor: NSObject, FullScreenContentDelegate {
     weak var plugin: AdMobPlugin?
-    var interstitial: InterstitialAd!
+    private var preparedAds: [String: InterstitialAd] = [:]
+    private var lastPreparedAdId: String?
+    private var currentlyShowingAdId: String?
 
     func prepareInterstitial(_ call: CAPPluginCall, _ request: Request, _ adUnitID: String) {
         InterstitialAd.load(
@@ -12,7 +14,7 @@ class AdInterstitialExecutor: NSObject, FullScreenContentDelegate {
             request: request,
             completionHandler: { (ad, error) in
                 if let error = error {
-                    NSLog("Rewarded ad failed to load with error: \(error.localizedDescription)")
+                    NSLog("Interstitial ad failed to load with error: \(error.localizedDescription)")
                     self.plugin?.notifyListeners(InterstitialAdPluginEvents.FailedToLoad.rawValue, data: [
                         "code": 0,
                         "message": error.localizedDescription
@@ -21,8 +23,23 @@ class AdInterstitialExecutor: NSObject, FullScreenContentDelegate {
                     return
                 }
 
-                self.interstitial = ad
-                self.interstitial.fullScreenContentDelegate = self
+                if let ad = ad {
+                    ad.fullScreenContentDelegate = self
+                    ad.paidEventHandler = { adValue in
+                        let networkName = ad.responseInfo.loadedAdNetworkResponseInfo?.adNetworkClassName ?? ""
+                        let impressionId = ad.responseInfo.responseIdentifier ?? ""
+                        self.plugin?.notifyListeners(InterstitialAdPluginEvents.AdImpression.rawValue, data: [
+                            "adUnitId": adUnitID,
+                            "valueMicros": adValue.value.int64Value,
+                            "currencyCode": adValue.currencyCode,
+                            "precision": adValue.precision.rawValue,
+                            "networkName": networkName,
+                            "impressionId": impressionId
+                        ])
+                    }
+                    self.preparedAds[adUnitID] = ad
+                    self.lastPreparedAdId = adUnitID
+                }
                 self.plugin?.notifyListeners(InterstitialAdPluginEvents.Loaded.rawValue, data: [
                     "adUnitId": adUnitID
                 ])
@@ -34,8 +51,18 @@ class AdInterstitialExecutor: NSObject, FullScreenContentDelegate {
     }
 
     func showInterstitial(_ call: CAPPluginCall) {
+        guard let adId = call.getString("adId") ?? lastPreparedAdId else {
+            call.reject("No ad prepared")
+            return
+        }
+        guard currentlyShowingAdId == nil else {
+            call.reject("An ad is already showing")
+            return
+        }
+
         if let rootViewController = plugin?.getRootVC() {
-            if let ad = self.interstitial {
+            if let ad = preparedAds[adId] {
+                currentlyShowingAdId = adId
                 ad.present(from: rootViewController)
                 call.resolve([:])
             } else {
@@ -46,6 +73,7 @@ class AdInterstitialExecutor: NSObject, FullScreenContentDelegate {
     }
 
     func ad(_ ad: FullScreenPresentingAd, didFailToPresentFullScreenContentWithError error: Error) {
+        removeCurrentlyShowingAd()
         NSLog("InterstitialFullScreenDelegate Ad failed to present full screen content with error \(error.localizedDescription).")
         self.plugin?.notifyListeners(InterstitialAdPluginEvents.FailedToShow.rawValue, data: [
             "code": 0,
@@ -59,7 +87,15 @@ class AdInterstitialExecutor: NSObject, FullScreenContentDelegate {
     }
 
     func adDidDismissFullScreenContent(_ ad: FullScreenPresentingAd) {
+        removeCurrentlyShowingAd()
         NSLog("InterstitialFullScreenDelegate Ad did dismiss full screen content.")
         self.plugin?.notifyListeners(InterstitialAdPluginEvents.Dismissed.rawValue, data: [:])
     }
+
+    private func removeCurrentlyShowingAd() {
+        guard let adId = currentlyShowingAdId else { return }
+        preparedAds.removeValue(forKey: adId)
+        if lastPreparedAdId == adId { lastPreparedAdId = Array(preparedAds.keys).last }
+        currentlyShowingAdId = nil
+    }
 }

package/ios/Sources/AdMobPlugin/Interstitial/InterstitialAdPluginEvents.swift

@@ -4,4 +4,5 @@ public enum InterstitialAdPluginEvents: String {
     case Showed = "interstitialAdShowed"
     case FailedToShow = "interstitialAdFailedToShow"
     case Dismissed = "interstitialAdDismissed"
+    case AdImpression = "interstitialAdImpression"
 }

package/ios/Sources/AdMobPlugin/Rewarded/AdRewardExecutor.swift

@@ -4,7 +4,9 @@ import GoogleMobileAds
 
 class AdRewardExecutor: NSObject, FullScreenContentDelegate {
     weak var plugin: AdMobPlugin?
-    var rewardedAd: RewardedAd!
+    private var preparedAds: [String: RewardedAd] = [:]
+    private var lastPreparedAdId: String?
+    private var currentlyShowingAdId: String?
 
     func prepareRewardVideoAd(_ call: CAPPluginCall, _ request: Request, _ adUnitID: String) {
         RewardedAd.load(
@@ -21,7 +23,10 @@ class AdRewardExecutor: NSObject, FullScreenContentDelegate {
                     return
                 }
 
-                self.rewardedAd = ad
+                guard let ad = ad else {
+                    call.reject("Loading failed")
+                    return
+                }
 
                 if let providedOptions = call.getObject("ssv") {
                     let ssvOptions = ServerSideVerificationOptions()
@@ -36,10 +41,25 @@ class AdRewardExecutor: NSObject, FullScreenContentDelegate {
                         ssvOptions.userIdentifier = userId
                     }
 
-                    self.rewardedAd?.serverSideVerificationOptions = ssvOptions
+                    ad.serverSideVerificationOptions = ssvOptions
+                }
+
+                ad.fullScreenContentDelegate = self
+                ad.paidEventHandler = { adValue in
+                    let networkName = ad.responseInfo.loadedAdNetworkResponseInfo?.adNetworkClassName ?? ""
+                    let impressionId = ad.responseInfo.responseIdentifier ?? ""
+                    self.plugin?.notifyListeners(RewardAdPluginEvents.AdImpression.rawValue, data: [
+                        "adUnitId": adUnitID,
+                        "valueMicros": adValue.value.int64Value,
+                        "currencyCode": adValue.currencyCode,
+                        "precision": adValue.precision.rawValue,
+                        "networkName": networkName,
+                        "impressionId": impressionId
+                    ])
                 }
+                self.preparedAds[adUnitID] = ad
+                self.lastPreparedAdId = adUnitID
 
-                self.rewardedAd?.fullScreenContentDelegate = self
                 self.plugin?.notifyListeners(RewardAdPluginEvents.Loaded.rawValue, data: [
                     "adUnitId": adUnitID
                 ])
@@ -51,8 +71,18 @@ class AdRewardExecutor: NSObject, FullScreenContentDelegate {
     }
 
     func showRewardVideoAd(_ call: CAPPluginCall) {
+        guard let adId = call.getString("adId") ?? lastPreparedAdId else {
+            call.reject("No ad prepared")
+            return
+        }
+        guard currentlyShowingAdId == nil else {
+            call.reject("An ad is already showing")
+            return
+        }
+
         if let rootViewController = plugin?.getRootVC() {
-            if let ad = self.rewardedAd {
+            if let ad = preparedAds[adId] {
+                currentlyShowingAdId = adId
                 ad.present(from: rootViewController,
                            userDidEarnRewardHandler: {
                             let reward = ad.adReward
@@ -67,6 +97,7 @@ class AdRewardExecutor: NSObject, FullScreenContentDelegate {
     }
 
     func ad(_ ad: FullScreenPresentingAd, didFailToPresentFullScreenContentWithError error: Error) {
+        removeCurrentlyShowingAd()
         NSLog("RewardFullScreenDelegate Ad failed to present full screen content with error \(error.localizedDescription).")
         self.plugin?.notifyListeners(RewardAdPluginEvents.FailedToShow.rawValue, data: [
             "code": 0,
@@ -80,7 +111,15 @@ class AdRewardExecutor: NSObject, FullScreenContentDelegate {
     }
 
     func adDidDismissFullScreenContent(_ ad: FullScreenPresentingAd) {
+        removeCurrentlyShowingAd()
         NSLog("RewardFullScreenDelegate Ad did dismiss full screen content.")
         self.plugin?.notifyListeners(RewardAdPluginEvents.Dismissed.rawValue, data: [:])
     }
+
+    private func removeCurrentlyShowingAd() {
+        guard let adId = currentlyShowingAdId else { return }
+        preparedAds.removeValue(forKey: adId)
+        if lastPreparedAdId == adId { lastPreparedAdId = Array(preparedAds.keys).last }
+        currentlyShowingAdId = nil
+    }
 }

package/ios/Sources/AdMobPlugin/Rewarded/RewardAdPluginEvents.swift

@@ -5,4 +5,5 @@ public enum RewardAdPluginEvents: String {
     case FailedToShow = "onRewardedVideoAdFailedToShow"
     case Dismissed = "onRewardedVideoAdDismissed"
     case Rewarded = "onRewardedVideoAdReward"
+    case AdImpression = "onRewardedVideoAdImpression"
 }

package/ios/Sources/AdMobPlugin/RewardedInterstitial/AdRewardInterstitialExecutor.swift

@@ -4,7 +4,9 @@ import GoogleMobileAds
 
 class AdRewardInterstitialExecutor: NSObject, FullScreenContentDelegate {
     weak var plugin: AdMobPlugin?
-    var rewardedInterstitialAd: RewardedInterstitialAd!
+    private var preparedAds: [String: RewardedInterstitialAd] = [:]
+    private var lastPreparedAdId: String?
+    private var currentlyShowingAdId: String?
 
     func prepareRewardInterstitialAd(_ call: CAPPluginCall, _ request: Request, _ adUnitID: String) {
         RewardedInterstitialAd.load(
@@ -12,7 +14,7 @@ class AdRewardInterstitialExecutor: NSObject, FullScreenContentDelegate {
             request: request,
             completionHandler: { (ad, error) in
                 if let error = error {
-                    NSLog("Rewarded ad failed to load with error: \(error.localizedDescription)")
+                    NSLog("Rewarded interstitial ad failed to load with error: \(error.localizedDescription)")
                     self.plugin?.notifyListeners(RewardInterstitialAdPluginEvents.FailedToLoad.rawValue, data: [
                         "code": 0,
                         "message": error.localizedDescription
@@ -21,7 +23,10 @@ class AdRewardInterstitialExecutor: NSObject, FullScreenContentDelegate {
                     return
                 }
 
-                self.rewardedInterstitialAd = ad
+                guard let ad = ad else {
+                    call.reject("Loading failed")
+                    return
+                }
 
                 if let providedOptions = call.getObject("ssv") {
                     let ssvOptions = ServerSideVerificationOptions()
@@ -36,10 +41,25 @@ class AdRewardInterstitialExecutor: NSObject, FullScreenContentDelegate {
                         ssvOptions.userIdentifier = userId
                     }
 
-                    self.rewardedInterstitialAd?.serverSideVerificationOptions = ssvOptions
+                    ad.serverSideVerificationOptions = ssvOptions
+                }
+
+                ad.fullScreenContentDelegate = self
+                ad.paidEventHandler = { adValue in
+                    let networkName = ad.responseInfo.loadedAdNetworkResponseInfo?.adNetworkClassName ?? ""
+                    let impressionId = ad.responseInfo.responseIdentifier ?? ""
+                    self.plugin?.notifyListeners(RewardInterstitialAdPluginEvents.AdImpression.rawValue, data: [
+                        "adUnitId": adUnitID,
+                        "valueMicros": adValue.value.int64Value,
+                        "currencyCode": adValue.currencyCode,
+                        "precision": adValue.precision.rawValue,
+                        "networkName": networkName,
+                        "impressionId": impressionId
+                    ])
                 }
+                self.preparedAds[adUnitID] = ad
+                self.lastPreparedAdId = adUnitID
 
-                self.rewardedInterstitialAd?.fullScreenContentDelegate = self
                 self.plugin?.notifyListeners(RewardInterstitialAdPluginEvents.Loaded.rawValue, data: [
                     "adUnitId": adUnitID
                 ])
@@ -51,8 +71,18 @@ class AdRewardInterstitialExecutor: NSObject, FullScreenContentDelegate {
     }
 
     func showRewardInterstitialAd(_ call: CAPPluginCall) {
+        guard let adId = call.getString("adId") ?? lastPreparedAdId else {
+            call.reject("No ad prepared")
+            return
+        }
+        guard currentlyShowingAdId == nil else {
+            call.reject("An ad is already showing")
+            return
+        }
+
         if let rootViewController = plugin?.getRootVC() {
-            if let ad = self.rewardedInterstitialAd {
+            if let ad = preparedAds[adId] {
+                currentlyShowingAdId = adId
                 ad.present(from: rootViewController,
                            userDidEarnRewardHandler: {
                             let reward = ad.adReward
@@ -67,6 +97,7 @@ class AdRewardInterstitialExecutor: NSObject, FullScreenContentDelegate {
     }
 
     func ad(_ ad: FullScreenPresentingAd, didFailToPresentFullScreenContentWithError error: Error) {
+        removeCurrentlyShowingAd()
         NSLog("RewardFullScreenDelegate Ad failed to present full screen content with error \(error.localizedDescription).")
         self.plugin?.notifyListeners(RewardInterstitialAdPluginEvents.FailedToShow.rawValue, data: [
             "code": 0,
@@ -80,7 +111,15 @@ class AdRewardInterstitialExecutor: NSObject, FullScreenContentDelegate {
     }
 
     func adDidDismissFullScreenContent(_ ad: FullScreenPresentingAd) {
+        removeCurrentlyShowingAd()
         NSLog("RewardFullScreenDelegate Ad did dismiss full screen content.")
         self.plugin?.notifyListeners(RewardInterstitialAdPluginEvents.Dismissed.rawValue, data: [:])
     }
+
+    private func removeCurrentlyShowingAd() {
+        guard let adId = currentlyShowingAdId else { return }
+        preparedAds.removeValue(forKey: adId)
+        if lastPreparedAdId == adId { lastPreparedAdId = Array(preparedAds.keys).last }
+        currentlyShowingAdId = nil
+    }
 }

package/ios/Sources/AdMobPlugin/RewardedInterstitial/RewardInterstitialAdPluginEvents.swift

@@ -5,4 +5,5 @@ public enum RewardInterstitialAdPluginEvents: String {
     case FailedToShow = "onRewardedInterstitialAdFailedToShow"
     case Dismissed = "onRewardedInterstitialAdDismissed"
     case Rewarded = "onRewardedInterstitialAdReward"
+    case AdImpression = "onRewardedInterstitialAdImpression"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capacitor-community/admob",
   "private": false,
-  "version": "8.0.1",
+  "version": "8.1.0",
   "description": "A native plugin for AdMob",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",