QML UI: don't fetch the remote twice when loading

We first check the sha to see if we want to load at all. But at that
point we already have the repository and the branch and we have synced
with the remote. So when we decide that we need to reload from storage,
we don't need to repeat those steps, instead we can go directly to the
git load.

For that to work we need to pass the repository pointer and the branch
name back to the caller so that we can directly call git_load_dives().

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 12 insertions, 4 deletions

diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp
index 9b9c15ef2..1f6b1342d 100644
--- a/mobile-widgets/qmlmanager.cpp
+++ b/mobile-widgets/qmlmanager.cpp
@@ -352,7 +352,10 @@ void QMLManager::loadDivesWithValidCredentials()
 		return;
 	}
 	QByteArray fileNamePrt = QFile::encodeName(url);
-	if (check_git_sha(fileNamePrt.data()) == 0) {
+	git_repository *git;
+	const char *branch;
+	int error;
+	if (check_git_sha(fileNamePrt.data(), &git, &branch) == 0) {
 		qDebug() << "local cache was current, no need to modify dive list";
 		appendTextToLog("Cloud sync shows local cache was current");
 		setLoadFromCloud(true);
@@ -360,8 +363,14 @@ void QMLManager::loadDivesWithValidCredentials()
 		return;
 	}
 	appendTextToLog("Cloud sync brought newer data, reloading the dive list");
-
-	int error = parse_file(fileNamePrt.data());
+	clear_dive_file_data();
+	if (git != dummy_git_repository) {
+		appendTextToLog(QString("have repository and branch %1").arg(branch));
+		error = git_load_dives(git, branch);
+	} else {
+		appendTextToLog(QString("didn't receive valid git repo, try again"));
+		error = parse_file(fileNamePrt.data());
+	}
 	setAccessingCloud(-1);
 	if (!error) {
 		report_error("filename is now %s", fileNamePrt.data());
@@ -379,7 +388,6 @@ void QMLManager::loadDivesWithValidCredentials()
 	if (informational_prefs.unit_system == IMPERIAL)
 		informational_prefs.units = IMPERIAL_units;
 	prefs.units = informational_prefs.units;
-	clear_dive_file_data();
 	DiveListModel::instance()->clear();
 	process_dives(false, false);
 	DiveListModel::instance()->addAllDives();