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

fix(Cli): error case: join-conference-as without proxy config

Browse source
This commit is contained in:
nicolas 2017-08-18 11:17:22 +02:00
parent 1d2dbfb774
commit eae2c461c1
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/app/cli/Cli.cpp
View file

@ -60,18 +60,22 @@ static void cliJoinConference (QHash<QString, QString> &args) {
static void cliJoinConferenceAs (QHash<QString, QString> &args) {
const QString fromSipAddress = args.take("guest-sip-address");
const QString toSipAddress = args.take("sip-address");
CoreManager *coreManager = CoreManager::getInstance();
shared_ptr<linphone::Core> core = coreManager->getCore();
shared_ptr<linphone::ProxyConfig> proxyConfig = coreManager->getCore()->getDefaultProxyConfig();
{
shared_ptr<linphone::Address> currentSipAddress = core->getDefaultProxyConfig()->getIdentityAddress()->clone();
currentSipAddress->clean();
if (fromSipAddress != ::Utils::coreStringToAppString(currentSipAddress->asStringUriOnly())) {
qWarning() << QStringLiteral("Guest sip address `%1` doesn't match with default proxy config.")
.arg(fromSipAddress);
return;
}
if (!proxyConfig) {
qWarning() << QStringLiteral("You have no proxy config.");
return;
}
const shared_ptr<const linphone::Address> currentSipAddress = proxyConfig->getIdentityAddress();
const shared_ptr<const linphone::Address> askedSipAddress = linphone::Factory::get()->createAddress(
::Utils::appStringToCoreString(fromSipAddress)
);
if (!currentSipAddress->weakEqual(askedSipAddress)) {
qWarning() << QStringLiteral("Guest sip address `%1` doesn't match with default proxy config.")
.arg(fromSipAddress);
return;
}
args["method"] = QStringLiteral("join-conference");
@ -124,7 +128,8 @@ static void cliInitiateConference (QHash<QString, QString> &args) {
qWarning() << QStringLiteral("Unable to join created conference: `%1`.").arg(id);
return;
}
App *app = App::getInstance();
app->smartShowWindow(app->getCallsWindow());
// TODO: Set the view to the "waiting call view".
}