diff options
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | mobile-widgets/qmlmanager.cpp | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c62cca4a..812ad86f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +Mobile: fix subtle potential new data loss bug in first session connecting to a cloud account Planner: Add checkbox on considering oxygen narcotic Planner: Improve rounding of stop durations in planner notes Desktop: register changes when clicking "done" on dive-site edit screen diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index 1aadc6b50..983f192be 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -302,6 +302,9 @@ void QMLManager::openLocalThenRemote(QString url) QMLPrefs::instance()->setCredentialStatus(qPrefCloudStorage::CS_NEED_TO_VERIFY); } else { // if we can load from the cache, we know that we have a valid cloud account + // and we know that there was at least one successful sync with the cloud when + // that local cache was created - so there is a common ancestor + setLoadFromCloud(true); if (QMLPrefs::instance()->credentialStatus() == qPrefCloudStorage::CS_UNKNOWN) QMLPrefs::instance()->setCredentialStatus(qPrefCloudStorage::CS_VERIFIED); if (git_prefs.unit_system == IMPERIAL) |