Added Das Telefonbuch support.

[jenirok] / src / daemon / calllistener.cpp

diff --git a/src/daemon/calllistener.cpp b/src/daemon/calllistener.cpp
index c44e5ce..78d5737 100644 (file)
--- a/src/daemon/calllistener.cpp
+++ b/src/daemon/calllistener.cpp
@@ -48,6 +48,7 @@ retries_(-1), timer_(0)
 CallListener::~CallListener()
 {
     end();
+    DB::removeDatabase();
 }
 
 bool CallListener::begin()
@@ -59,8 +60,10 @@ bool CallListener::begin()
     }
 
     sourceId_ = Source::stringToId(Settings::instance()->get("source"));
+    QMap<QString, QString> tmpConfig;
     SourceCoreConfig* config = SourceCoreConfig::getCoreConfig(sourceId_);
-    config->getConfig(sourceConfig_);
+    config->getConfig(tmpConfig);
+    sourceConfig_ = tmpConfig;
     delete config;
 
     systemBus_.connect(CALL_SERVICE_NAME,
@@ -77,7 +80,6 @@ bool CallListener::begin()
                        this,
                        SLOT(callTerminate()));
 
-
     qDebug() << "Starting...";
 
     return true;
@@ -146,6 +148,13 @@ void CallListener::requestFinished(QVector <Source::Result> const& results,
                                    Source::SearchDetails const& details,
                                    bool error)
 {
+    if(closeConnection_)
+    {
+        closeConnection_ = false;
+        ConnectionManager cm;
+        cm.disconnect(true);
+    }
+
     // If box is not visible, the call must have been terminated already
     if(!initialized_ || !box_->isVisible())
     {
@@ -161,7 +170,7 @@ void CallListener::requestFinished(QVector <Source::Result> const& results,
         if(retries_ < SEARCH_RETRIES && retries_ >= 0)
         {
             retries_++;
-            source_->search(Source::SearchDetails(currentSearch_));
+            source_->search(Source::SearchDetails(currentSearch_, "", Source::BOTH));
             return;
         }
         else
@@ -205,13 +214,6 @@ void CallListener::requestFinished(QVector <Source::Result> const& results,
 
     retries_ = -1;
     currentSearch_ = "";
-
-    if(closeConnection_)
-    {
-        ConnectionManager cm;
-        cm.disconnect(true);
-        closeConnection_ = false;
-    }
 }
 
 QString CallListener::createResult(QString const& name, QString const& street, QString const& city)
@@ -252,13 +254,17 @@ void CallListener::showResult(QString const& text)
 
 void CallListener::incomingCall(QDBusObjectPath path, QString number)
 {
-    qDebug() << "Incoming: " << number;
+    if(number.isEmpty())
+    {
+        qDebug() << "Unknown caller without number";
+        return;
+    }
 
     ContactManager cm;
 
     if(!cm.numberExists(number))
     {
-        qDebug() << "Number doesn't exist";
+        qDebug() << "Number doesn't exist: " << number;
 
         systemBus_.connect(CALL_SERVICE_NAME,
                            path.path(),
@@ -267,11 +273,11 @@ void CallListener::incomingCall(QDBusObjectPath path, QString number)
                            this,
                            SLOT(callTerminate()));
 
-        search(Source::SearchDetails(number));
+        search(Source::SearchDetails(number, "", Source::BOTH));
     }
     else
     {
-        qDebug() << "Number exists";
+        qDebug() << "Number exists: " << number;
     }
 }
 
@@ -282,13 +288,6 @@ void CallListener::callTerminate()
         box_->hide();
     }
 
-    if(closeConnection_)
-    {
-        ConnectionManager cm;
-        cm.disconnect(true);
-        closeConnection_ = false;
-    }
-
     searchClose();
 }
 
@@ -343,6 +342,11 @@ void CallListener::searchInit()
 
 void CallListener::searchClose()
 {
+    if(!initialized_)
+    {
+        return;
+    }
+
     initialized_ = false;
 
     qDebug() << "Closing search...";
@@ -360,6 +364,13 @@ void CallListener::searchClose()
     delete box_;
     box_ = 0;
     label_ = 0;
+
+    if(closeConnection_)
+    {
+        closeConnection_ = false;
+        ConnectionManager cm;
+        cm.disconnect(true);
+    }
 }
 
 bool CallListener::handleConnection()
@@ -407,6 +418,14 @@ bool CallListener::handleConnection()
     }
 
     int cretries = 0;
