react-native-applovin-max 6.1.1 → 6.2.1

package/android/.project

@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>android</name>
+	<name>android_</name>
 	<comment>Project android_ created by Buildship.</comment>
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
 			<arguments>
@@ -17,7 +12,6 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
 </projectDescription>

package/android/.settings/org.eclipse.buildship.core.prefs

@@ -1,11 +1,11 @@
-arguments=--init-script /var/folders/7v/xx4_6n150w136j9cfrzqdc2w0000gq/T/d146c9752a26f79b52047fb6dc6ed385d064e120494f96f08ca63a317c41f94c.gradle --init-script /var/folders/7v/xx4_6n150w136j9cfrzqdc2w0000gq/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
+arguments=
 auto.sync=false
 build.scans.enabled=false
-connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
+connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.0))
 connection.project.dir=
 eclipse.preferences.version=1
 gradle.user.home=
-java.home=/Users/hiroshi.watanabe/Library/Java/JavaVirtualMachines/corretto-11.0.21/Contents/Home
+java.home=/Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home
 jvm.arguments=
 offline.mode=false
 override.workspace.settings=true

package/android/build.gradle

@@ -35,8 +35,8 @@ android {
   defaultConfig {
     minSdkVersion 16
     targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
-    versionCode 6010100
-    versionName "6.1.1"
+    versionCode 6020100
+    versionName "6.2.1"
   }
 
   flavorDimensions("default")

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

@@ -16,6 +16,7 @@ import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.events.RCTEventEmitter;
 import com.facebook.react.views.view.ReactViewGroup;
 
+import java.util.HashMap;
 import java.util.Map;
 
 import androidx.annotation.Nullable;
@@ -27,6 +28,8 @@ class AppLovinMAXAdView
         extends ReactViewGroup
         implements MaxAdListener, MaxAdViewAdListener, MaxAdRevenueListener
 {
+    private static final Map<String, MaxAdView> adViewInstances = new HashMap<>( 2 );
+
     private final ThemedReactContext reactContext;
 
     @Nullable
@@ -45,6 +48,11 @@ class AppLovinMAXAdView
     @Nullable
     private Map<String, Object> localExtraParameters;
 
+    public static MaxAdView getInstance(final String adUnitId)
+    {
+        return adViewInstances.get( adUnitId );
+    }
+
     public AppLovinMAXAdView(final Context context)
     {
         super( context );
@@ -268,6 +276,8 @@ class AppLovinMAXAdView
             adView.loadAd();
 
             addView( adView );
+
+            adViewInstances.put( adUnitId, adView );
         }, 250 );
     }
 
@@ -277,6 +287,8 @@ class AppLovinMAXAdView
         {
             AppLovinMAXModule.d( "Unmounting MaxAdView: " + adView );
 
+            adViewInstances.remove( adView.getAdUnitId() );
+
             removeView( adView );
 
             adView.setListener( null );

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

@@ -2673,6 +2673,76 @@ public class AppLovinMAXModule
         return networkResponseObject;
     }
 
+    // Amazon
+
+    public void setAmazonBannerResult(final Object result, final String adUnitId)
+    {
+        setAmazonResult( result, adUnitId, MaxAdFormat.BANNER );
+    }
+
+    public void setAmazonMRecResult(final Object result, final String adUnitId)
+    {
+        setAmazonResult( result, adUnitId, MaxAdFormat.MREC );
+    }
+
+    public void setAmazonInterstitialResult(final Object result, final String adUnitId)
+    {
+        setAmazonResult( result, adUnitId, MaxAdFormat.INTERSTITIAL );
+    }
+
+    private void setAmazonResult(final Object result, final String adUnitId, final MaxAdFormat adFormat)
+    {
+        if ( sdk == null )
+        {
+            logUninitializedAccessError( "Failed to set Amazon result - SDK not initialized: " + adUnitId );
+            return;
+        }
+
+        if ( result == null )
+        {
+            e( "Failed to set Amazon result - null value" );
+            return;
+        }
+
+        String key = getLocalExtraParameterKeyForAmazonResult( result );
+
+        if ( adFormat == MaxAdFormat.INTERSTITIAL )
+        {
+            MaxInterstitialAd interstitial = retrieveInterstitial( adUnitId, "setAmazonResult" );
+            if ( interstitial == null )
+            {
+                e( "Failed to set Amazon result - unable to retrieve interstitial" );
+                return;
+            }
+
+            interstitial.setLocalExtraParameter( key, result );
+        }
+        else // MaxAdFormat.BANNER or MaxAdFormat.MREC
+        {
+            MaxAdView adView = AppLovinMAXAdView.getInstance( adUnitId );
+
+            if ( adView == null )
+            {
+                adView = retrieveAdView( adUnitId, adFormat );
+            }
+
+            if ( adView != null )
+            {
+                adView.setLocalExtraParameter( key, result );
+            }
+            else
+            {
+                e( "Failed to set Amazon result - unable to retrieve " + adFormat );
+            }
+        }
+    }
+
+    private String getLocalExtraParameterKeyForAmazonResult(final Object /* DTBAdResponse or AdError */ result)
+    {
+        String className = result.getClass().getSimpleName();
+        return "DTBAdResponse".equalsIgnoreCase( className ) ? "amazon_ad_response" : "amazon_ad_error";
+    }
+
     // Lifecycle Events
 
     @Override

