Merge lp:~tiagosh/telepathy-ofono/rtm-14.09-fix-hangup-failure into lp:telepathy-ofono/rtm-14.09

[Tiago Salem Herrmann]

Retry when hangup() or answer() fail.

Retry when hangup() or answer() fail.

[lp:~tiagosh/telepathy-ofono/rtm-14.09-fix-hangup-failure]

111. By Tiago Salem Herrmann on 2015-02-17

remove debugs

=== modified file 'ofonocallchannel.cpp'
--- ofonocallchannel.cpp	2015-01-28 14:29:51 +0000
+++ ofonocallchannel.cpp	2015-02-17 00:20:56 +0000
@@ -64,6 +64,8 @@
     mCallChannel->setHangupCallback(Tp::memFun(this,&oFonoCallChannel::onHangup));
     mCallChannel->setAcceptCallback(Tp::memFun(this,&oFonoCallChannel::onAccept));
 
+    QObject::connect(this, SIGNAL(hangupComplete(bool)), this, SLOT(onHangupComplete(bool)));
+    QObject::connect(this, SIGNAL(answerComplete(bool)), this, SLOT(onAnswerComplete(bool)));
     // init must be called after initialization, otherwise we will have no object path registered.
     QTimer::singleShot(0, this, SLOT(init()));
 
@@ -100,6 +102,20 @@
 #endif
 }
 
+void oFonoCallChannel::onHangupComplete(bool status)
+{
+    if (!status) {
+        QTimer::singleShot(2000, this, SLOT(hangup()));
+    }
+}
+
+void oFonoCallChannel::onAnswerComplete(bool status)
+{
+    if (!status) {
+        QTimer::singleShot(1000, this, SLOT(answer()));
+    }
+}
+
 void oFonoCallChannel::onHangup(uint reason, const QString &detailedReason, const QString &message, Tp::DBusError *error)
 {
     // TODO: use the parameters sent by telepathy
@@ -203,6 +219,10 @@
 
 void oFonoCallChannel::onSwapCallsComplete(bool success)
 {
+    if (!success && errorName() == "org.ofono.Error.InProgress") {
+        QTimer::singleShot(2000, mConnection->voiceCallManager(), SLOT(swapCalls()));
+        return;
+    }
     Tp::LocalHoldState holdState = this->state() == "active" ? Tp::LocalHoldStateUnheld : Tp::LocalHoldStateHeld;
     Tp::LocalHoldStateReason reason = success ? Tp::LocalHoldStateReasonRequested : Tp::LocalHoldStateReasonResourceNotAvailable;
     QObject::disconnect(mConnection->voiceCallManager(), SIGNAL(swapCallsComplete(bool)), this, SLOT(onSwapCallsComplete(bool)));
 
=== modified file 'ofonocallchannel.h'
--- ofonocallchannel.h	2015-01-28 14:29:51 +0000
+++ ofonocallchannel.h	2015-02-17 00:20:56 +0000
@@ -64,6 +64,8 @@
     void onSwapCallsComplete(bool success);
     void sendNextDtmf();
     void init();
+    void onAnswerComplete(bool success);
+    void onHangupComplete(bool success);
 
     void onOfonoMuteChanged(bool mute);
     void onMultipartyChanged(bool multiparty);