missed some things

Author: danjenkins

android/src/main/java/io/wazo/callkeep/RNCallKeepModule.java

@@ -143,7 +143,7 @@ public void displayIncomingCall(String uuid, String identifier, String callerTyp
         extras.putString(EXTRA_CALL_UUID, uuid);
 
         if (callHasVideo) {
-            extras.putParcelable(TelecomManager.EXTRA_START_CALL_WITH_VIDEO_STATE, VideoProfile.STATE_BIDIRECTIONAL);
+            extras.putInt(TelecomManager.EXTRA_START_CALL_WITH_VIDEO_STATE, VideoProfile.STATE_BIDIRECTIONAL);
         }
 
         telecomManager.addNewIncomingCall(handle, extras);
@@ -183,7 +183,7 @@ public void startCall(String uuid, String identifer, String callerName, String c
         extras.putParcelable(TelecomManager.EXTRA_OUTGOING_CALL_EXTRAS, callExtras);
 
         if (callHasVideo) {
-            extras.putParcelable(TelecomManager.EXTRA_INCOMING_VIDEO_STATE, VideoProfile.STATE_BIDIRECTIONAL);
+            extras.putInt(TelecomManager.EXTRA_INCOMING_VIDEO_STATE, VideoProfile.STATE_BIDIRECTIONAL);
         }
 
         telecomManager.placeCall(uri, extras);
@@ -566,7 +566,7 @@ public void onReceive(Context context, Intent intent) {
                     sendEventToJS("RNCallKeepDidPerformDTMFAction", args);
                     break;
                 case ACTION_ONGOING_CALL:
-                    args.putString("handle", attributeMap.get(EXTRA_CALL_NUMBER));
+                    args.putString("handle", attributeMap.get(EXTRA_CALL_IDENTIFIER));
                     args.putString("callUUID", attributeMap.get(EXTRA_CALL_UUID));
                     args.putString("name", attributeMap.get(EXTRA_CALLER_NAME));
                     sendEventToJS("RNCallKeepDidReceiveStartCallAction", args);

android/src/main/java/io/wazo/callkeep/VoiceConnectionService.java

@@ -168,7 +168,7 @@ private Connection makeOutgoingCall(ConnectionRequest request, String uuid, Bool
         }
 
         // TODO: Hold all other calls
-        if (extrasIdentifier == null || !extrasIdentifier.equals(number)) {
+        if (extrasIdentifier == null || !extrasIdentifier.equals(identifier)) {
             extras.putString(EXTRA_CALL_UUID, uuid);
             extras.putString(EXTRA_CALLER_NAME, displayName);
             extras.putString(EXTRA_CALL_IDENTIFIER, identifier);