mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-23 22:58:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(src/components/assistant/AssistantModel): login user correctly with username/password

Browse source
This commit is contained in:
Ronan Abhamon 2017-06-05 10:28:19 +02:00
parent b2a29c3918
commit 8d51bfb673
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
linphone-desktop/src/components/assistant/AssistantModel.cpp
View file

@ -33,10 +33,6 @@ using namespace std;
// =============================================================================
inline bool dealWithPhoneNumber (const shared_ptr<linphone::AccountCreator> &creator) {
return creator->getEmail().empty();
}
class AssistantModel::Handlers : public linphone::AccountCreatorListener {
public:
Handlers (AssistantModel *assistant) {
@ -88,7 +84,7 @@ private:
status == linphone::AccountCreatorStatusAccountActivated ||
status == linphone::AccountCreatorStatusAccountAlreadyActivated
) {
if (dealWithPhoneNumber(creator)) {
if (creator->getEmail().empty()) {
shared_ptr<linphone::ProxyConfig> proxyConfig = creator->createProxyConfig();
Q_ASSERT(proxyConfig != nullptr);
}
@ -156,7 +152,7 @@ AssistantModel::AssistantModel (QObject *parent) : QObject(parent) {
// -----------------------------------------------------------------------------
void AssistantModel::activate () {
if (dealWithPhoneNumber(mAccountCreator))
if (mAccountCreator->getEmail().empty())
mAccountCreator->activateAccount();
else
mAccountCreator->isAccountActivated();
@ -167,7 +163,7 @@ void AssistantModel::create () {
}
void AssistantModel::login () {
if (dealWithPhoneNumber(mAccountCreator))
if (!mCountryCode.isEmpty())
mAccountCreator->recoverAccount();
else
mAccountCreator->isAccountExist();