mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

mobile: correctly reset model instead of disconnecting it

Browse source 
This is a much better workaround for the invalid accesses to the
underlying data while transitioning.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2019-11-15 21:33:05 -08:00
parent 0f390183e2
commit ca911e6916
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mobile-widgets/qmlmanager.cpp
View file

@ -300,6 +300,7 @@ void QMLManager::applicationStateChanged(Qt::ApplicationState state)
void QMLManager::openLocalThenRemote(QString url) void QMLManager::openLocalThenRemote(QString url)
{ {
DiveListModel::instance()->clear(); DiveListModel::instance()->clear();
MobileListModel::instance()->resetModel();
setNotificationText(tr("Open local dive data file")); setNotificationText(tr("Open local dive data file"));
QByteArray fileNamePrt = QFile::encodeName(url); QByteArray fileNamePrt = QFile::encodeName(url);
/* if this is a cloud storage repo and we have no local cache (i.e., it's the first time /* if this is a cloud storage repo and we have no local cache (i.e., it's the first time
@ -337,6 +338,7 @@ void QMLManager::openLocalThenRemote(QString url)
qPrefPartialPressureGas::set_po2(git_prefs.pp_graphs.po2); qPrefPartialPressureGas::set_po2(git_prefs.pp_graphs.po2);
process_loaded_dives(); process_loaded_dives();
DiveListModel::instance()->reload(); DiveListModel::instance()->reload();
MobileListModel::instance()->resetModel();
appendTextToLog(QStringLiteral("%1 dives loaded from cache").arg(dive_table.nr)); appendTextToLog(QStringLiteral("%1 dives loaded from cache").arg(dive_table.nr));
setNotificationText(tr("%1 dives loaded from local dive data file").arg(dive_table.nr)); setNotificationText(tr("%1 dives loaded from local dive data file").arg(dive_table.nr));
} }
@ -560,6 +562,7 @@ void QMLManager::saveCloudCredentials(const QString &newEmail, const QString &ne
manager()->clearAccessCache(); // remove any chached credentials manager()->clearAccessCache(); // remove any chached credentials
clear_git_id(); // invalidate our remembered GIT SHA clear_git_id(); // invalidate our remembered GIT SHA
DiveListModel::instance()->reload(); DiveListModel::instance()->reload();
MobileListModel::instance()->resetModel();
GpsListModel::instance()->clear(); GpsListModel::instance()->clear();
setStartPageText(tr("Attempting to open cloud storage with new credentials")); setStartPageText(tr("Attempting to open cloud storage with new credentials"));
// we therefore know that no one else is already accessing THIS git repo; // we therefore know that no one else is already accessing THIS git repo;