react-native-applovin-max 5.0.1 → 5.1.0

package/android/build.gradle

@@ -35,8 +35,8 @@ android {
   defaultConfig {
     minSdkVersion 16
     targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
-    versionCode 5000100
-    versionName "5.0.1"
+    versionCode 5010000
+    versionName "5.1.0"
   }
 
   flavorDimensions("default")

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

@@ -414,7 +414,8 @@ public class AppLovinMAXModule
     @ReactMethod
     public void isTablet(final Promise promise)
     {
-        Context contextToUse = ( maybeGetCurrentActivity() != null ) ? maybeGetCurrentActivity() : getReactApplicationContext();
+        Activity currentActivity = maybeGetCurrentActivity();
+        Context contextToUse = ( currentActivity != null ) ? currentActivity : getReactApplicationContext();
         promise.resolve( AppLovinSdkUtils.isTablet( contextToUse ) );
     }
 
@@ -467,7 +468,7 @@ public class AppLovinMAXModule
     }
 
     @ReactMethod
-    public void setUserId(String userId)
+    public void setUserId(final String userId)
     {
         if ( isPluginInitialized )
         {
@@ -491,7 +492,7 @@ public class AppLovinMAXModule
     @ReactMethod
     public void isMuted(final Promise promise)
     {
-        promise.resolve( isPluginInitialized ? sdk.getSettings().isMuted() : false );
+        promise.resolve( isPluginInitialized && sdk.getSettings().isMuted() );
     }
 
     @ReactMethod
@@ -1157,7 +1158,7 @@ public class AppLovinMAXModule
             return;
         }
 
-        MaxInterstitialAd interstitial = retrieveInterstitial( adUnitId );
+        MaxInterstitialAd interstitial = retrieveInterstitial( adUnitId, "loadInterstitial" );
         if ( interstitial == null )
         {
             sendReactNativeEventForAdLoadFailed( ON_INTERSTITIAL_LOAD_FAILED_EVENT, adUnitId, null );
@@ -1177,7 +1178,13 @@ public class AppLovinMAXModule
             return;
         }
 
-        MaxInterstitialAd interstitial = retrieveInterstitial( adUnitId );
+        MaxInterstitialAd interstitial = retrieveInterstitial( adUnitId, "isInterstitialReady" );
+        if ( interstitial == null )
+        {
+            promise.resolve( false );
+            return;
+        }
+
         promise.resolve( interstitial.isReady() );
     }
 
@@ -1190,7 +1197,13 @@ public class AppLovinMAXModule
             return;
         }
 
-        MaxInterstitialAd interstitial = retrieveInterstitial( adUnitId );
+        MaxInterstitialAd interstitial = retrieveInterstitial( adUnitId, "showInterstitial" );
+        if ( interstitial == null )
+        {
+            sendReactNativeEvent( ON_INTERSTITIAL_AD_FAILED_TO_DISPLAY_EVENT, getAdUnitInfo( adUnitId ) );
+            return;
+        }
+
         interstitial.showAd( placement, customData );
     }
 
@@ -1203,14 +1216,24 @@ public class AppLovinMAXModule
             return;
         }
 
-        MaxInterstitialAd interstitial = retrieveInterstitial( adUnitId );
+        MaxInterstitialAd interstitial = retrieveInterstitial( adUnitId, "setInterstitialExtraParameter" );
+        if ( interstitial == null ) return;
+
         interstitial.setExtraParameter( key, value );
     }
 
     @ReactMethod
     public void setInterstitialLocalExtraParameter(final String adUnitId, final String key, final String value)
     {
-        MaxInterstitialAd interstitial = retrieveInterstitial( adUnitId );
+        if ( sdk == null )
+        {
+            logUninitializedAccessError( "setInterstitialLocalExtraParameter" );
+            return;
+        }
+
+        MaxInterstitialAd interstitial = retrieveInterstitial( adUnitId, "setInterstitialLocalExtraParameter" );
+        if ( interstitial == null ) return;
+
         interstitial.setLocalExtraParameter( key, value );
     }
 
