mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-02-07 14:18:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

migrate sooner to avoid bad subscription on a migration

Browse source
This commit is contained in:
Benjamin Reis 2016-11-16 16:37:03 +01:00
parent 2e8de3d321
commit ce79a55abd
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Classes/LinphoneManager.m
View file

@ -301,11 +301,12 @@ struct codec_name_pref_table codec_pref_table[] = {{"speex", 8000, "speex_8k_pre
#pragma mark - Migration
- (void)migrationAll {
- (void)migrationAllPost {
[self migrationLinphoneSettings];
[self migrationFromVersion2To3];
[self migratePushNotificationPerAccount];
}
- (void)migrationAllPre {
// migrate xmlrpc URL if needed
if ([self lpConfigBoolForKey:@"migration_xmlrpc"] == NO) {
[self lpConfigSetString:@"https://subscribe.linphone.org:444/wizard.php"
@ -543,11 +544,6 @@ static void migrateWizardToAssistant(const char *entry, void *user_data) {
[thiz lpConfigSetString:[thiz lpConfigStringForKey:key inSection:@"wizard"] forKey:key inSection:@"assistant"];
}
- (void)migrationFromVersion2To3 {
// DONT DO THAT!
// lp_config_for_each_entry(_configDb, "wizard", migrateWizardToAssistant, (__bridge void *)(self));
}
- (void)migratePushNotificationPerAccount {
NSString *s = [self lpConfigStringForKey:@"pushnotification_preference"];
if (s && s.boolValue) {
@ -1618,7 +1614,6 @@ static LinphoneCoreVTable linphonec_vtable = {
linphone_core_set_chat_database_path(theLinphoneCore, [chatDBFileName UTF8String]);
linphone_core_set_call_logs_database_path(theLinphoneCore, [chatDBFileName UTF8String]);
[self migrationAll];
[self setupNetworkReachabilityCallback];
NSString *path = [LinphoneManager bundleFile:@"nowebcamCIF.jpg"];
@ -1774,7 +1769,7 @@ void popup_link_account_cb(LinphoneAccountCreator *creator, LinphoneAccountCreat
}
- (void)createLinphoneCore {
[self migrationAllPre];
if (theLinphoneCore != nil) {
LOGI(@"linphonecore is already created");
return;
@ -1812,6 +1807,8 @@ void popup_link_account_cb(LinphoneAccountCreator *creator, LinphoneAccountCreat
libmswebrtc_init(f);
linphone_core_reload_ms_plugins(theLinphoneCore, NULL);
[self migrationAllPost];
/* set the CA file no matter what, since the remote provisioning could be hitting an HTTPS server */
linphone_core_set_root_ca(theLinphoneCore, [LinphoneManager bundleFile:@"rootca.pem"].UTF8String);
linphone_core_set_user_certificates_path(theLinphoneCore, [LinphoneManager cacheDirectory].UTF8String);