+    int scans = 0;
+    bool found = false;
+    int maxScans = GPRS_SCANS;
+
+    if(lookupType != ConnectionManager::GPRS)
+    {
+        maxScans = WLAN_SCANS;
+    }
 
     while(cretries < CONNECTION_LOOKUP_RETRIES)
     {
@@ -415,17 +434,32 @@ bool CallListener::handleConnection()
             return false;
         }
 
-        if(cm.getBestConnection(best, lookupType))
+        if(scans < maxScans)
+        {
+            if(cm.getBestConnection(best, lookupType))
+            {
+                found = true;
+            }
+
+            scans++;
+        }
+
+        // If there is only gprs connection available,
+        // make sure that we are on 3g network
+        if(found && (best.type != ConnectionManager::GPRS || is3g()))
         {
             break;
         }
 
+        if(found)
+        {
+            sleep(WAIT_BETWEEN_RETRIES);
+        }
+
         qDebug() << "No connections found, retrying...";
 
         cretries++;
 
-        sleep(WAIT_BETWEEN_RETRIES);
-
     }
 
     if(cretries >= CONNECTION_LOOKUP_RETRIES)
@@ -443,7 +477,7 @@ bool CallListener::handleConnection()
             return false;
         }
 
-        sleep(WAIT_BETWEEN_RETRIES);
+        qDebug() << "Connecting to " << best.name;
 
         if(cm.connect(best.id))
         {
@@ -455,14 +489,26 @@ bool CallListener::handleConnection()
             return false;
         }
 
-        qDebug() << "Unable to connect, retrying...";
         retries++;
 
+        qDebug() << "Unable to connect, retrying...";
+
+        if(retries < CONNECT_RETRIES)
+        {
+            sendRetrySignal(best.id, initialized_);
+        }
+
     }
 
-    if(initialized_ && retries >= CONNECT_RETRIES)
+    if(retries >= CONNECT_RETRIES)
     {
-        showError(tr("Unable to connect to network."));
+        sendRetrySignal(best.id, false);
+
+        if(initialized_)
+        {
+            showError(tr("Unable to connect to network."));
+        }
+
         return false;
     }
 
@@ -472,6 +518,12 @@ bool CallListener::handleConnection()
 void CallListener::showError(QString const& msg, int timeout)
 {
     qDebug() << "Error: " << msg;
+
+    if(!initialized_ || !box_)
+    {
+        return;
+    }
+
     box_->setTimeout(ERROR_BANNER_TIMEOUT);
 
     if(timeout)
@@ -484,6 +536,47 @@ void CallListener::showError(QString const& msg, int timeout)
     }
 }
 
+bool CallListener::is3g()
+{
+    QDBusMessage msg = QDBusMessage::createMethodCall("com.nokia.phone.net",
+                                                      "/com/nokia/phone/net",
+                                                      "Phone.Net",
+                                                      "get_registration_status");
+
+    QDBusMessage rep = systemBus_.call(msg);
+
+    if(rep.type() == QDBusMessage::ErrorMessage)
+    {
+        qDebug() << "Unable to get network status";
+        return false;
+    }
+
+    uint status = rep.arguments().value(6).toUInt();
+
+    if(status & 0x10 || status & 0x08)
+    {
+        return true;
+    }
+
+    return false;
+}
+
+void CallListener::sendRetrySignal(QString const& iap, bool retry)
+{
+    QDBusMessage msg = QDBusMessage::createSignal("/com/nokia/icd_ui",
+                                                  "com.nokia.icd_ui",
+                                                  "retry");
+
+    QList<QVariant> arguments;
+    arguments.append(QVariant(iap));
+    arguments.append(QVariant(retry));
+    msg.setArguments(arguments);
+
+    QDBusConnection::systemBus().send(msg);
+
+    qDebug() << "Retry signal sent";
+}
+
 void CallListener::timerEvent(QTimerEvent* event)
 {
     Q_UNUSED(event);