Added automatic retries to call listener.

[jenirok] / src / daemon / calllistener.cpp

diff --git a/src/daemon/calllistener.cpp b/src/daemon/calllistener.cpp
index 114a05e..16ee0d5 100644 (file)
--- a/src/daemon/calllistener.cpp
+++ b/src/daemon/calllistener.cpp
@@ -17,6 +17,7 @@
  */
 
 #include <QtCore/QDebug>
+#include <QtCore/QTimer>
 #include <QtSql/QSqlQuery>
 #include <QtSql/QSqlError>
 #include "calllistener.h"
@@ -36,7 +37,7 @@ namespace
 
 QDBusConnection CallListener::systemBus_ = QDBusConnection::systemBus();
 
-CallListener::CallListener(): eniro_(0), contactManager_(0), box_(0), label_(0)
+CallListener::CallListener(): eniro_(0), contactManager_(0), box_(0), label_(0), retries_(-1)
 {
 }
 
@@ -79,6 +80,8 @@ void CallListener::begin()
     label_->setMargin(8);
     box_->setWidget(label_);
 
+    qDebug() << "Starting...";
+
 }
 
 void CallListener::end()
@@ -107,18 +110,22 @@ void CallListener::end()
 
 void CallListener::search(Eniro::SearchDetails const& details)
 {
+       qDebug() << "Search called";
+
     Eniro::Result result;
 
     if(Cache::instance().findItem(details.query, result))
     {
 
-        showResult(createResult(result.name,
-                                result.street,
-                                result.city));
+        showDelayedResult(createResult(result.name,
+                                 result.street,
+                                 result.city), BANNER_DELAY);
     }
     else
     {
         showResult(tr("Searching..."));
+        retries_ = 0;
+        currentSearch_ = details;
         eniro_->search(details);
     }
 
@@ -141,7 +148,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(currentSearch_);
+               return;
+        }
+        else
+        {
+               message = tr("Search failed:") + " " + eniro_->errorString() + ".";
+        }
     }
     else if(results.size() == 0)
     {
@@ -155,7 +172,12 @@ void CallListener::requestFinished(QVector <Eniro::Result> const& results,
         Cache::instance().addItem(result);
     }
 
-    showResult(message);
+    retries_ = -1;
+
+    timedMessage_ = message;
+
+    // Show banner after small delay
+    showDelayedResult(message, BANNER_DELAY);
 
 }
 
@@ -191,10 +213,11 @@ void CallListener::showResult(QString const& text)
 
 void CallListener::incomingCall(QDBusObjectPath path, QString number)
 {
-    qDebug() << number;
+    qDebug() << "Incoming: " << number;
 
     if(!contactManager_->numberExists(number))
     {
+       qDebug() << "Number doesn't exist";
 
         systemBus_.connect(CALL_SERVICE_NAME,
                            path.path(),
@@ -203,11 +226,38 @@ void CallListener::incomingCall(QDBusObjectPath path, QString number)
                            this,
                            SLOT(callTerminate()));
 
+        qDebug() << "Going to search";
+
         search(Eniro::SearchDetails(number));
     }
+    else
+    {
+       qDebug() << "Number exists";
+    }
 }
 
 void CallListener::callTerminate()
 {
-    box_->hide();
+       if(box_->isVisible())
+       {
+               box_->hide();
+       }
+}
+
+void CallListener::showDelayedResult(QString const& text, int delay)
+{
+       timedMessage_ = text;
+       QTimer::singleShot(delay, this, SLOT(showTimedMessage()));
+}
+
+void CallListener::showTimedMessage()
+{
+       if(timedMessage_.size() == 0)
+       {
+               return;
+       }
+
+       showResult(timedMessage_);
+
+       timedMessage_ = "";
 }