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

QML UI: only force network access when user asks us to

Browse source 
So when the user taps on the manual cloud sync, we always force access to
the cloud server. Otherwise we only access the cloud server if
git_local_only isn't set.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-04-08 12:35:45 -07:00
parent 685d31cd4f
commit 4ed369b975
3 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mobile-widgets/qml/main.qml
View file

@ -138,7 +138,7 @@ Kirigami.ApplicationWindow {
onTriggered: { onTriggered: {
globalDrawer.close() globalDrawer.close()
detailsWindow.endEditMode() detailsWindow.endEditMode()
manager.saveChangesCloud(); manager.saveChangesCloud(true);
globalDrawer.close() globalDrawer.close()
} }
} }

17
mobile-widgets/qmlmanager.cpp
View file

@ -84,7 +84,6 @@ QMLManager::QMLManager() : m_locationServiceEnabled(false),
qDebug() << QStringLiteral("build with Qt Version %1, runtime from Qt Version %2").arg(QT_VERSION_STR).arg(qVersion()); qDebug() << QStringLiteral("build with Qt Version %1, runtime from Qt Version %2").arg(QT_VERSION_STR).arg(qVersion());
setStartPageText(tr("Starting...")); setStartPageText(tr("Starting..."));
setAccessingCloud(-1); setAccessingCloud(-1);
setSyncToCloud(true);
// create location manager service // create location manager service
locationProvider = new GpsLocation(&appendTextToLogStandalone, this); locationProvider = new GpsLocation(&appendTextToLogStandalone, this);
set_git_update_cb(&gitProgressCB); set_git_update_cb(&gitProgressCB);
@ -117,7 +116,7 @@ void QMLManager::applicationStateChanged(Qt::ApplicationState state)
// FIXME // FIXME
// make sure the user sees that we are saving data if they come back // make sure the user sees that we are saving data if they come back
// while this is running // while this is running
saveChangesCloud(); saveChangesCloud(false);
appendTextToLog(QString::number(timer.elapsed() / 1000.0,'f', 3) + ": done saving to git local / remote"); appendTextToLog(QString::number(timer.elapsed() / 1000.0,'f', 3) + ": done saving to git local / remote");
} }
} }
@ -147,8 +146,12 @@ void QMLManager::openLocalThenRemote(QString url)
appendTextToLog(QStringLiteral("%1 dives loaded from cache").arg(dive_table.nr)); appendTextToLog(QStringLiteral("%1 dives loaded from cache").arg(dive_table.nr));
} }
set_filename(fileNamePrt.data(), true); set_filename(fileNamePrt.data(), true);
appendTextToLog(QStringLiteral("have cloud credentials, trying to connect")); if (prefs.git_local_only) {
tryRetrieveDataFromBackend(); appendTextToLog(QStringLiteral("have cloud credentials, but user asked not to connect to network"));
} else {
appendTextToLog(QStringLiteral("have cloud credentials, trying to connect"));
tryRetrieveDataFromBackend();
}
} }
void QMLManager::finishSetup() void QMLManager::finishSetup()
@ -156,6 +159,7 @@ void QMLManager::finishSetup()
// Initialize cloud credentials. // Initialize cloud credentials.
setCloudUserName(prefs.cloud_storage_email); setCloudUserName(prefs.cloud_storage_email);
setCloudPassword(prefs.cloud_storage_password); setCloudPassword(prefs.cloud_storage_password);
setSyncToCloud(!prefs.git_local_only);
// if the cloud credentials are valid, we should get the GPS Webservice ID as well // if the cloud credentials are valid, we should get the GPS Webservice ID as well
QString url; QString url;
if (!cloudUserName().isEmpty() && if (!cloudUserName().isEmpty() &&
@ -771,8 +775,11 @@ void QMLManager::saveChangesLocal()
} }
} }
void QMLManager::saveChangesCloud() void QMLManager::saveChangesCloud(bool forceRemoteSync)
{ {
if (prefs.git_local_only && !forceRemoteSync)
return;
git_storage_update_progress(true, "start save change to cloud"); git_storage_update_progress(true, "start save change to cloud");
if (!loadFromCloud()) { if (!loadFromCloud()) {
appendTextToLog("Don't save dives without loading from the cloud, first."); appendTextToLog("Don't save dives without loading from the cloud, first.");

2
mobile-widgets/qmlmanager.h
View file

@ -100,7 +100,7 @@ public slots:
QString buddy, QString diveMaster, QString weight, QString notes, QString buddy, QString diveMaster, QString weight, QString notes,
QString startpressure, QString endpressure, QString gasmix); QString startpressure, QString endpressure, QString gasmix);
void saveChangesLocal(); void saveChangesLocal();
void saveChangesCloud(); void saveChangesCloud(bool forceRemoteSync);
void deleteDive(int id); void deleteDive(int id);
void undoDelete(int id); void undoDelete(int id);
QString addDive(); QString addDive();