From d52cd025ed51e95a6417fd4ae1b2294baaaeb0ad Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Thu, 8 Oct 2015 14:49:54 +0200 Subject: [PATCH 1/5] LinphoneManager.m: temporary disable call logs in database until liblinphone handle them --- Classes/LinphoneManager.m | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index a332440b7..83e742180 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -1367,8 +1367,7 @@ static LinphoneCoreVTable linphonec_vtable = {.show = NULL, [zrtpSecretsFileName cStringUsingEncoding:[NSString defaultCStringEncoding]]); linphone_core_set_chat_database_path(theLinphoneCore, [chatDBFileName cStringUsingEncoding:[NSString defaultCStringEncoding]]); - linphone_core_set_call_logs_database_path(theLinphoneCore, - [chatDBFileName cStringUsingEncoding:[NSString defaultCStringEncoding]]); + [self migrationLinphoneSettings]; [self setupNetworkReachabilityCallback]; From fd72a9725590b3cbc3e4b02b867879356e014d02 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Thu, 8 Oct 2015 14:50:12 +0200 Subject: [PATCH 2/5] submodules: update linphone to fix ICE issue on call start and chat delivery state --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index c4cb4d276..4e3ea86c9 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit c4cb4d2767b126bf45cb404a83ac1b29b99a8726 +Subproject commit 4e3ea86c90cf125f1348dc4f296540d1696e5851 From dfdc51e817abf1d430142674020f38ef0217c754 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Thu, 8 Oct 2015 15:19:29 +0200 Subject: [PATCH 3/5] assistant: use TLS transport for quality reporting --- Classes/LinphoneManager.m | 3 ++- Resources/wizard_linphone_create.rc | 2 +- Resources/wizard_linphone_existing.rc | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 83e742180..67489abd7 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -523,7 +523,8 @@ exit_dbmigration: // we want to enable quality reporting for the proxies that are on linphone.org if (addr && strstr(addr, "sip.linphone.org") != 0) { LOGI(@"Migrating proxy config to send quality report"); - linphone_proxy_config_set_quality_reporting_collector(proxy, "sip:voip-metrics@sip.linphone.org"); + linphone_proxy_config_set_quality_reporting_collector( + proxy, "sip:voip-metrics@sip.linphone.org;transport=tls"); linphone_proxy_config_set_quality_reporting_interval(proxy, 180); linphone_proxy_config_enable_quality_reporting(proxy, TRUE); } diff --git a/Resources/wizard_linphone_create.rc b/Resources/wizard_linphone_create.rc index 722040d06..fbc0b7459 100644 --- a/Resources/wizard_linphone_create.rc +++ b/Resources/wizard_linphone_create.rc @@ -9,7 +9,7 @@ 0 0 1 - sip:voip-metrics@sip.linphone.org + sip:voip-metrics@sip.linphone.org;transport=tls 1 180 sip.linphone.org diff --git a/Resources/wizard_linphone_existing.rc b/Resources/wizard_linphone_existing.rc index 3822706d2..005c55977 100644 --- a/Resources/wizard_linphone_existing.rc +++ b/Resources/wizard_linphone_existing.rc @@ -9,7 +9,7 @@ 0 0 1 - sip:voip-metrics@sip.linphone.org + sip:voip-metrics@sip.linphone.org;transport=tls 1 180 sip.linphone.org From cf23a29ca6fbce108c6a58020594ad4756b4af14 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Fri, 9 Oct 2015 09:17:52 +0200 Subject: [PATCH 4/5] l10n: update translations --- Resources/de.lproj/Localizable.strings | Bin 35248 -> 35326 bytes Resources/ja.lproj/Localizable.strings | Bin 30590 -> 29718 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/de.lproj/Localizable.strings b/Resources/de.lproj/Localizable.strings index a3a93f1ee56ba66f2eabfc7beeeb78a4a67a9552..eed4a9dd379fe724a20410b15cff627538d42ad1 100644 GIT binary patch delta 158 zcmdlmnd#qTrVUIy+Gz}#3{^m!%232m%8-IFl6qIsonmCdmK* delta 48 zcmex2nP~$MG4V`3!!0+tgE?$-2hT3$$sz_SlfS8kZN6h*q%-+VjMU_9(qWrt#ir;0 E0O02nyZ`_I diff --git a/Resources/ja.lproj/Localizable.strings b/Resources/ja.lproj/Localizable.strings index 98c00b7a782b9134866bcea774c6cef96e33e271..7f4aa07b872f7de4e77d296671ef2ed1990da010 100644 GIT binary patch delta 613 zcmZvZOK1~O7=`}{*hQ^Hy68?xp~3hFoK$d8T$ECxv^SZWTBbG86v@M8>`cYSLNT#f zWs)u=7m9SH;F7P`8_|DQScJLmrSVJv+yR$p`; zI$P_`xAFoTnFX&PFSwWe!Go=%2bS-PswGV~<3B&qI&$vbodIbhI&I}Flwcu)074X{ ze!59R6rutBM$0`~y9&VbE zg#UTG(p%odFMNZ|znrEl9Q>U7lz5LPc*awKsZ`if2-6s(G&vNZAU(xLd}XEb+MWrT z^ZxG$(#PI5s0NjGBfKF#aB=25Te=oVm)X0z(Eg(Emt|ju}tddm=d)O=g!| zR>!qdpMW_j9y!?Z?p{|dsD~NTH7>Fs1u54rrR2+O!hc-sFxqtq9ln9G8NO{XW7<4? yb&_dSQ3344b9bf4w>iVKlTy8t#VjgKkOBzmk|)^7YZvV9#p~Ih&p$tRrt=?#f!2Ni delta 130 zcmbRCg7M!w#tqxJCO2^DO|H-j+pNI-LvHdbO|{7-+7X-Uw7$tsUgaq@*~z_#*N{Pl zp_sveL6yOXL1pqz_sx^l;=?9+vrJy+DYn_jGmULBk3R=%CPN-W`eaAW Date: Fri, 9 Oct 2015 16:19:14 +0200 Subject: [PATCH 5/5] prepare.py: fix makefile generation --- prepare.py | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/prepare.py b/prepare.py index e58d34bd3..0b1e1ea9a 100755 --- a/prepare.py +++ b/prepare.py @@ -271,29 +271,21 @@ def install_git_hook(): def generate_makefile(platforms, generator): packages = os.listdir('WORK/ios-' + platforms[0] + '/Build') + packages.remove('dummy_libraries') packages.sort() arch_targets = "" for arch in platforms: arch_targets += """ {arch}: {arch}-build -{arch}-build: -\t@for package in $(packages); do \\ -\t\t$(MAKE) {arch}-build-$$package; \\ -\tdone +{arch}-build: $(addprefix {arch}-build-, $(packages)) +\t@echo "Done" -{arch}-clean: -\t@for package in $(packages); do \\ -\t\t$(MAKE) {arch}-clean-$$package; \\ -\tdone +{arch}-clean: $(addprefix {arch}-clean-, $(packages)) +\t@echo "Done" -{arch}-veryclean: -\t@for package in $(packages); do \\ -\t\t$(MAKE) {arch}-veryclean-$$package; \\ -\tdone - -{arch}-build-dummy_libraries: -\t{generator} WORK/ios-{arch}/cmake EP_dummy_libraries +{arch}-veryclean: $(addprefix {arch}-veryclean-, $(packages)) +\t@echo "Done" {arch}-build-%: package-in-list-% \trm -f WORK/ios-{arch}/Stamp/EP_$*/EP_$*-update; \\ @@ -354,7 +346,8 @@ LINPHONE_IPHONE_VERSION=$(shell git describe --always) .PHONY: all .SILENT: sdk - +#turn off parallelism because it is not yet handled properly +.NOTPARALLEL: all: build package-in-list-%: @@ -377,6 +370,7 @@ clean: $(addprefix clean-,$(packages)) veryclean: $(addprefix veryclean-,$(packages)) sdk: +\tfor arch in $$archs; do {generator} WORK/ios-$arch/cmake EP_dummy_libraries; done && \\ \tarchives=`find liblinphone-sdk/{first_arch}-apple-darwin.ios -name *.a` && \\ \trm -rf liblinphone-sdk/apple-darwin && \\ \tmkdir -p liblinphone-sdk/apple-darwin && \\