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

mobile: unify download code on mobile and desktop

Browse source 
Use the undo-command for importing dives also on mobile. This should make the
whole disconnect-model shenigans unnecessary.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-11-16 22:24:06 +01:00 • committed by Dirk Hohndel
parent 3b6b9951ae
commit b6f821886b
4 changed files with 20 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

25
desktop-widgets/downloadfromdivecomputer.cpp
View file

@ -525,26 +525,13 @@ void DownloadFromDCWidget::on_ok_clicked()
if (currentState != DONE && currentState != ERRORED)
return;
// delete non-selected dives
diveImportedModel->deleteDeselected();
int flags = IMPORT_IS_DOWNLOADED;
if (preferDownloaded())
flags |= IMPORT_PREFER_IMPORTED;
if (ui.createNewTrip->isChecked())
flags |= IMPORT_ADD_TO_NEW_TRIP;
// TODO: use structured bindings once we go C++17
std::pair<struct dive_table, struct dive_site_table> tables = diveImportedModel->consumeTables();
if (tables.first.nr > 0) {
auto data = diveImportedModel->thread.data();
int flags = IMPORT_IS_DOWNLOADED;
if (preferDownloaded())
flags |= IMPORT_PREFER_IMPORTED;
if (ui.createNewTrip->isChecked())
flags |= IMPORT_ADD_TO_NEW_TRIP;
Command::importDives(&tables.first, nullptr, &tables.second, flags, data->devName());
} else {
clear_dive_site_table(&tables.second);
}
// The dives and dive sites have been consumed, but the arrays of the tables
// still exist. Free them.
free(tables.first.dives);
free(tables.second.dive_sites);
diveImportedModel->recordDives(flags);
if (ostcFirmwareCheck && currentState == DONE)
ostcFirmwareCheck->checkLatest(this, diveImportedModel->thread.data()->internalData());