Some connection handling improvements made for daemon. Changelog updated to newest...

[jenirok] / src / daemon / calllistener.cpp

diff --git a/src/daemon/calllistener.cpp b/src/daemon/calllistener.cpp
index 4307347..4a2f1c5 100644 (file)
--- a/src/daemon/calllistener.cpp
+++ b/src/daemon/calllistener.cpp
@@ -23,6 +23,7 @@
 #include "cache.h"
 #include "contactmanager.h"
 #include "connectionmanager.h"
+#include "sourcecoreconfig.h"
 #include "db.h"
 
 namespace
@@ -38,16 +39,15 @@ namespace
 
 QDBusConnection CallListener::systemBus_ = QDBusConnection::systemBus();
 
-CallListener::CallListener(): eniro_(0),
+CallListener::CallListener(): source_(0),
 closeConnection_(false), initialized_(false), box_(0), label_(0),
-retries_(-1), site_(Eniro::FI), timer_(0)
+retries_(-1), timer_(0)
 {
 }
 
 CallListener::~CallListener()
 {
     end();
-    DB::removeDatabase();
 }
 
 bool CallListener::begin()
@@ -58,6 +58,11 @@ bool CallListener::begin()
         return false;
     }
 
+    sourceId_ = Source::stringToId(Settings::instance()->get("source"));
+    SourceCoreConfig* config = SourceCoreConfig::getCoreConfig(sourceId_);
+    config->getConfig(sourceConfig_);
+    delete config;
+
     systemBus_.connect(CALL_SERVICE_NAME,
                        CALL_SERVICE_PATH,
                        CALL_SERVICE_INTERFACE,
@@ -72,7 +77,7 @@ bool CallListener::begin()
                        this,
                        SLOT(callTerminate()));
 
-    site_ = Eniro::stringToSite(Settings::instance()->get("site"));
+    findGprsId();
 
     qDebug() << "Starting...";
 
@@ -97,16 +102,17 @@ void CallListener::end()
                           SLOT(callTerminate()));
 
     searchClose();
+    sourceConfig_.clear();
 
 }
 
-void CallListener::search(Eniro::SearchDetails const& details)
+void CallListener::search(Source::SearchDetails const& details)
 {
     qDebug() << "Search called";
 
     searchInit();
 
-    Eniro::Result result;
+    Source::Result result;
 
     if(Cache::instance().findItem(details.query, result))
     {
@@ -132,13 +138,13 @@ void CallListener::search(Eniro::SearchDetails const& details)
 
         qDebug() << "Starting to search...";
 
-        eniro_->search(details);
+        source_->search(details);
     }
 
 }
 
