From 437cb7c965b8794d450b53cb3040d92276481c79 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Tue, 2 Jun 2015 16:19:01 +0200 Subject: [PATCH] LinphoneManager.m: if linphonerc~ipad and/or linphonerc-factory~ipad do not exist, fallback to linphonerc and/or linphonerc-factory --- Classes/LinphoneManager.m | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index ef74914bc..d5c769217 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -1715,16 +1715,24 @@ static int comp_call_state_paused (const LinphoneCall* call, const void* param) } - (void)copyDefaultSettings { - NSString *src = [LinphoneManager bundleFile:[LinphoneManager runningOnIpad]?@"linphonerc~ipad":@"linphonerc"]; + NSString *src = [LinphoneManager bundleFile:@"linphonerc"]; + NSString *srcIpad = [LinphoneManager bundleFile:@"linphonerc~ipad"]; + if ([LinphoneManager runningOnIpad] && [[NSFileManager defaultManager] fileExistsAtPath:srcIpad]){ + src = srcIpad; + } NSString *dst = [LinphoneManager documentFile:@"linphonerc"]; [LinphoneManager copyFile:src destination:dst override:FALSE]; } - (void)overrideDefaultSettings { - NSString* factoryConfig = [LinphoneManager bundleFile:[LinphoneManager runningOnIpad]?@"linphonerc-factory~ipad":@"linphonerc-factory"]; + NSString* factory = [LinphoneManager bundleFile:@"linphonerc-factory"]; + NSString *factoryIpad = [LinphoneManager bundleFile:@"linphonerc-factory~ipad"]; + if ([LinphoneManager runningOnIpad] && [[NSFileManager defaultManager] fileExistsAtPath:factoryIpad]){ + factory = factoryIpad; + } NSString *confiFileName = [LinphoneManager documentFile:@"linphonerc"]; configDb=lp_config_new_with_factory([confiFileName cStringUsingEncoding:[NSString defaultCStringEncoding]] - , [factoryConfig cStringUsingEncoding:[NSString defaultCStringEncoding]]); + , [factory cStringUsingEncoding:[NSString defaultCStringEncoding]]); } #pragma mark - Audio route Functions