Changeset 675

Timestamp:

01/20/10 09:18:40 (8 months ago)

Author:

henri

Message:

Fix to ensure proper login (or avoidance thereof) on application becoming active.

Location:

apps/iphone/my.tel/trunk/Classes

Files:

• MytelAppDelegate.m (modified) (1 diff)
• RootViewController.m (modified) (1 diff)

apps/iphone/my.tel/trunk/Classes/MytelAppDelegate.m

@@ -52 +52 @@
         // Re-login to make sure the session is ok
         // Nothing will happen if no account is set up
-        [self.rootController loginToCurrentAccount];
+        [self.rootController loginToAccountAtIndex:self.rootController.currentAccountIndex forced:YES];
 }
 

apps/iphone/my.tel/trunk/Classes/RootViewController.m

@@ -178 +178 @@
                                                                                                                 selector:@selector(postLoginProcess:)];
         } else {
-                // we aren't forcing login, and we're in the current account
-                [self displayControllerForAccountAtIndex:self.currentAccountIndex];
+                // we aren't forcing login, and we're in the current account, and there's no account visible
+                if (self.navigationController.topViewController == self) {
+                        [self displayControllerForAccountAtIndex:self.currentAccountIndex];
+                }
         }