cordova-admob-tomitank 1.1.6 → 1.1.8

package/README.md

@@ -1,8 +1,8 @@
 # [Cordova AdMob tomitank]
 
 Based on AdMob Plus Cordova with updated SDK-s
-- Android: 24.4.0
-- iOS: 12.7.0
+- Android: 24.5.0
+- iOS: 12.9.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/esm/api.d.ts

@@ -21,7 +21,7 @@ export declare class MobileAd<T extends MobileAdOptions = MobileAdOptions> {
     private _created;
     private _init;
     constructor(opts: T);
-    static getAdById(id: string): any;
+    static getAdById(id: string): MobileAd<MobileAdOptions>;
     get adUnitId(): string;
     on(...args: Parameters<typeof document.addEventListener>): () => void;
     protected isLoaded(): Promise<boolean>;

package/lib/api.d.ts

@@ -21,7 +21,7 @@ export declare class MobileAd<T extends MobileAdOptions = MobileAdOptions> {
     private _created;
     private _init;
     constructor(opts: T);
-    static getAdById(id: string): any;
+    static getAdById(id: string): MobileAd<MobileAdOptions>;
     get adUnitId(): string;
     on(...args: Parameters<typeof document.addEventListener>): () => void;
     protected isLoaded(): Promise<boolean>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-admob-tomitank",
-  "version": "1.1.6",
+  "version": "1.1.8",
   "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.1.6"
+<plugin id="cordova-admob-tomitank" version="1.1.8"
     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.4.0" />
+        <preference name="PLAY_SERVICES_VERSION" default="24.5.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.7.0" />
+                <pod name="Google-Mobile-Ads-SDK" spec="~> 12.9.0" />
             </pods>
         </podspec>
     </platform>

package/src/android/cordova/AdMob.java

@@ -27,6 +27,7 @@ import admob.plus.cordova.ads.Rewarded;
 import admob.plus.cordova.ads.RewardedInterstitial;
 import admob.plus.core.GenericAd;
 import admob.plus.core.Helper;
+import admob.plus.core.Ad;
 
 import static admob.plus.core.Helper.ads;
 
@@ -195,16 +196,16 @@ public class AdMob extends CordovaPlugin implements Helper.Adapter {
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
 
-        for (int i = 0; i < ads.size(); i++) {
-            AdBase ad = (AdBase) ads.valueAt(i);
+        for (Map.Entry<String, Ad> entry : ads.entrySet()) {
+            AdBase ad = (AdBase) entry.getValue();
             ad.onConfigurationChanged(newConfig);
         }
     }
 
     @Override
     public void onPause(boolean multitasking) {
-        for (int i = 0; i < ads.size(); i++) {
-            AdBase ad = (AdBase) ads.valueAt(i);
+        for (Map.Entry<String, Ad> entry : ads.entrySet()) {
+            AdBase ad = (AdBase) entry.getValue();
             ad.onPause(multitasking);
         }
         super.onPause(multitasking);
@@ -213,8 +214,8 @@ public class AdMob extends CordovaPlugin implements Helper.Adapter {
     @Override
     public void onResume(boolean multitasking) {
         super.onResume(multitasking);
-        for (int i = 0; i < ads.size(); i++) {
-            AdBase ad = (AdBase) ads.valueAt(i);
+        for (Map.Entry<String, Ad> entry : ads.entrySet()) {
+            AdBase ad = (AdBase) entry.getValue();
             ad.onResume(multitasking);
         }
     }
@@ -223,8 +224,8 @@ public class AdMob extends CordovaPlugin implements Helper.Adapter {
     public void onDestroy() {
         readyCallbackContext = null;
 
-        for (int i = 0; i < ads.size(); i++) {
-            AdBase ad = (AdBase) ads.valueAt(i);
+        for (Map.Entry<String, Ad> entry : ads.entrySet()) {
+            AdBase ad = (AdBase) entry.getValue();
             ad.onDestroy();
         }
 

package/src/android/core/Ad.java

@@ -16,10 +16,10 @@ import java.util.Objects;
 import static admob.plus.core.Helper.ads;
 
 public abstract class Ad {
-    public final int id;
+    public final String id;
     public final String adUnitId;
 
-    public Ad(int id, @NonNull String adUnitId) {
+    public Ad(String id, @NonNull String adUnitId) {
         this.id = id;
         this.adUnitId = adUnitId;
         ads.put(id, this);

package/src/android/core/Context.java

@@ -77,8 +77,8 @@ public interface Context {
     }
 
     @Nullable
-    default Integer optId() {
-        return this.optInt("id");
+    default String optId() {
+        return this.optString("id");
     }
 
     @Nullable

package/src/android/core/Helper.java

@@ -26,14 +26,14 @@ import java.util.List;
 import java.util.Map;
 
 public class Helper {
-    public static final SparseArray<Ad> ads = new SparseArray<Ad>();
+    public static final Map<String, Ad> ads = new HashMap<>();
     private final Adapter adapter;
 
     public Helper(Adapter adapter) {
         this.adapter = adapter;
     }
 
-    public static Ad getAd(Integer id) {
+    public static Ad getAd(String id) {
         return ads.get(id);
     }
 

package/src/www/api.ts

@@ -26,7 +26,7 @@ export async function start() {
 export class MobileAd<T extends MobileAdOptions = MobileAdOptions> {
   public static readonly type: string = ''
 
-  private static allAds: { [s: number]: MobileAd } = {}
+  private static allAds: { [s: string]: MobileAd } = {}
   private static idCounter = 0
 
   public readonly id: string