Merge pull request #65 from jpoutiai/remoteheld

[voicecall] add support for remote held signal.Fixes MER#907
nemomobile · Apr 21, 2015 · 5531f5d · 5531f5d
2 parents 31e28d4 + 81fef5d
commit 5531f5d
Show file tree

Hide file tree

Showing 11 changed files with 88 additions and 3 deletions.
diff --git a/lib/src/abstractvoicecallhandler.h b/lib/src/abstractvoicecallhandler.h
@@ -43,6 +43,7 @@ class AbstractVoiceCallHandler : public QObject
     Q_PROPERTY(bool isEmergency READ isEmergency NOTIFY emergencyChanged)
     Q_PROPERTY(bool isMultiparty READ isMultiparty NOTIFY multipartyChanged)
     Q_PROPERTY(bool isForwarded READ isForwarded NOTIFY forwardedChanged)
+    Q_PROPERTY(bool isRemoteHeld READ isRemoteHeld NOTIFY remoteHeldChanged)
 
 public:
     enum VoiceCallStatus {
@@ -69,6 +70,7 @@ class AbstractVoiceCallHandler : public QObject
     virtual bool isMultiparty() const = 0;
     virtual bool isEmergency() const = 0;
     virtual bool isForwarded() const = 0;
+    virtual bool isRemoteHeld() const = 0;
 
     virtual VoiceCallStatus status() const = 0;
 
@@ -83,6 +85,7 @@ class AbstractVoiceCallHandler : public QObject
     void emergencyChanged(bool);
     void multipartyChanged(bool);
     void forwardedChanged(bool);
+    void remoteHeldChanged(bool);
 
 public Q_SLOTS:
     virtual void answer() = 0;

diff --git a/lib/src/dbus/voicecallhandlerdbusadapter.cpp b/lib/src/dbus/voicecallhandlerdbusadapter.cpp
@@ -58,6 +58,7 @@ VoiceCallHandlerDBusAdapter::VoiceCallHandlerDBusAdapter(AbstractVoiceCallHandle
     QObject::connect(d->handler, SIGNAL(emergencyChanged(bool)), SIGNAL(emergencyChanged(bool)));
     QObject::connect(d->handler, SIGNAL(multipartyChanged(bool)), SIGNAL(multipartyChanged(bool)));
     QObject::connect(d->handler, SIGNAL(forwardedChanged(bool)), SIGNAL(forwardedChanged(bool)));
+    QObject::connect(d->handler, SIGNAL(remoteHeldChanged(bool)), SIGNAL(remoteHeldChanged(bool)));
 }
 
 VoiceCallHandlerDBusAdapter::~VoiceCallHandlerDBusAdapter()
@@ -148,6 +149,16 @@ bool VoiceCallHandlerDBusAdapter::isForwarded() const
     return d->handler->isForwarded();
 }
 
+/*!
+  Returns this voice calls' remote held flag property.
+*/
+bool VoiceCallHandlerDBusAdapter::isRemoteHeld() const
+{
+    TRACE
+    Q_D(const VoiceCallHandlerDBusAdapter);
+    return d->handler->isRemoteHeld();
+}
+
 /*!
   Returns this voice calls' emergency flag property.
 */
@@ -254,6 +265,7 @@ QVariantMap VoiceCallHandlerDBusAdapter::getProperties()
     props.insert("isEmergency", QVariant(isEmergency()));
     props.insert("isMultiparty", QVariant(isMultiparty()));
     props.insert("isForwarded", QVariant(isForwarded()));
+    props.insert("isRemoteHeld", QVariant(isRemoteHeld()));
 
     return props;
 }

diff --git a/lib/src/dbus/voicecallhandlerdbusadapter.h b/lib/src/dbus/voicecallhandlerdbusadapter.h
@@ -42,6 +42,7 @@ class VoiceCallHandlerDBusAdapter : public QDBusAbstractAdaptor
     Q_PROPERTY(bool isEmergency READ isEmergency NOTIFY emergencyChanged)
     Q_PROPERTY(bool isMultiparty READ isMultiparty NOTIFY multipartyChanged)
     Q_PROPERTY(bool isForwarded READ isForwarded NOTIFY forwardedChanged)
