From ee19cce8ea4d7918d746fd1c72568286a9420a72 Mon Sep 17 00:00:00 2001 From: Christophe Deschamps Date: Thu, 15 Oct 2020 13:45:12 +0200 Subject: [PATCH] 0008093: [Urgent] Critical issue with original provisioning URL being re-accessed --- Classes/AssistantView.m | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Classes/AssistantView.m b/Classes/AssistantView.m index c05d99618..1fd1e5928 100644 --- a/Classes/AssistantView.m +++ b/Classes/AssistantView.m @@ -743,11 +743,9 @@ static UICompositeViewDescription *compositeDescription = nil; [url showError:NSLocalizedString(@"Invalid remote provisioning URL", nil) when:^BOOL(NSString *inputEntry) { if (inputEntry.length > 0) { - // missing prefix will result in http:// being used - if ([inputEntry rangeOfString:@"://"].location == NSNotFound) { - inputEntry = [NSString stringWithFormat:@"http://%@", inputEntry]; - } - return (linphone_core_set_provisioning_uri(LC, inputEntry.UTF8String) != 0); + bool isValid = linphone_core_set_provisioning_uri(LC, [self addSchemeToProvisiionninUriIMissing:inputEntry].UTF8String) != 0; + linphone_core_set_provisioning_uri(LC,NULL); + return isValid; } return TRUE; }]; @@ -773,6 +771,11 @@ static UICompositeViewDescription *compositeDescription = nil; } +-(NSString *) addSchemeToProvisiionninUriIMissing:(NSString *)uri { + // missing prefix will result in http:// being used + return [uri rangeOfString:@"://"].location == NSNotFound ? [NSString stringWithFormat:@"http://%@", uri] : uri; +} + - (void)shouldEnableNextButton { BOOL invalidInputs = NO; for (int i = 0; !invalidInputs && i < ViewElement_TextFieldCount; i++) { @@ -1464,6 +1467,7 @@ void assistant_is_account_linked(LinphoneAccountCreator *creator, LinphoneAccoun [errView addAction:defaultAction]; [self presentViewController:errView animated:YES completion:nil]; } else { + linphone_core_set_provisioning_uri(LC, [self addSchemeToProvisiionninUriIMissing:[self findTextField:ViewElement_URL].text].UTF8String); [self resetLiblinphone:TRUE]; } });