emi-indo-cordova-plugin-admob 1.6.2 → 1.6.3

package/README.md

@@ -11,9 +11,9 @@
 ### Mobile Ads SDK (Android: 23.5.0) [Release Notes:](https://developers.google.com/admob/android/rel-notes)
 ### User Messaging Platform (UMP Android: 3.1.0) [Release Notes:](https://developers.google.com/admob/android/privacy/release-notes)
 
-### Mobile Ads SDK (IOS: 11.10.0) [Release Notes:](https://developers.google.com/admob/ios/rel-notes)
+### Mobile Ads SDK (IOS: 11.12.0) [Release Notes:](https://developers.google.com/admob/ios/rel-notes)
 
-### User Messaging Platform (UMP IOS: 2.6.0) [Release Notes:](https://developers.google.com/ad-manager/mobile-ads-sdk/ios/privacy/download)
+### User Messaging Platform (UMP IOS: 2.7.0) [Release Notes:](https://developers.google.com/ad-manager/mobile-ads-sdk/ios/privacy/download)
 ### IAB Europe Transparency & Consent Framework (CPM: 2.2.0)
 
 ## New example 
@@ -31,7 +31,10 @@
 
 
 ## IOS Ad Support IOS 18 *
+- Mobile Ads SDK (IOS: 11.12.0)
+- emi-indo-cordova-plugin-admob@1.6.3 or higher requires cocoapods 1.16.2 or higher
 > [!WARNING]
+> - Mobile Ads SDK (IOS: 11.10.0)
 > - emi-indo-cordova-plugin-admob@1.5.2 or higher
 > - Minimum supported Xcode version up to 15.3 or higher
 > - minimum deployment-target: 12.2

package/example/package.json

