diff --git a/openbis-ipad/openBIS/openBIS/CISDOBAppDelegate.m b/openbis-ipad/openBIS/openBIS/CISDOBAppDelegate.m index ed09e9bd7bc405b656cde9fbd8d5df9b6c040124..b15a6251af8f503abd770283f7e11f1df21f937e 100644 --- a/openbis-ipad/openBIS/openBIS/CISDOBAppDelegate.m +++ b/openbis-ipad/openBIS/openBIS/CISDOBAppDelegate.m @@ -149,7 +149,7 @@ // to the root model... maybe there is a better way to do this. [self detailsViewController].openBisModel = self.rootOpenBisModel; - [self initializeOpenBisConnection]; +// [self initializeOpenBisConnection]; return YES; @@ -175,6 +175,7 @@ - (void)applicationDidBecomeActive:(UIApplication *)application { // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. + [self initializeOpenBisConnection]; } - (void)applicationWillTerminate:(UIApplication *)application diff --git a/openbis-ipad/openBIS/openBIS/CISDOBLoginViewController.m b/openbis-ipad/openBIS/openBIS/CISDOBLoginViewController.m index 4cd5a6bc0b95a7e59dca510b5dad127a00679b27..375a9bb15b0b89c4eeee6806824058806d84be6b 100644 --- a/openbis-ipad/openBIS/openBIS/CISDOBLoginViewController.m +++ b/openbis-ipad/openBIS/openBIS/CISDOBLoginViewController.m @@ -69,6 +69,8 @@ NSString *urlString = [self valueFromTextField: self.urlTextField]; NSURL *openbisUrl = (urlString) ? [NSURL URLWithString: urlString] : nil; + [self showStatus: @"Logging in..."]; + CISDOBAppDelegate *appDelegate = self.appDelegate; [appDelegate verifyLoginURL: openbisUrl username: username password: password sender: self]; } @@ -79,5 +81,15 @@ self.errorLabel.text = errorText; } +- (void)showStatus:(NSString *)status +{ + self.errorLabel.text = status; +} + +- (void)clearStatus +{ + self.errorLabel.text = @""; +} + @end