@@ -1225,7 +1248,7 @@ public class AppLovinMAXModule
             return;
         }
 
-        MaxRewardedAd rewardedAd = retrieveRewardedAd( adUnitId );
+        MaxRewardedAd rewardedAd = retrieveRewardedAd( adUnitId, "loadRewardedAd" );
         if ( rewardedAd == null )
         {
             sendReactNativeEventForAdLoadFailed( ON_REWARDED_AD_LOAD_FAILED_EVENT, adUnitId, null );
@@ -1245,7 +1268,13 @@ public class AppLovinMAXModule
             return;
         }
 
-        MaxRewardedAd rewardedAd = retrieveRewardedAd( adUnitId );
+        MaxRewardedAd rewardedAd = retrieveRewardedAd( adUnitId, "isRewardedAdReady" );
+        if ( rewardedAd == null )
+        {
+            promise.resolve( false );
+            return;
+        }
+        
         promise.resolve( rewardedAd.isReady() );
     }
 
@@ -1258,7 +1287,13 @@ public class AppLovinMAXModule
             return;
         }
 
-        MaxRewardedAd rewardedAd = retrieveRewardedAd( adUnitId );
+        MaxRewardedAd rewardedAd = retrieveRewardedAd( adUnitId, "showRewardedAd" );
+        if ( rewardedAd == null )
+        {
+            sendReactNativeEvent( ON_REWARDED_AD_FAILED_TO_DISPLAY_EVENT, getAdUnitInfo( adUnitId ) );
+            return;
+        }
+
         rewardedAd.showAd( placement, customData );
     }
 
@@ -1271,14 +1306,24 @@ public class AppLovinMAXModule
             return;
         }
 
-        MaxRewardedAd rewardedAd = retrieveRewardedAd( adUnitId );
+        MaxRewardedAd rewardedAd = retrieveRewardedAd( adUnitId, "setRewardedAdExtraParameter" );
+        if ( rewardedAd == null ) return;
+
         rewardedAd.setExtraParameter( key, value );
     }
 
     @ReactMethod
     public void setRewardedAdLocalExtraParameter(final String adUnitId, final String key, final String value)
     {
-        MaxRewardedAd rewardedAd = retrieveRewardedAd( adUnitId );
+        if ( sdk == null )
+        {
+            logUninitializedAccessError( "setRewardedAdLocalExtraParameter" );
+            return;
+        }
+
+        MaxRewardedAd rewardedAd = retrieveRewardedAd( adUnitId, "setRewardedAdLocalExtraParameter" );
+        if ( rewardedAd == null ) return;
+
         rewardedAd.setLocalExtraParameter( key, value );
     }
 
@@ -1426,7 +1471,7 @@ public class AppLovinMAXModule
         sendReactNativeEventForAdLoadFailed( name, adUnitId, error );
     }
 
-    void sendReactNativeEventForAdLoadFailed(final String name, final String adUnitId, @Nullable final MaxError error)
+    private void sendReactNativeEventForAdLoadFailed(final String name, final String adUnitId, @Nullable final MaxError error)
     {
         sendReactNativeEvent( name, getAdLoadFailedInfo( adUnitId, error ) );
     }
@@ -1986,10 +2031,14 @@ public class AppLovinMAXModule
     }
 
     @Nullable
-    private MaxInterstitialAd retrieveInterstitial(String adUnitId)
+    private MaxInterstitialAd retrieveInterstitial(final String adUnitId, final String callingMethod)
     {
         Activity currentActivity = maybeGetCurrentActivity();
-        if ( currentActivity == null ) return null;
+        if ( currentActivity == null )
+        {
+            e( "Unable to get current Activity, returning null interstitial for " + callingMethod + "()" );
+            return null;
+        }
 
         MaxInterstitialAd result = mInterstitials.get( adUnitId );
         if ( result == null )
@@ -2005,10 +2054,14 @@ public class AppLovinMAXModule
     }
 
     @Nullable
