Skip to content
Snippets Groups Projects
Commit 7cf6d47a authored by Emmanuel Lepage Vallee's avatar Emmanuel Lepage Vallee
Browse files

call: Add various state related features 

This will help LibRingClient move to become centered around
communications rather than calls

 * New "NEW" call state (calls with no ContactMethods)
 * New "ABORTED" call state (cancelled before being sent to the daemon)
 * New "CREATION" LifeCycle state
 * Fix state change signals propagation to CallModel
 * Fix Invalid logic in UserActionModel
 * Fix nullptr dereference when checking hasVideo() early

Refs #67238 #69340 #69792
parent ecae6ced
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
config.ini
+ 1
− 1
View file @ 7cf6d47a
......@@ -9,7 +9,7 @@ name = libringclient
submodule = network
folder = libringclient
kde_release = no
version = 0.1.0
version = 0.2.0
docs = yes
translations = yes
gitModule = yes
......
src/call.cpp
+ 107
− 40
View file @ 7cf6d47a
This diff is collapsed.
src/call.h
+ 24
− 18
View file @ 7cf6d47a
......@@ -124,20 +124,22 @@ public:
///Possible call states
enum class State : unsigned int{
INCOMING = 0, /*!< Ringing incoming call */
RINGING = 1, /*!< Ringing outgoing call */
CURRENT = 2, /*!< Call to which the user can speak and hear */
DIALING = 3, /*!< Call which numbers are being added by the user */
HOLD = 4, /*!< Call is on hold */
FAILURE = 5, /*!< Call has failed */
BUSY = 6, /*!< Call is busy */
TRANSFERRED = 7, /*!< Call is being transferred. During this state, the user can enter the new number. */
TRANSF_HOLD = 8, /*!< Call is on hold for transfer */
OVER = 9, /*!< Call is over and should not be used */
ERROR = 10,/*!< This state should never be reached */
CONFERENCE = 11,/*!< This call is the current conference */
CONFERENCE_HOLD = 12,/*!< This call is a conference on hold */
INITIALIZATION = 13,/*!< The call have been placed, but the peer hasn't confirmed yet */
NEW = 0, /*!< The call has been created, but no dialing number been set */
INCOMING = 1, /*!< Ringing incoming call */
RINGING = 2, /*!< Ringing outgoing call */
CURRENT = 3, /*!< Call to which the user can speak and hear */
DIALING = 4, /*!< Call which numbers are being added by the user */
HOLD = 5, /*!< Call is on hold */
FAILURE = 6, /*!< Call has failed */
BUSY = 7, /*!< Call is busy */
TRANSFERRED = 8, /*!< Call is being transferred. During this state, the user can enter the new number. */
TRANSF_HOLD = 9, /*!< Call is on hold for transfer */
OVER = 10,/*!< Call is over and should not be used */
ERROR = 11,/*!< This state should never be reached */
CONFERENCE = 12,/*!< This call is the current conference */
CONFERENCE_HOLD = 13,/*!< This call is a conference on hold */
INITIALIZATION = 14,/*!< The call have been placed, but the peer hasn't confirmed yet */
ABORTED = 15,/*!< The call was dropped before being sent to the daemon */
COUNT__,
};
Q_ENUMS(State)
......@@ -176,11 +178,13 @@ public:
* as BUSY OR FAILURE while also finished
*/
enum class LifeCycleState {
INITIALIZATION = 0, /*!< Anything before the media transfer start */
PROGRESS = 1, /*!< The peers are in communication (or hold) */
FINISHED = 2, /*!< Everything is over, there is no going back */
CREATION = 0, /*!< Anything before creating the daemon call */
INITIALIZATION = 1, /*!< Anything before the media transfer start */
PROGRESS = 2, /*!< The peers are in communication (or hold) */
FINISHED = 3, /*!< Everything is over, there is no going back */
COUNT__
};
Q_ENUMS(LifeCycleState)
///TODO should be deprecated when a better factory system is implemented
class HistoryMapFields {
......@@ -326,7 +330,9 @@ Q_SIGNALS:
///Notify that a DTMF have been played
void dtmfPlayed(const QString& str);
///Notify of state change
void stateChanged();
void stateChanged(Call::State newState, Call::State previousState);
///Notify that the lifeCycleStateChanged
void lifeCycleStateChanged(Call::LifeCycleState newState, Call::LifeCycleState previousState);
///The call start timestamp changed, this usually indicate the call has started
void startTimeStampChanged(time_t newTimeStamp);
///The dial number has changed
......
src/callmodel.cpp
+ 17
− 26
View file @ 7cf6d47a
......@@ -103,12 +103,9 @@ public:
void slotAddPrivateCall ( Call* call );
void slotNewRecordingAvail ( const QString& callId , const QString& filePath);
void slotCallChanged ( Call* call );
void slotStateChanged ( Call::State newState, Call::State previousState );
void slotDTMFPlayed ( const QString& str );
void slotRecordStateChanged ( const QString& callId , bool state );
#ifdef ENABLE_VIDEO
void slotStartedDecoding ( const QString& callId , const QString& shmKey );
void slotStoppedDecoding ( const QString& callId , const QString& shmKey );
#endif
};
......@@ -163,10 +160,6 @@ void CallModelPrivate::init()
/**/connect(&callManager, SIGNAL(conferenceRemoved(QString)) , this , SLOT(slotConferenceRemoved(QString)) );
/**/connect(&callManager, SIGNAL(recordPlaybackFilepath(QString,QString)) , this , SLOT(slotNewRecordingAvail(QString,QString)) );
/**/connect(&callManager, SIGNAL(recordingStateChanged(QString,bool)) , this, SLOT(slotRecordStateChanged(QString,bool)));
#ifdef ENABLE_VIDEO
/**/connect(&interface , SIGNAL(startedDecoding(QString,QString,int,int,bool)), this , SLOT(slotStartedDecoding(QString,QString)) );
/**/connect(&interface , SIGNAL(stoppedDecoding(QString,QString,bool)) , this , SLOT(slotStoppedDecoding(QString,QString)) );
#endif
/* */
connect(CategorizedHistoryModel::instance(),SIGNAL(newHistoryCall(Call*)),this,SLOT(slotAddPrivateCall(Call*)));
......@@ -415,6 +408,7 @@ Call* CallModelPrivate::addCall2(Call* call, Call* parentCall)
const QModelIndex idx = q_ptr->index(m_lInternalModel.size()-1,0,QModelIndex());
emit q_ptr->dataChanged(idx, idx);
connect(call,SIGNAL(changed(Call*)),this,SLOT(slotCallChanged(Call*)));
connect(call,&Call::stateChanged,this,&CallModelPrivate::slotStateChanged);
connect(call,SIGNAL(dtmfPlayed(QString)),this,SLOT(slotDTMFPlayed(QString)));
connect(call,&Call::videoStarted,[this,call](Video::Renderer* r){
emit q_ptr->rendererAdded(call, r);
......@@ -430,7 +424,7 @@ Call* CallModel::dialingCall(const QString& peerName, Account* account)
//Having multiple dialing calls could be supported, but for now we decided not to
//handle this corner case as it will create issues of its own
foreach (Call* call, getActiveCalls()) {
if (call->state() == Call::State::DIALING)
if (call->lifeCycleState() == Call::LifeCycleState::CREATION)
return call;
}
......@@ -798,7 +792,7 @@ Qt::ItemFlags CallModel::flags( const QModelIndex& idx ) const
return Qt::ItemIsEnabled|Qt::ItemIsSelectable
| Qt::ItemIsDragEnabled
| ((c->type() != Call::Type::CONFERENCE)?(Qt::ItemIsDropEnabled):Qt::ItemIsEnabled)
| ((c->state() == Call::State::DIALING)?Qt::ItemIsEditable:Qt::NoItemFlags);
| ((c->lifeCycleState() == Call::LifeCycleState::CREATION)?Qt::ItemIsEditable:Qt::NoItemFlags);
}
return Qt::NoItemFlags;
}
......@@ -894,6 +888,9 @@ bool CallModelPrivate::isPartOf(const QModelIndex& confIdx, Call* call)
///Try to isolate the MIME id from the dringId() to eventually use something else
QByteArray CallModel::getMime(const Call* call) const
{
if ((!call) || (!call->hasRemote()))
return {};
return call->dringId().toLatin1();
}
......@@ -1014,11 +1011,12 @@ bool CallModel::dropMimeData(const QMimeData* mimedata, Qt::DropAction action, i
///When a call state change
void CallModelPrivate::slotCallStateChanged(const QString& callID, const QString& stateName, int code)
{
//This code is part of the CallModel interface too
qDebug() << "Call State Changed for call " << callID << " . New state : " << stateName;
InternalStruct* internal = m_shDringId[callID];
Call* call = nullptr;
Call::State previousState = Call::State::RINGING;
if(!internal) {
qDebug() << "Call not found" << callID << "new state" << stateName;
if(stateName == CallPrivate::StateChange::RINGING) {
......@@ -1031,7 +1029,7 @@ void CallModelPrivate::slotCallStateChanged(const QString& callID, const QString
}
else {
call = internal->call_real;
previousState = call->state();
qDebug() << "Call found" << call << call->state();
const Call::LifeCycleState oldLifeCycleState = call->lifeCycleState();
const Call::State oldState = call->state();
......@@ -1054,8 +1052,6 @@ void CallModelPrivate::slotCallStateChanged(const QString& callID, const QString
}
}
emit q_ptr->callStateChanged(call,previousState);
} //slotCallStateChanged
///When a new call is incoming
......@@ -1190,21 +1186,14 @@ void CallModelPrivate::slotNewRecordingAvail( const QString& callId, const QStri
q_ptr->getCall(callId)->setRecordingPath(filePath);
}
#ifdef ENABLE_VIDEO
///Updating call state when video is added
void CallModelPrivate::slotStartedDecoding(const QString& callId, const QString& shmKey)
void CallModelPrivate::slotStateChanged(Call::State newState, Call::State previousState)
{
Q_UNUSED(callId)
Q_UNUSED(shmKey)
}
Q_UNUSED(newState)
///Updating call state when video is removed
void CallModelPrivate::slotStoppedDecoding(const QString& callId, const QString& shmKey)
{
Q_UNUSED(callId)
Q_UNUSED(shmKey)
Call* call = qobject_cast<Call*>(sender());
if (call)
emit q_ptr->callStateChanged(call, previousState);
}
#endif
///Update model if the data change
void CallModelPrivate::slotCallChanged(Call* call)
......@@ -1221,6 +1210,7 @@ void CallModelPrivate::slotCallChanged(Call* call)
removeCall(call);
break;
//Over can be caused by local events
case Call::State::ABORTED:
case Call::State::OVER:
removeCall(call);
break;
......@@ -1230,6 +1220,7 @@ void CallModelPrivate::slotCallChanged(Call* call)
case Call::State::INITIALIZATION:
case Call::State::CURRENT:
case Call::State::DIALING:
case Call::State::NEW:
case Call::State::HOLD:
case Call::State::FAILURE:
case Call::State::BUSY:
......
src/numbercompletionmodel.cpp
+ 1
− 1
View file @ 7cf6d47a
......@@ -212,7 +212,7 @@ void NumberCompletionModel::setCall(Call* call)
void NumberCompletionModel::setPrefix(const QString& str)
{
d_ptr->m_Prefix = str;
const bool e = ((d_ptr->m_pCall && d_ptr->m_pCall->state() == Call::State::DIALING) || (!d_ptr->m_pCall)) && (!str.isEmpty());
const bool e = ((d_ptr->m_pCall && d_ptr->m_pCall->lifeCycleState() == Call::LifeCycleState::CREATION) || (!d_ptr->m_pCall)) && (!str.isEmpty());
if (d_ptr->m_Enabled != e) {
d_ptr->m_Enabled = e;
emit enabled(e);
......
src/private/call_p.h
+ 1
− 0
View file @ 7cf6d47a
......@@ -214,6 +214,7 @@ public:
void startWeird ();
void warning ();
void remove ();
void abort ();
//Helpers
void changeCurrentState(Call::State newState);
......
src/private/videorenderermanager.cpp
+ 1
− 1
View file @ 7cf6d47a
......@@ -110,7 +110,7 @@ int VideoRendererManager::size() const
///Return the call Renderer or nullptr
Video::Renderer* VideoRendererManager::getRenderer(const Call* call) const
{
if (!call) return nullptr;
if ((!call) || (!call->hasRemote())) return nullptr;
return d_ptr->m_hRenderers[call->dringId().toLatin1()];
}
......
src/useractionmodel.cpp
+ 15
− 14
View file @ 7cf6d47a
......@@ -104,18 +104,18 @@ public Q_SLOTS:
//Enabled actions
const TypedStateMachine< TypedStateMachine< bool , Call::State > , UserActionModel::Action > UserActionModelPrivate::availableActionMap = {{
/* INCOMING RINGING CURRENT DIALING HOLD FAILURE BUSY TRANSFERRED TRANSF_HOLD OVER ERROR CONFERENCE CONFERENCE_HOLD INITIALIZATION*/
/*ACCEPT */ {{ true , false, false, true , false, false, false, false, false, false, false, false, false, false}},
/*HOLD */ {{ false , false, true , false, true , false, false, false, false, false, false, true , false, false}},
/*MUTE_AUDIO */ {{ false , true , true , false, false, false, false, false, false, false, false, false, false, false}},
/*MUTE_VIDEO */ {{ false , true , true , false, false, false, false, false, false, false, false, false, false, false}},
/*SERVER_TRANSFER */ {{ false , false, true , false, true , false, false, false, false, false, false, false, false, false}},
/*RECORD */ {{ false , true , true , false, true , false, false, true , true , false, false, true , true , false}},
/*HANGUP */ {{ true , true , true , true , true , true , true , true , true , false, true , true , true , true }},
/*JOIN */ {{ false , true , true , false, true , false, false, true , true , false, false, true , true , false}},
/*ADD_NEW */ {{ false , false, false, false, false, false, false, false, false, false, false, false, false, false}},
/* NEW INCOMING RINGING CURRENT DIALING HOLD FAILURE BUSY TRANSFERRED TRANSF_HOLD OVER ERROR CONFERENCE CONFERENCE_HOLD INITIALIZATION ABORTED*/
/*ACCEPT */ {{ false , true , false, false, true , false, false, false, false, false, false, false, false, false, false, false}},
/*HOLD */ {{ false , false , false, true , false, true , false, false, false, false, false, false, true , false, false, false}},
/*MUTE_AUDIO */ {{ false , false , true , true , false, false, false, false, false, false, false, false, false, false, false, false}},
/*MUTE_VIDEO */ {{ false , false , true , true , false, false, false, false, false, false, false, false, false, false, false, false}},
/*SERVER_TRANSFER */ {{ false , false , false, true , false, true , false, false, false, false, false, false, false, false, false, false}},
/*RECORD */ {{ false , false , true , true , false, true , false, false, true , true , false, false, true , true , false, false}},
/*HANGUP */ {{ true , true , true , true , true , true , true , true , true , true , false, true , true , true , true , false}},
/*JOIN */ {{ false , false , true , true , false, true , false, false, true , true , false, false, true , true , false, false}},
/*ADD_NEW */ {{ false , false , false, false, false, false, false, false, false, false, false, false, false, false, false, false}},
}};
/**
......@@ -228,7 +228,7 @@ m_pCall(nullptr), m_pActiveModel(nullptr)
/* JOIN */ QObject::tr("Join" ),
/* JOIN */ QObject::tr("Add new" ),
/* ADD_NEW */ QObject::tr("Add new" ),
}};
}
......@@ -282,7 +282,7 @@ QHash<int,QByteArray> UserActionModel::roleNames() const
QVariant UserActionModel::data(const QModelIndex& idx, int role ) const
{
if (!idx.isValid() && (idx.row()>=0 && idx.row() < enum_class_size<UserActionModel::Action>()))
if ((!idx.isValid()) || !(idx.row()>=0 && idx.row() < enum_class_size<UserActionModel::Action>()))
return QVariant();
UserActionModel::Action action = static_cast<UserActionModel::Action>(idx.row());
......@@ -409,6 +409,7 @@ void UserActionModelPrivate::updateCheckMask(int& ret, UserActionModel::Action a
case UserActionModel::Action::HANGUP :
switch(c->state()) {
case Call::State::DIALING :
case Call::State::NEW :
m_ActionNames[UserActionModel::Action::HANGUP] = QObject::tr("Cancel");
break;
case Call::State::FAILURE :
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment