Update CallForwarding class to match latest oFono

3 files changed, 26 insertions, 5 deletions

diff --git a/lib/ofonocallforwarding.cpp b/lib/ofonocallforwarding.cpp
index 385660c..092a304 100644
--- a/lib/ofonocallforwarding.cpp
+++ b/lib/ofonocallforwarding.cpp
@@ -108,6 +108,10 @@ void OfonoCallForwarding::setVoiceNotReachable(const QString &property)
     return m_if->setProperty("VoiceNotReachable", qVariantFromValue(property));
 }
 
+void OfonoCallForwarding::requestForwardingFlagOnSim()
+{
+    m_if->requestProperty("ForwardingFlagOnSim");
+}
 
 void OfonoCallForwarding::propertyChanged(const QString& property, const QVariant& value)
 {
@@ -121,6 +125,8 @@ void OfonoCallForwarding::propertyChanged(const QString& property, const QVarian
         emit voiceNoReplyTimeoutChanged(value.value<ushort>());
     } else  if (property == "VoiceNotReachable") {	
         emit voiceNotReachableChanged(value.value<QString>());
+    } else  if (property == "ForwardingFlagOnSim") {	
+        emit forwardingFlagOnSimChanged(value.value<bool>());
     }
 }
 
@@ -142,15 +148,17 @@ void OfonoCallForwarding::setPropertyFailed(const QString& property)
 void OfonoCallForwarding::requestPropertyComplete(bool success, const QString& property, const QVariant& value)
 {
     if (property == "VoiceUnconditional") {	
-        success ? emit voiceUnconditionalComplete(true, value.value<QString>()) : emit voiceUnconditionalComplete(false, QString());
+        emit voiceUnconditionalComplete(success, value.value<QString>());
     } else if (property == "VoiceBusy") {	
-        success ? emit voiceBusyComplete(true, value.value<QString>()) : emit voiceBusyComplete(false, QString());
+        emit voiceBusyComplete(success, value.value<QString>());
     } else if (property == "VoiceNoReply") {	
-        success ? emit voiceNoReplyComplete(true, value.value<QString>()) : emit voiceNoReplyComplete(false, QString());
+        emit voiceNoReplyComplete(success, value.value<QString>());
     } else if (property == "VoiceNoReplyTimeout") {
-        success ? emit voiceNoReplyTimeoutComplete(true, value.value<ushort>()) : emit voiceNoReplyTimeoutComplete(false, 0);
+        emit voiceNoReplyTimeoutComplete(success, value.value<ushort>());
     } else if (property == "VoiceNotReachable") {
-        success ? emit voiceNotReachableComplete(true, value.value<QString>()) : emit voiceNotReachableComplete(false, QString());
+        emit voiceNotReachableComplete(success, value.value<QString>());
+    } else if (property == "ForwardingFlagOnSim") {
+        emit forwardingFlagOnSimComplete(success, value.value<bool>());
     }
 }
 
diff --git a/lib/ofonocallforwarding.h b/lib/ofonocallforwarding.h
index 50224ff..c765ca9 100644
--- a/lib/ofonocallforwarding.h
+++ b/lib/ofonocallforwarding.h
@@ -54,6 +54,7 @@ public slots:
     void setVoiceNoReplyTimeout(ushort timeout);
     void requestVoiceNotReachable();
     void setVoiceNotReachable(const QString &property);
+    void requestForwardingFlagOnSim();
     
     /* Methods */
     void disableAll(const QString &type); /* "all" | "conditional" */
@@ -64,12 +65,14 @@ signals:
     void voiceNoReplyComplete(bool success, const QString &property);
     void voiceNoReplyTimeoutComplete(bool success, ushort timeout);
     void voiceNotReachableComplete(bool success, const QString &property);
+    void forwardingFlagOnSimComplete(bool success, bool property);
 
     void voiceUnconditionalChanged(const QString &property);
     void voiceBusyChanged(const QString &property);
     void voiceNoReplyChanged(const QString &property);
     void voiceNoReplyTimeoutChanged(ushort timeout);
     void voiceNotReachableChanged(const QString &property);
+    void forwardingFlagOnSimChanged(bool property);
 
     void setVoiceUnconditionalFailed();
     void setVoiceBusyFailed();
diff --git a/tests/test_ofonocallforwarding.cpp b/tests/test_ofonocallforwarding.cpp
index 81bbbde..cd7c319 100644
--- a/tests/test_ofonocallforwarding.cpp
+++ b/tests/test_ofonocallforwarding.cpp
@@ -57,12 +57,14 @@ private slots:
         QSignalSpy voiceNoReplyComplete(m, SIGNAL(voiceNoReplyComplete(bool, QString)));
         QSignalSpy voiceNoReplyTimeoutComplete(m, SIGNAL(voiceNoReplyTimeoutComplete(bool, ushort)));
         QSignalSpy voiceNotReachableComplete(m, SIGNAL(voiceNotReachableComplete(bool, QString)));
+        QSignalSpy forwardingFlagOnSimComplete(m, SIGNAL(forwardingFlagOnSimComplete(bool, bool)));
 
         QSignalSpy voiceUnconditionalChanged(m, SIGNAL(voiceUnconditionalChanged(QString)));        
         QSignalSpy voiceBusyChanged(m, SIGNAL(voiceBusyChanged(QString)));        
         QSignalSpy voiceNoReplyChanged(m, SIGNAL(voiceNoReplyChanged(QString)));        
         QSignalSpy voiceNoReplyTimeoutChanged(m, SIGNAL(voiceNoReplyTimeoutChanged(ushort)));        
         QSignalSpy voiceNotReachableChanged(m, SIGNAL(voiceNotReachableChanged(QString)));        
+        QSignalSpy forwardingFlagOnSimChanged(m, SIGNAL(forwardingFlagOnSimChanged(bool)));
 
         QSignalSpy setVoiceUnconditionalFailed(m, SIGNAL(setVoiceUnconditionalFailed()));
         QSignalSpy setVoiceBusyFailed(m, SIGNAL(setVoiceBusyFailed()));
@@ -112,6 +114,14 @@ private slots:
 	QCOMPARE(list.at(1).toString(), QString(""));
 	QCOMPARE(voiceNotReachableChanged.count(), 1);	
 	QCOMPARE(voiceNotReachableChanged.takeFirst().at(0).toString(), QString(""));
+	m->requestForwardingFlagOnSim();
+	QTest::qWait(1000);
+	QCOMPARE(forwardingFlagOnSimComplete.count(), 1);
+	list = forwardingFlagOnSimComplete.takeFirst();
+	QCOMPARE(list.at(0).toBool(), true);
+	QCOMPARE(list.at(1).toBool(), false);
+	QCOMPARE(forwardingFlagOnSimChanged.count(), 1);	
+	QCOMPARE(forwardingFlagOnSimChanged.takeFirst().at(0).toBool(), false);
 	
 	m->setVoiceUnconditional("abc");
 	QTest::qWait(1000);