-void CallListener::requestFinished(QVector <Eniro::Result> const& results,
-                                   Eniro::SearchDetails const& details,
+void CallListener::requestFinished(QVector <Source::Result> const& results,
+                                   Source::SearchDetails const& details,
                                    bool error)
 {
     // If box is not visible, the call must have been terminated already
@@ -151,27 +157,27 @@ void CallListener::requestFinished(QVector <Eniro::Result> const& results,
 
     if(error)
     {
-        qDebug() << "Error: " << eniro_->errorString();
+        qDebug() << "Error: " << source_->errorString();
 
         if(retries_ < SEARCH_RETRIES && retries_ >= 0)
         {
             retries_++;
-            eniro_->search(Eniro::SearchDetails(currentSearch_));
+            source_->search(Source::SearchDetails(currentSearch_));
             return;
         }
         else
         {
             timedMessage_ = "";
             QString errorString;
-            Eniro::Error error = eniro_->error();
+            Source::Error error = source_->error();
 
             switch(error)
             {
-            case Eniro::TIMEOUT:
+            case Source::TIMEOUT:
                 errorString = tr("Request timed out");
                 break;
             default:
-                errorString = eniro_->errorString();
+                errorString = source_->errorString();
                 break;
             }
 
@@ -192,7 +198,7 @@ void CallListener::requestFinished(QVector <Eniro::Result> const& results,
             message = createResult(results.at(0).name, results.at(0).street,
                                    results.at(0).city);
             showResult(message);
-            Eniro::Result result = results.at(0);
+            Source::Result result = results.at(0);
             result.number = details.query;
             Cache::instance().addItem(result);
         }
@@ -203,9 +209,9 @@ void CallListener::requestFinished(QVector <Eniro::Result> const& results,
 
     if(closeConnection_)
     {
+        closeConnection_ = false;
         ConnectionManager cm;
         cm.disconnect(true);
-        closeConnection_ = false;
     }
 }
 
@@ -247,8 +253,6 @@ void CallListener::showResult(QString const& text)
 
 void CallListener::incomingCall(QDBusObjectPath path, QString number)
 {
-    qDebug() << "Incoming: " << number;
-
     ContactManager cm;
 
     if(!cm.numberExists(number))
@@ -262,7 +266,7 @@ void CallListener::incomingCall(QDBusObjectPath path, QString number)
                            this,
                            SLOT(callTerminate()));
 
-        search(Eniro::SearchDetails(number));
+        search(Source::SearchDetails(number));
     }
     else
     {
@@ -279,12 +283,17 @@ void CallListener::callTerminate()
 
     if(closeConnection_)
     {
+        closeConnection_ = false;
         ConnectionManager cm;
         cm.disconnect(true);
-        closeConnection_ = false;
     }
 
     searchClose();
+
+    if(gprsId_.isEmpty())
+    {
+        findGprsId();
+    }
 }
 
 void CallListener::showDelayedResult(QString const& text, int delay)
@@ -315,15 +324,19 @@ void CallListener::searchInit()
         return;
     }
 
-    eniro_ = new Eniro(site_);
-    eniro_->setMaxResults(1);
-    eniro_->setFindNumber(false);
-    eniro_->setTimeout(REQUEST_TIMEOUT);
-
-    connect(eniro_, SIGNAL(requestFinished(QVector <Eniro::Result> const&,
-                                           Eniro::SearchDetails const&, bool)),
-                                           this, SLOT(requestFinished(QVector <Eniro::Result> const&,
-                                                                      Eniro::SearchDetails const&, bool)));
+    source_ = Source::getSource(sourceId_);
+    SourceCoreConfig* config = SourceCoreConfig::getCoreConfig(sourceId_);
+    config->loadFromConfig(sourceConfig_);
+    config->apply(source_);
+    delete config;
+    source_->setMaxResults(1);
+    source_->setFindNumber(false);
+    source_->setTimeout(REQUEST_TIMEOUT);
+
+    connect(source_, SIGNAL(requestFinished(QVector <Source::Result> const&,
+                                           Source::SearchDetails const&, bool)),
+                                           this, SLOT(requestFinished(QVector <Source::Result> const&,
+                                                                      Source::SearchDetails const&, bool)));
     box_ = new InformationBox;
     label_ = new QLabel("", box_);
     label_->setMargin(8);
@@ -338,16 +351,16 @@ void CallListener::searchClose()
 
     qDebug() << "Closing search...";
 
-    if(eniro_)
+    if(source_)
     {
-        disconnect(eniro_, SIGNAL(requestFinished(QVector <Eniro::Result> const&,
-                                                  Eniro::SearchDetails const&, bool)),
-                                                  this, SLOT(requestFinished(QVector <Eniro::Result> const&,
-                                                                             Eniro::SearchDetails const&, bool)));
+        disconnect(source_, SIGNAL(requestFinished(QVector <Source::Result> const&,
+                                                  Source::SearchDetails const&, bool)),
+                                                  this, SLOT(requestFinished(QVector <Source::Result> const&,
+                                                                             Source::SearchDetails const&, bool)));
     }
 
-    delete eniro_;
-    eniro_ = 0;
+    delete source_;
+    source_ = 0;
     delete box_;
     box_ = 0;
     label_ = 0;
@@ -399,6 +412,9 @@ bool CallListener::handleConnection()
 
     int cretries = 0;
 
+    bool tryGprs = (!gprsId_.isEmpty() &&
+                   (configType == Settings::ANY || configType == Settings::GPRS));
+
     while(cretries < CONNECTION_LOOKUP_RETRIES)
     {
         if(!initialized_)
@@ -411,6 +427,15 @@ bool CallListener::handleConnection()
             break;
         }
 
+        // ICD doesn't always find gprs connection during call, so
+        // try to use gprs anyway.
+        if(tryGprs && is3g())
+        {
+            best.id = gprsId_;
+            qDebug() << "Trying gprs";
+            break;
+        }
+
         qDebug() << "No connections found, retrying...";
 
         cretries++;
@@ -434,8 +459,6 @@ bool CallListener::handleConnection()
             return false;
         }
 
-        sleep(WAIT_BETWEEN_RETRIES);
-
         if(cm.connect(best.id))
         {
             break;
@@ -446,6 +469,8 @@ bool CallListener::handleConnection()
             return false;
         }
 
+        sleep(WAIT_BETWEEN_RETRIES);
+
         qDebug() << "Unable to connect, retrying...";
         retries++;
 
@@ -496,3 +521,46 @@ void CallListener::sleep(int ms)
         QCoreApplication::processEvents(QEventLoop::WaitForMoreEvents);
     }
 }
+
+void CallListener::findGprsId()
+{
+    ConnectionManager cm;
+
+    QList<ConnectionManager::Connection> connections;
+
+    if(cm.scanConnections(connections, ConnectionManager::GPRS) &&
+       connections.size() > 0)
+    {
+        gprsId_ = connections.at(0).id;
+    }
+}
+
+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) // 3.5G (HSUPA)
+    {
+        return true;
+    }
+    else if(status & 0x08) // 3G (HSDPA)
+    {
+        return true;
+    }
+
+    // Something else
+    return false;
+}