@capgo/capacitor-admob 8.0.15 → 8.1.1

package/CapgoCapacitorAdmob.podspec

@@ -13,6 +13,6 @@ Pod::Spec.new do |s|
   s.source_files = 'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}'
   s.ios.deployment_target = '15.0'
   s.dependency 'Capacitor'
-  s.dependency 'Google-Mobile-Ads-SDK', '~> 11.0'
+  s.dependency 'Google-Mobile-Ads-SDK', '~> 13.1'
   s.swift_version = '5.1'
 end

package/Package.swift

@@ -11,7 +11,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "8.0.0"),
-        .package(url: "https://github.com/googleads/swift-package-manager-google-mobile-ads.git", from: "11.13.0")
+        .package(url: "https://github.com/googleads/swift-package-manager-google-mobile-ads.git", from: "13.2.0")
     ],
     targets: [
         .target(

package/README.md

@@ -7,6 +7,8 @@
 </div>
 AdMob SDK bridge for Capacitor apps
 
+Android now uses the Google Mobile Ads Next Gen SDK, and iOS is aligned to Google Mobile Ads SDK `13.1.x`, while preserving the existing Capacitor-facing API.
+
 ## Documentation
 
 The most complete doc is available here: https://capgo.app/docs/plugins/admob/

package/android/build.gradle

@@ -5,13 +5,13 @@ ext {
     androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.1'
     androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.3.0'
     androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.7.0'
-    googlePlayServicesAdsVersion = project.hasProperty('googlePlayServicesAdsVersion') ? rootProject.ext.googlePlayServicesAdsVersion : '23.0.0'
+    // Next Gen is currently published as a beta artifact; apps can override this property when pinning a newer vetted release.
+    googleMobileAdsNextGenVersion = project.hasProperty('googleMobileAdsNextGenVersion') ? rootProject.ext.googleMobileAdsNextGenVersion : '0.25.0-beta01'
 }
 
 buildscript {
     repositories {
         google()
-        jcenter()
         mavenCentral()
     }
     dependencies {
@@ -56,7 +56,6 @@ kotlin {
 
 repositories {
     google()
-    jcenter()
     mavenCentral()
 }
 
@@ -69,5 +68,5 @@ dependencies {
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
-    implementation "com.google.android.gms:play-services-ads:$googlePlayServicesAdsVersion"
+    implementation "com.google.android.libraries.ads.mobile.sdk:ads-mobile-sdk:$googleMobileAdsNextGenVersion"
 }

package/android/src/main/kotlin/admob/plus/capacitor/AdMobPlusPlugin.kt

@@ -7,24 +7,30 @@ import admob.plus.capacitor.ads.RewardedInterstitial
 import admob.plus.core.GenericAd
 import admob.plus.core.Helper
 import android.app.Activity
+import android.content.pm.PackageManager
 import com.getcapacitor.JSObject
 import com.getcapacitor.Plugin
 import com.getcapacitor.PluginCall
 import com.getcapacitor.PluginMethod
 import com.getcapacitor.annotation.CapacitorPlugin
-import com.google.android.gms.ads.MobileAds
-import com.google.android.gms.ads.initialization.InitializationStatus
+import com.google.android.libraries.ads.mobile.sdk.MobileAds
+import com.google.android.libraries.ads.mobile.sdk.common.RequestConfiguration
+import com.google.android.libraries.ads.mobile.sdk.initialization.InitializationConfig
 import org.json.JSONException
 import org.json.JSONObject
 
 @CapacitorPlugin(name = "AdMobPlus")
 class AdMobPlusPlugin : Plugin(), Helper.Adapter {
-    private val pluginVersion = "7.4.1"
+    private val pluginVersion = "8.0.15"
     private var helper: Helper? = null
+    @Volatile
+    private var mobileAdsInitialized = false
+    private var requestConfigurationOverride: RequestConfiguration? = null
+
     override fun load() {
         super.load()
         helper = Helper(this)
-        ExecuteContext.Companion.plugin = this
+        ExecuteContext.plugin = this
     }
 
     @PluginMethod
@@ -47,7 +53,22 @@ class AdMobPlusPlugin : Plugin(), Helper.Adapter {
 
     @PluginMethod
     fun start(call: PluginCall) {
-        MobileAds.initialize(context) { status: InitializationStatus? ->
+        if (mobileAdsInitialized) {
+            call.resolve()
+            return
+        }
+
+        val appId = getAppIdFromManifest()
+        if (appId == null) {
+            call.reject("AdMob App ID missing")
+            return
+        }
+
+        val initializationConfigBuilder = InitializationConfig.Builder(appId)
+        requestConfigurationOverride?.let(initializationConfigBuilder::setRequestConfiguration)
+
+        MobileAds.initialize(context, initializationConfigBuilder.build()) {
+            mobileAdsInitialized = true
             helper!!.configForTestLab()
             call.resolve()
         }
@@ -56,33 +77,44 @@ class AdMobPlusPlugin : Plugin(), Helper.Adapter {
     @PluginMethod
     fun configure(call: PluginCall) {
         val ctx = ExecuteContext(call)
+        if (rejectIfNotInitialized { ctx.reject(it) }) {
+            return
+        }
         ctx.configure(helper!!)
     }
 
     @PluginMethod
     fun configRequest(call: PluginCall) {
         val ctx = ExecuteContext(call)
-        MobileAds.setRequestConfiguration(ctx.optRequestConfiguration())
-        helper!!.configForTestLab()
+        val requestConfiguration = ctx.optRequestConfiguration()
+        requestConfigurationOverride = requestConfiguration
+        if (mobileAdsInitialized) {
+            MobileAds.setRequestConfiguration(requestConfiguration)
+            helper!!.configForTestLab()
+        }
         ctx.resolve()
     }
 
     @PluginMethod
     fun adCreate(call: PluginCall) {
         val ctx = ExecuteContext(call)
-        getBridge().executeOnMainThread {
+        bridge.executeOnMainThread {
             val adClass = ctx.optString("cls")
             if (adClass == null) {
                 ctx.reject("ad cls is missing")
             } else {
-                when (adClass) {
+                val created = when (adClass) {
                     "BannerAd" -> Banner(ctx)
                     "InterstitialAd" -> Interstitial(ctx)
                     "RewardedAd" -> Rewarded(ctx)
                     "RewardedInterstitialAd" -> RewardedInterstitial(ctx)
-                    else -> ctx.reject("ad cls is not supported: $adClass")
+                    else -> null
+                }
+                if (created == null) {
+                    ctx.reject("ad cls is not supported: $adClass")
+                } else {
+                    ctx.resolve()
                 }
-                ctx.resolve()
             }
         }
     }
@@ -90,7 +122,7 @@ class AdMobPlusPlugin : Plugin(), Helper.Adapter {
     @PluginMethod
     fun adIsLoaded(call: PluginCall) {
         val ctx = ExecuteContext(call)
-        getBridge().executeOnMainThread {
+        bridge.executeOnMainThread {
             val ad = ctx.optAdOrError() as GenericAd?
             if (ad != null) {
                 ctx.resolve(ad.isLoaded)
@@ -101,7 +133,10 @@ class AdMobPlusPlugin : Plugin(), Helper.Adapter {
     @PluginMethod
     fun adLoad(call: PluginCall) {
         val ctx = ExecuteContext(call)
-        getBridge().executeOnMainThread {
+        if (rejectIfNotInitialized { ctx.reject(it) }) {
+            return
+        }
+        bridge.executeOnMainThread {
             val ad = ctx.optAdOrError() as GenericAd?
             ad?.load(ctx)
         }
@@ -110,7 +145,10 @@ class AdMobPlusPlugin : Plugin(), Helper.Adapter {
     @PluginMethod
     fun adShow(call: PluginCall) {
         val ctx = ExecuteContext(call)
-        getBridge().executeOnMainThread {
+        if (rejectIfNotInitialized { ctx.reject(it) }) {
+            return
+        }
+        bridge.executeOnMainThread {
             val ad = ctx.optAdOrError() as GenericAd?
             if (ad != null) {
                 if (ad.isLoaded) {
@@ -125,7 +163,7 @@ class AdMobPlusPlugin : Plugin(), Helper.Adapter {
     @PluginMethod
     fun adHide(call: PluginCall) {
         val ctx = ExecuteContext(call)
-        getBridge().executeOnMainThread {
+        bridge.executeOnMainThread {
             val ad = ctx.optAdOrError() as GenericAd?
             ad?.hide(ctx)
         }
@@ -139,11 +177,13 @@ class AdMobPlusPlugin : Plugin(), Helper.Adapter {
         get() = getActivity()
 
     override fun emit(eventName: String?, data: Map<String?, Any?>?) {
-        try {
-            emit(eventName, JSObject.fromJSONObject(JSONObject(data)))
-        } catch (e: JSONException) {
-            e.printStackTrace()
+        val payload = JSObject()
+        data?.forEach { (key, value) ->
+            if (key != null) {
+                payload.put(key, value)
+            }
         }
+        emit(eventName, payload)
     }
 
     @PluginMethod
@@ -156,4 +196,31 @@ class AdMobPlusPlugin : Plugin(), Helper.Adapter {
             call.reject("Could not get plugin version", e)
         }
     }
+
+    private fun getAppIdFromManifest(): String? {
+        return try {
+            val appContext = context.applicationContext
+            val applicationInfo = appContext.packageManager.getApplicationInfo(
+                appContext.packageName,
+                PackageManager.GET_META_DATA
+            )
+            val metaData = applicationInfo.metaData ?: return null
+            metaData.getString(ADMOB_APP_ID_KEY)?.takeIf { it.isNotBlank() }
+                ?: metaData.getInt(ADMOB_APP_ID_KEY).takeIf { it != 0 }?.let(appContext::getString)
+        } catch (_: Exception) {
+            null
+        }
+    }
+
+    private fun rejectIfNotInitialized(reject: (String) -> Unit): Boolean {
+        if (mobileAdsInitialized) {
+            return false
+        }
+        reject("AdMob is not initialized. Call start() and wait for it to resolve.")
+        return true
+    }
+
+    private companion object {
+        private const val ADMOB_APP_ID_KEY = "com.google.android.gms.ads.APPLICATION_ID"
+    }
 }

package/android/src/main/kotlin/admob/plus/capacitor/ExecuteContext.kt

@@ -64,7 +64,7 @@ class ExecuteContext internal constructor(private val call: PluginCall) : Contex
         return call.getString(name)
     }
 
-    override fun optStringList(name: String): List<String?> {
+    override fun optStringList(name: String): List<String> {
         return jsonArray2stringList(call.getArray(name))
     }
 
@@ -77,12 +77,9 @@ class ExecuteContext internal constructor(private val call: PluginCall) : Contex
     }
 
     override fun resolve(data: Boolean) {
-        try {
-            call.resolve(JSObject("true"))
-        } catch (e: JSONException) {
-            e.printStackTrace()
-            reject()
-        }
+        val result = JSObject()
+        result.put("value", data)
+        call.resolve(result)
     }
 
     override fun reject(msg: String?) {

package/android/src/main/kotlin/admob/plus/capacitor/ads/Banner.kt

@@ -8,63 +8,74 @@ import admob.plus.core.GenericAd
 import admob.plus.core.Helper.Companion.getParentView
 import admob.plus.core.Helper.Companion.removeFromParentView
 import android.annotation.SuppressLint
+import android.util.DisplayMetrics
 import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
 import android.webkit.WebView
 import android.widget.LinearLayout
-import com.google.android.gms.ads.AdListener
-import com.google.android.gms.ads.AdSize
-import com.google.android.gms.ads.AdView
-import com.google.android.gms.ads.LoadAdError
+import com.google.android.libraries.ads.mobile.sdk.banner.AdSize
+import com.google.android.libraries.ads.mobile.sdk.banner.AdView
+import com.google.android.libraries.ads.mobile.sdk.banner.BannerAd
+import com.google.android.libraries.ads.mobile.sdk.banner.BannerAdEventCallback
+import com.google.android.libraries.ads.mobile.sdk.common.AdLoadCallback
 import java.util.Objects
 
 class Banner(ctx: ExecuteContext) : AdBase(ctx), GenericAd {
-    private val adSize: AdSize
     private val gravity: Int
     private var adView: AdView? = null
+    private var loaded = false
 
     init {
-        adSize = AdSize.SMART_BANNER
         gravity = if ("top" == ctx.optPosition()) Gravity.TOP else Gravity.BOTTOM
     }
 
     override val isLoaded: Boolean
-        get() = adView != null
+        get() = loaded
 
     override fun load(ctx: Context?) {
+        val requestContext = ctx ?: return
+
         if (adView == null) {
             adView = AdView(activity)
-            adView!!.adUnitId = adUnitId
-            adView!!.setAdSize(adSize)
-            adView!!.adListener = object : AdListener() {
-                override fun onAdClicked() {
-                    emit(Generated.Events.BANNER_CLICK)
-                }
+        }
 
-                override fun onAdClosed() {
-                    emit(Generated.Events.BANNER_CLOSE)
-                }
+        loaded = false
+        val adSize = resolveAdSize()
 
-                override fun onAdFailedToLoad(error: LoadAdError) {
-                    emit(Generated.Events.BANNER_LOAD_FAIL, error)
-                }
+        adView!!.loadAd(
+            requestContext.optBannerAdRequest(adUnitId, adSize, null),
+            object : AdLoadCallback<BannerAd> {
+                override fun onAdLoaded(bannerAd: BannerAd) {
+                    loaded = true
+                    bannerAd.adEventCallback = object : BannerAdEventCallback {
+                        override fun onAdClicked() {
+                            emit(Generated.Events.BANNER_CLICK)
+                        }
 
-                override fun onAdImpression() {
-                    emit(Generated.Events.BANNER_IMPRESSION)
-                }
+                        override fun onAdDismissedFullScreenContent() {
+                            emit(Generated.Events.BANNER_CLOSE)
+                        }
+
+                        override fun onAdImpression() {
+                            emit(Generated.Events.BANNER_IMPRESSION)
+                        }
 
-                override fun onAdLoaded() {
+                        override fun onAdShowedFullScreenContent() {
+                            emit(Generated.Events.BANNER_OPEN)
+                        }
+                    }
                     emit(Generated.Events.BANNER_LOAD)
+                    requestContext.resolve()
                 }
 
-                override fun onAdOpened() {
-                    emit(Generated.Events.BANNER_OPEN)
+                override fun onAdFailedToLoad(loadAdError: com.google.android.libraries.ads.mobile.sdk.common.LoadAdError) {
+                    loaded = false
+                    emit(Generated.Events.BANNER_LOAD_FAIL, loadAdError)
+                    requestContext.reject(loadAdError)
                 }
             }
-        }
-        adView!!.loadAd(ctx!!.optAdRequest())
-        ctx.resolve()
+        )
     }
 
     override fun show(ctx: Context?) {
@@ -73,7 +84,6 @@ class Banner(ctx: ExecuteContext) : AdBase(ctx), GenericAd {
         if (getParentView(adView) == null) {
             addBannerView(ExecuteContext.Companion.plugin, adView)
         } else if (adView!!.visibility == View.GONE) {
-            adView!!.resume()
             adView!!.visibility = View.VISIBLE
         } else {
             val wvParentView = getParentView(webView)
@@ -88,7 +98,6 @@ class Banner(ctx: ExecuteContext) : AdBase(ctx), GenericAd {
 
     override fun hide(ctx: Context?) {
         if (adView != null) {
-            adView!!.pause()
             adView!!.visibility = View.GONE
         }
         ctx!!.resolve()
@@ -96,6 +105,7 @@ class Banner(ctx: ExecuteContext) : AdBase(ctx), GenericAd {
 
     override fun destroy() {
         if (adView != null) {
+            loaded = false
             adView!!.destroy()
             adView = null
         }
@@ -108,7 +118,7 @@ class Banner(ctx: ExecuteContext) : AdBase(ctx), GenericAd {
         if (parentView == null) {
             parentView = LinearLayout(webView.context)
         }
-        if (wvParentView != null && wvParentView !== parentView) {
+        if (wvParentView !== parentView) {
             if (getParentView(parentView) != null) {
                 parentView!!.removeAllViews()
                 removeFromParentView(parentView)
@@ -141,6 +151,12 @@ class Banner(ctx: ExecuteContext) : AdBase(ctx), GenericAd {
         parentView!!.requestFocus()
     }
 
+    private fun resolveAdSize(): AdSize {
+        val displayMetrics: DisplayMetrics = activity.resources.displayMetrics
+        val adWidth = (displayMetrics.widthPixels / displayMetrics.density).toInt().coerceAtLeast(1)
+        return AdSize.getCurrentOrientationAnchoredAdaptiveBannerAdSize(activity, adWidth)
+    }
+
     companion object {
         @SuppressLint("StaticFieldLeak")
         private var parentView: ViewGroup? = null

package/android/src/main/kotlin/admob/plus/capacitor/ads/Interstitial.kt

@@ -4,11 +4,9 @@ import admob.plus.capacitor.ExecuteContext
 import admob.plus.capacitor.Generated
 import admob.plus.core.Context
 import admob.plus.core.GenericAd
-import com.google.android.gms.ads.AdError
-import com.google.android.gms.ads.FullScreenContentCallback
-import com.google.android.gms.ads.LoadAdError
-import com.google.android.gms.ads.interstitial.InterstitialAd
-import com.google.android.gms.ads.interstitial.InterstitialAdLoadCallback
+import com.google.android.libraries.ads.mobile.sdk.common.AdLoadCallback
+import com.google.android.libraries.ads.mobile.sdk.interstitial.InterstitialAd
+import com.google.android.libraries.ads.mobile.sdk.interstitial.InterstitialAdEventCallback
 
 class Interstitial(ctx: ExecuteContext?) : AdBase(ctx), GenericAd {
     private var mAd: InterstitialAd? = null
@@ -18,22 +16,22 @@ class Interstitial(ctx: ExecuteContext?) : AdBase(ctx), GenericAd {
     }
 
     override fun load(ctx: Context?) {
+        val requestContext = ctx ?: return
         clear()
         InterstitialAd.load(
-            activity,
-            adUnitId,
-            ctx!!.optAdRequest(),
-            object : InterstitialAdLoadCallback() {
+            requestContext.optAdRequest(adUnitId),
+            object : AdLoadCallback<InterstitialAd> {
                 override fun onAdLoaded(interstitialAd: InterstitialAd) {
                     mAd = interstitialAd
-                    mAd!!.fullScreenContentCallback = object : FullScreenContentCallback() {
+                    mAd!!.adEventCallback = object : InterstitialAdEventCallback {
                         override fun onAdDismissedFullScreenContent() {
                             clear()
                             emit(Generated.Events.INTERSTITIAL_DISMISS)
                         }
 
-                        override fun onAdFailedToShowFullScreenContent(adError: AdError) {
-                            emit(Generated.Events.INTERSTITIAL_SHOW_FAIL, adError)
+                        override fun onAdFailedToShowFullScreenContent(error: com.google.android.libraries.ads.mobile.sdk.common.FullScreenContentError) {
+                            clear()
+                            emit(Generated.Events.INTERSTITIAL_SHOW_FAIL, error)
                         }
 
                         override fun onAdShowedFullScreenContent() {
@@ -43,15 +41,19 @@ class Interstitial(ctx: ExecuteContext?) : AdBase(ctx), GenericAd {
                         override fun onAdImpression() {
                             emit(Generated.Events.INTERSTITIAL_IMPRESSION)
                         }
+
+                        override fun onAdClicked() {
+                            emit(Generated.Events.AD_CLICK)
+                        }
                     }
                     emit(Generated.Events.INTERSTITIAL_LOAD)
-                    ctx.resolve()
+                    requestContext.resolve()
                 }
 
-                override fun onAdFailedToLoad(loadAdError: LoadAdError) {
+                override fun onAdFailedToLoad(loadAdError: com.google.android.libraries.ads.mobile.sdk.common.LoadAdError) {
                     clear()
                     emit(Generated.Events.INTERSTITIAL_LOAD_FAIL, loadAdError)
-                    ctx.reject(loadAdError.message)
+                    requestContext.reject(loadAdError)
                 }
             })
     }
@@ -61,13 +63,10 @@ class Interstitial(ctx: ExecuteContext?) : AdBase(ctx), GenericAd {
 
     override fun show(ctx: Context?) {
         mAd!!.show(activity)
-        ctx!!.resolve()
+        ctx?.resolve()
     }
 
     private fun clear() {
-        if (mAd != null) {
-            mAd!!.fullScreenContentCallback = null
-            mAd = null
-        }
+        mAd = null
     }
 }

package/android/src/main/kotlin/admob/plus/capacitor/ads/Rewarded.kt

@@ -2,14 +2,13 @@ package admob.plus.capacitor.ads
 
 import admob.plus.capacitor.ExecuteContext
 import admob.plus.capacitor.Generated
+import android.util.Log
 import admob.plus.core.Context
 import admob.plus.core.GenericAd
-import com.google.android.gms.ads.AdError
-import com.google.android.gms.ads.FullScreenContentCallback
-import com.google.android.gms.ads.LoadAdError
-import com.google.android.gms.ads.rewarded.RewardItem
-import com.google.android.gms.ads.rewarded.RewardedAd
-import com.google.android.gms.ads.rewarded.RewardedAdLoadCallback
+import com.google.android.libraries.ads.mobile.sdk.common.AdLoadCallback
+import com.google.android.libraries.ads.mobile.sdk.rewarded.RewardItem
+import com.google.android.libraries.ads.mobile.sdk.rewarded.RewardedAd
+import com.google.android.libraries.ads.mobile.sdk.rewarded.RewardedAdEventCallback
 
 class Rewarded(ctx: ExecuteContext?) : AdBase(ctx), GenericAd {
     private var mAd: RewardedAd? = null
@@ -19,32 +18,32 @@ class Rewarded(ctx: ExecuteContext?) : AdBase(ctx), GenericAd {
     }
 
     override fun load(ctx: Context?) {
+        val requestContext = ctx ?: return
         clear()
         RewardedAd.load(
-            activity,
-            adUnitId,
-            ctx!!.optAdRequest(),
-            object : RewardedAdLoadCallback() {
-                override fun onAdFailedToLoad(loadAdError: LoadAdError) {
+            requestContext.optAdRequest(adUnitId),
+            object : AdLoadCallback<RewardedAd> {
+                override fun onAdFailedToLoad(loadAdError: com.google.android.libraries.ads.mobile.sdk.common.LoadAdError) {
                     clear()
                     emit(Generated.Events.REWARDED_LOAD_FAIL, loadAdError)
-                    ctx.reject(loadAdError)
+                    requestContext.reject(loadAdError)
                 }
 
                 override fun onAdLoaded(rewardedAd: RewardedAd) {
                     mAd = rewardedAd
-                    val ssv = ctx.optServerSideVerificationOptions()
+                    val ssv = requestContext.optServerSideVerificationOptions()
                     if (ssv != null) {
                         mAd!!.setServerSideVerificationOptions(ssv)
                     }
-                    mAd!!.fullScreenContentCallback = object : FullScreenContentCallback() {
+                    mAd!!.adEventCallback = object : RewardedAdEventCallback {
                         override fun onAdDismissedFullScreenContent() {
                             clear()
                             emit(Generated.Events.REWARDED_DISMISS)
                         }
 
-                        override fun onAdFailedToShowFullScreenContent(adError: AdError) {
-                            emit(Generated.Events.REWARDED_SHOW_FAIL, adError)
+                        override fun onAdFailedToShowFullScreenContent(error: com.google.android.libraries.ads.mobile.sdk.common.FullScreenContentError) {
+                            clear()
+                            emit(Generated.Events.REWARDED_SHOW_FAIL, error)
                         }
 
                         override fun onAdShowedFullScreenContent() {
@@ -54,9 +53,13 @@ class Rewarded(ctx: ExecuteContext?) : AdBase(ctx), GenericAd {
                         override fun onAdImpression() {
                             emit(Generated.Events.REWARDED_IMPRESSION)
                         }
+
+                        override fun onAdClicked() {
+                            emit(Generated.Events.AD_CLICK)
+                        }
                     }
                     emit(Generated.Events.REWARDED_LOAD)
-                    ctx.resolve()
+                    requestContext.resolve()
                 }
             })
     }
@@ -65,19 +68,21 @@ class Rewarded(ctx: ExecuteContext?) : AdBase(ctx), GenericAd {
         get() = mAd != null
 
     override fun show(ctx: Context?) {
-        mAd!!.show(activity) { rewardItem: RewardItem? ->
-            emit(
-                Generated.Events.REWARDED_REWARD,
-                rewardItem!!
-            )
+        val ad = mAd ?: run {
+            ctx?.reject("ad is not loaded")
+            return
         }
-        ctx!!.resolve()
+        ad.show(activity) { rewardItem: RewardItem? ->
+            if (rewardItem != null) {
+                emit(Generated.Events.REWARDED_REWARD, rewardItem)
+            } else {
+                Log.w("Rewarded", "Reward callback invoked with null rewardItem for adUnitId=$adUnitId")
+            }
+        }
+        ctx?.resolve()
     }
 
     private fun clear() {
-        if (mAd != null) {
-            mAd!!.fullScreenContentCallback = null
-            mAd = null
-        }
+        mAd = null
     }
 }