From 018c76763b96441fad8aaf05e4bc4e8d26972c61 Mon Sep 17 00:00:00 2001
From: EMI-INDO <78555833+EMI-INDO@users.noreply.github.com>
Date: Tue, 31 Dec 2024 00:39:43 +0700
Subject: [PATCH] v2.0.0 happy new year 2025

Issue on split screen view, popup view and landscape view
https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/issues/47

Fatal Exception: NSInvalidArgumentException on iOS
https://github.com/EMI-INDO/emi-indo-cordova-plugin-admob/issues/48
---
 package.json             |  2 +-
 plugin.xml               |  9 ++++++++-
 src/ios/emiAdmobPlugin.m | 33 ++++++++++++++++++---------------
 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index a529e64..a2805d7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "emi-indo-cordova-plugin-admob",
-  "version": "1.9.9",
+  "version": "2.0.0",
   "description": "Cordova/Quasar/Capacitor Plugin Admob Android IOS",
   "cordova": {
     "id": "emi-indo-cordova-plugin-admob",
diff --git a/plugin.xml b/plugin.xml
index 67a5d4f..68fc689 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,6 +1,6 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
   xmlns:android="http://schemas.android.com/apk/res/android"
-  id="emi-indo-cordova-plugin-admob" version="1.9.9">
+  id="emi-indo-cordova-plugin-admob" version="2.0.0">
 
   <name>emiAdmobPlugin</name>
   <description>Cordova/Quasar/Capacitor Plugin Admob Android IOS</description>
@@ -74,6 +74,13 @@
     <preference name="ANDROID_X" default="1.2.0" />
     <framework src="androidx.preference:preference:$ANDROID_X" />
 
+    <preference name="MULTI_WINDOW" default="false" />
+
+    <edit-config file="AndroidManifest.xml" mode="merge" target="/manifest/application/activity[@android:name='MainActivity']">
+            <activity android:resizeableActivity="$MULTI_WINDOW" />
+    </edit-config>
+
+
 
     <config-file parent="/*" target="AndroidManifest.xml" />
     <source-file src="src/android/emiAdmobPlugin.kt" target-dir="app/src/main/kotlin/emi/indo/cordova/plugin/admob" />
diff --git a/src/ios/emiAdmobPlugin.m b/src/ios/emiAdmobPlugin.m
index 9254bde..e98a81d 100755
--- a/src/ios/emiAdmobPlugin.m
+++ b/src/ios/emiAdmobPlugin.m
@@ -504,6 +504,7 @@ - (void)orientationDidChange:(NSNotification *)notification {
         }
           
         [self setAdRequest];
+          
 
         self.bannerViewLayout = [[UIView alloc] initWithFrame:CGRectZero];
         self.bannerViewLayout.translatesAutoresizingMaskIntoConstraints = NO;
@@ -809,11 +810,12 @@ - (void)loadAppOpenAd:(CDVInvokedUrlCommand *)command {
                     NSString *adUnitId = strongSelf.appOpenAd.adUnitID;
 
                     NSDictionary *data = @{
-                        @"value": adValue,
-                        @"currencyCode": currencyCode,
+                        @"value": adValue ?: [NSNull null],
+                        @"currencyCode": currencyCode ?: @"",
                         @"precision": @(precision),
-                        @"adUnitId": adUnitId
+                        @"adUnitId": adUnitId ?: @""
                     };
+
                     NSData *jsonData = [NSJSONSerialization dataWithJSONObject:data options:0 error:nil];
                     NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
 
@@ -937,11 +939,12 @@ - (void)loadInterstitialAd:(CDVInvokedUrlCommand *)command {
                     NSString *adUnitId = strongSelf.interstitial.adUnitID;
 
                     NSDictionary *data = @{
-                        @"value": adValue,
-                        @"currencyCode": currencyCode,
+                        @"value": adValue ?: [NSNull null],
+                        @"currencyCode": currencyCode ?: @"",
                         @"precision": @(precision),
-                        @"adUnitId": adUnitId
+                        @"adUnitId": adUnitId ?: @""
                     };
+                    
                     NSData *jsonData = [NSJSONSerialization dataWithJSONObject:data options:0 error:nil];
                     NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
 
@@ -1072,10 +1075,10 @@ - (void)loadRewardedInterstitialAd:(CDVInvokedUrlCommand *)command {
                     NSString *adUnitId = strongSelf.rewardedInterstitialAd.adUnitID;
 
                     NSDictionary *data = @{
-                        @"value": adValue,
-                        @"currencyCode": currencyCode,
+                        @"value": adValue ?: [NSNull null],
+                        @"currencyCode": currencyCode ?: @"",
                         @"precision": @(precision),
-                        @"adUnitId": adUnitId
+                        @"adUnitId": adUnitId ?: @""
                     };
                     NSData *jsonData = [NSJSONSerialization dataWithJSONObject:data options:0 error:nil];
                     NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
@@ -1229,10 +1232,10 @@ - (void)loadRewardedAd:(CDVInvokedUrlCommand *)command {
                     NSString *adUnitId = strongSelf.rewardedAd.adUnitID;
 
                     NSDictionary *data = @{
-                        @"value": adValue,
-                        @"currencyCode": currencyCode,
+                        @"value": adValue ?: [NSNull null],
+                        @"currencyCode": currencyCode ?: @"",
                         @"precision": @(precision),
-                        @"adUnitId": adUnitId
+                        @"adUnitId": adUnitId ?: @""
                     };
                     NSData *jsonData = [NSJSONSerialization dataWithJSONObject:data options:0 error:nil];
                     NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
@@ -1480,10 +1483,10 @@ - (void)bannerViewDidReceiveAd:(GADBannerView *)bannerView {
         NSString *adUnitId = strongSelf.bannerView.adUnitID;
 
         NSDictionary *data = @{
-            @"value": adValue,
-            @"currencyCode": currencyCode,
+            @"value": adValue ?: [NSNull null],
+            @"currencyCode": currencyCode ?: @"",
             @"precision": @(precision),
-            @"adUnitId": adUnitId
+            @"adUnitId": adUnitId ?: @""
         };
         NSData *jsonData = [NSJSONSerialization dataWithJSONObject:data options:0 error:nil];
         NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];