#include "calllistener.h"
#include "settings.h"
#include "cache.h"
+#include "contactmanager.h"
namespace
{
QDBusConnection CallListener::systemBus_ = QDBusConnection::systemBus();
-CallListener::CallListener(): eniro_(0), contactManager_(0),
-connectionManager_(0), closeConnection_(false), box_(0), label_(0),
-retries_(-1)
+CallListener::CallListener(): eniro_(0), connectionManager_(0),
+closeConnection_(false), initialized_(false), box_(0), label_(0),
+retries_(-1), site_(Eniro::FI)
{
}
this,
SLOT(callTerminate()));
- contactManager_ = new ContactManager;
-
- eniro_ = new Eniro(Eniro::stringToSite(Settings::instance()->get("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)));
-
- box_ = new InformationBox();
- label_ = new QLabel("", box_);
- label_->setMargin(8);
- box_->setWidget(label_);
+ site_ = Eniro::stringToSite(Settings::instance()->get("site"));
+ Settings::close();
qDebug() << "Starting...";
this,
SLOT(callTerminate()));
- delete contactManager_;
- contactManager_ = 0;
- delete connectionManager_;
- connectionManager_ = 0;
- delete eniro_;
- eniro_ = 0;
- delete box_;
- box_ = 0;
- delete label_;
- label_ = 0;
+ searchClose();
+
}
void CallListener::search(Eniro::SearchDetails const& details)
{
qDebug() << "Search called";
+ searchInit();
+
Eniro::Result result;
if(Cache::instance().findItem(details.query, result))
{
+ qDebug() << "Found from cache";
+
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;
+ showDelayedResult(tr("Searching..."), BANNER_DELAY);
if(!connectionManager_->isConnected())
{
closeConnection_ = false;
}
+ qDebug() << "Starting to search...";
+
eniro_->search(details);
}
bool error)
{
// If box is not visible, the call must have been terminated already
- if(!box_->isVisible())
+ if(!initialized_ || !box_->isVisible())
{
return;
}
}
else
{
+ timedMessage_ = "";
message = tr("Search failed:") + " " + eniro_->errorString() + ".";
+ showResult(message);
}
}
- else if(results.size() == 0)
- {
- message = tr("Phone number was not found");
- }
else
{
- 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_ = "";
+
+ if(results.size() == 0)
+ {
+ message = tr("Phone number was not found");
+ showResult(message);
+ }
+ else
+ {
+ message = createResult(results.at(0).name, results.at(0).street,
+ results.at(0).city);
+ showResult(message);
+ Eniro::Result result = results.at(0);
+ result.number = details.query;
+ Cache::instance().addItem(result);
+ }
}
retries_ = -1;
currentSearch_ = "";
- if(closeConnection_)
+ if(closeConnection_ && connectionManager_)
{
- connectionManager_->disconnect();
+ connectionManager_->disconnect(true);
closeConnection_ = false;
}
-
- delete connectionManager_;
- connectionManager_ = 0;
-
- showResult(message);
-
}
QString CallListener::createResult(QString const& name, QString const& street, QString const& city)
void CallListener::showResult(QString const& text)
{
+ if(!initialized_)
+ {
+ return;
+ }
+
label_->setText("<font color='black'>" + text + "</font>");
if(box_->isVisible())
{
qDebug() << "Incoming: " << number;
- if(!contactManager_->numberExists(number))
+ ContactManager cm;
+
+ if(!cm.numberExists(number))
{
qDebug() << "Number doesn't exist";
this,
SLOT(callTerminate()));
- qDebug() << "Going to search";
-
search(Eniro::SearchDetails(number));
}
else
void CallListener::callTerminate()
{
- if(box_->isVisible())
+ if(initialized_ && box_ && box_->isVisible())
{
box_->hide();
}
if(closeConnection_ && connectionManager_)
{
- connectionManager_->disconnect();
+ connectionManager_->disconnect(true);
closeConnection_ = false;
}
- delete connectionManager_;
- connectionManager_ = 0;
+ searchClose();
}
void CallListener::showDelayedResult(QString const& text, int delay)
void CallListener::showTimedMessage()
{
- if(timedMessage_.size() == 0)
+ if(timedMessage_.size() == 0 || !initialized_)
{
return;
}
timedMessage_ = "";
}
+
+void CallListener::searchInit()
+{
+ qDebug() << "Initializing search...";
+
+ 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)));
+ box_ = new InformationBox;
+ label_ = new QLabel("", box_);
+ label_->setMargin(8);
+ box_->setWidget(label_);
+ initialized_ = true;
+}
+
+void CallListener::searchClose()
+{
+ initialized_ = false;
+
+ qDebug() << "Closing search...";
+
+ if(eniro_)
+ {
+ disconnect(eniro_, SIGNAL(requestFinished(QVector <Eniro::Result> const&,
+ Eniro::SearchDetails const&, bool)),
+ this, SLOT(requestFinished(QVector <Eniro::Result> const&,
+ Eniro::SearchDetails const&, bool)));
+ }
+
+ delete connectionManager_;
+ connectionManager_ = 0;
+ delete eniro_;
+ eniro_ = 0;
+ delete box_;
+ box_ = 0;
+}