From bd0acbcc4b5889f019f461f36b22e4906e6ba01c Mon Sep 17 00:00:00 2001
From: Yann Diorcet <yann.diorcet@belledonne-communications.com>
Date: Thu, 9 Aug 2012 18:05:27 +0200
Subject: [PATCH] Fix Settings view: element update when chosen element change

---
 Classes/LinphoneAppDelegate.m            | 14 +++---
 Classes/SettingsViewController.m         | 61 +++++++++++++-----------
 Settings/InAppSettings.bundle/Root.plist |  2 +-
 3 files changed, 43 insertions(+), 34 deletions(-)

diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m
index c6ef17ab8..d12c0cf26 100644
--- a/Classes/LinphoneAppDelegate.m
+++ b/Classes/LinphoneAppDelegate.m
@@ -170,12 +170,14 @@ int __aeabi_idiv(int a, int b) {
     if(![LinphoneManager isLcReady]) {
         [[LinphoneManager instance]	startLibLinphone];
     }
-    [self setupGSMInteraction];
-    
-    // Only execute one time at application start
-    if(!started) {
-        started = TRUE;
-        [[PhoneMainView instance] startUp];
+    if([LinphoneManager isLcReady]) {
+        [self setupGSMInteraction];
+        
+        // Only execute one time at application start
+        if(!started) {
+            started = TRUE;
+            [[PhoneMainView instance] startUp];
+        }
     }
 }
 
diff --git a/Classes/SettingsViewController.m b/Classes/SettingsViewController.m
index cb1fd0dfa..b834b7831 100644
--- a/Classes/SettingsViewController.m
+++ b/Classes/SettingsViewController.m
@@ -187,11 +187,6 @@
     return self;
 }
 
-- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-    [super tableView:tableView didSelectRowAtIndexPath:indexPath];
-    [tableView deselectRowAtIndexPath:indexPath animated:YES]; // Fix IOS4 issue
-}
-
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     UITableViewCell * cell = [super tableView:tableView cellForRowAtIndexPath:indexPath];
     
@@ -280,8 +275,11 @@
 
 - (void)pushViewController:(UIViewController *)viewController animated:(BOOL)animated {
     [UINavigationControllerEx removeBackground:viewController.view];
-    
-    [viewController viewWillAppear:FALSE]; // Force load: Load Title
+    UIViewController *oldTopViewController = self.topViewController;
+    if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
+        [oldTopViewController viewWillDisappear:animated];
+    }
+    [viewController viewWillAppear:animated]; // Force view
     UILabel *labelTitleView = [[UILabel alloc] init];
     labelTitleView.backgroundColor = [UIColor clearColor];
     labelTitleView.textColor = [UIColor colorWithRed:0x41/255.0f green:0x48/255.0f blue:0x4f/255.0f alpha:1.0];
@@ -294,6 +292,28 @@
     viewController.navigationItem.titleView = labelTitleView;
     
     [super pushViewController:viewController animated:animated];
+    if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
+        [self.topViewController viewDidAppear:animated];
+        [oldTopViewController viewDidDisappear:animated];
+    }
+}
+
+- (UIViewController *)popViewControllerAnimated:(BOOL)animated {
+    if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
+        [self.topViewController viewWillDisappear:animated];
+        UIViewController *nextView = nil;
+        int count = [self.viewControllers count];
+        if(count > 1) {
+            nextView = [self.viewControllers objectAtIndex:count - 2];
+        }
+        [nextView viewWillAppear:animated];
+    }
+    UIViewController * ret = [super popViewControllerAnimated:animated];
+    if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
+        [ret viewDidDisappear:animated];
+        [self.topViewController viewDidAppear:animated];
+    }
+    return ret;
 }
 
 - (void)setViewControllers:(NSArray *)viewControllers {
@@ -372,9 +392,6 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 - (void)viewWillDisappear:(BOOL)animated {
     [super viewWillDisappear:animated];
-    if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
-        [settingsController viewWillDisappear:animated];
-    }
     [settingsController dismiss:self];
     // Set observer
     [[NSNotificationCenter defaultCenter] removeObserver:self 
@@ -384,9 +401,6 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
-    if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
-        [settingsController viewWillAppear:animated];
-    }   
     // Set observer
     [[NSNotificationCenter defaultCenter] addObserver:self 
                                              selector:@selector(appSettingChanged:) 
@@ -394,20 +408,6 @@ static UICompositeViewDescription *compositeDescription = nil;
                                                object:nil];
 }
 
-- (void)viewDidAppear:(BOOL)animated {
-    [super viewDidAppear:animated];
-    if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
-        [settingsController viewDidAppear:animated];
-    }   
-}
-
-- (void)viewDidDisappear:(BOOL)animated {
-    [super viewDidDisappear:animated];
-    if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
-        [settingsController viewDidDisappear:animated];
-    }  
-}
-
 
 #pragma mark - Event Functions
 
@@ -495,4 +495,11 @@ static UICompositeViewDescription *compositeDescription = nil;
 - (void)settingsViewControllerDidEnd:(IASKAppSettingsViewController *)sender {
 }
 
+- (void)settingsViewController:(IASKAppSettingsViewController*)sender buttonTappedForSpecifier:(IASKSpecifier*)specifier {
+    NSString *key = [specifier.specifierDict objectForKey:kIASKKey];
+#ifdef DEBUG
+    if([key isEqual:@"release_button"]) {
+    }
+#endif
+}
 @end
diff --git a/Settings/InAppSettings.bundle/Root.plist b/Settings/InAppSettings.bundle/Root.plist
index e9dc102f0..ebddc44c5 100644
--- a/Settings/InAppSettings.bundle/Root.plist
+++ b/Settings/InAppSettings.bundle/Root.plist
@@ -178,7 +178,7 @@
 		</dict>
 		<dict>
 			<key>Key</key>
-			<string>Release_button</string>
+			<string>release_button</string>
 			<key>Title</key>
 			<string>Release</string>
 			<key>Type</key>