cordova-plugin-admob-nextgen 2.0.0 → 2.0.1

package/README.md

@@ -115,7 +115,7 @@ This plugin is regularly updated to support the latest standards.
 
 | Component | Platform | Version | Release Notes |
 | :--- | :--- | :--- | :--- |
-| **GMA Next-Gen SDK** | Android | **1.2.1** | [View Notes](https://developers.google.com/admob/android/next-gen/rel-notes) |
+| **GMA Next-Gen SDK** | Android | **1.3.0** | [View Notes](https://developers.google.com/admob/android/next-gen/rel-notes) |
 | **UMP SDK** | Android | **4.0.0** | [View Notes](https://developers.google.com/admob/android/privacy/release-notes) |
 | **Mobile Ads SDK** | iOS | **13.3.0** | [View Notes](https://developers.google.com/admob/ios/rel-notes) |
 | **UMP SDK** | iOS | **3.1.0** | [View Notes](https://developers.google.com/ad-manager/mobile-ads-sdk/ios/privacy/download) |
@@ -289,7 +289,10 @@ admobNextGen.getTCData(function(tcData) {
 ```
 
 #### B: Advanced Usage (Raw Data Control)
-Advanced users who want full control over the consent logic can completely ignore the built-in boolean flags. The plugin exposes the raw IAB TCF data directly from the device's local storage (`purposeConsents`, `purposeLegitimateInterests`, `vendorConsents`, etc.), allowing you to manipulate and build custom conditions based on your own specific requirements.
+
+Advanced users who want full control over the consent logic can completely ignore the built-in boolean flags. The plugin now dynamically extracts and exposes **ALL standard IAB TCF v2 keys** directly from the device's local storage. 
+
+This means you have full access to every `IABTCF_` prefixed key (such as `IABTCF_PurposeConsents`, `IABTCF_VendorLegitimateInterests`, `IABTCF_SpecialFeaturesOptIns`, etc.), allowing you to manipulate and build custom enum conditions based on your own specific architecture requirements.
 
 ```javascript
 admobNextGen.getTCData(function(tcData) {
@@ -298,21 +301,24 @@ admobNextGen.getTCData(function(tcData) {
     // Note: IAB TCF strings are 1-indexed, but JavaScript strings are 0-indexed.
     // Index 0 represents Purpose 1, Index 2 represents Purpose 3, etc.
     
-    const purposes = tcData.purposeConsents || "";
-    const lis = tcData.purposeLegitimateInterests || "";
-    const vendors = tcData.vendorConsents || "";
-
-    // const tcs = tcData.tcString;
-    // const region = tcData.gdprApplies;
+    // You can use the standard IABTCF_ keys extracted dynamically by the plugin
+    const purposes = tcData.IABTCF_PurposeConsents || "";
+    const lis = tcData.IABTCF_PurposeLegitimateInterests || "";
+    const vendors = tcData.IABTCF_VendorConsents || "";
+    const vendorLIs = tcData.IABTCF_VendorLegitimateInterests || ""; 
+
+    // const tcs = tcData.IABTCF_TCString;
+    // const region = tcData.IABTCF_gdprApplies;
     
     // Custom logic example: Check if Purpose 1 and Purpose 3 are explicitly granted
     const hasPurpose1 = purposes.charAt(0) === '1';
     const hasPurpose3 = purposes.charAt(2) === '1';
     
-    // Check if Vendor 755 (Google) is granted (Index 754)
-    const hasGoogleVendor = vendors.charAt(754) === '1';
+    // Check if Vendor 755 (Google) Consent OR Legitimate Interest is granted (Index 754)
+    const hasGoogleVendorConsent = vendors.charAt(754) === '1';
+    const hasGoogleVendorLI = vendorLIs.charAt(754) === '1';
     
-    if (hasPurpose1 && hasPurpose3 && hasGoogleVendor) {
+    if (hasPurpose1 && hasPurpose3 && (hasGoogleVendorConsent || hasGoogleVendorLI)) {
         console.log("Custom advanced condition met!");
         // Your custom ad loading logic here
     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-admob-nextgen",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Google Mobile Ads Next Gen SDK for Cordova. High performance and modular architecture. ",
   "cordova": {
     "id": "cordova-plugin-admob-nextgen",

package/plugin.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <plugin id="cordova-plugin-admob-nextgen" 
-        version="2.0.0" 
+        version="2.0.1" 
         xmlns="http://apache.org/cordova/ns/plugins/1.0" 
         xmlns:android="http://schemas.android.com/apk/res/android">
 
@@ -20,7 +20,7 @@
             </feature>
         </config-file>
 
-        <config-file parent="/manifest/application" target="AndroidManifest.xml">
+        <config-file target="AndroidManifest.xml" parent="/manifest/application">
             <meta-data android:name="com.google.android.gms.ads.APPLICATION_ID" android:value="$APP_ID_ANDROID"/>
         </config-file>
         
@@ -53,7 +53,7 @@
         
     </platform>
 
-    <preference name="NEXT_GEN_SDK_VERSION" default="1.2.1" />
+    <preference name="NEXT_GEN_SDK_VERSION" default="1.3.0" />
     <preference name="UMP_VERSION" default="4.0.0" />
     <!-- Sample AdMob app ID: ca-app-pub-3940256099942544~3347511713 -->
     <preference name="APP_ID_ANDROID" default="ca-app-pub-3940256099942544~3347511713" />

package/src/android/ConsentExecutor.java

@@ -18,6 +18,7 @@ import org.json.JSONObject;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Locale;
+import java.util.Map;
 
 import com.google.android.ump.ConsentDebugSettings;
 import com.google.android.ump.ConsentInformation;
@@ -47,6 +48,7 @@ public class ConsentExecutor {
                 boolean resetConsent = false;
                 boolean tagForUnderAgeOfConsent = false;
 
+                boolean tempShowFormIfRequired = true;
                 if (options != null) {
                     debugMode = options.optBoolean("debug", false);
                     manualTestDeviceId = options.optString("testDeviceId", "");
@@ -55,6 +57,8 @@ public class ConsentExecutor {
                     if (options.has("tagForUnderAgeOfConsent")) {
                         tagForUnderAgeOfConsent = options.getBoolean("tagForUnderAgeOfConsent");
                     }
+
+                    tempShowFormIfRequired = options.optBoolean("showFormIfRequired", true);
                 }
 
                 if (resetConsent) {
@@ -62,6 +66,8 @@ public class ConsentExecutor {
 
                 }
 
+                final boolean showFormIfRequired = tempShowFormIfRequired;
+
                 ConsentRequestParameters.Builder paramsBuilder = new ConsentRequestParameters.Builder();
                 paramsBuilder.setTagForUnderAgeOfConsent(tagForUnderAgeOfConsent);
 
@@ -94,21 +100,25 @@ public class ConsentExecutor {
 
                                 fireEvent("on.consent.info.update", null);
 
-                                UserMessagingPlatform.loadAndShowConsentFormIfRequired(
-                                        activity,
-                                        (FormError loadAndShowError) -> {
-                                            if (loadAndShowError != null) {
-
-                                                sendErrorEvent(loadAndShowError);
-                                                callbackContext.error(loadAndShowError.getMessage());
-                                            } else {
+                                if (showFormIfRequired) {
+                                    UserMessagingPlatform.loadAndShowConsentFormIfRequired(
+                                            activity,
+                                            (FormError loadAndShowError) -> {
+                                                if (loadAndShowError != null) {
+
+                                                    sendErrorEvent(loadAndShowError);
+                                                    callbackContext.error(loadAndShowError.getMessage());
+                                                } else {
+                                                    fireEvent("on.consent.form.dismissed", null);
+                                                    sendConsentStatus(callbackContext);
+                                                }
+                                            }
+                                    );
+                                } else {
 
-                                                fireEvent("on.consent.form.dismissed", null);
+                                    sendConsentStatus(callbackContext);
+                                }
 
-                                                sendConsentStatus(callbackContext);
-                                            }
-                                        }
-                                );
                             },
                             (FormError requestConsentError) -> {
 
@@ -128,15 +138,20 @@ public class ConsentExecutor {
             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(cordova.getActivity());
             JSONObject tcData = new JSONObject();
 
-            String tcString = prefs.getString("IABTCF_TCString", "");
+            Map<String, ?> allEntries = prefs.getAll();
+            for (Map.Entry<String, ?> entry : allEntries.entrySet()) {
+                if (entry.getKey().startsWith("IABTCF_")) {
+                    tcData.put(entry.getKey(), entry.getValue());
+                }
+            }
+
             String purposeConsents = prefs.getString("IABTCF_PurposeConsents", "");
             String purposeLegitimateInterests = prefs.getString("IABTCF_PurposeLegitimateInterests", ""); 
             String vendorConsents = prefs.getString("IABTCF_VendorConsents", "");
             int gdprApplies = prefs.getInt("IABTCF_gdprApplies", 0);
 
-            tcData.put("tcString", tcString);
             tcData.put("purposeConsents", purposeConsents);
-            tcData.put("purposeLegitimateInterests", purposeLegitimateInterests); 
+            tcData.put("purposeLegitimateInterests", purposeLegitimateInterests);
             tcData.put("vendorConsents", vendorConsents);
             tcData.put("gdprApplies", gdprApplies);
 

package/src/ios/ConsentExecutor.m

@@ -26,6 +26,8 @@
             BOOL resetConsent = options[@"reset"] ? [options[@"reset"] boolValue] : NO;
             BOOL tagForUnderAgeOfConsent = options[@"tagForUnderAgeOfConsent"] ? [options[@"tagForUnderAgeOfConsent"] boolValue] : NO;
 
+            BOOL showFormIfRequired = options[@"showFormIfRequired"] ? [options[@"showFormIfRequired"] boolValue] : YES;
+
             if (resetConsent) {
                 [UMPConsentInformation.sharedInstance reset];
 
@@ -65,22 +67,24 @@
 
                 [self.plugin fireEvent:@"document" event:@"on.consent.info.update" withData:nil];
 
-                [UMPConsentForm loadAndPresentIfRequiredFromViewController:self.plugin.viewController completionHandler:^(NSError * _Nullable loadAndPresentError) {
-
-                    if (loadAndPresentError) {
-
-                        [self sendErrorEvent:loadAndPresentError];
-                        if (command) {
-                            CDVPluginResult* errRes = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:loadAndPresentError.localizedDescription];
-                            [self.plugin.commandDelegate sendPluginResult:errRes callbackId:command.callbackId];
+                if (showFormIfRequired) {
+                    [UMPConsentForm loadAndPresentIfRequiredFromViewController:self.plugin.viewController completionHandler:^(NSError * _Nullable loadAndPresentError) {
+
+                        if (loadAndPresentError) {
+                            [self sendErrorEvent:loadAndPresentError];
+                            if (command) {
+                                CDVPluginResult* errRes = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:loadAndPresentError.localizedDescription];
+                                [self.plugin.commandDelegate sendPluginResult:errRes callbackId:command.callbackId];
+                            }
+                        } else {
+                            [self.plugin fireEvent:@"document" event:@"on.consent.form.dismissed" withData:nil];
+                            [self sendConsentStatus:command];
                         }
-                    } else {
-
-                        [self.plugin fireEvent:@"document" event:@"on.consent.form.dismissed" withData:nil];
+                    }];
+                } else {
 
-                        [self sendConsentStatus:command];
-                    }
-                }];
+                    [self sendConsentStatus:command];
+                }
             }];
 
         } @catch (NSException *exception) {
@@ -98,14 +102,19 @@
             NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
             NSMutableDictionary *tcData = [NSMutableDictionary dictionary];
 
-            NSString *tcString = [prefs stringForKey:@"IABTCF_TCString"] ?: @"";
+            NSDictionary *allDefaults = [prefs dictionaryRepresentation];
+            for (NSString *key in allDefaults) {
+                 if ([key hasPrefix:@"IABTCF_"]) {
+                 tcData[key] = allDefaults[key];
+                }
+            }
+
             NSString *purposeConsents = [prefs stringForKey:@"IABTCF_PurposeConsents"] ?: @"";
             NSString *purposeLegitimateInterests = [prefs stringForKey:@"IABTCF_PurposeLegitimateInterests"] ?: @""; 
             NSString *vendorConsents = [prefs stringForKey:@"IABTCF_VendorConsents"] ?: @"";
             NSString *additionalConsent = [prefs stringForKey:@"IABTCF_AddtlConsent"] ?: @"";
             NSInteger gdprApplies = [prefs integerForKey:@"IABTCF_gdprApplies"];
 
-            tcData[@"tcString"] = tcString;
             tcData[@"purposeConsents"] = purposeConsents;
             tcData[@"purposeLegitimateInterests"] = purposeLegitimateInterests; 
             tcData[@"vendorConsents"] = vendorConsents;

package/www/admob-nextgen.js

@@ -15,10 +15,12 @@ var AdMobNextGen = {
     },
 
     setRequestConfiguration: function (config, success, error) {
+        config = config || {};
         exec(success, error, 'AdMobNextGen', 'setRequestConfiguration', [config]);
     },
 
     requestConsentInfo: function (options, success, error) {
+        options = options || {};
         exec(success, error, 'AdMobNextGen', 'requestConsentInfo', [options]);
     },