X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=homescreen%2Fsrc%2Fhomescreenhandler.cpp;h=4db60fb9069e26a77b730a49a1969cf840de8872;hb=f3de2f5cad06a772ee55f58694d559a7cb012c02;hp=3aaef26bc963c2d8c3d58145fddc397881b66a15;hpb=4667d93a852d66a57a2d7d26957c3aab6845756e;p=apps%2Fhomescreen.git

diff --git a/homescreen/src/homescreenhandler.cpp b/homescreen/src/homescreenhandler.cpp
index 3aaef26..4db60fb 100644
--- a/homescreen/src/homescreenhandler.cpp
+++ b/homescreen/src/homescreenhandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 TOYOTA MOTOR CORPORATION
+ * Copyright (c) 2017, 2018, 2019 TOYOTA MOTOR CORPORATION
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,14 +51,14 @@ void HomescreenHandler::init(int port, const char *token)
     });
 
     mp_hs->set_event_handler(LibHomeScreen::Event_ShowNotification,[this](json_object *object){
-       const char *application_id = json_object_get_string(
-                   json_object_object_get(object, "application_id"));
-
        json_object *p_obj = json_object_object_get(object, "parameter");
        const char *icon = json_object_get_string(
                    json_object_object_get(p_obj, "icon"));
        const char *text = json_object_get_string(
                    json_object_object_get(p_obj, "text"));
+       const char *app_id = json_object_get_string(
+                   json_object_object_get(p_obj, "caller"));
+       HMI_DEBUG("HomeScreen","Event_ShowNotification icon=%s, text=%s, caller=%s", icon, text, app_id);
        QFileInfo icon_file(icon);
        QString icon_path;
        if (icon_file.isFile() && icon_file.exists()) {
@@ -67,7 +67,7 @@ void HomescreenHandler::init(int port, const char *token)
            icon_path = "./images/Utility_Logo_Grey-01.svg";
        }
 
-       emit showNotification(QString(QLatin1String(application_id)), icon_path, QString(QLatin1String(text)));
+       emit showNotification(QString(QLatin1String(app_id)), icon_path, QString(QLatin1String(text)));
     });
 
     mp_hs->set_event_handler(LibHomeScreen::Event_ShowInformation,[this](json_object *object){
@@ -84,7 +84,7 @@ void HomescreenHandler::tapShortcut(QString application_id)
     HMI_DEBUG("HomeScreen","tapShortcut %s", application_id.toStdString().c_str());
     struct json_object* j_json = json_object_new_object();
     struct json_object* value;
-    value = json_object_new_string("normal");
+    value = json_object_new_string("normal.full");
     json_object_object_add(j_json, "area", value);
 
     mp_hs->showWindow(application_id.toStdString().c_str(), j_json);