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: restructure (and fix) the saveChanges logic

Browse source 
We first want to save any exiting unsaved changes to the local repository
(and ONLY to the local repository). After that we want to make sure that
we are syncing remotely, fetch the remote and then (possibly after a
merge) push the changes to the remote. In the end we reset the previous
"local git only" preference which we overwrote for this manual forced
sync.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-04-05 21:36:56 -07:00
parent 8af4534286
commit 8b670c3f3f
1 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
mobile-widgets/qmlmanager.cpp
View file

@ -359,9 +359,6 @@ void QMLManager::loadDivesWithValidCredentials()
setAccessingCloud(-1);
return;
}
clear_dive_file_data();
DiveListModel::instance()->clear();
appendTextToLog("Cloud sync brought newer data, reloading the dive list");
int error = parse_file(fileNamePrt.data());
@ -725,28 +722,38 @@ void QMLManager::saveChanges()
appendTextToLog("Save operation already in progress.");
return;
}
appendTextToLog("Saving dives.");
git_storage_update_progress(0, "saveChanges"); // reset the timers
QString fileName;
if (getCloudURL(fileName)) {
appendTextToLog(get_error_string());
return;
}
if (prefs.git_local_only == false) {
setAccessingCloud(0);
qApp->processEvents(); // make sure that the notification is actually shown
}
alreadySaving = true;
if (save_dives(fileName.toUtf8().data())) {
appendTextToLog(get_error_string());
setAccessingCloud(-1);
alreadySaving = false;
return;
bool glo = prefs.git_local_only;
bool cbs = prefs.cloud_background_sync;
if (unsaved_changes()) {
appendTextToLog("Saving dives locally.");
git_storage_update_progress(0, "saving dives locally"); // reset the timers
prefs.git_local_only = true;
prefs.cloud_background_sync = false;
if (save_dives(fileName.toUtf8().data())) {
appendTextToLog(get_error_string());
setAccessingCloud(-1);
prefs.git_local_only = glo;
prefs.cloud_background_sync = cbs;
alreadySaving = false;
return;
}
} else {
git_storage_update_progress(0, "no unsaved changes, sync with remote");
}
prefs.git_local_only = false;
loadDivesWithValidCredentials();
setAccessingCloud(-1);
appendTextToLog("Updated dive list saved.");
appendTextToLog("synced dive list.");
set_filename(fileName.toUtf8().data(), true);
mark_divelist_changed(false);
prefs.git_local_only = glo;
prefs.cloud_background_sync = cbs;
alreadySaving = false;
}