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

[Tiago Salem Herrmann]

Retry when hangup() or answer() fail.

Retry when hangup() or answer() fail.

--Checklist--
Are there any related MPs required for this MP to build/function as expected? Please list.
No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed UI labels, did you update the pot file?
N/A

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:131
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/154/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/12/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-i386-ci/12

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telepathy-ofono-ci/154/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good and works as expected!

review: Approve

=== modified file 'ofonocallchannel.cpp'
--- ofonocallchannel.cpp	2015-01-23 21:14:32 +0000
+++ ofonocallchannel.cpp	2015-02-17 17:08:35 +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-19 20:36:07 +0000
+++ ofonocallchannel.h	2015-02-17 17:08:35 +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);