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

Display name on notifications by using full SIP addresses

Browse source
This commit is contained in:
Julien Wadel 2020-05-08 00:23:44 +02:00
parent ca500317ca
commit 5829d54f70
5 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linphone-app/src/app/cli/Cli.cpp
View file

@ -295,7 +295,7 @@ void Cli::Command::executeUri (const shared_ptr<linphone::Address> &address) con
args[argName] = QByteArray::fromBase64(QByteArray(header.c_str(), int(header.length())));
}
address->clean();
args["sip-address"] = Utils::coreStringToAppString(address->asStringUriOnly());
args["sip-address"] = Utils::coreStringToAppString(address->asString());
execute(args);
}

5
linphone-app/src/components/call/CallModel.cpp
View file

@ -88,13 +88,12 @@ CallModel::~CallModel () {
// -----------------------------------------------------------------------------
QString CallModel::getPeerAddress () const {
return Utils::coreStringToAppString(mCall->getRemoteAddress()->asStringUriOnly());
return Utils::coreStringToAppString(mCall->getRemoteAddress()->asString());
}
QString CallModel::getLocalAddress () const {
return Utils::coreStringToAppString(mCall->getCallLog()->getLocalAddress()->asStringUriOnly());
return Utils::coreStringToAppString(mCall->getCallLog()->getLocalAddress()->asString());
}
// -----------------------------------------------------------------------------
void CallModel::setRecordFile (const shared_ptr<linphone::CallParams> &callParams) {

4
linphone-app/src/components/chat/ChatModel.cpp
View file

@ -383,13 +383,13 @@ bool ChatModel::removeRows (int row, int count, const QModelIndex &parent) {
QString ChatModel::getPeerAddress () const {
return Utils::coreStringToAppString(
mChatRoom->getPeerAddress()->asStringUriOnly()
mChatRoom->getPeerAddress()->asString()
);
}
QString ChatModel::getLocalAddress () const {
return Utils::coreStringToAppString(
mChatRoom->getLocalAddress()->asStringUriOnly()
mChatRoom->getLocalAddress()->asString()
);
}

4
linphone-app/src/components/notifier/Notifier.cpp
View file

@ -245,8 +245,8 @@ void Notifier::notifyReceivedMessage (const shared_ptr<linphone::ChatMessage> &m
: Utils::coreStringToAppString(message->getText());
shared_ptr<linphone::ChatRoom> chatRoom(message->getChatRoom());
map["peerAddress"] = Utils::coreStringToAppString(chatRoom->getPeerAddress()->asStringUriOnly());
map["localAddress"] = Utils::coreStringToAppString(chatRoom->getLocalAddress()->asStringUriOnly());
map["peerAddress"] = Utils::coreStringToAppString(chatRoom->getPeerAddress()->asString());
map["localAddress"] = Utils::coreStringToAppString(chatRoom->getLocalAddress()->asString());
map["window"].setValue(App::getInstance()->getMainWindow());
CREATE_NOTIFICATION(Notifier::ReceivedMessage, map)
}

4
linphone-app/src/components/settings/AccountSettingsModel.cpp
View file

@ -397,7 +397,7 @@ QVariantList AccountSettingsModel::getAccounts () const {
{
QVariantMap account;
account["sipAddress"] = Utils::coreStringToAppString(core->createPrimaryContactParsed()->asStringUriOnly());
account["sipAddress"] = Utils::coreStringToAppString(core->createPrimaryContactParsed()->asString());
account["unreadMessageCount"] = core->getUnreadChatMessageCountFromLocal(core->createPrimaryContactParsed());
account["proxyConfig"].setValue(nullptr);
accounts << account;
@ -405,7 +405,7 @@ QVariantList AccountSettingsModel::getAccounts () const {
for (const auto &proxyConfig : core->getProxyConfigList()) {
QVariantMap account;
account["sipAddress"] = Utils::coreStringToAppString(proxyConfig->getIdentityAddress()->asStringUriOnly());
account["sipAddress"] = Utils::coreStringToAppString(proxyConfig->getIdentityAddress()->asString());
account["proxyConfig"].setValue(proxyConfig);
account["unreadMessageCount"] = proxyConfig->getUnreadChatMessageCount();
accounts << account;