Skip to content

Commit 5b8a26c

Browse files
Merge pull request #660 from DataDog/marcosaia/RUM-4301/fix-rn-63
[RUM-4303, RUM-4301]: Fix Android build error for RN v63
2 parents fa3a93e + 7041d33 commit 5b8a26c

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkBridgeExt.kt

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
package com.datadog.reactnative
88

99
import android.util.Log
10+
import com.facebook.react.bridge.Arguments
1011
import com.facebook.react.bridge.ReadableArray
1112
import com.facebook.react.bridge.ReadableMap
1213
import com.facebook.react.bridge.ReadableType
@@ -186,8 +187,18 @@ internal fun ReadableArray.toList(): List<*> {
186187
ReadableType.Boolean -> list.add(getBoolean(i))
187188
ReadableType.Number -> list.add(getDouble(i))
188189
ReadableType.String -> list.add(getString(i))
189-
ReadableType.Map -> list.add(getMap(i).toMap())
190-
ReadableType.Array -> list.add(getArray(i).toList())
190+
ReadableType.Map -> {
191+
// getMap() return type is nullable in previous RN versions
192+
@Suppress("USELESS_ELVIS")
193+
val readableMap = getMap(i) ?: Arguments.createMap()
194+
list.add(readableMap.toMap())
195+
}
196+
ReadableType.Array -> {
197+
// getArray() return type is nullable in previous RN versions
198+
@Suppress("USELESS_ELVIS")
199+
val readableArray = getArray(i) ?: Arguments.createArray()
200+
list.add(readableArray.toList())
201+
}
191202
else -> Log.e(
192203
javaClass.simpleName,
193204
"toList(): Unhandled ReadableType: ${type.name}."

0 commit comments

Comments
 (0)