cloudx-react-native 3.1.2 → 3.4.0

package/android/build.gradle

@@ -65,7 +65,6 @@ android {
 }
 
 repositories {
-    mavenLocal()
     mavenCentral()
     google()
 }
@@ -73,5 +72,5 @@ repositories {
 dependencies {
     implementation "com.facebook.react:react-native:0.76.2"
 
-    implementation "io.cloudx:sdk:3.1.0"
+    implementation "io.cloudx:sdk:4.1.0"
 }

package/android/src/main/java/com/cloudxreactnative/CloudXModuleImpl.kt

@@ -13,6 +13,9 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.ReadableType
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import io.cloudx.sdk.CloudX
@@ -45,6 +48,7 @@ class CloudXModuleImpl(private val reactApplicationContext: ReactApplicationCont
     private val adViewAdFormats = ConcurrentHashMap<String, CloudXAdFormat>()
     private val adViewPositions = ConcurrentHashMap<String, String>()
     private val adViewOffsetsDp = ConcurrentHashMap<String, Pair<Float, Float>>()
+    private val adViewExtraParameters = ConcurrentHashMap<String, ConcurrentHashMap<String, Any>>()
     private val adUnitIdsToShowAfterCreate = ConcurrentHashMap.newKeySet<String>()
     // Workaround for React Native bug where getCurrentActivity() returns null:
     // https://github.com/facebook/react-native/issues/18345
@@ -170,6 +174,7 @@ class CloudXModuleImpl(private val reactApplicationContext: ReactApplicationCont
     fun setBannerBackgroundColor(adUnitId: String, hexColorString: String) = setAdViewBackgroundColor(adUnitId, CloudXAdFormat.BANNER, hexColorString)
     fun setBannerPlacement(adUnitId: String, placement: String?) = setAdViewPlacement(adUnitId, CloudXAdFormat.BANNER, placement)
     fun setBannerCustomData(adUnitId: String, customData: String?) = setAdViewCustomData(adUnitId, CloudXAdFormat.BANNER, customData)
+    fun setBannerExtraParameters(adUnitId: String, extraParameters: ReadableMap) = setAdViewExtraParameters(adUnitId, CloudXAdFormat.BANNER, extraParameters)
     fun updateBannerPosition(adUnitId: String, position: String) = updateAdViewPosition(adUnitId, CloudXAdFormat.BANNER, position, adViewOffsetsDp[adUnitId] ?: DEFAULT_AD_VIEW_OFFSET_DP)
     fun updateBannerOffsets(adUnitId: String, xOffset: Double, yOffset: Double) = updateAdViewPosition(adUnitId, CloudXAdFormat.BANNER, adViewPositions[adUnitId], Pair(xOffset.toFloat(), yOffset.toFloat()))
     fun startBannerAutoRefresh(adUnitId: String) = startAdViewAutoRefresh(adUnitId, CloudXAdFormat.BANNER)
@@ -187,6 +192,7 @@ class CloudXModuleImpl(private val reactApplicationContext: ReactApplicationCont
     fun setMRECBackgroundColor(adUnitId: String, hexColorString: String) = setAdViewBackgroundColor(adUnitId, CloudXAdFormat.MREC, hexColorString)
     fun setMRECPlacement(adUnitId: String, placement: String?) = setAdViewPlacement(adUnitId, CloudXAdFormat.MREC, placement)
     fun setMRECCustomData(adUnitId: String, customData: String?) = setAdViewCustomData(adUnitId, CloudXAdFormat.MREC, customData)
+    fun setMRECExtraParameters(adUnitId: String, extraParameters: ReadableMap) = setAdViewExtraParameters(adUnitId, CloudXAdFormat.MREC, extraParameters)
     fun updateMRECPosition(adUnitId: String, position: String) = updateAdViewPosition(adUnitId, CloudXAdFormat.MREC, position, adViewOffsetsDp[adUnitId] ?: DEFAULT_AD_VIEW_OFFSET_DP)
     fun updateMRECOffsets(adUnitId: String, xOffset: Double, yOffset: Double) = updateAdViewPosition(adUnitId, CloudXAdFormat.MREC, adViewPositions[adUnitId], Pair(xOffset.toFloat(), yOffset.toFloat()))
     fun startMRECAutoRefresh(adUnitId: String) = startAdViewAutoRefresh(adUnitId, CloudXAdFormat.MREC)
@@ -203,25 +209,35 @@ class CloudXModuleImpl(private val reactApplicationContext: ReactApplicationCont
         retrieveInterstitial(adUnitId).load()
     }
 
+    fun setInterstitialExtraParameters(adUnitId: String, extraParameters: ReadableMap) {
+        applyExtraParameters(extraParameters) { key, value ->
+            retrieveInterstitial(adUnitId).setExtraParameter(key, value)
+        }
+    }
+
     fun isInterstitialReady(adUnitId: String, promise: Promise) {
         promise.resolve(retrieveInterstitial(adUnitId).isAdReady)
     }
 
     fun showInterstitial(adUnitId: String, placement: String?, customData: String?) {
-        val interstitial = retrieveInterstitial(adUnitId)
-        val activity = maybeGetCurrentActivity()
-        if (activity == null) {
-            Log.e(TAG, "showInterstitial: no activity available")
-            return
+        reactApplicationContext.runOnUiQueueThread {
+            val interstitial = retrieveInterstitial(adUnitId)
+            val activity = maybeGetCurrentActivity()
+            if (activity == null) {
+                Log.e(TAG, "showInterstitial: no activity available")
+                return@runOnUiQueueThread
+            }
+            interstitial.show(activity, placement, customData)
         }
-        interstitial.show(activity, placement, customData)
     }
 
     fun destroyInterstitial(adUnitId: String) {
-        interstitials.remove(adUnitId)?.let {
-            it.listener = null
-            it.revenueListener = null
-            it.destroy()
+        reactApplicationContext.runOnUiQueueThread {
+            interstitials.remove(adUnitId)?.let {
+                it.listener = null
+                it.revenueListener = null
+                it.destroy()
+            }
         }
     }
 
@@ -233,25 +249,35 @@ class CloudXModuleImpl(private val reactApplicationContext: ReactApplicationCont
         retrieveRewarded(adUnitId).load()
     }
 
+    fun setRewardedExtraParameters(adUnitId: String, extraParameters: ReadableMap) {
+        applyExtraParameters(extraParameters) { key, value ->
+            retrieveRewarded(adUnitId).setExtraParameter(key, value)
+        }
+    }
+
     fun isRewardedReady(adUnitId: String, promise: Promise) {
         promise.resolve(retrieveRewarded(adUnitId).isAdReady)
     }
 
     fun showRewarded(adUnitId: String, placement: String?, customData: String?) {
-        val rewarded = retrieveRewarded(adUnitId)
-        val activity = maybeGetCurrentActivity()
-        if (activity == null) {
-            Log.e(TAG, "showRewarded: no activity available")
-            return
+        reactApplicationContext.runOnUiQueueThread {
+            val rewarded = retrieveRewarded(adUnitId)
+            val activity = maybeGetCurrentActivity()
+            if (activity == null) {
+                Log.e(TAG, "showRewarded: no activity available")
+                return@runOnUiQueueThread
+            }
+            rewarded.show(activity, placement, customData)
         }
-        rewarded.show(activity, placement, customData)
     }
 
     fun destroyRewarded(adUnitId: String) {
-        rewardedAds.remove(adUnitId)?.let {
-            it.listener = null
-            it.revenueListener = null
-            it.destroy()
+        reactApplicationContext.runOnUiQueueThread {
+            rewardedAds.remove(adUnitId)?.let {
+                it.listener = null
+                it.revenueListener = null
+                it.destroy()
+            }
         }
     }
 
@@ -383,6 +409,7 @@ class CloudXModuleImpl(private val reactApplicationContext: ReactApplicationCont
                 ?: return@runOnUiQueueThread
 
             adViewAdFormats[adUnitId] = adFormat
+            applyPendingExtraParameters(adUnitId, adView)
 
             adView.load()
 
@@ -408,6 +435,83 @@ class CloudXModuleImpl(private val reactApplicationContext: ReactApplicationCont
         }
     }
 
+    private fun setAdViewExtraParameters(adUnitId: String, adFormat: CloudXAdFormat, extraParameters: ReadableMap) {
+        reactApplicationContext.runOnUiQueueThread {
+            val adView = retrieveAdView(adUnitId, adFormat)
+            if (adView != null) {
+                applyExtraParameters(extraParameters) { key, value ->
+                    adView.setExtraParameter(key, value)
+                }
+                return@runOnUiQueueThread
+            }
+
+            val pending = adViewExtraParameters.getOrPut(adUnitId) { ConcurrentHashMap() }
+            applyExtraParameters(extraParameters) { key, value ->
+                if (value == null) {
+                    pending.remove(key)
+                } else {
+                    pending[key] = value
+                }
+            }
+        }
+    }
+
+    private fun applyPendingExtraParameters(adUnitId: String, adView: SdkAdView) {
+        val pending = adViewExtraParameters[adUnitId] ?: return
+        for ((key, value) in pending) {
+            adView.setExtraParameter(key, value)
+        }
+    }
+
+    private fun applyExtraParameters(extraParameters: ReadableMap, apply: (String, Any?) -> Unit) {
+        val iterator = extraParameters.keySetIterator()
+        while (iterator.hasNextKey()) {
+            val key = iterator.nextKey()
+            if (key.isBlank()) continue
+            apply(key, readableMapValue(extraParameters, key))
+        }
+    }
+
+    private fun readableMapValue(map: ReadableMap, key: String): Any? {
+        return when (map.getType(key)) {
+            ReadableType.Null -> null
+            ReadableType.Boolean -> map.getBoolean(key)
+            ReadableType.Number -> map.getDouble(key)
+            ReadableType.String -> map.getString(key)
+            ReadableType.Map -> map.getMap(key)?.let(::readableMapToMap)
+            ReadableType.Array -> map.getArray(key)?.let(::readableArrayToList)
+        }
+    }
+
+    private fun readableMapToMap(readableMap: ReadableMap): Map<String, Any?> {
+        val result = mutableMapOf<String, Any?>()
+        val iterator = readableMap.keySetIterator()
+        while (iterator.hasNextKey()) {
+            val key = iterator.nextKey()
+            result[key] = readableMapValue(readableMap, key)
+        }
+        return result
+    }
+
+    private fun readableArrayToList(readableArray: ReadableArray): List<Any?> {
+        val result = mutableListOf<Any?>()
+        for (index in 0 until readableArray.size()) {
+            result.add(readableArrayValue(readableArray, index))
+        }
+        return result
+    }
+
+    private fun readableArrayValue(array: ReadableArray, index: Int): Any? {
+        return when (array.getType(index)) {
+            ReadableType.Null -> null
+            ReadableType.Boolean -> array.getBoolean(index)
+            ReadableType.Number -> array.getDouble(index)
+            ReadableType.String -> array.getString(index)
+            ReadableType.Map -> array.getMap(index)?.let(::readableMapToMap)
+            ReadableType.Array -> array.getArray(index)?.let(::readableArrayToList)
+        }
+    }
+
     private fun updateAdViewPosition(adUnitId: String, adFormat: CloudXAdFormat, position: String?, offsetsDp: Pair<Float, Float>) {
         reactApplicationContext.runOnUiQueueThread {
             val adView = retrieveAdView(adUnitId, adFormat) ?: return@runOnUiQueueThread
@@ -466,6 +570,7 @@ class CloudXModuleImpl(private val reactApplicationContext: ReactApplicationCont
             adViewAdFormats.remove(adUnitId)
             adViewPositions.remove(adUnitId)
             adViewOffsetsDp.remove(adUnitId)
+            adViewExtraParameters.remove(adUnitId)
             adUnitIdsToShowAfterCreate.remove(adUnitId)
         }
     }
@@ -661,15 +766,17 @@ class CloudXModuleImpl(private val reactApplicationContext: ReactApplicationCont
             destroyAdView(adUnitId, adFormat)
         }
 
-        for (interstitial in interstitials.values) {
-            interstitial.destroy()
-        }
-        interstitials.clear()
+        reactApplicationContext.runOnUiQueueThread {
+            for (interstitial in interstitials.values) {
+                interstitial.destroy()
+            }
+            interstitials.clear()
 
-        for (rewarded in rewardedAds.values) {
-            rewarded.destroy()
+            for (rewarded in rewardedAds.values) {
+                rewarded.destroy()
+            }
+            rewardedAds.clear()
         }
-        rewardedAds.clear()
     }
 
     // =========================================================================

package/android/src/newarch/com/cloudxreactnative/CloudXModule.kt

@@ -4,6 +4,7 @@ import com.facebook.fbreact.specs.NativeCloudXSpec
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.module.annotations.ReactModule
 
 @ReactModule(name = CloudXModuleImpl.MODULE_NAME)
@@ -35,6 +36,7 @@ class CloudXModule(reactContext: ReactApplicationContext) :
     @ReactMethod override fun setBannerBackgroundColor(adUnitId: String, hexColorString: String) = impl.setBannerBackgroundColor(adUnitId, hexColorString)
     @ReactMethod override fun setBannerPlacement(adUnitId: String, placement: String?) = impl.setBannerPlacement(adUnitId, placement)
     @ReactMethod override fun setBannerCustomData(adUnitId: String, customData: String?) = impl.setBannerCustomData(adUnitId, customData)
+    @ReactMethod override fun setBannerExtraParameters(adUnitId: String, extraParameters: ReadableMap) = impl.setBannerExtraParameters(adUnitId, extraParameters)
     @ReactMethod override fun updateBannerPosition(adUnitId: String, position: String) = impl.updateBannerPosition(adUnitId, position)
     @ReactMethod override fun updateBannerOffsets(adUnitId: String, xOffset: Double, yOffset: Double) = impl.updateBannerOffsets(adUnitId, xOffset, yOffset)
     @ReactMethod override fun startBannerAutoRefresh(adUnitId: String) = impl.startBannerAutoRefresh(adUnitId)
@@ -47,6 +49,7 @@ class CloudXModule(reactContext: ReactApplicationContext) :
     @ReactMethod override fun createMRECWithOffsets(adUnitId: String, position: String, xOffset: Double, yOffset: Double) = impl.createMRECWithOffsets(adUnitId, position, xOffset, yOffset)
     @ReactMethod override fun setMRECPlacement(adUnitId: String, placement: String?) = impl.setMRECPlacement(adUnitId, placement)
     @ReactMethod override fun setMRECCustomData(adUnitId: String, customData: String?) = impl.setMRECCustomData(adUnitId, customData)
+    @ReactMethod override fun setMRECExtraParameters(adUnitId: String, extraParameters: ReadableMap) = impl.setMRECExtraParameters(adUnitId, extraParameters)
     @ReactMethod override fun updateMRECPosition(adUnitId: String, position: String) = impl.updateMRECPosition(adUnitId, position)
     @ReactMethod override fun updateMRECOffsets(adUnitId: String, xOffset: Double, yOffset: Double) = impl.updateMRECOffsets(adUnitId, xOffset, yOffset)
     @ReactMethod override fun startMRECAutoRefresh(adUnitId: String) = impl.startMRECAutoRefresh(adUnitId)
@@ -57,11 +60,13 @@ class CloudXModule(reactContext: ReactApplicationContext) :
     @ReactMethod override fun setMRECBackgroundColor(adUnitId: String, hexColorString: String) = impl.setMRECBackgroundColor(adUnitId, hexColorString)
 
     @ReactMethod override fun loadInterstitial(adUnitId: String) = impl.loadInterstitial(adUnitId)
+    @ReactMethod override fun setInterstitialExtraParameters(adUnitId: String, extraParameters: ReadableMap) = impl.setInterstitialExtraParameters(adUnitId, extraParameters)
     @ReactMethod override fun isInterstitialReady(adUnitId: String, promise: Promise) = impl.isInterstitialReady(adUnitId, promise)
     @ReactMethod override fun showInterstitial(adUnitId: String, placement: String?, customData: String?) = impl.showInterstitial(adUnitId, placement, customData)
     @ReactMethod override fun destroyInterstitial(adUnitId: String) = impl.destroyInterstitial(adUnitId)
 
     @ReactMethod override fun loadRewarded(adUnitId: String) = impl.loadRewarded(adUnitId)
+    @ReactMethod override fun setRewardedExtraParameters(adUnitId: String, extraParameters: ReadableMap) = impl.setRewardedExtraParameters(adUnitId, extraParameters)
     @ReactMethod override fun isRewardedReady(adUnitId: String, promise: Promise) = impl.isRewardedReady(adUnitId, promise)
     @ReactMethod override fun showRewarded(adUnitId: String, placement: String?, customData: String?) = impl.showRewarded(adUnitId, placement, customData)
     @ReactMethod override fun destroyRewarded(adUnitId: String) = impl.destroyRewarded(adUnitId)

package/android/src/oldarch/com/cloudxreactnative/CloudXModule.kt

@@ -1,9 +1,11 @@
 package com.cloudxreactnative
 
+import com.facebook.react.bridge.Dynamic
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.bridge.ReadableMap
 
 class CloudXModule(reactContext: ReactApplicationContext) :
     ReactContextBaseJavaModule(reactContext) {
@@ -25,14 +27,30 @@ class CloudXModule(reactContext: ReactApplicationContext) :
     @ReactMethod fun setAppKeyValue(key: String, value: String) = impl.setAppKeyValue(key, value)
     @ReactMethod fun clearAllKeyValues() = impl.clearAllKeyValues()
 
-    @ReactMethod fun setHasUserConsent(hasUserConsent: Boolean?) = impl.setHasUserConsent(hasUserConsent)
-    @ReactMethod fun setDoNotSell(isDoNotSell: Boolean?) = impl.setDoNotSell(isDoNotSell)
+    // Paper's `JavaMethodWrapper` extracts primitive boxed types via
+    // `ReadableNativeArray.getBoolean(int)` which unconditionally calls
+    // `booleanValue()` on the boxed result — null arguments therefore throw
+    // `NativeArgumentsParseException` *before* the method runs, even when the
+    // Kotlin signature is `Boolean?`. Declaring the parameter as `Dynamic`
+    // lets the bridge hand us the raw value and we null-check it ourselves.
+    // TurboModules (NewArch) don't have this limitation, which is why the
+    // newarch counterpart keeps the `Boolean?` signature directly.
+    @ReactMethod fun setHasUserConsent(hasUserConsent: Dynamic) {
+        val value: Boolean? = if (hasUserConsent.isNull) null else hasUserConsent.asBoolean()
+        impl.setHasUserConsent(value)
+    }
+
+    @ReactMethod fun setDoNotSell(isDoNotSell: Dynamic) {
+        val value: Boolean? = if (isDoNotSell.isNull) null else isDoNotSell.asBoolean()
+        impl.setDoNotSell(value)
+    }
 
     @ReactMethod fun createBanner(adUnitId: String, position: String) = impl.createBanner(adUnitId, position)
     @ReactMethod fun createBannerWithOffsets(adUnitId: String, position: String, xOffset: Double, yOffset: Double) = impl.createBannerWithOffsets(adUnitId, position, xOffset, yOffset)
     @ReactMethod fun setBannerBackgroundColor(adUnitId: String, hexColorString: String) = impl.setBannerBackgroundColor(adUnitId, hexColorString)
     @ReactMethod fun setBannerPlacement(adUnitId: String, placement: String?) = impl.setBannerPlacement(adUnitId, placement)
     @ReactMethod fun setBannerCustomData(adUnitId: String, customData: String?) = impl.setBannerCustomData(adUnitId, customData)
+    @ReactMethod fun setBannerExtraParameters(adUnitId: String, extraParameters: ReadableMap) = impl.setBannerExtraParameters(adUnitId, extraParameters)
     @ReactMethod fun updateBannerPosition(adUnitId: String, position: String) = impl.updateBannerPosition(adUnitId, position)
     @ReactMethod fun updateBannerOffsets(adUnitId: String, xOffset: Double, yOffset: Double) = impl.updateBannerOffsets(adUnitId, xOffset, yOffset)
     @ReactMethod fun startBannerAutoRefresh(adUnitId: String) = impl.startBannerAutoRefresh(adUnitId)
@@ -45,6 +63,7 @@ class CloudXModule(reactContext: ReactApplicationContext) :
     @ReactMethod fun createMRECWithOffsets(adUnitId: String, position: String, xOffset: Double, yOffset: Double) = impl.createMRECWithOffsets(adUnitId, position, xOffset, yOffset)
     @ReactMethod fun setMRECPlacement(adUnitId: String, placement: String?) = impl.setMRECPlacement(adUnitId, placement)
     @ReactMethod fun setMRECCustomData(adUnitId: String, customData: String?) = impl.setMRECCustomData(adUnitId, customData)
+    @ReactMethod fun setMRECExtraParameters(adUnitId: String, extraParameters: ReadableMap) = impl.setMRECExtraParameters(adUnitId, extraParameters)
     @ReactMethod fun updateMRECPosition(adUnitId: String, position: String) = impl.updateMRECPosition(adUnitId, position)
     @ReactMethod fun updateMRECOffsets(adUnitId: String, xOffset: Double, yOffset: Double) = impl.updateMRECOffsets(adUnitId, xOffset, yOffset)
     @ReactMethod fun startMRECAutoRefresh(adUnitId: String) = impl.startMRECAutoRefresh(adUnitId)
@@ -55,11 +74,13 @@ class CloudXModule(reactContext: ReactApplicationContext) :
     @ReactMethod fun setMRECBackgroundColor(adUnitId: String, hexColorString: String) = impl.setMRECBackgroundColor(adUnitId, hexColorString)
 
     @ReactMethod fun loadInterstitial(adUnitId: String) = impl.loadInterstitial(adUnitId)
+    @ReactMethod fun setInterstitialExtraParameters(adUnitId: String, extraParameters: ReadableMap) = impl.setInterstitialExtraParameters(adUnitId, extraParameters)
     @ReactMethod fun isInterstitialReady(adUnitId: String, promise: Promise) = impl.isInterstitialReady(adUnitId, promise)
     @ReactMethod fun showInterstitial(adUnitId: String, placement: String?, customData: String?) = impl.showInterstitial(adUnitId, placement, customData)
     @ReactMethod fun destroyInterstitial(adUnitId: String) = impl.destroyInterstitial(adUnitId)
 
     @ReactMethod fun loadRewarded(adUnitId: String) = impl.loadRewarded(adUnitId)
+    @ReactMethod fun setRewardedExtraParameters(adUnitId: String, extraParameters: ReadableMap) = impl.setRewardedExtraParameters(adUnitId, extraParameters)
     @ReactMethod fun isRewardedReady(adUnitId: String, promise: Promise) = impl.isRewardedReady(adUnitId, promise)
     @ReactMethod fun showRewarded(adUnitId: String, placement: String?, customData: String?) = impl.showRewarded(adUnitId, placement, customData)
     @ReactMethod fun destroyRewarded(adUnitId: String) = impl.destroyRewarded(adUnitId)

package/cloudx-react-native.podspec

@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
 
   s.requires_arc = true
 
-  s.dependency "CloudXCore", "~> 3.1.0"
+  s.dependency "CloudXCore", "~> 3.4.0"
 
   s.source_files = "ios/**/*.{h,mm}"