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

[Tiago Salem Herrmann]

Enable dialpad sounds only when enabled in the system-settings.

Enable dialpad sounds only when enabled in the system-settings.

--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 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:921
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/303/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-amd64-ci/119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/119
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/119/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-i386-ci/120

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/303/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 'handler/callhandler.cpp'
--- handler/callhandler.cpp	2014-08-22 19:01:46 +0000
+++ handler/callhandler.cpp	2014-09-08 16:16:00 +0000
@@ -25,6 +25,7 @@
 #include "telepathyhelper.h"
 #include "accountentry.h"
 #include "tonegenerator.h"
+#include "greetercontacts.h"
 #include <TelepathyQt/ContactManager>
 #include <TelepathyQt/PendingContacts>
 
@@ -166,9 +167,13 @@
          }
     }
     /*
-     * play locally (via tone generator)
+     * play locally (via tone generator) only if we are on a call, or if this is 
+     * dialpad sounds
      */
-    ToneGenerator::instance()->playDTMFTone((uint)event);
+    if (GreeterContacts::instance()->dialpadSoundsEnabled() && objectPath.isEmpty()
+        || !objectPath.isEmpty()) {
+        ToneGenerator::instance()->playDTMFTone((uint)event);
+    }
 
     Tp::CallChannelPtr channel = callFromObjectPath(objectPath);
     if (channel.isNull()) {
 
=== modified file 'libtelephonyservice/greetercontacts.cpp'
--- libtelephonyservice/greetercontacts.cpp	2014-08-27 22:32:34 +0000
+++ libtelephonyservice/greetercontacts.cpp	2014-09-08 16:16:00 +0000
@@ -171,6 +171,14 @@
     return mIncomingMessageVibrate.toBool();
 }
 
+bool GreeterContacts::dialpadSoundsEnabled()
+{
+    if (!mDialpadSoundsEnabled.isValid()) {
+        mDialpadSoundsEnabled = getUserValue("com.ubuntu.touch.AccountsService.Sound", "DialpadSoundsEnabled");
+    }
+    return mDialpadSoundsEnabled.toBool();
+}
+
 void GreeterContacts::greeterListPropertiesChanged(const QString &interface,
                                                const QVariantMap &changed,
                                                const QStringList &invalidated)
@@ -240,6 +248,7 @@
         checkUpdatedValue(changed, invalidated, "IncomingMessageSound", mIncomingMessageSound);
         checkUpdatedValue(changed, invalidated, "IncomingMessageVibrate", mIncomingMessageVibrate);
         checkUpdatedValue(changed, invalidated, "IncomingCallVibrate", mIncomingCallVibrate);
+        checkUpdatedValue(changed, invalidated, "DialpadSoundsEnabled", mDialpadSoundsEnabled);
     }
 }
 
@@ -314,6 +323,7 @@
         mIncomingMessageSound = QVariant();
         mIncomingCallVibrate = QVariant();
         mIncomingMessageVibrate = QVariant();
+        mDialpadSoundsEnabled = QVariant();
         signalIfNeeded();
     }
 }
 
=== modified file 'libtelephonyservice/greetercontacts.h'
--- libtelephonyservice/greetercontacts.h	2014-08-27 22:32:34 +0000
+++ libtelephonyservice/greetercontacts.h	2014-09-08 16:16:00 +0000
@@ -51,6 +51,7 @@
     QString incomingMessageSound();
     bool incomingMessageVibrate();
     bool incomingCallVibrate();
+    bool dialpadSoundsEnabled();
 
     static bool isGreeterMode();
 
@@ -94,6 +95,7 @@
     QVariant mIncomingMessageSound;
     QVariant mIncomingCallVibrate;
     QVariant mIncomingMessageVibrate;
+    QVariant mDialpadSoundsEnabled;
     bool mGreeterActive;
 
     QtContacts::QContactFilter mFilter;