-    private MaxRewardedAd retrieveRewardedAd(String adUnitId)
+    private MaxRewardedAd retrieveRewardedAd(final String adUnitId, final String callingMethod)
     {
         Activity currentActivity = maybeGetCurrentActivity();
-        if ( currentActivity == null ) return null;
+        if ( currentActivity == null )
+        {
+            e( "Unable to get current Activity, returning null rewarded ad for " + callingMethod + "()" );
+            return null;
+        }
 
         MaxRewardedAd result = mRewardedAds.get( adUnitId );
         if ( result == null )
@@ -2023,7 +2076,7 @@ public class AppLovinMAXModule
         return result;
     }
 
-    private MaxAppOpenAd retrieveAppOpenAd(String adUnitId)
+    private MaxAppOpenAd retrieveAppOpenAd(final String adUnitId)
     {
         MaxAppOpenAd result = mAppOpenAds.get( adUnitId );
         if ( result == null )
@@ -2387,10 +2440,10 @@ public class AppLovinMAXModule
 
     public WritableMap getAdDisplayFailedInfo(final MaxAd ad, final MaxError error)
     {
-        WritableMap params = getAdInfo( ad );
-        params.putInt( "code", error.getCode() );
-        params.putString( "message", error.getMessage() );
-        return params;
+        WritableMap info = getAdInfo( ad );
+        info.putInt( "code", error.getCode() );
+        info.putString( "message", error.getMessage() );
+        return info;
     }
 
     public WritableMap getAdRevenueInfo(final MaxAd ad)
@@ -2402,6 +2455,13 @@ public class AppLovinMAXModule
         return adInfo;
     }
 
+    private WritableMap getAdUnitInfo(final String adUnitId)
+    {
+        WritableMap info = Arguments.createMap();
+        info.putString( "adUnitId", adUnitId );
+        return info;
+    }
+
     // AD WATERFALL INFO
 
     private WritableMap createAdWaterfallInfo(final MaxAdWaterfallInfo waterfallInfo)

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

@@ -386,6 +386,11 @@ public class AppLovinMAXNativeAdView
         // 1. AdInfo for publisher to be notified via `onAdLoaded`
 
         WritableMap nativeAdInfo = Arguments.createMap();
+        nativeAdInfo.putString( "title", ad.getTitle() );
+        nativeAdInfo.putString( "advertiser", ad.getAdvertiser() );
+        nativeAdInfo.putString( "body", ad.getBody() );
+        nativeAdInfo.putString( "callToAction", ad.getCallToAction() );
+
         float aspectRatio = ad.getMediaContentAspectRatio();
         if ( !Float.isNaN( aspectRatio ) )
         {
@@ -404,26 +409,20 @@ public class AppLovinMAXNativeAdView
             nativeAdInfo.putDouble( "mediaContentAspectRatio", 1.0 );
         }
 
+        nativeAdInfo.putBoolean( "isIconImageAvailable", ( ad.getIcon() != null ) );
+        nativeAdInfo.putBoolean( "isOptionsViewAvailable", ( ad.getOptionsView() != null ) );
+        nativeAdInfo.putBoolean( "isMediaViewAvailable", ( ad.getMediaView() != null ) );
+
         WritableMap adInfo = AppLovinMAXModule.getInstance().getAdInfo( nativeAd );
         adInfo.putMap( "nativeAd", nativeAdInfo );
 
         // 2. NativeAd for `AppLovinNativeAdView.js` to render the views
 
         WritableMap jsNativeAd = Arguments.createMap();
-
         jsNativeAd.putString( "title", ad.getTitle() );
