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)
{
}
this,
SLOT(callTerminate()));
+ delete contactManager_;
+ contactManager_ = 0;
+ delete connectionManager_;
+ connectionManager_ = 0;
delete eniro_;
eniro_ = 0;
delete box_;
void CallListener::search(Eniro::SearchDetails const& details)
{
- qDebug() << "Search called";
+ qDebug() << "Search called";
Eniro::Result result;
showDelayedResult(createResult(result.name,
result.street,
- result.city));
+ 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;
+ }
+
eniro_->search(details);
}
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)
{
Cache::instance().addItem(result);
}
- timedMessage_ = message;
+ retries_ = -1;
+ currentSearch_ = "";
- // Show banner after small delay
- showDelayedResult(message);
+ if(closeConnection_)
+ {
+ connectionManager_->disconnect();
+ closeConnection_ = false;
+ }
+
+ delete connectionManager_;
+ connectionManager_ = 0;
+
+ showResult(message);
}
{
box_->hide();
}
+
box_->show();
}
if(!contactManager_->numberExists(number))
{
- qDebug() << "Number doesn't exist";
+ qDebug() << "Number doesn't exist";
systemBus_.connect(CALL_SERVICE_NAME,
path.path(),
}
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();
+ closeConnection_ = false;
+ }
+
+ delete connectionManager_;
+ connectionManager_ = 0;
}
-void CallListener::showDelayedResult(QString const& text)
+void CallListener::showDelayedResult(QString const& text, int delay)
{
- timedMessage_ = text;
- QTimer::singleShot(BANNER_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_ = "";
}