mobile: remove updateSelectedDive logic

Selection is now be handled by the core.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>

3 files changed, 4 insertions, 21 deletions

diff --git a/mobile-widgets/qml/DiveDetails.qml b/mobile-widgets/qml/DiveDetails.qml
index ef102542e..8419b5d09 100644
--- a/mobile-widgets/qml/DiveDetails.qml
+++ b/mobile-widgets/qml/DiveDetails.qml
@@ -42,7 +42,6 @@ Kirigami.Page {
 	property alias cylinderIndex4: detailsEdit.cylinderIndex4
 	property alias usedGas: detailsEdit.usedGas
 	property alias gpsCheckbox: detailsEdit.gpsCheckbox
-	property int updateCurrentIdx: manager.updateSelectedDive
 	property alias rating: detailsEdit.rating
 	property alias visibility: detailsEdit.visibility
 	property alias usedCyl: detailsEdit.usedCyl
diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp
index 0ccf6f42c..92dbfc4ff 100644
--- a/mobile-widgets/qmlmanager.cpp
+++ b/mobile-widgets/qmlmanager.cpp
@@ -149,7 +149,6 @@ void QMLManager::btRescan()
 
 QMLManager::QMLManager() : m_locationServiceEnabled(false),
 	m_verboseEnabled(false),
-	m_updateSelectedDive(-1),
 	m_selectedDiveTimestamp(0),
 	alreadySaving(false),
 	m_pluggedInDeviceName(""),
@@ -492,7 +491,7 @@ void QMLManager::finishSetup()
 			set_filename(NULL);
 		} else {
 			// successfully opened the local file, now add thigs to the dive list
-			consumeFinishedLoad(0);
+			consumeFinishedLoad();
 			appendTextToLog(QString("working in no-cloud mode, finished loading %1 dives from %2").arg(dive_table.nr).arg(existing_filename));
 		}
 	} else {
@@ -748,7 +747,6 @@ void QMLManager::retrieveUserid()
 void QMLManager::loadDivesWithValidCredentials()
 {
 	QString url;
-	timestamp_t currentDiveTimestamp = m_selectedDiveTimestamp;
 	if (getCloudURL(url)) {
 		setStartPageText(RED_FONT + tr("Cloud storage error: %1").arg(consumeError()) + END_FONT);
 		revertToNoCloudIfNeeded();
@@ -788,7 +786,7 @@ void QMLManager::loadDivesWithValidCredentials()
 		set_filename(NULL);
 		return;
 	}
-	consumeFinishedLoad(currentDiveTimestamp);
+	consumeFinishedLoad();
 
 successful_exit:
 	alreadySaving = false;
@@ -847,7 +845,7 @@ void QMLManager::revertToNoCloudIfNeeded()
 	alreadySaving = false;
 }
 
-void QMLManager::consumeFinishedLoad(timestamp_t currentDiveTimestamp)
+void QMLManager::consumeFinishedLoad()
 {
 	prefs.unit_system = git_prefs.unit_system;
 	if (git_prefs.unit_system == IMPERIAL)
@@ -862,8 +860,6 @@ void QMLManager::consumeFinishedLoad(timestamp_t currentDiveTimestamp)
 	prefs.pp_graphs.po2 = git_prefs.pp_graphs.po2;
 	process_loaded_dives();
 	MobileModels::instance()->reset();
-	if (currentDiveTimestamp)
-		setUpdateSelectedDive(DiveListSortModel::instance()->getIdxForId(get_dive_id_closest_to(currentDiveTimestamp)));
 	appendTextToLog(QStringLiteral("%1 dives loaded").arg(dive_table.nr));
 	if (dive_table.nr == 0)
 		setStartPageText(tr("Cloud storage open successfully. No dives in dive list."));
@@ -1715,12 +1711,6 @@ void QMLManager::setNotificationText(QString text)
 	emit notificationTextChanged();
 }
 
-void QMLManager::setUpdateSelectedDive(int idx)
-{
-	m_updateSelectedDive = idx;
-	emit updateSelectedDiveChanged();
-}
-
 void QMLManager::setSelectedDiveTimestamp(int when)
 {
 	m_selectedDiveTimestamp = when;
diff --git a/mobile-widgets/qmlmanager.h b/mobile-widgets/qmlmanager.h
index f0f78937e..d497280bd 100644
--- a/mobile-widgets/qmlmanager.h
+++ b/mobile-widgets/qmlmanager.h
@@ -32,7 +32,6 @@ class QMLManager : public QObject {
 	Q_PROPERTY(QString startPageText MEMBER m_startPageText WRITE setStartPageText NOTIFY startPageTextChanged)
 	Q_PROPERTY(bool verboseEnabled MEMBER m_verboseEnabled WRITE setVerboseEnabled NOTIFY verboseEnabledChanged)
 	Q_PROPERTY(QString notificationText MEMBER m_notificationText WRITE setNotificationText NOTIFY notificationTextChanged)
-	Q_PROPERTY(int updateSelectedDive MEMBER m_updateSelectedDive WRITE setUpdateSelectedDive NOTIFY updateSelectedDiveChanged)
 	Q_PROPERTY(int selectedDiveTimestamp MEMBER m_selectedDiveTimestamp WRITE setSelectedDiveTimestamp NOTIFY selectedDiveTimestampChanged)
 	Q_PROPERTY(QStringList suitList READ suitList NOTIFY suitListChanged)
 	Q_PROPERTY(QStringList buddyList READ buddyList NOTIFY buddyListChanged)
@@ -137,9 +136,6 @@ public:
 	QString notificationText() const;
 	void setNotificationText(QString text);
 
-	int updateSelectedDive() const;
-	void setUpdateSelectedDive(int idx);
-
 	int selectedDiveTimestamp() const;
 	void setSelectedDiveTimestamp(int when);
 
@@ -220,7 +216,7 @@ public slots:
 	QString getVersion() const;
 	void deleteGpsFix(quint64 when);
 	void revertToNoCloudIfNeeded();
-	void consumeFinishedLoad(timestamp_t currentDiveTimestamp);
+	void consumeFinishedLoad();
 	void refreshDiveList();
 	void screenChanged(QScreen *screen);
 	qreal lastDevicePixelRatio();
@@ -247,7 +243,6 @@ private:
 	bool m_loadFromCloud;
 	static QMLManager *m_instance;
 	QString m_notificationText;
-	int m_updateSelectedDive;
 	int m_selectedDiveTimestamp;
 	qreal m_lastDevicePixelRatio;
 	QElapsedTimer timer;
@@ -287,7 +282,6 @@ signals:
 	void loadFromCloudChanged();
 	void startPageTextChanged();
 	void notificationTextChanged();
-	void updateSelectedDiveChanged();
 	void selectedDiveTimestampChanged();
 	void sendScreenChanged(QScreen *screen);
 	void progressMessageChanged();