Merge lp:~tiagosh/telephony-service/fix-voicemail-indicator2 into lp:telephony-service

[Tiago Salem Herrmann]

Listen for VoicemailNumberChanged() signal

Listen for VoicemailNumberChanged() signal

--Checklist--
Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~tiagosh/telepathy-ofono/fix-voicemail-indicator/+merge/227990

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 add a core-dev as a reviewer to this MP?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:854
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/267/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-amd64-ci/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/83
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/83/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-i386-ci/84/console

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

review: Needs Fixing (continuous-integration)

[Bill Filler (bfiller)]

tested, works

review: Approve

[lp:~tiagosh/telephony-service/fix-voicemail-indicator2]

854. By Tiago Salem Herrmann on 2014-07-25

Use correct label for blocked and private numbers on messaging-menu. Fixes: 1340386, 1347708
Approved by: Gustavo Pichorim Boiko

855. By Tiago Salem Herrmann on 2014-07-25

Listen for VoicemailNumberChanged() signal Fixes: 1347085

=== modified file 'libtelephonyservice/callmanager.cpp'
--- libtelephonyservice/callmanager.cpp	2014-06-27 20:37:38 +0000
+++ libtelephonyservice/callmanager.cpp	2014-07-23 20:54:42 +0000
@@ -45,6 +45,8 @@
     connect(TelepathyHelper::instance(), SIGNAL(channelObserverUnregistered()), SLOT(onChannelObserverUnregistered()));
     connect(TelepathyHelper::instance(), SIGNAL(accountConnectionChanged()), SLOT(onEmergencyNumbersChanged()));
     connect(TelepathyHelper::instance(), SIGNAL(accountReady()), SLOT(onEmergencyNumbersChanged()));
+    connect(TelepathyHelper::instance(), SIGNAL(accountConnectionChanged()), SLOT(onVoicemailNumberChanged()));
+    connect(TelepathyHelper::instance(), SIGNAL(accountReady()), SLOT(onVoicemailNumberChanged()));
     connect(this, SIGNAL(hasCallsChanged()), SIGNAL(callsChanged()));
     connect(this, &CallManager::hasCallsChanged, [this] {
         Q_EMIT this->callIndicatorVisibleChanged(this->callIndicatorVisible());
@@ -185,24 +187,29 @@
         return;
     }
 
-    // FIXME: needs to handle voicemail numbers from multiple accounts
-    Tp::ConnectionPtr conn(TelepathyHelper::instance()->accounts()[0]->connection());
+    onVoicemailNumberChanged();
+
+    Tp::ConnectionPtr conn;
+    Q_FOREACH(const Tp::AccountPtr &account, TelepathyHelper::instance()->accounts()) {
+        if (!account->connection().isNull()) {
+            conn = account->connection();
+            break;
+        }
+    }
+
     if (conn.isNull()) {
-        mVoicemailNumber = QString();
         return;
     }
 
     QString busName = conn->busName();
     QString objectPath = conn->objectPath();
-    QDBusInterface connIface(busName, objectPath, CANONICAL_TELEPHONY_VOICEMAIL_IFACE);
-    QDBusReply<QString> replyNumber = connIface.call("VoicemailNumber");
-    if (replyNumber.isValid()) {
-        mVoicemailNumber = replyNumber.value();
-        Q_EMIT voicemailNumberChanged();
-    }
 
     // connect the emergency numbers changed signal
     QDBusConnection connection = QDBusConnection::sessionBus();
+    connection.connect(busName, objectPath, CANONICAL_TELEPHONY_VOICEMAIL_IFACE, "VoicemailNumberChanged",
+                       this, SLOT(onVoicemailNumberChanged()));
+
+    // connect the emergency numbers changed signal
     connection.connect(busName, objectPath, CANONICAL_TELEPHONY_EMERGENCYMODE_IFACE, "EmergencyNumbersChanged",
                        this, SLOT(onEmergencyNumbersChanged()));
 }
@@ -238,6 +245,33 @@
     }
 }
 
+void CallManager::onVoicemailNumberChanged()
+{
+    // FIXME: we need to handle emergency numbers for multiple accounts
+    Tp::ConnectionPtr conn;
+    Q_FOREACH(const Tp::AccountPtr &account, TelepathyHelper::instance()->accounts()) {
+        if (!account->connection().isNull()) {
+            conn = account->connection();
+            break;
+        }
+    }
+
+    if (conn.isNull()) {
+        mVoicemailNumber = QString();
+        return;
+    }
+
+    QString busName = conn->busName();
+    QString objectPath = conn->objectPath();
+    QDBusInterface connIface(busName, objectPath, CANONICAL_TELEPHONY_VOICEMAIL_IFACE);
+    QDBusReply<QString> replyNumber = connIface.call("VoicemailNumber");
+    if (replyNumber.isValid()) {
+        mVoicemailNumber = replyNumber.value();
+        qDebug() << mVoicemailNumber;
+        Q_EMIT voicemailNumberChanged();
+    }
+}
+
 CallEntry *CallManager::foregroundCall() const
 {
     CallEntry *call = 0;

=== modified file 'libtelephonyservice/callmanager.h'
--- libtelephonyservice/callmanager.h	2014-06-27 17:45:58 +0000
+++ libtelephonyservice/callmanager.h	2014-07-23 20:54:42 +0000
@@ -107,6 +107,7 @@
     void onConnectedChanged();
     void onCallIndicatorVisibleChanged(bool visible);
     void onEmergencyNumbersChanged();
+    void onVoicemailNumberChanged();
 
 private:
     explicit CallManager(QObject *parent = 0);