4 files changed, 45 insertions, 30 deletions

diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp
index 06267d590..d064c1807 100644
--- a/mobile-widgets/qmlmanager.cpp
+++ b/mobile-widgets/qmlmanager.cpp
@@ -300,7 +300,7 @@ void QMLManager::applicationStateChanged(Qt::ApplicationState state)
 void QMLManager::openLocalThenRemote(QString url)
 {
 	DiveListModel::instance()->clear();
-	MobileListModel::instance()->resetModel();
+	MobileModels::instance()->clear();
 	setNotificationText(tr("Open local dive data file"));
 	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
@@ -338,7 +338,7 @@ void QMLManager::openLocalThenRemote(QString url)
 		qPrefPartialPressureGas::set_po2(git_prefs.pp_graphs.po2);
 		process_loaded_dives();
 		DiveListModel::instance()->reload();
-		MobileListModel::instance()->resetModel();
+		MobileModels::instance()->reset();
 		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));
 	}
@@ -374,7 +374,7 @@ static struct dive *diveInRow(const QAbstractItemModel *model, int row)
 
 void QMLManager::selectRow(int row)
 {
-	dive *d = diveInRow(MobileListModel::instance(), row);
+	dive *d = diveInRow(MobileModels::instance()->listModel(), row);
 	select_single_dive(d);
 }
 
@@ -574,8 +574,8 @@ void QMLManager::saveCloudCredentials(const QString &newEmail, const QString &ne
 		getCloudURL(url);
 		manager()->clearAccessCache(); // remove any chached credentials
 		clear_git_id(); // invalidate our remembered GIT SHA
+		MobileModels::instance()->clear();
 		DiveListModel::instance()->reload();
-		MobileListModel::instance()->resetModel();
 		GpsListModel::instance()->clear();
 		setStartPageText(tr("Attempting to open cloud storage with new credentials"));
 		// we therefore know that no one else is already accessing THIS git repo;
diff --git a/qt-models/mobilelistmodel.cpp b/qt-models/mobilelistmodel.cpp
index 87248ce3f..e679c72c6 100644
--- a/qt-models/mobilelistmodel.cpp
+++ b/qt-models/mobilelistmodel.cpp
@@ -2,21 +2,10 @@
 #include "mobilelistmodel.h"
 #include "core/divelist.h" // for shown_dives
 
-MobileListModel::MobileListModel(DiveTripModelBase *sourceIn) : source(sourceIn),
+MobileListModel::MobileListModel(DiveTripModelBase *sourceIn) :
+	source(sourceIn),
 	expandedRow(-1)
 {
-	connectSignals();
-}
-
-MobileListModel *MobileListModel::instance()
-{
-	static DiveTripModelTree source;
-	static MobileListModel self(&source);
-	return &self;
-}
-
-void MobileListModel::connectSignals()
-{
 	connect(source, &DiveTripModelBase::modelAboutToBeReset, this, &MobileListModel::beginResetModel);
 	connect(source, &DiveTripModelBase::modelReset, this, &MobileListModel::endResetModel);
 	connect(source, &DiveTripModelBase::rowsAboutToBeRemoved, this, &MobileListModel::prepareRemove);
@@ -246,14 +235,6 @@ QVariant MobileListModel::data(const QModelIndex &index, int role) const
 	return source->data(mapToSource(index), role);
 }
 
-void MobileListModel::resetModel()
-{
-	beginResetModel();
-	source->reset();
-	connectSignals();
-	endResetModel();
-}
-
 // Trivial helper to return and erase the last element of a stack
 template<typename T>
 static T pop(std::vector<T> &v)
@@ -544,3 +525,28 @@ void MobileListModel::toggle(int row)
 	else
 		expand(row);
 }
+MobileModels *MobileModels::instance()
+{
+	static MobileModels self;
+	return &self;
+}
+
+MobileModels::MobileModels() :
+	lm(&source)
+{
+}
+
+MobileListModel *MobileModels::listModel()
+{
+	return &lm;
+}
+
+void MobileModels::clear()
+{
+	source.clear();
+}
+
+void MobileModels::reset()
+{
+	source.reset();
+}
diff --git a/qt-models/mobilelistmodel.h b/qt-models/mobilelistmodel.h
index ab0026f32..f5242a3c9 100644
--- a/qt-models/mobilelistmodel.h
+++ b/qt-models/mobilelistmodel.h
@@ -45,8 +45,6 @@ public:
 		SelectedRole,
 	};
 	MobileListModel(DiveTripModelBase *source);
-	static MobileListModel *instance();
-	void resetModel();
 	void expand(int row);
 	void unexpand();
 	Q_INVOKABLE void toggle(int row);
@@ -58,7 +56,6 @@ private:
 		bool visible;
 		int first, last;
 	};
-	void connectSignals();
 	std::vector<IndexRange> rangeStack;
 	QModelIndex sourceIndex(int row, int col, int parentRow = -1) const;
 	int numSubItems() const;
@@ -93,6 +90,19 @@ private slots:
 	void changed(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles);
 };
 
+// This convenience class provides access to the two mobile models.
+// Moreover, it provides an interface to the source trip-model.
+class MobileModels {
+public:
+	static MobileModels *instance();
+	MobileListModel *listModel();
+	void clear(); // Clear all dive data
+	void reset(); // Reset model after having reloaded the core data
+private:
+	MobileModels();
+	DiveTripModelTree source;
+	MobileListModel lm;
+};
 
 // Helper functions - these are actually defined in DiveObjectHelper.cpp. Why declare them here?
 QString formatSac(const dive *d);
diff --git a/subsurface-helper.cpp b/subsurface-helper.cpp
index d230eacb8..44676eb74 100644
--- a/subsurface-helper.cpp
+++ b/subsurface-helper.cpp
@@ -103,10 +103,9 @@ void run_ui()
 	gpsSortModel->setSortRole(GpsListModel::GpsWhenRole);
 	gpsSortModel->sort(0, Qt::DescendingOrder);
 	QQmlContext *ctxt = engine.rootContext();
-	MobileListModel *mlm(MobileListModel::instance());
-	ctxt->setContextProperty("diveModel", mlm);
 	ctxt->setContextProperty("gpsModel", gpsSortModel);
 	ctxt->setContextProperty("vendorList", vendorList);
+	ctxt->setContextProperty("diveModel", MobileModels::instance()->listModel());
 	set_non_bt_addresses();
 
 	ctxt->setContextProperty("connectionListModel", &connectionListModel);