accountwizard: remove some useless parameters

Change-Id: I19a26ef9ea3d58565ca2e62f1b75ff8c119abdee
GitLab: #847

src/app/accountadapter.cpp

@@ -97,16 +97,14 @@ AccountAdapter::connectFailure()
 }
 
 void
-AccountAdapter::createJamiAccount(QString registeredName,
-                                  const QVariantMap& settings,
-                                  bool isCreating)
+AccountAdapter::createJamiAccount(const QVariantMap& settings)
 {
+    auto registeredName = settings["registeredName"].toString();
     Utils::oneShotConnect(
         &lrcInstance_->accountModel(),
         &lrc::api::AccountModel::accountAdded,
-        [this, registeredName, settings, isCreating](const QString& accountId) {
+        [this, registeredName, settings](const QString& accountId) {
             lrcInstance_->accountModel().setAvatar(accountId, settings["avatar"].toString());
-
             Utils::oneShotConnect(&lrcInstance_->accountModel(),
                                   &lrc::api::AccountModel::accountDetailsChanged,
                                   [this](const QString& accountId) {
@@ -127,6 +125,7 @@ AccountAdapter::createJamiAccount(QString registeredName,
                 registeredNameSavedConnection_
                     = connect(&lrcInstance_->accountModel(),
                               &lrc::api::AccountModel::profileUpdated,
+                              this,
                               [this, addedAccountId = accountId](const QString& accountId) {
                                   if (addedAccountId == accountId) {
                                       Q_EMIT lrcInstance_->accountListChanged();

src/app/accountadapter.h

@@ -56,9 +56,7 @@ public:
     Q_INVOKABLE void changeAccount(int row);
 
     // Create normal Jami account, SIP account and JAMS accounts.
-    Q_INVOKABLE void createJamiAccount(QString registeredName,
-                                       const QVariantMap& settings,
-                                       bool isCreating);
+    Q_INVOKABLE void createJamiAccount(const QVariantMap& settings);
     Q_INVOKABLE void createSIPAccount(const QVariantMap& settings);
     Q_INVOKABLE void createJAMSAccount(const QVariantMap& settings);
 

src/app/wizardviewstepmodel.cpp

@@ -32,7 +32,10 @@ WizardViewStepModel::WizardViewStepModel(LRCInstance* lrcInstance,
 {
     reset();
 
-    connect(accountAdapter_, &AccountAdapter::accountAdded, [this](QString accountId, int index) {
+    connect(accountAdapter_,
+            &AccountAdapter::accountAdded,
+            this,
+            [this](QString accountId, int index) {
                 accountAdapter_->changeAccount(index);
 
                 auto accountCreationOption = get_accountCreationOption();
@@ -64,20 +67,17 @@ void
 WizardViewStepModel::nextStep()
 {
     auto accountCreationOption = get_accountCreationOption();
-    if (accountCreationOption == AccountCreationOption::None)
+    if (get_mainStep() == MainSteps::Initial
+        || accountCreationOption == AccountCreationOption::None) {
         return;
+    }
 
-    switch (get_mainStep()) {
-    case MainSteps::NameRegistration:
-    case MainSteps::AccountCreation: {
-        switch (get_accountCreationOption()) {
+    switch (accountCreationOption) {
     case AccountCreationOption::CreateJamiAccount:
     case AccountCreationOption::CreateRendezVous:
     case AccountCreationOption::ImportFromBackup:
     case AccountCreationOption::ImportFromDevice: {
-            accountAdapter_->createJamiAccount(get_accountCreationInfo()["registeredName"].toString(),
-                                               get_accountCreationInfo(),
-                                               false);
+        accountAdapter_->createJamiAccount(get_accountCreationInfo());
         break;
     }
     case AccountCreationOption::ConnectToAccountManager: {
@@ -88,11 +88,8 @@ WizardViewStepModel::nextStep()
         accountAdapter_->createSIPAccount(get_accountCreationInfo());
         break;
     }
-        }
-        break;
-    }
     default:
-        break;
+        return;
     }
 }