assistant: update

This commit is contained in:
Gautier Pelloux-Prayer 2016-08-05 15:46:45 +02:00
parent 8a0a5e910a
commit 2501622c6e
3 changed files with 8 additions and 6 deletions

View file

@ -401,9 +401,9 @@ static UICompositeViewDescription *compositeDescription = nil;
if (!country) {
//fetch phone locale
for (NSString* lang in [NSLocale preferredLanguages]) {
NSUInteger idx2 = [lang rangeOfString:@"-"].location;
if (idx2 == NSNotFound) idx2 = 0;
if ((country = [CountryListViewController countryWithIso:[lang substringFromIndex:idx2]]) != nil)
NSUInteger idx = [lang rangeOfString:@"-"].location;
idx = (idx == NSNotFound) ? idx = 0 : idx + 1;
if ((country = [CountryListViewController countryWithIso:[lang substringFromIndex:idx]]) != nil)
break;
}
}

View file

@ -42,7 +42,7 @@
}
}
for (NSString* phone in _phoneNumbers) {
LOGI(@"fixme! use linphone_friend_add_phone_number for phone numbers");
#if 0
char* normalized_phone = linphone_proxy_config_normalize_phone_number(linphone_core_get_default_proxy_config(LC), phone.UTF8String);
if (normalized_phone) {
LinphoneAddress* addr = linphone_core_interpret_url(LC, normalized_phone);
@ -53,7 +53,9 @@
}
ms_free(normalized_phone);
}
// linphone_friend_add_phone_number(_friend, phone.UTF8String);
#else
linphone_friend_add_phone_number(_friend, phone.UTF8String);
#endif
}
linphone_core_add_friend(LC, _friend);
}

@ -1 +1 @@
Subproject commit 3e924ef6f57de9234cba2eaf373108b01adcaea5
Subproject commit 97c8f0d0d885a020d98be3a35b6fac4c0736c554