Change contact email address as the nokia one will be no longer valid soon

[profile/ivi/ofono-qt.git] / lib / ofonosimmanager.cpp

diff --git a/lib/ofonosimmanager.cpp b/lib/ofonosimmanager.cpp
index 326e250..c95f062 100644 (file)
--- a/lib/ofonosimmanager.cpp
+++ b/lib/ofonosimmanager.cpp
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  *
- * Contact: Alexander Kanavin <alexander.kanavin@nokia.com>
+ * Contact: Alexander Kanavin <alex.kanavin@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -27,10 +27,11 @@
 #include "ofonosimmanager.h"
 #include "ofonointerface.h"
 
-
 OfonoSimManager::OfonoSimManager(OfonoModem::SelectionSetting modemSetting, const QString &modemPath, QObject *parent)
     : OfonoModemInterface(modemSetting, modemPath, "org.ofono.SimManager", OfonoGetAllOnStartup, parent)
 {
+    qRegisterMetaType<OfonoServiceNumbers>("OfonoServiceNumbers");
+    qRegisterMetaType<OfonoPinRetries>("OfonoPinRetries");
     connect(m_if, SIGNAL(propertyChanged(const QString&, const QVariant&)), 
             this, SLOT(propertyChanged(const QString&, const QVariant&)));
     connect(m_if, SIGNAL(setPropertyFailed(const QString&)), 
@@ -42,7 +43,7 @@ OfonoSimManager::~OfonoSimManager()
 {
 }
 
-void OfonoSimManager::requestChangePin(const QString &pintype, const QString &oldpin, const QString &newpin)
+void OfonoSimManager::changePin(const QString &pintype, const QString &oldpin, const QString &newpin)
 {
     QDBusMessage request;
 
@@ -56,7 +57,7 @@ void OfonoSimManager::requestChangePin(const QString &pintype, const QString &ol
                                        SLOT(changePinErr(const QDBusError&)));
 }
 
-void OfonoSimManager::requestEnterPin(const QString &pintype, const QString &pin)
+void OfonoSimManager::enterPin(const QString &pintype, const QString &pin)
 {
     QDBusMessage request;
 
@@ -70,7 +71,7 @@ void OfonoSimManager::requestEnterPin(const QString &pintype, const QString &pin
                                        SLOT(enterPinErr(const QDBusError&)));
 }
 
-void OfonoSimManager::requestResetPin(const QString &pintype, const QString &puk, const QString &newpin)
+void OfonoSimManager::resetPin(const QString &pintype, const QString &puk, const QString &newpin)
 {
     QDBusMessage request;
 
@@ -84,7 +85,7 @@ void OfonoSimManager::requestResetPin(const QString &pintype, const QString &puk
                                        SLOT(resetPinErr(const QDBusError&)));
 }
 
-void OfonoSimManager::requestLockPin(const QString &pintype, const QString &pin)
+void OfonoSimManager::lockPin(const QString &pintype, const QString &pin)
 {
     QDBusMessage request;
 
@@ -98,7 +99,7 @@ void OfonoSimManager::requestLockPin(const QString &pintype, const QString &pin)
                                        SLOT(lockPinErr(const QDBusError&)));
 }
 
-void OfonoSimManager::requestUnlockPin(const QString &pintype, const QString &pin)
+void OfonoSimManager::unlockPin(const QString &pintype, const QString &pin)
 {
     QDBusMessage request;
 
@@ -142,9 +143,9 @@ QStringList OfonoSimManager::subscriberNumbers() const
     return m_if->properties()["SubscriberNumbers"].value<QStringList>();
 }
 
-QMap<QString, QString> OfonoSimManager::serviceNumbers() const
+OfonoServiceNumbers OfonoSimManager::serviceNumbers() const
 {
-    QMap<QString, QString> map;
+    OfonoServiceNumbers map;
     m_if->properties()["ServiceNumbers"].value<QDBusArgument>() >> map;
     return map;
 }
@@ -169,6 +170,12 @@ QStringList OfonoSimManager::preferredLanguages() const
     return m_if->properties()["PreferredLanguages"].value<QStringList>();
 }
 
+OfonoPinRetries OfonoSimManager::pinRetries() const
+{
+    OfonoPinRetries retries;
+    m_if->properties()["Retries"].value<QDBusArgument>() >> retries;
+    return retries;
+}
 
 void OfonoSimManager::propertyChanged(const QString& property, const QVariant& value)
 {
@@ -183,17 +190,21 @@ void OfonoSimManager::propertyChanged(const QString& property, const QVariant& v
     } else if (property == "SubscriberNumbers") {      
         emit subscriberNumbersChanged(value.value<QStringList>());
     } else if (property == "ServiceNumbers") { 
-        QMap<QString, QString> map;
+        OfonoServiceNumbers map;
         value.value<QDBusArgument>() >> map;
         emit serviceNumbersChanged(map);
     } else if (property == "PinRequired") {    
         emit pinRequiredChanged(value.value<QString>());
-    } else if (property == "LockedPins") {     
+    } else if (property == "LockedPins") {
         emit lockedPinsChanged(value.value<QStringList>());
     } else if (property == "CardIdentifier") { 
         emit cardIdentifierChanged(value.value<QString>());
     } else if (property == "PreferredLanguages") {     
         emit preferredLanguagesChanged(value.value<QStringList>());
+    } else if (property == "Retries") {
+        OfonoPinRetries retries;
+        value.value<QDBusArgument>() >> retries;
+        emit pinRetriesChanged(retries);
     }
 }
 
@@ -210,7 +221,6 @@ void OfonoSimManager::changePinResp()
 
 void OfonoSimManager::changePinErr(QDBusError error)
 {
-    qDebug() << "ChangePin failed" << error;
     m_if->setError(error.name(), error.message());    
     emit changePinComplete(FALSE);
 }
@@ -222,7 +232,6 @@ void OfonoSimManager::enterPinResp()
 
 void OfonoSimManager::enterPinErr(QDBusError error)
 {
-    qDebug() << "EnterPin failed" << error;
     m_if->setError(error.name(), error.message());
     emit enterPinComplete(FALSE);
 }
@@ -234,7 +243,6 @@ void OfonoSimManager::resetPinResp()
 
 void OfonoSimManager::resetPinErr(QDBusError error)
 {
-    qDebug() << "ResetPin failed" << error;
     m_if->setError(error.name(), error.message());
     emit resetPinComplete(FALSE);
 }
@@ -245,7 +253,6 @@ void OfonoSimManager::lockPinResp()
 }
 void OfonoSimManager::lockPinErr(QDBusError error)
 {
-    qDebug() << "LockPin failed" << error;
     m_if->setError(error.name(), error.message());
     emit lockPinComplete(FALSE);
 }
@@ -256,7 +263,6 @@ void OfonoSimManager::unlockPinResp()
 }
 void OfonoSimManager::unlockPinErr(QDBusError error)
 {
-    qDebug() << "UnlockPin failed" << error;
     m_if->setError(error.name(), error.message()); 
     emit unlockPinComplete(FALSE);
 }