2017-04-27 18:30:36 +00:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2015-06-04 10:29:50 +00:00
|
|
|
#include "qmlmanager.h"
|
2015-06-04 10:36:36 +00:00
|
|
|
#include <QUrl>
|
2015-07-10 07:47:26 +00:00
|
|
|
#include <QSettings>
|
2015-07-13 00:39:13 +00:00
|
|
|
#include <QDebug>
|
2015-12-05 03:34:59 +00:00
|
|
|
#include <QNetworkAccessManager>
|
|
|
|
|
#include <QAuthenticator>
|
2015-12-26 21:22:50 +00:00
|
|
|
#include <QDesktopServices>
|
2016-01-08 06:30:58 +00:00
|
|
|
#include <QTextDocument>
|
2016-03-11 02:36:46 +00:00
|
|
|
#include <QRegularExpression>
|
2016-04-03 23:13:22 +00:00
|
|
|
#include <QApplication>
|
|
|
|
|
#include <QElapsedTimer>
|
2016-06-13 22:21:51 +00:00
|
|
|
#include <QTimer>
|
2017-07-18 18:25:41 +00:00
|
|
|
#include <QDateTime>
|
2017-10-16 01:43:38 +00:00
|
|
|
|
|
|
|
|
#if defined(BT_SUPPORT)
|
2017-10-12 07:43:40 +00:00
|
|
|
#include <QBluetoothLocalDevice>
|
2017-10-16 01:43:38 +00:00
|
|
|
#endif
|
2015-06-04 10:29:50 +00:00
|
|
|
|
2015-06-11 06:56:18 +00:00
|
|
|
#include "qt-models/divelistmodel.h"
|
2016-04-05 05:02:03 +00:00
|
|
|
#include "qt-models/gpslistmodel.h"
|
|
|
|
|
#include "core/divelist.h"
|
|
|
|
|
#include "core/device.h"
|
|
|
|
|
#include "core/pref.h"
|
|
|
|
|
#include "core/qthelper.h"
|
|
|
|
|
#include "core/qt-gui.h"
|
|
|
|
|
#include "core/git-access.h"
|
|
|
|
|
#include "core/cloudstorage.h"
|
2016-04-22 14:08:23 +00:00
|
|
|
#include "core/subsurface-qt/SettingsObjectWrapper.h"
|
2016-04-29 13:28:09 +00:00
|
|
|
#include "core/membuffer.h"
|
2016-08-30 14:24:19 +00:00
|
|
|
#include "qt-models/tankinfomodel.h"
|
2017-05-12 16:29:45 +00:00
|
|
|
#include "core/downloadfromdcthread.h"
|
2015-07-13 00:39:13 +00:00
|
|
|
|
2015-12-03 23:59:40 +00:00
|
|
|
QMLManager *QMLManager::m_instance = NULL;
|
|
|
|
|
|
2016-03-11 05:59:16 +00:00
|
|
|
#define RED_FONT QLatin1Literal("<font color=\"red\">")
|
|
|
|
|
#define END_FONT QLatin1Literal("</font>")
|
|
|
|
|
|
2016-04-30 13:51:26 +00:00
|
|
|
#define NOCLOUD_LOCALSTORAGE format_string("%s/cloudstorage/localrepo[master]", system_default_directory())
|
|
|
|
|
|
2017-07-09 23:07:48 +00:00
|
|
|
static void progressCallback(const char *text)
|
|
|
|
|
{
|
|
|
|
|
QMLManager *self = QMLManager::instance();
|
|
|
|
|
if (self) {
|
|
|
|
|
self->appendTextToLog(QString(text));
|
|
|
|
|
self->setProgressMessage(QString(text));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-12-03 23:59:40 +00:00
|
|
|
static void appendTextToLogStandalone(const char *text)
|
2015-07-13 00:39:13 +00:00
|
|
|
{
|
2016-01-26 14:45:03 +00:00
|
|
|
QMLManager *self = QMLManager::instance();
|
|
|
|
|
if (self)
|
|
|
|
|
self->appendTextToLog(QString(text));
|
2015-07-13 00:39:13 +00:00
|
|
|
}
|
2015-06-09 19:20:44 +00:00
|
|
|
|
2017-06-18 06:22:37 +00:00
|
|
|
// show the git progress in the passive notification area
|
|
|
|
|
extern "C" int gitProgressCB(const char *text)
|
2015-12-15 07:00:19 +00:00
|
|
|
{
|
2016-04-03 23:13:22 +00:00
|
|
|
static QElapsedTimer timer;
|
2017-06-18 06:50:22 +00:00
|
|
|
static qint64 lastTime = 0;
|
2016-04-06 04:16:25 +00:00
|
|
|
static QMLManager *self;
|
|
|
|
|
|
|
|
|
|
if (!self)
|
|
|
|
|
self = QMLManager::instance();
|
2015-12-15 07:00:19 +00:00
|
|
|
|
2017-06-18 06:22:37 +00:00
|
|
|
if (!timer.isValid()) {
|
2016-04-03 23:13:22 +00:00
|
|
|
timer.restart();
|
|
|
|
|
lastTime = 0;
|
|
|
|
|
}
|
|
|
|
|
if (self) {
|
|
|
|
|
qint64 elapsed = timer.elapsed();
|
2017-06-18 06:22:37 +00:00
|
|
|
self->appendTextToLog(text);
|
|
|
|
|
self->setNotificationText(text);
|
2017-06-18 06:50:22 +00:00
|
|
|
if (elapsed - lastTime > 50) { // 20 Hz refresh
|
|
|
|
|
qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
|
|
|
|
|
}
|
2016-04-03 23:13:22 +00:00
|
|
|
lastTime = elapsed;
|
2015-12-15 07:00:19 +00:00
|
|
|
}
|
|
|
|
|
// return 0 so that we don't end the download
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2017-10-16 02:17:58 +00:00
|
|
|
#if defined(BT_SUPPORT)
|
2017-10-12 07:43:40 +00:00
|
|
|
void QMLManager::btHostModeChange(QBluetoothLocalDevice::HostMode state)
|
|
|
|
|
{
|
|
|
|
|
BTDiscovery *btDiscovery = BTDiscovery::instance();
|
|
|
|
|
|
|
|
|
|
qDebug() << "btHostModeChange to " << state;
|
|
|
|
|
if (state != QBluetoothLocalDevice::HostPoweredOff) {
|
|
|
|
|
connectionListModel.removeAllAddresses();
|
|
|
|
|
btDiscovery->BTDiscoveryReDiscover();
|
|
|
|
|
m_btEnabled = btDiscovery->btAvailable();
|
|
|
|
|
} else {
|
|
|
|
|
connectionListModel.removeAllAddresses();
|
|
|
|
|
set_non_bt_addresses();
|
|
|
|
|
m_btEnabled = false;
|
|
|
|
|
}
|
|
|
|
|
emit btEnabledChanged();
|
|
|
|
|
}
|
2017-10-16 01:43:38 +00:00
|
|
|
#endif
|
2017-10-12 07:43:40 +00:00
|
|
|
|
2016-01-11 14:14:45 +00:00
|
|
|
QMLManager::QMLManager() : m_locationServiceEnabled(false),
|
2016-01-07 00:56:08 +00:00
|
|
|
m_verboseEnabled(false),
|
2016-02-29 14:53:26 +00:00
|
|
|
reply(0),
|
|
|
|
|
deletedDive(0),
|
2016-03-09 03:29:56 +00:00
|
|
|
deletedTrip(0),
|
2016-04-18 05:54:53 +00:00
|
|
|
m_updateSelectedDive(-1),
|
|
|
|
|
m_selectedDiveTimestamp(0),
|
2017-08-03 12:55:09 +00:00
|
|
|
m_credentialStatus(CS_UNKNOWN),
|
2017-06-08 11:38:52 +00:00
|
|
|
alreadySaving(false),
|
2017-07-10 01:08:06 +00:00
|
|
|
m_device_data(new DCDeviceData(this)),
|
|
|
|
|
m_libdcLog(false)
|
2015-06-04 10:29:50 +00:00
|
|
|
{
|
2015-12-03 23:59:40 +00:00
|
|
|
m_instance = this;
|
2017-04-04 00:29:06 +00:00
|
|
|
m_lastDevicePixelRatio = qApp->devicePixelRatio();
|
QML UI: don't immediately save data after we make changes
Much as this felt like the prudent thing to do, it makes the UI painful
to use. In bad network conditions, with a large dive log, on a phone,
the save operation can take more than a minute - which is just completely
ludicrous.
So instead we mark the dive list changed when we make changes and wait
for the app to not be in the foreground. Once the OS tells us that we are
hidden (on the desktop that generally means we don't have focus, on a
mobile device it usually does mean that the app is not on the screen), we
check if there are data to be saved and do so.
There is of course a major problem with this logic. If the user switches
away from Subsurface-mobile but comes back fairly quickly (just reacting
to a notification or briefly checking something, changing a song,
something... then the app may still be non-responsive for quite a while.
So we need to do something about the time it takes us to save the git
tree locally, and then figure out if we can move at least some of the
network traffic to another thread.
And we need to make sure the user immediately notices that the app is not
crashed but is actually saving their data. But that's for another commit.
tl;dr: CAREFUL, don't kill Subsurface-mobile before it had time to save
your data or your changes may be gone. In typical use that shouldn't be
an issue, but it is something that we need to tell the user about.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-04 00:37:17 +00:00
|
|
|
connect(qobject_cast<QApplication *>(QApplication::instance()), &QApplication::applicationStateChanged, this, &QMLManager::applicationStateChanged);
|
2017-07-10 00:03:57 +00:00
|
|
|
|
2017-07-10 01:23:16 +00:00
|
|
|
QString libdcLogFileName = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation).first() + "/libdivecomputer.log";
|
|
|
|
|
logfile_name = strdup(libdcLogFileName.toUtf8().data());
|
2017-07-10 00:03:57 +00:00
|
|
|
#if defined(Q_OS_ANDROID)
|
|
|
|
|
appLogFileName = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation).first() + "/subsurface.log";
|
|
|
|
|
appLogFile.setFileName(appLogFileName);
|
2017-07-18 18:25:41 +00:00
|
|
|
if (!appLogFile.open(QIODevice::ReadWrite|QIODevice::Truncate)) {
|
2017-07-10 00:03:57 +00:00
|
|
|
appLogFileOpen = false;
|
2017-07-18 18:25:41 +00:00
|
|
|
appendTextToLog("Failed to open logfile " + appLogFileName
|
|
|
|
|
+ " at " + QDateTime::currentDateTime().toString());
|
2017-07-10 00:03:57 +00:00
|
|
|
} else {
|
|
|
|
|
appLogFileOpen = true;
|
2017-07-18 18:25:41 +00:00
|
|
|
appendTextToLog("Successfully opened logfile " + appLogFileName
|
|
|
|
|
+ " at " + QDateTime::currentDateTime().toString());
|
2017-07-10 00:03:57 +00:00
|
|
|
}
|
|
|
|
|
#endif
|
2017-06-18 06:23:41 +00:00
|
|
|
appendTextToLog("Starting " + getUserAgent());
|
2017-11-27 18:11:52 +00:00
|
|
|
appendTextToLog(QStringLiteral("built with libdivecomputer v%1").arg(dc_version(NULL)));
|
|
|
|
|
appendTextToLog(QStringLiteral("built with Qt Version %1, runtime from Qt Version %2").arg(QT_VERSION_STR).arg(qVersion()));
|
|
|
|
|
int git_maj, git_min, git_rev;
|
|
|
|
|
git_libgit2_version(&git_maj, &git_min, &git_rev);
|
|
|
|
|
appendTextToLog(QStringLiteral("built with libgit2 %1.%2.%3").arg(git_maj).arg(git_min).arg(git_rev));
|
2016-02-11 01:31:52 +00:00
|
|
|
setStartPageText(tr("Starting..."));
|
2017-07-06 13:34:16 +00:00
|
|
|
|
|
|
|
|
#if defined(BT_SUPPORT)
|
|
|
|
|
// ensure that we start the BTDiscovery - this should be triggered by the export of the class
|
|
|
|
|
// to QML, but that doesn't seem to always work
|
|
|
|
|
BTDiscovery *btDiscovery = BTDiscovery::instance();
|
2017-07-12 11:14:24 +00:00
|
|
|
m_btEnabled = btDiscovery->btAvailable();
|
2017-10-12 07:43:40 +00:00
|
|
|
connect(&btDiscovery->localBtDevice, &QBluetoothLocalDevice::hostModeStateChanged,
|
|
|
|
|
this, &QMLManager::btHostModeChange);
|
2017-07-12 11:14:24 +00:00
|
|
|
#else
|
|
|
|
|
m_btEnabled = false;
|
2017-07-06 13:34:16 +00:00
|
|
|
#endif
|
2016-06-13 23:41:26 +00:00
|
|
|
setShowPin(false);
|
2015-11-11 20:32:54 +00:00
|
|
|
// create location manager service
|
2015-12-03 23:59:40 +00:00
|
|
|
locationProvider = new GpsLocation(&appendTextToLogStandalone, this);
|
2017-07-09 23:07:48 +00:00
|
|
|
progress_callback = &progressCallback;
|
2016-04-18 05:54:53 +00:00
|
|
|
connect(locationProvider, SIGNAL(haveSourceChanged()), this, SLOT(hasLocationSourceChanged()));
|
|
|
|
|
setLocationServiceAvailable(locationProvider->hasLocationsSource());
|
2015-12-15 07:00:19 +00:00
|
|
|
set_git_update_cb(&gitProgressCB);
|
2016-02-08 19:08:49 +00:00
|
|
|
|
|
|
|
|
// make sure we know if the current cloud repo has been successfully synced
|
|
|
|
|
syncLoadFromCloud();
|
2015-12-05 03:34:59 +00:00
|
|
|
}
|
2015-11-11 20:32:54 +00:00
|
|
|
|
QML UI: don't immediately save data after we make changes
Much as this felt like the prudent thing to do, it makes the UI painful
to use. In bad network conditions, with a large dive log, on a phone,
the save operation can take more than a minute - which is just completely
ludicrous.
So instead we mark the dive list changed when we make changes and wait
for the app to not be in the foreground. Once the OS tells us that we are
hidden (on the desktop that generally means we don't have focus, on a
mobile device it usually does mean that the app is not on the screen), we
check if there are data to be saved and do so.
There is of course a major problem with this logic. If the user switches
away from Subsurface-mobile but comes back fairly quickly (just reacting
to a notification or briefly checking something, changing a song,
something... then the app may still be non-responsive for quite a while.
So we need to do something about the time it takes us to save the git
tree locally, and then figure out if we can move at least some of the
network traffic to another thread.
And we need to make sure the user immediately notices that the app is not
crashed but is actually saving their data. But that's for another commit.
tl;dr: CAREFUL, don't kill Subsurface-mobile before it had time to save
your data or your changes may be gone. In typical use that shouldn't be
an issue, but it is something that we need to tell the user about.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-04 00:37:17 +00:00
|
|
|
void QMLManager::applicationStateChanged(Qt::ApplicationState state)
|
|
|
|
|
{
|
|
|
|
|
if (!timer.isValid())
|
|
|
|
|
timer.start();
|
|
|
|
|
QString stateText;
|
|
|
|
|
switch (state) {
|
|
|
|
|
case Qt::ApplicationActive: stateText = "active"; break;
|
|
|
|
|
case Qt::ApplicationHidden: stateText = "hidden"; break;
|
|
|
|
|
case Qt::ApplicationSuspended: stateText = "suspended"; break;
|
|
|
|
|
case Qt::ApplicationInactive: stateText = "inactive"; break;
|
|
|
|
|
default: stateText = QString("none of the four: 0x") + QString::number(state, 16);
|
|
|
|
|
}
|
2016-04-18 13:15:54 +00:00
|
|
|
stateText.prepend("AppState changed to ");
|
QML UI: don't immediately save data after we make changes
Much as this felt like the prudent thing to do, it makes the UI painful
to use. In bad network conditions, with a large dive log, on a phone,
the save operation can take more than a minute - which is just completely
ludicrous.
So instead we mark the dive list changed when we make changes and wait
for the app to not be in the foreground. Once the OS tells us that we are
hidden (on the desktop that generally means we don't have focus, on a
mobile device it usually does mean that the app is not on the screen), we
check if there are data to be saved and do so.
There is of course a major problem with this logic. If the user switches
away from Subsurface-mobile but comes back fairly quickly (just reacting
to a notification or briefly checking something, changing a song,
something... then the app may still be non-responsive for quite a while.
So we need to do something about the time it takes us to save the git
tree locally, and then figure out if we can move at least some of the
network traffic to another thread.
And we need to make sure the user immediately notices that the app is not
crashed but is actually saving their data. But that's for another commit.
tl;dr: CAREFUL, don't kill Subsurface-mobile before it had time to save
your data or your changes may be gone. In typical use that shouldn't be
an issue, but it is something that we need to tell the user about.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-04 00:37:17 +00:00
|
|
|
stateText.append(" with ");
|
|
|
|
|
stateText.append((alreadySaving ? QLatin1Literal("") : QLatin1Literal("no ")) + QLatin1Literal("save ongoing"));
|
2016-04-04 17:57:44 +00:00
|
|
|
stateText.append(" and ");
|
|
|
|
|
stateText.append((unsaved_changes() ? QLatin1Literal("") : QLatin1Literal("no ")) + QLatin1Literal("unsaved changes"));
|
QML UI: don't immediately save data after we make changes
Much as this felt like the prudent thing to do, it makes the UI painful
to use. In bad network conditions, with a large dive log, on a phone,
the save operation can take more than a minute - which is just completely
ludicrous.
So instead we mark the dive list changed when we make changes and wait
for the app to not be in the foreground. Once the OS tells us that we are
hidden (on the desktop that generally means we don't have focus, on a
mobile device it usually does mean that the app is not on the screen), we
check if there are data to be saved and do so.
There is of course a major problem with this logic. If the user switches
away from Subsurface-mobile but comes back fairly quickly (just reacting
to a notification or briefly checking something, changing a song,
something... then the app may still be non-responsive for quite a while.
So we need to do something about the time it takes us to save the git
tree locally, and then figure out if we can move at least some of the
network traffic to another thread.
And we need to make sure the user immediately notices that the app is not
crashed but is actually saving their data. But that's for another commit.
tl;dr: CAREFUL, don't kill Subsurface-mobile before it had time to save
your data or your changes may be gone. In typical use that shouldn't be
an issue, but it is something that we need to tell the user about.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-04 00:37:17 +00:00
|
|
|
appendTextToLog(stateText);
|
|
|
|
|
|
|
|
|
|
if (!alreadySaving && state == Qt::ApplicationInactive && unsaved_changes()) {
|
|
|
|
|
// FIXME
|
|
|
|
|
// make sure the user sees that we are saving data if they come back
|
|
|
|
|
// while this is running
|
2016-04-08 19:35:45 +00:00
|
|
|
saveChangesCloud(false);
|
QML UI: don't immediately save data after we make changes
Much as this felt like the prudent thing to do, it makes the UI painful
to use. In bad network conditions, with a large dive log, on a phone,
the save operation can take more than a minute - which is just completely
ludicrous.
So instead we mark the dive list changed when we make changes and wait
for the app to not be in the foreground. Once the OS tells us that we are
hidden (on the desktop that generally means we don't have focus, on a
mobile device it usually does mean that the app is not on the screen), we
check if there are data to be saved and do so.
There is of course a major problem with this logic. If the user switches
away from Subsurface-mobile but comes back fairly quickly (just reacting
to a notification or briefly checking something, changing a song,
something... then the app may still be non-responsive for quite a while.
So we need to do something about the time it takes us to save the git
tree locally, and then figure out if we can move at least some of the
network traffic to another thread.
And we need to make sure the user immediately notices that the app is not
crashed but is actually saving their data. But that's for another commit.
tl;dr: CAREFUL, don't kill Subsurface-mobile before it had time to save
your data or your changes may be gone. In typical use that shouldn't be
an issue, but it is something that we need to tell the user about.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-04 00:37:17 +00:00
|
|
|
appendTextToLog(QString::number(timer.elapsed() / 1000.0,'f', 3) + ": done saving to git local / remote");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-02-09 15:53:22 +00:00
|
|
|
void QMLManager::openLocalThenRemote(QString url)
|
|
|
|
|
{
|
|
|
|
|
clear_dive_file_data();
|
2017-06-18 06:22:37 +00:00
|
|
|
setNotificationText(tr("Open local dive data file"));
|
2016-02-09 15:53:22 +00:00
|
|
|
QByteArray fileNamePrt = QFile::encodeName(url);
|
2016-04-04 01:33:40 +00:00
|
|
|
bool glo = prefs.git_local_only;
|
2016-02-09 15:53:22 +00:00
|
|
|
prefs.git_local_only = true;
|
|
|
|
|
int error = parse_file(fileNamePrt.data());
|
2016-04-04 01:33:40 +00:00
|
|
|
prefs.git_local_only = glo;
|
2016-02-09 15:53:22 +00:00
|
|
|
if (error) {
|
2016-03-13 15:58:57 +00:00
|
|
|
appendTextToLog(QStringLiteral("loading dives from cache failed %1").arg(error));
|
2017-06-18 06:22:37 +00:00
|
|
|
setNotificationText(tr("Opening local data file failed"));
|
2017-10-17 11:28:36 +00:00
|
|
|
/* there can be 2 reasons for this:
|
|
|
|
|
* 1) we have cloud credentials, but there is no local repo (yet).
|
|
|
|
|
* This implies that the PIN verify is still to be done.
|
|
|
|
|
* 2) we are in a very clean state after installing the app, and
|
|
|
|
|
* want to use a NO CLOUD setup. The intial repo has no initial
|
|
|
|
|
* commit in it, so its master branch does not yet exist. We do not
|
|
|
|
|
* care about this, as the very first commit of dive data to the
|
|
|
|
|
* no cloud repo solves this.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
if (credentialStatus() != CS_NOCLOUD)
|
|
|
|
|
setCredentialStatus(CS_NEED_TO_VERIFY);
|
2016-02-09 15:53:22 +00:00
|
|
|
} else {
|
mobile: remove superfluous state VALID_EMAIL
This is a no-brainer removal of the VALID_EMAIL state used in QMLManager.
All current usage of this state is "if state is VALID or VALID_EMAIL",
so there is no distinction between the two states.
It is even a little different. The comment suggests "when we can open
a local cloud storage, tied to a cloud account (so explicitly not
the no-cloud status), we have at least a valid email". While this
is formally true, this implies that there is also a cloud account
on the cloud server (ie. the cloud account is in a VERIFIED state).
In other words: currently, there can't exist a valid local storage
that is tied to a valid email adress, without valid cloud account
on the server.
Notice that this touches the discussion on GitHub for commit
e76f527fe530636 (pull request #520). Can we implement the creation
of a valid cloud account without data link to the cloud server?
Currently, we need the server to confirm the email address (for
example for uniqueness reasons on server side). Obviously, we could
hack our way out of this, but we have a perfect solution already
in place. Create a no-cloud account, and transfer that later to
a true and valid cloud account.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-08-01 09:38:59 +00:00
|
|
|
// if we can load from the cache, we know that we have a valid cloud account
|
2017-08-03 12:55:09 +00:00
|
|
|
if (credentialStatus() == CS_UNKNOWN)
|
|
|
|
|
setCredentialStatus(CS_VERIFIED);
|
2017-02-04 16:55:25 +00:00
|
|
|
prefs.unit_system = git_prefs.unit_system;
|
|
|
|
|
if (git_prefs.unit_system == IMPERIAL)
|
|
|
|
|
git_prefs.units = IMPERIAL_units;
|
2017-03-11 23:21:23 +00:00
|
|
|
else if (git_prefs.unit_system == METRIC)
|
|
|
|
|
git_prefs.units = SI_units;
|
2017-02-04 16:55:25 +00:00
|
|
|
prefs.units = git_prefs.units;
|
2017-02-04 09:42:00 +00:00
|
|
|
prefs.tankbar = git_prefs.tankbar;
|
|
|
|
|
prefs.dcceiling = git_prefs.dcceiling;
|
2017-03-25 12:03:37 +00:00
|
|
|
prefs.show_ccr_setpoint = git_prefs.show_ccr_setpoint;
|
|
|
|
|
prefs.show_ccr_sensors = git_prefs.show_ccr_sensors;
|
|
|
|
|
prefs.pp_graphs.po2 = git_prefs.pp_graphs.po2;
|
2016-02-09 15:53:22 +00:00
|
|
|
process_dives(false, false);
|
|
|
|
|
DiveListModel::instance()->clear();
|
2016-04-06 04:17:37 +00:00
|
|
|
DiveListModel::instance()->addAllDives();
|
|
|
|
|
appendTextToLog(QStringLiteral("%1 dives loaded from cache").arg(dive_table.nr));
|
2017-06-18 06:22:37 +00:00
|
|
|
setNotificationText(tr("%1 dives loaded from local dive data file").arg(dive_table.nr));
|
2016-02-09 15:53:22 +00:00
|
|
|
}
|
2017-09-27 15:08:30 +00:00
|
|
|
if (credentialStatus() == CS_NEED_TO_VERIFY) {
|
|
|
|
|
appendTextToLog(QStringLiteral("have cloud credentials, but still needs PIN"));
|
|
|
|
|
setShowPin(true);
|
|
|
|
|
}
|
2017-08-03 12:55:09 +00:00
|
|
|
if (oldStatus() == CS_NOCLOUD) {
|
|
|
|
|
// if we switch to credentials from CS_NOCLOUD, we take things online temporarily
|
2016-04-29 13:28:09 +00:00
|
|
|
prefs.git_local_only = false;
|
|
|
|
|
appendTextToLog(QStringLiteral("taking things online to be able to switch to cloud account"));
|
|
|
|
|
}
|
2016-04-06 18:44:58 +00:00
|
|
|
set_filename(fileNamePrt.data(), true);
|
2016-04-08 19:35:45 +00:00
|
|
|
if (prefs.git_local_only) {
|
|
|
|
|
appendTextToLog(QStringLiteral("have cloud credentials, but user asked not to connect to network"));
|
2016-04-14 12:42:08 +00:00
|
|
|
alreadySaving = false;
|
2016-04-08 19:35:45 +00:00
|
|
|
} else {
|
|
|
|
|
appendTextToLog(QStringLiteral("have cloud credentials, trying to connect"));
|
|
|
|
|
tryRetrieveDataFromBackend();
|
|
|
|
|
}
|
2016-02-09 15:53:22 +00:00
|
|
|
}
|
|
|
|
|
|
2016-04-29 13:28:09 +00:00
|
|
|
void QMLManager::mergeLocalRepo()
|
|
|
|
|
{
|
2016-04-30 13:51:26 +00:00
|
|
|
char *filename = NOCLOUD_LOCALSTORAGE;
|
2016-04-29 13:28:09 +00:00
|
|
|
parse_file(filename);
|
|
|
|
|
process_dives(true, false);
|
|
|
|
|
}
|
|
|
|
|
|
mobile: No cloud repo creation more explicit
Before this change, there was only one way to create the local
no cloud repo on the device. The user needed to add at least
one dive to the no cloud account (so that there is something
to save). While this worked in some scenarios, it could also
get things in an inconsistent state: credential status = CS_NOCLOUD
but no local repo. This was a dead end.
In this commit, the creation of the no cloud repo is made more
explicit. When asking for no cloud mode, just create an (empty)
repo for it when it does not yet exist, and otherwise, just
open the existing (possibly empty) repo.
Now, a user can have no cloud repo, next to (any number of)
cloud accounts.
This leaves one functional aspect left: how does a user abandon
the no cloud repo, by merging his data into a true cloud
account. This is code for this, that tries to do this merge in
a smart way. This seems to be broken (too). To be clear: this
is no part of this commit.
Fixes: #667
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-10-17 07:51:00 +00:00
|
|
|
void QMLManager::clearCredentials()
|
|
|
|
|
{
|
|
|
|
|
setCloudUserName(NULL);
|
|
|
|
|
setCloudPassword(NULL);
|
|
|
|
|
setCloudPin(NULL);
|
|
|
|
|
}
|
|
|
|
|
|
2017-09-27 15:24:03 +00:00
|
|
|
void QMLManager::cancelCredentialsPinSetup()
|
|
|
|
|
{
|
|
|
|
|
/*
|
|
|
|
|
* The user selected <cancel> on the final stage of the
|
|
|
|
|
* cloud account generation (entering the emailed PIN).
|
|
|
|
|
*
|
2017-10-08 08:36:40 +00:00
|
|
|
* Resets the cloud credential status to CS_UNKNOWN, resulting
|
|
|
|
|
* in a return to the first crededentials page, with the
|
|
|
|
|
* email and passwd still filled in. In case of a cancel
|
|
|
|
|
* of registration (from the PIN page), the email address
|
|
|
|
|
* was probably misspelled, so the user never received a PIN to
|
|
|
|
|
* complete the process.
|
2017-09-27 15:24:03 +00:00
|
|
|
*
|
2017-10-08 08:36:40 +00:00
|
|
|
* Notice that this function is also used to switch to a different
|
|
|
|
|
* cloud account, so the name is not perfect.
|
2017-09-27 15:24:03 +00:00
|
|
|
*/
|
|
|
|
|
QSettings s;
|
|
|
|
|
|
|
|
|
|
setCredentialStatus(CS_UNKNOWN);
|
|
|
|
|
s.beginGroup("CloudStorage");
|
|
|
|
|
s.setValue("email", cloudUserName());
|
|
|
|
|
s.setValue("password", cloudPassword());
|
|
|
|
|
s.setValue("cloud_verification_status", credentialStatus());
|
|
|
|
|
s.sync();
|
|
|
|
|
setStartPageText(tr("Starting..."));
|
|
|
|
|
|
|
|
|
|
setShowPin(false);
|
|
|
|
|
}
|
|
|
|
|
|
2015-12-05 03:34:59 +00:00
|
|
|
void QMLManager::finishSetup()
|
|
|
|
|
{
|
2015-11-11 20:32:54 +00:00
|
|
|
// Initialize cloud credentials.
|
2015-07-10 07:47:26 +00:00
|
|
|
setCloudUserName(prefs.cloud_storage_email);
|
|
|
|
|
setCloudPassword(prefs.cloud_storage_password);
|
2016-04-08 19:35:45 +00:00
|
|
|
setSyncToCloud(!prefs.git_local_only);
|
2017-09-09 11:15:14 +00:00
|
|
|
setCredentialStatus((cloud_status_qml) prefs.cloud_verification_status);
|
2015-11-18 21:14:19 +00:00
|
|
|
// if the cloud credentials are valid, we should get the GPS Webservice ID as well
|
2015-12-27 16:32:15 +00:00
|
|
|
QString url;
|
2016-02-11 01:31:52 +00:00
|
|
|
if (!cloudUserName().isEmpty() &&
|
|
|
|
|
!cloudPassword().isEmpty() &&
|
2015-12-27 16:32:15 +00:00
|
|
|
getCloudURL(url) == 0) {
|
2016-04-06 18:47:12 +00:00
|
|
|
// we know that we are the first ones to access git storage, so we don't need to test,
|
|
|
|
|
// but we need to make sure we stay the only ones accessing git storage
|
|
|
|
|
alreadySaving = true;
|
2016-02-09 15:53:22 +00:00
|
|
|
openLocalThenRemote(url);
|
2017-09-26 15:26:54 +00:00
|
|
|
} else if (!same_string(existing_filename, "") && credentialStatus() != CS_UNKNOWN) {
|
2017-08-03 12:55:09 +00:00
|
|
|
setCredentialStatus(CS_NOCLOUD);
|
QML UI: rework single credential page to two pages
This commit tries to implement most of issue #515. It reworks the
one credential page, which its dynamic PIN part, into two pages.
Main driver of selecting one of the two pages is the showPin
boolean. Page 1 contains the email/passwd field (and the
option to use a no cloud setup). Page 2 only contains the PIN
part (and the option to cancel the process).
The Kirigami central button does not seem very handy here. We
need, for example, a cancel, sign-in and register, only register,
etc. buttons, which are not easy to handle in specific icons.
Therefore, normal pushbuttons are chosen to deal with user
interaction, and the Kirigami button is removed from these
pages.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-09-27 17:11:23 +00:00
|
|
|
saveCloudCredentials();
|
2016-04-22 14:13:14 +00:00
|
|
|
appendTextToLog(tr("working in no-cloud mode"));
|
2016-04-27 13:14:13 +00:00
|
|
|
int error = parse_file(existing_filename);
|
|
|
|
|
if (error) {
|
|
|
|
|
// we got an error loading the local file
|
|
|
|
|
appendTextToLog(QString("got error %2 when parsing file %1").arg(existing_filename, get_error_string()));
|
2017-06-18 06:22:37 +00:00
|
|
|
setNotificationText(tr("Error parsing local storage, giving up"));
|
2017-12-03 18:37:31 +00:00
|
|
|
set_filename(NULL, true);
|
2016-04-27 13:14:13 +00:00
|
|
|
} else {
|
|
|
|
|
// successfully opened the local file, now add thigs to the dive list
|
|
|
|
|
consumeFinishedLoad(0);
|
|
|
|
|
appendTextToLog(QString("working in no-cloud mode, finished loading %1 dives from %2").arg(dive_table.nr).arg(existing_filename));
|
|
|
|
|
}
|
2015-12-20 00:08:10 +00:00
|
|
|
} else {
|
2017-08-03 12:55:09 +00:00
|
|
|
setCredentialStatus(CS_UNKNOWN);
|
2016-04-22 14:13:14 +00:00
|
|
|
appendTextToLog(tr("no cloud credentials"));
|
2016-03-11 05:59:16 +00:00
|
|
|
setStartPageText(RED_FONT + tr("Please enter valid cloud credentials.") + END_FONT);
|
2015-12-20 00:08:10 +00:00
|
|
|
}
|
2015-11-14 17:10:06 +00:00
|
|
|
setDistanceThreshold(prefs.distance_threshold);
|
|
|
|
|
setTimeThreshold(prefs.time_threshold / 60);
|
2015-06-04 10:29:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QMLManager::~QMLManager()
|
|
|
|
|
{
|
2017-07-10 00:03:57 +00:00
|
|
|
#if defined(Q_OS_ANDROID)
|
|
|
|
|
if (appLogFileOpen)
|
|
|
|
|
appLogFile.close();
|
|
|
|
|
#endif
|
2015-12-03 23:59:40 +00:00
|
|
|
m_instance = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QMLManager *QMLManager::instance()
|
|
|
|
|
{
|
|
|
|
|
return m_instance;
|
2015-06-04 10:29:50 +00:00
|
|
|
}
|
|
|
|
|
|
2015-07-10 07:47:26 +00:00
|
|
|
void QMLManager::savePreferences()
|
|
|
|
|
{
|
2016-08-25 18:22:04 +00:00
|
|
|
auto location = SettingsObjectWrapper::instance()->location_settings;
|
|
|
|
|
location->setTimeThreshold(timeThreshold() * 60);
|
|
|
|
|
location->setDistanceThreshold(distanceThreshold());
|
2015-12-03 22:30:30 +00:00
|
|
|
}
|
|
|
|
|
|
2015-12-05 03:34:59 +00:00
|
|
|
#define CLOUDURL QString(prefs.cloud_base_url)
|
|
|
|
|
#define CLOUDREDIRECTURL CLOUDURL + "/cgi-bin/redirect.pl"
|
|
|
|
|
|
2015-12-03 22:30:30 +00:00
|
|
|
void QMLManager::saveCloudCredentials()
|
|
|
|
|
{
|
|
|
|
|
QSettings s;
|
|
|
|
|
bool cloudCredentialsChanged = false;
|
2017-07-15 05:15:31 +00:00
|
|
|
// make sure we only have letters, numbers, and +-_. in password and email address
|
|
|
|
|
QRegularExpression regExp("^[a-zA-Z0-9@.+_-]+$");
|
|
|
|
|
QString cloudPwd = cloudPassword();
|
|
|
|
|
QString cloudUser = cloudUserName();
|
2017-09-27 16:19:53 +00:00
|
|
|
if (credentialStatus() != CS_NOCLOUD) {
|
|
|
|
|
// in case of NO_CLOUD, the email address + passwd do not care, so do not check it.
|
|
|
|
|
if (cloudPwd.isEmpty() || !regExp.match(cloudPwd).hasMatch() || !regExp.match(cloudUser).hasMatch()) {
|
|
|
|
|
setStartPageText(RED_FONT + tr("Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.") + END_FONT);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
// use the same simplistic regex as the backend to check email addresses
|
|
|
|
|
regExp = QRegularExpression("^[a-zA-Z0-9.+_-]+@[a-zA-Z0-9.+_-]+\\.[a-zA-Z0-9]+");
|
|
|
|
|
if (!regExp.match(cloudUser).hasMatch()) {
|
|
|
|
|
setStartPageText(RED_FONT + tr("Invalid format for email address") + END_FONT);
|
|
|
|
|
return;
|
|
|
|
|
}
|
2017-07-15 05:15:31 +00:00
|
|
|
}
|
2015-07-10 07:47:26 +00:00
|
|
|
s.beginGroup("CloudStorage");
|
2017-07-15 05:15:31 +00:00
|
|
|
s.setValue("email", cloudUser);
|
|
|
|
|
s.setValue("password", cloudPwd);
|
QML UI: rework single credential page to two pages
This commit tries to implement most of issue #515. It reworks the
one credential page, which its dynamic PIN part, into two pages.
Main driver of selecting one of the two pages is the showPin
boolean. Page 1 contains the email/passwd field (and the
option to use a no cloud setup). Page 2 only contains the PIN
part (and the option to cancel the process).
The Kirigami central button does not seem very handy here. We
need, for example, a cancel, sign-in and register, only register,
etc. buttons, which are not easy to handle in specific icons.
Therefore, normal pushbuttons are chosen to deal with user
interaction, and the Kirigami button is removed from these
pages.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-09-27 17:11:23 +00:00
|
|
|
s.setValue("cloud_verification_status", credentialStatus());
|
2015-07-10 07:47:26 +00:00
|
|
|
s.sync();
|
2017-07-15 05:15:31 +00:00
|
|
|
if (!same_string(prefs.cloud_storage_email, qPrintable(cloudUser))) {
|
2017-11-18 18:57:50 +00:00
|
|
|
free((void *)prefs.cloud_storage_email);
|
2017-07-15 05:15:31 +00:00
|
|
|
prefs.cloud_storage_email = strdup(qPrintable(cloudUser));
|
2015-11-18 21:14:19 +00:00
|
|
|
cloudCredentialsChanged = true;
|
2015-07-13 00:39:13 +00:00
|
|
|
}
|
2015-11-18 21:14:19 +00:00
|
|
|
|
2017-07-15 05:15:31 +00:00
|
|
|
cloudCredentialsChanged |= !same_string(prefs.cloud_storage_password, qPrintable(cloudPwd));
|
2015-11-18 21:14:19 +00:00
|
|
|
|
mobile: No cloud repo creation more explicit
Before this change, there was only one way to create the local
no cloud repo on the device. The user needed to add at least
one dive to the no cloud account (so that there is something
to save). While this worked in some scenarios, it could also
get things in an inconsistent state: credential status = CS_NOCLOUD
but no local repo. This was a dead end.
In this commit, the creation of the no cloud repo is made more
explicit. When asking for no cloud mode, just create an (empty)
repo for it when it does not yet exist, and otherwise, just
open the existing (possibly empty) repo.
Now, a user can have no cloud repo, next to (any number of)
cloud accounts.
This leaves one functional aspect left: how does a user abandon
the no cloud repo, by merging his data into a true cloud
account. This is code for this, that tries to do this merge in
a smart way. This seems to be broken (too). To be clear: this
is no part of this commit.
Fixes: #667
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-10-17 07:51:00 +00:00
|
|
|
if (credentialStatus() != CS_NOCLOUD && !cloudCredentialsChanged) {
|
2016-04-06 18:42:38 +00:00
|
|
|
// just go back to the dive list
|
|
|
|
|
setCredentialStatus(oldStatus());
|
|
|
|
|
}
|
2016-04-29 13:24:21 +00:00
|
|
|
|
2017-07-15 05:15:31 +00:00
|
|
|
if (!same_string(prefs.cloud_storage_password, qPrintable(cloudPwd))) {
|
2017-11-18 18:57:50 +00:00
|
|
|
free((void *)prefs.cloud_storage_password);
|
2017-07-15 05:15:31 +00:00
|
|
|
prefs.cloud_storage_password = strdup(qPrintable(cloudPwd));
|
2015-07-13 00:39:13 +00:00
|
|
|
}
|
2017-07-15 05:15:31 +00:00
|
|
|
if (cloudUser.isEmpty() || cloudPwd.isEmpty()) {
|
2016-03-11 05:59:16 +00:00
|
|
|
setStartPageText(RED_FONT + tr("Please enter valid cloud credentials.") + END_FONT);
|
2016-02-13 06:06:38 +00:00
|
|
|
} else if (cloudCredentialsChanged) {
|
2016-04-29 12:04:47 +00:00
|
|
|
// let's make sure there are no unsaved changes
|
|
|
|
|
saveChangesLocal();
|
2017-11-18 18:57:50 +00:00
|
|
|
free((void *)prefs.userid);
|
2015-12-05 03:34:59 +00:00
|
|
|
prefs.userid = NULL;
|
2016-02-08 19:14:11 +00:00
|
|
|
syncLoadFromCloud();
|
2016-02-09 15:53:22 +00:00
|
|
|
QString url;
|
|
|
|
|
getCloudURL(url);
|
2016-02-11 02:14:09 +00:00
|
|
|
manager()->clearAccessCache(); // remove any chached credentials
|
2016-02-11 05:24:10 +00:00
|
|
|
clear_git_id(); // invalidate our remembered GIT SHA
|
2016-02-12 06:46:35 +00:00
|
|
|
clear_dive_file_data();
|
|
|
|
|
DiveListModel::instance()->clear();
|
|
|
|
|
GpsListModel::instance()->clear();
|
2016-02-12 14:54:52 +00:00
|
|
|
setStartPageText(tr("Attempting to open cloud storage with new credentials"));
|
2016-04-06 18:47:12 +00:00
|
|
|
// we therefore know that no one else is already accessing THIS git repo;
|
|
|
|
|
// let's make sure we stay the only ones doing so
|
|
|
|
|
alreadySaving = true;
|
2016-04-30 18:08:33 +00:00
|
|
|
// since we changed credentials, we need to try to connect to the cloud, regardless
|
|
|
|
|
// of whether we're in offline mode or not, to make sure the repository is synced
|
|
|
|
|
currentGitLocalOnly = prefs.git_local_only;
|
|
|
|
|
prefs.git_local_only = false;
|
2016-02-09 15:53:22 +00:00
|
|
|
openLocalThenRemote(url);
|
2016-06-17 11:23:46 +00:00
|
|
|
} else if (prefs.cloud_verification_status == CS_NEED_TO_VERIFY && !cloudPin().isEmpty()) {
|
2016-06-13 23:42:36 +00:00
|
|
|
// the user entered a PIN?
|
|
|
|
|
tryRetrieveDataFromBackend();
|
2015-12-05 03:34:59 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QMLManager::checkCredentialsAndExecute(execute_function_type execute)
|
|
|
|
|
{
|
|
|
|
|
// if the cloud credentials are present, we should try to get the GPS Webservice ID
|
|
|
|
|
// and (if we haven't done so) load the dive list
|
2015-11-18 21:14:19 +00:00
|
|
|
if (!same_string(prefs.cloud_storage_email, "") &&
|
|
|
|
|
!same_string(prefs.cloud_storage_password, "")) {
|
2016-01-02 08:04:59 +00:00
|
|
|
setStartPageText(tr("Testing cloud credentials"));
|
2015-12-05 03:34:59 +00:00
|
|
|
appendTextToLog("Have credentials, let's see if they are valid");
|
2016-04-08 19:28:05 +00:00
|
|
|
CloudStorageAuthenticate *csa = new CloudStorageAuthenticate(this);
|
2016-06-13 23:42:36 +00:00
|
|
|
csa->backend(prefs.cloud_storage_email, prefs.cloud_storage_password, cloudPin());
|
2016-06-13 22:21:51 +00:00
|
|
|
// let's wait here for the signal to avoid too many more nested functions
|
|
|
|
|
QTimer myTimer;
|
|
|
|
|
myTimer.setSingleShot(true);
|
|
|
|
|
QEventLoop loop;
|
|
|
|
|
connect(csa, &CloudStorageAuthenticate::finishedAuthenticate, &loop, &QEventLoop::quit);
|
|
|
|
|
connect(&myTimer, &QTimer::timeout, &loop, &QEventLoop::quit);
|
|
|
|
|
myTimer.start(5000);
|
|
|
|
|
loop.exec();
|
|
|
|
|
if (!myTimer.isActive()) {
|
|
|
|
|
// got no response from the server
|
|
|
|
|
setStartPageText(RED_FONT + tr("No response from cloud server to validate the credentials") + END_FONT);
|
|
|
|
|
revertToNoCloudIfNeeded();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
myTimer.stop();
|
2016-06-13 23:42:36 +00:00
|
|
|
setCloudPin("");
|
2017-07-24 07:42:44 +00:00
|
|
|
if (prefs.cloud_verification_status == CS_INCORRECT_USER_PASSWD) {
|
|
|
|
|
appendTextToLog(QStringLiteral("Incorrect cloud credentials"));
|
|
|
|
|
setStartPageText(RED_FONT + tr("Incorrect cloud credentials") + END_FONT);
|
|
|
|
|
revertToNoCloudIfNeeded();
|
|
|
|
|
return;
|
|
|
|
|
} else if (prefs.cloud_verification_status != CS_VERIFIED) {
|
2016-06-13 22:21:51 +00:00
|
|
|
// here we need to enter the PIN
|
2017-07-29 07:37:35 +00:00
|
|
|
appendTextToLog(QStringLiteral("Need to verify the email address - enter PIN"));
|
2016-06-13 22:21:51 +00:00
|
|
|
setStartPageText(RED_FONT + tr("Cannot connect to cloud storage - cloud account not verified") + END_FONT);
|
|
|
|
|
revertToNoCloudIfNeeded();
|
2016-06-13 23:42:36 +00:00
|
|
|
setShowPin(true);
|
2016-06-13 22:21:51 +00:00
|
|
|
return;
|
|
|
|
|
}
|
2016-06-13 23:42:36 +00:00
|
|
|
if (showPin())
|
|
|
|
|
setShowPin(false);
|
|
|
|
|
|
2016-06-13 22:21:51 +00:00
|
|
|
// now check the redirect URL to make sure everything is set up on the cloud server
|
2016-01-26 14:45:03 +00:00
|
|
|
connect(manager(), &QNetworkAccessManager::authenticationRequired, this, &QMLManager::provideAuth, Qt::UniqueConnection);
|
2015-12-05 03:34:59 +00:00
|
|
|
QUrl url(CLOUDREDIRECTURL);
|
|
|
|
|
request = QNetworkRequest(url);
|
|
|
|
|
request.setRawHeader("User-Agent", getUserAgent().toUtf8());
|
|
|
|
|
request.setRawHeader("Accept", "text/html");
|
2016-01-26 14:45:03 +00:00
|
|
|
reply = manager()->get(request);
|
2015-12-05 03:34:59 +00:00
|
|
|
connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(handleError(QNetworkReply::NetworkError)));
|
|
|
|
|
connect(reply, &QNetworkReply::sslErrors, this, &QMLManager::handleSslErrors);
|
2016-04-30 17:16:00 +00:00
|
|
|
connect(reply, &QNetworkReply::finished, this, execute, Qt::UniqueConnection);
|
2015-11-18 21:14:19 +00:00
|
|
|
}
|
2015-12-05 03:34:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QMLManager::tryRetrieveDataFromBackend()
|
|
|
|
|
{
|
|
|
|
|
checkCredentialsAndExecute(&QMLManager::retrieveUserid);
|
2015-07-10 07:47:26 +00:00
|
|
|
}
|
2015-07-10 08:31:24 +00:00
|
|
|
|
2015-12-05 03:34:59 +00:00
|
|
|
void QMLManager::provideAuth(QNetworkReply *reply, QAuthenticator *auth)
|
|
|
|
|
{
|
|
|
|
|
if (auth->user() == QString(prefs.cloud_storage_email) &&
|
|
|
|
|
auth->password() == QString(prefs.cloud_storage_password)) {
|
|
|
|
|
// OK, credentials have been tried and didn't work, so they are invalid
|
|
|
|
|
appendTextToLog("Cloud credentials are invalid");
|
2016-03-11 05:59:16 +00:00
|
|
|
setStartPageText(RED_FONT + tr("Cloud credentials are invalid") + END_FONT);
|
2017-08-03 12:55:09 +00:00
|
|
|
setCredentialStatus(CS_INCORRECT_USER_PASSWD);
|
2015-12-05 03:34:59 +00:00
|
|
|
reply->disconnect();
|
|
|
|
|
reply->abort();
|
|
|
|
|
reply->deleteLater();
|
2015-11-30 18:15:04 +00:00
|
|
|
return;
|
|
|
|
|
}
|
2015-12-05 03:34:59 +00:00
|
|
|
auth->setUser(prefs.cloud_storage_email);
|
|
|
|
|
auth->setPassword(prefs.cloud_storage_password);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QMLManager::handleSslErrors(const QList<QSslError> &errors)
|
|
|
|
|
{
|
2016-03-11 05:59:16 +00:00
|
|
|
setStartPageText(RED_FONT + tr("Cannot open cloud storage: Error creating https connection") + END_FONT);
|
2016-01-11 14:14:45 +00:00
|
|
|
Q_FOREACH (QSslError e, errors) {
|
2017-06-18 06:23:41 +00:00
|
|
|
appendTextToLog(e.errorString());
|
2015-12-05 03:34:59 +00:00
|
|
|
}
|
|
|
|
|
reply->abort();
|
|
|
|
|
reply->deleteLater();
|
2017-06-18 06:22:37 +00:00
|
|
|
setNotificationText(QStringLiteral(""));
|
2015-12-05 03:34:59 +00:00
|
|
|
}
|
2015-11-30 18:15:04 +00:00
|
|
|
|
2015-12-05 03:34:59 +00:00
|
|
|
void QMLManager::handleError(QNetworkReply::NetworkError nError)
|
|
|
|
|
{
|
2015-12-15 07:00:19 +00:00
|
|
|
QString errorString = reply->errorString();
|
2017-06-18 06:23:41 +00:00
|
|
|
appendTextToLog(QStringLiteral("handleError ") + nError + QStringLiteral(": ") + errorString);
|
2016-03-11 05:59:16 +00:00
|
|
|
setStartPageText(RED_FONT + tr("Cannot open cloud storage: %1").arg(errorString) + END_FONT);
|
2015-12-05 03:34:59 +00:00
|
|
|
reply->abort();
|
|
|
|
|
reply->deleteLater();
|
2017-06-18 06:22:37 +00:00
|
|
|
setNotificationText(QStringLiteral(""));
|
2015-12-05 03:34:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QMLManager::retrieveUserid()
|
|
|
|
|
{
|
|
|
|
|
if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute) != 302) {
|
2016-04-30 17:15:15 +00:00
|
|
|
appendTextToLog(QStringLiteral("Cloud storage connection not working correctly: (%1) %2")
|
|
|
|
|
.arg(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt())
|
|
|
|
|
.arg(QString(reply->readAll())));
|
2016-04-06 04:27:05 +00:00
|
|
|
setStartPageText(RED_FONT + tr("Cannot connect to cloud storage") + END_FONT);
|
2016-04-29 13:28:09 +00:00
|
|
|
revertToNoCloudIfNeeded();
|
2015-12-05 03:34:59 +00:00
|
|
|
return;
|
|
|
|
|
}
|
2017-08-03 12:55:09 +00:00
|
|
|
setCredentialStatus(CS_VERIFIED);
|
2015-12-05 03:34:59 +00:00
|
|
|
QString userid(prefs.userid);
|
2015-12-20 00:20:20 +00:00
|
|
|
if (userid.isEmpty()) {
|
|
|
|
|
if (same_string(prefs.cloud_storage_email, "") || same_string(prefs.cloud_storage_password, "")) {
|
2016-03-13 15:58:57 +00:00
|
|
|
appendTextToLog("cloud user name or password are empty, can't retrieve web user id");
|
2016-04-29 13:28:09 +00:00
|
|
|
revertToNoCloudIfNeeded();
|
2015-12-20 00:20:20 +00:00
|
|
|
return;
|
|
|
|
|
}
|
2016-01-26 15:02:42 +00:00
|
|
|
appendTextToLog(QStringLiteral("calling getUserid with user %1").arg(prefs.cloud_storage_email));
|
2015-12-05 03:34:59 +00:00
|
|
|
userid = locationProvider->getUserid(prefs.cloud_storage_email, prefs.cloud_storage_password);
|
2015-12-20 00:20:20 +00:00
|
|
|
}
|
2015-12-05 03:34:59 +00:00
|
|
|
if (!userid.isEmpty()) {
|
|
|
|
|
// overwrite the existing userid
|
2017-11-18 18:57:50 +00:00
|
|
|
free((void *)prefs.userid);
|
2015-12-05 03:34:59 +00:00
|
|
|
prefs.userid = strdup(qPrintable(userid));
|
|
|
|
|
QSettings s;
|
|
|
|
|
s.setValue("subsurface_webservice_uid", prefs.userid);
|
|
|
|
|
s.sync();
|
|
|
|
|
}
|
2017-08-03 12:55:09 +00:00
|
|
|
setCredentialStatus(CS_VERIFIED);
|
2017-06-18 06:50:22 +00:00
|
|
|
setStartPageText(tr("Cloud credentials valid, loading dives..."));
|
2016-04-06 18:47:12 +00:00
|
|
|
// this only gets called with "alreadySaving" already locked
|
2016-02-08 19:12:43 +00:00
|
|
|
loadDivesWithValidCredentials();
|
2015-12-05 03:34:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QMLManager::loadDivesWithValidCredentials()
|
|
|
|
|
{
|
2015-07-10 08:31:24 +00:00
|
|
|
QString url;
|
2016-04-29 13:28:09 +00:00
|
|
|
timestamp_t currentDiveTimestamp = selectedDiveTimestamp();
|
2015-07-10 08:31:24 +00:00
|
|
|
if (getCloudURL(url)) {
|
2015-12-15 07:00:19 +00:00
|
|
|
QString errorString(get_error_string());
|
|
|
|
|
appendTextToLog(errorString);
|
2016-03-11 05:59:16 +00:00
|
|
|
setStartPageText(RED_FONT + tr("Cloud storage error: %1").arg(errorString) + END_FONT);
|
2016-04-29 13:28:09 +00:00
|
|
|
revertToNoCloudIfNeeded();
|
2015-07-10 08:31:24 +00:00
|
|
|
return;
|
|
|
|
|
}
|
2016-01-11 14:14:45 +00:00
|
|
|
QByteArray fileNamePrt = QFile::encodeName(url);
|
2016-04-06 05:51:09 +00:00
|
|
|
git_repository *git;
|
|
|
|
|
const char *branch;
|
|
|
|
|
int error;
|
|
|
|
|
if (check_git_sha(fileNamePrt.data(), &git, &branch) == 0) {
|
2015-12-27 18:05:19 +00:00
|
|
|
appendTextToLog("Cloud sync shows local cache was current");
|
2016-04-29 13:28:09 +00:00
|
|
|
goto successful_exit;
|
2015-12-27 18:05:19 +00:00
|
|
|
}
|
2016-04-06 04:27:05 +00:00
|
|
|
appendTextToLog("Cloud sync brought newer data, reloading the dive list");
|
2016-04-14 13:01:36 +00:00
|
|
|
|
2016-04-06 05:51:09 +00:00
|
|
|
clear_dive_file_data();
|
|
|
|
|
if (git != dummy_git_repository) {
|
|
|
|
|
appendTextToLog(QString("have repository and branch %1").arg(branch));
|
|
|
|
|
error = git_load_dives(git, branch);
|
|
|
|
|
} else {
|
|
|
|
|
appendTextToLog(QString("didn't receive valid git repo, try again"));
|
|
|
|
|
error = parse_file(fileNamePrt.data());
|
|
|
|
|
}
|
2015-07-10 08:31:24 +00:00
|
|
|
if (!error) {
|
2015-07-13 00:39:13 +00:00
|
|
|
report_error("filename is now %s", fileNamePrt.data());
|
2017-06-18 06:22:37 +00:00
|
|
|
QString errorString(get_error_string());
|
|
|
|
|
appendTextToLog(errorString);
|
2015-07-10 08:31:24 +00:00
|
|
|
set_filename(fileNamePrt.data(), true);
|
2015-07-13 00:39:13 +00:00
|
|
|
} else {
|
2015-12-01 17:37:47 +00:00
|
|
|
report_error("failed to open file %s", fileNamePrt.data());
|
2015-12-15 07:00:19 +00:00
|
|
|
QString errorString(get_error_string());
|
|
|
|
|
appendTextToLog(errorString);
|
2017-06-18 06:22:37 +00:00
|
|
|
setNotificationText(errorString);
|
2016-04-29 13:28:09 +00:00
|
|
|
revertToNoCloudIfNeeded();
|
2015-12-03 01:50:47 +00:00
|
|
|
return;
|
2015-07-10 08:31:24 +00:00
|
|
|
}
|
2016-04-22 14:10:20 +00:00
|
|
|
consumeFinishedLoad(currentDiveTimestamp);
|
2016-04-29 13:28:09 +00:00
|
|
|
|
|
|
|
|
successful_exit:
|
|
|
|
|
alreadySaving = false;
|
2016-04-22 14:10:20 +00:00
|
|
|
setLoadFromCloud(true);
|
2016-04-29 13:28:09 +00:00
|
|
|
// if we came from local storage mode, let's merge the local data into the local cache
|
|
|
|
|
// for the remote data - which then later gets merged with the remote data if necessary
|
2017-08-03 12:55:09 +00:00
|
|
|
if (oldStatus() == CS_NOCLOUD) {
|
2017-06-18 06:50:22 +00:00
|
|
|
git_storage_update_progress(qPrintable(tr("Loading dives from local storage ('no cloud' mode)")));
|
2016-04-29 13:28:09 +00:00
|
|
|
dive_table.preexisting = dive_table.nr;
|
|
|
|
|
mergeLocalRepo();
|
|
|
|
|
DiveListModel::instance()->clear();
|
|
|
|
|
DiveListModel::instance()->addAllDives();
|
|
|
|
|
appendTextToLog(QStringLiteral("%1 dives loaded after importing nocloud local storage").arg(dive_table.nr));
|
|
|
|
|
saveChangesLocal();
|
|
|
|
|
if (syncToCloud() == false) {
|
|
|
|
|
appendTextToLog(QStringLiteral("taking things back offline now that storage is synced"));
|
|
|
|
|
prefs.git_local_only = syncToCloud();
|
|
|
|
|
}
|
|
|
|
|
}
|
2016-04-30 18:08:33 +00:00
|
|
|
// if we got here just for an initial connection to the cloud, reset to offline
|
|
|
|
|
if (currentGitLocalOnly) {
|
|
|
|
|
currentGitLocalOnly = false;
|
|
|
|
|
prefs.git_local_only = true;
|
|
|
|
|
}
|
2016-04-29 13:28:09 +00:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QMLManager::revertToNoCloudIfNeeded()
|
|
|
|
|
{
|
2016-04-30 18:08:33 +00:00
|
|
|
if (currentGitLocalOnly) {
|
|
|
|
|
// we tried to connect to the cloud for the first time and that failed
|
|
|
|
|
currentGitLocalOnly = false;
|
|
|
|
|
prefs.git_local_only = true;
|
|
|
|
|
}
|
2017-08-03 12:55:09 +00:00
|
|
|
if (oldStatus() == CS_NOCLOUD) {
|
2016-04-29 13:28:09 +00:00
|
|
|
// we tried to switch to a cloud account and had previously used local data,
|
|
|
|
|
// but connecting to the cloud account (and subsequently merging the local
|
|
|
|
|
// and cloud data) failed - so let's delete the cloud credentials and go
|
2017-08-03 12:55:09 +00:00
|
|
|
// back to CS_NOCLOUD mode in order to prevent us from losing the locally stored
|
2016-04-29 13:28:09 +00:00
|
|
|
// dives
|
|
|
|
|
if (syncToCloud() == false) {
|
|
|
|
|
appendTextToLog(QStringLiteral("taking things back offline since sync with cloud failed"));
|
|
|
|
|
prefs.git_local_only = syncToCloud();
|
|
|
|
|
}
|
2017-11-18 18:57:50 +00:00
|
|
|
free((void *)prefs.cloud_storage_email);
|
2016-04-29 13:28:09 +00:00
|
|
|
prefs.cloud_storage_email = NULL;
|
2017-11-18 18:57:50 +00:00
|
|
|
free((void *)prefs.cloud_storage_password);
|
2016-04-29 13:28:09 +00:00
|
|
|
prefs.cloud_storage_password = NULL;
|
|
|
|
|
setCloudUserName("");
|
|
|
|
|
setCloudPassword("");
|
2017-08-03 12:55:09 +00:00
|
|
|
setCredentialStatus(CS_NOCLOUD);
|
2016-04-30 13:51:26 +00:00
|
|
|
set_filename(NOCLOUD_LOCALSTORAGE, true);
|
2016-04-29 13:28:09 +00:00
|
|
|
setStartPageText(RED_FONT + tr("Failed to connect to cloud server, reverting to no cloud status") + END_FONT);
|
|
|
|
|
}
|
|
|
|
|
alreadySaving = false;
|
2016-04-22 14:10:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QMLManager::consumeFinishedLoad(timestamp_t currentDiveTimestamp)
|
|
|
|
|
{
|
2017-02-04 16:55:25 +00:00
|
|
|
prefs.unit_system = git_prefs.unit_system;
|
|
|
|
|
if (git_prefs.unit_system == IMPERIAL)
|
|
|
|
|
git_prefs.units = IMPERIAL_units;
|
2017-03-11 23:44:55 +00:00
|
|
|
else if (git_prefs.unit_system == METRIC)
|
|
|
|
|
git_prefs.units = SI_units;
|
2017-02-04 16:55:25 +00:00
|
|
|
prefs.units = git_prefs.units;
|
2017-02-04 09:42:00 +00:00
|
|
|
prefs.tankbar = git_prefs.tankbar;
|
|
|
|
|
prefs.dcceiling = git_prefs.dcceiling;
|
2017-03-25 12:03:37 +00:00
|
|
|
prefs.show_ccr_setpoint = git_prefs.show_ccr_setpoint;
|
|
|
|
|
prefs.show_ccr_sensors = git_prefs.show_ccr_sensors;
|
|
|
|
|
prefs.pp_graphs.po2 = git_prefs.pp_graphs.po2;
|
2016-04-06 04:17:37 +00:00
|
|
|
DiveListModel::instance()->clear();
|
2015-07-10 08:31:24 +00:00
|
|
|
process_dives(false, false);
|
2016-04-06 04:17:37 +00:00
|
|
|
DiveListModel::instance()->addAllDives();
|
2016-04-14 18:48:04 +00:00
|
|
|
if (currentDiveTimestamp)
|
|
|
|
|
setUpdateSelectedDive(dlSortModel->getIdxForId(get_dive_id_closest_to(currentDiveTimestamp)));
|
2016-04-06 04:17:37 +00:00
|
|
|
appendTextToLog(QStringLiteral("%1 dives loaded").arg(dive_table.nr));
|
2015-12-15 07:00:19 +00:00
|
|
|
if (dive_table.nr == 0)
|
|
|
|
|
setStartPageText(tr("Cloud storage open successfully. No dives in dive list."));
|
2016-04-06 18:47:12 +00:00
|
|
|
alreadySaving = false;
|
2015-07-17 15:28:01 +00:00
|
|
|
}
|
|
|
|
|
|
2016-01-11 03:34:21 +00:00
|
|
|
void QMLManager::refreshDiveList()
|
|
|
|
|
{
|
|
|
|
|
DiveListModel::instance()->clear();
|
2016-04-06 04:17:37 +00:00
|
|
|
DiveListModel::instance()->addAllDives();
|
2016-01-11 03:34:21 +00:00
|
|
|
}
|
|
|
|
|
|
QML UI: rewrite the commitChanges function
I couldn't figure out how to break this down into small, useful commits.
Part of the problem is that I kept going while working on this and as you
can see from looking at the commit, diff tries so hard to find small code
fragments that moved around, that the diff overall becomes quite
unreadable and it seemed impossible to recreate the sequence of steps
after the fact.
It all started with adding the parsing for the GPS coordinates. But while
testing that code I found several issues with the rest of the function.
Most importantly it seemed ridiculous that we carefully tried to match the
texts that the DiveObjectHelper would create for the various fields,
instead of just using the DiveObjectHelper to do just that. And once I had
converted that I once again realized just how long and hard to understand
that function was getting and decided to break out some of the more
complex parts into their own helper functions.
But of course all this didn't happen in this logical, structured, ordered
way. Instead I did all of these things at the same time, testing,
rearranging, etc.
So in the end I went with one BIG commit that does all of this in one fell
swoop.
This adds four helper functions to deal with start time/date, duration,
location and gps coordinates, and depth of the dive.
To avoid mistakes when dealing with the GPS coordinates, there's another
helper to encapsulate the creation of the dive site and we switched to a
current GPS location.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-15 13:01:14 +00:00
|
|
|
static void setupDivesite(struct dive *d, struct dive_site *ds, double lat, double lon, const char *locationtext)
|
2015-07-17 15:28:01 +00:00
|
|
|
{
|
QML UI: rewrite the commitChanges function
I couldn't figure out how to break this down into small, useful commits.
Part of the problem is that I kept going while working on this and as you
can see from looking at the commit, diff tries so hard to find small code
fragments that moved around, that the diff overall becomes quite
unreadable and it seemed impossible to recreate the sequence of steps
after the fact.
It all started with adding the parsing for the GPS coordinates. But while
testing that code I found several issues with the rest of the function.
Most importantly it seemed ridiculous that we carefully tried to match the
texts that the DiveObjectHelper would create for the various fields,
instead of just using the DiveObjectHelper to do just that. And once I had
converted that I once again realized just how long and hard to understand
that function was getting and decided to break out some of the more
complex parts into their own helper functions.
But of course all this didn't happen in this logical, structured, ordered
way. Instead I did all of these things at the same time, testing,
rearranging, etc.
So in the end I went with one BIG commit that does all of this in one fell
swoop.
This adds four helper functions to deal with start time/date, duration,
location and gps coordinates, and depth of the dive.
To avoid mistakes when dealing with the GPS coordinates, there's another
helper to encapsulate the creation of the dive site and we switched to a
current GPS location.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-15 13:01:14 +00:00
|
|
|
if (ds) {
|
2017-10-07 18:39:20 +00:00
|
|
|
ds->latitude.udeg = lrint(lat * 1000000);
|
|
|
|
|
ds->longitude.udeg = lrint(lon * 1000000);
|
QML UI: rewrite the commitChanges function
I couldn't figure out how to break this down into small, useful commits.
Part of the problem is that I kept going while working on this and as you
can see from looking at the commit, diff tries so hard to find small code
fragments that moved around, that the diff overall becomes quite
unreadable and it seemed impossible to recreate the sequence of steps
after the fact.
It all started with adding the parsing for the GPS coordinates. But while
testing that code I found several issues with the rest of the function.
Most importantly it seemed ridiculous that we carefully tried to match the
texts that the DiveObjectHelper would create for the various fields,
instead of just using the DiveObjectHelper to do just that. And once I had
converted that I once again realized just how long and hard to understand
that function was getting and decided to break out some of the more
complex parts into their own helper functions.
But of course all this didn't happen in this logical, structured, ordered
way. Instead I did all of these things at the same time, testing,
rearranging, etc.
So in the end I went with one BIG commit that does all of this in one fell
swoop.
This adds four helper functions to deal with start time/date, duration,
location and gps coordinates, and depth of the dive.
To avoid mistakes when dealing with the GPS coordinates, there's another
helper to encapsulate the creation of the dive site and we switched to a
current GPS location.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-15 13:01:14 +00:00
|
|
|
} else {
|
|
|
|
|
degrees_t latData, lonData;
|
2017-10-07 18:39:20 +00:00
|
|
|
latData.udeg = lrint(lat);
|
|
|
|
|
lonData.udeg = lrint(lon);
|
QML UI: rewrite the commitChanges function
I couldn't figure out how to break this down into small, useful commits.
Part of the problem is that I kept going while working on this and as you
can see from looking at the commit, diff tries so hard to find small code
fragments that moved around, that the diff overall becomes quite
unreadable and it seemed impossible to recreate the sequence of steps
after the fact.
It all started with adding the parsing for the GPS coordinates. But while
testing that code I found several issues with the rest of the function.
Most importantly it seemed ridiculous that we carefully tried to match the
texts that the DiveObjectHelper would create for the various fields,
instead of just using the DiveObjectHelper to do just that. And once I had
converted that I once again realized just how long and hard to understand
that function was getting and decided to break out some of the more
complex parts into their own helper functions.
But of course all this didn't happen in this logical, structured, ordered
way. Instead I did all of these things at the same time, testing,
rearranging, etc.
So in the end I went with one BIG commit that does all of this in one fell
swoop.
This adds four helper functions to deal with start time/date, duration,
location and gps coordinates, and depth of the dive.
To avoid mistakes when dealing with the GPS coordinates, there's another
helper to encapsulate the creation of the dive site and we switched to a
current GPS location.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-15 13:01:14 +00:00
|
|
|
d->dive_site_uuid = create_dive_site_with_gps(locationtext, latData, lonData, d->when);
|
2015-12-27 05:24:29 +00:00
|
|
|
}
|
QML UI: rewrite the commitChanges function
I couldn't figure out how to break this down into small, useful commits.
Part of the problem is that I kept going while working on this and as you
can see from looking at the commit, diff tries so hard to find small code
fragments that moved around, that the diff overall becomes quite
unreadable and it seemed impossible to recreate the sequence of steps
after the fact.
It all started with adding the parsing for the GPS coordinates. But while
testing that code I found several issues with the rest of the function.
Most importantly it seemed ridiculous that we carefully tried to match the
texts that the DiveObjectHelper would create for the various fields,
instead of just using the DiveObjectHelper to do just that. And once I had
converted that I once again realized just how long and hard to understand
that function was getting and decided to break out some of the more
complex parts into their own helper functions.
But of course all this didn't happen in this logical, structured, ordered
way. Instead I did all of these things at the same time, testing,
rearranging, etc.
So in the end I went with one BIG commit that does all of this in one fell
swoop.
This adds four helper functions to deal with start time/date, duration,
location and gps coordinates, and depth of the dive.
To avoid mistakes when dealing with the GPS coordinates, there's another
helper to encapsulate the creation of the dive site and we switched to a
current GPS location.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-15 13:01:14 +00:00
|
|
|
}
|
2015-07-17 15:28:01 +00:00
|
|
|
|
QML UI: rewrite the commitChanges function
I couldn't figure out how to break this down into small, useful commits.
Part of the problem is that I kept going while working on this and as you
can see from looking at the commit, diff tries so hard to find small code
fragments that moved around, that the diff overall becomes quite
unreadable and it seemed impossible to recreate the sequence of steps
after the fact.
It all started with adding the parsing for the GPS coordinates. But while
testing that code I found several issues with the rest of the function.
Most importantly it seemed ridiculous that we carefully tried to match the
texts that the DiveObjectHelper would create for the various fields,
instead of just using the DiveObjectHelper to do just that. And once I had
converted that I once again realized just how long and hard to understand
that function was getting and decided to break out some of the more
complex parts into their own helper functions.
But of course all this didn't happen in this logical, structured, ordered
way. Instead I did all of these things at the same time, testing,
rearranging, etc.
So in the end I went with one BIG commit that does all of this in one fell
swoop.
This adds four helper functions to deal with start time/date, duration,
location and gps coordinates, and depth of the dive.
To avoid mistakes when dealing with the GPS coordinates, there's another
helper to encapsulate the creation of the dive site and we switched to a
current GPS location.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-15 13:01:14 +00:00
|
|
|
bool QMLManager::checkDate(DiveObjectHelper *myDive, struct dive * d, QString date)
|
|
|
|
|
{
|
|
|
|
|
QString oldDate = myDive->date() + " " + myDive->time();
|
|
|
|
|
if (date != oldDate) {
|
2016-01-06 06:53:32 +00:00
|
|
|
QDateTime newDate;
|
|
|
|
|
// what a pain - Qt will not parse dates if the day of the week is incorrect
|
|
|
|
|
// so if the user changed the date but didn't update the day of the week (most likely behavior, actually),
|
|
|
|
|
// we need to make sure we don't try to parse that
|
2016-01-26 15:02:42 +00:00
|
|
|
QString format(QString(prefs.date_format) + QChar(' ') + prefs.time_format);
|
|
|
|
|
if (format.contains(QLatin1String("ddd")) || format.contains(QLatin1String("dddd"))) {
|
|
|
|
|
QString dateFormatToDrop = format.contains(QLatin1String("ddd")) ? QStringLiteral("ddd") : QStringLiteral("dddd");
|
2016-01-06 06:53:32 +00:00
|
|
|
QDateTime ts;
|
|
|
|
|
QLocale loc = getLocale();
|
|
|
|
|
ts.setMSecsSinceEpoch(d->when * 1000L);
|
|
|
|
|
QString drop = loc.toString(ts.toUTC(), dateFormatToDrop);
|
|
|
|
|
format.replace(dateFormatToDrop, "");
|
|
|
|
|
date.replace(drop, "");
|
|
|
|
|
}
|
2017-04-16 01:51:03 +00:00
|
|
|
// set date from string and make sure it's treated as UTC (like all our time stamps)
|
2016-01-06 06:53:32 +00:00
|
|
|
newDate = QDateTime::fromString(date, format);
|
2017-04-16 01:51:03 +00:00
|
|
|
newDate.setTimeSpec(Qt::UTC);
|
2016-03-11 02:36:46 +00:00
|
|
|
if (!newDate.isValid()) {
|
2017-06-18 06:23:41 +00:00
|
|
|
appendTextToLog("unable to parse date " + date + " with the given format " + format);
|
2016-03-11 02:36:46 +00:00
|
|
|
QRegularExpression isoDate("\\d+-\\d+-\\d+[^\\d]+\\d+:\\d+");
|
|
|
|
|
if (date.contains(isoDate)) {
|
|
|
|
|
newDate = QDateTime::fromString(date, "yyyy-M-d h:m:s");
|
|
|
|
|
if (newDate.isValid())
|
|
|
|
|
goto parsed;
|
|
|
|
|
newDate = QDateTime::fromString(date, "yy-M-d h:m:s");
|
|
|
|
|
if (newDate.isValid())
|
|
|
|
|
goto parsed;
|
|
|
|
|
}
|
|
|
|
|
QRegularExpression isoDateNoSecs("\\d+-\\d+-\\d+[^\\d]+\\d+");
|
|
|
|
|
if (date.contains(isoDateNoSecs)) {
|
|
|
|
|
newDate = QDateTime::fromString(date, "yyyy-M-d h:m");
|
|
|
|
|
if (newDate.isValid())
|
|
|
|
|
goto parsed;
|
|
|
|
|
newDate = QDateTime::fromString(date, "yy-M-d h:m");
|
|
|
|
|
if (newDate.isValid())
|
|
|
|
|
goto parsed;
|
|
|
|
|
}
|
|
|
|
|
QRegularExpression usDate("\\d+/\\d+/\\d+[^\\d]+\\d+:\\d+:\\d+");
|
|
|
|
|
if (date.contains(usDate)) {
|
|
|
|
|
newDate = QDateTime::fromString(date, "M/d/yyyy h:m:s");
|
|
|
|
|
if (newDate.isValid())
|
|
|
|
|
goto parsed;
|
|
|
|
|
newDate = QDateTime::fromString(date, "M/d/yy h:m:s");
|
|
|
|
|
if (newDate.isValid())
|
|
|
|
|
goto parsed;
|
|
|
|
|
newDate = QDateTime::fromString(date.toLower(), "M/d/yyyy h:m:sap");
|
|
|
|
|
if (newDate.isValid())
|
|
|
|
|
goto parsed;
|
|
|
|
|
newDate = QDateTime::fromString(date.toLower(), "M/d/yy h:m:sap");
|
|
|
|
|
if (newDate.isValid())
|
|
|
|
|
goto parsed;
|
|
|
|
|
}
|
|
|
|
|
QRegularExpression usDateNoSecs("\\d+/\\d+/\\d+[^\\d]+\\d+:\\d+");
|
|
|
|
|
if (date.contains(usDateNoSecs)) {
|
|
|
|
|
newDate = QDateTime::fromString(date, "M/d/yyyy h:m");
|
|
|
|
|
if (newDate.isValid())
|
|
|
|
|
goto parsed;
|
|
|
|
|
newDate = QDateTime::fromString(date, "M/d/yy h:m");
|
|
|
|
|
if (newDate.isValid())
|
|
|
|
|
goto parsed;
|
|
|
|
|
newDate = QDateTime::fromString(date.toLower(), "M/d/yyyy h:map");
|
|
|
|
|
if (newDate.isValid())
|
|
|
|
|
goto parsed;
|
|
|
|
|
newDate = QDateTime::fromString(date.toLower(), "M/d/yy h:map");
|
|
|
|
|
if (newDate.isValid())
|
|
|
|
|
goto parsed;
|
|
|
|
|
}
|
|
|
|
|
QRegularExpression leDate("\\d+\\.\\d+\\.\\d+[^\\d]+\\d+:\\d+:\\d+");
|
|
|
|
|
if (date.contains(leDate)) {
|
|
|
|
|
newDate = QDateTime::fromString(date, "d.M.yyyy h:m:s");
|
|
|
|
|
if (newDate.isValid())
|
|
|
|
|
goto parsed;
|
|
|
|
|
newDate = QDateTime::fromString(date, "d.M.yy h:m:s");
|
|
|
|
|
if (newDate.isValid())
|
|
|
|
|
goto parsed;
|
|
|
|
|
}
|
|
|
|
|
QRegularExpression leDateNoSecs("\\d+\\.\\d+\\.\\d+[^\\d]+\\d+:\\d+");
|
|
|
|
|
if (date.contains(leDateNoSecs)) {
|
|
|
|
|
newDate = QDateTime::fromString(date, "d.M.yyyy h:m");
|
|
|
|
|
if (newDate.isValid())
|
|
|
|
|
goto parsed;
|
|
|
|
|
newDate = QDateTime::fromString(date, "d.M.yy h:m");
|
|
|
|
|
if (newDate.isValid())
|
|
|
|
|
goto parsed;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
parsed:
|
2016-01-27 20:07:10 +00:00
|
|
|
if (newDate.isValid()) {
|
|
|
|
|
// stupid Qt... two digit years are always 19xx - WTF???
|
|
|
|
|
// so if adding a hundred years gets you into something before a year from now...
|
|
|
|
|
// add a hundred years.
|
|
|
|
|
if (newDate.addYears(100) < QDateTime::currentDateTime().addYears(1))
|
|
|
|
|
newDate = newDate.addYears(100);
|
2016-06-22 20:46:22 +00:00
|
|
|
d->dc.when = d->when = newDate.toMSecsSinceEpoch() / 1000;
|
QML UI: rewrite the commitChanges function
I couldn't figure out how to break this down into small, useful commits.
Part of the problem is that I kept going while working on this and as you
can see from looking at the commit, diff tries so hard to find small code
fragments that moved around, that the diff overall becomes quite
unreadable and it seemed impossible to recreate the sequence of steps
after the fact.
It all started with adding the parsing for the GPS coordinates. But while
testing that code I found several issues with the rest of the function.
Most importantly it seemed ridiculous that we carefully tried to match the
texts that the DiveObjectHelper would create for the various fields,
instead of just using the DiveObjectHelper to do just that. And once I had
converted that I once again realized just how long and hard to understand
that function was getting and decided to break out some of the more
complex parts into their own helper functions.
But of course all this didn't happen in this logical, structured, ordered
way. Instead I did all of these things at the same time, testing,
rearranging, etc.
So in the end I went with one BIG commit that does all of this in one fell
swoop.
This adds four helper functions to deal with start time/date, duration,
location and gps coordinates, and depth of the dive.
To avoid mistakes when dealing with the GPS coordinates, there's another
helper to encapsulate the creation of the dive site and we switched to a
current GPS location.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-15 13:01:14 +00:00
|
|
|
return true;
|
2016-01-27 20:07:10 +00:00
|
|
|
}
|
2017-06-18 06:23:41 +00:00
|
|
|
appendTextToLog("none of our parsing attempts worked for the date string");
|
2016-01-06 06:53:32 +00:00
|
|
|
}
|
QML UI: rewrite the commitChanges function
I couldn't figure out how to break this down into small, useful commits.
Part of the problem is that I kept going while working on this and as you
can see from looking at the commit, diff tries so hard to find small code
fragments that moved around, that the diff overall becomes quite
unreadable and it seemed impossible to recreate the sequence of steps
after the fact.
It all started with adding the parsing for the GPS coordinates. But while
testing that code I found several issues with the rest of the function.
Most importantly it seemed ridiculous that we carefully tried to match the
texts that the DiveObjectHelper would create for the various fields,
instead of just using the DiveObjectHelper to do just that. And once I had
converted that I once again realized just how long and hard to understand
that function was getting and decided to break out some of the more
complex parts into their own helper functions.
But of course all this didn't happen in this logical, structured, ordered
way. Instead I did all of these things at the same time, testing,
rearranging, etc.
So in the end I went with one BIG commit that does all of this in one fell
swoop.
This adds four helper functions to deal with start time/date, duration,
location and gps coordinates, and depth of the dive.
To avoid mistakes when dealing with the GPS coordinates, there's another
helper to encapsulate the creation of the dive site and we switched to a
current GPS location.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-15 13:01:14 +00:00
|
|
|
return false;
|
|
|
|
|
}
|
2016-04-14 19:39:32 +00:00
|
|
|
|
QML UI: rewrite the commitChanges function
I couldn't figure out how to break this down into small, useful commits.
Part of the problem is that I kept going while working on this and as you
can see from looking at the commit, diff tries so hard to find small code
fragments that moved around, that the diff overall becomes quite
unreadable and it seemed impossible to recreate the sequence of steps
after the fact.
It all started with adding the parsing for the GPS coordinates. But while
testing that code I found several issues with the rest of the function.
Most importantly it seemed ridiculous that we carefully tried to match the
texts that the DiveObjectHelper would create for the various fields,
instead of just using the DiveObjectHelper to do just that. And once I had
converted that I once again realized just how long and hard to understand
that function was getting and decided to break out some of the more
complex parts into their own helper functions.
But of course all this didn't happen in this logical, structured, ordered
way. Instead I did all of these things at the same time, testing,
rearranging, etc.
So in the end I went with one BIG commit that does all of this in one fell
swoop.
This adds four helper functions to deal with start time/date, duration,
location and gps coordinates, and depth of the dive.
To avoid mistakes when dealing with the GPS coordinates, there's another
helper to encapsulate the creation of the dive site and we switched to a
current GPS location.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-15 13:01:14 +00:00
|
|
|
bool QMLManager::checkLocation(DiveObjectHelper *myDive, struct dive *d, QString location, QString gps)
|
|
|
|
|
{
|
|
|
|
|
bool diveChanged = false;
|
2016-04-14 19:39:32 +00:00
|
|
|
|
QML UI: rewrite the commitChanges function
I couldn't figure out how to break this down into small, useful commits.
Part of the problem is that I kept going while working on this and as you
can see from looking at the commit, diff tries so hard to find small code
fragments that moved around, that the diff overall becomes quite
unreadable and it seemed impossible to recreate the sequence of steps
after the fact.
It all started with adding the parsing for the GPS coordinates. But while
testing that code I found several issues with the rest of the function.
Most importantly it seemed ridiculous that we carefully tried to match the
texts that the DiveObjectHelper would create for the various fields,
instead of just using the DiveObjectHelper to do just that. And once I had
converted that I once again realized just how long and hard to understand
that function was getting and decided to break out some of the more
complex parts into their own helper functions.
But of course all this didn't happen in this logical, structured, ordered
way. Instead I did all of these things at the same time, testing,
rearranging, etc.
So in the end I went with one BIG commit that does all of this in one fell
swoop.
This adds four helper functions to deal with start time/date, duration,
location and gps coordinates, and depth of the dive.
To avoid mistakes when dealing with the GPS coordinates, there's another
helper to encapsulate the creation of the dive site and we switched to a
current GPS location.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-15 13:01:14 +00:00
|
|
|
struct dive_site *ds = get_dive_site_by_uuid(d->dive_site_uuid);
|
|
|
|
|
if (myDive->location() != location) {
|
|
|
|
|
diveChanged = true;
|
2015-12-27 06:57:47 +00:00
|
|
|
ds = get_dive_site_by_uuid(create_dive_site(qPrintable(location), d->when));
|
|
|
|
|
d->dive_site_uuid = ds->uuid;
|
|
|
|
|
}
|
QML UI: rewrite the commitChanges function
I couldn't figure out how to break this down into small, useful commits.
Part of the problem is that I kept going while working on this and as you
can see from looking at the commit, diff tries so hard to find small code
fragments that moved around, that the diff overall becomes quite
unreadable and it seemed impossible to recreate the sequence of steps
after the fact.
It all started with adding the parsing for the GPS coordinates. But while
testing that code I found several issues with the rest of the function.
Most importantly it seemed ridiculous that we carefully tried to match the
texts that the DiveObjectHelper would create for the various fields,
instead of just using the DiveObjectHelper to do just that. And once I had
converted that I once again realized just how long and hard to understand
that function was getting and decided to break out some of the more
complex parts into their own helper functions.
But of course all this didn't happen in this logical, structured, ordered
way. Instead I did all of these things at the same time, testing,
rearranging, etc.
So in the end I went with one BIG commit that does all of this in one fell
swoop.
This adds four helper functions to deal with start time/date, duration,
location and gps coordinates, and depth of the dive.
To avoid mistakes when dealing with the GPS coordinates, there's another
helper to encapsulate the creation of the dive site and we switched to a
current GPS location.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-15 13:01:14 +00:00
|
|
|
// now make sure that the GPS coordinates match - if the user changed the name but not
|
|
|
|
|
// the GPS coordinates, this still does the right thing as the now new dive site will
|
|
|
|
|
// have no coordinates, so the coordinates from the edit screen will get added
|
|
|
|
|
if (myDive->gps() != gps) {
|
|
|
|
|
double lat, lon;
|
|
|
|
|
if (parseGpsText(gps, &lat, &lon)) {
|
|
|
|
|
// there are valid GPS coordinates - just use them
|
|
|
|
|
setupDivesite(d, ds, lat, lon, qPrintable(myDive->location()));
|
|
|
|
|
diveChanged = true;
|
|
|
|
|
} else if (gps == GPS_CURRENT_POS) {
|
|
|
|
|
// user asked to use current pos
|
|
|
|
|
QString gpsString = getCurrentPosition();
|
|
|
|
|
if (gpsString != GPS_CURRENT_POS) {
|
|
|
|
|
if (parseGpsText(qPrintable(gpsString), &lat, &lon)) {
|
|
|
|
|
setupDivesite(d, ds, lat, lon, qPrintable(myDive->location()));
|
|
|
|
|
diveChanged = true;
|
2016-01-27 14:29:14 +00:00
|
|
|
}
|
QML UI: rewrite the commitChanges function
I couldn't figure out how to break this down into small, useful commits.
Part of the problem is that I kept going while working on this and as you
can see from looking at the commit, diff tries so hard to find small code
fragments that moved around, that the diff overall becomes quite
unreadable and it seemed impossible to recreate the sequence of steps
after the fact.
It all started with adding the parsing for the GPS coordinates. But while
testing that code I found several issues with the rest of the function.
Most importantly it seemed ridiculous that we carefully tried to match the
texts that the DiveObjectHelper would create for the various fields,
instead of just using the DiveObjectHelper to do just that. And once I had
converted that I once again realized just how long and hard to understand
that function was getting and decided to break out some of the more
complex parts into their own helper functions.
But of course all this didn't happen in this logical, structured, ordered
way. Instead I did all of these things at the same time, testing,
rearranging, etc.
So in the end I went with one BIG commit that does all of this in one fell
swoop.
This adds four helper functions to deal with start time/date, duration,
location and gps coordinates, and depth of the dive.
To avoid mistakes when dealing with the GPS coordinates, there's another
helper to encapsulate the creation of the dive site and we switched to a
current GPS location.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-15 13:01:14 +00:00
|
|
|
} else {
|
|
|
|
|
appendTextToLog("couldn't get GPS location in time");
|
2016-01-02 01:23:29 +00:00
|
|
|
}
|
2016-01-27 14:29:14 +00:00
|
|
|
} else {
|
QML UI: rewrite the commitChanges function
I couldn't figure out how to break this down into small, useful commits.
Part of the problem is that I kept going while working on this and as you
can see from looking at the commit, diff tries so hard to find small code
fragments that moved around, that the diff overall becomes quite
unreadable and it seemed impossible to recreate the sequence of steps
after the fact.
It all started with adding the parsing for the GPS coordinates. But while
testing that code I found several issues with the rest of the function.
Most importantly it seemed ridiculous that we carefully tried to match the
texts that the DiveObjectHelper would create for the various fields,
instead of just using the DiveObjectHelper to do just that. And once I had
converted that I once again realized just how long and hard to understand
that function was getting and decided to break out some of the more
complex parts into their own helper functions.
But of course all this didn't happen in this logical, structured, ordered
way. Instead I did all of these things at the same time, testing,
rearranging, etc.
So in the end I went with one BIG commit that does all of this in one fell
swoop.
This adds four helper functions to deal with start time/date, duration,
location and gps coordinates, and depth of the dive.
To avoid mistakes when dealing with the GPS coordinates, there's another
helper to encapsulate the creation of the dive site and we switched to a
current GPS location.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-15 13:01:14 +00:00
|
|
|
// just something we can't parse, so tell the user
|
|
|
|
|
appendTextToLog(QString("wasn't able to parse gps string '%1'").arg(gps));
|
2016-01-02 01:23:29 +00:00
|
|
|
}
|
|
|
|
|
}
|
QML UI: rewrite the commitChanges function
I couldn't figure out how to break this down into small, useful commits.
Part of the problem is that I kept going while working on this and as you
can see from looking at the commit, diff tries so hard to find small code
fragments that moved around, that the diff overall becomes quite
unreadable and it seemed impossible to recreate the sequence of steps
after the fact.
It all started with adding the parsing for the GPS coordinates. But while
testing that code I found several issues with the rest of the function.
Most importantly it seemed ridiculous that we carefully tried to match the
texts that the DiveObjectHelper would create for the various fields,
instead of just using the DiveObjectHelper to do just that. And once I had
converted that I once again realized just how long and hard to understand
that function was getting and decided to break out some of the more
complex parts into their own helper functions.
But of course all this didn't happen in this logical, structured, ordered
way. Instead I did all of these things at the same time, testing,
rearranging, etc.
So in the end I went with one BIG commit that does all of this in one fell
swoop.
This adds four helper functions to deal with start time/date, duration,
location and gps coordinates, and depth of the dive.
To avoid mistakes when dealing with the GPS coordinates, there's another
helper to encapsulate the creation of the dive site and we switched to a
current GPS location.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-15 13:01:14 +00:00
|
|
|
return diveChanged;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool QMLManager::checkDuration(DiveObjectHelper *myDive, struct dive *d, QString duration)
|
|
|
|
|
{
|
|
|
|
|
if (myDive->duration() != duration) {
|
2016-01-01 08:23:15 +00:00
|
|
|
int h = 0, m = 0, s = 0;
|
2016-02-06 20:07:42 +00:00
|
|
|
QRegExp r1(QStringLiteral("(\\d*)\\s*%1[\\s,:]*(\\d*)\\s*%2[\\s,:]*(\\d*)\\s*%3").arg(tr("h")).arg(tr("min")).arg(tr("sec")), Qt::CaseInsensitive);
|
|
|
|
|
QRegExp r2(QStringLiteral("(\\d*)\\s*%1[\\s,:]*(\\d*)\\s*%2").arg(tr("h")).arg(tr("min")), Qt::CaseInsensitive);
|
|
|
|
|
QRegExp r3(QStringLiteral("(\\d*)\\s*%1").arg(tr("min")), Qt::CaseInsensitive);
|
2016-01-26 15:02:42 +00:00
|
|
|
QRegExp r4(QStringLiteral("(\\d*):(\\d*):(\\d*)"));
|
|
|
|
|
QRegExp r5(QStringLiteral("(\\d*):(\\d*)"));
|
2016-02-09 21:00:56 +00:00
|
|
|
QRegExp r6(QStringLiteral("(\\d*)"));
|
2016-01-01 08:23:15 +00:00
|
|
|
if (r1.indexIn(duration) >= 0) {
|
|
|
|
|
h = r1.cap(1).toInt();
|
|
|
|
|
m = r1.cap(2).toInt();
|
|
|
|
|
s = r1.cap(3).toInt();
|
|
|
|
|
} else if (r2.indexIn(duration) >= 0) {
|
|
|
|
|
h = r2.cap(1).toInt();
|
|
|
|
|
m = r2.cap(2).toInt();
|
|
|
|
|
} else if (r3.indexIn(duration) >= 0) {
|
|
|
|
|
m = r3.cap(1).toInt();
|
|
|
|
|
} else if (r4.indexIn(duration) >= 0) {
|
|
|
|
|
h = r4.cap(1).toInt();
|
|
|
|
|
m = r4.cap(2).toInt();
|
|
|
|
|
s = r4.cap(3).toInt();
|
|
|
|
|
} else if (r5.indexIn(duration) >= 0) {
|
|
|
|
|
h = r5.cap(1).toInt();
|
|
|
|
|
m = r5.cap(2).toInt();
|
2016-02-09 21:00:56 +00:00
|
|
|
} else if (r6.indexIn(duration) >= 0) {
|
|
|
|
|
m = r6.cap(1).toInt();
|
2016-01-01 08:23:15 +00:00
|
|
|
}
|
2016-01-11 06:08:42 +00:00
|
|
|
d->dc.duration.seconds = d->duration.seconds = h * 3600 + m * 60 + s;
|
2016-03-02 14:28:00 +00:00
|
|
|
if (same_string(d->dc.model, "manually added dive")) {
|
|
|
|
|
free(d->dc.sample);
|
|
|
|
|
d->dc.sample = 0;
|
|
|
|
|
d->dc.samples = 0;
|
|
|
|
|
} else {
|
2017-06-18 06:23:41 +00:00
|
|
|
appendTextToLog("Cannot change the duration on a dive that wasn't manually added");
|
2016-03-02 14:28:00 +00:00
|
|
|
}
|
QML UI: rewrite the commitChanges function
I couldn't figure out how to break this down into small, useful commits.
Part of the problem is that I kept going while working on this and as you
can see from looking at the commit, diff tries so hard to find small code
fragments that moved around, that the diff overall becomes quite
unreadable and it seemed impossible to recreate the sequence of steps
after the fact.
It all started with adding the parsing for the GPS coordinates. But while
testing that code I found several issues with the rest of the function.
Most importantly it seemed ridiculous that we carefully tried to match the
texts that the DiveObjectHelper would create for the various fields,
instead of just using the DiveObjectHelper to do just that. And once I had
converted that I once again realized just how long and hard to understand
that function was getting and decided to break out some of the more
complex parts into their own helper functions.
But of course all this didn't happen in this logical, structured, ordered
way. Instead I did all of these things at the same time, testing,
rearranging, etc.
So in the end I went with one BIG commit that does all of this in one fell
swoop.
This adds four helper functions to deal with start time/date, duration,
location and gps coordinates, and depth of the dive.
To avoid mistakes when dealing with the GPS coordinates, there's another
helper to encapsulate the creation of the dive site and we switched to a
current GPS location.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-15 13:01:14 +00:00
|
|
|
return true;
|
2016-01-01 08:23:15 +00:00
|
|
|
}
|
QML UI: rewrite the commitChanges function
I couldn't figure out how to break this down into small, useful commits.
Part of the problem is that I kept going while working on this and as you
can see from looking at the commit, diff tries so hard to find small code
fragments that moved around, that the diff overall becomes quite
unreadable and it seemed impossible to recreate the sequence of steps
after the fact.
It all started with adding the parsing for the GPS coordinates. But while
testing that code I found several issues with the rest of the function.
Most importantly it seemed ridiculous that we carefully tried to match the
texts that the DiveObjectHelper would create for the various fields,
instead of just using the DiveObjectHelper to do just that. And once I had
converted that I once again realized just how long and hard to understand
that function was getting and decided to break out some of the more
complex parts into their own helper functions.
But of course all this didn't happen in this logical, structured, ordered
way. Instead I did all of these things at the same time, testing,
rearranging, etc.
So in the end I went with one BIG commit that does all of this in one fell
swoop.
This adds four helper functions to deal with start time/date, duration,
location and gps coordinates, and depth of the dive.
To avoid mistakes when dealing with the GPS coordinates, there's another
helper to encapsulate the creation of the dive site and we switched to a
current GPS location.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-15 13:01:14 +00:00
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool QMLManager::checkDepth(DiveObjectHelper *myDive, dive *d, QString depth)
|
|
|
|
|
{
|
|
|
|
|
if (myDive->depth() != depth) {
|
2016-02-21 06:11:03 +00:00
|
|
|
int depthValue = parseLengthToMm(depth);
|
|
|
|
|
// the QML code should stop negative depth, but massively huge depth can make
|
|
|
|
|
// the profile extremely slow or even run out of memory and crash, so keep
|
|
|
|
|
// the depth <= 500m
|
|
|
|
|
if (0 <= depthValue && depthValue <= 500000) {
|
|
|
|
|
d->maxdepth.mm = depthValue;
|
|
|
|
|
if (same_string(d->dc.model, "manually added dive")) {
|
|
|
|
|
d->dc.maxdepth.mm = d->maxdepth.mm;
|
|
|
|
|
free(d->dc.sample);
|
|
|
|
|
d->dc.sample = 0;
|
|
|
|
|
d->dc.samples = 0;
|
|
|
|
|
}
|
QML UI: rewrite the commitChanges function
I couldn't figure out how to break this down into small, useful commits.
Part of the problem is that I kept going while working on this and as you
can see from looking at the commit, diff tries so hard to find small code
fragments that moved around, that the diff overall becomes quite
unreadable and it seemed impossible to recreate the sequence of steps
after the fact.
It all started with adding the parsing for the GPS coordinates. But while
testing that code I found several issues with the rest of the function.
Most importantly it seemed ridiculous that we carefully tried to match the
texts that the DiveObjectHelper would create for the various fields,
instead of just using the DiveObjectHelper to do just that. And once I had
converted that I once again realized just how long and hard to understand
that function was getting and decided to break out some of the more
complex parts into their own helper functions.
But of course all this didn't happen in this logical, structured, ordered
way. Instead I did all of these things at the same time, testing,
rearranging, etc.
So in the end I went with one BIG commit that does all of this in one fell
swoop.
This adds four helper functions to deal with start time/date, duration,
location and gps coordinates, and depth of the dive.
To avoid mistakes when dealing with the GPS coordinates, there's another
helper to encapsulate the creation of the dive site and we switched to a
current GPS location.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-15 13:01:14 +00:00
|
|
|
return true;
|
2016-02-15 15:51:23 +00:00
|
|
|
}
|
2016-01-01 08:32:30 +00:00
|
|
|
}
|
QML UI: rewrite the commitChanges function
I couldn't figure out how to break this down into small, useful commits.
Part of the problem is that I kept going while working on this and as you
can see from looking at the commit, diff tries so hard to find small code
fragments that moved around, that the diff overall becomes quite
unreadable and it seemed impossible to recreate the sequence of steps
after the fact.
It all started with adding the parsing for the GPS coordinates. But while
testing that code I found several issues with the rest of the function.
Most importantly it seemed ridiculous that we carefully tried to match the
texts that the DiveObjectHelper would create for the various fields,
instead of just using the DiveObjectHelper to do just that. And once I had
converted that I once again realized just how long and hard to understand
that function was getting and decided to break out some of the more
complex parts into their own helper functions.
But of course all this didn't happen in this logical, structured, ordered
way. Instead I did all of these things at the same time, testing,
rearranging, etc.
So in the end I went with one BIG commit that does all of this in one fell
swoop.
This adds four helper functions to deal with start time/date, duration,
location and gps coordinates, and depth of the dive.
To avoid mistakes when dealing with the GPS coordinates, there's another
helper to encapsulate the creation of the dive site and we switched to a
current GPS location.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-15 13:01:14 +00:00
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// update the dive and return the notes field, stripped of the HTML junk
|
|
|
|
|
void QMLManager::commitChanges(QString diveId, QString date, QString location, QString gps, QString duration, QString depth,
|
|
|
|
|
QString airtemp, QString watertemp, QString suit, QString buddy, QString diveMaster, QString weight, QString notes,
|
2017-07-28 17:28:52 +00:00
|
|
|
QString startpressure, QString endpressure, QString gasmix, QString cylinder, int rating, int visibility)
|
QML UI: rewrite the commitChanges function
I couldn't figure out how to break this down into small, useful commits.
Part of the problem is that I kept going while working on this and as you
can see from looking at the commit, diff tries so hard to find small code
fragments that moved around, that the diff overall becomes quite
unreadable and it seemed impossible to recreate the sequence of steps
after the fact.
It all started with adding the parsing for the GPS coordinates. But while
testing that code I found several issues with the rest of the function.
Most importantly it seemed ridiculous that we carefully tried to match the
texts that the DiveObjectHelper would create for the various fields,
instead of just using the DiveObjectHelper to do just that. And once I had
converted that I once again realized just how long and hard to understand
that function was getting and decided to break out some of the more
complex parts into their own helper functions.
But of course all this didn't happen in this logical, structured, ordered
way. Instead I did all of these things at the same time, testing,
rearranging, etc.
So in the end I went with one BIG commit that does all of this in one fell
swoop.
This adds four helper functions to deal with start time/date, duration,
location and gps coordinates, and depth of the dive.
To avoid mistakes when dealing with the GPS coordinates, there's another
helper to encapsulate the creation of the dive site and we switched to a
current GPS location.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-15 13:01:14 +00:00
|
|
|
{
|
|
|
|
|
struct dive *d = get_dive_by_uniq_id(diveId.toInt());
|
|
|
|
|
DiveObjectHelper *myDive = new DiveObjectHelper(d);
|
|
|
|
|
|
|
|
|
|
// notes comes back as rich text - let's convert this into plain text
|
|
|
|
|
QTextDocument doc;
|
|
|
|
|
doc.setHtml(notes);
|
|
|
|
|
notes = doc.toPlainText();
|
|
|
|
|
|
|
|
|
|
if (!d) {
|
2017-06-18 06:23:41 +00:00
|
|
|
appendTextToLog("cannot commit changes: no dive");
|
QML UI: rewrite the commitChanges function
I couldn't figure out how to break this down into small, useful commits.
Part of the problem is that I kept going while working on this and as you
can see from looking at the commit, diff tries so hard to find small code
fragments that moved around, that the diff overall becomes quite
unreadable and it seemed impossible to recreate the sequence of steps
after the fact.
It all started with adding the parsing for the GPS coordinates. But while
testing that code I found several issues with the rest of the function.
Most importantly it seemed ridiculous that we carefully tried to match the
texts that the DiveObjectHelper would create for the various fields,
instead of just using the DiveObjectHelper to do just that. And once I had
converted that I once again realized just how long and hard to understand
that function was getting and decided to break out some of the more
complex parts into their own helper functions.
But of course all this didn't happen in this logical, structured, ordered
way. Instead I did all of these things at the same time, testing,
rearranging, etc.
So in the end I went with one BIG commit that does all of this in one fell
swoop.
This adds four helper functions to deal with start time/date, duration,
location and gps coordinates, and depth of the dive.
To avoid mistakes when dealing with the GPS coordinates, there's another
helper to encapsulate the creation of the dive site and we switched to a
current GPS location.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-15 13:01:14 +00:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
bool diveChanged = false;
|
|
|
|
|
bool needResort = false;
|
|
|
|
|
|
|
|
|
|
diveChanged = needResort = checkDate(myDive, d, date);
|
|
|
|
|
|
|
|
|
|
diveChanged |= checkLocation(myDive, d, location, gps);
|
|
|
|
|
|
|
|
|
|
diveChanged |= checkDuration(myDive, d, duration);
|
|
|
|
|
|
|
|
|
|
diveChanged |= checkDepth(myDive, d, depth);
|
|
|
|
|
|
|
|
|
|
if (myDive->airTemp() != airtemp) {
|
2016-01-01 01:34:20 +00:00
|
|
|
diveChanged = true;
|
|
|
|
|
d->airtemp.mkelvin = parseTemperatureToMkelvin(airtemp);
|
|
|
|
|
}
|
QML UI: rewrite the commitChanges function
I couldn't figure out how to break this down into small, useful commits.
Part of the problem is that I kept going while working on this and as you
can see from looking at the commit, diff tries so hard to find small code
fragments that moved around, that the diff overall becomes quite
unreadable and it seemed impossible to recreate the sequence of steps
after the fact.
It all started with adding the parsing for the GPS coordinates. But while
testing that code I found several issues with the rest of the function.
Most importantly it seemed ridiculous that we carefully tried to match the
texts that the DiveObjectHelper would create for the various fields,
instead of just using the DiveObjectHelper to do just that. And once I had
converted that I once again realized just how long and hard to understand
that function was getting and decided to break out some of the more
complex parts into their own helper functions.
But of course all this didn't happen in this logical, structured, ordered
way. Instead I did all of these things at the same time, testing,
rearranging, etc.
So in the end I went with one BIG commit that does all of this in one fell
swoop.
This adds four helper functions to deal with start time/date, duration,
location and gps coordinates, and depth of the dive.
To avoid mistakes when dealing with the GPS coordinates, there's another
helper to encapsulate the creation of the dive site and we switched to a
current GPS location.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-15 13:01:14 +00:00
|
|
|
if (myDive->waterTemp() != watertemp) {
|
2016-01-01 01:34:20 +00:00
|
|
|
diveChanged = true;
|
|
|
|
|
d->watertemp.mkelvin = parseTemperatureToMkelvin(watertemp);
|
|
|
|
|
}
|
2016-02-06 06:54:47 +00:00
|
|
|
// not sure what we'd do if there was more than one weight system
|
|
|
|
|
// defined - for now just ignore that case
|
|
|
|
|
if (weightsystem_none((void *)&d->weightsystem[1])) {
|
QML UI: rewrite the commitChanges function
I couldn't figure out how to break this down into small, useful commits.
Part of the problem is that I kept going while working on this and as you
can see from looking at the commit, diff tries so hard to find small code
fragments that moved around, that the diff overall becomes quite
unreadable and it seemed impossible to recreate the sequence of steps
after the fact.
It all started with adding the parsing for the GPS coordinates. But while
testing that code I found several issues with the rest of the function.
Most importantly it seemed ridiculous that we carefully tried to match the
texts that the DiveObjectHelper would create for the various fields,
instead of just using the DiveObjectHelper to do just that. And once I had
converted that I once again realized just how long and hard to understand
that function was getting and decided to break out some of the more
complex parts into their own helper functions.
But of course all this didn't happen in this logical, structured, ordered
way. Instead I did all of these things at the same time, testing,
rearranging, etc.
So in the end I went with one BIG commit that does all of this in one fell
swoop.
This adds four helper functions to deal with start time/date, duration,
location and gps coordinates, and depth of the dive.
To avoid mistakes when dealing with the GPS coordinates, there's another
helper to encapsulate the creation of the dive site and we switched to a
current GPS location.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-15 13:01:14 +00:00
|
|
|
if (myDive->sumWeight() != weight) {
|
2016-02-06 06:54:47 +00:00
|
|
|
diveChanged = true;
|
|
|
|
|
d->weightsystem[0].weight.grams = parseWeightToGrams(weight);
|
|
|
|
|
}
|
|
|
|
|
}
|
2016-02-28 14:43:54 +00:00
|
|
|
// start and end pressures for first cylinder only
|
QML UI: rewrite the commitChanges function
I couldn't figure out how to break this down into small, useful commits.
Part of the problem is that I kept going while working on this and as you
can see from looking at the commit, diff tries so hard to find small code
fragments that moved around, that the diff overall becomes quite
unreadable and it seemed impossible to recreate the sequence of steps
after the fact.
It all started with adding the parsing for the GPS coordinates. But while
testing that code I found several issues with the rest of the function.
Most importantly it seemed ridiculous that we carefully tried to match the
texts that the DiveObjectHelper would create for the various fields,
instead of just using the DiveObjectHelper to do just that. And once I had
converted that I once again realized just how long and hard to understand
that function was getting and decided to break out some of the more
complex parts into their own helper functions.
But of course all this didn't happen in this logical, structured, ordered
way. Instead I did all of these things at the same time, testing,
rearranging, etc.
So in the end I went with one BIG commit that does all of this in one fell
swoop.
This adds four helper functions to deal with start time/date, duration,
location and gps coordinates, and depth of the dive.
To avoid mistakes when dealing with the GPS coordinates, there's another
helper to encapsulate the creation of the dive site and we switched to a
current GPS location.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-15 13:01:14 +00:00
|
|
|
if (myDive->startPressure() != startpressure || myDive->endPressure() != endpressure) {
|
2016-02-09 16:20:17 +00:00
|
|
|
diveChanged = true;
|
|
|
|
|
d->cylinder[0].start.mbar = parsePressureToMbar(startpressure);
|
|
|
|
|
d->cylinder[0].end.mbar = parsePressureToMbar(endpressure);
|
2016-03-11 21:17:57 +00:00
|
|
|
if (d->cylinder[0].end.mbar > d->cylinder[0].start.mbar)
|
|
|
|
|
d->cylinder[0].end.mbar = d->cylinder[0].start.mbar;
|
2016-02-09 16:20:17 +00:00
|
|
|
}
|
2016-02-13 17:34:31 +00:00
|
|
|
// gasmix for first cylinder
|
QML UI: rewrite the commitChanges function
I couldn't figure out how to break this down into small, useful commits.
Part of the problem is that I kept going while working on this and as you
can see from looking at the commit, diff tries so hard to find small code
fragments that moved around, that the diff overall becomes quite
unreadable and it seemed impossible to recreate the sequence of steps
after the fact.
It all started with adding the parsing for the GPS coordinates. But while
testing that code I found several issues with the rest of the function.
Most importantly it seemed ridiculous that we carefully tried to match the
texts that the DiveObjectHelper would create for the various fields,
instead of just using the DiveObjectHelper to do just that. And once I had
converted that I once again realized just how long and hard to understand
that function was getting and decided to break out some of the more
complex parts into their own helper functions.
But of course all this didn't happen in this logical, structured, ordered
way. Instead I did all of these things at the same time, testing,
rearranging, etc.
So in the end I went with one BIG commit that does all of this in one fell
swoop.
This adds four helper functions to deal with start time/date, duration,
location and gps coordinates, and depth of the dive.
To avoid mistakes when dealing with the GPS coordinates, there's another
helper to encapsulate the creation of the dive site and we switched to a
current GPS location.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-15 13:01:14 +00:00
|
|
|
if (myDive->firstGas() != gasmix) {
|
2016-02-21 06:11:03 +00:00
|
|
|
int o2 = parseGasMixO2(gasmix);
|
|
|
|
|
int he = parseGasMixHE(gasmix);
|
|
|
|
|
// the QML code SHOULD only accept valid gas mixes, but just to make sure
|
2016-03-11 06:03:00 +00:00
|
|
|
if (o2 >= 0 && o2 <= 1000 &&
|
|
|
|
|
he >= 0 && he <= 1000 &&
|
|
|
|
|
o2 + he <= 1000) {
|
2016-02-21 06:11:03 +00:00
|
|
|
diveChanged = true;
|
|
|
|
|
d->cylinder[0].gasmix.o2.permille = o2;
|
|
|
|
|
d->cylinder[0].gasmix.he.permille = he;
|
|
|
|
|
}
|
2016-02-13 17:34:31 +00:00
|
|
|
}
|
2016-08-30 14:24:19 +00:00
|
|
|
// info for first cylinder
|
|
|
|
|
if (myDive->getCylinder() != cylinder) {
|
|
|
|
|
diveChanged = true;
|
2016-09-04 17:27:56 +00:00
|
|
|
unsigned long i;
|
|
|
|
|
int size = 0, wp = 0;
|
2016-08-30 14:24:19 +00:00
|
|
|
for (i = 0; i < sizeof(tank_info) && tank_info[i].name != NULL; i++) {
|
|
|
|
|
if (tank_info[i].name == cylinder ) {
|
|
|
|
|
if (tank_info[i].ml > 0){
|
|
|
|
|
size = tank_info[i].ml;
|
|
|
|
|
wp = tank_info[i].bar * 1000;
|
|
|
|
|
} else {
|
2017-06-02 16:42:23 +00:00
|
|
|
size = (int) (cuft_to_l(tank_info[i].cuft) * 1000 / bar_to_atm(psi_to_bar(tank_info[i].psi)));
|
2016-08-30 14:24:19 +00:00
|
|
|
wp = psi_to_mbar(tank_info[i].psi);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
d->cylinder[0].type.description = strdup(qPrintable(cylinder));
|
|
|
|
|
d->cylinder[0].type.size.mliter = size;
|
|
|
|
|
d->cylinder[0].type.workingpressure.mbar = wp;
|
|
|
|
|
}
|
QML UI: rewrite the commitChanges function
I couldn't figure out how to break this down into small, useful commits.
Part of the problem is that I kept going while working on this and as you
can see from looking at the commit, diff tries so hard to find small code
fragments that moved around, that the diff overall becomes quite
unreadable and it seemed impossible to recreate the sequence of steps
after the fact.
It all started with adding the parsing for the GPS coordinates. But while
testing that code I found several issues with the rest of the function.
Most importantly it seemed ridiculous that we carefully tried to match the
texts that the DiveObjectHelper would create for the various fields,
instead of just using the DiveObjectHelper to do just that. And once I had
converted that I once again realized just how long and hard to understand
that function was getting and decided to break out some of the more
complex parts into their own helper functions.
But of course all this didn't happen in this logical, structured, ordered
way. Instead I did all of these things at the same time, testing,
rearranging, etc.
So in the end I went with one BIG commit that does all of this in one fell
swoop.
This adds four helper functions to deal with start time/date, duration,
location and gps coordinates, and depth of the dive.
To avoid mistakes when dealing with the GPS coordinates, there's another
helper to encapsulate the creation of the dive site and we switched to a
current GPS location.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-15 13:01:14 +00:00
|
|
|
if (myDive->suit() != suit) {
|
2015-07-17 15:28:01 +00:00
|
|
|
diveChanged = true;
|
|
|
|
|
free(d->suit);
|
2015-12-27 06:57:47 +00:00
|
|
|
d->suit = strdup(qPrintable(suit));
|
2015-07-17 15:28:01 +00:00
|
|
|
}
|
QML UI: rewrite the commitChanges function
I couldn't figure out how to break this down into small, useful commits.
Part of the problem is that I kept going while working on this and as you
can see from looking at the commit, diff tries so hard to find small code
fragments that moved around, that the diff overall becomes quite
unreadable and it seemed impossible to recreate the sequence of steps
after the fact.
It all started with adding the parsing for the GPS coordinates. But while
testing that code I found several issues with the rest of the function.
Most importantly it seemed ridiculous that we carefully tried to match the
texts that the DiveObjectHelper would create for the various fields,
instead of just using the DiveObjectHelper to do just that. And once I had
converted that I once again realized just how long and hard to understand
that function was getting and decided to break out some of the more
complex parts into their own helper functions.
But of course all this didn't happen in this logical, structured, ordered
way. Instead I did all of these things at the same time, testing,
rearranging, etc.
So in the end I went with one BIG commit that does all of this in one fell
swoop.
This adds four helper functions to deal with start time/date, duration,
location and gps coordinates, and depth of the dive.
To avoid mistakes when dealing with the GPS coordinates, there's another
helper to encapsulate the creation of the dive site and we switched to a
current GPS location.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-15 13:01:14 +00:00
|
|
|
if (myDive->buddy() != buddy) {
|
2017-01-29 16:32:13 +00:00
|
|
|
if (buddy.contains(",")){
|
|
|
|
|
buddy = buddy.replace(QRegExp("\\s*,\\s*"), ", ");
|
|
|
|
|
}
|
|
|
|
|
if (!buddy.contains("Multiple Buddies")) {
|
2016-09-12 18:30:07 +00:00
|
|
|
diveChanged = true;
|
|
|
|
|
free(d->buddy);
|
|
|
|
|
d->buddy = strdup(qPrintable(buddy));
|
|
|
|
|
}
|
2015-07-17 15:28:01 +00:00
|
|
|
}
|
QML UI: rewrite the commitChanges function
I couldn't figure out how to break this down into small, useful commits.
Part of the problem is that I kept going while working on this and as you
can see from looking at the commit, diff tries so hard to find small code
fragments that moved around, that the diff overall becomes quite
unreadable and it seemed impossible to recreate the sequence of steps
after the fact.
It all started with adding the parsing for the GPS coordinates. But while
testing that code I found several issues with the rest of the function.
Most importantly it seemed ridiculous that we carefully tried to match the
texts that the DiveObjectHelper would create for the various fields,
instead of just using the DiveObjectHelper to do just that. And once I had
converted that I once again realized just how long and hard to understand
that function was getting and decided to break out some of the more
complex parts into their own helper functions.
But of course all this didn't happen in this logical, structured, ordered
way. Instead I did all of these things at the same time, testing,
rearranging, etc.
So in the end I went with one BIG commit that does all of this in one fell
swoop.
This adds four helper functions to deal with start time/date, duration,
location and gps coordinates, and depth of the dive.
To avoid mistakes when dealing with the GPS coordinates, there's another
helper to encapsulate the creation of the dive site and we switched to a
current GPS location.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-15 13:01:14 +00:00
|
|
|
if (myDive->divemaster() != diveMaster) {
|
2015-07-17 15:28:01 +00:00
|
|
|
diveChanged = true;
|
|
|
|
|
free(d->divemaster);
|
2015-12-27 06:57:47 +00:00
|
|
|
d->divemaster = strdup(qPrintable(diveMaster));
|
2015-07-17 15:28:01 +00:00
|
|
|
}
|
2017-07-28 17:28:52 +00:00
|
|
|
if (myDive->rating() != rating) {
|
|
|
|
|
diveChanged = true;
|
|
|
|
|
d->rating = rating;
|
|
|
|
|
}
|
|
|
|
|
if (myDive->visibility() != visibility) {
|
|
|
|
|
diveChanged = true;
|
|
|
|
|
d->visibility = visibility;
|
|
|
|
|
}
|
QML UI: rewrite the commitChanges function
I couldn't figure out how to break this down into small, useful commits.
Part of the problem is that I kept going while working on this and as you
can see from looking at the commit, diff tries so hard to find small code
fragments that moved around, that the diff overall becomes quite
unreadable and it seemed impossible to recreate the sequence of steps
after the fact.
It all started with adding the parsing for the GPS coordinates. But while
testing that code I found several issues with the rest of the function.
Most importantly it seemed ridiculous that we carefully tried to match the
texts that the DiveObjectHelper would create for the various fields,
instead of just using the DiveObjectHelper to do just that. And once I had
converted that I once again realized just how long and hard to understand
that function was getting and decided to break out some of the more
complex parts into their own helper functions.
But of course all this didn't happen in this logical, structured, ordered
way. Instead I did all of these things at the same time, testing,
rearranging, etc.
So in the end I went with one BIG commit that does all of this in one fell
swoop.
This adds four helper functions to deal with start time/date, duration,
location and gps coordinates, and depth of the dive.
To avoid mistakes when dealing with the GPS coordinates, there's another
helper to encapsulate the creation of the dive site and we switched to a
current GPS location.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-15 13:01:14 +00:00
|
|
|
if (myDive->notes() != notes) {
|
2015-07-17 15:28:01 +00:00
|
|
|
diveChanged = true;
|
|
|
|
|
free(d->notes);
|
2015-12-27 06:57:47 +00:00
|
|
|
d->notes = strdup(qPrintable(notes));
|
2015-07-17 15:28:01 +00:00
|
|
|
}
|
2016-03-02 12:52:44 +00:00
|
|
|
// now that we have it all figured out, let's see what we need
|
|
|
|
|
// to update
|
|
|
|
|
DiveListModel *dm = DiveListModel::instance();
|
2017-04-16 02:06:46 +00:00
|
|
|
int modelIdx = dm->getDiveIdx(d->id);
|
2016-01-27 20:11:37 +00:00
|
|
|
int oldIdx = get_idx_by_uniq_id(d->id);
|
|
|
|
|
if (needResort) {
|
|
|
|
|
// we know that the only thing that might happen in a resort is that
|
|
|
|
|
// this one dive moves to a different spot in the dive list
|
2016-01-06 06:57:40 +00:00
|
|
|
sort_table(&dive_table);
|
2016-01-27 20:11:37 +00:00
|
|
|
int newIdx = get_idx_by_uniq_id(d->id);
|
|
|
|
|
if (newIdx != oldIdx) {
|
2017-04-16 02:06:46 +00:00
|
|
|
DiveListModel::instance()->removeDive(modelIdx);
|
|
|
|
|
modelIdx += (newIdx - oldIdx);
|
|
|
|
|
DiveListModel::instance()->insertDive(modelIdx, myDive);
|
|
|
|
|
diveChanged = true; // because we already modified things
|
2016-01-27 20:11:37 +00:00
|
|
|
}
|
|
|
|
|
}
|
2016-02-20 15:33:05 +00:00
|
|
|
if (diveChanged) {
|
|
|
|
|
if (d->maxdepth.mm == d->dc.maxdepth.mm &&
|
|
|
|
|
d->maxdepth.mm > 0 &&
|
|
|
|
|
same_string(d->dc.model, "manually added dive") &&
|
|
|
|
|
d->dc.samples == 0) {
|
|
|
|
|
// so we have depth > 0, a manually added dive and no samples
|
|
|
|
|
// let's create an actual profile so the desktop version can work it
|
|
|
|
|
// first clear out the mean depth (or the fake_dc() function tries
|
|
|
|
|
// to be too clever
|
|
|
|
|
d->meandepth.mm = d->dc.meandepth.mm = 0;
|
2016-02-20 17:36:14 +00:00
|
|
|
d->dc = *fake_dc(&d->dc, true);
|
2016-02-20 15:33:05 +00:00
|
|
|
}
|
2017-04-16 02:06:46 +00:00
|
|
|
DiveListModel::instance()->updateDive(modelIdx, d);
|
QML UI: rewrite the commitChanges function
I couldn't figure out how to break this down into small, useful commits.
Part of the problem is that I kept going while working on this and as you
can see from looking at the commit, diff tries so hard to find small code
fragments that moved around, that the diff overall becomes quite
unreadable and it seemed impossible to recreate the sequence of steps
after the fact.
It all started with adding the parsing for the GPS coordinates. But while
testing that code I found several issues with the rest of the function.
Most importantly it seemed ridiculous that we carefully tried to match the
texts that the DiveObjectHelper would create for the various fields,
instead of just using the DiveObjectHelper to do just that. And once I had
converted that I once again realized just how long and hard to understand
that function was getting and decided to break out some of the more
complex parts into their own helper functions.
But of course all this didn't happen in this logical, structured, ordered
way. Instead I did all of these things at the same time, testing,
rearranging, etc.
So in the end I went with one BIG commit that does all of this in one fell
swoop.
This adds four helper functions to deal with start time/date, duration,
location and gps coordinates, and depth of the dive.
To avoid mistakes when dealing with the GPS coordinates, there's another
helper to encapsulate the creation of the dive site and we switched to a
current GPS location.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-15 13:01:14 +00:00
|
|
|
invalidate_dive_cache(d);
|
|
|
|
|
mark_divelist_changed(true);
|
2016-02-20 15:33:05 +00:00
|
|
|
}
|
QML UI: don't immediately save data after we make changes
Much as this felt like the prudent thing to do, it makes the UI painful
to use. In bad network conditions, with a large dive log, on a phone,
the save operation can take more than a minute - which is just completely
ludicrous.
So instead we mark the dive list changed when we make changes and wait
for the app to not be in the foreground. Once the OS tells us that we are
hidden (on the desktop that generally means we don't have focus, on a
mobile device it usually does mean that the app is not on the screen), we
check if there are data to be saved and do so.
There is of course a major problem with this logic. If the user switches
away from Subsurface-mobile but comes back fairly quickly (just reacting
to a notification or briefly checking something, changing a song,
something... then the app may still be non-responsive for quite a while.
So we need to do something about the time it takes us to save the git
tree locally, and then figure out if we can move at least some of the
network traffic to another thread.
And we need to make sure the user immediately notices that the app is not
crashed but is actually saving their data. But that's for another commit.
tl;dr: CAREFUL, don't kill Subsurface-mobile before it had time to save
your data or your changes may be gone. In typical use that shouldn't be
an issue, but it is something that we need to tell the user about.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-04 00:37:17 +00:00
|
|
|
if (diveChanged || needResort)
|
2016-04-11 02:22:16 +00:00
|
|
|
changesNeedSaving();
|
|
|
|
|
}
|
QML UI: don't immediately save data after we make changes
Much as this felt like the prudent thing to do, it makes the UI painful
to use. In bad network conditions, with a large dive log, on a phone,
the save operation can take more than a minute - which is just completely
ludicrous.
So instead we mark the dive list changed when we make changes and wait
for the app to not be in the foreground. Once the OS tells us that we are
hidden (on the desktop that generally means we don't have focus, on a
mobile device it usually does mean that the app is not on the screen), we
check if there are data to be saved and do so.
There is of course a major problem with this logic. If the user switches
away from Subsurface-mobile but comes back fairly quickly (just reacting
to a notification or briefly checking something, changing a song,
something... then the app may still be non-responsive for quite a while.
So we need to do something about the time it takes us to save the git
tree locally, and then figure out if we can move at least some of the
network traffic to another thread.
And we need to make sure the user immediately notices that the app is not
crashed but is actually saving their data. But that's for another commit.
tl;dr: CAREFUL, don't kill Subsurface-mobile before it had time to save
your data or your changes may be gone. In typical use that shouldn't be
an issue, but it is something that we need to tell the user about.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-04 00:37:17 +00:00
|
|
|
|
2016-04-11 02:22:16 +00:00
|
|
|
void QMLManager::changesNeedSaving()
|
|
|
|
|
{
|
|
|
|
|
// we no longer save right away on iOS because file access is so slow; on the other hand,
|
|
|
|
|
// on Android the save as the user switches away doesn't seem to work... drat.
|
|
|
|
|
// as a compromise for now we save just to local storage on Android right away (that appears
|
|
|
|
|
// to be reasonably fast), but don't save at all (and only remember that we need to save things
|
|
|
|
|
// on iOS
|
|
|
|
|
// on all other platforms we just save the changes and be done with it
|
|
|
|
|
mark_divelist_changed(true);
|
2016-04-30 13:21:55 +00:00
|
|
|
#if defined(Q_OS_ANDROID)
|
2016-04-11 02:22:16 +00:00
|
|
|
saveChangesLocal();
|
2016-04-30 13:21:55 +00:00
|
|
|
#elif !defined(Q_OS_IOS)
|
2016-04-11 14:54:22 +00:00
|
|
|
saveChangesCloud(false);
|
2016-04-11 02:22:16 +00:00
|
|
|
#endif
|
2015-07-17 15:28:01 +00:00
|
|
|
}
|
mobile: No cloud repo creation more explicit
Before this change, there was only one way to create the local
no cloud repo on the device. The user needed to add at least
one dive to the no cloud account (so that there is something
to save). While this worked in some scenarios, it could also
get things in an inconsistent state: credential status = CS_NOCLOUD
but no local repo. This was a dead end.
In this commit, the creation of the no cloud repo is made more
explicit. When asking for no cloud mode, just create an (empty)
repo for it when it does not yet exist, and otherwise, just
open the existing (possibly empty) repo.
Now, a user can have no cloud repo, next to (any number of)
cloud accounts.
This leaves one functional aspect left: how does a user abandon
the no cloud repo, by merging his data into a true cloud
account. This is code for this, that tries to do this merge in
a smart way. This seems to be broken (too). To be clear: this
is no part of this commit.
Fixes: #667
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-10-17 07:51:00 +00:00
|
|
|
|
|
|
|
|
void QMLManager::openNoCloudRepo()
|
|
|
|
|
/*
|
|
|
|
|
* Open the No Cloud repo. In case this repo does not (yet)
|
|
|
|
|
* exists, create one first. When done, open the repo, which
|
|
|
|
|
* is obviously empty when just created.
|
|
|
|
|
*/
|
|
|
|
|
{
|
|
|
|
|
char *filename = NOCLOUD_LOCALSTORAGE;
|
|
|
|
|
const char *branch;
|
|
|
|
|
struct git_repository *git;
|
|
|
|
|
|
|
|
|
|
git = is_git_repository(filename, &branch, NULL, false);
|
|
|
|
|
|
|
|
|
|
if (git == dummy_git_repository) {
|
|
|
|
|
if (git_create_local_repo(filename))
|
|
|
|
|
appendTextToLog(get_error_string());
|
|
|
|
|
set_filename(filename, true);
|
|
|
|
|
GeneralSettingsObjectWrapper s(this);
|
|
|
|
|
s.setDefaultFilename(filename);
|
|
|
|
|
s.setDefaultFileBehavior(LOCAL_DEFAULT_FILE);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
openLocalThenRemote(filename);
|
|
|
|
|
}
|
|
|
|
|
|
2016-04-06 18:47:12 +00:00
|
|
|
void QMLManager::saveChangesLocal()
|
2015-07-17 15:28:01 +00:00
|
|
|
{
|
2016-04-06 04:36:56 +00:00
|
|
|
if (unsaved_changes()) {
|
2017-08-03 12:55:09 +00:00
|
|
|
if (credentialStatus() == CS_NOCLOUD) {
|
2016-04-22 14:08:23 +00:00
|
|
|
if (same_string(existing_filename, "")) {
|
2016-04-30 13:51:26 +00:00
|
|
|
char *filename = NOCLOUD_LOCALSTORAGE;
|
|
|
|
|
if (git_create_local_repo(filename))
|
2016-04-22 14:08:23 +00:00
|
|
|
appendTextToLog(get_error_string());
|
2016-04-30 13:51:26 +00:00
|
|
|
set_filename(filename, true);
|
2016-04-22 14:08:23 +00:00
|
|
|
GeneralSettingsObjectWrapper s(this);
|
|
|
|
|
s.setDefaultFilename(filename);
|
|
|
|
|
s.setDefaultFileBehavior(LOCAL_DEFAULT_FILE);
|
|
|
|
|
}
|
|
|
|
|
} else if (!loadFromCloud()) {
|
2016-04-06 18:47:12 +00:00
|
|
|
// this seems silly, but you need a common ancestor in the repository in
|
|
|
|
|
// order to be able to merge che changes later
|
|
|
|
|
appendTextToLog("Don't save dives without loading from the cloud, first.");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (alreadySaving) {
|
|
|
|
|
appendTextToLog("save operation already in progress, can't save locally");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
alreadySaving = true;
|
|
|
|
|
bool glo = prefs.git_local_only;
|
2016-04-06 04:36:56 +00:00
|
|
|
prefs.git_local_only = true;
|
2016-04-06 18:47:12 +00:00
|
|
|
if (save_dives(existing_filename)) {
|
2017-06-18 06:22:37 +00:00
|
|
|
QString errorString(get_error_string());
|
|
|
|
|
appendTextToLog(errorString);
|
|
|
|
|
setNotificationText(errorString);
|
2016-04-22 14:08:23 +00:00
|
|
|
set_filename(NULL, true);
|
2016-04-06 04:36:56 +00:00
|
|
|
prefs.git_local_only = glo;
|
|
|
|
|
alreadySaving = false;
|
|
|
|
|
return;
|
|
|
|
|
}
|
2016-04-06 18:47:12 +00:00
|
|
|
prefs.git_local_only = glo;
|
|
|
|
|
mark_divelist_changed(false);
|
|
|
|
|
alreadySaving = false;
|
2016-04-06 04:36:56 +00:00
|
|
|
} else {
|
2016-04-06 18:47:12 +00:00
|
|
|
appendTextToLog("local save requested with no unsaved changes");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-04-08 19:35:45 +00:00
|
|
|
void QMLManager::saveChangesCloud(bool forceRemoteSync)
|
2016-04-06 18:47:12 +00:00
|
|
|
{
|
2016-04-30 17:15:56 +00:00
|
|
|
if (!unsaved_changes() && !forceRemoteSync) {
|
2016-04-15 11:58:09 +00:00
|
|
|
appendTextToLog("asked to save changes but no unsaved changes");
|
2016-04-08 19:35:45 +00:00
|
|
|
return;
|
2016-04-15 11:58:09 +00:00
|
|
|
}
|
2016-04-06 18:47:12 +00:00
|
|
|
if (alreadySaving) {
|
2016-04-15 11:58:09 +00:00
|
|
|
appendTextToLog("save operation in progress already");
|
2016-04-06 18:47:12 +00:00
|
|
|
return;
|
2015-07-17 15:28:01 +00:00
|
|
|
}
|
2016-04-15 11:58:09 +00:00
|
|
|
// first we need to store any unsaved changes to the local repo
|
2017-06-18 06:22:37 +00:00
|
|
|
gitProgressCB("Save changes to local cache");
|
2016-04-15 11:58:09 +00:00
|
|
|
saveChangesLocal();
|
|
|
|
|
|
|
|
|
|
// if the user asked not to push to the cloud we are done
|
|
|
|
|
if (prefs.git_local_only && !forceRemoteSync)
|
|
|
|
|
return;
|
|
|
|
|
|
2016-04-29 13:24:21 +00:00
|
|
|
if (!loadFromCloud()) {
|
|
|
|
|
appendTextToLog("Don't save dives without loading from the cloud, first.");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2016-04-15 11:58:09 +00:00
|
|
|
bool glo = prefs.git_local_only;
|
2016-04-06 04:36:56 +00:00
|
|
|
prefs.git_local_only = false;
|
2016-04-06 18:47:12 +00:00
|
|
|
alreadySaving = true;
|
2016-04-06 04:36:56 +00:00
|
|
|
loadDivesWithValidCredentials();
|
2016-04-06 18:47:12 +00:00
|
|
|
alreadySaving = false;
|
2016-04-06 04:36:56 +00:00
|
|
|
prefs.git_local_only = glo;
|
2015-07-10 08:31:24 +00:00
|
|
|
}
|
2015-08-10 05:35:47 +00:00
|
|
|
|
2016-04-11 19:10:46 +00:00
|
|
|
bool QMLManager::undoDelete(int id)
|
2016-02-29 14:53:26 +00:00
|
|
|
{
|
|
|
|
|
if (!deletedDive || deletedDive->id != id) {
|
2017-06-18 06:23:41 +00:00
|
|
|
appendTextToLog("Trying to undo delete but can't find the deleted dive");
|
2016-04-11 19:10:46 +00:00
|
|
|
return false;
|
2016-02-29 14:53:26 +00:00
|
|
|
}
|
|
|
|
|
if (deletedTrip)
|
|
|
|
|
insert_trip(&deletedTrip);
|
|
|
|
|
if (deletedDive->divetrip) {
|
|
|
|
|
struct dive_trip *trip = deletedDive->divetrip;
|
|
|
|
|
tripflag_t tripflag = deletedDive->tripflag; // this gets overwritten in add_dive_to_trip()
|
|
|
|
|
deletedDive->divetrip = NULL;
|
|
|
|
|
deletedDive->next = NULL;
|
|
|
|
|
deletedDive->pprev = NULL;
|
|
|
|
|
add_dive_to_trip(deletedDive, trip);
|
|
|
|
|
deletedDive->tripflag = tripflag;
|
|
|
|
|
}
|
|
|
|
|
record_dive(deletedDive);
|
2016-04-06 04:17:37 +00:00
|
|
|
QList<dive *>diveAsList;
|
|
|
|
|
diveAsList << deletedDive;
|
|
|
|
|
DiveListModel::instance()->addDive(diveAsList);
|
2016-04-11 02:22:16 +00:00
|
|
|
changesNeedSaving();
|
2016-02-29 14:53:26 +00:00
|
|
|
deletedDive = NULL;
|
|
|
|
|
deletedTrip = NULL;
|
2016-04-11 19:10:46 +00:00
|
|
|
return true;
|
2016-02-29 14:53:26 +00:00
|
|
|
}
|
|
|
|
|
|
2016-02-23 12:39:40 +00:00
|
|
|
void QMLManager::deleteDive(int id)
|
|
|
|
|
{
|
|
|
|
|
struct dive *d = get_dive_by_uniq_id(id);
|
|
|
|
|
if (!d) {
|
2017-06-18 06:23:41 +00:00
|
|
|
appendTextToLog("trying to delete non-existing dive");
|
2016-02-23 12:39:40 +00:00
|
|
|
return;
|
|
|
|
|
}
|
2016-02-29 14:53:26 +00:00
|
|
|
// clean up (or create) the storage for the deleted dive and trip (if applicable)
|
|
|
|
|
if (!deletedDive)
|
|
|
|
|
deletedDive = alloc_dive();
|
|
|
|
|
else
|
|
|
|
|
clear_dive(deletedDive);
|
|
|
|
|
copy_dive(d, deletedDive);
|
|
|
|
|
if (!deletedTrip) {
|
|
|
|
|
deletedTrip = (struct dive_trip *)calloc(1, sizeof(struct dive_trip));
|
|
|
|
|
} else {
|
|
|
|
|
free(deletedTrip->location);
|
|
|
|
|
free(deletedTrip->notes);
|
|
|
|
|
memset(deletedTrip, 0, sizeof(struct dive_trip));
|
|
|
|
|
}
|
|
|
|
|
// if this is the last dive in that trip, remember the trip as well
|
|
|
|
|
if (d->divetrip && d->divetrip->nrdives == 1) {
|
|
|
|
|
*deletedTrip = *d->divetrip;
|
|
|
|
|
deletedTrip->location = copy_string(d->divetrip->location);
|
|
|
|
|
deletedTrip->notes = copy_string(d->divetrip->notes);
|
|
|
|
|
deletedTrip->nrdives = 0;
|
|
|
|
|
deletedDive->divetrip = deletedTrip;
|
|
|
|
|
}
|
2016-02-23 12:39:40 +00:00
|
|
|
DiveListModel::instance()->removeDiveById(id);
|
|
|
|
|
delete_single_dive(get_idx_by_uniq_id(id));
|
2016-04-11 02:22:16 +00:00
|
|
|
changesNeedSaving();
|
2016-02-23 12:39:40 +00:00
|
|
|
}
|
|
|
|
|
|
2017-07-19 07:16:47 +00:00
|
|
|
void QMLManager::cancelDownloadDC()
|
|
|
|
|
{
|
|
|
|
|
import_thread_cancelled = true;
|
|
|
|
|
}
|
|
|
|
|
|
2015-12-27 05:37:18 +00:00
|
|
|
QString QMLManager::addDive()
|
2015-08-10 05:35:47 +00:00
|
|
|
{
|
2015-08-19 07:17:52 +00:00
|
|
|
appendTextToLog("Adding new dive.");
|
2015-12-27 05:37:18 +00:00
|
|
|
return DiveListModel::instance()->startAddDive();
|
2015-08-10 05:35:47 +00:00
|
|
|
}
|
|
|
|
|
|
2016-01-29 14:25:13 +00:00
|
|
|
void QMLManager::addDiveAborted(int id)
|
|
|
|
|
{
|
|
|
|
|
DiveListModel::instance()->removeDiveById(id);
|
|
|
|
|
}
|
|
|
|
|
|
2016-01-02 01:23:29 +00:00
|
|
|
QString QMLManager::getCurrentPosition()
|
|
|
|
|
{
|
2016-04-18 05:54:53 +00:00
|
|
|
static bool hasLocationSource = false;
|
|
|
|
|
if (locationProvider->hasLocationsSource() != hasLocationSource) {
|
|
|
|
|
hasLocationSource = !hasLocationSource;
|
|
|
|
|
setLocationServiceAvailable(hasLocationSource);
|
|
|
|
|
}
|
|
|
|
|
if (!hasLocationSource)
|
|
|
|
|
return tr("Unknown GPS location");
|
|
|
|
|
|
2016-01-02 01:23:29 +00:00
|
|
|
return locationProvider->currentPosition();
|
|
|
|
|
}
|
|
|
|
|
|
2015-11-13 04:23:00 +00:00
|
|
|
void QMLManager::applyGpsData()
|
|
|
|
|
{
|
2016-01-11 03:34:21 +00:00
|
|
|
if (locationProvider->applyLocations())
|
|
|
|
|
refreshDiveList();
|
2015-11-13 04:23:00 +00:00
|
|
|
}
|
|
|
|
|
|
2015-11-14 01:21:43 +00:00
|
|
|
void QMLManager::sendGpsData()
|
|
|
|
|
{
|
|
|
|
|
locationProvider->uploadToServer();
|
|
|
|
|
}
|
|
|
|
|
|
2016-01-08 05:37:36 +00:00
|
|
|
void QMLManager::downloadGpsData()
|
|
|
|
|
{
|
|
|
|
|
locationProvider->downloadFromServer();
|
2016-01-08 15:11:49 +00:00
|
|
|
populateGpsData();
|
2016-01-08 05:37:36 +00:00
|
|
|
}
|
|
|
|
|
|
2016-01-08 05:40:15 +00:00
|
|
|
void QMLManager::populateGpsData()
|
|
|
|
|
{
|
2016-01-08 15:11:49 +00:00
|
|
|
if (GpsListModel::instance())
|
|
|
|
|
GpsListModel::instance()->update();
|
2016-01-08 05:40:15 +00:00
|
|
|
}
|
|
|
|
|
|
2015-11-14 01:20:45 +00:00
|
|
|
void QMLManager::clearGpsData()
|
|
|
|
|
{
|
|
|
|
|
locationProvider->clearGpsData();
|
2016-01-08 15:11:49 +00:00
|
|
|
populateGpsData();
|
2015-11-14 01:20:45 +00:00
|
|
|
}
|
|
|
|
|
|
2016-01-09 07:18:41 +00:00
|
|
|
void QMLManager::deleteGpsFix(quint64 when)
|
|
|
|
|
{
|
|
|
|
|
locationProvider->deleteGpsFix(when);
|
|
|
|
|
populateGpsData();
|
|
|
|
|
}
|
|
|
|
|
|
2015-08-19 07:17:52 +00:00
|
|
|
QString QMLManager::logText() const
|
|
|
|
|
{
|
2015-11-13 17:17:13 +00:00
|
|
|
QString logText = m_logText + QString("\nNumer of GPS fixes: %1").arg(locationProvider->getGpsNum());
|
|
|
|
|
return logText;
|
2015-08-19 07:17:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QMLManager::setLogText(const QString &logText)
|
|
|
|
|
{
|
|
|
|
|
m_logText = logText;
|
2015-08-20 09:08:59 +00:00
|
|
|
emit logTextChanged();
|
2015-08-19 07:17:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QMLManager::appendTextToLog(const QString &newText)
|
|
|
|
|
{
|
2016-04-18 13:15:54 +00:00
|
|
|
if (!timer.isValid())
|
|
|
|
|
timer.start();
|
2017-06-06 06:22:19 +00:00
|
|
|
qDebug() << QString::number(timer.elapsed() / 1000.0,'f', 3) + ": " + newText;
|
2015-08-19 07:17:52 +00:00
|
|
|
}
|
|
|
|
|
|
2015-11-11 20:34:56 +00:00
|
|
|
bool QMLManager::locationServiceEnabled() const
|
|
|
|
|
{
|
|
|
|
|
return m_locationServiceEnabled;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QMLManager::setLocationServiceEnabled(bool locationServiceEnabled)
|
|
|
|
|
{
|
|
|
|
|
m_locationServiceEnabled = locationServiceEnabled;
|
|
|
|
|
locationProvider->serviceEnable(m_locationServiceEnabled);
|
2017-07-23 07:38:40 +00:00
|
|
|
emit locationServiceEnabledChanged();
|
2015-11-11 20:34:56 +00:00
|
|
|
}
|
2015-07-10 08:31:24 +00:00
|
|
|
|
2016-04-18 05:54:53 +00:00
|
|
|
bool QMLManager::locationServiceAvailable() const
|
|
|
|
|
{
|
|
|
|
|
return m_locationServiceAvailable;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QMLManager::setLocationServiceAvailable(bool locationServiceAvailable)
|
|
|
|
|
{
|
2017-06-18 06:23:41 +00:00
|
|
|
appendTextToLog(QStringLiteral("location service is ") + (locationServiceAvailable ? QStringLiteral("available") : QStringLiteral("not available")));
|
2016-04-18 05:54:53 +00:00
|
|
|
m_locationServiceAvailable = locationServiceAvailable;
|
|
|
|
|
emit locationServiceAvailableChanged();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QMLManager::hasLocationSourceChanged()
|
|
|
|
|
{
|
|
|
|
|
setLocationServiceAvailable(locationProvider->hasLocationsSource());
|
|
|
|
|
}
|
|
|
|
|
|
2015-12-20 02:41:10 +00:00
|
|
|
bool QMLManager::verboseEnabled() const
|
|
|
|
|
{
|
|
|
|
|
return m_verboseEnabled;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QMLManager::setVerboseEnabled(bool verboseMode)
|
|
|
|
|
{
|
|
|
|
|
m_verboseEnabled = verboseMode;
|
|
|
|
|
verbose = verboseMode;
|
2017-06-18 06:23:41 +00:00
|
|
|
appendTextToLog(QStringLiteral("verbose is ") + (verbose ? QStringLiteral("on") : QStringLiteral("off")));
|
2015-12-20 02:41:10 +00:00
|
|
|
emit verboseEnabledChanged();
|
|
|
|
|
}
|
|
|
|
|
|
2015-07-10 07:47:26 +00:00
|
|
|
QString QMLManager::cloudPassword() const
|
|
|
|
|
{
|
|
|
|
|
return m_cloudPassword;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QMLManager::setCloudPassword(const QString &cloudPassword)
|
|
|
|
|
{
|
|
|
|
|
m_cloudPassword = cloudPassword;
|
|
|
|
|
emit cloudPasswordChanged();
|
|
|
|
|
}
|
|
|
|
|
|
2016-06-13 23:41:26 +00:00
|
|
|
QString QMLManager::cloudPin() const
|
|
|
|
|
{
|
|
|
|
|
return m_cloudPin;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QMLManager::setCloudPin(const QString &cloudPin)
|
|
|
|
|
{
|
|
|
|
|
m_cloudPin = cloudPin;
|
|
|
|
|
emit cloudPinChanged();
|
|
|
|
|
}
|
|
|
|
|
|
2015-07-10 07:47:26 +00:00
|
|
|
QString QMLManager::cloudUserName() const
|
|
|
|
|
{
|
|
|
|
|
return m_cloudUserName;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QMLManager::setCloudUserName(const QString &cloudUserName)
|
|
|
|
|
{
|
2016-03-24 06:12:03 +00:00
|
|
|
m_cloudUserName = cloudUserName.toLower();
|
2015-07-10 07:47:26 +00:00
|
|
|
emit cloudUserNameChanged();
|
|
|
|
|
}
|
2015-11-14 01:14:22 +00:00
|
|
|
|
2015-11-14 17:10:06 +00:00
|
|
|
int QMLManager::distanceThreshold() const
|
|
|
|
|
{
|
|
|
|
|
return m_distanceThreshold;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QMLManager::setDistanceThreshold(int distance)
|
|
|
|
|
{
|
|
|
|
|
m_distanceThreshold = distance;
|
|
|
|
|
emit distanceThresholdChanged();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int QMLManager::timeThreshold() const
|
|
|
|
|
{
|
|
|
|
|
return m_timeThreshold;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QMLManager::setTimeThreshold(int time)
|
|
|
|
|
{
|
|
|
|
|
m_timeThreshold = time;
|
2017-07-25 09:44:30 +00:00
|
|
|
locationProvider->setGpsTimeThreshold(m_timeThreshold * 60);
|
2015-11-14 17:10:06 +00:00
|
|
|
emit timeThresholdChanged();
|
|
|
|
|
}
|
2015-12-03 02:49:02 +00:00
|
|
|
|
2017-06-24 02:35:48 +00:00
|
|
|
void QMLManager::setTheme(QString theme)
|
|
|
|
|
{
|
|
|
|
|
QSettings s;
|
|
|
|
|
s.beginGroup("Theme");
|
|
|
|
|
s.setValue("currentTheme", theme);
|
|
|
|
|
emit themeChanged();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QString QMLManager::theme() const
|
|
|
|
|
{
|
|
|
|
|
QSettings s;
|
|
|
|
|
s.beginGroup("Theme");
|
|
|
|
|
return s.value("currentTheme", "Blue").toString();
|
|
|
|
|
}
|
|
|
|
|
|
2015-12-03 02:49:02 +00:00
|
|
|
bool QMLManager::loadFromCloud() const
|
|
|
|
|
{
|
|
|
|
|
return m_loadFromCloud;
|
|
|
|
|
}
|
|
|
|
|
|
2016-02-08 19:08:49 +00:00
|
|
|
void QMLManager::syncLoadFromCloud()
|
|
|
|
|
{
|
|
|
|
|
QSettings s;
|
|
|
|
|
QString cloudMarker = QLatin1Literal("loadFromCloud") + QString(prefs.cloud_storage_email);
|
|
|
|
|
m_loadFromCloud = s.contains(cloudMarker) && s.value(cloudMarker).toBool();
|
|
|
|
|
}
|
|
|
|
|
|
2015-12-03 02:49:02 +00:00
|
|
|
void QMLManager::setLoadFromCloud(bool done)
|
|
|
|
|
{
|
2016-01-11 05:38:44 +00:00
|
|
|
QSettings s;
|
2016-02-08 19:08:49 +00:00
|
|
|
QString cloudMarker = QLatin1Literal("loadFromCloud") + QString(prefs.cloud_storage_email);
|
|
|
|
|
s.setValue(cloudMarker, done);
|
2015-12-03 02:49:02 +00:00
|
|
|
m_loadFromCloud = done;
|
|
|
|
|
emit loadFromCloudChanged();
|
|
|
|
|
}
|
2015-12-15 07:00:19 +00:00
|
|
|
|
|
|
|
|
QString QMLManager::startPageText() const
|
|
|
|
|
{
|
|
|
|
|
return m_startPageText;
|
|
|
|
|
}
|
|
|
|
|
|
2016-01-26 15:02:42 +00:00
|
|
|
void QMLManager::setStartPageText(const QString& text)
|
2015-12-15 07:00:19 +00:00
|
|
|
{
|
|
|
|
|
m_startPageText = text;
|
|
|
|
|
emit startPageTextChanged();
|
|
|
|
|
}
|
2015-12-26 21:22:50 +00:00
|
|
|
|
2017-08-03 12:55:09 +00:00
|
|
|
QMLManager::cloud_status_qml QMLManager::credentialStatus() const
|
2016-02-11 01:45:23 +00:00
|
|
|
{
|
|
|
|
|
return m_credentialStatus;
|
|
|
|
|
}
|
|
|
|
|
|
2017-08-03 12:55:09 +00:00
|
|
|
void QMLManager::setCredentialStatus(const cloud_status_qml value)
|
2016-02-11 01:45:23 +00:00
|
|
|
{
|
|
|
|
|
if (m_credentialStatus != value) {
|
2017-09-27 16:42:19 +00:00
|
|
|
setOldStatus(m_credentialStatus);
|
2017-09-27 16:27:12 +00:00
|
|
|
if (value == CS_NOCLOUD) {
|
2016-04-29 13:28:09 +00:00
|
|
|
appendTextToLog("Switching to no cloud mode");
|
2017-09-27 16:27:12 +00:00
|
|
|
set_filename(NOCLOUD_LOCALSTORAGE, true);
|
mobile: No cloud repo creation more explicit
Before this change, there was only one way to create the local
no cloud repo on the device. The user needed to add at least
one dive to the no cloud account (so that there is something
to save). While this worked in some scenarios, it could also
get things in an inconsistent state: credential status = CS_NOCLOUD
but no local repo. This was a dead end.
In this commit, the creation of the no cloud repo is made more
explicit. When asking for no cloud mode, just create an (empty)
repo for it when it does not yet exist, and otherwise, just
open the existing (possibly empty) repo.
Now, a user can have no cloud repo, next to (any number of)
cloud accounts.
This leaves one functional aspect left: how does a user abandon
the no cloud repo, by merging his data into a true cloud
account. This is code for this, that tries to do this merge in
a smart way. This seems to be broken (too). To be clear: this
is no part of this commit.
Fixes: #667
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-10-17 07:51:00 +00:00
|
|
|
clearCredentials();
|
2017-09-27 16:27:12 +00:00
|
|
|
}
|
2016-02-11 01:45:23 +00:00
|
|
|
m_credentialStatus = value;
|
|
|
|
|
emit credentialStatusChanged();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-08-03 12:55:09 +00:00
|
|
|
QMLManager::cloud_status_qml QMLManager::oldStatus() const
|
2016-04-06 18:42:38 +00:00
|
|
|
{
|
|
|
|
|
return m_oldStatus;
|
|
|
|
|
}
|
|
|
|
|
|
2017-08-03 12:55:09 +00:00
|
|
|
void QMLManager::setOldStatus(const cloud_status_qml value)
|
2016-04-06 18:42:38 +00:00
|
|
|
{
|
|
|
|
|
if (m_oldStatus != value) {
|
|
|
|
|
m_oldStatus = value;
|
|
|
|
|
emit oldStatusChanged();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-01-26 15:02:42 +00:00
|
|
|
QString QMLManager::getNumber(const QString& diveId)
|
2015-12-27 04:02:23 +00:00
|
|
|
{
|
|
|
|
|
int dive_id = diveId.toInt();
|
|
|
|
|
struct dive *d = get_dive_by_uniq_id(dive_id);
|
|
|
|
|
QString number;
|
|
|
|
|
if (d)
|
|
|
|
|
number = QString::number(d->number);
|
|
|
|
|
return number;
|
|
|
|
|
}
|
|
|
|
|
|
2016-01-26 15:02:42 +00:00
|
|
|
QString QMLManager::getDate(const QString& diveId)
|
2015-12-27 04:02:23 +00:00
|
|
|
{
|
|
|
|
|
int dive_id = diveId.toInt();
|
|
|
|
|
struct dive *d = get_dive_by_uniq_id(dive_id);
|
|
|
|
|
QString datestring;
|
|
|
|
|
if (d)
|
|
|
|
|
datestring = get_dive_date_string(d->when);
|
|
|
|
|
return datestring;
|
|
|
|
|
}
|
2016-02-10 20:53:58 +00:00
|
|
|
|
|
|
|
|
QString QMLManager::getVersion() const
|
|
|
|
|
{
|
2016-03-05 20:53:38 +00:00
|
|
|
QRegExp versionRe(".*:([()\\.,\\d]+).*");
|
2016-02-10 20:53:58 +00:00
|
|
|
if (!versionRe.exactMatch(getUserAgent()))
|
|
|
|
|
return QString();
|
|
|
|
|
|
|
|
|
|
return versionRe.cap(1);
|
|
|
|
|
}
|
2016-03-03 01:13:42 +00:00
|
|
|
|
2017-11-22 18:22:02 +00:00
|
|
|
QString QMLManager::getGpsFromSiteName(const QString& siteName)
|
|
|
|
|
{ uint32_t uuid;
|
|
|
|
|
struct dive_site *ds;
|
|
|
|
|
|
|
|
|
|
uuid = get_dive_site_uuid_by_name(qPrintable(siteName), NULL);
|
|
|
|
|
if (uuid) {
|
|
|
|
|
ds = get_dive_site_by_uuid(uuid);
|
|
|
|
|
return QString(printGPSCoords(ds->latitude.udeg, ds->longitude.udeg));
|
|
|
|
|
}
|
|
|
|
|
return "";
|
|
|
|
|
}
|
|
|
|
|
|
2017-06-18 06:22:37 +00:00
|
|
|
QString QMLManager::notificationText() const
|
2016-03-03 01:13:42 +00:00
|
|
|
{
|
2017-06-18 06:22:37 +00:00
|
|
|
return m_notificationText;
|
2016-03-03 01:13:42 +00:00
|
|
|
}
|
|
|
|
|
|
2017-06-18 06:22:37 +00:00
|
|
|
void QMLManager::setNotificationText(QString text)
|
2016-03-03 01:13:42 +00:00
|
|
|
{
|
2017-06-18 06:22:37 +00:00
|
|
|
m_notificationText = text;
|
|
|
|
|
emit notificationTextChanged();
|
2016-03-03 01:13:42 +00:00
|
|
|
}
|
2016-03-09 03:31:05 +00:00
|
|
|
|
2016-04-04 01:33:40 +00:00
|
|
|
bool QMLManager::syncToCloud() const
|
|
|
|
|
{
|
|
|
|
|
return m_syncToCloud;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QMLManager::setSyncToCloud(bool status)
|
|
|
|
|
{
|
|
|
|
|
m_syncToCloud = status;
|
|
|
|
|
prefs.git_local_only = !status;
|
2016-04-04 01:48:20 +00:00
|
|
|
QSettings s;
|
|
|
|
|
s.beginGroup("CloudStorage");
|
|
|
|
|
s.setValue("git_local_only", prefs.git_local_only);
|
2016-04-04 01:33:40 +00:00
|
|
|
emit syncToCloudChanged();
|
|
|
|
|
}
|
|
|
|
|
|
2016-04-14 13:01:36 +00:00
|
|
|
int QMLManager::updateSelectedDive() const
|
|
|
|
|
{
|
|
|
|
|
return m_updateSelectedDive;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QMLManager::setUpdateSelectedDive(int idx)
|
|
|
|
|
{
|
|
|
|
|
m_updateSelectedDive = idx;
|
|
|
|
|
emit updateSelectedDiveChanged();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int QMLManager::selectedDiveTimestamp() const
|
|
|
|
|
{
|
|
|
|
|
return m_selectedDiveTimestamp;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QMLManager::setSelectedDiveTimestamp(int when)
|
|
|
|
|
{
|
|
|
|
|
m_selectedDiveTimestamp = when;
|
|
|
|
|
emit selectedDiveTimestampChanged();
|
|
|
|
|
}
|
|
|
|
|
|
2016-03-09 03:31:05 +00:00
|
|
|
qreal QMLManager::lastDevicePixelRatio()
|
|
|
|
|
{
|
|
|
|
|
return m_lastDevicePixelRatio;
|
|
|
|
|
}
|
|
|
|
|
|
2017-04-04 00:29:06 +00:00
|
|
|
void QMLManager::setDevicePixelRatio(qreal dpr, QScreen *screen)
|
|
|
|
|
{
|
|
|
|
|
if (m_lastDevicePixelRatio != dpr) {
|
|
|
|
|
m_lastDevicePixelRatio = dpr;
|
|
|
|
|
emit sendScreenChanged(screen);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-03-09 03:31:05 +00:00
|
|
|
void QMLManager::screenChanged(QScreen *screen)
|
|
|
|
|
{
|
|
|
|
|
m_lastDevicePixelRatio = screen->devicePixelRatio();
|
|
|
|
|
emit sendScreenChanged(screen);
|
|
|
|
|
}
|
2016-04-15 21:42:08 +00:00
|
|
|
|
|
|
|
|
void QMLManager::quit()
|
|
|
|
|
{
|
|
|
|
|
if (unsaved_changes())
|
|
|
|
|
saveChangesCloud(false);
|
|
|
|
|
QApplication::quit();
|
|
|
|
|
}
|
2016-05-20 16:48:35 +00:00
|
|
|
|
|
|
|
|
QStringList QMLManager::suitInit() const
|
|
|
|
|
{
|
|
|
|
|
QStringList suits;
|
|
|
|
|
struct dive *d;
|
|
|
|
|
int i = 0;
|
|
|
|
|
for_each_dive (i, d) {
|
|
|
|
|
QString temp = d->suit;
|
|
|
|
|
if (!temp.isEmpty())
|
|
|
|
|
suits << d->suit;
|
|
|
|
|
}
|
|
|
|
|
suits.removeDuplicates();
|
|
|
|
|
suits.sort();
|
|
|
|
|
return suits;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QStringList QMLManager::buddyInit() const
|
|
|
|
|
{
|
|
|
|
|
QStringList buddies;
|
|
|
|
|
struct dive *d;
|
|
|
|
|
int i = 0;
|
|
|
|
|
for_each_dive (i, d) {
|
|
|
|
|
QString temp = d->buddy;
|
|
|
|
|
if (!temp.isEmpty() && !temp.contains(",")){
|
|
|
|
|
buddies << d->buddy;
|
|
|
|
|
}
|
|
|
|
|
else if (!temp.isEmpty()){
|
|
|
|
|
QRegExp sep("(,\\s)");
|
|
|
|
|
QStringList tempList = temp.split(sep);
|
|
|
|
|
buddies << tempList;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
buddies.removeDuplicates();
|
|
|
|
|
buddies.sort();
|
|
|
|
|
return buddies;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QStringList QMLManager::divemasterInit() const
|
|
|
|
|
{
|
|
|
|
|
QStringList divemasters;
|
|
|
|
|
struct dive *d;
|
|
|
|
|
int i = 0;
|
|
|
|
|
for_each_dive (i, d) {
|
|
|
|
|
QString temp = d->divemaster;
|
|
|
|
|
if (!temp.isEmpty())
|
|
|
|
|
divemasters << d->divemaster;
|
|
|
|
|
}
|
|
|
|
|
divemasters.removeDuplicates();
|
|
|
|
|
divemasters.sort();
|
|
|
|
|
return divemasters;
|
|
|
|
|
}
|
2016-06-13 23:41:26 +00:00
|
|
|
|
2017-04-15 00:32:32 +00:00
|
|
|
QStringList QMLManager::cylinderInit() const
|
|
|
|
|
{
|
|
|
|
|
QStringList cylinders;
|
|
|
|
|
struct dive *d;
|
|
|
|
|
int i = 0;
|
|
|
|
|
for_each_dive (i, d) {
|
|
|
|
|
for (int j = 0; j < MAX_CYLINDERS; j++) {
|
|
|
|
|
if (! same_string(d->cylinder[j].type.description, ""))
|
|
|
|
|
cylinders << d->cylinder[j].type.description;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
cylinders.removeDuplicates();
|
|
|
|
|
cylinders.sort();
|
|
|
|
|
return cylinders;
|
|
|
|
|
}
|
|
|
|
|
|
2016-06-13 23:41:26 +00:00
|
|
|
bool QMLManager::showPin() const
|
|
|
|
|
{
|
|
|
|
|
return m_showPin;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QMLManager::setShowPin(bool enable)
|
|
|
|
|
{
|
|
|
|
|
m_showPin = enable;
|
|
|
|
|
emit showPinChanged();
|
|
|
|
|
}
|
2017-06-23 14:31:44 +00:00
|
|
|
|
2017-07-09 22:07:16 +00:00
|
|
|
QString QMLManager::progressMessage() const
|
|
|
|
|
{
|
|
|
|
|
return m_progressMessage;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QMLManager::setProgressMessage(QString text)
|
|
|
|
|
{
|
|
|
|
|
m_progressMessage = text;
|
|
|
|
|
emit progressMessageChanged();
|
|
|
|
|
}
|
|
|
|
|
|
2017-07-10 01:08:06 +00:00
|
|
|
bool QMLManager::libdcLog() const
|
|
|
|
|
{
|
|
|
|
|
return m_libdcLog;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QMLManager::setLibdcLog(bool value)
|
|
|
|
|
{
|
|
|
|
|
m_libdcLog = value;
|
2017-07-10 01:23:16 +00:00
|
|
|
DCDeviceData::instance()->setSaveLog(value);
|
2017-07-10 01:08:06 +00:00
|
|
|
emit libdcLogChanged();
|
|
|
|
|
}
|
|
|
|
|
|
2017-07-19 14:35:46 +00:00
|
|
|
bool QMLManager::developer() const
|
|
|
|
|
{
|
|
|
|
|
return m_developer;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QMLManager::setDeveloper(bool value)
|
|
|
|
|
{
|
|
|
|
|
m_developer = value;
|
|
|
|
|
emit developerChanged();
|
|
|
|
|
}
|
|
|
|
|
|
2017-07-12 11:14:24 +00:00
|
|
|
bool QMLManager::btEnabled() const
|
|
|
|
|
{
|
|
|
|
|
return m_btEnabled;
|
|
|
|
|
}
|
|
|
|
|
|
2017-10-12 07:43:40 +00:00
|
|
|
void QMLManager::setBtEnabled(bool value)
|
|
|
|
|
{
|
|
|
|
|
m_btEnabled = value;
|
|
|
|
|
}
|
|
|
|
|
|
2017-06-23 14:31:44 +00:00
|
|
|
#if defined (Q_OS_ANDROID)
|
|
|
|
|
|
2017-07-10 00:03:57 +00:00
|
|
|
void writeToAppLogFile(QString logText)
|
|
|
|
|
{
|
|
|
|
|
// write to storage and flush so that the data doesn't get lost
|
|
|
|
|
logText.append("\n");
|
|
|
|
|
QMLManager *self = QMLManager::instance();
|
|
|
|
|
if (self) {
|
|
|
|
|
self->writeToAppLogFile(logText);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QMLManager::writeToAppLogFile(QString logText)
|
|
|
|
|
{
|
|
|
|
|
if (appLogFileOpen) {
|
|
|
|
|
appLogFile.write(logText.toUtf8().data());
|
|
|
|
|
appLogFile.flush();
|
|
|
|
|
}
|
|
|
|
|
}
|
2017-06-23 14:31:44 +00:00
|
|
|
|
|
|
|
|
//HACK to color the system bar on Android, use qtandroidextras and call the appropriate Java methods
|
|
|
|
|
//this code is based on code in the Kirigami example app for Android (under LGPL-2) Copyright 2017 Marco Martin
|
|
|
|
|
|
|
|
|
|
#include <QtAndroid>
|
|
|
|
|
|
|
|
|
|
// there doesn't appear to be an include that defines these in an easily accessible way
|
|
|
|
|
// WindowManager.LayoutParams
|
|
|
|
|
#define FLAG_TRANSLUCENT_STATUS 0x04000000
|
|
|
|
|
#define FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS 0x80000000
|
|
|
|
|
// View
|
|
|
|
|
#define SYSTEM_UI_FLAG_LIGHT_STATUS_BAR 0x00002000
|
|
|
|
|
|
|
|
|
|
void QMLManager::setStatusbarColor(QColor color)
|
|
|
|
|
{
|
|
|
|
|
QtAndroid::runOnAndroidThread([=]() {
|
|
|
|
|
QAndroidJniObject window = QtAndroid::androidActivity().callObjectMethod("getWindow", "()Landroid/view/Window;");
|
|
|
|
|
window.callMethod<void>("addFlags", "(I)V", FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
|
|
|
|
|
window.callMethod<void>("clearFlags", "(I)V", FLAG_TRANSLUCENT_STATUS);
|
|
|
|
|
window.callMethod<void>("setStatusBarColor", "(I)V", color.rgba());
|
|
|
|
|
window.callMethod<void>("setNavigationBarColor", "(I)V", color.rgba());
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
#else
|
|
|
|
|
void QMLManager::setStatusbarColor(QColor color)
|
|
|
|
|
{
|
|
|
|
|
// noop
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif
|
