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

- Remove conference from timelines as they have no chat rooms yet. Keep logs in history.

Browse source 
- Update SDK.
- Add an API to merge all call into a conference.
This commit is contained in:
Julien Wadel 2022-07-26 16:56:44 +02:00
parent 0a183ac3df
commit ea087ea3dd
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -165,7 +165,7 @@ ContactModel *CallModel::getContactModel() const{
} }
ChatRoomModel * CallModel::getChatRoomModel() const{ ChatRoomModel * CallModel::getChatRoomModel() const{
if(mCall && mCall->getCallLog()->getCallId() != "") { if(mCall && mCall->getCallLog()->getCallId() != "" && !mCall->getConference()) {// Conference has no chat room yet.
auto currentParams = mCall->getCurrentParams(); auto currentParams = mCall->getCurrentParams();
bool isEncrypted = currentParams->getMediaEncryption() != linphone::MediaEncryption::None; bool isEncrypted = currentParams->getMediaEncryption() != linphone::MediaEncryption::None;
SettingsModel * settingsModel = CoreManager::getInstance()->getSettingsModel(); SettingsModel * settingsModel = CoreManager::getInstance()->getSettingsModel();
@ -221,7 +221,7 @@ QSharedPointer<ConferenceModel> CallModel::getConferenceSharedModel(){
bool CallModel::isConference () const{ bool CallModel::isConference () const{
// Check status to avoid crash when requesting a conference on an ended call. // Check status to avoid crash when requesting a conference on an ended call.
return getStatus() != CallStatusEnded && mCall->getConference() != nullptr; return Utils::coreStringToAppString(mCall->getRemoteAddress()->asString()).toLower().contains("conf-id") || (getStatus() != CallStatusEnded && mCall->getConference() != nullptr);
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------

4
linphone-app/src/components/calls/CallsListModel.cpp
View file

@ -371,7 +371,9 @@ void CallsListModel::prepareConferenceCall(ConferenceInfoModel * model){
app->smartShowWindow(app->getCallsWindow()); app->smartShowWindow(app->getCallsWindow());
emit callConferenceAsked(model); emit callConferenceAsked(model);
} }
int CallsListModel::addAllToConference(){
return CoreManager::getInstance()->getCore()->addAllToConference();
}
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
int CallsListModel::getRunningCallsNumber () const { int CallsListModel::getRunningCallsNumber () const {

2
linphone-app/src/components/calls/CallsListModel.hpp
View file

@ -56,6 +56,8 @@ public:
Q_INVOKABLE QVariantMap createChatRoom(const QString& subject, const int& securityLevel, const QVariantList& participants, const bool& selectAfterCreation) const; Q_INVOKABLE QVariantMap createChatRoom(const QString& subject, const int& securityLevel, const QVariantList& participants, const bool& selectAfterCreation) const;
Q_INVOKABLE void prepareConferenceCall(ConferenceInfoModel * model); Q_INVOKABLE void prepareConferenceCall(ConferenceInfoModel * model);
Q_INVOKABLE int addAllToConference();
Q_INVOKABLE int getRunningCallsNumber () const; Q_INVOKABLE int getRunningCallsNumber () const;

2
linphone-sdk

@ -1 +1 @@
Subproject commit b1d3f2d6db0879ddbe5e475b135256d2d477cab0 Subproject commit fe54d5571dd50e17b0de0bfe56a634990a3e6ff7