fix handshake bug

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

diff --git a/src/homescreen.cpp b/src/homescreen.cpp
index 3e4ff8f..d63d5aa 100644 (file)
--- a/src/homescreen.cpp
+++ b/src/homescreen.cpp
@@ -17,6 +17,7 @@
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
+#include <unistd.h>
 #include <memory>
 #include <algorithm>
 #include <unordered_map>
@@ -25,7 +26,8 @@
 #include "hs-clientmanager.h"
 #include "hs-appinfo.h"
 #include "hs-config.h"
-#include <unistd.h>
+#include "hs-apprecover.h"
+
 
 
 const char _error[] = "error";
@@ -37,7 +39,7 @@ const char _keyId[] = "id";
 
 struct hs_handshake {
     hs_handshake(int times, int sleep) : m_times(times), m_sleep(sleep) {}
-    void start(afb_api_t api) const;
+    int start(afb_api_t api) const;
 
     enum HandshakeStatus {
         Handshake_Idle = 0,
@@ -56,8 +58,24 @@ private:
 
 int hs_handshake::hs_sts = hs_handshake::Handshake_Idle;
 
+/**
+ * handshake callback function
+ *
+ * #### Parameters
+ * - obj : reply json object
+ * - error : api_call error
+ * - info : api_call information
+ *
+ * #### Return
+ * None
+ *
+ */
 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;
     }
@@ -66,14 +84,41 @@ void handshake_subscribe_callback(struct json_object *obj, const char *error, co
     }
 }
 
+/**
+ * handshake event function
+ *
+ * #### Parameters
+ * - api : the api
+ * - event : received event name
+ * - object : received json object
+ *
+ * #### Return
+ * 0 : event can transfer to others
+ * 1 : event not transfer to others
+ */
 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;
 }
 
-void hs_handshake::start(afb_api_t api) const
+/**
+ * start handshake function
+ *
+ * #### Parameters
+ * - api : the api
+ *
+ * #### Return
+ * None
+ * 0 : handshake success
+ * -1 : handshake fail
+ * 
+ */
+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;
     do {
@@ -81,26 +126,29 @@ void hs_handshake::start(afb_api_t api) const
         if(hs_handshake::hs_sts == hs_handshake::Handshake_Idle
         || hs_handshake::hs_sts == hs_handshake::Handshake_Subscribe_Fail) {
             hs_handshake::hs_sts = Handshake_Subscribing;
-            HS_WmProxy *wm_proxy = new HS_WmProxy();
-            wm_proxy->subscribe(api, HS_WmProxy::Event_Handshake, handshake_subscribe_callback);
+            HS_WmProxy wm_proxy;
+            wm_proxy.subscribe(api, HS_WmProxy::Event_Handshake, handshake_subscribe_callback);
         }
 
         // wait handshake event
         if(hs_handshake::hs_sts == hs_handshake::Handshake_Over) {
+            ret = 0;
             break;
         }
 
         ++count;
         usleep(m_sleep*1000);
     } while(count < m_times);
-    AFB_WARNING("wait count is %d.", count);
+
+    return ret;
 }
 
 struct hs_instance {
     HS_ClientManager *client_manager;   // the connection session manager
     HS_AppInfo *app_info;               // application info
+    HS_AppRecover *app_recover;
 
-    hs_instance() : client_manager(HS_ClientManager::instance()), app_info(HS_AppInfo::instance()) {}
+    hs_instance() : client_manager(HS_ClientManager::instance()), app_info(HS_AppInfo::instance()), app_recover(HS_AppRecover::instance()) {}
     int init(afb_api_t api);
     void setEventHook(const char *event, const event_hook_func f);
     void onEvent(afb_api_t api, const char *event, struct json_object *object);
@@ -108,6 +156,8 @@ private:
     std::unordered_map<std::string, std::list<event_hook_func>> event_hook_list;
 };
 
+static struct hs_instance *g_hs_instance;
+
 /**
  * init function
  *
@@ -139,12 +189,19 @@ int hs_instance::init(afb_api_t api)
         return -1;
     }
 
-    // const struct handshake_info *h = hs_config.getHandshakeInfo();
-    // struct hs_handshake handshake(h->times, h->sleep);
-    // handshake.start(api);
-
-    // recover application
+    const struct handshake_info *h = hs_config.getHandshakeInfo();
+    struct hs_handshake handshake(h->times, h->sleep);
+    if(handshake.start(api) < 0) {
+        AFB_ERROR("handshake with windowmanager failed.");
+        return -1;
+    }
 
+    if(app_recover == nullptr) {
+        AFB_ERROR("app_recover is nullptr.");
+        return -1;
+    }
+    app_recover->init(api);
+    app_recover->startRecovery(api, hs_config.getRecoverMap());
 
     return 0;
 }
@@ -201,8 +258,6 @@ void hs_instance::onEvent(afb_api_t api, const char *event, struct json_object *
     }
 }
 
-static struct hs_instance *g_hs_instance;
-
 /**
  * set event hook
  *
@@ -256,9 +311,10 @@ 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, id);
+            afm_proxy.start(request->api, id);
             ret = 0;
         }
     }
@@ -413,9 +469,10 @@ 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, id);
+            afm_proxy.start(request->api, id);
             ret = 0;
         }
     }
@@ -631,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;
     }