diff --git a/Classes/ContactDetailsViewController.m b/Classes/ContactDetailsViewController.m index f87ed3cb7..7d03e6b0f 100644 --- a/Classes/ContactDetailsViewController.m +++ b/Classes/ContactDetailsViewController.m @@ -149,8 +149,7 @@ static void sync_address_book(ABAddressBookRef addressBook, CFDictionaryRef info - (void)addCurrentContactContactField:(NSString *)address { - LinphoneAddress *linphoneAddress = - linphone_address_new([address cStringUsingEncoding:[NSString defaultCStringEncoding]]); + LinphoneAddress *linphoneAddress = linphone_address_new(address.UTF8String); NSString *username = [NSString stringWithUTF8String:linphone_address_get_username(linphoneAddress)]; if (([username rangeOfString:@"@"].length > 0) && diff --git a/Classes/IncomingCallViewController.m b/Classes/IncomingCallViewController.m index beef707b6..50accd45a 100644 --- a/Classes/IncomingCallViewController.m +++ b/Classes/IncomingCallViewController.m @@ -94,6 +94,7 @@ static UICompositeViewDescription *compositeDescription = nil; } else if ([LinphoneManager.instance lpConfigBoolForKey:@"auto_answer"]) { LinphoneCallState state = linphone_call_get_state(call); if (state == LinphoneCallIncomingReceived) { + LOGI(@"Auto answering call"); [self onAcceptClick:nil]; } } diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m index 8b194773c..ff76a437b 100644 --- a/Classes/LinphoneCoreSettingsStore.m +++ b/Classes/LinphoneCoreSettingsStore.m @@ -418,7 +418,7 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); proxyAddress = [NSString stringWithFormat:@"sip:%@", proxyAddress]; } - char *proxy = ms_strdup([proxyAddress cStringUsingEncoding:[NSString defaultCStringEncoding]]); + char *proxy = ms_strdup(proxyAddress.UTF8String); LinphoneAddress *proxy_addr = linphone_address_new(proxy); if (proxy_addr) { @@ -444,15 +444,14 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); 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_proxy_config_normalize_number(proxyCfg, username.UTF8String, normalizedUserName, + sizeof(normalizedUserName)); linphone_address_set_username(linphoneAddress, normalizedUserName); - linphone_address_set_domain(linphoneAddress, [domain cStringUsingEncoding:[NSString defaultCStringEncoding]]); + linphone_address_set_domain(linphoneAddress, [domain UTF8String]); const char *identity = linphone_address_as_string_uri_only(linphoneAddress); - const char *password = [accountPassword cStringUsingEncoding:[NSString defaultCStringEncoding]]; - const char *ha1 = [accountHa1 cStringUsingEncoding:[NSString defaultCStringEncoding]]; + const char *password = [accountPassword UTF8String]; + const char *ha1 = [accountHa1 UTF8String]; if (linphone_proxy_config_set_identity(proxyCfg, identity) == -1) { error = NSLocalizedString(@"Invalid username or domain", nil); @@ -470,8 +469,7 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); } if ([prefix length] > 0) { - linphone_proxy_config_set_dial_prefix(proxyCfg, - [prefix cStringUsingEncoding:[NSString defaultCStringEncoding]]); + linphone_proxy_config_set_dial_prefix(proxyCfg, [prefix UTF8String]); } if ([self objectForKey:@"substitute_+_by_00_preference"]) { @@ -749,8 +747,7 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); } else if ([lTunnelPrefMode isEqualToString:@"auto"]) { mode = tunnel_auto; } else { - LOGE(@"Unexpected tunnel mode [%s]", - [lTunnelPrefMode cStringUsingEncoding:[NSString defaultCStringEncoding]]); + LOGE(@"Unexpected tunnel mode [%s]", [lTunnelPrefMode UTF8String]); } } @@ -784,9 +781,8 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); NSString *username = [self stringForKey:@"primary_username_preference"]; LinphoneAddress *parsed = linphone_core_get_primary_contact_parsed(lc); if (parsed != NULL) { - linphone_address_set_display_name(parsed, - [displayname cStringUsingEncoding:[NSString defaultCStringEncoding]]); - linphone_address_set_username(parsed, [username cStringUsingEncoding:[NSString defaultCStringEncoding]]); + linphone_address_set_display_name(parsed, [displayname UTF8String]); + linphone_address_set_username(parsed, [username UTF8String]); char *contact = linphone_address_as_string(parsed); linphone_core_set_primary_contact(lc, contact); ms_free(contact); diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 67489abd7..0376b561f 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -495,8 +495,7 @@ exit_dbmigration: NSString *chatDBFileName = [LinphoneManager documentFile:kLinphoneInternalChatDBFilename]; if ([self migrateChatDBIfNeeded:theLinphoneCore]) { // if a migration was performed, we should reinitialize the chat database - linphone_core_set_chat_database_path(theLinphoneCore, - [chatDBFileName cStringUsingEncoding:[NSString defaultCStringEncoding]]); + linphone_core_set_chat_database_path(theLinphoneCore, [chatDBFileName UTF8String]); } /* AVPF migration */ @@ -797,6 +796,7 @@ static void linphone_iphone_display_status(struct _LinphoneCore *lc, const char @"state" : [NSNumber numberWithInt:state], @"message" : [NSString stringWithUTF8String:message] }; + LOGI(@"Call %p changed to state %s: %s", call, linphone_call_state_to_string(state), message); [[NSNotificationCenter defaultCenter] postNotificationName:kLinphoneCallUpdate object:self userInfo:dict]; } @@ -960,8 +960,7 @@ static void linphone_iphone_popup_password_request(LinphoneCore *lc, const char address = [FastAddressBook getContactDisplayName:contact]; } else { if ([[LinphoneManager instance] lpConfigBoolForKey:@"show_contacts_emails_preference"] == true) { - LinphoneAddress *linphoneAddress = - linphone_address_new([address cStringUsingEncoding:[NSString defaultCStringEncoding]]); + LinphoneAddress *linphoneAddress = linphone_address_new([address UTF8String]); address = [NSString stringWithUTF8String:linphone_address_get_username(linphoneAddress)]; linphone_address_destroy(linphoneAddress); } @@ -1338,8 +1337,7 @@ static LinphoneCoreVTable linphonec_vtable = {.show = NULL, // get default config from bundle NSString *zrtpSecretsFileName = [LinphoneManager documentFile:@"zrtp_secrets"]; NSString *chatDBFileName = [LinphoneManager documentFile:kLinphoneInternalChatDBFilename]; - const char *lRootCa = - [[LinphoneManager bundleFile:@"rootca.pem"] cStringUsingEncoding:[NSString defaultCStringEncoding]]; + const char *lRootCa = [[LinphoneManager bundleFile:@"rootca.pem"] UTF8String]; NSString *device = [NSString stringWithFormat:@"%@_%@_iOS%@", [NSBundle.mainBundle objectForInfoDictionaryKey:@"CFBundleDisplayName"], @@ -1354,20 +1352,15 @@ static LinphoneCoreVTable linphonec_vtable = {.show = NULL, linphone_core_set_root_ca(theLinphoneCore, lRootCa); // Set audio assets - const char *lRing = - [[LinphoneManager bundleFile:@"ring.wav"] cStringUsingEncoding:[NSString defaultCStringEncoding]]; + const char *lRing = [[LinphoneManager bundleFile:@"ring.wav"] UTF8String]; linphone_core_set_ring(theLinphoneCore, lRing); - const char *lRingBack = - [[LinphoneManager bundleFile:@"ringback.wav"] cStringUsingEncoding:[NSString defaultCStringEncoding]]; + const char *lRingBack = [[LinphoneManager bundleFile:@"ringback.wav"] UTF8String]; linphone_core_set_ringback(theLinphoneCore, lRingBack); - const char *lPlay = - [[LinphoneManager bundleFile:@"hold.wav"] cStringUsingEncoding:[NSString defaultCStringEncoding]]; + const char *lPlay = [[LinphoneManager bundleFile:@"hold.wav"] UTF8String]; linphone_core_set_play_file(theLinphoneCore, lPlay); - linphone_core_set_zrtp_secrets_file(theLinphoneCore, - [zrtpSecretsFileName cStringUsingEncoding:[NSString defaultCStringEncoding]]); - linphone_core_set_chat_database_path(theLinphoneCore, - [chatDBFileName cStringUsingEncoding:[NSString defaultCStringEncoding]]); + linphone_core_set_zrtp_secrets_file(theLinphoneCore, [zrtpSecretsFileName UTF8String]); + linphone_core_set_chat_database_path(theLinphoneCore, [chatDBFileName UTF8String]); [self migrationLinphoneSettings]; @@ -1375,7 +1368,7 @@ static LinphoneCoreVTable linphonec_vtable = {.show = NULL, NSString *path = [LinphoneManager bundleFile:@"nowebcamCIF.jpg"]; if (path) { - const char *imagePath = [path cStringUsingEncoding:[NSString defaultCStringEncoding]]; + const char *imagePath = [path UTF8String]; LOGI(@"Using '%s' as source image for no webcam", imagePath); linphone_core_set_static_picture(theLinphoneCore, imagePath); } @@ -1403,8 +1396,7 @@ static LinphoneCoreVTable linphonec_vtable = {.show = NULL, linphone_core_enable_video(theLinphoneCore, FALSE, FALSE); } - LOGI(@"Linphone [%s] started on [%s]", linphone_core_get_version(), - [[UIDevice currentDevice].model cStringUsingEncoding:[NSString defaultCStringEncoding]]); + LOGI(@"Linphone [%s] started on [%s]", linphone_core_get_version(), [[UIDevice currentDevice].model UTF8String]); // Post event NSDictionary *dict = [NSDictionary dictionaryWithObject:[NSValue valueWithPointer:theLinphoneCore] forKey:@"core"]; @@ -1482,22 +1474,18 @@ static BOOL libStarted = FALSE; libmswebrtc_init(); // Set audio assets - const char *lRing = - [[LinphoneManager bundleFile:@"ring.wav"] cStringUsingEncoding:[NSString defaultCStringEncoding]]; + const char *lRing = [[LinphoneManager bundleFile:@"ring.wav"] UTF8String]; lp_config_set_string(configDb, "sound", "local_ring", lRing); - const char *lRingBack = - [[LinphoneManager bundleFile:@"ringback.wav"] cStringUsingEncoding:[NSString defaultCStringEncoding]]; + const char *lRingBack = [[LinphoneManager bundleFile:@"ringback.wav"] UTF8String]; lp_config_set_string(configDb, "sound", "ringback_tone", lRingBack); - const char *lPlay = - [[LinphoneManager bundleFile:@"hold.wav"] cStringUsingEncoding:[NSString defaultCStringEncoding]]; + const char *lPlay = [[LinphoneManager bundleFile:@"hold.wav"] UTF8String]; lp_config_set_string(configDb, "sound", "hold_music", lPlay); theLinphoneCore = linphone_core_new_with_config(&linphonec_vtable, configDb, (__bridge void *)(self) /* user_data */); /* set the CA file no matter what, since the remote provisioning could be hitting an HTTPS server */ - const char *lRootCa = - [[LinphoneManager bundleFile:@"rootca.pem"] cStringUsingEncoding:[NSString defaultCStringEncoding]]; + const char *lRootCa = [[LinphoneManager bundleFile:@"rootca.pem"] UTF8String]; linphone_core_set_root_ca(theLinphoneCore, lRootCa); linphone_core_set_user_certificates_path(theLinphoneCore, [[LinphoneManager cacheDirectory] UTF8String]); @@ -1810,8 +1798,7 @@ static int comp_call_state_paused(const LinphoneCall *call, const void *param) { factory = factoryIpad; } NSString *confiFileName = [LinphoneManager documentFile:@"linphonerc"]; - configDb = lp_config_new_with_factory([confiFileName cStringUsingEncoding:[NSString defaultCStringEncoding]], - [factory cStringUsingEncoding:[NSString defaultCStringEncoding]]); + configDb = lp_config_new_with_factory([confiFileName UTF8String], [factory UTF8String]); } #pragma mark - Audio route Functions @@ -1845,7 +1832,7 @@ static void audioRouteChangeListenerCallback(void *inUserData, // 1 OSStatus lStatus = AudioSessionGetProperty(kAudioSessionProperty_AudioRoute, &lNewRouteSize, &lNewRoute); if (!lStatus && lNewRouteSize > 0) { NSString *route = (__bridge NSString *)lNewRoute; - LOGI(@"Current audio route is [%s]", [route cStringUsingEncoding:[NSString defaultCStringEncoding]]); + LOGI(@"Current audio route is [%s]", [route UTF8String]); speakerEnabled = [route isEqualToString:@"Speaker"] || [route isEqualToString:@"SpeakerAndMicrophone"]; if (![LinphoneManager runningOnIpad] && [route isEqualToString:@"HeadsetBT"] && !speakerEnabled) { @@ -1949,18 +1936,7 @@ static void audioRouteChangeListenerCallback(void *inUserData, // 1 // Continue by checking that the provided address is a valid SIP address, abort otherwise. if ([address length] == 0) { // no address provided... nothing to do - } else if (![address canBeConvertedToEncoding:[NSString defaultCStringEncoding]]) { - UIAlertView *error = [[UIAlertView alloc] - initWithTitle:NSLocalizedString(@"Invalid SIP address", nil) - message:NSLocalizedString( - @"Some invalid characters where found in the given SIP address. Please correct it.", - nil) - delegate:nil - cancelButtonTitle:NSLocalizedString(@"Cancel", nil) - otherButtonTitles:nil]; - [error show]; - } else if ((addr = linphone_core_interpret_url( - theLinphoneCore, [address cStringUsingEncoding:[NSString defaultCStringEncoding]])) == NULL) { + } else if ((addr = linphone_core_interpret_url(theLinphoneCore, address.UTF8String)) == NULL) { UIAlertView *error = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Invalid SIP address", nil) message:NSLocalizedString(@"Either configure a SIP proxy server from settings prior to place a " @@ -1979,14 +1955,13 @@ static void audioRouteChangeListenerCallback(void *inUserData, // 1 LOGI(@"Enabling low bandwidth mode"); linphone_call_params_enable_low_bandwidth(lcallParams, YES); } + if (displayName != nil) { - linphone_address_set_display_name(addr, - [displayName cStringUsingEncoding:[NSString defaultCStringEncoding]]); + linphone_address_set_display_name(addr, displayName.UTF8String); } if ([[LinphoneManager instance] lpConfigBoolForKey:@"override_domain_with_default_one"]) { linphone_address_set_domain( - addr, [[[LinphoneManager instance] lpConfigStringForKey:@"domain" forSection:@"wizard"] - cStringUsingEncoding:[NSString defaultCStringEncoding]]); + addr, [[[LinphoneManager instance] lpConfigStringForKey:@"domain" forSection:@"wizard"] UTF8String]); } if (transfer) { diff --git a/Classes/Utils/Utils.m b/Classes/Utils/Utils.m index 8b857cf36..1fe48024a 100644 --- a/Classes/Utils/Utils.m +++ b/Classes/Utils/Utils.m @@ -28,8 +28,7 @@ va_list args; va_start(args, format); NSString *str = [[NSString alloc] initWithFormat:format arguments:args]; - NSStringEncoding enc = CFStringConvertEncodingToNSStringEncoding(CFStringGetSystemEncoding()); - const char *utf8str = [str cStringUsingEncoding:enc]; + const char *utf8str = [str cStringUsingEncoding:NSString.defaultCStringEncoding]; int filesize = 20; const char *filename = strchr(file, '/') ? strrchr(file, '/') + 1 : file; if (severity <= ORTP_DEBUG) { diff --git a/Classes/WizardViewController.m b/Classes/WizardViewController.m index 64d4a24ac..fc6a5efed 100644 --- a/Classes/WizardViewController.m +++ b/Classes/WizardViewController.m @@ -381,8 +381,8 @@ static UICompositeViewDescription *compositeDescription = nil; NSString *server_address = domain; char normalizedUserName[256]; - linphone_proxy_config_normalize_number(proxyCfg, [username cStringUsingEncoding:[NSString defaultCStringEncoding]], - normalizedUserName, sizeof(normalizedUserName)); + linphone_proxy_config_normalize_number(proxyCfg, [username UTF8String], normalizedUserName, + sizeof(normalizedUserName)); const char *identity = linphone_proxy_config_get_identity(proxyCfg); if (!identity || !*identity) @@ -450,8 +450,8 @@ static UICompositeViewDescription *compositeDescription = nil; char normalizedUsername[256]; LinphoneAddress *linphoneAddress = linphone_address_new(addr); - linphone_proxy_config_normalize_number(proxyCfg, [username cStringUsingEncoding:[NSString defaultCStringEncoding]], - normalizedUsername, sizeof(normalizedUsername)); + linphone_proxy_config_normalize_number(proxyCfg, [username UTF8String], normalizedUsername, + sizeof(normalizedUsername)); linphone_address_set_username(linphoneAddress, normalizedUsername); linphone_address_set_domain(linphoneAddress, [domain UTF8String]); @@ -473,8 +473,7 @@ static UICompositeViewDescription *compositeDescription = nil; - (NSString *)identityFromUsername:(NSString *)username { char normalizedUserName[256]; LinphoneAddress *linphoneAddress = linphone_address_new("sip:user@domain.com"); - linphone_proxy_config_normalize_number(NULL, [username cStringUsingEncoding:[NSString defaultCStringEncoding]], - normalizedUserName, sizeof(normalizedUserName)); + linphone_proxy_config_normalize_number(NULL, [username UTF8String], normalizedUserName, sizeof(normalizedUserName)); linphone_address_set_username(linphoneAddress, normalizedUserName); linphone_address_set_domain( linphoneAddress, [[[LinphoneManager instance] lpConfigStringForKey:@"domain" forSection:@"wizard"] UTF8String]); @@ -567,8 +566,7 @@ static UICompositeViewDescription *compositeDescription = nil; - (void)loadWizardConfig:(NSString *)rcFilename { NSString *fullPath = [@"file://" stringByAppendingString:[LinphoneManager bundleFile:rcFilename]]; - linphone_core_set_provisioning_uri([LinphoneManager getLc], - [fullPath cStringUsingEncoding:[NSString defaultCStringEncoding]]); + linphone_core_set_provisioning_uri([LinphoneManager getLc], [fullPath UTF8String]); [[LinphoneManager instance] lpConfigSetInt:1 forKey:@"transient_provisioning" forSection:@"misc"]; [[LinphoneManager instance] resetLinphoneCore]; }