data/linux.x86.linphone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adds voicemailAddress support

Browse source
This commit is contained in:
Christophe Deschamps 2024-11-05 05:23:43 +01:00
parent ad0b557cb3
commit 387bf67e8f
7 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Linphone/core/account/AccountCore.cpp
View file

@ -95,6 +95,8 @@ AccountCore::AccountCore(const std::shared_ptr<linphone::Account> &account) : QO
mDialPlan = mAccountModel->dialPlanAsString(dialPlan);
}
}
mVoicemailAddress =
params->getVoicemailAddress() ? Utils::coreStringToAppString(params->getVoicemailAddress()->asString()) : "";
INIT_CORE_MEMBER(VoicemailCount, mAccountModel)
INIT_CORE_MEMBER(ShowMwi, mAccountModel)
@ -270,6 +272,8 @@ void AccountCore::setSelf(QSharedPointer<AccountCore> me) {
DEFINE_CORE_GET_CONNECT(mAccountModelConnection, AccountCore, AccountModel, mAccountModel, int, voicemailCount,
VoicemailCount)
DEFINE_CORE_GET_CONNECT(mAccountModelConnection, AccountCore, AccountModel, mAccountModel, int, showMwi, ShowMwi)
DEFINE_CORE_GETSET_CONNECT(mAccountModelConnection, AccountCore, AccountModel, mAccountModel, QString,
voicemailAddress, VoicemailAddress)
}
const std::shared_ptr<AccountModel> &AccountCore::getModel() const {

1
Linphone/core/account/AccountCore.hpp
View file

@ -73,6 +73,7 @@ class AccountCore : public QObject, public AbstractObject {
Q_PROPERTY(QString limeServerUrl READ getLimeServerUrl WRITE lSetLimeServerUrl NOTIFY limeServerUrlChanged)
DECLARE_CORE_GET(int, voicemailCount, VoicemailCount)
DECLARE_CORE_GET(bool, showMwi, ShowMwi)
DECLARE_CORE_GETSET_MEMBER(QString, voicemailAddress, VoicemailAddress)
public:
static QSharedPointer<AccountCore> create(const std::shared_ptr<linphone::Account> &account);

11
Linphone/model/account/AccountModel.cpp
View file

@ -319,6 +319,17 @@ bool AccountModel::getShowMwi() {
else return false;
}
void AccountModel::setVoicemailAddress(QString value) {
mustBeInLinphoneThread(log().arg(Q_FUNC_INFO));
auto params = mMonitor->getParams()->clone();
auto address = linphone::Factory::get()->createAddress(Utils::appStringToCoreString(value));
if (address) {
params->setVoicemailAddress(address);
mMonitor->setParams(params);
emit voicemailAddressChanged(value);
} else qWarning() << "Unable to set VoicemailAddress, failed creating address from" << value;
}
// UserData (see hpp for explanations)
static QMap<const std::shared_ptr<linphone::Account>, std::shared_ptr<AccountUserData>> userDataMap;

2
Linphone/model/account/AccountModel.hpp
View file

@ -68,6 +68,7 @@ public:
QString dialPlanAsString(const std::shared_ptr<linphone::DialPlan> &dialPlan);
int getVoicemailCount();
bool getShowMwi();
void setVoicemailAddress(QString value);
signals:
void registrationStateChanged(const std::shared_ptr<linphone::Account> &account,
@ -96,6 +97,7 @@ signals:
void removed();
void voicemailCountChanged(int count);
void showMwiChanged(bool show);
void voicemailAddressChanged(QString value);
private:
/**Linphone **/

6
Linphone/view/Control/Display/Contact/Contact.qml
View file

@ -151,10 +151,10 @@ Control.Control{
visible: mainItem.account.core.showMwi
voicemailCount: mainItem.account.core.voicemailCount >= 100 ? '99+' : mainItem.account.core.voicemailCount
onClicked: {
if (mainItem.account.core.mwiServerAddress.length > 0)
UtilsCpp.createCall(mainItem.account.core.mwiServerAddress)
if (mainItem.account.core.voicemailAddress.length > 0)
UtilsCpp.createCall(mainItem.account.core.voicemailAddress)
else
UtilsCpp.showInformationPopup(qsTr("Erreur"), qsTr("L'adresse de la messagerie vocale n'est pas définie."), false)
UtilsCpp.showInformationPopup(qsTr("Erreur"), qsTr("L'URI de messagerie vocale n'est pas définie."), false)
}
}
Item{Layout.fillWidth: true}

6
Linphone/view/Page/Layout/Main/MainLayout.qml
View file

@ -425,10 +425,10 @@ Item {
if (accountProxy.count > 1) {
avatarButton.popup.open()
} else {
if (accountProxy.defaultAccount.core.mwiServerAddress.length > 0)
UtilsCpp.createCall(accountProxy.defaultAccount.core.mwiServerAddress)
if (accountProxy.defaultAccount.core.voicemailAddress.length > 0)
UtilsCpp.createCall(accountProxy.defaultAccount.core.voicemailAddress)
else
UtilsCpp.showInformationPopup(qsTr("Erreur"), qsTr("L'adresse de la messagerie vocale n'est pas définie."), false)
UtilsCpp.showInformationPopup(qsTr("Erreur"), qsTr("L'URI de messagerie vocale n'est pas définie."), false)
}
}
}

7
Linphone/view/Page/Layout/Settings/AccountSettingsParametersLayout.qml
View file

@ -53,6 +53,13 @@ AbstractSettingsLayout {
isValid: function(text) { return UtilsCpp.isValidSIPAddress(text); }
toValidate: true
}
DecoratedTextField {
propertyName: "voicemailAddress"
propertyOwner: account.core
title: qsTr("URI de messagerie vocale")
isValid: function(text) { return UtilsCpp.isValidSIPAddress(text); }
toValidate: true
}
Item {
Layout.fillHeight: true
Layout.fillWidth: true