From f340644f63e2f16e1f78858006d97d9c14e0197c Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 14 Oct 2015 18:00:53 +0200 Subject: [PATCH 1/4] Update linphone-cmake-builder submodule. --- submodules/cmake-builder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/cmake-builder b/submodules/cmake-builder index cde0af647..58a2a71ee 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit cde0af647557dd73a74d868779b7906c78b31e0d +Subproject commit 58a2a71ee6d4bc5f0a4f77958375a832b18253ed From d5ed8a9d9e26c05c6cc579420c01d267e17c2d48 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Thu, 15 Oct 2015 11:14:47 +0200 Subject: [PATCH 2/4] Settings: add auto_answer for debugging purposes --- Classes/IncomingCallViewController.m | 5 +++++ Classes/LinphoneCoreSettingsStore.m | 5 +++++ Settings/InAppSettings.bundle/Root.plist | 10 ++++++++++ 3 files changed, 20 insertions(+) diff --git a/Classes/IncomingCallViewController.m b/Classes/IncomingCallViewController.m index efee13a35..2ee789c8e 100644 --- a/Classes/IncomingCallViewController.m +++ b/Classes/IncomingCallViewController.m @@ -91,6 +91,11 @@ static UICompositeViewDescription *compositeDescription = nil; if (call == acall && (astate == LinphoneCallEnd || astate == LinphoneCallError)) { [delegate incomingCallAborted:call]; [self dismiss]; + } else if ([LinphoneManager.instance lpConfigBoolForKey:@"auto_answer"]) { + LinphoneCallState state = linphone_call_get_state(call); + if (state == LinphoneCallIncomingReceived || state == LinphoneCallIncomingEarlyMedia) { + [self onAcceptClick:nil]; + } } } diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m index 0aae9d65b..8b194773c 100644 --- a/Classes/LinphoneCoreSettingsStore.m +++ b/Classes/LinphoneCoreSettingsStore.m @@ -161,6 +161,8 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); [self setBool:(linphone_proxy_config_get_route(cfg) != NULL)forKey:@"outbound_proxy_preference"]; [self setBool:linphone_proxy_config_avpf_enabled(cfg) forKey:@"avpf_preference"]; [self setBool:linphone_core_video_enabled(lc) forKey:@"enable_video_preference"]; + [self setBool:[LinphoneManager.instance lpConfigBoolForKey:@"auto_answer"] + forKey:@"enable_auto_answer_preference"]; // actually in Advanced section but proxy config dependent [self setInteger:linphone_proxy_config_get_expires(cfg) forKey:@"expire_preference"]; @@ -577,6 +579,9 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); bool enableVideo = [self boolForKey:@"enable_video_preference"]; linphone_core_enable_video(lc, enableVideo, enableVideo); + + bool enableAutoAnswer = [self boolForKey:@"enable_auto_answer_preference"]; + [LinphoneManager.instance lpConfigSetBool:enableAutoAnswer forKey:@"auto_answer"]; } // audio section diff --git a/Settings/InAppSettings.bundle/Root.plist b/Settings/InAppSettings.bundle/Root.plist index dedc25c2d..a636b84dd 100644 --- a/Settings/InAppSettings.bundle/Root.plist +++ b/Settings/InAppSettings.bundle/Root.plist @@ -288,6 +288,16 @@ Type IASKButtonSpecifier + + Type + PSToggleSwitchSpecifier + Title + Auto answer call immediately + Key + enable_auto_answer_preference + DefaultValue + + StringsTable Root From 302dbfb9124c5866407fbec6cedce3093604ffab Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 15 Oct 2015 11:48:25 +0200 Subject: [PATCH 3/4] update belle-sip and linphone (fix webrtc interop issue) --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index c9e603882..1ced63785 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit c9e603882c3b6bd2b387f17ba8c003ffb4f218fe +Subproject commit 1ced637855bb052f2475847c867f648338b84376 diff --git a/submodules/linphone b/submodules/linphone index 2bc233d95..1dc50acfd 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 2bc233d95b367c2cbd00240a0703de0f5b3c7b37 +Subproject commit 1dc50acfd10b48ca23e96a3311eaadec7aa40b86 From 5e8722305169412c0205eeb7d004628cdce31d0e Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Thu, 15 Oct 2015 12:14:00 +0200 Subject: [PATCH 4/4] xcode: bump version --- linphone-Info.plist | 4 ++-- .../xcshareddata/xcschemes/linphone.xcscheme | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/linphone-Info.plist b/linphone-Info.plist index fb0c22ce2..24982b408 100644 --- a/linphone-Info.plist +++ b/linphone-Info.plist @@ -24,7 +24,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.8.5 + 3.8.6 CFBundleURLTypes @@ -53,7 +53,7 @@ CFBundleVersion - 2.4 + 2.4.1 LSRequiresIPhoneOS UIApplicationExitsOnSuspend diff --git a/linphone.xcodeproj/xcshareddata/xcschemes/linphone.xcscheme b/linphone.xcodeproj/xcshareddata/xcschemes/linphone.xcscheme index 9781b8192..97800868c 100644 --- a/linphone.xcodeproj/xcshareddata/xcschemes/linphone.xcscheme +++ b/linphone.xcodeproj/xcshareddata/xcschemes/linphone.xcscheme @@ -1,7 +1,7 @@ + version = "1.8"> @@ -37,10 +37,10 @@ + shouldUseLaunchSchemeArgsEnv = "YES" + buildConfiguration = "Debug"> @@ -66,11 +66,11 @@