fix handshake bug

[apps/agl-service-homescreen.git] / src / homescreen.cpp

diff --git a/src/homescreen.cpp b/src/homescreen.cpp
index 2a0ee77..d63d5aa 100644 (file)
--- a/src/homescreen.cpp
+++ b/src/homescreen.cpp
@@ -72,6 +72,10 @@ int hs_handshake::hs_sts = hs_handshake::Handshake_Idle;
  */
 void handshake_subscribe_callback(struct json_object *obj, const char *error, const char *info)
 {
+    AFB_NOTICE("subscribe handshake reply: obj=%s, error=%s, info=%s", json_object_to_json_string(obj), error, info);
+    if(hs_handshake::hs_sts == hs_handshake::Handshake_Over) {
+        return;
+    }
     if(error == nullptr) {
         hs_handshake::hs_sts =  hs_handshake::Handshake_WaitEvent;
     }
@@ -94,6 +98,7 @@ void handshake_subscribe_callback(struct json_object *obj, const char *error, co
  */
 int on_handshake_event(afb_api_t api, const char *event, struct json_object *object)
 {
+    AFB_NOTICE("received handshake event from windowmanager.");
     hs_handshake::hs_sts =  hs_handshake::Handshake_Over;
     return 1;
 }
@@ -112,6 +117,7 @@ int on_handshake_event(afb_api_t api, const char *event, struct json_object *obj
  */
 int hs_handshake::start(afb_api_t api) const
 {
+    AFB_NOTICE("start handshake with windowmanager.");
     int ret = -1;
     setEventHook(sub_event.c_str(), on_handshake_event);
     int count = 0;
@@ -305,6 +311,7 @@ static void tap_shortcut (afb_req_t request)
         AFB_INFO("request appid = %s.", value);
         ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__, value);
         if(ret == AFB_REQ_NOT_STARTED_APPLICATION) {
+            g_hs_instance->client_manager->setStartupAppid(std::string(value));
             std::string id = g_hs_instance->app_info->getAppProperty(value, _keyId);
             HS_AfmMainProxy afm_proxy;
             afm_proxy.start(request->api, id);
@@ -462,6 +469,7 @@ static void showWindow(afb_req_t request)
     if (value) {
         ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__, value);
         if(ret == AFB_REQ_NOT_STARTED_APPLICATION) {
+            g_hs_instance->client_manager->setStartupAppid(std::string(value));
             std::string id = g_hs_instance->app_info->getAppProperty(value, _keyId);
             HS_AfmMainProxy afm_proxy;
             afm_proxy.start(request->api, id);
@@ -680,6 +688,7 @@ static int init(afb_api_t api)
         AFB_WARNING( "g_hs_instance isn't null.");
         delete g_hs_instance->client_manager;
         delete g_hs_instance->app_info;
+        delete g_hs_instance->app_recover;
         delete g_hs_instance;
         g_hs_instance = nullptr;
     }