+    Q_PROPERTY(bool isRemoteHeld READ isRemoteHeld NOTIFY remoteHeldChanged)
 
 public:
     explicit VoiceCallHandlerDBusAdapter(AbstractVoiceCallHandler *parent = 0);
@@ -58,6 +59,7 @@ class VoiceCallHandlerDBusAdapter : public QDBusAbstractAdaptor
     bool isMultiparty() const;
     bool isEmergency() const;
     bool isForwarded() const;
+    bool isRemoteHeld() const;
 
 Q_SIGNALS:
     void error(const QString &message);
@@ -68,6 +70,7 @@ class VoiceCallHandlerDBusAdapter : public QDBusAbstractAdaptor
     void emergencyChanged(bool);
     void multipartyChanged(bool);
     void forwardedChanged(bool);
+    void remoteHeldChanged(bool);
 
 public Q_SLOTS:
     bool answer();

diff --git a/plugins/declarative/src/voicecallhandler.cpp b/plugins/declarative/src/voicecallhandler.cpp
@@ -20,7 +20,8 @@ class VoiceCallHandlerPrivate
 public:
     VoiceCallHandlerPrivate(VoiceCallHandler *q, const QString &pHandlerId)
         : q_ptr(q), handlerId(pHandlerId), interface(NULL), connected(false)
-        , duration(0), status(0), emergency(false), multiparty(false), forwarded(false)
+        , duration(0), status(0), emergency(false), multiparty(false)
+        , forwarded(false), remoteHeld(false)
     { /* ... */ }
 
     VoiceCallHandler *q_ptr;
@@ -39,6 +40,7 @@ class VoiceCallHandlerPrivate
     bool emergency;
     bool multiparty;
     bool forwarded;
+    bool remoteHeld;
 };
 
 /*!
@@ -82,6 +84,7 @@ void VoiceCallHandler::initialize(bool notifyError)
         success &= (bool)QObject::connect(d->interface, SIGNAL(emergencyChanged(bool)), SLOT(onEmergencyChanged(bool)));
         success &= (bool)QObject::connect(d->interface, SIGNAL(multipartyChanged(bool)), SLOT(onMultipartyChanged(bool)));
         success &= (bool)QObject::connect(d->interface, SIGNAL(forwardedChanged(bool)), SLOT(onForwardedChanged(bool)));
+        success &= (bool)QObject::connect(d->interface, SIGNAL(remoteHeldChanged(bool)), SLOT(onRemoteHeldChanged(bool)));
     }
 
     if(!(d->connected = success))
@@ -101,6 +104,7 @@ void VoiceCallHandler::initialize(bool notifyError)
             d->multiparty = props["isMultiparty"].toBool();
             d->emergency = props["isEmergency"].toBool();
             d->forwarded = props["isForwarded"].toBool();
+            d->remoteHeld = props["isRemoteHeld"].toBool();
             emit durationChanged();
             emit statusChanged();
             emit lineIdChanged();
@@ -109,6 +113,7 @@ void VoiceCallHandler::initialize(bool notifyError)
             emit emergencyChanged();
             emit forwardedChanged();
             emit isReadyChanged();
+            emit isRemoteHeld();
         } else if (notifyError) {
             emit this->error("Failed to getProperties() from VCM D-Bus service.");
         }
@@ -172,6 +177,14 @@ void VoiceCallHandler::onForwardedChanged(bool forwarded)
     emit forwardedChanged();
 }
 
+void VoiceCallHandler::onRemoteHeldChanged(bool remoteHeld)
+{
+    TRACE
+    Q_D(VoiceCallHandler);
+    d->remoteHeld = remoteHeld;
+    emit remoteHeldChanged();
+}
+
 /*!
   Returns this voice calls' handler id.
  */
@@ -268,6 +281,16 @@ bool VoiceCallHandler::isForwarded() const
     return d->forwarded;
 }
 
