From 6ab4d13983569eed3b360dbce9a2a95d398af9cb Mon Sep 17 00:00:00 2001 From: Ramsay Romero Date: Mon, 27 Feb 2023 15:17:13 -0800 Subject: [PATCH 1/2] Send didDisplayIncomingCall event in correct method --- .../io/wazo/callkeep/RNCallKeepModule.java | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/android/src/main/java/io/wazo/callkeep/RNCallKeepModule.java b/android/src/main/java/io/wazo/callkeep/RNCallKeepModule.java index f5bca1d8..a8e2d37b 100644 --- a/android/src/main/java/io/wazo/callkeep/RNCallKeepModule.java +++ b/android/src/main/java/io/wazo/callkeep/RNCallKeepModule.java @@ -181,17 +181,6 @@ public void reportNewIncomingCall(String uuid, String number, String callerName, Log.d(TAG, "[RNCallKeepModule] reportNewIncomingCall, uuid: " + uuid + ", number: " + number + ", callerName: " + callerName); this.displayIncomingCall(uuid, number, callerName, hasVideo); - - // Send event to JS - WritableMap args = Arguments.createMap(); - args.putString("handle", number); - args.putString("callUUID", uuid); - args.putString("name", callerName); - args.putString("hasVideo", String.valueOf(hasVideo)); - if (payload != null) { - args.putString("payload", payload); - } - sendEventToJS("RNCallKeepDidDisplayIncomingCall", args); } public void startObserving() { @@ -329,6 +318,15 @@ public void displayIncomingCall(String uuid, String number, String callerName, b extras.putString(EXTRA_HAS_VIDEO, String.valueOf(hasVideo)); telecomManager.addNewIncomingCall(handle, extras); + + // Send event to JS + WritableMap args = Arguments.createMap(); + args.putString("handle", number); + args.putString("callUUID", uuid); + args.putString("localizedCallerName", callerName); + args.putString("hasVideo", hasVideo ? "1" : "0"); + + sendEventToJS("RNCallKeepDidDisplayIncomingCall", args); } @ReactMethod From 1d7583b4e888cd8056d6682facc614065893cf53 Mon Sep 17 00:00:00 2001 From: Ramsay Romero Date: Mon, 27 Feb 2023 15:23:34 -0800 Subject: [PATCH 2/2] Update docs for didDisplayIncomingCall --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3dcc8f2d..95ef1bd5 100644 --- a/README.md +++ b/README.md @@ -798,7 +798,8 @@ Callback for `RNCallKeep.displayIncomingCall` ```js RNCallKeep.addEventListener('didDisplayIncomingCall', ({ error, callUUID, handle, localizedCallerName, hasVideo, fromPushKit, payload }) => { // you might want to do following things when receiving this event: - // - Start playing ringback if it is an outgoing call + // - Navigate to your incoming call screen + // - Handle errors on iOS }); ``` @@ -816,9 +817,11 @@ RNCallKeep.addEventListener('didDisplayIncomingCall', ({ error, callUUID, handle - `1` (video enabled) - `0` (video not enabled) - `fromPushKit` (string) + - iOS only. - `1` (call triggered from PushKit) - `0` (call not triggered from PushKit) - `payload` (object) + - iOS only. - VOIP push payload. ### didPerformSetMutedCallAction