@@ -14,7 +14,7 @@
   "author": "Apache Cordova Team",
   "license": "Apache-2.0",
   "devDependencies": {
-    "emi-indo-cordova-plugin-admob": "^1.6.1"
+    "emi-indo-cordova-plugin-admob": "^1.6.3"
   },
   "cordova": {
     "plugins": {

package/example/www/js/deviceready.js

@@ -87,7 +87,7 @@ document.addEventListener("deviceready", function () {
     
     cordova.plugins.emiAdmobPlugin.initialize({
 
-        isUsingAdManagerRequest: true, // AdManagerAdRequest.Builder | AdRequest.Builder (Default true)
+        isUsingAdManagerRequest: true, // true = AdManager | false = AdMob (Default true)
         isResponseInfo: true, // debug Default false
         isConsentDebug: true, // debug Default false
 
@@ -101,6 +101,7 @@ document.addEventListener("deviceready", function () {
         const sdkVersion = data.version;
         // const adAdapter = data.adapters;
         const conStatus = data.consentStatus;
+        const attStatus = data.attStatus;
         // const gdprApplie = data.gdprApplies;
         // const purposeConsent = data.purposeConsents;
         // const vendorConsents = data.vendorConsents;
@@ -108,6 +109,11 @@ document.addEventListener("deviceready", function () {
         // const additionalConsent = data.additionalConsent;
         log.value += ("\n On Sdk Initialization version: " + sdkVersion);
         log.value += ("\n On Consent Status: " + conStatus);
+        
+        if (isPlatformIOS){
+            
+            log.value += ("\n On Authorization Status: " + attStatus);
+        }
 
         loadBanner(); // auto show
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emi-indo-cordova-plugin-admob",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "description": "Cordova Plugin Admob Android IOS Support Capacitor",
   "cordova": {
     "id": "emi-indo-cordova-plugin-admob",

package/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.6.2">
+  id="emi-indo-cordova-plugin-admob" version="1.6.3">
 
   <name>emiAdmobPlugin</name>
   <description>Cordova Plugin Admob Android IOS</description>
@@ -296,8 +296,8 @@
       </config>
       <pods use-frameworks="true">
 		<!--minimum macOS 14.4 > Xcode 15.3 -->
-		 <pod name="GoogleUserMessagingPlatform" spec="~> 2.6.0" />
-                <pod name="Google-Mobile-Ads-SDK" spec="~> 11.10.0" />
+		 <pod name="GoogleUserMessagingPlatform" spec="~> 2.7.0" />
+     <pod name="Google-Mobile-Ads-SDK" spec="~> 11.12.0" />
 		
       </pods>
     </podspec>

package/src/ios/emiAdmobPlugin.h

@@ -4,6 +4,7 @@
 #import <UserMessagingPlatform/UserMessagingPlatform.h>
 #import <CommonCrypto/CommonDigest.h>
 @interface emiAdmobPlugin : CDVPlugin<GADBannerViewDelegate, GADFullScreenContentDelegate>{}
+@property(nonatomic, strong) GADRequest *globalRequest;
 @property(nonatomic, strong) GADAppOpenAd *appOpenAd;
 @property(nonatomic, strong) GADBannerView *bannerView;
 @property(nonatomic, strong) GADInterstitialAd *interstitial;
@@ -20,7 +21,6 @@
 - (void)initialize:(CDVInvokedUrlCommand *)command;
 - (void)requestIDFA:(CDVInvokedUrlCommand *)command;
 - (void)showPrivacyOptionsForm:(CDVInvokedUrlCommand *)command;
-// - (void)getConsentRequest:(CDVInvokedUrlCommand *)command;
 - (void)forceDisplayPrivacyForm:(CDVInvokedUrlCommand *)command;
 - (void)consentReset:(CDVInvokedUrlCommand *)command;
 - (void)getIabTfc:(CDVInvokedUrlCommand *)command;

package/src/ios/emiAdmobPlugin.m

@@ -13,25 +13,24 @@
 @synthesize command;
 @synthesize responseInfo;
 @synthesize isPrivacyOptionsRequired;
-int idfaStatus = 0;
+int attStatus = 0;
 // int fromStatus = 0; // Deprecated
 int Consent_Status = 0;
 int adFormat = 0;
-int adWidth = 320; // Deprecated
+int adWidth = 320; // Default
 BOOL auto_Show = NO;
 // NSString *Npa = @"1"; // Deprecated
-NSString *Position = @"bottom-center"; // Default
+NSString *setPosition = @"bottom-center"; // Default
 NSString *bannerSaveAdUnitId = @""; // autoResize dependency = true
 
-BOOL enableCollapsible = NO;
+BOOL isCollapsible = NO;
 BOOL isAutoResize = NO;
 
 int isAdSkip = 0;
-BOOL isIAB = NO;
 BOOL UnderAgeOfConsent = NO;
 BOOL isPrivacyOptions = NO;
 BOOL isDebugGeography = NO;
-BOOL ResponseInfo = NO;
+BOOL isResponseInfo = NO;
 BOOL isUsingAdManagerRequest = YES;
 
 - (BOOL)canRequestAds {
@@ -40,8 +39,20 @@ BOOL isUsingAdManagerRequest = YES;
 - (void)setUsingAdManagerRequest:(BOOL)value {
   isUsingAdManagerRequest = value;
 }
-- (void)ResponseInfo:(BOOL)value {
-  ResponseInfo = value;
+
+- (void)setAdRequest {
+    if (isUsingAdManagerRequest) {
+        self.globalRequest = [GAMRequest request];
+        NSLog(@"Using AdManager request");
+    } else {
+        self.globalRequest = [GADRequest request];
+        NSLog(@"Using AdMob request");
+    }
+}
+
+
+- (void)isResponseInfo:(BOOL)value {
+  isResponseInfo = value;
 }
 - (void)isDebugGeography:(BOOL)value {
   isDebugGeography = value;
@@ -55,7 +66,7 @@ BOOL isUsingAdManagerRequest = YES;
   BOOL setDebugGeography = [[options valueForKey:@"isConsentDebug"] boolValue];
 
   [self setUsingAdManagerRequest:setAdRequest];
-  [self ResponseInfo:responseInfo];
+  [self isResponseInfo:responseInfo];
   [self isDebugGeography:setDebugGeography];
 
   __block CDVPluginResult *pluginResult;
@@ -132,42 +143,28 @@ BOOL isUsingAdManagerRequest = YES;
       [ATTrackingManager requestTrackingAuthorizationWithCompletionHandler:^(
                              ATTrackingManagerAuthorizationStatus status) {
         if (status == ATTrackingManagerAuthorizationStatusDenied) {
-          idfaStatus = ATTrackingManagerAuthorizationStatusDenied;
+          attStatus = ATTrackingManagerAuthorizationStatusDenied;
         } else if (status == ATTrackingManagerAuthorizationStatusAuthorized) {
-          idfaStatus = ATTrackingManagerAuthorizationStatusAuthorized;
+          attStatus = ATTrackingManagerAuthorizationStatusAuthorized;
         } else if (status == ATTrackingManagerAuthorizationStatusRestricted) {
-          idfaStatus = ATTrackingManagerAuthorizationStatusRestricted;
+          attStatus = ATTrackingManagerAuthorizationStatusRestricted;
         } else if (status ==
                    ATTrackingManagerAuthorizationStatusNotDetermined) {
-          idfaStatus = ATTrackingManagerAuthorizationStatusNotDetermined;
+          attStatus = ATTrackingManagerAuthorizationStatusNotDetermined;
         }
       }];
     });
-    [self fireEvent:@""
-              event:@"on."
-                    @"getI"
-                    @"DFA."
-                    @"stat"
-                    @"us"
-           withData:nil];
+      [self fireEvent:@"" event:@"on.getIDFA.status" withData:nil];
+
     pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK
-                                        messageAsInt:idfaStatus];
+                                        messageAsInt:attStatus];
   } else {
-    [self fireEvent:@""
-              event:@"on."
-                    @"getI"
-                    @"DFA."
-                    @"erro"
-                    @"r"
-           withData:nil];
+      [self fireEvent:@"" event:@"on.getIDFA.error" withData:nil];
     pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR];
   }
   [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
 }
-/*
-- (void)getConsentRequest:(CDVInvokedUrlCommand *)command {
-}
-*/
+
 - (void)startGoogleMobileAdsSDK {
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
@@ -187,22 +184,21 @@ BOOL isUsingAdManagerRequest = YES;
         [adaptersArray addObject:adapterInfo];
       }
 
-      NSString *sdkVersion = GADGetStringFromVersionNumber(
-          GADMobileAds.sharedInstance.versionNumber);
-      int Consent_Status =
-          (int)UMPConsentInformation.sharedInstance.consentStatus;
+      NSString *sdkVersion = GADGetStringFromVersionNumber(GADMobileAds.sharedInstance.versionNumber);
+      int Consent_Status = (int)UMPConsentInformation.sharedInstance.consentStatus;
+      int initAttStatus = (int)attStatus;
 
       NSMutableDictionary *result = [[NSMutableDictionary alloc] init];
       NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
       NSNumber *CmpSdkID = [prefs valueForKey:@"IABTCF_CmpSdkID"];
       NSString *gdprApplies = [prefs stringForKey:@"IABTCF_gdprApplies"];
-      NSString *PurposeConsents =
-          [prefs stringForKey:@"IABTCF_PurposeConsents"];
+      NSString *PurposeConsents = [prefs stringForKey:@"IABTCF_PurposeConsents"];
       NSString *TCString = [prefs stringForKey:@"IABTCF_TCString"];
       NSString *additionalConsent = [prefs stringForKey:@"IABTCF_AddtlConsent"];
 
       result[@"version"] = sdkVersion;
       result[@"consentStatus"] = @(Consent_Status);
+      result[@"attStatus"] = @(initAttStatus);
       result[@"adapter"] = adaptersArray;
       result[@"CmpSdkID"] = CmpSdkID;
       result[@"gdprApplies"] = gdprApplies;
@@ -366,7 +362,7 @@ BOOL isUsingAdManagerRequest = YES;
     CDVPluginResult *pluginResult;
     NSString *callbackId = command.callbackId;
     
-    if (isIAB == 1) {
+
         NSMutableDictionary *result = [[NSMutableDictionary alloc] init];
         NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
         
@@ -386,9 +382,7 @@ BOOL isUsingAdManagerRequest = YES;
         
         pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:result];
         [self fireEvent:@"" event:@"onGetIabTfc" withData:nil];
-    } else {
-        pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR];
-    }
+    
     
     [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
 }
@@ -468,47 +462,33 @@ BOOL isUsingAdManagerRequest = YES;
 }
 
 - (void)pluginInitialize {
-  [super pluginInitialize];
+    [super pluginInitialize];
 
-  [[NSNotificationCenter defaultCenter]
-      addObserver:self
-         selector:@selector(orientationDidChange:)
-             name:UIDeviceOrientationDidChangeNotification
-           object:nil];
-
-  isIAB = YES;
-  NSMutableDictionary *result = [[NSMutableDictionary alloc] init];
-  NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
-  NSNumber *CmpSdkID = [prefs valueForKey:@"IABTCF"
-                                          @"_CmpSd"
-                                          @"kID"];
-  NSString *gdprApplies = [prefs stringForKey:@"IABTCF"
-                                              @"_gdprA"
-                                              @"pplie"
-                                              @"s"];
-  NSString *PurposeConsents = [prefs stringForKey:@"IABTCF"
-                                                  @"_Purpo"
-                                                  @"seCons"
-                                                  @"ents"];
-  NSString *TCString = [prefs stringForKey:@"IABTCF"
-                                           @"_TCStr"
-                                           @"ing"];
-  result[@"IABTCF_"
-         @"CmpSdkID"] = CmpSdkID;
-  result[@"IABTCF_"
-         @"gdprApplies"] = gdprApplies;
-  result[@"IABTCF_"
-         @"PurposeCons"
-         @"ents"] = PurposeConsents;
-  result[@"IABTCF_"
-         @"TCString"] = TCString;
-  // NSLog(@"%@",
-  //   [[NSUserDefaults
-  //   standardUserDefaults]
-  //   dictionaryRepresentation]);
-  [prefs synchronize];
+    [[NSNotificationCenter defaultCenter]
+        addObserver:self
+           selector:@selector(orientationDidChange:)
+               name:UIDeviceOrientationDidChangeNotification
+             object:nil];
+    
+    NSMutableDictionary *result = [[NSMutableDictionary alloc] init];
+    NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
+    
+    NSNumber *CmpSdkID = [prefs valueForKey:@"IABTCF_CmpSdkID"];
+    NSString *gdprApplies = [prefs stringForKey:@"IABTCF_gdprApplies"];
+    NSString *PurposeConsents = [prefs stringForKey:@"IABTCF_PurposeConsents"];
+    NSString *TCString = [prefs stringForKey:@"IABTCF_TCString"];
+    
+    result[@"IABTCF_CmpSdkID"] = CmpSdkID;
+    result[@"IABTCF_gdprApplies"] = gdprApplies;
+    result[@"IABTCF_PurposeConsents"] = PurposeConsents;
+    result[@"IABTCF_TCString"] = TCString;
+    
+    // NSLog(@"%@", [[NSUserDefaults standardUserDefaults] dictionaryRepresentation]);
+    
+    [prefs synchronize];
 }
 
+
 - (void)orientationDidChange:(NSNotification *)notification {
   // NSLog(@"Orientation changed");
   [self fireEvent:@"" event:@"on.screen.rotated" withData:nil];
@@ -522,6 +502,8 @@ BOOL isUsingAdManagerRequest = YES;
             [self.bannerView removeFromSuperview];
           }
         }
+          
+        [self setAdRequest];
 
         self.bannerViewLayout = [[UIView alloc] initWithFrame:CGRectZero];
         self.bannerViewLayout.translatesAutoresizingMaskIntoConstraints = NO;
@@ -549,7 +531,7 @@ BOOL isUsingAdManagerRequest = YES;
                     rootView.frame.size.width)];
         self.bannerView.adUnitID = bannerSaveAdUnitId;
         self.bannerView.delegate = self;
-        [self.bannerView loadRequest:[GADRequest request]];
+        [self.bannerView loadRequest:self.globalRequest];
 
         [self.bannerViewLayout addSubview:self.bannerView];
         [self.bannerViewLayout bringSubviewToFront:self.bannerView];
@@ -563,11 +545,15 @@ BOOL isUsingAdManagerRequest = YES;
   }
 }
 
