mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-02-07 15:08:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(SipAddressesView): do not display wrong default sip address

Browse source
This commit is contained in:
Ronan Abhamon 2017-08-09 12:31:27 +02:00
parent dcfecffe66
commit 091227e83b
9 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -52,7 +52,7 @@ static void cliInitiateConference (QHash<QString, QString> &args) {
// Check identity.
{
shared_ptr<linphone::Address> address = core->interpretUrl(::Utils::appStringToCoreString(args["sip-address"]));
shared_ptr<linphone::Address> address = core->interpretSipAddress(::Utils::appStringToCoreString(args["sip-address"]));
address->clean();
const string sipAddress = address->asString();

10
src/components/calls/CallsListModel.cpp
View file

@ -91,10 +91,10 @@ void CallsListModel::askForTransfer (CallModel *callModel) {
// -----------------------------------------------------------------------------
void CallsListModel::launchAudioCall (const QString &sipUri, const QHash<QString, QString> &headers) const {
void CallsListModel::launchAudioCall (const QString &sipAddress, const QHash<QString, QString> &headers) const {
shared_ptr<linphone::Core> core = CoreManager::getInstance()->getCore();
shared_ptr<linphone::Address> address = core->interpretUrl(::Utils::appStringToCoreString(sipUri));
shared_ptr<linphone::Address> address = core->interpretSipAddress(::Utils::appStringToCoreString(sipAddress));
if (!address)
return;
@ -111,15 +111,15 @@ void CallsListModel::launchAudioCall (const QString &sipUri, const QHash<QString
core->inviteAddressWithParams(address, params);
}
void CallsListModel::launchVideoCall (const QString &sipUri) const {
void CallsListModel::launchVideoCall (const QString &sipAddress) const {
shared_ptr<linphone::Core> core = CoreManager::getInstance()->getCore();
if (!core->videoSupported()) {
qWarning() << QStringLiteral("Unable to launch video call. (Video not supported.) Launching audio call...");
launchAudioCall(sipUri);
launchAudioCall(sipAddress);
return;
}
shared_ptr<linphone::Address> address = core->interpretUrl(::Utils::appStringToCoreString(sipUri));
shared_ptr<linphone::Address> address = core->interpretSipAddress(::Utils::appStringToCoreString(sipAddress));
if (!address)
return;

4
src/components/calls/CallsListModel.hpp
View file

@ -45,8 +45,8 @@ public:
void askForTransfer (CallModel *callModel);
Q_INVOKABLE void launchAudioCall (const QString &sipUri, const QHash<QString, QString> &headers = {}) const;
Q_INVOKABLE void launchVideoCall (const QString &sipUri) const;
Q_INVOKABLE void launchAudioCall (const QString &sipAddress, const QHash<QString, QString> &headers = {}) const;
Q_INVOKABLE void launchVideoCall (const QString &sipAddress) const;
Q_INVOKABLE int getRunningCallsNumber () const;

2
src/components/conference/ConferenceAddModel.cpp
View file

@ -95,7 +95,7 @@ bool ConferenceHelperModel::ConferenceAddModel::addToConference (const QString &
beginInsertRows(QModelIndex(), row, row);
qInfo() << QStringLiteral("Add sip address to conference: `%1`.").arg(sipAddress);
shared_ptr<linphone::Address> linphoneAddress = CoreManager::getInstance()->getCore()->interpretUrl(
shared_ptr<linphone::Address> linphoneAddress = CoreManager::getInstance()->getCore()->interpretSipAddress(
::Utils::appStringToCoreString(sipAddress)
);
addToConferencePrivate(linphoneAddress);

2
src/components/contact/VcardModel.cpp
View file

@ -96,7 +96,7 @@ static void removeBelcardPhoto (const shared_ptr<belcard::BelCard> &belcard, boo
static string interpretSipAddress (const QString &sipAddress) {
string out;
shared_ptr<linphone::Address> linphoneAddress = CoreManager::getInstance()->getCore()->interpretUrl(
shared_ptr<linphone::Address> linphoneAddress = CoreManager::getInstance()->getCore()->interpretSipAddress(
::Utils::appStringToCoreString(sipAddress)
);

8
src/components/sip-addresses/SipAddressesModel.cpp
View file

@ -163,15 +163,17 @@ QString SipAddressesModel::addTransportToSipAddress (const QString &sipAddress,
// -----------------------------------------------------------------------------
QString SipAddressesModel::interpretUrl (const QString &sipAddress) {
QString SipAddressesModel::interpretSipAddress (const QString &sipAddress) {
shared_ptr<linphone::Address> lAddress = CoreManager::getInstance()->getCore()->interpretUrl(
::Utils::appStringToCoreString(sipAddress)
);
return lAddress ? ::Utils::coreStringToAppString(lAddress->asStringUriOnly()) : QString("");
if (lAddress && !lAddress->getUsername().empty())
return ::Utils::coreStringToAppString(lAddress->asStringUriOnly());
return QString("");
}
QString SipAddressesModel::interpretUrl (const QUrl &sipAddress) {
QString SipAddressesModel::interpretSipAddress (const QUrl &sipAddress) {
return sipAddress.toString();
}

4
src/components/sip-addresses/SipAddressesModel.hpp
View file

@ -56,8 +56,8 @@ public:
Q_INVOKABLE QString getTransportFromSipAddress (const QString &sipAddress) const;
Q_INVOKABLE QString addTransportToSipAddress (const QString &sipAddress, const QString &transport) const;
Q_INVOKABLE static QString interpretUrl (const QString &sipAddress);
Q_INVOKABLE static QString interpretUrl (const QUrl &sipAddress);
Q_INVOKABLE static QString interpretSipAddress (const QString &sipAddress);
Q_INVOKABLE static QString interpretSipAddress (const QUrl &sipAddress);
Q_INVOKABLE static bool addressIsValid (const QString &address);
Q_INVOKABLE static bool sipAddressIsValid (const QString &sipAddress);

2
src/components/url-handlers/UrlHandlers.cpp
View file

@ -33,5 +33,5 @@ UrlHandlers::UrlHandlers (QObject *parent) : QObject(parent) {
}
void UrlHandlers::handleSip (const QUrl &url) {
emit sip(SipAddressesModel::interpretUrl(url));
emit sip(SipAddressesModel::interpretSipAddress(url));
}

2
ui/modules/Linphone/View/SipAddressesView.qml
View file

@ -25,7 +25,7 @@ ScrollableListView {
property string headerButtonIcon
property var headerButtonAction
readonly property string interpretableSipAddress: SipAddressesModel.interpretUrl(
readonly property string interpretableSipAddress: SipAddressesModel.interpretSipAddress(
genSipAddress
)