Skip to content

Commit b5fcda1

Browse files
Merge branch 'master' into patch-2
2 parents ebecfec + e312594 commit b5fcda1

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed

README.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ RNCallKeep.registerAndroidEvents();
726726
| [didPerformSetMutedCallAction](#didPerformSetMutedCallAction) |||
727727
| [didToggleHoldCallAction](#didToggleHoldCallAction) |||
728728
| [didPerformDTMFAction](#didPerformDTMFAction) |||
729-
| [didLoadWithEvents](#didLoadWithEvents) || |
729+
| [didLoadWithEvents](#didLoadWithEvents) || |
730730
| [showIncomingCallUi](#showIncomingCallUi) |||
731731
| [silenceIncomingCall](#silenceIncomingCall) |||
732732
| [checkReachability](#checkReachability) |||
@@ -754,7 +754,7 @@ RNCallKeep.addEventListener('didReceiveStartCallAction', ({ handle, callUUID, na
754754
- `name` (string)
755755
- Name of the callee
756756

757-
### - answerCall
757+
### answerCall
758758

759759
User answer the incoming call
760760

@@ -767,7 +767,7 @@ RNCallKeep.addEventListener('answerCall', ({ callUUID }) => {
767767
- `callUUID` (string)
768768
- The UUID of the call that is to be answered.
769769

770-
### - endCall
770+
### endCall
771771

772772
User finish the call.
773773

@@ -780,7 +780,7 @@ RNCallKeep.addEventListener('endCall', ({ callUUID }) => {
780780
- `callUUID` (string)
781781
- The UUID of the call that is to be ended.
782782

783-
### - didActivateAudioSession
783+
### didActivateAudioSession
784784

785785
The `AudioSession` has been activated by **RNCallKeep**.
786786

@@ -791,7 +791,7 @@ RNCallKeep.addEventListener('didActivateAudioSession', () => {
791791
});
792792
```
793793

794-
### - didDisplayIncomingCall
794+
### didDisplayIncomingCall
795795

796796
Callback for `RNCallKeep.displayIncomingCall`
797797

@@ -821,7 +821,7 @@ RNCallKeep.addEventListener('didDisplayIncomingCall', ({ error, callUUID, handle
821821
- `payload` (object)
822822
- VOIP push payload.
823823

824-
### - didPerformSetMutedCallAction
824+
### didPerformSetMutedCallAction
825825

826826
A call was muted by the system or the user:
827827

@@ -835,7 +835,7 @@ RNCallKeep.addEventListener('didPerformSetMutedCallAction', ({ muted, callUUID }
835835
- `callUUID` (string)
836836
- The UUID of the call.
837837

838-
### - didToggleHoldCallAction
838+
### didToggleHoldCallAction
839839

840840
A call was held or unheld by the current user
841841

@@ -849,7 +849,7 @@ RNCallKeep.addEventListener('didToggleHoldCallAction', ({ hold, callUUID }) => {
849849
- `callUUID` (string)
850850
- The UUID of the call.
851851

852-
### - didChangeAudioRoute
852+
### didChangeAudioRoute
853853

854854
Triggered when the audio route has been changed.
855855

@@ -864,7 +864,7 @@ RNCallKeep.addEventListener('didChangeAudioRoute', ({ output }) => {
864864
- `handle` (string, Android only) Phone number of the incoming caller
865865
- `callUUID` (string, Android only) The UUID of the call
866866

867-
### - didPerformDTMFAction
867+
### didPerformDTMFAction
868868

869869
Used type a number on his dialer
870870

@@ -879,7 +879,7 @@ RNCallKeep.addEventListener('didPerformDTMFAction', ({ digits, callUUID }) => {
879879
- `callUUID` (string)
880880
- The UUID of the call.
881881

882-
### - didLoadWithEvents
882+
### didLoadWithEvents
883883

884884
iOS only.
885885

@@ -906,7 +906,7 @@ RNCallKeep.addEventListener('didLoadWithEvents', (events) => {
906906
- `data`: object
907907
Object with data passed together with specific event so it can be handled in the same way like original event, for example `({ callUUID })` for `answerCall` event if `name` is `RNCallKeepPerformAnswerCallAction`
908908

909-
### - showIncomingCallUi
909+
### showIncomingCallUi
910910

911911
_Android only. Self Managed only._
912912

@@ -927,7 +927,7 @@ The following values will match those initially passed to `displayIncomingCall`
927927
- `name` (string)
928928
- Caller Name.
929929

930-
### - silenceIncomingCall
930+
### silenceIncomingCall
931931

932932
_Android only. Self Managed only._
933933

@@ -948,7 +948,7 @@ The following values will match those initially passed to `silenceIncomingCall`
948948
- `name` (string)
949949
- Caller Name.
950950

951-
### - createIncomingConnectionFailed
951+
### createIncomingConnectionFailed
952952

953953
_Android only. Self Managed only._
954954

@@ -969,7 +969,7 @@ The following values will match those initially passed to `silenceIncomingCall`
969969
- `name` (string)
970970
- Caller Name.
971971

972-
### - checkReachability
972+
### checkReachability
973973

974974
_Android only._
975975

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ private Connection makeOutgoingCall(ConnectionRequest request, String uuid, Bool
269269
// ‍️Weirdly on some Samsung phones (A50, S9...) using `setInitialized` will not display the native UI ...
270270
// when making a call from the native Phone application. The call will still be displayed correctly without it.
271271
if (!Build.MANUFACTURER.equalsIgnoreCase("Samsung")) {
272-
Log.d(TAG, "[VoiceConnectionService] onCreateOutgoingConnection: initializing connection on Samsung device");
272+
Log.d(TAG, "[VoiceConnectionService] onCreateOutgoingConnection: initializing connection on non-Samsung device");
273273
outgoingCallConnection.setInitialized();
274274
}
275275

docs/android-installation.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ public class MainActivity extends ReactActivity {
6565
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
6666
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
6767
<uses-permission android:name="android.permission.CALL_PHONE" />
68+
<uses-permission android:name="android.permission.RECORD_AUDIO" />
6869

6970
<application>
7071
// ...

0 commit comments

Comments
 (0)