Skip to content

fix(android): prevent TurboModule event emitter crash before setEventEmitterCallback (#428) #441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AmitKulkarni23 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(android): prevent TurboModule event emitter crash before setEventEmitterCallback (#428) #441

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions android/src/newarch/java/com/radar/RadarModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,24 @@ import com.facebook.react.bridge.WritableMap
import com.facebook.react.bridge.Promise
import com.facebook.react.bridge.ReadableMap
import com.facebook.react.bridge.ReadableArray
import com.facebook.react.bridge.CxxCallbackImpl
import org.json.JSONException
import org.json.JSONObject

@ReactModule(name = RadarModule.NAME)
class RadarModule(reactContext: ReactApplicationContext) :
NativeRadarSpec(reactContext), PermissionListener {

@Volatile private var jsEventEmitterReady = false

override fun setEventEmitterCallback(eventEmitterCallback: CxxCallbackImpl) {
super.setEventEmitterCallback(eventEmitterCallback)
jsEventEmitterReady = true
}

private val radarReceiver = object : RadarReceiver() {
override fun onEventsReceived(context: Context, events: Array<RadarEvent>, user: RadarUser?) {
if (!jsEventEmitterReady) return
val eventBlob = Arguments.createMap().apply {
var eventsArray = Arguments.createArray()
for (event in events) {
Expand All @@ -57,6 +66,7 @@ class RadarModule(reactContext: ReactApplicationContext) :
}

override fun onLocationUpdated(context: Context, location: Location, user: RadarUser) {
if (!jsEventEmitterReady) return
val eventBlob = Arguments.createMap().apply {
putString("location", Radar.jsonForLocation(location).toString())
putString("user", user.toJson().toString())
Expand All @@ -65,6 +75,7 @@ class RadarModule(reactContext: ReactApplicationContext) :
}

override fun onClientLocationUpdated(context: Context, location: Location, stopped: Boolean, source: Radar.RadarLocationSource) {
if (!jsEventEmitterReady) return
val eventBlob = Arguments.createMap().apply {
putString("location", Radar.jsonForLocation(location).toString())
putBoolean("stopped", stopped)
Expand All @@ -74,13 +85,15 @@ class RadarModule(reactContext: ReactApplicationContext) :
}

override fun onError(context: Context, status: Radar.RadarStatus) {
if (!jsEventEmitterReady) return
val eventBlob = Arguments.createMap().apply {
putString("status", status.toString())
}
emitErrorEmitter(eventBlob)
}

override fun onLog(context: Context, message: String) {
if (!jsEventEmitterReady) return
val eventBlob = Arguments.createMap().apply {
putString("message", message)
}
Expand All @@ -90,6 +103,7 @@ class RadarModule(reactContext: ReactApplicationContext) :

private val radarInAppMessageReceiver = object : RadarInAppMessageReceiver {
override fun onNewInAppMessage(message: RadarInAppMessage) {
if (!jsEventEmitterReady) return
try {
val eventBlob = Arguments.createMap().apply {
putMap("inAppMessage", RadarUtils.mapForJson(JSONObject(message.toJson())))
Expand All @@ -101,6 +115,7 @@ class RadarModule(reactContext: ReactApplicationContext) :
}

override fun onInAppMessageDismissed(message: RadarInAppMessage) {
if (!jsEventEmitterReady) return
try {
val eventBlob = Arguments.createMap().apply {
putMap("inAppMessage", RadarUtils.mapForJson(JSONObject(message.toJson())))
Expand All @@ -112,6 +127,7 @@ class RadarModule(reactContext: ReactApplicationContext) :
}

override fun onInAppMessageButtonClicked(message: RadarInAppMessage) {
if (!jsEventEmitterReady) return
try {
val eventBlob = Arguments.createMap().apply {
putMap("inAppMessage", RadarUtils.mapForJson(JSONObject(message.toJson())))
Expand All @@ -125,6 +141,7 @@ class RadarModule(reactContext: ReactApplicationContext) :

private val radarVerifiedReceiver = object : RadarVerifiedReceiver() {
override fun onTokenUpdated(context: Context, token: RadarVerifiedLocationToken) {
if (!jsEventEmitterReady) return
val eventBlob = Arguments.createMap().apply {
putString("token", token.toJson().toString())
}
Expand Down