-        if ( ad.getAdvertiser() != null )
-        {
-            jsNativeAd.putString( "advertiser", ad.getAdvertiser() );
-        }
-        if ( ad.getBody() != null )
-        {
-            jsNativeAd.putString( "body", ad.getBody() );
-        }
-        if ( ad.getCallToAction() != null )
-        {
-            jsNativeAd.putString( "callToAction", ad.getCallToAction() );
-        }
+        jsNativeAd.putString( "advertiser", ad.getAdvertiser() );
+        jsNativeAd.putString( "body", ad.getBody() );
+        jsNativeAd.putString( "callToAction", ad.getCallToAction() );
 
         MaxNativeAdImage icon = ad.getIcon();
         if ( icon != null )

package/ios/AppLovinMAX.m

@@ -44,6 +44,10 @@
 @property (nonatomic, strong, nullable) NSNumber *locationCollectionEnabledToSet;
 @property (nonatomic, strong) NSMutableDictionary<NSString *, NSString *> *extraParametersToSet;
 
+@property (nonatomic, strong, nullable) NSNumber *consentFlowEnabledToSet;
+@property (nonatomic, strong, nullable) NSURL *privacyPolicyURLToSet;
+@property (nonatomic, strong, nullable) NSURL *termsOfServiceURLToSet;
+
 @property (nonatomic, strong, nullable) NSNumber *targetingYearOfBirthToSet;
 @property (nonatomic,   copy, nullable) NSString *targetingGenderToSet;
 @property (nonatomic, strong, nullable) NSNumber *targetingMaximumAdContentRatingToSet;
@@ -207,8 +211,17 @@ RCT_EXPORT_METHOD(initialize:(NSString *)pluginVersion :(NSString *)sdkKey :(RCT
         }
     }
     
+    ALSdkSettings *settings = [[ALSdkSettings alloc] init];
+    settings.consentFlowSettings.enabled = self.consentFlowEnabledToSet.boolValue;
+    settings.consentFlowSettings.privacyPolicyURL = self.privacyPolicyURLToSet;
+    settings.consentFlowSettings.termsOfServiceURL = self.termsOfServiceURLToSet;
+    
+    self.consentFlowEnabledToSet = nil;
+    self.privacyPolicyURLToSet = nil;
+    self.termsOfServiceURLToSet = nil;
+
     // Initialize SDK
-    self.sdk = [ALSdk sharedWithKey: sdkKey];
+    self.sdk = [ALSdk sharedWithKey: sdkKey settings: settings];
     [self.sdk setPluginVersion: [@"React-Native-" stringByAppendingString: pluginVersion]];
     [self.sdk setMediationProvider: ALMediationProviderMAX];
     
@@ -434,6 +447,19 @@ RCT_EXPORT_METHOD(setExtraParameter:(NSString *)key :(nullable NSString *)value)
     }
 }
 
+RCT_EXPORT_METHOD(setConsentFlowEnabled:(BOOL)enabled)
+{
+    self.consentFlowEnabledToSet = @(enabled);
+}
+RCT_EXPORT_METHOD(setPrivacyPolicyUrl:(NSString *)urlString)
+{
+    self.privacyPolicyURLToSet = [NSURL URLWithString: urlString];
+}
+RCT_EXPORT_METHOD(setTermsOfServiceUrl:(NSString *)urlString)
+{
+    self.termsOfServiceURLToSet = [NSURL URLWithString: urlString];
+}
+
 #pragma mark - Data Passing
 
 RCT_EXPORT_METHOD(setTargetingDataYearOfBirth:(nonnull NSNumber *)yearOfBirth)

package/ios/AppLovinMAXNativeAdView.m

