Skip to content

Commit 724104d

Browse files
manuquentinmanuquentin
authored
Merge pull request #64 from sangoma/master
Bring in Sangoma Fork Changes
2 parents 7d9b128 + 2b69925 commit 724104d

File tree

13 files changed

+1096
-304
lines changed

13 files changed

+1096
-304
lines changed

‎README.md

Lines changed: 209 additions & 56 deletions
Large diffs are not rendered by default.

‎actions.js

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,59 +7,54 @@ const RNCallKeepDidReceiveStartCallAction = 'RNCallKeepDidReceiveStartCallAction
77
const RNCallKeepPerformAnswerCallAction = 'RNCallKeepPerformAnswerCallAction';
88
const RNCallKeepPerformEndCallAction = 'RNCallKeepPerformEndCallAction';
99
const RNCallKeepDidActivateAudioSession = 'RNCallKeepDidActivateAudioSession';
10+
const RNCallKeepDidDeactivateAudioSession = 'RNCallKeepDidDeactivateAudioSession';
1011
const RNCallKeepDidDisplayIncomingCall = 'RNCallKeepDidDisplayIncomingCall';
1112
const RNCallKeepDidPerformSetMutedCallAction = 'RNCallKeepDidPerformSetMutedCallAction';
1213
const RNCallKeepDidToggleHoldAction = 'RNCallKeepDidToggleHoldAction';
1314
const RNCallKeepDidPerformDTMFAction = 'RNCallKeepDidPerformDTMFAction';
15+
const RNCallKeepProviderReset = 'RNCallKeepProviderReset';
1416
const isIOS = Platform.OS === 'ios';
1517

16-
const didReceiveStartCallAction = handler => {
17-
const listener = eventEmitter.addListener(
18-
RNCallKeepDidReceiveStartCallAction, (data) => {
19-
handler(isIOS ? data : { handle: data.number });
20-
}
21-
);
22-
23-
if (isIOS) {
24-
RNCallKeepModule._startCallActionEventListenerAdded();
25-
}
26-
27-
return listener;
28-
};
18+
const didReceiveStartCallAction = handler =>
19+
eventEmitter.addListener(RNCallKeepDidReceiveStartCallAction, (data) => handler(data));
2920

3021
const answerCall = handler =>
31-
eventEmitter.addListener(RNCallKeepPerformAnswerCallAction, (data) => handler(isIOS ? data : {}));
22+
eventEmitter.addListener(RNCallKeepPerformAnswerCallAction, (data) => handler(data));
3223

3324
const endCall = handler =>
34-
eventEmitter.addListener(RNCallKeepPerformEndCallAction, (data) => handler(isIOS ? data : {}));
25+
eventEmitter.addListener(RNCallKeepPerformEndCallAction, (data) => handler(data));
3526

3627
const didActivateAudioSession = handler =>
3728
eventEmitter.addListener(RNCallKeepDidActivateAudioSession, handler);
3829

30+
const didDeactivateAudioSession = handler =>
31+
eventEmitter.addListener(RNCallKeepDidDeactivateAudioSession, handler);
32+
3933
const didDisplayIncomingCall = handler =>
40-
eventEmitter.addListener(RNCallKeepDidDisplayIncomingCall, (data) => handler(isIOS ? data.error : null));
34+
eventEmitter.addListener(RNCallKeepDidDisplayIncomingCall, (data) => handler(data));
4135

4236
const didPerformSetMutedCallAction = handler =>
43-
eventEmitter.addListener(RNCallKeepDidPerformSetMutedCallAction, (data) => handler(data.muted));
37+
eventEmitter.addListener(RNCallKeepDidPerformSetMutedCallAction, (data) => handler(data));
4438

4539
const didToggleHoldCallAction = handler =>
4640
eventEmitter.addListener(RNCallKeepDidToggleHoldAction, handler);
4741

4842
const didPerformDTMFAction = handler =>
49-
eventEmitter.addListener(RNCallKeepDidPerformDTMFAction, (data) => {
50-
const payload = isIOS ? { dtmf: data.digits, callUUID: data.callUUID } : data;
43+
eventEmitter.addListener(RNCallKeepDidPerformDTMFAction, (data) => handler(data));
5144

52-
return handler(payload);
53-
});
45+
const didResetProvider = handler =>
46+
eventEmitter.addListener(RNCallKeepProviderReset, handler);
5447

5548
export const listeners = {
5649
didReceiveStartCallAction,
5750
answerCall,
5851
endCall,
5952
didActivateAudioSession,
53+
didDeactivateAudioSession,
6054
didDisplayIncomingCall,
6155
didPerformSetMutedCallAction,
6256
didToggleHoldCallAction,
6357
didPerformDTMFAction,
58+
didResetProvider,
6459
};
6560

