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

assistant: fix phone number linking with existing account

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2016-08-24 11:14:30 +02:00
parent 2eae32359d
commit aa48999235
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Classes/AssistantView.m
View file

@ -498,7 +498,7 @@ static UICompositeViewDescription *compositeDescription = nil;
if (s != LinphoneAccountCreatorOK) linphone_account_creator_set_phone_number(account_creator, NULL, NULL);
// if phone is empty and username is empty, this is wrong
if (linphone_account_creator_get_phone_number(account_creator) == NULL) {
if (linphone_account_creator_get_username(account_creator) == NULL) {
s = LinphoneAccountCreatorPhoneNumberTooShort;
}
@ -927,7 +927,11 @@ void assistant_activate_phone_number_link(LinphoneAccountCreator *creator, Linph
ONCLICKBUTTON(sender, 100, {
_waitView.hidden = NO;
linphone_account_creator_set_activation_code(account_creator, ((UITextField*)[self findView:ViewElement_SMSCode inView:_contentView ofType:UITextField.class]).text.UTF8String);
linphone_account_creator_activate_account(account_creator);
if (linphone_account_creator_get_password(account_creator) == NULL) {
linphone_account_creator_activate_account(account_creator);
} else {
linphone_account_creator_activate_phone_number_link(account_creator);
}
});
}

2
Classes/Utils/XMLRPCHelper.h
View file

@ -19,7 +19,7 @@
* responded 'OK', in which case the view will return to idle, or if there is an error, an
* Alert will be displayed with the error message.
*
* All the rest is implemented to do nothing, which is what we want for Urmet
* All the rest is implemented to do nothing
*/
/**

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit 24b9e4b61cfa7c05be14f2d3456b43b9456aaba6
Subproject commit bfd9a69b66ae7150884e84682cec39b36d7564e3

2
submodules/linphone

@ -1 +1 @@
Subproject commit 7b2e4bd4e200add58c5e37438e46ccf906bb3d29
Subproject commit 63fe9fad5206b469fa39b99f40301381eeabe6cd