From d54aa4f9979e26abbbdf0509d792abd4ee12e16f Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Tue, 2 Aug 2016 16:18:16 +0200 Subject: [PATCH] assistant continue --- Classes/AssistantView.m | 12 ++++++------ submodules/linphone | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Classes/AssistantView.m b/Classes/AssistantView.m index 72f0466c6..71c04eba7 100644 --- a/Classes/AssistantView.m +++ b/Classes/AssistantView.m @@ -531,15 +531,15 @@ static UICompositeViewDescription *compositeDescription = nil; LinphoneAccountCreatorStatus s = linphone_account_creator_set_phone_number(account_creator, inputEntry.length > 0 ? inputEntry.UTF8String : NULL, prefix.UTF8String); if (s != LinphoneAccountCreatorOK) linphone_account_creator_set_phone_number(account_creator, NULL, NULL); - createPhone.errorLabel.text = [AssistantView errorForStatus:s]; // if phone is empty and username is empty, this is wrong - if (s == LinphoneAccountCreatorOK) { - if (linphone_account_creator_get_phone_number(account_creator) == NULL - && linphone_account_creator_get_username(account_creator) == NULL) { - return LinphoneAccountCreatorPhoneNumberInvalid; - } + if (linphone_account_creator_get_phone_number(account_creator) == NULL) { + s = LinphoneAccountCreatorPhoneNumberTooShort; } + + createPhone.errorLabel.text = [AssistantView errorForStatus:s]; + + return s != LinphoneAccountCreatorOK; }]; diff --git a/submodules/linphone b/submodules/linphone index fbb24ec87..d687000a8 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit fbb24ec879896a82c257d986df10a9a2ab416e90 +Subproject commit d687000a81f7d0a0dc9957ee51050666540a31b6