Some connection handling improvements made for daemon. Changelog updated to newest...
[jenirok] / src / daemon / calllistener.cpp
index 4f2f4b6..4a2f1c5 100644 (file)
 
 #include <QtCore/QDebug>
 #include <QtCore/QTimer>
-#include <QtSql/QSqlQuery>
-#include <QtSql/QSqlError>
 #include "calllistener.h"
 #include "settings.h"
 #include "cache.h"
 #include "contactmanager.h"
+#include "connectionmanager.h"
+#include "sourcecoreconfig.h"
+#include "db.h"
 
 namespace
 {
@@ -38,9 +39,9 @@ namespace
 
 QDBusConnection CallListener::systemBus_ = QDBusConnection::systemBus();
 
-CallListener::CallListener(): eniro_(0), connectionManager_(0),
+CallListener::CallListener(): source_(0),
 closeConnection_(false), initialized_(false), box_(0), label_(0),
-retries_(-1), site_(Eniro::FI)
+retries_(-1), timer_(0)
 {
 }
 
@@ -49,8 +50,19 @@ CallListener::~CallListener()
     end();
 }
 
-void CallListener::begin()
+bool CallListener::begin()
 {
+    if(Settings::instance()->getConnectionType() == Settings::ALWAYS_ASK)
+    {
+        qDebug() << "Bad connection settings, unable to start";
+        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,
@@ -65,11 +77,12 @@ void CallListener::begin()
                        this,
                        SLOT(callTerminate()));
 
-    site_ = Eniro::stringToSite(Settings::instance()->get("site"));
-    Settings::close();
+    findGprsId();
 
     qDebug() << "Starting...";
 
+    return true;
+
 }
 
 void CallListener::end()
@@ -89,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))
     {
@@ -114,27 +128,23 @@ void CallListener::search(Eniro::SearchDetails const& details)
         retries_ = 0;
         currentSearch_ = details.query;
 
-        showDelayedResult(tr("Searching..."), BANNER_DELAY);
-
-        if(!connectionManager_->isConnected())
-        {
-            connectionManager_->connect();
-            closeConnection_ = true;
-        }
-        else
+        if(!handleConnection())
         {
-            closeConnection_ = false;
+            qDebug() << "Unable to connect";
+            return;
         }
 
+        showDelayedResult(tr("Searching..."), BANNER_DELAY);
+
         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
@@ -147,19 +157,31 @@ void CallListener::requestFinished(QVector <Eniro::Result> const& results,
 
     if(error)
     {
-        qDebug() << "Error: " << eniro_->errorString();
+        qDebug() << "Error: " << source_->errorString();
 
-        if(retries_ < NUMBER_OF_RETRIES && retries_ >= 0)
+        if(retries_ < SEARCH_RETRIES && retries_ >= 0)
         {
             retries_++;
-            eniro_->search(Eniro::SearchDetails(currentSearch_));
+            source_->search(Source::SearchDetails(currentSearch_));
             return;
         }
         else
         {
             timedMessage_ = "";
-            message = tr("Search failed:") + " " + eniro_->errorString() + ".";
-            showResult(message);
+            QString errorString;
+            Source::Error error = source_->error();
+
+            switch(error)
+            {
+            case Source::TIMEOUT:
+                errorString = tr("Request timed out");
+                break;
+            default:
+                errorString = source_->errorString();
+                break;
+            }
+
+            showError(tr("Searching failed:") + " " + errorString + ".");
         }
     }
     else
@@ -176,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);
         }
@@ -185,10 +207,11 @@ void CallListener::requestFinished(QVector <Eniro::Result> const& results,
     retries_ = -1;
     currentSearch_ = "";
 
-    if(closeConnection_ && connectionManager_)
+    if(closeConnection_)
     {
-        connectionManager_->disconnect(true);
         closeConnection_ = false;
+        ConnectionManager cm;
+        cm.disconnect(true);
     }
 }
 
@@ -230,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))
@@ -245,7 +266,7 @@ void CallListener::incomingCall(QDBusObjectPath path, QString number)
                            this,
                            SLOT(callTerminate()));
 
