witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

0008093: [Urgent] Critical issue with original provisioning URL being re-accessed

Browse source
This commit is contained in:
Christophe Deschamps 2020-10-15 13:45:12 +02:00 • committed by Danmei Chen
parent 1ff46fe25f
commit 4cc09f5428
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Classes/AssistantView.m
View file

@ -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];
}
});