lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-03 22:35:45 +02:00
Code Activity

misc: fix call hold

Browse source 
GitLab: https://git.jami.net/savoirfairelinux/jami-daemon/-/issues/769

Change-Id: I209215e0f81fe0e810a5cf243f122db9bb7065b6
This commit is contained in:
Aline Gondim Santos 2022-09-29 18:49:37 -03:00
parent 7fb102ed45
commit 3250c0298b
6 changed files with 46 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/app/lrcinstance.cpp
View file

@ -111,9 +111,9 @@ LRCInstance::isConnected()
}
VectorString
LRCInstance::getActiveCalls()
LRCInstance::getActiveCalls(const QString& accountId)
{
return lrc_->activeCalls();
return lrc_->activeCalls(accountId);
}
int

2
src/app/lrcinstance.h
View file

@ -83,7 +83,7 @@ public:
void subscribeToDebugReceived();
bool isConnected();
void connectivityChanged();
VectorString getActiveCalls();
VectorString getActiveCalls(const QString& accountId = "");
int notificationsCount() const;
const account::Info& getAccountInfo(const QString& accountId);

4
src/app/utilsadapter.cpp
View file

@ -194,7 +194,7 @@ UtilsAdapter::getAccountListSize()
bool
UtilsAdapter::hasCall(const QString& accountId)
{
auto activeCalls = lrcInstance_->getActiveCalls();
auto activeCalls = lrcInstance_->getActiveCalls(accountId);
for (const auto& callId : activeCalls) {
auto& accountInfo = lrcInstance_->accountModel().getAccountInfo(accountId);
if (accountInfo.callModel->hasCall(callId)) {
@ -208,7 +208,7 @@ const QString
UtilsAdapter::getCallConvForAccount(const QString& accountId)
{
// TODO: Currently returning first call, establish priority according to state?
for (const auto& callId : lrcInstance_->getActiveCalls()) {
for (const auto& callId : lrcInstance_->getActiveCalls(accountId)) {
auto& accountInfo = lrcInstance_->accountModel().getAccountInfo(accountId);
if (accountInfo.callModel->hasCall(callId)) {
return lrcInstance_->getConversationFromCallId(callId, accountId).uid;

2
src/libclient/api/lrc.h
View file

@ -92,7 +92,7 @@ public:
/**
* Helper: get active call list from daemon
*/
static VectorString activeCalls();
static VectorString activeCalls(const QString& accountId = "");
/**
* Close all active calls and conferences

65
src/libclient/callmodel.cpp
View file

@ -1060,36 +1060,44 @@ CallModel::setCurrentCall(const QString& callId) const
}
}
VectorString filterCalls;
QStringList conferences = CallManager::instance().getConferenceList(owner.id);
for (const auto& confId : conferences) {
QStringList callList = CallManager::instance().getParticipantList(owner.id, confId);
Q_FOREACH (const auto& cid, callList) {
filterCalls.push_back(cid);
QStringList accountList = pimpl_->lrc.getAccountModel().getAccountList();
// If we are setting a current call in the UI, we want to hold all other calls,
// across accounts, to avoid sending our local media streams while another call
// is in focus.
for (const auto& acc : accountList) {
VectorString filterCalls;
// For each account, we should not hold calls linked to a conference
QStringList conferences = CallManager::instance().getConferenceList(acc);
for (const auto& confId : conferences) {
QStringList callList = CallManager::instance().getParticipantList(acc, confId);
Q_FOREACH (const auto& cid, callList) {
filterCalls.push_back(cid);
}
}
}
for (const auto& cid : Lrc::activeCalls()) {
auto filtered = std::find(filterCalls.begin(), filterCalls.end(), cid) != filterCalls.end();
if (cid != callId && !filtered) {
// Only hold calls for a non rendez-vous point
MapStringString callDetails = CallManager::instance().getCallDetails(owner.id, callId);
auto accountId = callDetails["ACCOUNTID"];
CallManager::instance().hold(owner.id, cid);
for (const auto& cid : Lrc::activeCalls(acc)) {
auto filtered = std::find(filterCalls.begin(), filterCalls.end(), cid) != filterCalls.end();
if (cid != callId && !filtered) {
// Only hold calls for a non rendez-vous point
CallManager::instance().hold(acc, cid);
}
}
}
if (!lrc::api::Lrc::holdConferences) {
return;
}
for (const auto& confId : conferences) {
if (callId != confId) {
MapStringString confDetails = CallManager::instance().getConferenceDetails(owner.id,
confId);
// Only hold conference if attached
if (confDetails["CALL_STATE"] == "ACTIVE_DETACHED")
continue;
QStringList callList = CallManager::instance().getParticipantList(owner.id, confId);
if (callList.indexOf(callId) == -1)
CallManager::instance().holdConference(owner.id, confId);
if (!lrc::api::Lrc::holdConferences) {
return;
}
// If the account is the host and it is attached to the conference,
// then we should hold it.
for (const auto& confId : conferences) {
if (callId != confId) {
MapStringString confDetails = CallManager::instance().getConferenceDetails(acc, confId);
// Only hold conference if attached
if (confDetails["CALL_STATE"] == "ACTIVE_DETACHED")
continue;
QStringList callList = CallManager::instance().getParticipantList(acc, confId);
if (callList.indexOf(callId) == -1)
CallManager::instance().holdConference(acc, confId);
}
}
}
}
@ -1372,6 +1380,7 @@ CallModelPimpl::slotCallStateChanged(const QString& accountId,
|| previousStatus == call::Status::OUTGOING_RINGING) {
if (previousStatus == call::Status::INCOMING_RINGING
&& linked.owner.profileInfo.type != profile::Type::SIP
&& !linked.owner.confProperties.autoAnswer
&& !linked.owner.confProperties.isRendezVous) { // TODO remove this when we want to
// not show calls in rendez-vous
linked.setCurrentCall(callId);

4
src/libclient/lrc.cpp
View file

@ -148,11 +148,13 @@ Lrc::subscribeToDebugReceived()
}
VectorString
Lrc::activeCalls()
Lrc::activeCalls(const QString& accountId)
{
VectorString result;
const QStringList accountIds = ConfigurationManager::instance().getAccountList();
for (const auto& accId : accountIds) {
if (!accountId.isEmpty() && accountId != accId)
continue;
QStringList callLists = CallManager::instance().getCallList(accId);
for (const auto& call : callLists) {
MapStringString callDetails = CallManager::instance().getCallDetails(accId, call);