diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m index 2f9c9c371..697d69b0d 100644 --- a/Classes/LinphoneAppDelegate.m +++ b/Classes/LinphoneAppDelegate.m @@ -212,7 +212,7 @@ [[UIApplication sharedApplication] endBackgroundTask:bgStartId]; }]; - [[LinphoneManager instance] startLibLinphone]; + [[LinphoneManager instance] startLinphoneCore]; // initialize UI [self.window makeKeyAndVisible]; [RootViewManager setupWithPortrait:(PhoneMainView*)self.window.rootViewController]; @@ -513,8 +513,8 @@ name:kLinphoneConfiguringStateUpdate object:nil]; linphone_core_set_provisioning_uri([LinphoneManager getLc] , [configURL UTF8String]); - [[LinphoneManager instance] destroyLibLinphone]; - [[LinphoneManager instance] startLibLinphone]; + [[LinphoneManager instance] destroyLinphoneCore]; + [[LinphoneManager instance] startLinphoneCore]; } diff --git a/Classes/LinphoneManager.h b/Classes/LinphoneManager.h index daa3c4779..286038c1a 100644 --- a/Classes/LinphoneManager.h +++ b/Classes/LinphoneManager.h @@ -132,8 +132,8 @@ typedef struct _LinphoneManagerSounds { - (void)playMessageSound; - (void)resetLinphoneCore; -- (void)startLibLinphone; -- (void)destroyLibLinphone; +- (void)startLinphoneCore; +- (void)destroyLinphoneCore; - (BOOL)resignActive; - (void)becomeActive; - (BOOL)enterBackgroundMode; diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index d1068d40a..f0c0a267e 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -1387,7 +1387,7 @@ static LinphoneCoreVTable linphonec_vtable = { static BOOL libStarted = FALSE; -- (void)startLibLinphone { +- (void)startLinphoneCore { if ( libStarted ) { [LinphoneLogger logc:LinphoneLoggerError format:"Liblinphone is already initialized!"]; @@ -1402,6 +1402,7 @@ static BOOL libStarted = FALSE; // create linphone core [self createLinphoneCore]; + linphone_core_migrate_to_multi_transport(theLinphoneCore); // init audio session (just getting the instance will init) @@ -1491,7 +1492,7 @@ static BOOL libStarted = FALSE; repeats:YES]; } -- (void)destroyLibLinphone { +- (void)destroyLinphoneCore { [mIterateTimer invalidate]; //just in case [self removeCTCallCenterCb]; @@ -1518,7 +1519,7 @@ static BOOL libStarted = FALSE; } - (void) resetLinphoneCore { - [self destroyLibLinphone]; + [self destroyLinphoneCore]; [self createLinphoneCore]; // reset network state to trigger a new network connectivity assessment diff --git a/Classes/SettingsViewController.m b/Classes/SettingsViewController.m index 909a8fb39..f0d196cf8 100644 --- a/Classes/SettingsViewController.m +++ b/Classes/SettingsViewController.m @@ -701,7 +701,7 @@ static UICompositeViewDescription *compositeDescription = nil; if([key isEqual:@"release_button"]) { [UIApplication sharedApplication].keyWindow.rootViewController = nil; [[UIApplication sharedApplication].keyWindow setRootViewController:nil]; - [[LinphoneManager instance] destroyLibLinphone]; + [[LinphoneManager instance] destroyLinphoneCore]; [LinphoneManager instanceRelease]; } else if([key isEqual:@"clear_cache_button"]) { [[PhoneMainView instance].mainViewController clearCache:[NSArray arrayWithObject:[[PhoneMainView instance] currentView]]];