Skip to content

Commit

Permalink
Merge pull request #185 from haiwen/problem_account_https
Browse files Browse the repository at this point in the history
problem with serverTextField when wrong password
  • Loading branch information
freeplant authored Sep 26, 2017
2 parents 818e7a5 + 7116de2 commit c5b6b45
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions seafile/SeafAccountViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ - (IBAction)httpsSwitchFlip:(id)sender

- (IBAction)shibboleth:(id)sender
{
NSString *url = serverTextField.text;
NSString *url = [NSString stringWithFormat:@"%@%@",self.prefixLabel.text,serverTextField.text];
if (!url || url.length < 1) {
[self alertWithTitle:NSLocalizedString(@"Server must not be empty", @"Seafile")];
return;
Expand All @@ -110,7 +110,6 @@ - (IBAction)shibboleth:(id)sender

- (IBAction)login:(id)sender
{
serverTextField.text = [NSString stringWithFormat:@"%@%@",self.prefixLabel.text,serverTextField.text];
if (self.type == ACCOUNT_SHIBBOLETH) {
return [self shibboleth:sender];
}
Expand All @@ -119,7 +118,7 @@ - (IBAction)login:(id)sender
[passwordTextField resignFirstResponder];
NSString *username = usernameTextField.text;
NSString *password = passwordTextField.text;
NSString *url = serverTextField.text;
NSString *url = [NSString stringWithFormat:@"%@%@",self.prefixLabel.text,serverTextField.text];

if (!url || url.length < 1) {
[self alertWithTitle:NSLocalizedString(@"Server must not be empty", @"Seafile")];
Expand Down

0 comments on commit c5b6b45

Please sign in to comment.