From 323833846ce683752c698e4ebcdbc74287f40df1 Mon Sep 17 00:00:00 2001
From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@linphone.org>
Date: Fri, 20 Jan 2012 10:08:51 +0100
Subject: [PATCH] Settings: do not use settings-changed notifications, simply
 compare new/old settings

---
 Classes/FirstLoginViewController.m   |  1 +
 Classes/LinphoneUI/LinphoneManager.h |  4 ++-
 Classes/LinphoneUI/LinphoneManager.m | 38 +++++++++++++++++++---------
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/Classes/FirstLoginViewController.m b/Classes/FirstLoginViewController.m
index ddacf0e09..b91450b65 100644
--- a/Classes/FirstLoginViewController.m
+++ b/Classes/FirstLoginViewController.m
@@ -81,6 +81,7 @@
 	} else {
 		[[NSUserDefaults standardUserDefaults] setObject:username.text forKey:@"username_preference"];
 		[[NSUserDefaults standardUserDefaults] setObject:passwd.text forKey:@"password_preference"];
+        [[LinphoneManager instance] reconfigureLinphoneIfNeeded:nil];
 		[self.activityIndicator setHidden:false];
 	};
 	
diff --git a/Classes/LinphoneUI/LinphoneManager.h b/Classes/LinphoneUI/LinphoneManager.h
index 1c0915469..95aaa8d60 100644
--- a/Classes/LinphoneUI/LinphoneManager.h
+++ b/Classes/LinphoneUI/LinphoneManager.h
@@ -52,6 +52,8 @@ typedef struct _CallContext {
 	const char*  frontCamId;
 	const char*  backCamId;
     
+    NSDictionary* currentSettings;
+    
 @public
     CallContext currentCallContextBeforeGoingBackground;
 }
@@ -73,7 +75,7 @@ typedef struct _CallContext {
 -(NSString*) getDisplayNameFromAddressBook:(NSString*) number andUpdateCallLog:(LinphoneCallLog*)log; 
 -(UIImage*) getImageFromAddressBook:(NSString*) number;
 
-
+-(BOOL) reconfigureLinphoneIfNeeded:(NSDictionary *)oldSettings;
 
 @property (nonatomic, retain) id<LinphoneUICallDelegate> callDelegate;
 @property (nonatomic, retain) id<LinphoneUIRegistrationDelegate> registrationDelegate;
diff --git a/Classes/LinphoneUI/LinphoneManager.m b/Classes/LinphoneUI/LinphoneManager.m
index 8dcf1e4c3..2c0d5e31b 100644
--- a/Classes/LinphoneUI/LinphoneManager.m
+++ b/Classes/LinphoneUI/LinphoneManager.m
@@ -429,12 +429,24 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
 	}
 }
 
--(void) doLinphoneConfiguration:(NSNotification *)notification {
-	ms_message("Configuring Linphone");
+-(BOOL) reconfigureLinphoneIfNeeded:(NSDictionary *)settings {
 	if (theLinphoneCore==nil) {
 		ms_warning("cannot configure linphone beacause not initialized yet");
-		return;
+		return NO;
 	}
+    
+    [[NSUserDefaults standardUserDefaults] synchronize];
+    NSDictionary* newSettings = [[NSUserDefaults standardUserDefaults] dictionaryRepresentation];
+    if (settings != nil) {
+        /* reconfigure only if newSettings != settings */
+        if ([newSettings isEqualToDictionary:settings]) {
+            ms_message("Same settings: no need to reconfigure linphone");
+            return NO;
+        }
+    }
+    NSLog(@"Configuring Linphone (new settings)");
+    
+    
 	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);
@@ -449,9 +461,7 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
     linphone_core_set_root_ca(theLinphoneCore, lRootCa);
     
 	NSString* transport = [[NSUserDefaults standardUserDefaults] stringForKey:@"transport_preference"];
-	
-
-	
+		
 	LCSipTransports transportValue;
 	if (transport!=nil) {
 		if (linphone_core_get_sip_transports(theLinphoneCore, &transportValue)) {
@@ -622,6 +632,11 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
 		isbackgroundModeEnabled=false;
 	}
 
+    [currentSettings release];
+    currentSettings = newSettings;
+    [currentSettings retain];
+    
+    return YES;
 }
 - (BOOL)isNotIphone3G
 {
@@ -779,10 +794,7 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
 		ms_error("Cannot register schedule reachability cb");
 	};
 	
-	[self doLinphoneConfiguration:nil];
-	[[NSNotificationCenter defaultCenter]	addObserver:self
-											 selector:@selector(doLinphoneConfiguration:)
-												 name:NSUserDefaultsDidChangeNotification object:nil];
+	[self reconfigureLinphoneIfNeeded:nil];
 	
 	// start scheduler
 	mIterateTimer = [NSTimer scheduledTimerWithTimeInterval:0.1 
@@ -851,8 +863,10 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
 		//back from standby and background mode is disabled
 		[self	startLibLinphone];
 	} else {
-        ms_message("becomming active, make sure we are registered");
-		linphone_core_refresh_registers(theLinphoneCore);//just to make sure REGISTRATION is up to date
+        if (![self reconfigureLinphoneIfNeeded:currentSettings]) {
+            ms_message("becomming active with no config modification, make sure we are registered");
+            linphone_core_refresh_registers(theLinphoneCore);//just to make sure REGISTRATION is up to date
+        }
 		
 	}
 	/*IOS specific*/