Update CallSettings to match latest oFono

diff --git a/lib/ofonocallsettings.cpp b/lib/ofonocallsettings.cpp
index 7382f2d..c49d284 100644 (file)
--- a/lib/ofonocallsettings.cpp
+++ b/lib/ofonocallsettings.cpp
@@ -52,6 +52,11 @@ void OfonoCallSettings::requestCalledLinePresentation()
     m_if->requestProperty("CalledLinePresentation");
 }
 
+void OfonoCallSettings::requestCallingNamePresentation()
+{
+    m_if->requestProperty("CallingNamePresentation");
+}
+
 void OfonoCallSettings::requestConnectedLinePresentation()
 {
     m_if->requestProperty("ConnectedLinePresentation");
@@ -90,19 +95,21 @@ void OfonoCallSettings::setVoiceCallWaiting(const QString &preference)
 void OfonoCallSettings::requestPropertyComplete(bool success, const QString& property, const QVariant& value)
 {
     if (property == "CallingLinePresentation") {       
-        success ? emit callingLinePresentationComplete(true, value.value<QString>()) : emit callingLinePresentationComplete(false, value.value<QString>());
+        emit callingLinePresentationComplete(success, value.value<QString>());
     } else if (property == "CalledLinePresentation") { 
-        success ? emit calledLinePresentationComplete(true, value.value<QString>()) : emit calledLinePresentationComplete(false, value.value<QString>());
+        emit calledLinePresentationComplete(success, value.value<QString>());
+    } else if (property == "CallingNamePresentation") {        
+        emit callingNamePresentationComplete(success, value.value<QString>());
     } else if (property == "ConnectedLinePresentation") {
-        success ? emit connectedLinePresentationComplete(true, value.value<QString>()) : emit connectedLinePresentationComplete(false, value.value<QString>());
+        emit connectedLinePresentationComplete(success, value.value<QString>());
     } else if (property == "ConnectedLineRestriction") {
-        success ? emit connectedLineRestrictionComplete(true, value.value<QString>()) : emit connectedLineRestrictionComplete(false, value.value<QString>());
+        emit connectedLineRestrictionComplete(success, value.value<QString>());
     } else if (property == "CallingLineRestriction") { 
-        success ? emit callingLineRestrictionComplete(true, value.value<QString>()) : emit callingLineRestrictionComplete(false, value.value<QString>());
+        emit callingLineRestrictionComplete(success, value.value<QString>());
     } else if (property == "HideCallerId") {   
-        success ? emit hideCallerIdComplete(true, value.value<QString>()) : emit hideCallerIdComplete(false, value.value<QString>());
+        emit hideCallerIdComplete(success, value.value<QString>());
     } else if (property == "VoiceCallWaiting") {       
-        success ? emit voiceCallWaitingComplete(true, value.value<QString>()) : emit voiceCallWaitingComplete(false, value.value<QString>());
+        emit voiceCallWaitingComplete(success, value.value<QString>());
     }
 }
 
@@ -112,6 +119,8 @@ void OfonoCallSettings::propertyChanged(const QString& property, const QVariant&
         emit callingLinePresentationChanged(value.value<QString>());
     } else if (property == "CalledLinePresentation") { 
         emit calledLinePresentationChanged(value.value<QString>());
+    } else if (property == "CallingNamePresentation") {        
+        emit callingNamePresentationChanged(value.value<QString>());
     } else if (property == "ConnectedLinePresentation") {
         emit connectedLinePresentationChanged(value.value<QString>());
     } else if (property == "ConnectedLineRestriction") {

diff --git a/lib/ofonocallsettings.h b/lib/ofonocallsettings.h
index 2bbc27b..896c91a 100644 (file)
--- a/lib/ofonocallsettings.h
+++ b/lib/ofonocallsettings.h
@@ -45,6 +45,7 @@ public slots:
     /* Properties */
     void requestCallingLinePresentation();
     void requestCalledLinePresentation();
+    void requestCallingNamePresentation();
     void requestConnectedLinePresentation();
     void requestConnectedLineRestriction();
     void requestCallingLineRestriction();
@@ -56,6 +57,7 @@ public slots:
 signals:
     void callingLinePresentationComplete(bool success, const QString &setting);
     void calledLinePresentationComplete(bool success, const QString &setting);
+    void callingNamePresentationComplete(bool success, const QString &setting);
     void connectedLinePresentationComplete(bool success, const QString &setting);
     void connectedLineRestrictionComplete(bool success, const QString &setting);
     void callingLineRestrictionComplete(bool success, const QString &setting);
@@ -64,6 +66,7 @@ signals:
 
     void callingLinePresentationChanged(const QString &setting);
     void calledLinePresentationChanged(const QString &setting);
+    void callingNamePresentationChanged(const QString &setting);
     void connectedLinePresentationChanged(const QString &setting);
     void connectedLineRestrictionChanged(const QString &setting);
     void callingLineRestrictionChanged(const QString &setting);

diff --git a/tests/test_ofonocallsettings.cpp b/tests/test_ofonocallsettings.cpp
index 1f3493f..75cfd5a 100644 (file)
--- a/tests/test_ofonocallsettings.cpp
+++ b/tests/test_ofonocallsettings.cpp
@@ -54,6 +54,7 @@ private slots:
     {
         QSignalSpy callingLinePresentationComplete(m, SIGNAL(callingLinePresentationComplete(bool, QString)));
         QSignalSpy calledLinePresentationComplete(m, SIGNAL(calledLinePresentationComplete(bool, QString)));
+        QSignalSpy callingNamePresentationComplete(m, SIGNAL(callingNamePresentationComplete(bool, QString)));
         QSignalSpy connectedLinePresentationComplete(m, SIGNAL(connectedLinePresentationComplete(bool, QString)));
         QSignalSpy connectedLineRestrictionComplete(m, SIGNAL(connectedLineRestrictionComplete(bool, QString)));
         QSignalSpy callingLineRestrictionComplete(m, SIGNAL(callingLineRestrictionComplete(bool, QString)));
@@ -62,6 +63,7 @@ private slots:
 
         QSignalSpy callingLinePresentationChanged(m, SIGNAL(callingLinePresentationChanged(QString)));        
         QSignalSpy calledLinePresentationChanged(m, SIGNAL(calledLinePresentationChanged(QString)));        
+        QSignalSpy callingNamePresentationChanged(m, SIGNAL(callingNamePresentationChanged(QString)));        
         QSignalSpy connectedLinePresentationChanged(m, SIGNAL(connectedLinePresentationChanged(QString)));
         QSignalSpy connectedLineRestrictionChanged(m, SIGNAL(connectedLineRestrictionChanged(QString)));
         QSignalSpy callingLineRestrictionChanged(m, SIGNAL(callingLineRestrictionChanged(QString)));        
@@ -87,6 +89,14 @@ private slots:
        QCOMPARE(list.at(1).toString(), QString("enabled"));
        QVERIFY(calledLinePresentationChanged.count() > 0);     
        QCOMPARE(calledLinePresentationChanged.takeFirst().at(0).toString(), QString("enabled"));       
+       m->requestCallingNamePresentation();
+       QTest::qWait(5000);
+       QCOMPARE(callingNamePresentationComplete.count(), 1);
+       list = callingNamePresentationComplete.takeFirst();
+       QCOMPARE(list.at(0).toBool(), true);
+       QCOMPARE(list.at(1).toString(), QString("enabled"));
+       QVERIFY(callingNamePresentationChanged.count() > 0);    
+       QCOMPARE(callingNamePresentationChanged.takeFirst().at(0).toString(), QString("enabled"));      
         m->requestConnectedLinePresentation();
        QTest::qWait(1000);
         QCOMPARE(connectedLinePresentationComplete.count(), 1);