From 141ff70a60af68e204fb92e50472e660ba79b846 Mon Sep 17 00:00:00 2001 From: Niraj Venkat Date: Fri, 5 Jun 2015 15:36:42 -0700 Subject: [PATCH] Some changes to constants --- libraries/networking/src/AddressManager.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp index e813b214f1..a86ce78655 100644 --- a/libraries/networking/src/AddressManager.cpp +++ b/libraries/networking/src/AddressManager.cpp @@ -165,13 +165,16 @@ void AddressManager::handleLookupString(const QString& lookupString) { } } +const QString DATA_OBJECT_DOMAIN_KEY = "domain"; + + void AddressManager::handleAPIResponse(QNetworkReply& requestReply) { QJsonObject responseObject = QJsonDocument::fromJson(requestReply.readAll()).object(); QJsonObject dataObject = responseObject["data"].toObject(); - if (!dataObject.isEmpty()){ + if (!dataObject.isEmpty()) { goToAddressFromObject(dataObject.toVariantMap(), requestReply); - } else { + } else if (responseObject.contains(DATA_OBJECT_DOMAIN_KEY)) { goToAddressFromObject(responseObject.toVariantMap(), requestReply); } @@ -183,7 +186,6 @@ const char OVERRIDE_PATH_KEY[] = "override_path"; void AddressManager::goToAddressFromObject(const QVariantMap& dataObject, const QNetworkReply& reply) { const QString DATA_OBJECT_PLACE_KEY = "place"; - const QString DATA_OBJECT_DOMAIN_KEY = "domain"; const QString DATA_OBJECT_USER_LOCATION_KEY = "location"; QVariantMap locationMap;