diff --git a/Classes/AssistantView.h b/Classes/AssistantView.h index 401ff4e1c..b98368a23 100644 --- a/Classes/AssistantView.h +++ b/Classes/AssistantView.h @@ -40,14 +40,14 @@ @property(nonatomic, strong) IBOutlet UIView *createAccountActivationView; @property(nonatomic, strong) IBOutlet UIView *linphoneLoginView; @property(nonatomic, strong) IBOutlet UIView *loginView; -@property(nonatomic, strong) IBOutlet UIView *remoteProvisionningLoginView; -@property(strong, nonatomic) IBOutlet UIView *remoteProvisionningView; +@property(nonatomic, strong) IBOutlet UIView *remoteProvisioningLoginView; +@property(strong, nonatomic) IBOutlet UIView *remoteProvisioningView; @property(nonatomic, strong) IBOutlet UIImageView *welcomeLogoImage; @property(nonatomic, strong) IBOutlet UIButton *gotoCreateAccountButton; @property(nonatomic, strong) IBOutlet UIButton *gotoLinphoneLoginButton; @property(nonatomic, strong) IBOutlet UIButton *gotoLoginButton; -@property(nonatomic, strong) IBOutlet UIButton *gotoRemoteProvisionningButton; +@property(nonatomic, strong) IBOutlet UIButton *gotoRemoteProvisioningButton; - (void)reset; - (void)fillDefaultValues; @@ -58,14 +58,14 @@ - (IBAction)onGotoCreateAccountClick:(id)sender; - (IBAction)onGotoLinphoneLoginClick:(id)sender; - (IBAction)onGotoLoginClick:(id)sender; -- (IBAction)onGotoRemoteProvisionningClick:(id)sender; +- (IBAction)onGotoRemoteProvisioningClick:(id)sender; - (IBAction)onCreateAccountClick:(id)sender; - (IBAction)onCreateAccountActivationClick:(id)sender; - (IBAction)onLinphoneLoginClick:(id)sender; - (IBAction)onLoginClick:(id)sender; -- (IBAction)onRemoteProvisionningLoginClick:(id)sender; -- (IBAction)onRemoteProvisionningDownloadClick:(id)sender; +- (IBAction)onRemoteProvisioningLoginClick:(id)sender; +- (IBAction)onRemoteProvisioningDownloadClick:(id)sender; - (IBAction)onTransportChange:(id)sender; diff --git a/Classes/AssistantView.m b/Classes/AssistantView.m index 4589ad1f0..5a7c66f8b 100644 --- a/Classes/AssistantView.m +++ b/Classes/AssistantView.m @@ -108,7 +108,7 @@ static UICompositeViewDescription *compositeDescription = nil; [LinphoneUtils adjustFontSize:_linphoneLoginView mult:2.22f]; [LinphoneUtils adjustFontSize:_loginView mult:2.22f]; [LinphoneUtils adjustFontSize:_createAccountActivationView mult:2.22f]; - [LinphoneUtils adjustFontSize:_remoteProvisionningLoginView mult:2.22f]; + [LinphoneUtils adjustFontSize:_remoteProvisioningLoginView mult:2.22f]; } } @@ -335,7 +335,7 @@ static UICompositeViewDescription *compositeDescription = nil; } } - [self changeView:_remoteProvisionningLoginView back:FALSE animation:TRUE]; + [self changeView:_remoteProvisioningLoginView back:FALSE animation:TRUE]; linphone_proxy_config_destroy(default_conf); } @@ -346,7 +346,7 @@ static UICompositeViewDescription *compositeDescription = nil; [AssistantView cleanTextField:_linphoneLoginView]; [AssistantView cleanTextField:_loginView]; [AssistantView cleanTextField:_createAccountActivationView]; - [AssistantView cleanTextField:_remoteProvisionningLoginView]; + [AssistantView cleanTextField:_remoteProvisioningLoginView]; } - (void)displayUsernameAsPhoneOrUsername { @@ -455,18 +455,17 @@ static UICompositeViewDescription *compositeDescription = nil; }]; UIAssistantTextField *url = [self findTextField:ViewElement_URL]; - [url showError:NSLocalizedString(@"Invalid remote provisionning URL", nil) - when:^BOOL(NSString *inputEntry) { - NSString *url = [self findTextField:ViewElement_URL].text; - if (url.length > 0) { - // missing prefix will result in http:// being used - if ([url rangeOfString:@"://"].location == NSNotFound) { - url = [NSString stringWithFormat:@"http://%@", url]; - } - return (linphone_core_set_provisioning_uri([LinphoneManager getLc], [url UTF8String]) != 0); - } - return TRUE; - }]; + [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([LinphoneManager getLc], inputEntry.UTF8String) != 0); + } + return TRUE; + }]; [self shouldEnableNextButton]; } @@ -647,8 +646,8 @@ void assistant_validation_tested(LinphoneAccountCreator *creator, LinphoneAccoun [self loadAssistantConfig:@"assistant_external_sip.rc"]; } -- (IBAction)onGotoRemoteProvisionningClick:(id)sender { - nextView = _remoteProvisionningView; +- (IBAction)onGotoRemoteProvisioningClick:(id)sender { + nextView = _remoteProvisioningView; [self loadAssistantConfig:@"assistant_remote.rc"]; [self findTextField:ViewElement_URL].text = [[LinphoneManager instance] lpConfigStringForKey:@"config-uri" forSection:@"misc"]; @@ -674,13 +673,13 @@ void assistant_validation_tested(LinphoneAccountCreator *creator, LinphoneAccoun [self addProxyConfig:linphone_account_creator_configure(account_creator)]; } -- (IBAction)onRemoteProvisionningLoginClick:(id)sender { +- (IBAction)onRemoteProvisioningLoginClick:(id)sender { _waitView.hidden = NO; [[LinphoneManager instance] lpConfigSetInt:1 forKey:@"transient_provisioning" forSection:@"misc"]; [self addProxyConfig:linphone_account_creator_configure(account_creator)]; } -- (IBAction)onRemoteProvisionningDownloadClick:(id)sender { +- (IBAction)onRemoteProvisioningDownloadClick:(id)sender { [_waitView setHidden:false]; [self resetLiblinphone]; } diff --git a/Classes/Base.lproj/AssistantViewScreens.xib b/Classes/Base.lproj/AssistantViewScreens.xib index c001b3e4b..7dc5a9191 100644 --- a/Classes/Base.lproj/AssistantViewScreens.xib +++ b/Classes/Base.lproj/AssistantViewScreens.xib @@ -12,11 +12,11 @@ - + - - + + @@ -78,7 +78,7 @@ - @@ -708,7 +708,7 @@ - + @@ -795,7 +795,7 @@ - diff --git a/Classes/LinphoneUI/UIAssistantTextField.h b/Classes/LinphoneUI/UIAssistantTextField.h index 86e2aaea4..d6b1a7e9f 100644 --- a/Classes/LinphoneUI/UIAssistantTextField.h +++ b/Classes/LinphoneUI/UIAssistantTextField.h @@ -14,7 +14,7 @@ typedef BOOL (^UIDisplayError)(NSString *inputEntry); @property(nonatomic, strong) IBOutlet UILabel *errorLabel; @property(nonatomic, readonly) UIDisplayError showErrorPredicate; -@property(nonatomic, readonly) NSString *lastText; +@property(nonatomic, strong) NSString *lastText; // we should show error only when user finished editted the field at least once @property(atomic) BOOL canShowError; diff --git a/TestsUI/AssistantTester.m b/TestsUI/AssistantTester.m index f8847bdcd..9d0470982 100644 --- a/TestsUI/AssistantTester.m +++ b/TestsUI/AssistantTester.m @@ -102,7 +102,7 @@ [tester fail]; } else { [tester tapViewWithAccessibilityLabel:@"OK"]; // alertview - [tester tapViewWithAccessibilityLabel:@"Cancel"]; // cancel assistant + [tester tapViewWithAccessibilityLabel:@"Dialer"]; } } else { [tester fail]; @@ -111,7 +111,7 @@ - (void)testRemoteProvisioning { [tester tapViewWithAccessibilityLabel:@"Fetch remote configuration"]; - [tester enterText:@"smtp.linphone.org/testios_xml" intoViewWithAccessibilityLabel:@"Username"]; + [tester enterText:@"smtp.linphone.org/testios_xml" intoViewWithAccessibilityLabel:@"URL"]; [tester tapViewWithAccessibilityLabel:@"Fetch and apply"]; [self waitForRegistration]; } diff --git a/TestsUI/ChatTester.m b/TestsUI/ChatTester.m index 900d4f7f9..ca64d5cab 100644 --- a/TestsUI/ChatTester.m +++ b/TestsUI/ChatTester.m @@ -17,7 +17,7 @@ [super beforeAll]; [self switchToValidAccountIfNeeded]; // turn off logs for chat tests because there are way to much logs in liblinphone in filetransfer and sqlite - // linphone_core_set_log_level(ORTP_WARNING); + linphone_core_set_log_level(ORTP_WARNING); } - (void)beforeEach { diff --git a/submodules/linphone b/submodules/linphone index 53dcc192f..8c2a440fd 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 53dcc192fd1fb9cefb8d083cb488a8b3b8bb5a92 +Subproject commit 8c2a440fd9804ea3dacd27737afd3f18911e0379