‎android/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ android {
2020
buildToolsVersion safeExtGet('buildToolsVersion', "23.0.1")
2121

2222
defaultConfig {
23-
minSdkVersion safeExtGet('minSdkVersion', 16)
24-
targetSdkVersion safeExtGet('targetSdkVersion', 22)
23+
minSdkVersion safeExtGet('minSdkVersion', 23)
24+
targetSdkVersion safeExtGet('targetSdkVersion', 28)
2525
versionCode 1
2626
versionName "1.0"
2727
}
@@ -32,5 +32,5 @@ repositories {
3232
}
3333

3434
dependencies {
35-
compile 'com.facebook.react:react-native:+'
35+
implementation 'com.facebook.react:react-native:+'
3636
}

‎android/react-native-callkeep.iml

Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,138 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module external.linked.project.id=":react-native-callkeep" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../../android" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
3+
<component name="FacetManager">
4+
<facet type="android-gradle" name="Android-Gradle">
5+
<configuration>
6+
<option name="GRADLE_PROJECT_PATH" value=":react-native-callkeep" />
7+
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.3.1" />
8+
<option name="LAST_KNOWN_AGP_VERSION" value="3.3.1" />
9+
</configuration>
10+
</facet>
11+
<facet type="android" name="Android">
12+
<configuration>
13+
<option name="SELECTED_BUILD_VARIANT" value="debug" />
14+
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
15+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
16+
<afterSyncTasks>
17+
<task>generateDebugSources</task>
18+
</afterSyncTasks>
19+
<option name="ALLOW_USER_CONFIGURATION" value="false" />
20+
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
21+
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
22+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
23+
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" />
24+
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
25+
<option name="PROJECT_TYPE" value="1" />
26+
</configuration>
27+
</facet>
28+
</component>
29+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
30+
<output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
31+
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
32+
<exclude-output />
33+
<content url="file://$MODULE_DIR$">
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
44+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
45+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
46+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
47+
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
48+
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
49+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
59+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
60+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
61+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
62+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
63+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
64+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
67+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
69+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
70+
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
86+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
87+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
88+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
89+
<excludeFolder url="file://$MODULE_DIR$/build" />
90+
</content>
91+
<orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
92+
<orderEntry type="sourceFolder" forTests="false" />
93+
<orderEntry type="library" name="Gradle: com.facebook.infer.annotation:infer-annotation:0.11.2@jar" level="project" />
94+
<orderEntry type="library" name="Gradle: com.google.code.findbugs:jsr305:3.0.2@jar" level="project" />
95+
<orderEntry type="library" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
96+
<orderEntry type="library" name="Gradle: com.android.support:collections:28.0.0@jar" level="project" />
97+
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.1@jar" level="project" />
98+
<orderEntry type="library" name="Gradle: android.arch.core:common:1.1.1@jar" level="project" />
99+
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:28.0.0@jar" level="project" />
100+
<orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp-urlconnection:3.12.1@jar" level="project" />
101+
<orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.12.1@jar" level="project" />
102+
<orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.15.0@jar" level="project" />
103+
<orderEntry type="library" name="Gradle: com.facebook.react:react-native:0.59.9@aar" level="project" />
104+
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:28.0.0@aar" level="project" />
105+
<orderEntry type="library" name="Gradle: com.android.support:support-fragment:28.0.0@aar" level="project" />
106+
<orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:28.0.0@aar" level="project" />
107+
<orderEntry type="library" name="Gradle: com.android.support:support-core-ui:28.0.0@aar" level="project" />
108+
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils:28.0.0@aar" level="project" />
109+
<orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:28.0.0@aar" level="project" />
110+
<orderEntry type="library" name="Gradle: com.android.support:loader:28.0.0@aar" level="project" />
111+
<orderEntry type="library" name="Gradle: com.android.support:viewpager:28.0.0@aar" level="project" />
112+
<orderEntry type="library" name="Gradle: com.android.support:coordinatorlayout:28.0.0@aar" level="project" />
113+
<orderEntry type="library" name="Gradle: com.android.support:drawerlayout:28.0.0@aar" level="project" />
114+
<orderEntry type="library" name="Gradle: com.android.support:slidingpanelayout:28.0.0@aar" level="project" />
115+
<orderEntry type="library" name="Gradle: com.android.support:customview:28.0.0@aar" level="project" />
116+
<orderEntry type="library" name="Gradle: com.android.support:swiperefreshlayout:28.0.0@aar" level="project" />
117+
<orderEntry type="library" name="Gradle: com.android.support:asynclayoutinflater:28.0.0@aar" level="project" />
118+
<orderEntry type="library" name="Gradle: com.android.support:support-compat:28.0.0@aar" level="project" />
119+
<orderEntry type="library" name="Gradle: com.android.support:versionedparcelable:28.0.0@aar" level="project" />
120+
<orderEntry type="library" name="Gradle: com.android.support:cursoradapter:28.0.0@aar" level="project" />
121+
<orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime:1.1.1@aar" level="project" />
122+
<orderEntry type="library" name="Gradle: com.android.support:documentfile:28.0.0@aar" level="project" />
123+
<orderEntry type="library" name="Gradle: com.android.support:localbroadcastmanager:28.0.0@aar" level="project" />
124+
<orderEntry type="library" name="Gradle: com.android.support:print:28.0.0@aar" level="project" />
125+
<orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel:1.1.1@aar" level="project" />
126+
<orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata:1.1.1@aar" level="project" />
127+
<orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar" level="project" />
128+
<orderEntry type="library" name="Gradle: android.arch.core:runtime:1.1.1@aar" level="project" />
129+
<orderEntry type="library" name="Gradle: com.android.support:interpolator:28.0.0@aar" level="project" />
130+
<orderEntry type="library" name="Gradle: com.facebook.fresco:fresco:1.10.0@aar" level="project" />
131+
<orderEntry type="library" name="Gradle: com.facebook.fresco:fbcore:1.10.0@aar" level="project" />
132+
<orderEntry type="library" name="Gradle: com.facebook.fresco:drawee:1.10.0@aar" level="project" />
133+
<orderEntry type="library" name="Gradle: com.facebook.fresco:imagepipeline:1.10.0@aar" level="project" />
134+
<orderEntry type="library" name="Gradle: com.facebook.fresco:imagepipeline-base:1.10.0@aar" level="project" />
135+
<orderEntry type="library" name="Gradle: com.facebook.soloader:soloader:0.6.0@aar" level="project" />
136+
<orderEntry type="library" name="Gradle: com.facebook.fresco:imagepipeline-okhttp3:1.10.0@aar" level="project" />
137+
</component>
138+
</module>

0 commit comments

Comments
 (0)