lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-04-22 06:02:03 +02:00
Code Activity

misc: prevent inconsistent include path

Browse source 
Gitlab: #229

Change-Id: I4c9188f7406b790f87d19413a3a4a4d6ac904719
This commit is contained in:
Ming Rui Zhang 2020-12-30 10:00:16 -05:00
parent 15932c6da5
commit d61a9a9da9
1 changed files with 15 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/accountadapter.cpp
View file

@ -27,9 +27,6 @@
#include <QtConcurrent/QtConcurrent> #include <QtConcurrent/QtConcurrent>
#undef REGISTERED
#include "../daemon/src/dring/account_const.h"
AccountAdapter::AccountAdapter(QObject* parent) AccountAdapter::AccountAdapter(QObject* parent)
: QmlAdapterBase(parent) : QmlAdapterBase(parent)
{} {}
@ -97,6 +94,11 @@ AccountAdapter::createJamiAccount(QString registeredName,
&LRCInstance::accountModel(), &LRCInstance::accountModel(),
&lrc::api::NewAccountModel::accountAdded, &lrc::api::NewAccountModel::accountAdded,
[this, registeredName, settings, isCreating](const QString& accountId) { [this, registeredName, settings, isCreating](const QString& accountId) {
auto confProps = LRCInstance::accountModel().getAccountConfig(accountId);
confProps.Ringtone.ringtonePath = Utils::GetRingtonePath();
confProps.isRendezVous = settings["isRendezVous"].toBool();
LRCInstance::accountModel().setAccountConfig(accountId, confProps);
auto showBackup = isCreating auto showBackup = isCreating
&& !AppSettingsManager::getValue(Settings::Key::NeverShowMeAgain) && !AppSettingsManager::getValue(Settings::Key::NeverShowMeAgain)
.toBool(); .toBool();
@ -130,19 +132,12 @@ AccountAdapter::createJamiAccount(QString registeredName,
connectFailure(); connectFailure();
QtConcurrent::run([settings] { QtConcurrent::run([settings] {
QMap<QString, QString> additionalAccountConfig;
additionalAccountConfig.insert(DRing::Account::ConfProperties::Ringtone::PATH,
Utils::GetRingtonePath());
additionalAccountConfig.insert(DRing::Account::ConfProperties::ISRENDEZVOUS,
settings["isRendezVous"].toString());
LRCInstance::accountModel().createNewAccount(lrc::api::profile::Type::RING, LRCInstance::accountModel().createNewAccount(lrc::api::profile::Type::RING,
settings["alias"].toString(), settings["alias"].toString(),
settings["archivePath"].toString(), settings["archivePath"].toString(),
settings["password"].toString(), settings["password"].toString(),
settings["archivePin"].toString(), settings["archivePin"].toString(),
"", "");
additionalAccountConfig);
}); });
} }
@ -159,6 +154,7 @@ AccountAdapter::createSIPAccount(const QVariantMap& settings)
confProps.username = settings["username"].toString(); confProps.username = settings["username"].toString();
confProps.password = settings["password"].toString(); confProps.password = settings["password"].toString();
confProps.routeset = settings["proxy"].toString(); confProps.routeset = settings["proxy"].toString();
confProps.Ringtone.ringtonePath = Utils::GetRingtonePath();
LRCInstance::accountModel().setAccountConfig(accountId, confProps); LRCInstance::accountModel().setAccountConfig(accountId, confProps);
emit LRCInstance::instance().accountListChanged(); emit LRCInstance::instance().accountListChanged();
@ -171,17 +167,13 @@ AccountAdapter::createSIPAccount(const QVariantMap& settings)
connectFailure(); connectFailure();
QtConcurrent::run([settings] { QtConcurrent::run([settings] {
QMap<QString, QString> additionalAccountConfig;
additionalAccountConfig.insert(DRing::Account::ConfProperties::Ringtone::PATH,
Utils::GetRingtonePath());
LRCInstance::accountModel().createNewAccount(lrc::api::profile::Type::SIP, LRCInstance::accountModel().createNewAccount(lrc::api::profile::Type::SIP,
settings["alias"].toString(), settings["alias"].toString(),
settings["archivePath"].toString(), settings["archivePath"].toString(),
"", "",
"", "",
settings["username"].toString(), settings["username"].toString(),
additionalAccountConfig); {});
}); });
} }
@ -191,9 +183,14 @@ AccountAdapter::createJAMSAccount(const QVariantMap& settings)
Utils::oneShotConnect(&LRCInstance::accountModel(), Utils::oneShotConnect(&LRCInstance::accountModel(),
&lrc::api::NewAccountModel::accountAdded, &lrc::api::NewAccountModel::accountAdded,
[this](const QString& accountId) { [this](const QString& accountId) {
Q_UNUSED(accountId)
if (!LRCInstance::accountModel().getAccountList().size()) if (!LRCInstance::accountModel().getAccountList().size())
return; return;
auto confProps = LRCInstance::accountModel().getAccountConfig(
accountId);
confProps.Ringtone.ringtonePath = Utils::GetRingtonePath();
LRCInstance::accountModel().setAccountConfig(accountId, confProps);
emit accountAdded(accountId, emit accountAdded(accountId,
false, false,
LRCInstance::accountModel().getAccountList().indexOf( LRCInstance::accountModel().getAccountList().indexOf(
@ -204,14 +201,9 @@ AccountAdapter::createJAMSAccount(const QVariantMap& settings)
connectFailure(); connectFailure();
QtConcurrent::run([settings] { QtConcurrent::run([settings] {
QMap<QString, QString> additionalAccountConfig;
additionalAccountConfig.insert(DRing::Account::ConfProperties::Ringtone::PATH,
Utils::GetRingtonePath());
LRCInstance::accountModel().connectToAccountManager(settings["username"].toString(), LRCInstance::accountModel().connectToAccountManager(settings["username"].toString(),
settings["password"].toString(), settings["password"].toString(),
settings["manager"].toString(), settings["manager"].toString());
additionalAccountConfig);
}); });
} }