X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=homescreen%2Fsrc%2Fhomescreenhandler.cpp;h=6d7941e6903661673994b9fa58998a2528637e8f;hb=refs%2Fheads%2Fsandbox%2Fmvlad%2Fflatpak-integration;hp=e31f12279c705d894d06ce02a498541b950dc230;hpb=a37400d73417dc02511813833b8f4d9b91e40a11;p=apps%2Fhomescreen.git

diff --git a/homescreen/src/homescreenhandler.cpp b/homescreen/src/homescreenhandler.cpp
index e31f122..6d7941e 100644
--- a/homescreen/src/homescreenhandler.cpp
+++ b/homescreen/src/homescreenhandler.cpp
@@ -18,71 +18,24 @@
 #include <QFileInfo>
 #include "homescreenhandler.h"
 #include <functional>
-#include "hmi-debug.h"
 
 #include <qpa/qplatformnativeinterface.h>
 
 void* HomescreenHandler::myThis = 0;
 
 HomescreenHandler::HomescreenHandler(Shell *_aglShell, ApplicationLauncher *launcher, QObject *parent) :
-    QObject(parent),
-    aglShell(_aglShell)
+	QObject(parent),
+	aglShell(_aglShell)
 {
-    mp_launcher = launcher;
+	mp_launcher = launcher;
 }
 
 HomescreenHandler::~HomescreenHandler()
 {
-    if (mp_hs != NULL) {
-        delete mp_hs;
-    }
 }
 
-void HomescreenHandler::init(int port, const char *token)
+void HomescreenHandler::init()
 {
-    mp_hs = new LibHomeScreen();
-    mp_hs->init(port, token);
-
-    myThis = this;
-
-
-    mp_hs->registerCallback(nullptr, HomescreenHandler::onRep_static);
-
-    mp_hs->set_event_handler(LibHomeScreen::Event_OnScreenMessage, [this](json_object *object){
-        const char *display_message = json_object_get_string(
-            json_object_object_get(object, "display_message"));
-        HMI_DEBUG("HomeScreen","set_event_handler Event_OnScreenMessage display_message = %s", display_message);
-    });
-
-    // should be handled in the top panel
-    mp_hs->set_event_handler(LibHomeScreen::Event_ShowNotification,[this](json_object *object){
-       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()) {
-           icon_path = QString(QLatin1String(icon));
-       } else {
-           icon_path = "./images/Utility_Logo_Grey-01.svg";
-       }
-
-       emit showNotification(QString(QLatin1String(app_id)), icon_path, QString(QLatin1String(text)));
-    });
-
-    // should be handled in the bottom panel
-    mp_hs->set_event_handler(LibHomeScreen::Event_ShowInformation,[this](json_object *object){
-       json_object *p_obj = json_object_object_get(object, "parameter");
-       const char *info = json_object_get_string(
-                   json_object_object_get(p_obj, "info"));
-
-       emit showInformation(QString(QLatin1String(info)));
-    });
 }
 
 static struct wl_output *
@@ -94,19 +47,11 @@ getWlOutput(QPlatformNativeInterface *native, QScreen *screen)
 
 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;
-
 	struct agl_shell *agl_shell = aglShell->shell.get();
 	QPlatformNativeInterface *native = qApp->platformNativeInterface();
 	struct wl_output *output = getWlOutput(native, qApp->screens().first());
 
-	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);
+	// start the application here, or do in the WM!
 
 	// this works (and it is redundant the first time), due to the default
 	// policy engine installed which actives the application, when starting
@@ -114,6 +59,7 @@ void HomescreenHandler::tapShortcut(QString application_id)
 	// require calling 'agl_shell_activate_app'
 	agl_shell_activate_app(agl_shell, application_id.toStdString().c_str(), output);
 
+	// keep this for having animations working
 	if (mp_launcher) {
 		mp_launcher->setCurrent(application_id);
 	}
@@ -121,30 +67,22 @@ void HomescreenHandler::tapShortcut(QString application_id)
 
 void HomescreenHandler::onRep_static(struct json_object* reply_contents)
 {
-    static_cast<HomescreenHandler*>(HomescreenHandler::myThis)->onRep(reply_contents);
+	(void) reply_contents;
 }
 
 void HomescreenHandler::onEv_static(const string& event, struct json_object* event_contents)
 {
-    static_cast<HomescreenHandler*>(HomescreenHandler::myThis)->onEv(event, event_contents);
+	(void) event;
+	(void) event_contents;
 }
 
 void HomescreenHandler::onRep(struct json_object* reply_contents)
 {
-    const char* str = json_object_to_json_string(reply_contents);
-    HMI_DEBUG("HomeScreen","HomeScreen onReply %s", str);
+	(void) reply_contents;
 }
 
 void HomescreenHandler::onEv(const string& event, struct json_object* event_contents)
 {
-    const char* str = json_object_to_json_string(event_contents);
-    HMI_DEBUG("HomeScreen","HomeScreen onEv %s, contents: %s", event.c_str(), str);
-
-    if (event.compare("homescreen/on_screen_message") == 0) {
-        struct json_object *json_data = json_object_object_get(event_contents, "data");
-        struct json_object *json_display_message = json_object_object_get(json_data, "display_message");
-        const char* display_message = json_object_get_string(json_display_message);
-
-        HMI_DEBUG("HomeScreen","display_message = %s", display_message);
-    }
+	(void) event;
+	(void) event_contents;
 }