* Pass the callbacks in the constructor when creating iOS plugin classes.

* Fix typos and add null checks.

PiperOrigin-RevId: 784650598

Author: Mobile Ads Developer Relations

source/plugin/Assets/GoogleMobileAds/Platforms/iOS/Externs.cs

@@ -341,47 +341,42 @@ internal static extern void GADUAppOpenAdPreloaderDestroy(IntPtr appOpenAdPreloa
 
         [DllImport("__Internal")]
         internal static extern IntPtr GADUCreateRewardedAdPreloader(
-            IntPtr rewardedAdPreloaderClient);
+            IntPtr rewardedAdPreloaderClient,
+            RewardedAdPreloaderClient.GADUAdAvailableForPreloadIdCallback adPreloadedCallback,
+            RewardedAdPreloaderClient.GADUAdFailedToPreloadForPreloadIdCallback
+                adFailedToPreloadCallback,
+            RewardedAdPreloaderClient.GADUAdsExhaustedForPreloadIdCallback adsExhaustedCallback);
 
         [DllImport("__Internal")]
-        internal static extern bool GADURewardedAdPreloaderPreload(IntPtr rewardedAdPreloaderClient,
+        internal static extern bool GADURewardedAdPreloaderPreload(IntPtr rewardedAdPreloader,
             string preloadId, IntPtr preloadConfiguration);
 
         [DllImport("__Internal")]
-        internal static extern bool GADURewardedAdPreloaderIsAdAvailable(
-            IntPtr rewardedAdPreloaderClient, string preloadId);
+        internal static extern bool GADURewardedAdPreloaderIsAdAvailable(IntPtr rewardedAdPreloader,
+                                                                         string preloadId);
 
         [DllImport("__Internal")]
         internal static extern IntPtr GADURewardedAdPreloaderGetPreloadedAd(
-            IntPtr rewardedAdPreloaderClient, string preloadId, IntPtr appOpenAdClientPtr);
+            IntPtr rewardedAdPreloader, string preloadId, IntPtr appOpenAdClientPtr);
 
         [DllImport("__Internal")]
         internal static extern int GADURewardedAdPreloaderGetNumAdsAvailable(
-            IntPtr rewardedAdPreloaderClient, string preloadId);
+            IntPtr rewardedAdPreloader, string preloadId);
 
         [DllImport("__Internal")]
         internal static extern IntPtr GADURewardedAdPreloaderGetConfiguration(
-            IntPtr rewardedAdPreloaderClient, string preloadId);
+            IntPtr rewardedAdPreloader, string preloadId);
 
         [DllImport("__Internal")]
         internal static extern IntPtr GADURewardedAdPreloaderGetConfigurations(
-            IntPtr rewardedAdPreloaderClient);
+            IntPtr rewardedAdPreloader);
 
         [DllImport("__Internal")]
-        internal static extern bool GADURewardedAdPreloaderDestroy(IntPtr rewardedAdPreloaderClient,
-                                                                  string preloadId);
+        internal static extern bool GADURewardedAdPreloaderDestroy(IntPtr rewardedAdPreloader,
+                                                                   string preloadId);
 
         [DllImport("__Internal")]
-        internal static extern void GADURewardedAdPreloaderDestroyAll(
-            IntPtr rewardedAdPreloaderClient);
-
-        [DllImport("__Internal")]
-        internal static extern void GADUSetRewardedAdPreloaderCallbacks(
-            IntPtr appOpenAdPreloader,
-            RewardedAdPreloaderClient.GADUAdAvailableForPreloadIdCallback adPreloadedCallback,
-            RewardedAdPreloaderClient.GADUAdFailedToPreloadForPreloadIdCallback
-                adFailedToPreloadCallback,
-            RewardedAdPreloaderClient.GADUAdsExhaustedForPreloadIdCallback adsExhaustedCallback);
+        internal static extern void GADURewardedAdPreloaderDestroyAll(IntPtr rewardedAdPreloader);
 
         #endregion
 

source/plugin/Assets/GoogleMobileAds/Platforms/iOS/RewardedAdPreloaderClient.cs