+
+
+
+/*
+
 - (void)addBannerConstraints {
   self.bannerView.translatesAutoresizingMaskIntoConstraints = NO;
 
-  // Tambahkan constraint berdasarkan posisi
-  if ([Position isEqualToString:@"bottom-center"]) {
+  if ([setPosition isEqualToString:@"bottom-center"]) {
     [self.viewController.view addConstraints:@[
       [NSLayoutConstraint
           constraintWithItem:self.bannerView
@@ -585,7 +571,7 @@ BOOL isUsingAdManagerRequest = YES;
                                   multiplier:1
                                     constant:0]
     ]];
-  } else if ([Position isEqualToString:@"top-center"]) {
+  } else if ([setPosition isEqualToString:@"top-center"]) {
     [self.viewController.view addConstraints:@[
       [NSLayoutConstraint
           constraintWithItem:self.bannerView
@@ -606,10 +592,13 @@ BOOL isUsingAdManagerRequest = YES;
   }
 }
 
+*/
+
+
+
 - (void)loadBannerAd:(CDVInvokedUrlCommand *)command {
   CDVPluginResult *pluginResult;
   NSString *callbackId = command.callbackId;
-  adFormat = 3;
   NSDictionary *options = [command.arguments objectAtIndex:0];
   NSString *adUnitId = [options valueForKey:@"adUnitId"];
   NSString *position = [options valueForKey:@"position"];
@@ -620,6 +609,10 @@ BOOL isUsingAdManagerRequest = YES;
 
   bannerSaveAdUnitId = adUnitId;
 
+  setPosition = position;
+    
+  adFormat = 3;
+
   if (adUnitId == nil || [adUnitId length] == 0) {
     pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR
                                      messageAsString:@"Ad unit ID is required"];
@@ -628,15 +621,16 @@ BOOL isUsingAdManagerRequest = YES;
   }
 
   if (collapsible != nil && [collapsible length] > 0) {
-    enableCollapsible = YES;
+    isCollapsible = YES;
   } else {
-    enableCollapsible = NO;
+    isCollapsible = YES;
   }
 
   if (autoResize) {
-
     isAutoResize = YES;
   }
