diff --git a/.gitignore b/.gitignore
index e2f3c65b2..0b5eb907c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ build-*
*.locuser
.DS_Store
liblinphone-sdk
+liblinphone-iphone-sdk*.zip
+xcuserdata/
diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m
index 616e2c6fe..16d58ba71 100644
--- a/Classes/LinphoneCoreSettingsStore.m
+++ b/Classes/LinphoneCoreSettingsStore.m
@@ -173,12 +173,12 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
if (elem && (ai=(LinphoneAuthInfo*)elem->data)){
[self setString: linphone_auth_info_get_passwd(ai) forKey:@"password_preference"];
[self setString: linphone_auth_info_get_ha1(ai) forKey:@"ha1_preference"]; // hidden but useful if provisioned
+ [self setString:linphone_auth_info_get_userid(ai) forKey:@"userid_preference"];
}
}
{
[self setString: linphone_core_get_stun_server(lc) forKey:@"stun_preference"];
- [self
- setBool:linphone_core_get_firewall_policy(lc)==LinphonePolicyUseIce forKey:@"ice_preference"];
+ [self setBool:linphone_core_get_firewall_policy(lc)==LinphonePolicyUseIce forKey:@"ice_preference"];
}
{
@@ -188,7 +188,9 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
[self setInteger:lp_config_get_int(conf, "audio", "codec_bitrate_limit", kLinphoneAudioVbrCodecDefaultBitrate) forKey:@"audio_codec_bitrate_limit_preference"];
}
-
+
+ [self setBool:lp_config_get_int(conf, LINPHONERC_APPLICATION_KEY, "advanced_account_preference", 0) forKey:@"advanced_account_preference"];
+
{
LinphoneMediaEncryption menc=linphone_core_get_media_encryption(lc);
const char *val;
@@ -291,29 +293,10 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
- (void)synchronizeAccount {
LinphoneCore *lc = [LinphoneManager getLc];
LpConfig* conf = linphone_core_get_config(lc);
- LinphoneManager* lLinphoneMgr = [LinphoneManager instance];
LinphoneProxyConfig* proxyCfg = NULL;
+ BOOL isEditing = FALSE;
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);
- }
- }
- }
-
int port_preference = [self integerForKey:@"port_preference"];
BOOL random_port_preference = [self boolForKey:@"random_port_preference"];
@@ -345,6 +328,7 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
//mandatory parameters
NSString* username = [self stringForKey:@"username_preference"];
+ NSString* userID = [self stringForKey:@"userid_preference"];
NSString* domain = [self stringForKey:@"domain_preference"];
NSString* transport = [self stringForKey:@"transport_preference"];
NSString* accountHa1 = [self stringForKey:@"ha1_preference"];
@@ -353,9 +337,17 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
BOOL use_avpf = [self boolForKey:@"avpf_preference"];
if (username && [username length] >0 && domain && [domain length]>0) {
- LinphoneAuthInfo *info = NULL;
-
+ int expire = [self integerForKey:@"expire_preference"];
+ BOOL isWifiOnly = [self boolForKey:@"wifi_only_preference"];
+ BOOL pushnotification = [self boolForKey:@"pushnotification_preference"];
+ NSString* prefix = [self stringForKey:@"prefix_preference"];
NSString* proxyAddress = [self stringForKey:@"proxy_preference"];
+
+ LinphoneAuthInfo *info = NULL;
+ const char* route = NULL;
+
+ if( isWifiOnly && [LinphoneManager instance].connectivity == wwan ) expire = 0;
+
if ((!proxyAddress || [proxyAddress length] <1 ) && domain) {
proxyAddress = [NSString stringWithFormat:@"sip:%@",domain] ;
} else {
@@ -375,71 +367,71 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
proxy = linphone_address_as_string_uri_only(proxy_addr);
}
- //possible valid config detected
- proxyCfg = linphone_core_create_proxy_config(lc);
+ // use proxy as route if outbound_proxy is enabled
+ route = isOutboundProxy? proxy : NULL;
+
+ //possible valid config detected, try to modify current proxy or create new one if none existing
+ linphone_core_get_default_proxy(lc, &proxyCfg);
+ if( proxyCfg == NULL ){
+ proxyCfg = linphone_core_create_proxy_config(lc);
+ } else {
+ isEditing = TRUE;
+ linphone_proxy_config_edit(proxyCfg);
+ }
+
char normalizedUserName[256];
LinphoneAddress* linphoneAddress = linphone_address_new("sip:user@domain.com");
linphone_proxy_config_normalize_number(proxyCfg, [username cStringUsingEncoding:[NSString defaultCStringEncoding]], normalizedUserName, sizeof(normalizedUserName));
linphone_address_set_username(linphoneAddress, normalizedUserName);
linphone_address_set_domain(linphoneAddress, [domain cStringUsingEncoding:[NSString defaultCStringEncoding]]);
+
const char* identity = linphone_address_as_string_uri_only(linphoneAddress);
const char* password = [accountPassword cStringUsingEncoding:[NSString defaultCStringEncoding]];
const char* ha1 = [accountHa1 cStringUsingEncoding:[NSString defaultCStringEncoding]];
- // configure proxy entries
- if( linphone_proxy_config_set_identity(proxyCfg, identity) == -1 ) { error = NSLocalizedString(@"Invalid username or domain",nil); goto bad_proxy; }
+
+ if( linphone_proxy_config_set_identity(proxyCfg, identity) == -1 ) { error = NSLocalizedString(@"Invalid username or domain",nil); goto bad_proxy;}
if( linphone_proxy_config_set_server_addr(proxyCfg, proxy) == -1 ) { error = NSLocalizedString(@"Invalid proxy address", nil); goto bad_proxy; }
+ if( linphone_proxy_config_set_route(proxyCfg, route) == -1 ) { error = NSLocalizedString(@"Invalid route", nil); goto bad_proxy; }
- linphone_proxy_config_enable_register(proxyCfg, true);
-
- linphone_proxy_config_enable_avpf(proxyCfg, use_avpf);
-
- // add username password
- LinphoneAddress *from = linphone_address_new(identity);
- if (from != 0){
- info=linphone_auth_info_new(linphone_address_get_username(from),NULL,password,ha1,NULL,linphone_proxy_config_get_domain(proxyCfg));
- linphone_address_destroy(from);
+ if ([prefix length]>0) {
+ linphone_proxy_config_set_dial_prefix(proxyCfg, [prefix cStringUsingEncoding:[NSString defaultCStringEncoding]]);
}
- int expire = [self integerForKey:@"expire_preference"];
- linphone_proxy_config_expires(proxyCfg,expire);
-
- BOOL isWifiOnly = [self boolForKey:@"wifi_only_preference"];
-
- if (isWifiOnly && lLinphoneMgr.connectivity == wwan) {
- linphone_proxy_config_expires(proxyCfg, 0);
- } else {
- linphone_proxy_config_expires(proxyCfg, expire);
- }
-
- if (isOutboundProxy)
- linphone_proxy_config_set_route(proxyCfg, proxy);
-
- if ([self objectForKey:@"prefix_preference"]) {
- NSString* prefix = [self stringForKey:@"prefix_preference"];
- if ([prefix length]>0) {
- linphone_proxy_config_set_dial_prefix(proxyCfg, [prefix cStringUsingEncoding:[NSString defaultCStringEncoding]]);
- }
- }
if ([self objectForKey:@"substitute_+_by_00_preference"]) {
bool substitute_plus_by_00 = [self boolForKey:@"substitute_+_by_00_preference"];
linphone_proxy_config_set_dial_escape_plus(proxyCfg,substitute_plus_by_00);
}
-
- BOOL pushnotification = [self boolForKey:@"pushnotification_preference"];
+
lp_config_set_int(conf, LINPHONERC_APPLICATION_KEY, "pushnotification_preference", pushnotification);
-
- [[LinphoneManager instance] addPushTokenToProxyConfig:proxyCfg];
+ if( pushnotification ) [[LinphoneManager instance] addPushTokenToProxyConfig:proxyCfg];
- // We reached here: the new settings are correct, so replace the previous ones.
- linphone_core_clear_proxy_config(lc);
- linphone_core_clear_all_auth_info(lc);
+ linphone_proxy_config_enable_register(proxyCfg, true);
+ linphone_proxy_config_enable_avpf(proxyCfg, use_avpf);
+ linphone_proxy_config_set_expires(proxyCfg, expire);
- // add proxy and auth info
- linphone_core_add_proxy_config(lc,proxyCfg);
- linphone_core_set_default_proxy(lc,proxyCfg);
- if( info )
- linphone_core_add_auth_info(lc,info);
+ // setup auth info
+ LinphoneAddress *from = linphone_address_new(identity);
+ if (from != 0){
+ const char* userid_str = (userID != nil)? [userID UTF8String] : NULL;
+ info=linphone_auth_info_new(linphone_address_get_username(from),userid_str,password,ha1,NULL,linphone_proxy_config_get_domain(proxyCfg));
+ linphone_address_destroy(from);
+ }
+
+ // We reached here without hitting the goto: the new settings are correct, so replace the previous ones.
+
+ // add auth info
+ linphone_core_clear_all_auth_info(lc);
+ if( info ) { linphone_core_add_auth_info(lc,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(lc,proxyCfg);
+ }
bad_proxy:
if( linphoneAddress)
@@ -448,7 +440,12 @@ 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 ){
+ if( isEditing ) linphone_proxy_config_done(proxyCfg);
+ else linphone_proxy_config_destroy(proxyCfg);
+
[self alertAccountError:error];
}
}
@@ -656,7 +653,7 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
lp_config_set_int(config, LINPHONERC_APPLICATION_KEY, "backgroundmode_preference", isbackgroundModeEnabled);
lp_config_set_int(config, LINPHONERC_APPLICATION_KEY, "start_at_boot_preference", [self boolForKey:@"start_at_boot_preference"]);
lp_config_set_int(config, LINPHONERC_APPLICATION_KEY, "autoanswer_notif_preference", [self boolForKey:@"autoanswer_notif_preference"]);
-
+ lp_config_set_int(config, LINPHONERC_APPLICATION_KEY, "advanced_account_preference", [self boolForKey:@"advanced_account_preference"]);
BOOL firstloginview = [self boolForKey:@"enable_first_login_view_preference"];
lp_config_set_int(config, LINPHONERC_APPLICATION_KEY, "enable_first_login_view_preference", firstloginview);
diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index 0df79656e..a105fba20 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -273,6 +273,8 @@ struct codec_name_pref_table codec_pref_table[]={
NSString *confiFileName = [LinphoneManager documentFile:@".linphonerc"];
configDb=lp_config_new_with_factory([confiFileName cStringUsingEncoding:[NSString defaultCStringEncoding]] , [factoryConfig cStringUsingEncoding:[NSString defaultCStringEncoding]]);
+ [self migrateFromUserPrefs];
+
//set default values for first boot
if (lp_config_get_string(configDb,LINPHONERC_APPLICATION_KEY,"debugenable_preference",NULL)==NULL){
#ifdef DEBUG
@@ -371,6 +373,14 @@ static int check_should_migrate_images(void* data ,int argc,char** argv,char** c
goto exit_dbmigration;
}
+ // invert direction of old messages, because iOS was storing the direction flag incorrectly
+ const char* invert_direction = "UPDATE history SET direction = NOT direction";
+ if( sqlite3_exec(newDb, invert_direction, NULL, NULL, &errMsg) != SQLITE_OK){
+ [LinphoneLogger log: LinphoneLoggerError format:@"Inverting direction failed, error[%s]", errMsg];
+ sqlite3_free(errMsg);
+ goto exit_dbmigration;
+ }
+
// replace empty from: or to: by the current identity.
if( default_proxy ){
identity = linphone_proxy_config_get_identity(default_proxy);
@@ -431,6 +441,45 @@ exit_dbmigration:
return migrated;
}
+- (void)migrateFromUserPrefs {
+ static const char* migration_flag = "userpref_migration_done";
+
+ if( configDb == nil ) return;
+
+ if( lp_config_get_int(configDb, LINPHONERC_APPLICATION_KEY, migration_flag, 0) ){
+ Linphone_log(@"UserPrefs migration already performed, skip");
+ return;
+ }
+
+ NSDictionary* defaults = [[NSUserDefaults standardUserDefaults] dictionaryRepresentation];
+ NSArray* defaults_keys = [defaults allKeys];
+ NSDictionary* values = @{@"backgroundmode_preference" :@YES,
+ @"debugenable_preference" :@NO,
+ @"start_at_boot_preference" :@YES};
+ BOOL shouldSync = FALSE;
+
+ Linphone_log(@"%d user prefs", [defaults_keys count]);
+
+ for( NSString* userpref in values ){
+ if( [defaults_keys containsObject:userpref] ){
+ Linphone_log(@"Migrating %@ from user preferences: %d", userpref, [[defaults objectForKey:userpref] boolValue]);
+ lp_config_set_int(configDb, LINPHONERC_APPLICATION_KEY, [userpref UTF8String], [[defaults objectForKey:userpref] boolValue]);
+ [[NSUserDefaults standardUserDefaults] removeObjectForKey:userpref];
+ shouldSync = TRUE;
+ } else if ( lp_config_get_string(configDb, LINPHONERC_APPLICATION_KEY, [userpref UTF8String], NULL) == NULL ){
+ // no default value found in our linphonerc, we need to add them
+ lp_config_set_int(configDb, LINPHONERC_APPLICATION_KEY, [userpref UTF8String], [[values objectForKey:userpref] boolValue]);
+ }
+ }
+
+ if( shouldSync ){
+ Linphone_log(@"Synchronizing...");
+ [[NSUserDefaults standardUserDefaults] synchronize];
+ }
+ // don't get back here in the future
+ lp_config_set_int(configDb, LINPHONERC_APPLICATION_KEY, migration_flag, 1);
+}
+
#pragma mark - Linphone Core Functions
@@ -713,6 +762,7 @@ static void linphone_iphone_display_status(struct _LinphoneCore * lc, const char
speaker_already_enabled = TRUE;
}
}
+
if (state == LinphoneCallConnected && !mCallCenter) {
/*only register CT call center CB for connected call*/
[self setupGSMInteraction];
@@ -1144,12 +1194,30 @@ static LinphoneCoreVTable linphonec_vtable = {
const char* addr = linphone_proxy_config_get_addr(proxy);
// we want to enable AVPF for the proxies
if( addr && strstr(addr, "sip.linphone.org") != 0 ){
+ Linphone_log(@"Migrating proxy config to use AVPF");
linphone_proxy_config_enable_avpf(proxy, TRUE);
}
proxies = proxies->next;
}
[self lpConfigSetBool:TRUE forKey:@"avpf_migration_done"];
}
+ /* Quality Reporting migration */
+ if( [self lpConfigBoolForKey:@"quality_report_migration_done" forSection:@"app"] == FALSE ){
+ const MSList* proxies = linphone_core_get_proxy_config_list(theLinphoneCore);
+ while(proxies){
+ LinphoneProxyConfig* proxy = (LinphoneProxyConfig*)proxies->data;
+ const char* addr = linphone_proxy_config_get_addr(proxy);
+ // we want to enable quality reporting for the proxies that are on linphone.org
+ if( addr && strstr(addr, "sip.linphone.org") != 0 ){
+ Linphone_log(@"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_interval(proxy, 180);
+ linphone_proxy_config_enable_quality_reporting(proxy, TRUE);
+ }
+ proxies = proxies->next;
+ }
+ [self lpConfigSetBool:TRUE forKey:@"quality_report_migration_done"];
+ }
[self setupNetworkReachabilityCallback];
@@ -1658,6 +1726,13 @@ static void audioRouteChangeListenerCallback (
}
linphone_call_params_enable_low_bandwidth(lcallParams, low_bandwidth);
}
+
+ // workaround for video policy not correctly updated for automatic accept
+ BOOL video = linphone_call_params_video_enabled(lcallParams);
+ const LinphoneVideoPolicy* policy = linphone_core_get_video_policy(theLinphoneCore);
+ video &= policy->automatically_accept;
+ linphone_call_params_enable_video(lcallParams, video);
+
linphone_core_accept_call_with_params(theLinphoneCore,call, lcallParams);
}
diff --git a/Classes/SettingsViewController.m b/Classes/SettingsViewController.m
index 458acc1c9..702df5c96 100644
--- a/Classes/SettingsViewController.m
+++ b/Classes/SettingsViewController.m
@@ -540,7 +540,23 @@ static UICompositeViewDescription *compositeDescription = nil;
[hiddenKeys addObject:@"console_button"];
}
[settingsController setHiddenKeys:hiddenKeys animated:TRUE];
- }
+ } else if( [@"advanced_account_preference" compare:notif.object] == NSOrderedSame) {
+ BOOL advanced = [[notif.userInfo objectForKey:@"advanced_account_preference"] boolValue];
+ NSMutableSet *hiddenKeys = [NSMutableSet setWithSet:[settingsController hiddenKeys]];
+
+ if( advanced ){
+ [hiddenKeys removeObject:@"userid_preference"];
+ [hiddenKeys removeObject:@"proxy_preference"];
+ [hiddenKeys removeObject:@"outbound_proxy_preference"];
+ [hiddenKeys removeObject:@"avpf_preference"];
+ } else {
+ [hiddenKeys addObject:@"userid_preference"];
+ [hiddenKeys addObject:@"proxy_preference"];
+ [hiddenKeys addObject:@"outbound_proxy_preference"];
+ [hiddenKeys addObject:@"avpf_preference"];
+ }
+ [settingsController setHiddenKeys:hiddenKeys animated:TRUE];
+ }
}
@@ -616,6 +632,7 @@ static UICompositeViewDescription *compositeDescription = nil;
if(![LinphoneManager isLcReady]) {
[LinphoneLogger log:LinphoneLoggerWarning format:@"Can't filter settings: Linphone core not read"];
}
+ LinphoneManager* lm = [LinphoneManager instance];
NSMutableSet *hiddenKeys = [NSMutableSet set];
#ifndef DEBUG
@@ -650,7 +667,7 @@ static UICompositeViewDescription *compositeDescription = nil;
[hiddenKeys addObject:@"backgroundmode_preference"];
[hiddenKeys addObject:@"start_at_boot_preference"];
} else {
- if(![[LinphoneManager instance] lpConfigBoolForKey:@"backgroundmode_preference"]) {
+ if(![lm lpConfigBoolForKey:@"backgroundmode_preference"]) {
[hiddenKeys addObject:@"start_at_boot_preference"];
}
}
@@ -668,7 +685,7 @@ static UICompositeViewDescription *compositeDescription = nil;
[hiddenKeys addObjectsFromArray:[[LinphoneManager unsupportedCodecs] allObjects]];
- BOOL random_port = [[LinphoneManager instance] lpConfigBoolForKey:@"random_port_preference"];
+ BOOL random_port = [lm lpConfigBoolForKey:@"random_port_preference"];
if(random_port) {
[hiddenKeys addObject:@"port_preference"];
}
@@ -677,21 +694,28 @@ static UICompositeViewDescription *compositeDescription = nil;
[hiddenKeys addObject:@"ice_preference"];
}
- if(![[LinphoneManager instance] lpConfigBoolForKey:@"debugenable_preference"]) {
+ if(![lm lpConfigBoolForKey:@"debugenable_preference"]) {
[hiddenKeys addObject:@"console_button"];
}
if(![LinphoneManager runningOnIpad]) {
[hiddenKeys addObject:@"preview_preference"];
}
- if([[LinphoneManager instance] lpConfigBoolForKey:@"hide_run_assistant_preference"]) {
+ if([lm lpConfigBoolForKey:@"hide_run_assistant_preference"]) {
[hiddenKeys addObject:@"wizard_button"];
}
if (!linphone_core_tunnel_available()){
[hiddenKeys addObject:@"tunnel_menu"];
}
-
+
+ if( ![lm lpConfigBoolForKey:@"advanced_account_preference"] ){
+ [hiddenKeys addObject:@"userid_preference"];
+ [hiddenKeys addObject:@"proxy_preference"];
+ [hiddenKeys addObject:@"outbound_proxy_preference"];
+ [hiddenKeys addObject:@"avpf_preference"];
+ }
+
return hiddenKeys;
}
diff --git a/Resources/licenses.html b/Resources/licenses.html
index 38e6bca0e..183077683 100644
--- a/Resources/licenses.html
+++ b/Resources/licenses.html
@@ -1,6 +1,7 @@
+
Third party softwares
CAAnimationBlocks
@@ -68,7 +69,9 @@
Russian
Maxim Solodovnik
+
solomax666@gmail.com
+