react-native-applovin-max 3.2.2 → 3.3.1

package/android/build.gradle

@@ -16,7 +16,7 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.5.2'
+    classpath 'com.android.tools.build:gradle:3.5.4'
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
@@ -41,8 +41,8 @@ android {
   defaultConfig {
     minSdkVersion 16
     targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
-    versionCode 3020200
-    versionName "3.2.2"
+    versionCode 3030100
+    versionName "3.3.1"
   }
 
   flavorDimensions("default")
@@ -150,5 +150,5 @@ dependencies {
 
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-  implementation 'com.applovin:applovin-sdk:11.4.4'
+  implementation 'com.applovin:applovin-sdk:11.5.1'
 }

package/android/src/main/java/com/applovin/reactnative/AppLovinMAXAdView.java

@@ -19,9 +19,14 @@ class AppLovinMAXAdView
 {
     private final ThemedReactContext reactContext;
 
-    private MaxAdView adView;
-    private int       currentWidthPx;
-    private int       currentHeightPx;
+    private @Nullable MaxAdView adView;
+
+    private           String      adUnitId;
+    private           MaxAdFormat adFormat;
+    private @Nullable String      placement;
+    private @Nullable String      customData;
+    private           boolean     adaptiveBannerEnabled;
+    private           boolean     autoRefresh;
 
     public AppLovinMAXAdView(final Context context)
     {
@@ -29,6 +34,93 @@ class AppLovinMAXAdView
         this.reactContext = (ThemedReactContext) context;
     }
 
+    public void setAdUnitId(final String value)
+    {
+        // Ad Unit ID must be set prior to creating MaxAdView
+        if ( adView != null )
+        {
+            AppLovinMAXModule.e( "Attempting to set Ad Unit ID " + value + " after MaxAdView is created" );
+            return;
+        }
+
+        adUnitId = value;
+
+        maybeAttachAdView();
+    }
+
+    public void setAdFormat(final String value)
+    {
+        // Ad format must be set prior to creating MaxAdView
+        if ( adView != null )
+        {
+            AppLovinMAXModule.e( "Attempting to set ad format " + value + " after MaxAdView is created" );
+            return;
+        }
+
+        if ( "banner".equals( value ) )
+        {
+            adFormat = AppLovinMAXModule.getDeviceSpecificBannerAdViewAdFormat( reactContext );
+        }
+        else if ( "mrec".equals( value ) )
+        {
+            adFormat = MaxAdFormat.MREC;
+        }
+        else
+        {
+            AppLovinMAXModule.e( "Attempting to set an invalid ad format of \"" + value + "\" for " + adUnitId );
+            return;
+        }
+
+        maybeAttachAdView();
+    }
+
+    public void setPlacement(@Nullable final String value)
+    {
+        placement = value;
+
+        if ( adView != null )
+        {
+            adView.setPlacement( placement );
+        }
+    }
+
+    public void setCustomData(@Nullable final String value)
+    {
+        customData = value;
+
+        if ( adView != null )
+        {
+            adView.setCustomData( customData );
+        }
+    }
+
+    public void setAdaptiveBannerEnabled(final boolean enabled)
+    {
+        adaptiveBannerEnabled = enabled;
+
+        if ( adView != null )
+        {
+            adView.setExtraParameter( "adaptive_banner", Boolean.toString( enabled ) );
+        }
+    }
+
+    public void setAutoRefresh(final boolean enabled)
+    {
+        autoRefresh = enabled;
+
+        if ( adView != null )
+        {
+            if ( autoRefresh )
+            {
+                adView.startAutoRefresh();
+            }
+            else
+            {
+                adView.stopAutoRefresh();
+            }
+        }
+    }
+
     @Override
     public void requestLayout()
     {
@@ -38,6 +130,9 @@ class AppLovinMAXAdView
         // This is required to ensure ad refreshes render correctly in RN Android due to known issue where `getWidth()` and `getHeight()` return 0 on attach
         if ( adView != null )
         {
+            int currentWidthPx = getWidth();
+            int currentHeightPx = getHeight();
+
             adView.measure(
                     MeasureSpec.makeMeasureSpec( currentWidthPx, MeasureSpec.EXACTLY ),
                     MeasureSpec.makeMeasureSpec( currentHeightPx, MeasureSpec.EXACTLY )
@@ -68,13 +163,7 @@ class AppLovinMAXAdView
         }
     }
 
-    @Nullable
-    protected MaxAdView getAdView()
-    {
-        return adView;
-    }
-
-    public void maybeAttachAdView(final String placement, final String customData, final String adaptiveBannerEnabledStr, final String adUnitId, final MaxAdFormat adFormat)
+    private void maybeAttachAdView()
     {
         final Activity currentActivity = reactContext.getCurrentActivity();
         if ( currentActivity == null )
@@ -83,42 +172,70 @@ class AppLovinMAXAdView
             return;
         }
 
-        // Run in next run loop when view is laid out and `getWidth()` / `getHeight()` has appropriate values
-        post( new Runnable()
-        {
-            @Override
-            public void run()
+        // Re-assign in case of race condition
+        final String adUnitId = this.adUnitId;
+        final MaxAdFormat adFormat = this.adFormat;
+
+        // Run after 0.25 sec delay to allow all properties to set
+        postDelayed( () -> {
+
+            if ( TextUtils.isEmpty( adUnitId ) )
+            {
+                AppLovinMAXModule.e( "Attempting to attach MaxAdView without Ad Unit ID" );
+                return;
+            }
+
+            if ( adFormat == null )
+            {
+                AppLovinMAXModule.e( "Attempting to attach MaxAdView without ad format" );
+                return;
+            }
+
+            if ( adView != null )
+            {
+                AppLovinMAXModule.e( "Attempting to re-attach with existing MaxAdView: " + adView );
+                return;
+            }
+
+            AppLovinMAXModule.d( "Attaching MaxAdView for " + adUnitId );
+
+            adView = new MaxAdView( adUnitId, adFormat, AppLovinMAXModule.getInstance().getSdk(), currentActivity );
+            adView.setListener( AppLovinMAXModule.getInstance() );
+            adView.setRevenueListener( AppLovinMAXModule.getInstance() );
+            adView.setPlacement( placement );
+            adView.setCustomData( customData );
+            adView.setExtraParameter( "adaptive_banner", Boolean.toString( adaptiveBannerEnabled ) );
+            // Set this extra parameter to work around a SDK bug that ignores calls to stopAutoRefresh()
+            adView.setExtraParameter( "allow_pause_auto_refresh_immediately", "true" );
+
+            if ( autoRefresh )
+            {
+                adView.startAutoRefresh();
+            }
+            else
             {
-                // If ad unit id and format has been set - create and attach AdView
-                if ( !TextUtils.isEmpty( adUnitId ) && adFormat != null )
-                {
-                    adView = new MaxAdView( adUnitId, adFormat, AppLovinMAXModule.getInstance().getSdk(), currentActivity );
-                    adView.setListener( AppLovinMAXModule.getInstance() );
-                    adView.setRevenueListener( AppLovinMAXModule.getInstance() );
-
-                    if ( placement != null )
-                    {
-                        adView.setPlacement( placement );
-                    }
-
-                    if ( customData != null )
-                    {
-                        adView.setCustomData( customData );
-                    }
-
-                    if ( adaptiveBannerEnabledStr != null )
-                    {
-                        adView.setExtraParameter( "adaptive_banner", adaptiveBannerEnabledStr );
-                    }
-
-                    adView.loadAd();
-
-                    currentWidthPx = getWidth();
-                    currentHeightPx = getHeight();
-
-                    addView( adView );
-                }
+                adView.stopAutoRefresh();
             }
-        } );
+
+            adView.loadAd();
+
+            addView( adView );
+        }, 250 );
+    }
+
+    public void destroy()
+    {
+        if ( adView != null )
+        {
+            AppLovinMAXModule.d( "Unmounting MaxAdView: " + adView );
+
+            removeView( adView );
+
+            adView.setListener( null );
+            adView.setRevenueListener( null );
+            adView.destroy();
+
+            adView = null;
+        }
     }
 }

package/android/src/main/java/com/applovin/reactnative/AppLovinMAXAdViewManager.java

@@ -1,18 +1,12 @@
 package com.applovin.reactnative;
 
-import com.applovin.mediation.MaxAdFormat;
-import com.applovin.mediation.ads.MaxAdView;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.uimanager.SimpleViewManager;
 import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.annotations.ReactProp;
 
 import org.jetbrains.annotations.NotNull;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 /**
@@ -21,167 +15,63 @@ import androidx.annotation.Nullable;
 class AppLovinMAXAdViewManager
         extends SimpleViewManager<AppLovinMAXAdView>
 {
-    // Parent fields
-    private final ReactApplicationContext reactApplicationContext;
-
-    // Maps from the view to the corresponding ad unit id and ad format.
-    // Both must be set before the MaxAdView is created.
-    private final Map<AppLovinMAXAdView, String>      adUnitIdRegistry = new HashMap<>();
-    private final Map<AppLovinMAXAdView, MaxAdFormat> adFormatRegistry = new HashMap<>();
-
-    // Storage for placement and extra parameters if set before the MAAdView is created
-    private final Map<AppLovinMAXAdView, String> placementRegistry             = new HashMap<>();
-    private final Map<AppLovinMAXAdView, String> customDataRegistry            = new HashMap<>();
-    private final Map<AppLovinMAXAdView, String> adaptiveBannerEnabledRegistry = new HashMap<>();
-
-    public AppLovinMAXAdViewManager(final ReactApplicationContext reactApplicationContext)
-    {
-        this.reactApplicationContext = reactApplicationContext;
-    }
+    public AppLovinMAXAdViewManager(final ReactApplicationContext reactApplicationContext) { }
 
+    @NotNull
     @Override
-    public @NotNull String getName()
+    public String getName()
     {
         return "AppLovinMAXAdView";
     }
 
+    @NotNull
     @Override
-    protected @NotNull AppLovinMAXAdView createViewInstance(@NotNull final ThemedReactContext reactContext)
+    protected AppLovinMAXAdView createViewInstance(@NotNull final ThemedReactContext reactContext)
     {
         // NOTE: Do not set frame or backgroundColor as RN will overwrite the values set by your custom class in order to match your JavaScript component's layout props - hence wrapper
         return new AppLovinMAXAdView( reactContext );
     }
 
-    @Override
-    public void receiveCommand(@NonNull AppLovinMAXAdView view, String commandId, @Nullable ReadableArray args)
+    @ReactProp(name = "placement")
+    public void setPlacement(final AppLovinMAXAdView view, @Nullable final String placement)
     {
-        if ( args == null ) return;
-
-        String arg = args.getString( 0 );
-        if ( arg == null ) return;
-
-        if ( "setPlacement".equals( commandId ) )
-        {
-            setPlacement( view, arg );
-        }
-        else if ( "setAdaptiveBannerEnabled".equals( commandId ) )
-        {
-            setAdaptiveBannerEnabled( view, arg );
-        }
-        else if ( "setCustomData".equals( commandId ) )
-        {
-            setCustomData( view, arg );
-        }
-        else if ( "setAdUnitId".equals( commandId ) )
-        {
-            setAdUnitId( view, arg );
-        }
-        else if ( "setAdFormat".equals( commandId ) )
-        {
-            setAdFormat( view, arg );
-        }
-        else
-        {
-            AppLovinMAXModule.e( "Unable to parse command: " + commandId + " for AdView: + " + view + " with args: " + args );
-        }
+        view.setPlacement( placement );
     }
 
-    public void setPlacement(final AppLovinMAXAdView view, final String placement)
+    @ReactProp(name = "customData")
+    public void setCustomData(final AppLovinMAXAdView view, @Nullable final String customData)
     {
-        // Post to main thread to avoid race condition with actual creation of MaxAdView in maybeAttachAdView()
-        view.post( () -> {
-
-            MaxAdView adView = view.getAdView();
-            if ( adView != null )
-            {
-                adView.setPlacement( placement );
-            }
-            else
-            {
-                placementRegistry.put( view, placement );
-            }
-        } );
+        view.setCustomData( customData );
     }
 
-    public void setCustomData(final AppLovinMAXAdView view, final String customData)
+    @ReactProp(name = "adaptiveBannerEnabled")
+    public void setAdaptiveBannerEnabled(final AppLovinMAXAdView view, final boolean enabled)
     {
-        // Post to main thread to avoid race condition with actual creation of MaxAdView in maybeAttachAdView()
-        view.post( () -> {
-
-            MaxAdView adView = view.getAdView();
-            if ( adView != null )
-            {
-                adView.setCustomData( customData );
-            }
-            else
-            {
-                customDataRegistry.put( view, customData );
-            }
-        } );
+        view.setAdaptiveBannerEnabled( enabled );
     }
 
-    public void setAdaptiveBannerEnabled(final AppLovinMAXAdView view, final String enabledStr)
+    @ReactProp(name = "autoRefresh")
+    public void setAutoRefresh(final AppLovinMAXAdView view, final boolean enabled)
     {
-        // Post to main thread to avoid race condition with actual creation of MaxAdView in maybeAttachAdView()
-        view.post( () -> {
-
-            MaxAdView adView = view.getAdView();
-            if ( adView != null )
-            {
-                adView.setExtraParameter( "adaptive_banner", enabledStr );
-            }
-            else
-            {
-                adaptiveBannerEnabledRegistry.put( view, enabledStr );
-            }
-        } );
+        view.setAutoRefresh( enabled );
     }
 
+    @ReactProp(name = "adUnitId")
     public void setAdUnitId(final AppLovinMAXAdView view, final String adUnitId)
     {
-        adUnitIdRegistry.put( view, adUnitId );
-        maybeAttachAdView( view );
+        view.setAdUnitId( adUnitId );
     }
 
+    @ReactProp(name = "adFormat")
     public void setAdFormat(final AppLovinMAXAdView view, final String adFormatStr)
     {
-        if ( "banner".equals( adFormatStr ) )
-        {
-            adFormatRegistry.put( view, AppLovinMAXModule.getDeviceSpecificBannerAdViewAdFormat( reactApplicationContext ) );
-        }
-        else if ( "mrec".equals( adFormatStr ) )
-        {
-            adFormatRegistry.put( view, MaxAdFormat.MREC );
-        }
-
-        maybeAttachAdView( view );
-    }
-
-    private void maybeAttachAdView(final AppLovinMAXAdView view)
-    {
-        String placement = placementRegistry.remove( view );
-        String customData = customDataRegistry.remove( view );
-        String adaptiveBannerEnabledStr = adaptiveBannerEnabledRegistry.remove( view );
-
-        view.maybeAttachAdView( placement,
-                                customData,
-                                adaptiveBannerEnabledStr,
-                                adUnitIdRegistry.get( view ),
-                                adFormatRegistry.get( view ) );
+        view.setAdFormat( adFormatStr );
     }
 
     @Override
     public void onDropViewInstance(@NotNull AppLovinMAXAdView view)
     {
-        // NOTE: Android destroys the native MaxAdView and calls this method while iOS caches it when you remove it from screen
-        adUnitIdRegistry.remove( view );
-
-        // HACK ALERT: Since current SDK does not respect auto-refresh APIs until _after_ `onAdLoaded()`, explicitly expose view validity to the main module
-        MaxAdView adView = view.getAdView();
-        if ( adView != null )
-        {
-            AppLovinMAXModule.sAdViewsToRemove.put( adView.getAdUnitId(), adView );
-        }
+        view.destroy();
 
         super.onDropViewInstance( view );
     }