+/*!
+  Returns this voice calls' remote held flag property.
+ */
+bool VoiceCallHandler::isRemoteHeld() const
+{
+    TRACE
+    Q_D(const VoiceCallHandler);
+    return d->remoteHeld;
+}
+
 /*!
   Returns this voice calls' emergency flag property.
  */

diff --git a/plugins/declarative/src/voicecallhandler.h b/plugins/declarative/src/voicecallhandler.h
@@ -24,6 +24,7 @@ class VoiceCallHandler : public QObject
     Q_PROPERTY(bool isMultiparty READ isMultiparty NOTIFY multipartyChanged)
     Q_PROPERTY(bool isForwarded READ isForwarded NOTIFY forwardedChanged)
     Q_PROPERTY(bool isReady READ isReady NOTIFY isReadyChanged)
+    Q_PROPERTY(bool isRemoteHeld READ isRemoteHeld NOTIFY remoteHeldChanged)
 
 public:
     enum VoiceCallStatus {
@@ -52,6 +53,7 @@ class VoiceCallHandler : public QObject
     bool isEmergency() const;
     bool isForwarded() const;
     bool isReady() const;
+    bool isRemoteHeld() const;
 
 Q_SIGNALS:
     void error(const QString &error);
@@ -63,6 +65,7 @@ class VoiceCallHandler : public QObject
     void multipartyChanged();
     void forwardedChanged();
     void isReadyChanged();
+    void remoteHeldChanged();
 
 public Q_SLOTS:
     void answer();
@@ -82,6 +85,7 @@ protected Q_SLOTS:
     void onEmergencyChanged(bool emergency);
     void onMultipartyChanged(bool multiparty);
     void onForwardedChanged(bool forwarded);
+    void onRemoteHeldChanged(bool remoteHeld);
 
 private:
     class VoiceCallHandlerPrivate *d_ptr;

diff --git a/plugins/providers/ofono/src/ofonovoicecallhandler.cpp b/plugins/providers/ofono/src/ofonovoicecallhandler.cpp
@@ -149,6 +149,12 @@ bool OfonoVoiceCallHandler::isForwarded() const
     return false;
 }
 
+bool OfonoVoiceCallHandler::isRemoteHeld() const
+{
+    TRACE
+    return false;
+}
+
 AbstractVoiceCallHandler::VoiceCallStatus OfonoVoiceCallHandler::status() const
 {
     TRACE

diff --git a/plugins/providers/ofono/src/ofonovoicecallhandler.h b/plugins/providers/ofono/src/ofonovoicecallhandler.h
@@ -48,6 +48,7 @@ class OfonoVoiceCallHandler : public AbstractVoiceCallHandler
     bool isMultiparty() const;
     bool isEmergency() const;
     bool isForwarded() const;
+    bool isRemoteHeld() const;
 
     VoiceCallStatus status() const;
 

diff --git a/plugins/providers/telepathy/src/callchannelhandler.cpp b/plugins/providers/telepathy/src/callchannelhandler.cpp
@@ -64,7 +64,7 @@ class CallChannelHandlerPrivate
     CallChannelHandlerPrivate(CallChannelHandler *q, const QString &id, Tp::CallChannelPtr c, const QDateTime &s, TelepathyProvider *p)
         : q_ptr(q), handlerId(id), provider(p), startedAt(s), status(AbstractVoiceCallHandler::STATUS_NULL),
           channel(c), fsChannel(NULL), duration(0), durationTimerId(-1), isEmergency(false),
-          isForwarded(false), isIncoming(false)
+          isForwarded(false), isIncoming(false), isRemoteHeld(false)
     { /* ... */ }
 
     CallChannelHandler  *q_ptr;
@@ -86,6 +86,7 @@ class CallChannelHandlerPrivate
     bool isEmergency;
     bool isForwarded;
     bool isIncoming;
+    bool isRemoteHeld;
 };
 
 CallChannelHandler::CallChannelHandler(const QString &id, Tp::CallChannelPtr channel, const QDateTime &userActionTime, TelepathyProvider *provider)