package/ios/AppLovinMAX.m

@@ -7,6 +7,7 @@
 //
 
 #import "AppLovinMAX.h"
+#import "AppLovinMAXAdView.h"
 #import "AppLovinMAXNativeAdView.h"
 
 #define ROOT_VIEW_CONTROLLER (UIApplication.sharedApplication.keyWindow.rootViewController)
@@ -226,65 +227,65 @@ RCT_EXPORT_METHOD(initialize:(NSString *)pluginVersion :(NSString *)sdkKey :(RCT
     }
     
     ALSdkSettings *settings = [[ALSdkSettings alloc] init];
-
+    
     // Selective init
     if ( self.initializationAdUnitIdentifiersToSet )
     {
         settings.initializationAdUnitIdentifiers = self.initializationAdUnitIdentifiersToSet;
         self.initializationAdUnitIdentifiersToSet = nil;
     }
-
+    
     // Deprecated consent flow which automatically moves to the new flow
     if ( self.consentFlowEnabledToSet )
     {
         settings.consentFlowSettings.enabled = self.consentFlowEnabledToSet.boolValue;
         self.consentFlowEnabledToSet = nil;
-
+        
         if ( self.privacyPolicyURLToSet )
         {
             settings.consentFlowSettings.privacyPolicyURL = self.privacyPolicyURLToSet;
             self.privacyPolicyURLToSet = nil;
         }
-
+        
         if (self.termsOfServiceURLToSet )
         {
             settings.consentFlowSettings.termsOfServiceURL = self.termsOfServiceURLToSet;
             self.termsOfServiceURLToSet = nil;
         }
     }
-
+    
     // New terms and privacy policy flow
     if ( self.termsAndPrivacyPolicyFlowEnabledToSet )
     {
         settings.termsAndPrivacyPolicyFlowSettings.enabled = self.termsAndPrivacyPolicyFlowEnabledToSet.boolValue;
         self.termsAndPrivacyPolicyFlowEnabledToSet = nil;
-
+        
         if ( self.privacyPolicyURLToSet )
         {
             settings.termsAndPrivacyPolicyFlowSettings.privacyPolicyURL = self.privacyPolicyURLToSet;
             self.privacyPolicyURLToSet = nil;
         }
-
+        
         if ( self.termsOfServiceURLToSet )
         {
             settings.termsAndPrivacyPolicyFlowSettings.termsOfServiceURL = self.termsOfServiceURLToSet;
             self.termsOfServiceURLToSet = nil;
         }
-
+        
         if ( self.debugUserGeographyToSet )
         {
             settings.termsAndPrivacyPolicyFlowSettings.debugUserGeography = [self toAppLovinConsentFlowUserGeography: self.debugUserGeographyToSet];
             self.debugUserGeographyToSet = nil;
         }
     }
-
+    
     // Set muted if needed
     if ( self.mutedToSet )
     {
         settings.muted = self.mutedToSet;
         self.mutedToSet = nil;
     }
-
+    
     // Set test device ids if needed
     if ( self.testDeviceIdentifiersToSet )
     {
@@ -314,7 +315,7 @@ RCT_EXPORT_METHOD(initialize:(NSString *)pluginVersion :(NSString *)sdkKey :(RCT
     }
     
     [self setPendingExtraParametersIfNeeded: settings];
-
+    
     // Initialize SDK
     self.sdk = [ALSdk sharedWithKey: sdkKey settings: settings];
     [self.sdk setPluginVersion: [@"React-Native-" stringByAppendingString: pluginVersion]];
@@ -848,10 +849,11 @@ RCT_EXPORT_METHOD(setBannerExtraParameter:(NSString *)adUnitIdentifier :(NSStrin
     [self setAdViewExtraParameterForAdUnitIdentifier: adUnitIdentifier adFormat: DEVICE_SPECIFIC_ADVIEW_AD_FORMAT key: key value: value];
 }
 
+// NOTE: Even though iOS is ok with `id` generic types, Android is not - so we wrap it via JSON/ReadableMap
 RCT_EXPORT_METHOD(setBannerLocalExtraParameter:(NSString *)adUnitIdentifier :(NSDictionary<NSString *, id> *)parameterDict)
-{    
+{
     NSString *key = parameterDict.allKeys.firstObject;
-    id value = parameterDict.allValues.firstObject;
+    id value = parameterDict.allValues.firstObject != [NSNull null] ? parameterDict.allValues.firstObject : nil;
     
     [self setAdViewLocalExtraParameterForAdUnitIdentifier: adUnitIdentifier adFormat: DEVICE_SPECIFIC_ADVIEW_AD_FORMAT key: key value: value];
 }
@@ -963,14 +965,15 @@ RCT_EXPORT_METHOD(updateMRecPosition:(NSString *)mrecPosition :(NSString *)adUni
 }
 
 RCT_EXPORT_METHOD(setMRecExtraParameter:(NSString *)adUnitIdentifier :(NSString *)key :(nullable NSString *)value)
-{   
+{
     [self setAdViewExtraParameterForAdUnitIdentifier: adUnitIdentifier adFormat: MAAdFormat.mrec key: key value: value];
 }
 
+// NOTE: Even though iOS is ok with `id` generic types, Android is not - so we wrap it via JSON/ReadableMap
 RCT_EXPORT_METHOD(setMRecLocalExtraParameter:(NSString *)adUnitIdentifier :(NSDictionary<NSString *, id> *)parameterDict)
 {
     NSString *key = parameterDict.allKeys.firstObject;
-    id value = parameterDict.allValues.firstObject;
+    id value = parameterDict.allValues.firstObject != [NSNull null] ? parameterDict.allValues.firstObject : nil;
     
     [self setAdViewLocalExtraParameterForAdUnitIdentifier: adUnitIdentifier adFormat: MAAdFormat.mrec key: key value: value];
 }
@@ -1081,10 +1084,11 @@ RCT_EXPORT_METHOD(setInterstitialExtraParameter:(NSString *)adUnitIdentifier :(N
     [interstitial setExtraParameterForKey: key value: value];
 }
 
+// NOTE: Even though iOS is ok with `id` generic types, Android is not - so we wrap it via JSON/ReadableMap
 RCT_EXPORT_METHOD(setInterstitialLocalExtraParameter:(NSString *)adUnitIdentifier :(NSDictionary<NSString *, id> *)parameterDict)
 {
     NSString *key = parameterDict.allKeys.firstObject;
-    id value = parameterDict.allValues.firstObject;
+    id value = parameterDict.allValues.firstObject != [NSNull null] ? parameterDict.allValues.firstObject : nil;
     
     MAInterstitialAd *interstitial = [self retrieveInterstitialForAdUnitIdentifier: adUnitIdentifier];
     [interstitial setLocalExtraParameterForKey: key value: value];
@@ -1141,10 +1145,11 @@ RCT_EXPORT_METHOD(setRewardedAdExtraParameter:(NSString *)adUnitIdentifier :(NSS
     [rewardedAd setExtraParameterForKey: key value: value];
 }
 
+// NOTE: Even though iOS is ok with `id` generic types, Android is not - so we wrap it via JSON/ReadableMap
 RCT_EXPORT_METHOD(setRewardedAdLocalExtraParameter:(NSString *)adUnitIdentifier :(NSDictionary<NSString *, id> *)parameterDict)
 {
     NSString *key = parameterDict.allKeys.firstObject;
-    id value = parameterDict.allValues.firstObject;
+    id value = parameterDict.allValues.firstObject != [NSNull null] ? parameterDict.allValues.firstObject : nil;
     
     MARewardedAd *rewardedAd = [self retrieveRewardedAdForAdUnitIdentifier: adUnitIdentifier];
     [rewardedAd setLocalExtraParameterForKey: key value: value];
@@ -1201,10 +1206,11 @@ RCT_EXPORT_METHOD(setAppOpenAdExtraParameter:(NSString *)adUnitIdentifier key:(N
     [appOpenAd setExtraParameterForKey: key value: value];
 }
 
+// NOTE: Even though iOS is ok with `id` generic types, Android is not - so we wrap it via JSON/ReadableMap
 RCT_EXPORT_METHOD(setAppOpenAdLocalExtraParameter:(NSString *)adUnitIdentifier :(NSDictionary<NSString *, id> *)parameterDict)
 {
     NSString *key = parameterDict.allKeys.firstObject;
-    id value = parameterDict.allValues.firstObject;
+    id value = parameterDict.allValues.firstObject != [NSNull null] ? parameterDict.allValues.firstObject : nil;
     
     MAAppOpenAd *appOpenAd = [self retrieveAppOpenAdForAdUnitIdentifier: adUnitIdentifier];
     [appOpenAd setLocalExtraParameterForKey: key value: value];
@@ -2074,7 +2080,7 @@ RCT_EXPORT_METHOD(setAppOpenAdLocalExtraParameter:(NSString *)adUnitIdentifier :
     {
         return ALConsentFlowUserGeographyOther;
     }
-
+    
     return ALConsentFlowUserGeographyUnknown;
 }
 
@@ -2088,7 +2094,7 @@ RCT_EXPORT_METHOD(setAppOpenAdLocalExtraParameter:(NSString *)adUnitIdentifier :
     {
         return USER_GEOGRAPHY_OTHER;
     }
-
+    
     return USER_GEOGRAPHY_UNKNOWN;
 }
 
@@ -2110,7 +2116,7 @@ RCT_EXPORT_METHOD(setAppOpenAdLocalExtraParameter:(NSString *)adUnitIdentifier :
     {
         return APP_TRACKING_STATUS_AUTHORIZED;
     }
-
+    
     return APP_TRACKING_STATUS_UNAVAILABLE;
 }
 
@@ -2223,6 +2229,78 @@ RCT_EXPORT_METHOD(setAppOpenAdLocalExtraParameter:(NSString *)adUnitIdentifier :
     return networkResponseDict;
 }
 
+#pragma mark - Amazon
+
+- (void)setAmazonResult:(id)result forBannerAdUnitIdentifier:(NSString *)adUnitIdentifier
+{
+    [self setAmazonResult: result forAdUnitIdentifier: adUnitIdentifier adFormat: MAAdFormat.banner];
+}
+
+- (void)setAmazonResult:(id)result forMRecAdUnitIdentifier:(NSString *)adUnitIdentifier
+{
+    [self setAmazonResult: result forAdUnitIdentifier: adUnitIdentifier adFormat: MAAdFormat.mrec];
+}
+
+- (void)setAmazonResult:(id)result forInterstitialAdUnitIdentifier:(NSString *)adUnitIdentifier
+{
+    [self setAmazonResult: result forAdUnitIdentifier: adUnitIdentifier adFormat: MAAdFormat.interstitial];
+}
+
+- (void)setAmazonResult:(id /* DTBAdResponse or DTBAdErrorInfo */)result forAdUnitIdentifier:(NSString *)adUnitIdentifier adFormat:(MAAdFormat *)adFormat
+{
+    if ( !self.sdk )
+    {
+        NSString *errorMessage = [NSString stringWithFormat: @"Failed to set Amazon result - SDK not initialized: %@", adUnitIdentifier];
+        [self logUninitializedAccessError: errorMessage];
+        
+        return;
+    }
+    
+    if ( !result )
+    {
+        [self log: @"Failed to set Amazon result - nil value"];
+        return;
+    }
+    
+    NSString *key = [self localExtraParameterKeyForAmazonResult: result];
+    
+    if ( adFormat == MAAdFormat.interstitial )
+    {
+        MAInterstitialAd *interstitial = [self retrieveInterstitialForAdUnitIdentifier: adUnitIdentifier];
+        if ( !interstitial )
+        {
+            [self log: @"Failed to set Amazon result - unable to find interstitial"];
+            return;
+        }
+
+        [interstitial setLocalExtraParameterForKey: key value: result];
+    }
+    else  // MAAdFormat.banner or MAAdFormat.mrec
+    {
+        MAAdView *adView = [AppLovinMAXAdView sharedWithAdUnitIdentifier: adUnitIdentifier];
+
+        if ( !adView )
+        {
+            adView = [self retrieveAdViewForAdUnitIdentifier: adUnitIdentifier adFormat: adFormat];
+        }
+        
+        if ( adView )
+        {
+            [adView setLocalExtraParameterForKey: key value: result];
+        }
+        else
+        {
+            [self log: @"Failed to set Amazon result - unable to find %@", adFormat];
+        }
+    }
+}
+
+- (NSString *)localExtraParameterKeyForAmazonResult:(id /* DTBAdResponse or DTBAdErrorInfo */)result
+{
+    NSString *className = NSStringFromClass([result class]);
+    return [@"DTBAdResponse" isEqualToString: className] ? @"amazon_ad_response" : @"amazon_ad_error";
+}
+
 #pragma mark - React Native Event Bridge
 
 - (void)sendReactNativeEventWithName:(NSString *)name body:(NSDictionary<NSString *, id> *)body

package/ios/AppLovinMAXAdView.h

@@ -7,10 +7,14 @@
 
 #import <React/RCTUIManager.h>
 
+@class MAAdView;
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface AppLovinMAXAdView : UIView
 
++ (MAAdView *)sharedWithAdUnitIdentifier:(NSString *)adUnitIdentifier;
+
 @end
 
 NS_ASSUME_NONNULL_END

package/ios/AppLovinMAXAdView.m

@@ -35,6 +35,19 @@
 
 @implementation AppLovinMAXAdView
 
+static NSMutableDictionary<NSString *, MAAdView *> *adViewInstances;
+
++ (void)initialize
+{
+    [super initialize];
+    adViewInstances = [NSMutableDictionary dictionaryWithCapacity: 2];
+}
+
++ (MAAdView *)sharedWithAdUnitIdentifier:(NSString *)adUnitIdentifier
+{
+    return adViewInstances[adUnitIdentifier];
+}
+
 - (void)setAdUnitId:(NSString *)adUnitId
 {
     // Ad Unit ID must be set prior to creating MAAdView
@@ -176,7 +189,8 @@
         
         for ( NSString *key in self.localExtraParameters )
         {
-            [self.adView setLocalExtraParameterForKey: key value: self.localExtraParameters[key]];
+            id value = self.localExtraParameters[key];
+            [self.adView setLocalExtraParameterForKey: key value: (value != [NSNull null] ? value : nil)];
         }
         
         if ( [self isAutoRefresh] )
@@ -196,6 +210,8 @@
                                                    [self.adView.heightAnchor constraintEqualToAnchor: self.heightAnchor],
                                                    [self.adView.centerXAnchor constraintEqualToAnchor: self.centerXAnchor],
                                                    [self.adView.centerYAnchor constraintEqualToAnchor: self.centerYAnchor]]];
+
+        adViewInstances[adUnitId] = self.adView;
     });
 }
 
@@ -210,6 +226,8 @@
         {
             [[AppLovinMAX shared] log: @"Unmounting MAAdView: %@", self.adView];
             
+            [adViewInstances removeObjectForKey: self.adUnitId];
+
             self.adView.delegate = nil;
             self.adView.revenueDelegate = nil;
             

package/ios/AppLovinMAXNativeAdView.m

@@ -123,7 +123,8 @@
         
         for ( NSString *key in self.localExtraParameters )
         {
-            [self.adLoader setLocalExtraParameterForKey: key value: self.localExtraParameters[key]];
+            id value = self.localExtraParameters[key];
+            [self.adLoader setLocalExtraParameterForKey: key value: (value != [NSNull null] ? value : nil)];
         }
         
         [self.adLoader loadAd];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-applovin-max",
   "author": "AppLovin Corporation",
-  "version": "6.1.1",
+  "version": "6.2.1",
   "description": "AppLovin MAX React Native Plugin for Android and iOS",
   "homepage": "https://github.com/AppLovin/AppLovin-MAX-React-Native",
   "license": "MIT",

package/react-native-applovin-max.podspec

@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
   s.authors      = package["author"]
 
   s.platforms    = { :ios => "10.0" }
-  s.source       = { :git => "https://github.com/AppLovin/AppLovin-MAX-React-Native.git", :tag => "release_6_1_1" }
+  s.source       = { :git => "https://github.com/AppLovin/AppLovin-MAX-React-Native.git", :tag => "release_6_2_1" }
   
   s.source_files  = "ios/AppLovinMAX*.{h,m}"
 

package/src/AppLovinMAX.ts

@@ -4,7 +4,7 @@ import type { Configuration } from './types/Configuration';
 
 const NativeAppLovinMAX = NativeModules.AppLovinMAX;
 
-const VERSION = '6.1.1';
+const VERSION = '6.2.1';
 
 const initialize = async (sdkKey: string): Promise<Configuration> => {
     return NativeAppLovinMAX.initialize(VERSION, sdkKey);