mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-26 07:38:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't wait for unregister when editing the account, and re-register after unsuccessful edit.

Browse source
This commit is contained in:
Guillaume BIENKOWSKI 2014-08-20 11:09:18 +02:00
parent ba6145c813
commit 52928e7e1e
1 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Classes/LinphoneCoreSettingsStore.m
View file

@ -295,27 +295,13 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
LpConfig* conf = linphone_core_get_config(lc);
LinphoneManager* lLinphoneMgr = [LinphoneManager instance];
LinphoneProxyConfig* proxyCfg = NULL;
LinphoneProxyConfig* defaultProxy = NULL;
NSString* error = nil;
/* unregister before modifying any settings */
{
linphone_core_get_default_proxy(lc, &proxyCfg);
if (proxyCfg) {
// this will force unregister WITHOUT destorying the proxyCfg object
linphone_proxy_config_edit(proxyCfg);
int i=0;
while (linphone_proxy_config_get_state(proxyCfg)!=LinphoneRegistrationNone &&
linphone_proxy_config_get_state(proxyCfg)!=LinphoneRegistrationCleared &&
linphone_proxy_config_get_state(proxyCfg)!=LinphoneRegistrationFailed &&
i++<40 ) {
linphone_core_iterate(lc);
usleep(10000);
}
}
}
/* unregister before modifying any settings: editing will force unregistration */
linphone_core_get_default_proxy(lc, &defaultProxy);
if (defaultProxy) linphone_proxy_config_edit(defaultProxy);
int port_preference = [self integerForKey:@"port_preference"];
BOOL random_port_preference = [self boolForKey:@"random_port_preference"];
@ -454,7 +440,11 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
ms_free(proxy);
if( info )
linphone_auth_info_destroy(info);
// in case of error, show an alert to the user
if( error != nil ){
// restart the registration on the old proxy
if( defaultProxy ) linphone_proxy_config_done(defaultProxy);
[self alertAccountError:error];
}
}