From 67bdefe627d55bcdc5d98cc6f4a93eeb642d7d79 Mon Sep 17 00:00:00 2001
From: Joern <joern.rm@gmail.com>
Date: Sun, 2 Oct 2016 19:30:57 +0200
Subject: [PATCH] Fix Dump in Dropbox sync without network access ... ...
 improve error messages for upload/sync in case of no network access ... fix
 "authorized" icon position for Dropbox in Options

---
 src/Cloud/Dropbox.cpp          | 25 ++++++++++++++++++++-----
 src/Cloud/WithingsDownload.cpp |  5 +++++
 src/Gui/Pages.cpp              |  2 +-
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/Cloud/Dropbox.cpp b/src/Cloud/Dropbox.cpp
index ad2d4d40f..d3d9d04e1 100644
--- a/src/Cloud/Dropbox.cpp
+++ b/src/Cloud/Dropbox.cpp
@@ -55,6 +55,10 @@ Dropbox::open(QStringList &errors)
     connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));
     loop.exec();
 
+    if (reply->error() != QNetworkReply::NoError) {
+       errors << tr("Network Problem reading Dropbox data");
+       return false;
+    }
     // did we get a good response ?
     QByteArray r = reply->readAll();
     QJsonParseError parseError;
@@ -71,11 +75,13 @@ Dropbox::open(QStringList &errors)
         root_->isDir = document.object()["is_dir"].toBool();
         root_->size = document.object()["bytes"].toInt();
 
-    }
+        // happy with what we got ?
+        if (root_->name != "/") errors << tr("invalid root path.");
+        if (root_->isDir != true) errors << tr("root is not a directory.");
 
-    // happy with what we got ?
-    if (root_->name != "/") errors << tr("invalid root path.");
-    if (root_->isDir != true) errors << tr("root is not a directory.");
+    } else {
+        errors << tr("problem parsing Dropbox data");
+    }
 
     // ok so far ?
     if (errors.count()) return false;
@@ -249,7 +255,16 @@ Dropbox::writeFile(QByteArray &data, QString remotename)
 void
 Dropbox::writeFileCompleted()
 {
-    notifyWriteComplete(replyName(static_cast<QNetworkReply*>(QObject::sender())), tr("Completed."));
+    QNetworkReply *reply = static_cast<QNetworkReply*>(QObject::sender());
+    if (reply->error() == QNetworkReply::NoError) {
+        notifyWriteComplete(
+            replyName(static_cast<QNetworkReply*>(QObject::sender())),
+            tr("Completed."));
+    } else {
+        notifyWriteComplete(
+            replyName(static_cast<QNetworkReply*>(QObject::sender())),
+            tr("Network Error - Upload failed."));
+    }
 }
 
 void
diff --git a/src/Cloud/WithingsDownload.cpp b/src/Cloud/WithingsDownload.cpp
index 7a0bb86b8..819839d78 100644
--- a/src/Cloud/WithingsDownload.cpp
+++ b/src/Cloud/WithingsDownload.cpp
@@ -54,6 +54,11 @@ WithingsDownload::download()
 void
 WithingsDownload::downloadFinished(QNetworkReply *reply)
 {
+
+    if (reply->error() != QNetworkReply::NoError) {
+       QMessageBox::warning(context->mainWindow, tr("Network Problem"), tr("No Withings Data downloaded"));
+       return;
+    }
     QString text = reply->readAll();
     QStringList errors;
 
diff --git a/src/Gui/Pages.cpp b/src/Gui/Pages.cpp
index 19c98fcc0..a89a8ef39 100644
--- a/src/Gui/Pages.cpp
+++ b/src/Gui/Pages.cpp
@@ -461,7 +461,7 @@ CredentialsPage::CredentialsPage(QWidget *parent, Context *context) : QScrollAre
     grid->addWidget(dropauthLabel, ++row, 0);
     grid->addWidget(dropboxAuthorise, row, 1, Qt::AlignLeft | Qt::AlignVCenter);
     if (appsettings->cvalue(context->athlete->cyclist, GC_DROPBOX_TOKEN, "")!="")
-        grid->addWidget(dropboxAuthorised, row, 2, Qt::AlignLeft | Qt::AlignVCenter);
+        grid->addWidget(dropboxAuthorised, row, 1, Qt::AlignLeft | Qt::AlignVCenter);
     else
         dropboxAuthorised->hide(); // if no token no show