@@ -279,7 +279,12 @@
 {
     // 1. AdInfo for publisher to be notified via `onAdLoaded`
     
-    NSMutableDictionary<NSString *, id> *nativeAdInfo = [NSMutableDictionary dictionaryWithCapacity: 2];
+    NSMutableDictionary<NSString *, id> *nativeAdInfo = [NSMutableDictionary dictionaryWithCapacity: 5];
+    nativeAdInfo[@"title"] = ad.title;
+    nativeAdInfo[@"advertiser"] = ad.advertiser;
+    nativeAdInfo[@"body"] = ad.body;
+    nativeAdInfo[@"callToAction"] = ad.callToAction;
+
     if ( !isnan(ad.mediaContentAspectRatio) )
     {
         // The aspect ratio can be 0.0f when it is not provided by the network.
@@ -297,28 +302,21 @@
         nativeAdInfo[@"mediaContentAspectRatio"] = @(1.0);
     }
 
+    nativeAdInfo[@"isIconImageAvailable"] = @(ad.icon != nil);
+    nativeAdInfo[@"isOptionsViewAvailable"] = @(ad.optionsView != nil);
+    nativeAdInfo[@"isMediaViewAvailable"] = @(ad.mediaView != nil);
+
     NSMutableDictionary *adInfo = [[AppLovinMAX shared] adInfoForAd: self.nativeAd].mutableCopy;
     adInfo[@"nativeAd"] = nativeAdInfo;
     
     // 2. NativeAd for `AppLovinNativeAdView.js` to render the views
     
     NSMutableDictionary<NSString *, id> *jsNativeAd = [NSMutableDictionary dictionaryWithCapacity: 5];
-    if ( ad.title )
-    {
-        jsNativeAd[@"title"] = ad.title;
-    }
-    if ( ad.advertiser )
-    {
-        jsNativeAd[@"advertiser"] = ad.advertiser;
-    }
-    if ( ad.body )
-    {
-        jsNativeAd[@"body"] = ad.body;
-    }
-    if ( ad.callToAction )
-    {
-        jsNativeAd[@"callToAction"] = ad.callToAction;
-    }
+    jsNativeAd[@"title"] = ad.title;
+    jsNativeAd[@"advertiser"] = ad.advertiser;
+    jsNativeAd[@"body"] = ad.body;
+    jsNativeAd[@"callToAction"] = ad.callToAction;
+
     if ( ad.icon )
     {
         if ( ad.icon.URL )
@@ -330,6 +328,7 @@
             jsNativeAd[@"image"] = @(YES);
         }
     }
+
     jsNativeAd[@"isOptionsViewAvailable"] = ad.optionsView ? @(YES) : @(NO);
     jsNativeAd[@"isMediaViewAvailable"] = ad.mediaView ? @(YES) : @(NO);
     

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-applovin-max",
   "author": "AppLovin Corporation",
-  "version": "5.0.1",
+  "version": "5.1.0",
   "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_5_0_1" }
+  s.source       = { :git => "https://github.com/AppLovin/AppLovin-MAX-React-Native.git", :tag => "release_5_1_0" }
   
   s.source_files  = "ios/AppLovinMAX*.{h,m}"
 

package/src/NativeAdComponents.js

@@ -94,7 +94,7 @@ export const IconView = (props) => {
   const {nativeAd, nativeAdView} = useContext(NativeAdViewContext);
 
   useEffect(() => {
-    if (!nativeAdView || !(nativeAd.url || nativeAd.image)) return;
+    if (!nativeAdView || !nativeAd.image) return;
 
     nativeAdView.setNativeProps({
       iconView: findNodeHandle(imageRef.current),
@@ -104,7 +104,9 @@ export const IconView = (props) => {
   if (!nativeAdView) return null;
 
   return (
-    <Image {...props} ref={imageRef} source={{uri: nativeAd.url || null}}/>
+    nativeAd.url ? <Image {...props} source={{uri: nativeAd.url}} /> :
+      nativeAd.image ? <Image {...props} ref={imageRef} /> : 
+      <Image {...props} />
   );
 };
 

package/src/index.js

@@ -6,7 +6,7 @@ import EventListeners from "./AppLovinMAXEventListeners";
 
 const { AppLovinMAX } = NativeModules;
 
-const VERSION = "5.0.1";
+const VERSION = "5.1.0";
 
 /*---------*/
 /* BANNERS */