diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2016-04-29 06:28:09 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2016-04-29 14:36:00 -0700 |
| commit | 4ad73fb80756eb7509efd19962994ebfeb2a219b (patch) | |
| tree | bbb1cfa0b850f559a8319bed5fe65764cba3a89d /mobile-widgets/qmlmanager.h | |
| parent | c6205b5819c7e7e3853b93208fb1444a02d46b71 (diff) | |
| download | subsurface-4ad73fb80756eb7509efd19962994ebfeb2a219b.tar.gz | |
QML UI: when switching from no cloud to cloud usage, don't drop local data
This is rather simplistic, it just imports the local data into the remote
repository and therefore loses the git history of the local data - but I
wasn't able to make the git merge without shared base commit work, so I
went this much easier to implement route instead.
One thing we need to be careful about is that contacting the remote server
could fail. If we don't manage to merge the dives from cloud server and
local storage, we need to revery to no cloud status in order not to lose
the local data.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'mobile-widgets/qmlmanager.h')
| -rw-r--r-- | mobile-widgets/qmlmanager.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mobile-widgets/qmlmanager.h b/mobile-widgets/qmlmanager.h index 2bd2ee240..965a68d40 100644 --- a/mobile-widgets/qmlmanager.h +++ b/mobile-widgets/qmlmanager.h @@ -128,11 +128,13 @@ public slots: void clearGpsData(); void finishSetup(); void openLocalThenRemote(QString url); + void mergeLocalRepo(); QString getNumber(const QString& diveId); QString getDate(const QString& diveId); QString getCurrentPosition(); QString getVersion() const; void deleteGpsFix(quint64 when); + void revertToNoCloudIfNeeded(); void consumeFinishedLoad(timestamp_t currentDiveTimestamp); void refreshDiveList(); void screenChanged(QScreen *screen); |