Merge lp:~tiagosh/telepathy-ofono/missed-calls into lp:telepathy-ofono

[Tiago Salem Herrmann]

Use DisconnectReason() from ofono to decide if the call was missed

Use DisconnectReason() from ofono to decide if the call was missed

-----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/telepathy-ofono) on device or emulator?
Yes

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

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

[Michael Terry (mterry)]

Tested and works for me!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:76
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/86/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-utopic-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-utopic-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-utopic-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-utopic-i386-ci/3

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

review: Approve (continuous-integration)

=== modified file 'ofonocallchannel.cpp'
--- ofonocallchannel.cpp	2014-03-19 02:36:35 +0000
+++ ofonocallchannel.cpp	2014-05-09 16:59:37 +0000
@@ -142,10 +142,16 @@
     QObject::connect(mConnection, SIGNAL(speakerModeChanged(bool)), mSpeakerIface.data(), SLOT(setSpeakerMode(bool)));
     QObject::connect(mConnection->voiceCallManager(), SIGNAL(sendTonesComplete(bool)), SLOT(onDtmfComplete(bool)));
     QObject::connect(this, SIGNAL(multipartyChanged(bool)), this, SLOT(onMultipartyChanged(bool)));
+    
+    QObject::connect(this, SIGNAL(disconnectReason(const QString &)), this, SLOT(onDisconnectReason(const QString &)));
 
     mSpeakerIface->setSpeakerMode(mConnection->speakerMode());
 }
 
+void oFonoCallChannel::onDisconnectReason(const QString &reason) {
+    mRequestedHangup = reason == "local";
+}
+
 void oFonoCallChannel::onMultipartyChanged(bool multiparty)
 {
     // if previous state was multparty then split

=== modified file 'ofonocallchannel.h'
--- ofonocallchannel.h	2014-02-14 17:48:08 +0000
+++ ofonocallchannel.h	2014-05-09 16:59:37 +0000
@@ -66,6 +66,7 @@
 
     void onOfonoMuteChanged(bool mute);
     void onMultipartyChanged(bool multiparty);
+    void onDisconnectReason(const QString &reason);
 
 private:
     QString mObjPath;