cordova-admob-tomitank 1.4.1 → 1.4.2

package/README.md

@@ -1,8 +1,8 @@
 # [Cordova AdMob tomitank]
 
 Based on AdMob Plus Cordova with updated SDK-s
-- Android: 24.6.0
-- iOS: 12.11.0
+- Android: 24.9.0
+- iOS: 12.14.0
 
 [![](https://img.shields.io/static/v1?label=Sponsor%20Me&style=for-the-badge&message=%E2%9D%A4&logo=GitHub&color=%23fe8e86)](https://github.com/sponsors/tomitank)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-admob-tomitank",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "Trustable Google AdMob Cordova Plugin",
   "main": "lib/index.js",
   "module": "esm/index.js",

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="cordova-admob-tomitank" version="1.4.1"
+<plugin id="cordova-admob-tomitank" version="1.4.2"
     xmlns="http://apache.org/cordova/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <name>cordova-admob-tomitank</name>
@@ -20,7 +20,7 @@
 
     <platform name="android">
         <preference name="APP_ID_ANDROID" default="ca-app-pub-xxx~yyy" />
-        <preference name="PLAY_SERVICES_VERSION" default="24.6.0" />
+        <preference name="PLAY_SERVICES_VERSION" default="24.9.0" />
 
         <config-file target="AndroidManifest.xml" parent="/manifest/application">
             <activity android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize" android:excludeFromRecents="true" android:name="com.google.android.gms.ads.AdActivity" android:noHistory="true" />
@@ -317,7 +317,7 @@
                 <source url="https://cdn.cocoapods.org/" />
             </config>
             <pods use-frameworks="true">
-                <pod name="Google-Mobile-Ads-SDK" spec="~> 12.11.0" />
+                <pod name="Google-Mobile-Ads-SDK" spec="~> 12.14.0" />
             </pods>
         </podspec>
     </platform>

package/src/android/cordova/AdMob.java

@@ -215,17 +215,15 @@ public class AdMob extends CordovaPlugin implements Helper.Adapter {
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
 
-        for (Map.Entry<String, Ad> entry : ads.entrySet()) {
-            AdBase ad = (AdBase) entry.getValue();
-            ad.onConfigurationChanged(newConfig);
+        for (Ad ad : new ArrayList<>(ads.values())) {
+            ((AdBase) ad).onConfigurationChanged(newConfig);
         }
     }
 
     @Override
     public void onPause(boolean multitasking) {
-        for (Map.Entry<String, Ad> entry : ads.entrySet()) {
-            AdBase ad = (AdBase) entry.getValue();
-            ad.onPause(multitasking);
+        for (Ad ad : new ArrayList<>(ads.values())) {
+            ((AdBase) ad).onPause(multitasking);
         }
         super.onPause(multitasking);
     }
@@ -233,9 +231,8 @@ public class AdMob extends CordovaPlugin implements Helper.Adapter {
     @Override
     public void onResume(boolean multitasking) {
         super.onResume(multitasking);
-        for (Map.Entry<String, Ad> entry : ads.entrySet()) {
-            AdBase ad = (AdBase) entry.getValue();
-            ad.onResume(multitasking);
+        for (Ad ad : new ArrayList<>(ads.values())) {
+            ((AdBase) ad).onResume(multitasking);
         }
     }
 
@@ -244,9 +241,12 @@ public class AdMob extends CordovaPlugin implements Helper.Adapter {
         isPluginStarted = false;
         readyCallbackContext = null;
 
-        for (Map.Entry<String, Ad> entry : ads.entrySet()) {
-            AdBase ad = (AdBase) entry.getValue();
-            ad.onDestroy();
+        for (Ad ad : new ArrayList<>(ads.values())) {
+            try {
+                ((AdBase) ad).onDestroy();
+            } catch (Exception e) {
+                Log.e(TAG, "Ad destroy failed", e);
+            }
         }
 
         Banner.destroyParentView();