From d27ceba2135e774e12352a88d9ae3d7b7061c529 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Tue, 24 Nov 2015 10:49:39 +0100 Subject: [PATCH] Assistant: add possibility to skip registration validation --- Classes/AssistantView.m | 8 ++++++-- Classes/LinphoneManager.m | 30 +++++++++++++++++------------- submodules/linphone | 2 +- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/Classes/AssistantView.m b/Classes/AssistantView.m index 7748df265..e430c43a5 100644 --- a/Classes/AssistantView.m +++ b/Classes/AssistantView.m @@ -520,11 +520,15 @@ static UICompositeViewDescription *compositeDescription = nil; if ([message isEqualToString:@"Forbidden"]) { message = NSLocalizedString(@"Incorrect username or password.", nil); } - UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Registration failure", nil) + DTAlertView *alert = [[DTAlertView alloc] initWithTitle:NSLocalizedString(@"Registration failure", nil) message:message delegate:nil - cancelButtonTitle:@"OK" + cancelButtonTitle:@"Cancel" otherButtonTitles:nil]; + [alert addButtonWithTitle:@"Continue" + block:^(void) { + [PhoneMainView.instance changeCurrentView:DialerView.compositeViewDescription]; + }]; [alert show]; break; } diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 78208ddf6..6dae6fd20 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -879,20 +879,19 @@ static void linphone_iphone_popup_password_request(LinphoneCore *lc, const char NSString *username = [NSString stringWithUTF8String:usernameC]; NSString *domain = [NSString stringWithUTF8String:domainC]; alertView = [[DTAlertView alloc] - initWithTitle:NSLocalizedString(@"Authentication needed.", nil) - message:[NSString stringWithFormat:NSLocalizedString(@"Registration failed because authentication is " - @"missing or invalid for %@@%@.\nYou can " - @"provide password again, or check your " - @"account configuration in the settings.", - nil), - username, realm]]; - alertView.alertViewStyle = UIAlertViewStyleSecureTextInput; - [alertView addCancelButtonWithTitle:NSLocalizedString(@"Go to settings", nil) - block:^{ - SettingsView *view = VIEW(SettingsView); - [PhoneMainView.instance changeCurrentView:view.compositeViewDescription]; - }]; + initWithTitle:NSLocalizedString(@"Authentication needed.", nil) + message:[NSString + stringWithFormat:NSLocalizedString(@"Registration failed because authentication is " + @"missing or invalid for %@@%@.\nYou can " + @"provide password again, or check your " + @"account configuration in the settings.", + nil), + username, realm] + delegate:nil + cancelButtonTitle:NSLocalizedString(@"Cancel", nil) + otherButtonTitles:nil]; + alertView.alertViewStyle = UIAlertViewStyleSecureTextInput; [alertView addButtonWithTitle:NSLocalizedString(@"Confirm password", nil) block:^{ NSString *password = [alertView textFieldAtIndex:0].text; @@ -902,6 +901,11 @@ static void linphone_iphone_popup_password_request(LinphoneCore *lc, const char linphone_core_add_auth_info([LinphoneManager getLc], info); [LinphoneManager.instance refreshRegisters]; }]; + [alertView addButtonWithTitle:NSLocalizedString(@"Go to settings", nil) + block:^{ + SettingsView *view = VIEW(SettingsView); + [PhoneMainView.instance changeCurrentView:view.compositeViewDescription]; + }]; [alertView show]; } } diff --git a/submodules/linphone b/submodules/linphone index 1d1368820..591a9b88b 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 1d13688204c1cf189ba5036dcc67e5d07451d145 +Subproject commit 591a9b88b7df18f4631fa55edf232c1c6dfbdd17