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

Settings: fix authentication popup misdisplayed when changing account settings

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-11-23 12:18:00 +01:00
parent 57dac2df86
commit 173891fc62
4 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Classes/LinphoneCoreSettingsStore.m
View file

@ -505,7 +505,18 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
linphone_proxy_config_set_expires(proxyCfg, expire);
LinphoneAuthInfo *proxyAi = (LinphoneAuthInfo *)linphone_proxy_config_find_auth_info(proxyCfg);
// setup auth info
// setup new proxycfg
if (isEditing) {
linphone_proxy_config_done(proxyCfg);
} else {
// was a new proxy config, add it
linphone_core_add_proxy_config(lc, proxyCfg);
linphone_core_set_default_proxy_config(lc, proxyCfg);
}
// modify auth info only after finishing editting the proxy config, so that
// UNREGISTER succeed
if (proxyAi) {
linphone_auth_info_set_username(proxyAi, username.UTF8String);
if (password) {
@ -526,15 +537,6 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
}
}
// setup new proxycfg
if (isEditing) {
linphone_proxy_config_done(proxyCfg);
} else {
// was a new proxy config, add it
linphone_core_add_proxy_config(lc, proxyCfg);
linphone_core_set_default_proxy_config(lc, proxyCfg);
}
bad_proxy:
if (linphoneAddress)
linphone_address_destroy(linphoneAddress);

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit 9b72b22e81db1aeb2782413648dbcde5d41d8067
Subproject commit 59d40bdb82fd7ea89b94e80e563771fbc7d41ada

2
submodules/cmake-builder

@ -1 +1 @@
Subproject commit 535ffb9d91b071f9272cb3bf71e4e4dacc57371a
Subproject commit f0eba1764f2fa80e5bdb755aae32a65fdb3b2e4a

2
submodules/linphone

@ -1 +1 @@
Subproject commit 7228158af0d723d642dbaa7e1c556dddb9cf78d7
Subproject commit 5d44564e109c4780460ce83463d1ef6bf94712d2