Changed daemon to auto disconnect if network connection was initialized by itself.

[jenirok] / src / daemon / calllistener.cpp

diff --git a/src/daemon/calllistener.cpp b/src/daemon/calllistener.cpp
index 061c83a..840d849 100644 (file)
--- a/src/daemon/calllistener.cpp
+++ b/src/daemon/calllistener.cpp
@@ -37,7 +37,9 @@ namespace
 
 QDBusConnection CallListener::systemBus_ = QDBusConnection::systemBus();
 
-CallListener::CallListener(): eniro_(0), contactManager_(0), box_(0), label_(0)
+CallListener::CallListener(): eniro_(0), contactManager_(0),
+connectionManager_(0), closeConnection_(false), box_(0), label_(0),
+retries_(-1)
 {
 }
 
@@ -100,6 +102,10 @@ void CallListener::end()
                           this,
                           SLOT(callTerminate()));
 
+    delete contactManager_;
+    contactManager_ = 0;
+    delete connectionManager_;
+    connectionManager_ = 0;
     delete eniro_;
     eniro_ = 0;
     delete box_;
@@ -110,7 +116,7 @@ void CallListener::end()
 
 void CallListener::search(Eniro::SearchDetails const& details)
 {
-       qDebug() << "Search called";
+    qDebug() << "Search called";
 
     Eniro::Result result;
 
@@ -118,12 +124,33 @@ void CallListener::search(Eniro::SearchDetails const& details)
     {
 
         showDelayedResult(createResult(result.name,
-                                 result.street,
-                                 result.city), BANNER_DELAY);
+                                       result.street,
+                                       result.city), BANNER_DELAY);
     }
     else
     {
-        showResult(tr("Searching..."));
+        retries_ = 0;
+        currentSearch_ = details.query;
+
+        if(connectionManager_)
+        {
+            delete connectionManager_;
+            connectionManager_ = 0;
+        }
+
+        connectionManager_ = new ConnectionManager;
+
+        if(!connectionManager_->isConnected())
+        {
+            connectionManager_->connect();
+            closeConnection_ = true;
+        }
+        else
+        {
+            closeConnection_ = false;
+        }
+
+        showDelayedResult(tr("Searching..."), 200);
         eniro_->search(details);
     }
 
@@ -133,8 +160,6 @@ void CallListener::requestFinished(QVector <Eniro::Result> const& results,
                                    Eniro::SearchDetails const& details,
                                    bool error)
 {
-    qDebug() << "Found: " << results.size();
-
     // If box is not visible, the call must have been terminated already
     if(!box_->isVisible())
     {
@@ -146,7 +171,17 @@ void CallListener::requestFinished(QVector <Eniro::Result> const& results,
     if(error)
     {
         qDebug() << "Error: " << eniro_->errorString();
-        message = tr("Search failed:") + " " + eniro_->errorString() + ".";
+
+        if(retries_ < NUMBER_OF_RETRIES && retries_ >= 0)
+        {
+            retries_++;
+            eniro_->search(Eniro::SearchDetails(currentSearch_));
+            return;
+        }
+        else
+        {
+            message = tr("Search failed:") + " " + eniro_->errorString() + ".";
+        }
     }
     else if(results.size() == 0)
     {
@@ -154,16 +189,27 @@ void CallListener::requestFinished(QVector <Eniro::Result> const& results,
     }
     else
     {
-        message = createResult(results.at(0).name, results.at(0).street, results.at(0).city);
+        message = createResult(results.at(0).name, results.at(0).street,
+                               results.at(0).city);
         Eniro::Result result = results.at(0);
         result.number = details.query;
         Cache::instance().addItem(result);
     }
 
-    timedMessage_ = message;
+    retries_ = -1;
+    currentSearch_ = "";
+    timedMessage_ = "";
 
-    // Show banner after small delay
-    showDelayedResult(message, BANNER_DELAY);
+    showResult(message);
+
+    if(closeConnection_ && connectionManager_)
+    {
+        connectionManager_->disconnect(true);
+        closeConnection_ = false;
+    }
+
+    delete connectionManager_;
+    connectionManager_ = 0;
 
 }
 
@@ -194,6 +240,7 @@ void CallListener::showResult(QString const& text)
     {
         box_->hide();
     }
+
     box_->show();
 }
 
@@ -203,7 +250,7 @@ void CallListener::incomingCall(QDBusObjectPath path, QString number)
 
     if(!contactManager_->numberExists(number))
     {
-       qDebug() << "Number doesn't exist";
+        qDebug() << "Number doesn't exist";
 
         systemBus_.connect(CALL_SERVICE_NAME,
                            path.path(),
@@ -218,32 +265,41 @@ void CallListener::incomingCall(QDBusObjectPath path, QString number)
     }
     else
     {
-       qDebug() << "Number exists";
+        qDebug() << "Number exists";
     }
 }
 
 void CallListener::callTerminate()
 {
-       if(box_->isVisible())
-       {
-               box_->hide();
-       }
+    if(box_->isVisible())
+    {
+        box_->hide();
+    }
+
+    if(closeConnection_ && connectionManager_)
+    {
+        connectionManager_->disconnect(true);
+        closeConnection_ = false;
+    }
+
+    delete connectionManager_;
+    connectionManager_ = 0;
 }
 
 void CallListener::showDelayedResult(QString const& text, int delay)
 {
-       timedMessage_ = text;
-       QTimer::singleShot(delay, this, SLOT(showTimedMessage()));
+    timedMessage_ = text;
+    QTimer::singleShot(delay, this, SLOT(showTimedMessage()));
 }
 
 void CallListener::showTimedMessage()
 {
-       if(timedMessage_.size() == 0)
-       {
-               return;
-       }
+    if(timedMessage_.size() == 0)
+    {
+        return;
+    }
 
-       showResult(timedMessage_);
+    showResult(timedMessage_);
 
-       timedMessage_ = "";
+    timedMessage_ = "";
 }