+    
+  [self setAdRequest];
 
   if (adFormat == 3) {
     dispatch_async(dispatch_get_main_queue(), ^{
@@ -649,28 +643,26 @@ BOOL isUsingAdManagerRequest = YES;
       }
 
       self.viewWidth = frame.size.width;
-
+        
       auto_Show = autoShow;
       adWidth = self.viewWidth;
 
-      Position = position;
-
-      GADAdSize sizes = [self __AdSizeFromString:size];
-      self.bannerView = [[GADBannerView alloc] initWithAdSize:sizes];
-
-      GADRequest *request = [GADRequest request];
+      GADAdSize siz = [self __AdSizeFromString:size];
+      self.bannerView = [[GADBannerView alloc] initWithAdSize:siz];
+        
       GADExtras *extras = [[GADExtras alloc] init];
 
-      if (enableCollapsible) {
+      if (isCollapsible) {
         extras.additionalParameters = @{@"collapsible" : collapsible};
+          
+        [self.globalRequest registerAdNetworkExtras:extras];
+          
       }
 
-      [request registerAdNetworkExtras:extras];
-
       self.bannerView.adUnitID = adUnitId;
       self.bannerView.rootViewController = self.viewController;
       self.bannerView.delegate = self;
-      [self.bannerView loadRequest:request];
+      [self.bannerView loadRequest:self.globalRequest];
       self.bannerView.hidden = YES;
       [parentView addSubview:self.bannerView];
       [parentView bringSubviewToFront:self.bannerView];
@@ -685,6 +677,8 @@ BOOL isUsingAdManagerRequest = YES;
   [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
 }
 
+
+
 - (GADAdSize)__AdSizeFromString:(NSString *)size {
 
   if (self.viewWidth == 0) {
@@ -718,14 +712,7 @@ BOOL isUsingAdManagerRequest = YES;
     [self addBannerViewToView:command];
     pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
   } else {
-    [self fireEvent:@""
-              event:@"on."
-                    @"bann"
-                    @"er."
-                    @"fail"
-                    @"ed."
-                    @"show"
-           withData:nil];
+      [self fireEvent:@"" event:@"on.banner.failed.show" withData:nil];
     pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR];
   }
   [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
@@ -734,7 +721,7 @@ BOOL isUsingAdManagerRequest = YES;
 - (void)addBannerViewToView:(CDVInvokedUrlCommand *)command {
   bannerView.translatesAutoresizingMaskIntoConstraints = NO;
   [self.viewController.view addSubview:bannerView];
-  if ([Position isEqualToString:@"bottom-center"]) {
+  if ([setPosition isEqualToString:@"bottom-center"]) {
     [self.viewController.view addConstraints:@[
       [NSLayoutConstraint
           constraintWithItem:bannerView
@@ -752,7 +739,7 @@ BOOL isUsingAdManagerRequest = YES;
                                   multiplier:1
                                     constant:0]
     ]];
-  } else if ([Position isEqualToString:@"top-center"]) {
+  } else if ([setPosition isEqualToString:@"top-center"]) {
 
     [self.viewController.view addConstraints:@[
       [NSLayoutConstraint
@@ -834,13 +821,15 @@ BOOL isUsingAdManagerRequest = YES;
     adFormat = 1;
     self.appOpenAd = nil;
     
+    [self setAdRequest];
+    
     if (adFormat == 1) {
         dispatch_async(dispatch_get_main_queue(), ^{
-            GADRequest *request = [GADRequest request];
+
             GADExtras *extras = [[GADExtras alloc] init];
-            [request registerAdNetworkExtras:extras];
+            [self.globalRequest registerAdNetworkExtras:extras];
             
-            [GADAppOpenAd loadWithAdUnitID:adUnitId request:request completionHandler:^(GADAppOpenAd *ad, NSError *error) {
+            [GADAppOpenAd loadWithAdUnitID:adUnitId request:self.globalRequest completionHandler:^(GADAppOpenAd *ad, NSError *error) {
                 if (error) {
                     // Send load error to event
                     NSDictionary *errorData = @{@"error": error.localizedDescription ?: @"Unknown error"};
@@ -881,9 +870,6 @@ BOOL isUsingAdManagerRequest = YES;
                 };
                 
                 
-              
-                
-                
                 if (auto_Show) {
                     NSError *presentError = nil;
                     if ([self.appOpenAd canPresentFromRootViewController:self.viewController error:&presentError]) {
@@ -899,7 +885,7 @@ BOOL isUsingAdManagerRequest = YES;
                 }
                 
                 
-                if (ResponseInfo) {
+                if (isResponseInfo) {
                     GADResponseInfo *responseInfo = ad.responseInfo;
                     NSMutableArray *adNetworkInfoArray = [NSMutableArray array];
 
@@ -953,15 +939,7 @@ BOOL isUsingAdManagerRequest = YES;
     pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
   } else {
     pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR];
-    [self fireEvent:@""
-              event:@"on."
-                    @"appO"
-                    @"penA"
-                    @"d."
-                    @"fail"
-                    @"ed."
-                    @"show"
-           withData:nil];
+      [self fireEvent:@"" event:@"on.appOpened.failed.show" withData:nil];
   }
   [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
 }
@@ -975,11 +953,11 @@ BOOL isUsingAdManagerRequest = YES;
     
     auto_Show = autoShow;
     adFormat = 2;
-    
+    [self setAdRequest];
     if (adFormat == 2) {
         dispatch_async(dispatch_get_main_queue(), ^{
-            GADRequest *request = [GADRequest request];
-            [GADInterstitialAd loadWithAdUnitID:adUnitId request:request completionHandler:^(GADInterstitialAd *ad, NSError *error) {
+            
+            [GADInterstitialAd loadWithAdUnitID:adUnitId request:self.globalRequest completionHandler:^(GADInterstitialAd *ad, NSError *error) {
                 if (error) {
                     // Send load error to event
                     NSDictionary *errorData = @{@"error": error.localizedDescription ?: @"Unknown error"};
@@ -1035,7 +1013,7 @@ BOOL isUsingAdManagerRequest = YES;
                 
                 
                 
-                if (ResponseInfo) {
+                if (isResponseInfo) {
                     GADResponseInfo *responseInfo = ad.responseInfo;
                     NSMutableArray *adNetworkInfoArray = [NSMutableArray array];
 
@@ -1109,11 +1087,10 @@ BOOL isUsingAdManagerRequest = YES;
     
     auto_Show = autoShow;
     adFormat = 4;
-    
+    [self setAdRequest];
     if (adFormat == 4) {
         dispatch_async(dispatch_get_main_queue(), ^{
-            GADRequest *request = [GADRequest request];
-            [GADRewardedInterstitialAd loadWithAdUnitID:adUnitId request:request completionHandler:^(GADRewardedInterstitialAd *ad, NSError *error) {
+            [GADRewardedInterstitialAd loadWithAdUnitID:adUnitId request:self.globalRequest completionHandler:^(GADRewardedInterstitialAd *ad, NSError *error) {
                 if (error) {
                     // Send error data to event
                     NSDictionary *errorData = @{@"error": error.localizedDescription ?: @"Unknown error"};
@@ -1130,7 +1107,6 @@ BOOL isUsingAdManagerRequest = YES;
                 [self fireEvent:@"" event:@"on.rewardedInt.loaded" withData:nil];
                 
                 
-                
                 __weak __typeof(self) weakSelf = self;
                 self.rewardedInterstitialAd.paidEventHandler = ^(GADAdValue *_Nonnull value) {
                     __strong __typeof(weakSelf) strongSelf = weakSelf;
@@ -1183,7 +1159,7 @@ BOOL isUsingAdManagerRequest = YES;
                     }
                     
                     
-                    if (ResponseInfo) {
+                    if (isResponseInfo) {
                         GADResponseInfo *responseInfo = ad.responseInfo;
                         NSMutableArray *adNetworkInfoArray = [NSMutableArray array];
 
@@ -1216,9 +1192,6 @@ BOOL isUsingAdManagerRequest = YES;
                         }
                     }
                     
-                    
-                    
-                    
                 }
             }];
         });
@@ -1274,12 +1247,10 @@ BOOL isUsingAdManagerRequest = YES;
     BOOL autoShow = [[options valueForKey:@"autoShow"] boolValue];
     auto_Show = autoShow;
     adFormat = 3;
-    
+    [self setAdRequest];
     if (adFormat == 3) {
         dispatch_async(dispatch_get_main_queue(), ^{
-            GADRequest *request = [GADRequest request];
-            
-            [GADRewardedAd loadWithAdUnitID:adUnitId request:request completionHandler:^(GADRewardedAd *ad, NSError *error) {
+            [GADRewardedAd loadWithAdUnitID:adUnitId request:self.globalRequest completionHandler:^(GADRewardedAd *ad, NSError *error) {
                 if (error) {
                     NSDictionary *errorData = @{@"error": error.localizedDescription ?: @"Unknown error"};
                     NSData *jsonData = [NSJSONSerialization dataWithJSONObject:errorData options:0 error:nil];
@@ -1297,17 +1268,14 @@ BOOL isUsingAdManagerRequest = YES;
                 __weak __typeof(self) weakSelf = self;
                 self.rewardedAd.paidEventHandler = ^(GADAdValue *_Nonnull value) {
                     __strong __typeof(weakSelf) strongSelf = weakSelf;
-                    if (!strongSelf) return; // Pastikan strongSelf tidak null
+                    if (!strongSelf) return;
                     
-                    // Mengambil data ad revenue
                     NSDecimalNumber *adValue = value.value;
                     NSString *currencyCode = value.currencyCode;
                     GADAdValuePrecision precision = value.precision;
 
-                    // Mendapatkan ID unit iklan
                     NSString *adUnitId = strongSelf.rewardedAd.adUnitID;
 
-                    // Mengirim data dalam format JSON
                     NSDictionary *data = @{
                         @"value": adValue,
                         @"currencyCode": currencyCode,
@@ -1337,7 +1305,7 @@ BOOL isUsingAdManagerRequest = YES;
                             
                             [self fireEvent:@"" event:@"on.reward.userEarnedReward" withData:rewardJsonString];
                             isAdSkip = 2;
-                          //  NSLog(@"Reward diterima dengan currency %@, amount %lf", reward.type, [reward.amount doubleValue]);
+                        
                         }];
                     } else {
                         NSDictionary *errorData = @{@"error": presentError.localizedDescription ?: @"Unknown error"};
@@ -1347,7 +1315,7 @@ BOOL isUsingAdManagerRequest = YES;
                     }
                     
                     
-                    if (ResponseInfo) {
+                    if (isResponseInfo) {
                         GADResponseInfo *responseInfo = ad.responseInfo;
                         NSMutableArray *adNetworkInfoArray = [NSMutableArray array];
 
@@ -1514,9 +1482,10 @@ BOOL isUsingAdManagerRequest = YES;
   return hexString;
 }
 
-#pragma mark GADBannerViewDelegate implementation
+ #pragma mark GADBannerViewDelegate implementation
 
 - (void)bannerViewDidReceiveAd:(GADBannerView *)bannerView {
+   // NSLog(@"The last loaded banner is %@collapsible.", (bannerView.isCollapsible ? @"" : @"not "));
     NSString *collapsibleStatus = bannerView.isCollapsible ? @"collapsible" : @"not collapsible";
     NSDictionary *eventData = @{@"collapsible" : collapsibleStatus};
     NSError *error;
@@ -1529,7 +1498,6 @@ BOOL isUsingAdManagerRequest = YES;
 
     [self fireEvent:@"" event:@"on.banner.load" withData:nil];
     
-    
     if (auto_Show && self.bannerView) {
         [self addBannerViewToView:command];
         self.bannerView.hidden = NO;
@@ -1566,7 +1534,7 @@ BOOL isUsingAdManagerRequest = YES;
     
     
     
-    if (ResponseInfo) {
+    if (isResponseInfo) {
         GADResponseInfo *responseInfo = self.bannerView.responseInfo;
         NSMutableArray *adNetworkInfoArray = [NSMutableArray array];
 
@@ -1637,7 +1605,7 @@ BOOL isUsingAdManagerRequest = YES;
     [self fireEvent:@"" event:@"on.banner.did.dismiss" withData:nil];
 }
 
-#pragma GADFullScreeContentDelegate implementation
+#pragma mark GADFullScreeContentDelegate implementation
 
 - (void)adWillPresentFullScreenContent:(id)ad {
     if (adFormat == 1) {