@ququplay/admob 8.0.5 → 8.0.6

package/android/src/main/java/com/getcapacitor/community/admob/banner/BannerExecutor.java

@@ -13,8 +13,6 @@ import android.widget.RelativeLayout;
 import androidx.annotation.NonNull;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.util.Supplier;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.community.admob.helpers.AdViewIdHelper;
@@ -35,7 +33,6 @@ public class BannerExecutor extends Executor {
     private RelativeLayout mAdViewLayout;
     private AdView mAdView;
     private ViewGroup mViewGroup;
-    private CoordinatorLayout.LayoutParams mAdViewLayoutParams;
 
     public BannerExecutor(
         Supplier<Context> contextSupplier,
@@ -88,7 +85,7 @@ public class BannerExecutor extends Executor {
             mAdViewLayout.setHorizontalGravity(Gravity.CENTER_HORIZONTAL);
             mAdViewLayout.setVerticalGravity(Gravity.BOTTOM);
 
-            mAdViewLayoutParams = new CoordinatorLayout.LayoutParams(
+            final CoordinatorLayout.LayoutParams mAdViewLayoutParams = new CoordinatorLayout.LayoutParams(
                 CoordinatorLayout.LayoutParams.WRAP_CONTENT,
                 CoordinatorLayout.LayoutParams.WRAP_CONTENT
             );
@@ -106,37 +103,45 @@ public class BannerExecutor extends Executor {
                     break;
             }
 
+            // set Safe Area only for Android 15+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+                View rootView = activitySupplier.get().getWindow().getDecorView();
+                rootView.setOnApplyWindowInsetsListener((v, insets) -> {
+                    int bottomInset = insets.getSystemWindowInsetBottom();
+                    int topInset = insets.getSystemWindowInsetTop();
+
+                    if ("TOP_CENTER".equals(adOptions.position)) {
+                        mAdViewLayoutParams.setMargins(0, topInset, 0, 0);
+                    } else {
+                        mAdViewLayoutParams.setMargins(0, 0, 0, bottomInset);
+                    }
+
+                    mAdViewLayout.setLayoutParams(mAdViewLayoutParams);
+                    return insets;
+                });
+            }
+
+            mAdViewLayout.setLayoutParams(mAdViewLayoutParams);
+
             int densityMargin = (int) (adOptions.margin * density);
 
             // Center Banner Ads
             int adWidth = (int) (adOptions.adSize.getSize().getWidth() * density);
 
-            final int baseSideMargin;
             if (adWidth <= 0 || adOptions.adSize.toString().equals("ADAPTIVE_BANNER")) {
                 int margin = 0;
                 if (fullscreen) {
                     margin = (realWidthPixels - defaultWidthPixels) / 2;
                 }
-                baseSideMargin = margin;
+                mAdViewLayoutParams.setMargins(margin, densityMargin, margin, densityMargin);
             } else {
                 int sideMargin = ((int) defaultWidthPixels - adWidth) / 2;
                 if (fullscreen) {
                     sideMargin = (realWidthPixels - adWidth) / 2;
                 }
-                baseSideMargin = sideMargin;
-            }
-
-            applyBannerMargins(adOptions, baseSideMargin, densityMargin);
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
-                ViewCompat.setOnApplyWindowInsetsListener(mAdViewLayout, (v, insets) -> {
-                    applyBannerMargins(adOptions, baseSideMargin, densityMargin);
-                    return insets;
-                });
+                mAdViewLayoutParams.setMargins(sideMargin, densityMargin, sideMargin, densityMargin);
             }
 
-            mAdViewLayout.setLayoutParams(mAdViewLayoutParams);
-
             createNewAdView(adOptions);
 
             call.resolve();
@@ -226,27 +231,6 @@ public class BannerExecutor extends Executor {
             });
     }
 
-    private void applyBannerMargins(AdOptions adOptions, int sideMargin, int densityMargin) {
-        int topInset = 0;
-        int bottomInset = 0;
-
-        WindowInsetsCompat insets = ViewCompat.getRootWindowInsets(mAdViewLayout != null ? mAdViewLayout : mViewGroup);
-        if (insets != null) {
-            topInset = insets.getInsets(WindowInsetsCompat.Type.systemBars()).top;
-            bottomInset = insets.getInsets(WindowInsetsCompat.Type.systemBars()).bottom;
-        }
-
-        if ("TOP_CENTER".equals(adOptions.position)) {
-            mAdViewLayoutParams.setMargins(sideMargin, densityMargin + topInset, sideMargin, 0);
-        } else {
-            mAdViewLayoutParams.setMargins(sideMargin, densityMargin, sideMargin, densityMargin + bottomInset);
-        }
-
-        if (mAdViewLayout != null) {
-            mAdViewLayout.setLayoutParams(mAdViewLayoutParams);
-        }
-    }
-
     /**
      * Follow iOS method Name:
      * https://developers.google.com/admob/ios/banner?hl=ja

package/android/src/main/java/com/getcapacitor/community/admob/consent/AdConsentExecutor.java

@@ -61,38 +61,76 @@ public class AdConsentExecutor extends Executor {
         );
     }
 
+    /**
+     * Erases ALL core IAB TCF records simultaneously to prevent leaving
+     * orphaned consent data that will crash Google Ad serving.
+     */
+    private void clearAllTCFPreferences(SharedPreferences prefs) {
+        prefs
+            .edit()
+            .remove("IABTCF_TCString")
+            .remove("IABTCF_PurposeConsents")
+            .remove("IABTCF_VendorConsents")
+            .remove("IABTCF_PurposeLegitimateInterests")
+            .remove("IABTCF_VendorLegitimateInterests")
+            .remove("IABTCF_gdprApplies") // Force SDK to reassess context
+            .apply();
+        Log.w(logTag, "Successfully purged all IABTCF tracking variables from SharedPreferences.");
+    }
+
     public boolean isConsentOutdated() {
         Context context = contextSupplier.get();
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context.getApplicationContext());
+
         String tcString = prefs.getString("IABTCF_TCString", "");
 
         if (tcString == null || tcString.isEmpty()) {
             return false;
         }
 