-        search(Eniro::SearchDetails(number));
+        search(Source::SearchDetails(number));
     }
     else
     {
@@ -255,18 +276,24 @@ void CallListener::incomingCall(QDBusObjectPath path, QString number)
 
 void CallListener::callTerminate()
 {
-    if(initialized_ && box_ && box_->isVisible())
+    if(box_ && box_->isVisible())
     {
         box_->hide();
     }
 
-    if(closeConnection_ && connectionManager_)
+    if(closeConnection_)
     {
-        connectionManager_->disconnect(true);
         closeConnection_ = false;
+        ConnectionManager cm;
+        cm.disconnect(true);
     }
 
     searchClose();
+
+    if(gprsId_.isEmpty())
+    {
+        findGprsId();
+    }
 }
 
 void CallListener::showDelayedResult(QString const& text, int delay)
@@ -297,20 +324,23 @@ void CallListener::searchInit()
         return;
     }
 
-    connectionManager_ = new ConnectionManager;
-
-    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);
+    label_->setWordWrap(true);
     box_->setWidget(label_);
     initialized_ = true;
 }
@@ -321,19 +351,216 @@ 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 connectionManager_;
-    connectionManager_ = 0;
-    delete eniro_;
-    eniro_ = 0;
+    delete source_;
+    source_ = 0;
     delete box_;
     box_ = 0;
     label_ = 0;
 }
+
+bool CallListener::handleConnection()
+{
+    if(!initialized_)
+    {
+        return false;
+    }
+
+    ConnectionManager cm;
+
+    if(cm.isConnected())
+    {
+        closeConnection_ = false;
+        return true;
+    }
+
+    closeConnection_ = true;
+
+    Settings::ConnectionType configType = Settings::instance()->getConnectionType();
+
+    if(configType == Settings::ALWAYS_ASK)
+    {
+        showError(tr("Automatic connecting is not allowed by settings."), BANNER_DELAY);
+        return false;
+    }
+
+    showDelayedResult(tr("Connecting..."), BANNER_DELAY);
+
+    ConnectionManager::Connection best;
+
+    ConnectionManager::ConnectionType lookupType = ConnectionManager::NO_TYPE;
+
+    switch(configType)
+    {
+    case Settings::WLAN:
+        lookupType = ConnectionManager::WLAN;
+        break;
+    case Settings::GPRS:
+        lookupType = ConnectionManager::GPRS;
+        break;
+    default:
+        lookupType = ConnectionManager::NO_TYPE;
+        break;
+    }
+
+    int cretries = 0;
+
+    bool tryGprs = (!gprsId_.isEmpty() &&
+                   (configType == Settings::ANY || configType == Settings::GPRS));
+
+    while(cretries < CONNECTION_LOOKUP_RETRIES)
+    {
+        if(!initialized_)
+        {
+            return false;
+        }
+
+        if(cm.getBestConnection(best, lookupType))
+        {
+            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++;
+
+        sleep(WAIT_BETWEEN_RETRIES);
+
+    }
+
+    if(cretries >= CONNECTION_LOOKUP_RETRIES)
+    {
+        showError(tr("No available 3G or WLAN networks found."));
+        return false;
+    }
+
+    int retries = 0;
+
+    while(retries < CONNECT_RETRIES)
+    {
+        if(!initialized_)
+        {
+            return false;
+        }
+
+        if(cm.connect(best.id))
+        {
+            break;
+        }
+        else if(cm.error() == ConnectionManager::INVALID_IAP)
+        {
+            showError(tr("Selected access point doesn't exist."));
+            return false;
+        }
+
+        sleep(WAIT_BETWEEN_RETRIES);
+
+        qDebug() << "Unable to connect, retrying...";
+        retries++;
+
+    }
+
+    if(initialized_ && retries >= CONNECT_RETRIES)
+    {
+        showError(tr("Unable to connect to network."));
+        return false;
+    }
+
+    return initialized_;
+}
+
+void CallListener::showError(QString const& msg, int timeout)
+{
+    qDebug() << "Error: " << msg;
+    box_->setTimeout(ERROR_BANNER_TIMEOUT);
+
+    if(timeout)
+    {
+        showDelayedResult(msg, timeout);
+    }
+    else
+    {
+        showResult(msg);
+    }
+}
+
+void CallListener::timerEvent(QTimerEvent* event)
+{
+    Q_UNUSED(event);
+    killTimer(timer_);
+    timer_ = 0;
+}
+
+void CallListener::sleep(int ms)
+{
+    if(timer_)
+    {
+        killTimer(timer_);
+    }
+
+    timer_ = startTimer(ms);
+
+    while(timer_)
+    {
+        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;
+}