@@ -62,13 +62,10 @@ public RewardedAdPreloaderClient()
         {
             _rewardedAdPreloaderClientPtr = (IntPtr)GCHandle.Alloc(this);
             RewardedAdPreloaderPtr = Externs.GADUCreateRewardedAdPreloader(
-                    _rewardedAdPreloaderClientPtr);
-
-            Externs.GADUSetRewardedAdPreloaderCallbacks(
-                RewardedAdPreloaderPtr,
-                AdAvailableForPreloadIdCallback,
-                AdFailedToPreloadForPreloadIdCallback,
-                AdsExhaustedForPreloadIdCallback);
+                    _rewardedAdPreloaderClientPtr,
+                    AdAvailableForPreloadIdCallback,
+                    AdFailedToPreloadForPreloadIdCallback,
+                    AdsExhaustedForPreloadIdCallback);
         }
 
         public bool Preload(string preloadId, PreloadConfiguration preloadConfiguration,
@@ -91,17 +88,29 @@ public bool Preload(string preloadId, PreloadConfiguration preloadConfiguration,
             {
                 preloadConfigurationClient.Request = preloadConfiguration.Request;
             }
+            if (RewardedAdPreloaderPtr == IntPtr.Zero)
+            {
+                return false;
+            }
             return Externs.GADURewardedAdPreloaderPreload(RewardedAdPreloaderPtr, preloadId,
                                                           preloadConfigRef);
         }
 
         public bool IsAdAvailable(string preloadId)
         {
+            if (RewardedAdPreloaderPtr == IntPtr.Zero)
+            {
+                return false;
+            }
             return Externs.GADURewardedAdPreloaderIsAdAvailable(RewardedAdPreloaderPtr, preloadId);
         }
 
         public IRewardedAdClient DequeueAd(string preloadId)
         {
+            if (RewardedAdPreloaderPtr == IntPtr.Zero)
+            {
+                return null;
+            }
             var rewardedAdClient = new RewardedAdClient();
             var rewardedAdClientPtr = (IntPtr)GCHandle.Alloc(rewardedAdClient);
             var rewardedAd = Externs.GADURewardedAdPreloaderGetPreloadedAd(RewardedAdPreloaderPtr,
@@ -114,12 +123,20 @@ public IRewardedAdClient DequeueAd(string preloadId)
 
         public int GetNumAdsAvailable(string preloadId)
         {
+            if (RewardedAdPreloaderPtr == IntPtr.Zero)
+            {
+                return 0;
+            }
             return Externs.GADURewardedAdPreloaderGetNumAdsAvailable(RewardedAdPreloaderPtr,
                                                                      preloadId);
         }
 
         public PreloadConfiguration GetConfiguration(string preloadId)
         {
+            if (RewardedAdPreloaderPtr == IntPtr.Zero)
+            {
+                return null;
+            }
             var config = Externs.GADURewardedAdPreloaderGetConfiguration(RewardedAdPreloaderPtr,
                                                                          preloadId);
             if (config == IntPtr.Zero)
@@ -140,6 +157,10 @@ public PreloadConfiguration GetConfiguration(string preloadId)
         public Dictionary<string, PreloadConfiguration> GetConfigurations()
         {
             var configurations = new Dictionary<string, PreloadConfiguration>();
+            if (RewardedAdPreloaderPtr == IntPtr.Zero)
+            {
+                return configurations;
+            }
             var configurationsPtr = Externs.GADURewardedAdPreloaderGetConfigurations(
                     RewardedAdPreloaderPtr);
             // Marshall the Dictionary from configurationsPtr
@@ -162,11 +183,19 @@ public Dictionary<string, PreloadConfiguration> GetConfigurations()
 
         public void Destroy(string preloadId)
         {
+            if (RewardedAdPreloaderPtr == IntPtr.Zero)
+            {
+                return;
+            }
             Externs.GADURewardedAdPreloaderDestroy(RewardedAdPreloaderPtr, preloadId);
         }
 
         public void DestroyAll()
         {
+            if (RewardedAdPreloaderPtr == IntPtr.Zero)
+            {
+                return;
+            }
             Externs.GADURewardedAdPreloaderDestroyAll(RewardedAdPreloaderPtr);
         }