mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

GPS provider: change haveGPS status if GPS source returns error

Browse source 
If the GPS source returns an error that could be an indication that the
user hasn't given us permission to use it, so switch our status to NOGPS.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-04-17 22:47:53 -07:00
parent b00306f50e
commit c0b44e25b7
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/gpslocation.cpp
View file

@ -66,6 +66,7 @@ QGeoPositionInfoSource *GpsLocation::getGpsSource()
status(QString("Created position source %1").arg(m_GpsSource->sourceName())); status(QString("Created position source %1").arg(m_GpsSource->sourceName()));
connect(m_GpsSource, SIGNAL(positionUpdated(QGeoPositionInfo)), this, SLOT(newPosition(QGeoPositionInfo))); connect(m_GpsSource, SIGNAL(positionUpdated(QGeoPositionInfo)), this, SLOT(newPosition(QGeoPositionInfo)));
connect(m_GpsSource, SIGNAL(updateTimeout()), this, SLOT(updateTimeout())); connect(m_GpsSource, SIGNAL(updateTimeout()), this, SLOT(updateTimeout()));
connect(m_GpsSource, SIGNAL(error(QGeoPositionInfoSource::Error)), this, SLOT(positionSourceError(QGeoPositionInfoSource::Error)));
m_GpsSource->setUpdateInterval(5 * 60 * 1000); // 5 minutes so the device doesn't drain the battery m_GpsSource->setUpdateInterval(5 * 60 * 1000); // 5 minutes so the device doesn't drain the battery
} else { } else {
#ifdef SUBSURFACE_MOBILE #ifdef SUBSURFACE_MOBILE
@ -154,6 +155,13 @@ void GpsLocation::updateTimeout()
status("request to get new position timed out"); status("request to get new position timed out");
} }
void GpsLocation::positionSourceError(QGeoPositionInfoSource::Error)
{
status("error receiving a GPS location");
haveSource = NOGPS;
emit haveSourceChanged();
}
void GpsLocation::status(QString msg) void GpsLocation::status(QString msg)
{ {
qDebug() << msg; qDebug() << msg;

3
core/gpslocation.h
View file

@ -20,7 +20,7 @@ struct gpsTracker {
int idx; int idx;
}; };
class GpsLocation : QObject { class GpsLocation : public QObject {
Q_OBJECT Q_OBJECT
public: public:
GpsLocation(void (*showMsgCB)(const char *msg), QObject *parent); GpsLocation(void (*showMsgCB)(const char *msg), QObject *parent);
@ -61,6 +61,7 @@ public slots:
void serviceEnable(bool toggle); void serviceEnable(bool toggle);
void newPosition(QGeoPositionInfo pos); void newPosition(QGeoPositionInfo pos);
void updateTimeout(); void updateTimeout();
void positionSourceError(QGeoPositionInfoSource::Error error);
void uploadToServer(); void uploadToServer();
void downloadFromServer(); void downloadFromServer();
void postError(QNetworkReply::NetworkError error); void postError(QNetworkReply::NetworkError error);