Network errors: Use exception name, if message is empty #2718

diff --git a/src/libsync/abstractnetworkjob.cpp b/src/libsync/abstractnetworkjob.cpp
index ed675cdc9a21c484fe73e2463b2285eb7921f25b..599e5be9a9ee8cbd0a95501485c2a2bde338ae25 100644 (file)
--- a/src/libsync/abstractnetworkjob.cpp
+++ b/src/libsync/abstractnetworkjob.cpp
@@ -263,13 +263,21 @@ QString extractErrorMessage(const QByteArray& errorResponse)
         return QString::null;
     }
 
+    QString exception;
     while (!reader.atEnd() && reader.error() == QXmlStreamReader::NoError) {
         reader.readNextStartElement();
         if (reader.name() == QLatin1String("message")) {
-            return reader.readElementText();
+            QString message = reader.readElementText();
+            if (!message.isEmpty()) {
+                return message;
+            }
+        } else if (reader.name() == QLatin1String("exception")) {
+            exception = reader.readElementText();
         }
+
     }
-    return QString::null;
+    // Fallback, if message could not be found
+    return exception;
 }
 
 QString errorMessage(const QString& baseError, const QByteArray& body)