Merge branch 'master' into master

Author: JoL0712

README.md

@@ -15,6 +15,7 @@ For more information about **ConnectionService** on Android, please see [Android
 - [Demo](#Demo)
 - [Installation](#Installation)
 - [Usage](#Usage)
+  - [Expo](#Usage-with-Expo)
   - [Constants](#Constants)
   - [Android Self Managed](#Android-Self-Managed-Mode)
   - [API](#Api)
@@ -155,6 +156,10 @@ Alternative on iOS you can perform setup in `AppDelegate.m`. Doing this allows c
 
 You can alternatively just call `setSettings()` with the same option as `setup()` to define only your settings.
 
+# Usage with Expo
+
+To use this library with Expo, you will need to create a development build. Expo Go does not support custom native modules. For information on how to create and run a development build, visit: [Create a development build - Expo Documentation](https://docs.expo.dev/develop/development-builds/create-a-build/). You can use and test this library with a development build installed on your physical device (iOS and Android). 
+
 # Constants
 
 To make passing the right integer into methods easier, there are constants that are exported from the module.
@@ -1108,6 +1113,7 @@ class RNCallKeepExample extends React.Component {
 }
 ```
 
+
 ## Receiving a call when the application is not reachable.
 
 In some case your application can be unreachable :

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

@@ -1079,11 +1079,11 @@ private WritableMap storeSettings(ReadableMap options) {
     }
 
     protected static void fetchStoredSettings(@Nullable Context fromContext) {
-        Context context = fromContext != null ? fromContext : instance.getAppContext();
-        if (instance == null && context == null) {
+        if (instance == null && fromContext == null) {
             Log.w(TAG, "[RNCallKeepModule][fetchStoredSettings] no instance nor fromContext.");
             return;
         }
+        Context context = fromContext != null ? fromContext : instance.getAppContext();
         _settings = new WritableNativeMap();
         if (context == null) {
             Log.w(TAG, "[RNCallKeepModule][fetchStoredSettings] no react context found.");

example/App.js

@@ -77,7 +77,7 @@ export default function App() {
     const { [callUUID]: __, ...updatedHeldCalls } = heldCalls;
 
     setCalls(updated);
-    setCalls(updatedHeldCalls);
+    setHeldCalls(updatedHeldCalls);
   };
 
   const setCallHeld = (callUUID, held) => {

example/yarn.lock

@@ -5520,9 +5520,9 @@ typedarray@^0.0.6:
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
 ua-parser-js@^0.7.18, ua-parser-js@^0.7.19:
-  version "0.7.28"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.28.tgz#8ba04e653f35ce210239c64661685bf9121dec31"
-  integrity sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g==
+  version "0.7.33"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.33.tgz#1d04acb4ccef9293df6f70f2c3d22f3030d8b532"
+  integrity sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw==
 
 uglify-es@^3.1.9:
   version "3.3.9"

index.d.ts

@@ -1,28 +1,4 @@
 declare module 'react-native-callkeep' {
-  export type Events =
-    'didReceiveStartCallAction' |
-    'answerCall' |
-    'endCall' |
-    'didActivateAudioSession' |
-    'didDeactivateAudioSession' |
-    'didDisplayIncomingCall' |
-    'didToggleHoldCallAction' |
-    'didPerformDTMFAction' |
-    'didResetProvider' |
-    'checkReachability' |
-    'didPerformSetMutedCallAction' |
-    'didChangeAudioRoute' |
-    'didLoadWithEvents' |
-    'showIncomingCallUi' |
-    'silenceIncomingCall' |
-    'createIncomingConnectionFailed';
-
-  export type InitialEvent<Event extends Events> = {
-    name: NativeEvents[Event],
-    data: EventHandlers[Event]
-  }
-  export type InitialEvents = Array<InitialEvent<Events>>;
-
   export type NativeEvents = {
     didReceiveStartCallAction: 'RNCallKeepDidReceiveStartCallAction';
     answerCall: 'RNCallKeepPerformAnswerCallAction';
@@ -34,44 +10,50 @@ declare module 'react-native-callkeep' {
     didToggleHoldCallAction: 'RNCallKeepDidToggleHoldAction';
     didChangeAudioRoute: 'RNCallKeepDidChangeAudioRoute';
     didPerformDTMFAction: 'RNCallKeepDidPerformDTMFAction';
-    didLoadWithEvents: 'RNCallKeepDidLoadWithEvents';
     showIncomingCallUi: 'RNCallKeepShowIncomingCallUi';
     silenceIncomingCall: 'RNCallKeepOnSilenceIncomingCall';
     createIncomingConnectionFailed: 'RNCallKeepOnIncomingConnectionFailed';
     checkReachability: 'RNCallKeepCheckReachability';
     didResetProvider: 'RNCallKeepProviderReset';
+    didLoadWithEvents: 'RNCallKeepDidLoadWithEvents';
   }
-  export type EventHandlers = {
-    didReceiveStartCallAction: (args: { handle: string, callUUID: string, name: string }) => void;
-    answerCall: (args: { callUUID: string }) => void;
-    endCall: (args: { callUUID: string }) => void;
-    didActivateAudioSession: () => void;
-    didDeactivateAudioSession: () => void;
-    didDisplayIncomingCall: (args: {
-        error?: string,
-        errorCode?: 'Unentitled' | 'CallUUIDAlreadyExists' | 'FilteredByDoNotDisturb' | 'FilteredByBlockList' | 'Unknown',
-        callUUID: string,
-        handle: string,
-        localizedCallerName: string,
-        hasVideo: '1' | '0',
-        fromPushKit: '1' | '0',
-        payload: object,
-    }) => void;
-    didPerformSetMutedCallAction: (args: { muted: boolean, callUUID: string }) => void;
-    didToggleHoldCallAction: (args: { hold: boolean, callUUID: string }) => void;
-    didChangeAudioRoute: (args: {
+
+  export type InitialEvents = Array<{
+    [Event in Events]: { name: NativeEvents[Event], data: EventsPayload[Event] }
+  }[Events]>
+
+  export type Events = keyof NativeEvents;
+  export type EventsPayload = {
+    didReceiveStartCallAction: { handle: string, callUUID?: string, name?: string };
+    answerCall: { callUUID: string };
+    endCall: { callUUID: string };
+    didActivateAudioSession: undefined;
+    didDeactivateAudioSession: undefined;
+    didDisplayIncomingCall: {
+      error?: string,
+      errorCode?: 'Unentitled' | 'CallUUIDAlreadyExists' | 'FilteredByDoNotDisturb' | 'FilteredByBlockList' | 'Unknown',
+      callUUID: string,
+      handle: string,
+      localizedCallerName: string,
+      hasVideo: '1' | '0',
+      fromPushKit: '1' | '0',
+      payload: object,
+    };
+    didPerformSetMutedCallAction: { muted: boolean, callUUID: string };
+    didToggleHoldCallAction: { hold: boolean, callUUID: string };
+    didChangeAudioRoute: {
       output: string,
       reason?: number,
       handle?: string,
       callUUID?: string,
-    }) => void;
-    didPerformDTMFAction: (args: { digits: string, callUUID: string }) => void;
-    didLoadWithEvents: (args: { events: InitialEvents }) => void;
-    showIncomingCallUi: (args: { handle: string, callUUID: string, name: string}) => void;
-    silenceIncomingCall: (args: { handle: string, callUUID: string, name: string}) => void;
-    createIncomingConnectionFailed: (args: { handle: string, callUUID: string, name: string}) => void;
-    checkReachability: () => void;
-    didResetProvider: () => void;
+    };
+    didPerformDTMFAction: { digits: string, callUUID: string };
+    showIncomingCallUi: { handle: string, callUUID: string, name: string };
+    silenceIncomingCall: { handle: string, callUUID: string, name: string };
+    createIncomingConnectionFailed: { handle: string, callUUID: string, name: string };
+    checkReachability: undefined;
+    didResetProvider: undefined;
+    didLoadWithEvents: InitialEvents;
   }
 
   type HandleType = 'generic' | 'number' | 'email';
@@ -109,12 +91,6 @@ declare module 'react-native-callkeep' {
     }
   }
 
-  export type DidReceiveStartCallActionPayload = { handle: string };
-  export type AnswerCallPayload = { callUUID: string };
-  export type EndCallPayload = AnswerCallPayload;
-  export type DidDisplayIncomingCallPayload = string | undefined;
-  export type DidPerformSetMutedCallActionPayload = boolean;
-
   export const CONSTANTS: {
     END_CALL_REASONS: {
       FAILED: 1,
@@ -137,7 +113,7 @@ declare module 'react-native-callkeep' {
 
     static addEventListener<Event extends Events>(
       type: Event,
-      handler: EventHandlers[Event],
+      handler: (args: EventsPayload[Event]) => void,
     ): EventListener
 
     static removeEventListener(type: Events): void
@@ -202,18 +178,24 @@ declare module 'react-native-callkeep' {
 
     static setReachable(): void
 
-    static setSettings(settings: Object): void;
+    static setSettings(settings: IOptions): void;
 
     /**
      * @description isCallActive method is available only on iOS.
      */
     static isCallActive(uuid: string): Promise<boolean>
 
-    static getCalls(): Promise<object>
+    static getCalls(): Promise<{
+      callUUID: string,
+      hasConnected: boolean,
+      hasEnded: boolean,
+      onHold: boolean,
+      outgoing: boolean
+    }[] | void>
 
     static getAudioRoutes(): Promise<void>
 
-    static setAudioRoute: (uuid:string, inputName: string) => Promise<void>
+    static setAudioRoute: (uuid: string, inputName: string) => Promise<void>
 
     /**
      * @description supportConnectionService method is available only on Android.
@@ -257,7 +239,7 @@ declare module 'react-native-callkeep' {
      */
     static setAvailable(active: boolean): void
 
-    static setForegroundServiceSettings(settings: Object): void
+    static setForegroundServiceSettings(settings: NonNullable<IOptions['android']['foregroundService']>): void
 
     static canMakeMultipleCalls(allow: boolean): void