Add "here" prefix to all Here geoservices parameters

Task-number: QTBUG-42151
Change-Id: I3d71ee77327478dfdda23af709bee489f83bb9f6
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

1 files changed, 11 insertions, 6 deletions

diff --git a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
index 0192b6ce..f6d05c36 100644
--- a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
@@ -75,14 +75,19 @@ namespace
 
     void checkUsageTerms(const QVariantMap &parameters, QGeoServiceProvider::Error *error, QString *errorString)
     {
-        const QString appId = parameters.value(QStringLiteral("app_id")).toString();
-        const QString token = parameters.value(QStringLiteral("token")).toString();
+        QString appId, token;
 
-        if (!isValidParameter(appId) || !isValidParameter(token)) {
+        appId = parameters.value(QStringLiteral("here.app_id")).toString();
+        token = parameters.value(QStringLiteral("here.token")).toString();
 
-            *error = QGeoServiceProvider::MissingRequiredParameterError;
-            *errorString = QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, MISSED_CREDENTIALS);
-        }
+        if (isValidParameter(appId) && isValidParameter(token))
+            return;
+
+        if (parameters.contains(QStringLiteral("app_id")) || parameters.contains(QStringLiteral("token")))
+            qWarning() << QStringLiteral("Please prefix 'app_id' and 'token' with prefix 'here' (e.g.: 'here.app_id')");
+
+        *error = QGeoServiceProvider::MissingRequiredParameterError;
+        *errorString = QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, MISSED_CREDENTIALS);
     }
 
     template<class TInstance>