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

Synchronize ICS on deletion.

Browse source
This commit is contained in:
Julien Wadel 2022-09-27 15:00:49 +02:00
parent a93200e00b
commit 2d923ac663
4 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
linphone-app/src/components/conferenceInfo/ConferenceInfoListModel.cpp
View file

@ -61,9 +61,11 @@ QSharedPointer<ConferenceInfoModel> ConferenceInfoListModel::build(const std::sh
haveMe = (std::find_if(participants.begin(), participants.end(), [me](const std::shared_ptr<linphone::Address>& address){
return me->weakEqual(address);
}) != participants.end());
if(haveMe)
return ConferenceInfoModel::create( conferenceInfo );
else
if(haveMe){
auto conferenceModel = ConferenceInfoModel::create( conferenceInfo );
connect(conferenceModel.get(), &ConferenceInfoModel::removed, this, &ConferenceInfoListModel::onRemoved);
return conferenceModel;
}else
return nullptr;
}
@ -115,5 +117,9 @@ void ConferenceInfoListModel::onConferenceInfoReceived(const std::shared_ptr<con
}else
qWarning() << "No ConferenceInfo have beend found for " << conferenceInfo->getUri()->asString().c_str();
}
void ConferenceInfoListModel::onRemoved(bool byUser){
remove(sender());
}

3
linphone-app/src/components/conferenceInfo/ConferenceInfoListModel.hpp
View file

@ -46,7 +46,8 @@ public:
QSharedPointer<ConferenceInfoModel> get(std::shared_ptr<linphone::ConferenceInfo> conferenceInfo) const;
void onConferenceInfoReceived(const std::shared_ptr<const linphone::ConferenceInfo> & conferenceInfo);
public slots:
void onRemoved(bool byUser);
signals:
void filterTypeChanged(int filterType);

6
linphone-app/src/components/conferenceInfo/ConferenceInfoModel.cpp
View file

@ -158,15 +158,15 @@ QDateTime ConferenceInfoModel::getEndDateTime() const{
}
QString ConferenceInfoModel::getOrganizer() const{
return QString::fromStdString(mConferenceInfo->getOrganizer()->asString());
return Utils::coreStringToAppString(mConferenceInfo->getOrganizer()->asString());
}
QString ConferenceInfoModel::getSubject() const{
return QString::fromStdString(mConferenceInfo->getSubject());
return Utils::coreStringToAppString(mConferenceInfo->getSubject());
}
QString ConferenceInfoModel::getDescription() const{
return QString::fromStdString(mConferenceInfo->getDescription());
return Utils::coreStringToAppString(mConferenceInfo->getDescription());
}
QString ConferenceInfoModel::displayNamesToString()const{

2
linphone-app/ui/modules/Linphone/Chat/ChatCalendarMessage.qml
View file

@ -32,7 +32,7 @@ Loader{
property int gotoButtonMode: -1 //-1: hide, 0:goto, 1:MoreInfo
property bool isExpanded : false
property bool isCancelled: conferenceInfoModel.state == LinphoneEnums.ConferenceInfoStateCancelled
property bool isCancelled: conferenceInfoModel && conferenceInfoModel.state == LinphoneEnums.ConferenceInfoStateCancelled
signal expandToggle()
signal conferenceUriCopied()