@@ -180,6 +181,14 @@ bool CallChannelHandler::isForwarded() const
     return d->isForwarded;
 }
 
+bool CallChannelHandler::isRemoteHeld() const
+{
+    TRACE
+    Q_D(const CallChannelHandler);
+    if(!d->channel->isReady()) return false;
+    return d->isRemoteHeld;
+}
+
 AbstractVoiceCallHandler::VoiceCallStatus CallChannelHandler::status() const
 {
     TRACE

diff --git a/plugins/providers/telepathy/src/callchannelhandler.h b/plugins/providers/telepathy/src/callchannelhandler.h
@@ -46,6 +46,7 @@ class CallChannelHandler : public AbstractVoiceCallHandler
     bool isMultiparty() const;
     bool isEmergency() const;
     bool isForwarded() const;
+    bool isRemoteHeld() const;
 
     VoiceCallStatus status() const;
 

diff --git a/plugins/providers/telepathy/src/streamchannelhandler.cpp b/plugins/providers/telepathy/src/streamchannelhandler.cpp
@@ -62,7 +62,7 @@ class StreamChannelHandlerPrivate
     StreamChannelHandlerPrivate(StreamChannelHandler *q, const QString &id, Tp::StreamedMediaChannelPtr c, const QDateTime &s, TelepathyProvider *p)
         : q_ptr(q), handlerId(id), provider(p), startedAt(s), status(AbstractVoiceCallHandler::STATUS_NULL),
           channel(c), servicePointInterface(NULL), duration(0), durationTimerId(-1), isEmergency(false),
-          isForwarded(false), isIncoming(false)
+          isForwarded(false), isIncoming(false), isRemoteHeld(false)
     { /* ... */ }
 
     void listenToEmergencyStatus()
@@ -108,6 +108,7 @@ class StreamChannelHandlerPrivate
     bool isEmergency;
     bool isForwarded;
     bool isIncoming;
+    bool isRemoteHeld;
 };
 
 StreamChannelHandler::StreamChannelHandler(const QString &id, Tp::StreamedMediaChannelPtr channel, const QDateTime &userActionTime, TelepathyProvider *provider)
@@ -203,6 +204,14 @@ bool StreamChannelHandler::isForwarded() const
     return d->isForwarded;
 }
 
+bool StreamChannelHandler::isRemoteHeld() const
+{
+    TRACE
+    Q_D(const StreamChannelHandler);
+    if(!d->channel->isReady()) return false;
+    return d->isRemoteHeld;
+}
+
 AbstractVoiceCallHandler::VoiceCallStatus StreamChannelHandler::status() const
 {
     TRACE
@@ -459,6 +468,19 @@ void StreamChannelHandler::onStreamedMediaChannelCallStateChanged(uint, uint sta
     TRACE
     Q_D(StreamChannelHandler);
     bool forwarded = state & Tp::ChannelCallStateForwarded;
+
+    if ((d->status == STATUS_HELD) && !state) {
+        setStatus(STATUS_ACTIVE);
+        d->isRemoteHeld = false;
+        emit remoteHeldChanged(d->isRemoteHeld);
+    }
+
+    if (state & Tp::ChannelCallStateHeld) {
+        setStatus(STATUS_HELD);
+        d->isRemoteHeld = true;
+        emit remoteHeldChanged(d->isRemoteHeld);
+    }
+
     if (forwarded != d->isForwarded) {
         d->isForwarded = forwarded;
         DEBUG_T(QString("Call forwarded: ") + (forwarded ? "true" : "false"));

diff --git a/plugins/providers/telepathy/src/streamchannelhandler.h b/plugins/providers/telepathy/src/streamchannelhandler.h
@@ -45,6 +45,7 @@ class StreamChannelHandler : public AbstractVoiceCallHandler
     bool isMultiparty() const;
     bool isEmergency() const;
     bool isForwarded() const;
+    bool isRemoteHeld() const;
 
     VoiceCallStatus status() const;