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

QML UI: simplify code for loading data from the cloud

Browse source 
We had a redundant check of the server reply hidden in there, and the
logic which values were set where didn't really make much sense. This
seems clearer to me.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-04-05 21:27:05 -07:00
parent a1332ce361
commit c3ab4dfc3e
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
mobile-widgets/qmlmanager.cpp
View file

@ -301,6 +301,7 @@ void QMLManager::retrieveUserid()
{ {
if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute) != 302) { if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute) != 302) {
appendTextToLog(QStringLiteral("Cloud storage connection not working correctly: %1").arg(QString(reply->readAll()))); appendTextToLog(QStringLiteral("Cloud storage connection not working correctly: %1").arg(QString(reply->readAll())));
setStartPageText(RED_FONT + tr("Cannot connect to cloud storage") + END_FONT);
setAccessingCloud(-1); setAccessingCloud(-1);
return; return;
} }
@ -323,6 +324,9 @@ void QMLManager::retrieveUserid()
s.setValue("subsurface_webservice_uid", prefs.userid); s.setValue("subsurface_webservice_uid", prefs.userid);
s.sync(); s.sync();
} }
setCredentialStatus(VALID);
setStartPageText("Cloud credentials valid, loading dives...");
git_storage_update_progress(0, "load dives with valid credentials");
loadDivesWithValidCredentials(); loadDivesWithValidCredentials();
} }
@ -339,16 +343,6 @@ void QMLManager::loadDiveProgress(int percent)
void QMLManager::loadDivesWithValidCredentials() void QMLManager::loadDivesWithValidCredentials()
{ {
if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute) != 302) {
appendTextToLog(QStringLiteral("Cloud storage connection not working correctly: ") + reply->readAll());
setStartPageText(RED_FONT + tr("Cannot connect to cloud storage") + END_FONT);
setAccessingCloud(-1);
return;
}
setCredentialStatus(VALID);
appendTextToLog("Cloud credentials valid, loading dives...");
setStartPageText("Cloud credentials valid, loading dives...");
git_storage_update_progress(0, "load dives with valid credentials");
QString url; QString url;
if (getCloudURL(url)) { if (getCloudURL(url)) {
QString errorString(get_error_string()); QString errorString(get_error_string());
@ -368,6 +362,8 @@ void QMLManager::loadDivesWithValidCredentials()
clear_dive_file_data(); clear_dive_file_data();
DiveListModel::instance()->clear(); DiveListModel::instance()->clear();
appendTextToLog("Cloud sync brought newer data, reloading the dive list");
int error = parse_file(fileNamePrt.data()); int error = parse_file(fileNamePrt.data());
setAccessingCloud(-1); setAccessingCloud(-1);
if (!error) { if (!error) {