From c0686613dc482ccd0b65786faa34baa881baaf47 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 2 Jun 2017 11:02:08 +0200 Subject: [PATCH] feat(src/components/assistant/AssistantModel): provide a `dealWithPhoneNumber` function --- .../src/components/assistant/AssistantModel.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/linphone-desktop/src/components/assistant/AssistantModel.cpp b/linphone-desktop/src/components/assistant/AssistantModel.cpp index cfdd6486f..f2a853505 100644 --- a/linphone-desktop/src/components/assistant/AssistantModel.cpp +++ b/linphone-desktop/src/components/assistant/AssistantModel.cpp @@ -32,6 +32,10 @@ using namespace std; // ============================================================================= +inline bool dealWithPhoneNumber (const shared_ptr &creator) { + return creator->getEmail().empty(); +} + class AssistantModel::Handlers : public linphone::AccountCreatorListener { public: Handlers (AssistantModel *assistant) { @@ -83,7 +87,7 @@ private: status == linphone::AccountCreatorStatusAccountActivated || status == linphone::AccountCreatorStatusAccountAlreadyActivated ) { - if (creator->getEmail().empty()) { + if (dealWithPhoneNumber(creator)) { shared_ptr proxyConfig = creator->createProxyConfig(); Q_ASSERT(proxyConfig != nullptr); } @@ -151,7 +155,7 @@ AssistantModel::AssistantModel (QObject *parent) : QObject(parent) { // ----------------------------------------------------------------------------- void AssistantModel::activate () { - if (mAccountCreator->getEmail().empty()) + if (dealWithPhoneNumber(mAccountCreator)) mAccountCreator->activateAccount(); else mAccountCreator->isAccountActivated(); @@ -162,7 +166,7 @@ void AssistantModel::create () { } void AssistantModel::login () { - if (mAccountCreator->getEmail().empty()) + if (dealWithPhoneNumber(mAccountCreator)) mAccountCreator->recoverAccount(); else mAccountCreator->isAccountExist();