Merge lp:~tiagosh/telephony-service/clear_snap_decision_on_reject into lp:telephony-service

[Tiago Salem Herrmann]

Clear pending snap decision when rejecting an incoming call.

Clear pending snap decision when rejecting an incoming call.

--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/telephony-service) 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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:821
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/205/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-i386-ci/21

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/205/rebuild

review: Approve (continuous-integration)

[lp:~tiagosh/telephony-service/clear_snap_decision_on_reject]

822. By Tiago Salem Herrmann on 2014-06-04

clear snap decision if it failed to show

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:822
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/206/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/22/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-i386-ci/22

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/206/rebuild

review: Approve (continuous-integration)

[lp:~tiagosh/telephony-service/clear_snap_decision_on_reject]

823. By Tiago Salem Herrmann on 2014-06-04

update contact filter after notification is displayed

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:823
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/207/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-i386-ci/23

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/207/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

[Michael Terry (mterry)]

Can this be top-approved and merged?

=== modified file 'approver/approver.cpp'
--- approver/approver.cpp	2014-03-12 20:58:50 +0000
+++ approver/approver.cpp	2014-06-04 18:21:07 +0000
@@ -210,6 +210,7 @@
 
     GError *error = NULL;
     if (!notify_notification_show(mPendingSnapDecision, &error)) {
+        closeSnapDecision();
         qWarning() << "Failed to show snap decision:" << error->message;
         g_error_free (error);
     }
@@ -310,6 +311,19 @@
 
     mPendingSnapDecision = notification;
 
+    GError *error = NULL;
+    if (!notify_notification_show(notification, &error)) {
+        closeSnapDecision();
+        qWarning() << "Failed to show snap decision:" << error->message;
+        g_error_free (error);
+    }
+
+    // play a ringtone
+    Ringtone::instance()->playIncomingCallSound();
+
+    mChannels.remove(pr);
+
+    // and now set up the contact matching for either greeter mode or regular mode
     if (GreeterContacts::isGreeterMode()) {
         GreeterContacts::instance()->setContactFilter(QContactPhoneNumber::match(contact->id()));
     } else {
@@ -334,16 +348,6 @@
         request->start();
     }
 
-    GError *error = NULL;
-    if (!notify_notification_show(notification, &error)) {
-        qWarning() << "Failed to show snap decision:" << error->message;
-        g_error_free (error);
-    }
-
-    // play a ringtone
-    Ringtone::instance()->playIncomingCallSound();
-
-    mChannels.remove(pr);
 }
 
 void Approver::onApproved(Tp::ChannelDispatchOperationPtr dispatchOp)
@@ -379,6 +383,8 @@
 
 void Approver::onRejected(Tp::ChannelDispatchOperationPtr dispatchOp)
 {
+    closeSnapDecision();
+
     Tp::PendingOperation *claimop = dispatchOp->claim();
     // assume there is just one channel in the dispatchOp for calls
     mChannels[claimop] = dispatchOp->channels().first();

=== modified file 'libtelephonyservice/greetercontacts.cpp'
--- libtelephonyservice/greetercontacts.cpp	2014-03-12 20:58:50 +0000
+++ libtelephonyservice/greetercontacts.cpp	2014-06-04 18:21:07 +0000
@@ -155,6 +155,7 @@
     } else {
         qWarning() << "Failed to get user property " << propName << " from AccountsService:" << reply.error().message();
     }
+    return QVariant();
 }
 
 void GreeterContacts::checkUpdatedValue(const QVariantMap &changed,