Skip to content

Commit 78b8ac1

Browse files
author
Kyle Kurz
authored
Merge pull request #37 from sangoma/iOS_13_XCode_10_INStartCallIntent_fix
Check for XCode version
2 parents 630cf1a + c7bec36 commit 78b8ac1

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

android/react-native-callkeep.iml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
2121
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
2222
<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" />
23+
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
2424
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
2525
<option name="PROJECT_TYPE" value="1" />
2626
</configuration>

ios/RNCallKeep/RNCallKeep.m

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -463,15 +463,26 @@ + (BOOL)application:(UIApplication *)application
463463
NSString *handle;
464464
BOOL isAudioCall;
465465
BOOL isVideoCall;
466+
467+
//HACK TO AVOID XCODE 10 COMPILE CRASH
468+
//REMOVE ON NEXT MAJOR RELEASE OF RNCALLKIT
469+
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
470+
//XCode 11
466471
// iOS 13 returns an INStartCallIntent userActivity type
467472
if (@available(iOS 13, *)) {
468473
INStartCallIntent *intent = (INStartCallIntent*)interaction.intent;
469474
isAudioCall = intent.callCapability == INCallCapabilityAudioCall;
470475
isVideoCall = intent.callCapability == INCallCapabilityVideoCall;
471476
} else {
477+
#endif
478+
//XCode 10 and below
472479
isAudioCall = [userActivity.activityType isEqualToString:INStartAudioCallIntentIdentifier];
473480
isVideoCall = [userActivity.activityType isEqualToString:INStartVideoCallIntentIdentifier];
481+
//HACK TO AVOID XCODE 10 COMPILE CRASH
482+
//REMOVE ON NEXT MAJOR RELEASE OF RNCALLKIT
483+
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
474484
}
485+
#endif
475486

476487
if (isAudioCall) {
477488
INStartAudioCallIntent *startAudioCallIntent = (INStartAudioCallIntent *)interaction.intent;

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-native-callkeep",
3-
"version": "3.0.3",
3+
"version": "3.0.4",
44
"description": "iOS 10 CallKit and Android ConnectionService Framework For React Native",
55
"main": "index.js",
66
"scripts": {},

0 commit comments

Comments
 (0)