-        // base64 alphabet used to store data in IABTCF string
+        // 1. Safety Boundary Check: If string is way too short, it's corrupted.
+        if (tcString.length() < 7) {
+            clearAllTCFPreferences(prefs);
+            return true;
+        }
+
+        // Base64url alphabet used in IAB TCF specifications
         String base64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
 
-        // date is stored in digits 1..7 of the IABTCF string
+        // 2. Extract and Validate TCF Specification Version (First 6 bits / 1st character)
+        char versionChar = tcString.charAt(0);
+        int tcfVersion = base64.indexOf(versionChar);
+
+        // TCF v2.0 through v2.3 strings all use a '2' value in the version bit field
+        if (tcfVersion != 2) {
+            clearAllTCFPreferences(prefs);
+            return true;
+        }
+
+        // 3. Extract and Parse Timestamp (Characters at indexes 1 through 6 inclusive)
         String dateSubstring = tcString.substring(1, 7);
 
-        // interpret date substring as base64-encoded integer value
         long timestamp = 0L;
-
         for (char c : dateSubstring.toCharArray()) {
             int value = base64.indexOf(c);
+            if (value == -1) {
+                clearAllTCFPreferences(prefs);
+                return true;
+            }
             timestamp = timestamp * 64 + value;
         }
 
-        // timestamp is given in deci-seconds, convert to milliseconds
+        // Timestamp is given in deci-seconds, convert to milliseconds
         timestamp *= 100;
 
-        // compare with current timestamp to get age in days
+        // 4. Calculate Age in Days
         long daysAgo = (System.currentTimeMillis() - timestamp) / (1000 * 60 * 60 * 24);
 
-        // delete TC string if age is over a year
-        if (daysAgo > 365) {
-            prefs.edit().remove("IABTCF_TCString").apply();
+        // 5. Enforce Expiration Hard Limits
+        // Google hard-caps ad server acceptance at 395 days (13 months).
+        // The IAB TCF policy requires CMP re-checks at 365 days (12 months).
+        if (daysAgo > 365 || daysAgo < 0) {
+            clearAllTCFPreferences(prefs);
             return true;
         }
 
@@ -163,12 +201,16 @@ public class AdConsentExecutor extends Executor {
                 activitySupplier.get(),
                 consentRequestParameters,
                 () -> {
+                    // Check (and possibly purge) outdated consent before reading the
+                    // remaining values, so they reflect the post-cleanup state.
+                    boolean isConsentOutdated = isConsentOutdated();
+
                     JSObject consentInfo = new JSObject();
                     consentInfo.put("status", getConsentStatusString(consentInformation.getConsentStatus()));
                     consentInfo.put("isConsentFormAvailable", consentInformation.isConsentFormAvailable());
+                    consentInfo.put("isConsentOutdated", isConsentOutdated);
                     consentInfo.put("canShowAds", canShowAds());
                     consentInfo.put("canShowPersonalizedAds", canShowPersonalizedAds());
-                    consentInfo.put("isConsentOutdated", isConsentOutdated());
                     consentInfo.put("canRequestAds", consentInformation.canRequestAds());
                     consentInfo.put("privacyOptionsRequirementStatus", consentInformation.getPrivacyOptionsRequirementStatus().name());
                     call.resolve(consentInfo);
@@ -223,6 +265,10 @@ public class AdConsentExecutor extends Executor {
                                 if (formError != null) {
                                     call.reject("Error when show consent form", formError.getMessage());
                                 } else {
+                                    // Check (and possibly purge) outdated consent before reading the
+                                    // remaining values, so they reflect the post-cleanup state.
+                                    boolean isConsentOutdated = isConsentOutdated();
+
                                     JSObject consentFormInfo = new JSObject();
                                     consentFormInfo.put("status", getConsentStatusString(consentInformation.getConsentStatus()));
                                     consentFormInfo.put("isConsentFormAvailable", consentInformation.isConsentFormAvailable());
@@ -231,9 +277,9 @@ public class AdConsentExecutor extends Executor {
                                         "privacyOptionsRequirementStatus",
                                         consentInformation.getPrivacyOptionsRequirementStatus().name()
                                     );
+                                    consentFormInfo.put("isConsentOutdated", isConsentOutdated);
                                     consentFormInfo.put("canShowAds", canShowAds());
                                     consentFormInfo.put("canShowPersonalizedAds", canShowPersonalizedAds());
-                                    consentFormInfo.put("isConsentOutdated", isConsentOutdated());
 
                                     call.resolve(consentFormInfo);
                                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ququplay/admob",
-  "version": "8.0.5",
+  "version": "8.0.6",
   "description": "A native plugin for AdMob",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -98,4 +98,4 @@
       "src": "android"
     }
   }
-}
+}