mirror of
https://github.com/subsurface/subsurface.git
synced 2024-12-01 06:30:26 +00:00
fd78f8dc1a
We really need to verify that the credentials are valid before trying to access our backend resources. Trying to do so in a clean manner caused quite a bit of changes to how we retrieve the webservice userid and how we load the dive list from cloud storage. So instead of accessing the network resources directly, this adds a handler function that first checks the validity of the credentials (by using the rederict handler on the cloud server), and only calls the function that does the actual work (looks up the web service userid, loads the dives) if that succeeds. Right now there is no good user feedback mechanism - this just gets logged on the log page. But this is a massive improvement if there are issues with network connectivity or if the user mistyped their credentials. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
100 lines
3.1 KiB
C++
100 lines
3.1 KiB
C++
#ifndef QMLMANAGER_H
|
|
#define QMLMANAGER_H
|
|
|
|
#include <QObject>
|
|
#include <QString>
|
|
#include <QNetworkAccessManager>
|
|
|
|
#include "gpslocation.h"
|
|
|
|
class QMLManager : public QObject
|
|
{
|
|
Q_OBJECT
|
|
Q_PROPERTY(QString cloudUserName READ cloudUserName WRITE setCloudUserName NOTIFY cloudUserNameChanged)
|
|
Q_PROPERTY(QString cloudPassword READ cloudPassword WRITE setCloudPassword NOTIFY cloudPasswordChanged)
|
|
Q_PROPERTY(bool saveCloudPassword READ saveCloudPassword WRITE setSaveCloudPassword NOTIFY saveCloudPasswordChanged)
|
|
Q_PROPERTY(QString logText READ logText WRITE setLogText NOTIFY logTextChanged)
|
|
Q_PROPERTY(bool locationServiceEnabled READ locationServiceEnabled WRITE setLocationServiceEnabled NOTIFY locationServiceEnabledChanged)
|
|
Q_PROPERTY(int distanceThreshold READ distanceThreshold WRITE setDistanceThreshold NOTIFY distanceThresholdChanged)
|
|
Q_PROPERTY(int timeThreshold READ timeThreshold WRITE setTimeThreshold NOTIFY timeThresholdChanged)
|
|
Q_PROPERTY(bool loadFromCloud READ loadFromCloud WRITE setLoadFromCloud NOTIFY loadFromCloudChanged)
|
|
public:
|
|
QMLManager();
|
|
~QMLManager();
|
|
|
|
static QMLManager *instance();
|
|
|
|
QString cloudUserName() const;
|
|
void setCloudUserName(const QString &cloudUserName);
|
|
|
|
QString cloudPassword() const;
|
|
void setCloudPassword(const QString &cloudPassword);
|
|
|
|
bool saveCloudPassword() const;
|
|
void setSaveCloudPassword(bool saveCloudPassword);
|
|
|
|
bool locationServiceEnabled() const;
|
|
void setLocationServiceEnabled(bool locationServiceEnable);
|
|
|
|
int distanceThreshold() const;
|
|
void setDistanceThreshold(int distance);
|
|
|
|
int timeThreshold() const;
|
|
void setTimeThreshold(int time);
|
|
|
|
bool loadFromCloud() const;
|
|
void setLoadFromCloud(bool done);
|
|
|
|
QString logText() const;
|
|
void setLogText(const QString &logText);
|
|
void appendTextToLog(const QString &newText);
|
|
|
|
typedef void(QMLManager::*execute_function_type)();
|
|
|
|
public slots:
|
|
void savePreferences();
|
|
void saveCloudCredentials();
|
|
void checkCredentialsAndExecute(execute_function_type execute);
|
|
void tryRetrieveDataFromBackend();
|
|
void handleError(QNetworkReply::NetworkError nError);
|
|
void handleSslErrors(const QList<QSslError> &errors);
|
|
void retrieveUserid();
|
|
void loadDives();
|
|
void loadDivesWithValidCredentials();
|
|
void provideAuth(QNetworkReply *reply, QAuthenticator *auth);
|
|
void commitChanges(QString diveId, QString suit, QString buddy, QString diveMaster, QString notes);
|
|
void saveChanges();
|
|
void addDive();
|
|
void applyGpsData();
|
|
void sendGpsData();
|
|
void clearGpsData();
|
|
void finishSetup();
|
|
|
|
private:
|
|
QString m_cloudUserName;
|
|
QString m_cloudPassword;
|
|
QString m_ssrfGpsWebUserid;
|
|
bool m_saveCloudPassword;
|
|
QString m_logText;
|
|
bool m_locationServiceEnabled;
|
|
int m_distanceThreshold;
|
|
int m_timeThreshold;
|
|
GpsLocation *locationProvider;
|
|
bool m_loadFromCloud;
|
|
static QMLManager *m_instance;
|
|
QNetworkReply *reply;
|
|
QNetworkRequest request;
|
|
QNetworkAccessManager *mgr;
|
|
|
|
signals:
|
|
void cloudUserNameChanged();
|
|
void cloudPasswordChanged();
|
|
void saveCloudPasswordChanged();
|
|
void locationServiceEnabledChanged();
|
|
void logTextChanged();
|
|
void timeThresholdChanged();
|
|
void distanceThresholdChanged();
|
|
void loadFromCloudChanged();
|
|
};
|
|
|
|
#endif
|