lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-09-01 12:43:30 +02:00
Code Activity

calls: fix returning to main view from setting while in a call

Browse source 
This fixes the call stack view not being reset when exiting the
settings.

Gitlab: #417
Change-Id: I1af534a1a164a28e1d29b9a4064cc0c78496557c
This commit is contained in:
Andreas Traczyk 2021-05-18 13:15:25 -04:00
parent c8008c5414
commit 1b56c4aa0f
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/calladapter.cpp
View file

@ -232,6 +232,9 @@ CallAdapter::onShowIncomingCallView(const QString& accountId, const QString& con
if (call.isOutgoing) {
if (isCallSelected) {
// don't reselect
// TODO: this signal can be renamed to conversationReselected,
// isCallSelected and any other similar logic can be removed
// and calling selectConversation should be sufficient
Q_EMIT lrcInstance_->conversationUpdated(convInfo.uid, accountId);
}
} else {

5
src/lrcinstance.cpp
View file

@ -434,6 +434,11 @@ LRCInstance::poplastConference(const QString& confId)
void
LRCInstance::selectConversation(const QString& convId, const QString& accountId)
{
// reselection can be used to update the conversation
if (convId == selectedConvUid_ && accountId == currentAccountId_) {
Q_EMIT conversationUpdated(convId, accountId);
return;
}
// if the account is not currently selected, do that first, then
// proceed to select the conversation
if (!accountId.isEmpty() && accountId != getCurrentAccountId()) {

2
src/mainview/MainView.qml
View file

@ -138,7 +138,7 @@ Rectangle {
if (checkCurrentCall && currentAccountIsCalling()) {
var callConv = UtilsAdapter.getCallConvForAccount(
LRCInstance.currentAccountId)
LRCInstance.selectConversation(callConv)
LRCInstance.selectConversation(callConv, currentAccountId)
CallAdapter.updateCall(callConv, currentAccountId)
} else {
showWelcomeView()