Fix rebase

Author: manuquentin

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

@@ -289,7 +289,7 @@ private void startForegroundService() {
             return;
         }
         Log.d(TAG, "[VoiceConnectionService] startForegroundService");
-        ReadableMap foregroundSettings = getForegroundSettings();
+        ReadableMap foregroundSettings = getForegroundSettings(null);
 
         if (foregroundSettings == null || !foregroundSettings.hasKey("channelId")) {
             Log.w(TAG, "[VoiceConnectionService] Not creating foregroundService because not configured");
@@ -325,7 +325,7 @@ private void startForegroundService() {
 
     private void stopForegroundService() {
         Log.d(TAG, "[VoiceConnectionService] stopForegroundService");
-        ReadableMap foregroundSettings = getForegroundSettings();
+        ReadableMap foregroundSettings = getForegroundSettings(null);
 
         if (foregroundSettings == null || !foregroundSettings.hasKey("channelId")) {
             Log.d(TAG, "[VoiceConnectionService] Discarding stop foreground service, no service configured");
@@ -476,7 +476,7 @@ public void onCreateIncomingConnectionFailed(PhoneAccountHandle connectionManage
             extrasMap.put(EXTRA_CALL_NUMBER, callerNumber);
         }
 
-        sendCallRequestToActivity(ACTION_ON_CREATE_CONNECTION_FAILED, extrasMap);
+        sendCallRequestToActivity(ACTION_ON_CREATE_CONNECTION_FAILED, extrasMap, true);
     }
 
     // When a listener is available for `sendCallRequestToActivity`, send delayed events.

ios/RNCallKeep/RNCallKeep.m

@@ -114,8 +114,8 @@ - (void)dealloc
         RNCallKeepDidToggleHoldAction,
         RNCallKeepProviderReset,
         RNCallKeepCheckReachability,
-        RNCallKeepDidChangeAudioRoute,
-        RNCallKeepDidLoadWithEvents
+        RNCallKeepDidLoadWithEvents,
+        RNCallKeepDidChangeAudioRoute
     ];
 }