mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 11:08:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'public/master' into 3.0.x

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-10-09 17:00:00 +02:00
commit 3cd3956b74
7 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Classes/LinphoneManager.m
View file

@ -524,7 +524,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);
}
@ -1323,8 +1324,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];

2
Resources/assistant_linphone_create.rc
View file

@ -9,7 +9,7 @@
<entry name="publish" overwrite="true">0</entry>
<entry name="dial_escape_plus" overwrite="true">0</entry>
<entry name="avpf" overwrite="true">1</entry>
<entry name="quality_reporting_collector" overwrite="true">sip:voip-metrics@sip.linphone.org</entry>
<entry name="quality_reporting_collector" overwrite="true">sip:voip-metrics@sip.linphone.org;transport=tls</entry>
<entry name="quality_reporting_enabled" overwrite="true">1</entry>
<entry name="quality_reporting_interval" overwrite="true">180</entry>
<entry name="realm" overwrite="true">sip.linphone.org</entry>

2
Resources/assistant_linphone_existing.rc
View file

@ -9,7 +9,7 @@
<entry name="publish" overwrite="true">0</entry>
<entry name="dial_escape_plus" overwrite="true">0</entry>
<entry name="avpf" overwrite="true">1</entry>
<entry name="quality_reporting_collector" overwrite="true">sip:voip-metrics@sip.linphone.org</entry>
<entry name="quality_reporting_collector" overwrite="true">sip:voip-metrics@sip.linphone.org;transport=tls</entry>
<entry name="quality_reporting_enabled" overwrite="true">1</entry>
<entry name="quality_reporting_interval" overwrite="true">180</entry>
<entry name="realm" overwrite="true">sip.linphone.org</entry>

BIN
Resources/de.lproj/Localizable.strings
View file

Binary file not shown.

BIN
Resources/ja.lproj/Localizable.strings
View file

Binary file not shown.

26
prepare.py
View file

@ -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 && \\

2
submodules/linphone

@ -1 +1 @@
Subproject commit c4cb4d2767b126bf45cb404a83ac1b29b99a8726
Subproject commit 4e3ea86c90cf125f1348dc4f296540d1696e5851