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

linphone-desktop/src/components/assistant/AssistantModel.cpp

@@ -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();