Fix branch stuff

Author: Brandon Huang

README.md

@@ -106,6 +106,7 @@ _This feature is available only on Android._
 
 Mark the current call as active (eg: when the callee has answered).
 Necessary to set the correct Android capabilities (hold, mute) once the call is set as active.
+Be sure to set this only after your call is ready for two way audio; used both incoming and outgoing calls.
 
 ```js
 RNCallKeep.setCurrentCallActive(uuid);

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

@@ -77,7 +77,6 @@ public void onAnswer() {
         Log.d(TAG, "onAnswer called");
 
         setConnectionCapabilities(getConnectionCapabilities() | Connection.CAPABILITY_HOLD);
-        setActive();
         setAudioModeIsVoip(true);
 
         sendCallRequestToActivity(ACTION_ANSWER_CALL, handle);

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

@@ -96,6 +96,7 @@ public Connection onCreateIncomingConnection(PhoneAccountHandle connectionManage
         String name = extra.getString(EXTRA_CALLER_NAME);
         Connection incomingCallConnection = createConnection(request);
         incomingCallConnection.setRinging();
+        incomingCallConnection.setInitialized();
 
         return incomingCallConnection;
     }
@@ -125,6 +126,7 @@ public Connection onCreateOutgoingConnection(PhoneAccountHandle connectionManage
         outgoingCallConnection.setDialing();
         outgoingCallConnection.setAudioModeIsVoip(true);
         outgoingCallConnection.setCallerDisplayName(name, TelecomManager.PRESENTATION_ALLOWED);
+        outgoingCallConnection.setInitialized();
 
         HashMap<String, String> extrasMap = this.bundleToMap(extras);
 
@@ -159,7 +161,6 @@ private Connection createConnection(ConnectionRequest request) {
         List<Connection> conferenceConnections = new ArrayList<Connection>(otherConnections.values());
         connection.setConferenceableConnections(conferenceConnections);
 
-        connection.setInitialized();
         return connection;
     }
 

index.js

@@ -138,9 +138,6 @@ class RNCallKeep {
   };
 
   updateDisplay = (uuid, displayName, uri) => {
-    if (isIOS) {
-      return;
-    }
     RNCallKeepModule.updateDisplay(uuid, displayName, uri)
   }
 

ios/RNCallKeep/RNCallKeep.m

@@ -225,7 +225,7 @@ - (void)dealloc
     [self.callKeepProvider reportOutgoingCallWithUUID:uuid connectedAtDate:[NSDate date]];
 }
 
-RCT_EXPORT_METHOD(reportEndCallWithUUID:(NSString *)uuidString reason:(int)reason)
+RCT_EXPORT_METHOD(reportEndCallWithUUID:(NSString *)uuidString :(int)reason)
 {
 #ifdef DEBUG
     NSLog(@"[RNCallKeep][reportEndCallWithUUID] uuidString = %@ reason = %d", uuidString, reason);
@@ -246,7 +246,20 @@ - (void)dealloc
     }
 }
 
-RCT_EXPORT_METHOD(setMutedCall:(NSString *)uuidString muted:(BOOL)muted)
+RCT_EXPORT_METHOD(updateDisplay:(NSString *)uuidString :(NSString *)displayName :(NSString *)uri)
+{
+#ifdef DEBUG
+    NSLog(@"[RNCallKeep][updateDisplay] uuidString = %@ displayName = %@ uri = %@", uuidString, displayName, uri);
+#endif
+    NSUUID *uuid = [[NSUUID alloc] initWithUUIDString:uuidString];
+    CXHandle *callHandle = [[CXHandle alloc] initWithType:CXHandleTypePhoneNumber value:uri];
+    CXCallUpdate *callUpdate = [[CXCallUpdate alloc] init];
+    callUpdate.localizedCallerName = displayName;
+    callUpdate.remoteHandle = callHandle;
+    [self.callKeepProvider reportCallWithUUID:uuid updated:callUpdate];
+}
+
+RCT_EXPORT_METHOD(setMutedCall:(NSString *)uuidString :(BOOL)muted)
 {
 #ifdef DEBUG
     NSLog(@"[RNCallKeep][setMutedCall] muted = %i", muted);