From a8d1a4d845fbf83f8c2e4ba38f0ef23a6a373dec Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Fri, 8 Jan 2016 11:44:24 +0100 Subject: [PATCH] assistant: detect invalid domain and show error in that case --- Classes/AssistantView.m | 4 ++-- Classes/SettingsView.m | 2 +- submodules/linphone | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Classes/AssistantView.m b/Classes/AssistantView.m index ea7b00b1b..e7de74eb8 100644 --- a/Classes/AssistantView.m +++ b/Classes/AssistantView.m @@ -666,8 +666,8 @@ void assistant_validation_tested(LinphoneAccountCreator *creator, LinphoneAccoun replacementString:(NSString *)string { UIAssistantTextField *atf = (UIAssistantTextField *)textField; BOOL replace = YES; - // if we are hitting backspace, invalid range is given (length=1 instead of text size, new string="") - if ([string isEqual:@""]) { + // if we are hitting backspace on secure entry, this will clear all text + if ([string isEqual:@""] && textField.isSecureTextEntry) { range = NSMakeRange(0, atf.text.length); } [atf textField:atf shouldChangeCharactersInRange:range replacementString:string]; diff --git a/Classes/SettingsView.m b/Classes/SettingsView.m index e6ab35b6f..1c810ed61 100644 --- a/Classes/SettingsView.m +++ b/Classes/SettingsView.m @@ -798,7 +798,7 @@ static UICompositeViewDescription *compositeDescription = nil; MFMailComposeViewController *picker = [[MFMailComposeViewController alloc] init]; picker.mailComposeDelegate = self; - [picker setSubject:@"Linphone iOS Logs"]; + [picker setSubject:@""]; [picker setToRecipients:[NSArray arrayWithObjects:@"linphone-iphone@belledonne-communications.com", nil]]; [picker setMessageBody:@"Here are information about an issue I had on my device.\nI was " @"doing ...\nI expected Linphone to ...\nInstead, I got an " diff --git a/submodules/linphone b/submodules/linphone index 60708a53a..3739d2c86 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 60708a53ab17ccb5084f3ffcbc288edbb5bd3633 +Subproject commit 3739d2c8669ad122aa402c35e410f82c53aad662