diff options
Diffstat (limited to 'mobile-widgets/qmlmanager.cpp')
| -rw-r--r-- | mobile-widgets/qmlmanager.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index fa8a782c6..bf9459b0f 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -301,6 +301,7 @@ void QMLManager::retrieveUserid() { if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute) != 302) { 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); return; } @@ -323,6 +324,9 @@ void QMLManager::retrieveUserid() s.setValue("subsurface_webservice_uid", prefs.userid); s.sync(); } + setCredentialStatus(VALID); + setStartPageText("Cloud credentials valid, loading dives..."); + git_storage_update_progress(0, "load dives with valid credentials"); loadDivesWithValidCredentials(); } @@ -339,16 +343,6 @@ void QMLManager::loadDiveProgress(int percent) 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; if (getCloudURL(url)) { QString errorString(get_error_string()); @@ -368,6 +362,8 @@ void QMLManager::loadDivesWithValidCredentials() clear_dive_file_data(); DiveListModel::instance()->clear(); + appendTextToLog("Cloud sync brought newer data, reloading the dive list"); + int error = parse_file(fileNamePrt.data()); setAccessingCloud(-1); if (!error) { |