*/
#include <QtCore/QDebug>
+#include <QtCore/QTimer>
#include <QtSql/QSqlQuery>
+#include <QtSql/QSqlError>
#include "calllistener.h"
#include "settings.h"
-#include "db.h"
+#include "cache.h"
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)
{
}
eniro_->setMaxResults(1);
eniro_->setFindNumber(false);
+ eniro_->setTimeout(REQUEST_TIMEOUT);
connect(eniro_, SIGNAL(requestFinished(QVector <Eniro::Result> const&,
Eniro::SearchDetails const&, bool)),
box_ = new InformationBox();
label_ = new QLabel("", box_);
- label_->setMargin(10);
+ label_->setMargin(8);
box_->setWidget(label_);
+ qDebug() << "Starting...";
+
}
void CallListener::end()
this,
SLOT(callTerminate()));
+ delete contactManager_;
+ contactManager_ = 0;
+ delete connectionManager_;
+ connectionManager_ = 0;
delete eniro_;
eniro_ = 0;
delete box_;
void CallListener::search(Eniro::SearchDetails const& details)
{
- label_->setText(tr("Searching..."));
- box_->show();
+ qDebug() << "Search called";
- DB::connect();
+ Eniro::Result result;
- QSqlQuery query;
- query.prepare("SELECT name, street, city FROM cache WHERE number = :number");
- query.bindValue(":number", details.query);
-
- if(query.exec() && query.next())
+ if(Cache::instance().findItem(details.query, result))
{
- showResult(createResult(query.value(0).toString(),
- query.value(1).toString(),
- query.value(2).toString()));
+ showDelayedResult(createResult(result.name,
+ result.street,
+ result.city), BANNER_DELAY);
}
else
{
+ 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);
}
- DB::disconnect();
-
}
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())
{
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)
{
}
else
{
- message = createResult(results.at(0).name, results.at(0).street, results.at(0).city);
- QSqlQuery query;
-
- DB::connect();
-
- query.prepare("INSERT INTO cache(number, name, street, city) VALUES(:number, :name, :street, :city)");
- query.bindValue(":number", details.query);
- query.bindValue(":name", results.at(0).name);
- query.bindValue(":street", results.at(0).street);
- query.bindValue(":city", results.at(0).city);
-
- if(!query.exec())
- {
- qDebug() << "Unable to save cache";
- }
+ 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);
+ }
- QString cacheSize = Settings::instance()->get("cache_size");
+ retries_ = -1;
+ currentSearch_ = "";
+ timedMessage_ = "";
- // Delete old entries from cache
- if(cacheSize.toInt() > 0)
- {
- if(!query.exec("DELETE c1 FROM cache AS c1 LEFT JOIN (SELECT id FROM cache ORDER BY id DESC LIMIT " + cacheSize + ") AS c2 ON c1.id = c2.id WHERE c2.id IS NULL"))
- {
- qDebug() << "Unable to delete old cache entries";
- }
- }
+ showResult(message);
- DB::disconnect();
+ if(closeConnection_ && connectionManager_)
+ {
+ connectionManager_->disconnect(true);
+ closeConnection_ = false;
}
- showResult(message);
+ delete connectionManager_;
+ connectionManager_ = 0;
}
void CallListener::showResult(QString const& text)
{
- label_->setText(text);
- box_->hide();
+ label_->setText("<font color='black'>" + text + "</font>");
+
+ if(box_->isVisible())
+ {
+ box_->hide();
+ }
+
box_->show();
}
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(),
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();
+ }
+
+ 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()));
+}
+
+void CallListener::showTimedMessage()
+{
+ if(timedMessage_.size() == 0)
+ {
+ return;
+ }
+
+ showResult(timedMessage_);
+
+ timedMessage_ = "";
}
projects / jenirok / blobdiff