From 1e165e19aafe6611f39b4f065a08a5f3785b2b01 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Fri, 4 Feb 2011 16:18:07 +0100
Subject: [PATCH] fix initial startup

---
 Classes/LinphoneUI/LinphoneManager.m | 22 +++++++++++++++++-----
 Classes/PhoneViewController.m        |  3 +--
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/Classes/LinphoneUI/LinphoneManager.m b/Classes/LinphoneUI/LinphoneManager.m
index e24aade25..0932a5210 100644
--- a/Classes/LinphoneUI/LinphoneManager.m
+++ b/Classes/LinphoneUI/LinphoneManager.m
@@ -75,9 +75,15 @@ extern void libmsilbc_init();
 			 */
 			NSString* lMessage;
 			NSString* lTitle;
-			
-			
-			lMessage=@"Please make sure your device is connected to the internet and double check your SIP account configuration in the settings.";
+			LinphoneProxyConfig* proxyCfg;	
+			//get default proxy
+			linphone_core_get_default_proxy([LinphoneManager getLc],&proxyCfg);
+			if (proxyCfg == nil) {
+				lMessage=@"Please make sure your device is connected to the internet and double check your SIP account configuration in the settings.";
+			} else {
+				lMessage=[NSString stringWithFormat : @"Cannot call %@",lUserName];
+
+			}
 			
 			if (message!=nil){
 				lMessage=[NSString stringWithFormat : @"%@\nReason was: %s",lMessage, message];
@@ -168,6 +174,7 @@ static void linphone_iphone_call_state(LinphoneCore *lc, LinphoneCall* call, Lin
 	NSString* lUserName = linphone_address_get_username(lAddress)? [[NSString alloc] initWithCString:linphone_address_get_username(lAddress) ]:@"";
 	NSString* lDisplayName = linphone_address_get_display_name(lAddress)? [[NSString alloc] initWithCString:linphone_address_get_display_name(lAddress) ]:@"";
 	NSString* lDomain = [[NSString alloc] initWithCString:linphone_address_get_domain(lAddress)];
+	linphone_address_destroy(lAddress);
 	
 	if (state == LinphoneRegistrationOk) {
 		[[(LinphoneManager*)linphone_core_get_user_data(lc) registrationDelegate] displayRegisteredFromUI:nil
@@ -269,7 +276,10 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
 
 -(void) doLinphoneConfiguration:(NSNotification *)notification {
 	ms_message("Configuring Linphone");
-	
+	if (theLinphoneCore==nil) {
+		ms_warning("cannot configure linphone beacause not initialized yet");
+		return;
+	}
 	if ([[NSUserDefaults standardUserDefaults] boolForKey:@"debugenable_preference"]) {
 		//redirect all traces to the iphone log framework
 		linphone_core_enable_logs_with_cb((OrtpLogFunc)linphone_iphone_log_handler);
@@ -385,7 +395,8 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
 		
 		[self doRegister];
 	} else {
-		if (configCheckDisable == false) {
+		if (configCheckDisable == false 
+			&& (!domain  && !username)) {
 			UIAlertView* error = [[UIAlertView alloc]	initWithTitle:@"Warning"
 															message:@"It seems you have not configured any proxy server from settings" 
 														   delegate:self
@@ -577,6 +588,7 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
 										 , [factoryConfig cStringUsingEncoding:[NSString defaultCStringEncoding]]
 										 ,self);
 	
+	[[NSUserDefaults standardUserDefaults] synchronize];//sync before loading config 
 	[ self doLinphoneConfiguration:nil];
 	[[NSNotificationCenter defaultCenter]	addObserver:self
 											 selector:@selector(doLinphoneConfiguration:)
diff --git a/Classes/PhoneViewController.m b/Classes/PhoneViewController.m
index ef9b23dd2..aaf2d6fbc 100644
--- a/Classes/PhoneViewController.m
+++ b/Classes/PhoneViewController.m
@@ -177,8 +177,7 @@
 	[callDuration stop];
 	
 	[peerLabel setText:@""];
-	if ([[NSUserDefaults standardUserDefaults] boolForKey:@"firstlogindone_preference" 
-												   bundle:[NSBundle mainBundle]] == true) {
+	if ([[NSUserDefaults standardUserDefaults] boolForKey:@"firstlogindone_preference" ] == true) {
 		//first login case, dismmis first login view																		 
 		[self dismissModalViewControllerAnimated:true];
 	};