When starting ssrf-mobile, and the local divelist is identical to the
cloud version (so same sha1), a save of local modifcations to the cloud
should be possible. This fix enables this by pretending that a
suppressed load from cloud on start is still a valid load from cloud.
Signed-off-by: Jan Mulder <[email protected]>
---
qt-mobile/qmlmanager.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/qt-mobile/qmlmanager.cpp b/qt-mobile/qmlmanager.cpp
index 00f8b5d..d25d885 100644
--- a/qt-mobile/qmlmanager.cpp
+++ b/qt-mobile/qmlmanager.cpp
@@ -275,6 +275,7 @@ void QMLManager::loadDivesWithValidCredentials()
if (check_git_sha(fileNamePrt.data()) == 0) {
qDebug() << "local cache was current, no need to modify dive
list";
appendTextToLog("Cloud sync shows local cache was current");
+ setLoadFromCloud(true);
return;
}
clear_dive_file_data();
--
2.7.0
best,
--jan
>From 1373499c9a19e412fedbf9d51dbb811b1da3ea09 Mon Sep 17 00:00:00 2001
From: Jan Mulder <[email protected]>
Date: Thu, 7 Jan 2016 20:49:29 +0100
Subject: [PATCH] mobile: allow save when local store is actual
When starting ssrf-mobile, and the local divelist is identical to the
cloud version (so same sha1), a save of local modifications to the
cloud should be possible. This fix enables this by pretending
that a suppressed load from cloud on start is still a valid load
from cloud.
Signed-off-by: Jan Mulder <[email protected]>
---
qt-mobile/qmlmanager.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/qt-mobile/qmlmanager.cpp b/qt-mobile/qmlmanager.cpp
index 00f8b5d..d25d885 100644
--- a/qt-mobile/qmlmanager.cpp
+++ b/qt-mobile/qmlmanager.cpp
@@ -275,6 +275,7 @@ void QMLManager::loadDivesWithValidCredentials()
if (check_git_sha(fileNamePrt.data()) == 0) {
qDebug() << "local cache was current, no need to modify dive list";
appendTextToLog("Cloud sync shows local cache was current");
+ setLoadFromCloud(true);
return;
}
clear_dive_file_data();
--
2.7.0
_______________________________________________
subsurface mailing list
[email protected]
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
