#include "cache.h"
#include "contactmanager.h"
#include "connectionmanager.h"
+#include "sourcecoreconfig.h"
#include "db.h"
namespace
QDBusConnection CallListener::systemBus_ = QDBusConnection::systemBus();
-CallListener::CallListener(): eniro_(0),
+CallListener::CallListener(): source_(0),
closeConnection_(false), initialized_(false), box_(0), label_(0),
-retries_(-1), site_(Eniro::FI), timer_(0), autoconnect_(false)
+retries_(-1), timer_(0)
{
}
return false;
}
+ sourceId_ = Source::stringToId(Settings::instance()->get("source"));
+ QMap<QString, QString> tmpConfig;
+ SourceCoreConfig* config = SourceCoreConfig::getCoreConfig(sourceId_);
+ config->getConfig(tmpConfig);
+ sourceConfig_ = tmpConfig;
+ delete config;
+
systemBus_.connect(CALL_SERVICE_NAME,
CALL_SERVICE_PATH,
CALL_SERVICE_INTERFACE,
this,
SLOT(callTerminate()));
- site_ = Eniro::stringToSite(Settings::instance()->get("site"));
-
qDebug() << "Starting...";
return true;
SLOT(callTerminate()));
searchClose();
+ sourceConfig_.clear();
}
-void CallListener::search(Eniro::SearchDetails const& details)
+void CallListener::search(Source::SearchDetails const& details)
{
qDebug() << "Search called";
searchInit();
- Eniro::Result result;
+ Source::Result result;
if(Cache::instance().findItem(details.query, result))
{
qDebug() << "Starting to search...";
- eniro_->search(details);
+ source_->search(details);
}
}
-void CallListener::requestFinished(QVector <Eniro::Result> const& results,
- Eniro::SearchDetails const& details,
+void CallListener::requestFinished(QVector <Source::Result> const& results,
+ Source::SearchDetails const& details,
bool error)
{
+ if(closeConnection_)
+ {
+ closeConnection_ = false;
+ ConnectionManager cm;
+ cm.disconnect(true);
+ }
+
// If box is not visible, the call must have been terminated already
if(!initialized_ || !box_->isVisible())
{
if(error)
{
- qDebug() << "Error: " << eniro_->errorString();
+ qDebug() << "Error: " << source_->errorString();
if(retries_ < SEARCH_RETRIES && retries_ >= 0)
{
retries_++;
- eniro_->search(Eniro::SearchDetails(currentSearch_));
+ source_->search(Source::SearchDetails(currentSearch_, "", Source::BOTH));
return;
}
else
{
timedMessage_ = "";
QString errorString;
- Eniro::Error error = eniro_->error();
+ Source::Error error = source_->error();
switch(error)
{
- case Eniro::TIMEOUT:
+ case Source::TIMEOUT:
errorString = tr("Request timed out");
break;
default:
- errorString = eniro_->errorString();
+ errorString = source_->errorString();
break;
}
message = createResult(results.at(0).name, results.at(0).street,
results.at(0).city);
showResult(message);
- Eniro::Result result = results.at(0);
+ Source::Result result = results.at(0);
result.number = details.query;
Cache::instance().addItem(result);
}
retries_ = -1;
currentSearch_ = "";
-
- if(closeConnection_)
- {
- ConnectionManager cm;
- cm.disconnect(true);
- closeConnection_ = false;
- }
}
QString CallListener::createResult(QString const& name, QString const& street, QString const& city)
void CallListener::incomingCall(QDBusObjectPath path, QString number)
{
- qDebug() << "Incoming: " << number;
+ if(number.isEmpty())
+ {
+ qDebug() << "Unknown caller without number";
+ return;
+ }
ContactManager cm;
if(!cm.numberExists(number))
{
- qDebug() << "Number doesn't exist";
+ qDebug() << "Number doesn't exist: " << number;
systemBus_.connect(CALL_SERVICE_NAME,
path.path(),
this,
SLOT(callTerminate()));
- search(Eniro::SearchDetails(number));
+ search(Source::SearchDetails(number, "", Source::BOTH));
}
else
{
- qDebug() << "Number exists";
+ qDebug() << "Number exists: " << number;
}
}
box_->hide();
}
- if(closeConnection_)
- {
- ConnectionManager cm;
- cm.disconnect(true);
- closeConnection_ = false;
- }
-
searchClose();
}
return;
}
- 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)));
+ source_ = Source::getSource(sourceId_);
+ SourceCoreConfig* config = SourceCoreConfig::getCoreConfig(sourceId_);
+ config->loadFromConfig(sourceConfig_);
+ config->apply(source_);
+ delete config;
+ source_->setMaxResults(1);
+ source_->setFindNumber(false);
+ source_->setTimeout(REQUEST_TIMEOUT);
+
+ connect(source_, SIGNAL(requestFinished(QVector <Source::Result> const&,
+ Source::SearchDetails const&, bool)),
+ this, SLOT(requestFinished(QVector <Source::Result> const&,
+ Source::SearchDetails const&, bool)));
box_ = new InformationBox;
label_ = new QLabel("", box_);
label_->setMargin(8);
void CallListener::searchClose()
{
+ if(!initialized_)
+ {
+ return;
+ }
+
initialized_ = false;
qDebug() << "Closing search...";
- if(eniro_)
+ if(source_)
{
- disconnect(eniro_, SIGNAL(requestFinished(QVector <Eniro::Result> const&,
- Eniro::SearchDetails const&, bool)),
- this, SLOT(requestFinished(QVector <Eniro::Result> const&,
- Eniro::SearchDetails const&, bool)));
+ disconnect(source_, SIGNAL(requestFinished(QVector <Source::Result> const&,
+ Source::SearchDetails const&, bool)),
+ this, SLOT(requestFinished(QVector <Source::Result> const&,
+ Source::SearchDetails const&, bool)));
}
- delete eniro_;
- eniro_ = 0;
+ delete source_;
+ source_ = 0;
delete box_;
box_ = 0;
label_ = 0;
+
+ if(closeConnection_)
+ {
+ closeConnection_ = false;
+ ConnectionManager cm;
+ cm.disconnect(true);
+ }
}
bool CallListener::handleConnection()
if(configType == Settings::ALWAYS_ASK)
{
- showError(tr("Automatic connecting is not allowed by settings."));
+ showError(tr("Automatic connecting is not allowed by settings."), BANNER_DELAY);
return false;
}
}
int cretries = 0;
+ int scans = 0;
+ bool found = false;
+ int maxScans = GPRS_SCANS;
+
+ if(lookupType != ConnectionManager::GPRS)
+ {
+ maxScans = WLAN_SCANS;
+ }
while(cretries < CONNECTION_LOOKUP_RETRIES)
{
return false;
}
- if(cm.getBestConnection(best, lookupType))
+ if(scans < maxScans)
+ {
+ if(cm.getBestConnection(best, lookupType))
+ {
+ found = true;
+ }
+
+ scans++;
+ }
+
+ // If there is only gprs connection available,
+ // make sure that we are on 3g network
+ if(found && (best.type != ConnectionManager::GPRS || is3g()))
{
break;
}
+ if(found)
+ {
+ sleep(WAIT_BETWEEN_RETRIES);
+ }
+
qDebug() << "No connections found, retrying...";
cretries++;
- sleep(WAIT_BETWEEN_RETRIES);
-
}
if(cretries >= CONNECTION_LOOKUP_RETRIES)
return false;
}
- sleep(WAIT_BETWEEN_RETRIES);
+ qDebug() << "Connecting to " << best.name;
if(cm.connect(best.id))
{
return false;
}
- qDebug() << "Unable to connect, retrying...";
retries++;
+ qDebug() << "Unable to connect, retrying...";
+
+ if(retries < CONNECT_RETRIES)
+ {
+ sendRetrySignal(best.id, initialized_);
+ }
+
}
- if(initialized_ && retries >= CONNECT_RETRIES)
+ if(retries >= CONNECT_RETRIES)
{
- showError(tr("Unable to connect to network."));
+ sendRetrySignal(best.id, false);
+
+ if(initialized_)
+ {
+ showError(tr("Unable to connect to network."));
+ }
+
return false;
}
return initialized_;
}
-void CallListener::showError(QString const& msg)
+void CallListener::showError(QString const& msg, int timeout)
{
qDebug() << "Error: " << msg;
+
+ if(!initialized_ || !box_)
+ {
+ return;
+ }
+
box_->setTimeout(ERROR_BANNER_TIMEOUT);
- showResult(msg);
+
+ if(timeout)
+ {
+ showDelayedResult(msg, timeout);
+ }
+ else
+ {
+ showResult(msg);
+ }
+}
+
+bool CallListener::is3g()
+{
+ QDBusMessage msg = QDBusMessage::createMethodCall("com.nokia.phone.net",
+ "/com/nokia/phone/net",
+ "Phone.Net",
+ "get_registration_status");
+
+ QDBusMessage rep = systemBus_.call(msg);
+
+ if(rep.type() == QDBusMessage::ErrorMessage)
+ {
+ qDebug() << "Unable to get network status";
+ return false;
+ }
+
+ uint status = rep.arguments().value(6).toUInt();
+
+ if(status & 0x10 || status & 0x08)
+ {
+ return true;
+ }
+
+ return false;
+}
+
+void CallListener::sendRetrySignal(QString const& iap, bool retry)
+{
+ QDBusMessage msg = QDBusMessage::createSignal("/com/nokia/icd_ui",
+ "com.nokia.icd_ui",
+ "retry");
+
+ QList<QVariant> arguments;
+ arguments.append(QVariant(iap));
+ arguments.append(QVariant(retry));
+ msg.setArguments(arguments);
+
+ QDBusConnection::systemBus().send(msg);
+
+ qDebug() << "Retry signal sent";
}
void CallListener::timerEvent(QTimerEvent* event)
projects / jenirok / blobdiff