Google/20.6.0.1

AppLovin · Feb 28, 2022 · d68a600 · d68a600
1 parent 5ec89cf
commit d68a600
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/Google/CHANGELOG.md b/Google/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 20.6.0.1
+* Fix AdChoices `getLocalExtraParameters()` crash. Publishers can set a custom placement on AppLovin SDKs 11.0.0+ and the placement is defaulted to the top right corner otherwise.
+
 ## 20.6.0.0
 * Certified with Google SDK 20.6.0.
 

diff --git a/Google/build.gradle.kts b/Google/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 private val versionMajor = 20
 private val versionMinor = 6
 private val versionPatch = 0
-private val versionAdapterPatch = 0
+private val versionAdapterPatch = 1
 
 val libraryVersionName by extra("${versionMajor}.${versionMinor}.${versionPatch}.${versionAdapterPatch}")
 val libraryVersionCode by extra((versionMajor * 1000000) + (versionMinor * 10000) + (versionPatch * 100) + versionAdapterPatch)

diff --git a/Google/src/main/java/com/applovin/mediation/adapters/GoogleMediationAdapter.java b/Google/src/main/java/com/applovin/mediation/adapters/GoogleMediationAdapter.java
@@ -482,7 +482,7 @@ public void loadAdViewAd(final MaxAdapterResponseParameters parameters, final Ma
         if ( isNative )
         {
             NativeAdOptions.Builder nativeAdOptionsBuilder = new NativeAdOptions.Builder();
-            nativeAdOptionsBuilder.setAdChoicesPlacement( getAdChoicesPlacement( parameters.getLocalExtraParameters() ) );
+            nativeAdOptionsBuilder.setAdChoicesPlacement( getAdChoicesPlacement( parameters ) );
             nativeAdOptionsBuilder.setRequestMultipleImages( adFormat == MaxAdFormat.MREC ); // MRECs can handle multiple images via AdMob's media view
 
             NativeAdViewListener nativeAdViewListener = new NativeAdViewListener( parameters, adFormat, activity, listener );
@@ -521,7 +521,7 @@ public void loadNativeAd(final MaxAdapterResponseParameters parameters, final Ac
         AdRequest adRequest = createAdRequestWithParameters( isBiddingAd, parameters, activity );
 
         NativeAdOptions.Builder nativeAdOptionsBuilder = new NativeAdOptions.Builder();
-        nativeAdOptionsBuilder.setAdChoicesPlacement( getAdChoicesPlacement( parameters.getLocalExtraParameters() ) );
+        nativeAdOptionsBuilder.setAdChoicesPlacement( getAdChoicesPlacement( parameters ) );
 
         // Medium templates can handle multiple images via AdMob's media view
         String template = BundleUtils.getString( "template", "", parameters.getServerParameters() );
@@ -746,11 +746,19 @@ private boolean isValidNativeAd(final NativeAd nativeAd)
         return nativeAd.getHeadline() != null;
     }
 
-    private int getAdChoicesPlacement(Map<String, Object> localExtraParams)
+    private int getAdChoicesPlacement(MaxAdapterResponseParameters parameters)
     {
         // Publishers can set via nativeAdLoader.setLocalExtraParameter( "admob_ad_choices_placement", ADCHOICES_BOTTOM_LEFT );
-        final Object adChoicesPlacementObj = localExtraParams.get( "admob_ad_choices_placement" );
-        return isValidAdChoicesPlacement( adChoicesPlacementObj ) ? (Integer) adChoicesPlacementObj : NativeAdOptions.ADCHOICES_TOP_RIGHT;
+        // Note: This feature requires AppLovin v11.0.0+
+        if ( AppLovinSdk.VERSION_CODE >= 11_00_00_00 )
+        {
+            final Map<String, Object> localExtraParams = parameters.getLocalExtraParameters();
+            final Object adChoicesPlacementObj = localExtraParams != null ? localExtraParams.get( "admob_ad_choices_placement" ) : null;
+
+            return isValidAdChoicesPlacement( adChoicesPlacementObj ) ? (Integer) adChoicesPlacementObj : NativeAdOptions.ADCHOICES_TOP_RIGHT;
+        }
+
+        return NativeAdOptions.ADCHOICES_TOP_RIGHT;
     }
 
     private boolean isValidAdChoicesPlacement(Object placementObj)