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

fix(Cli): set if there is not a proxy config when joining a conference

Browse source
This commit is contained in:
nicolas 2017-08-16 11:34:15 +02:00
parent 34759e3a28
commit a9a3e896a3
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -43,11 +43,16 @@ static void cliCall (QHash<QString, QString> &args) {
static void cliJoinConference (QHash<QString, QString> &args) {
const QString sipAddress = args.take("sip-address");
const string displayName = ::Utils::appStringToCoreString(args.take("display-name"));
shared_ptr<linphone::ProxyConfig> proxyConfig = CoreManager::getInstance()->getCore()->getDefaultProxyConfig();
shared_ptr<linphone::Address> address = proxyConfig->getIdentityAddress()->clone();
address->setDisplayName(displayName);
proxyConfig->setIdentityAddress(address);
if (!args["default-display-name"].isEmpty()) {
const shared_ptr<linphone::Core> core = CoreManager::getInstance()->getCore();
const shared_ptr<linphone::ProxyConfig> defaultProxyConfig = core->getDefaultProxyConfig();
shared_ptr<linphone::Address> address;
if (!defaultProxyConfig) {
address = core->getPrimaryContactParsed();
address->setDisplayName(::Utils::appStringToCoreString(args.take("default-display-name")));
core->setPrimaryContact(address->asString());
}
}
args["method"] = QStringLiteral("join-conference");
CoreManager::getInstance()->getCallsListModel()->launchAudioCall(sipAddress, args);
}
@ -151,6 +156,7 @@ void Cli::Command::execute (QHash<QString, QString> &args) const {
void Cli::Command::executeUri (const shared_ptr<linphone::Address> &address) const {
QHash<QString, QString> args;
//TODO: check if there is too much headers.
for (const auto &argName : mArgsScheme.keys()) {
const string header = address->getHeader(::Utils::appStringToCoreString(argName));
args[argName] = QByteArray::fromBase64(QByteArray(header.c_str(), header.length()));
@ -176,7 +182,7 @@ Cli::Cli (QObject *parent) : QObject(parent) {
{ "sip-address", {} }, { "conference-id", {} }
});
addCommand("join-conference", tr("joinConferenceFunctionDescription"), ::cliJoinConference, {
{ "sip-address", {} }, { "conference-id", {} }, { "display-name", {STRING, true } }
{ "sip-address", {} }, { "conference-id", {} }, { "default-display-name", {STRING, true} }
});
}
@ -227,7 +233,6 @@ void Cli::executeCommand (const QString &command, CommandFormat *format) const {
return;
}
// TODO: Check if there is any header when the `method` header is missing.
const QString functionName = ::Utils::coreStringToAppString(address->getHeader("method")).isEmpty()
? QStringLiteral("call")
: ::Utils::coreStringToAppString(address->getHeader("method"));