add lastmode function

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

diff --git a/src/hs-config.cpp b/src/hs-config.cpp
index 17b086a..c0d6942 100644 (file)
--- a/src/hs-config.cpp
+++ b/src/hs-config.cpp
@@ -22,6 +22,10 @@ const std::array<std::string, 3> HS_Config::keys_recover_type = {   // based on
     "default-lastmode",
     "normal-apps"
 };
+const std::string HS_Config::lastmode_json = "lastmode.json";
+const std::string HS_Config::key_appid = "appid";
+const std::string HS_Config::key_visibility = "visibility";
+std::string HS_Config::root_dir = "";
 
 /**
  * read configuration file to memory
@@ -35,14 +39,14 @@ const std::array<std::string, 3> HS_Config::keys_recover_type = {   // based on
  */
 int HS_Config::readConfig(void)
 {
-    auto rootdir = std::string(getenv("AFM_APP_INSTALL_DIR"));
-    auto path = rootdir + "/etc/" + hs_conf_json;
+    root_dir = std::string(getenv("AFM_APP_INSTALL_DIR"));
+    auto path = root_dir + "/etc/" + hs_conf_json;
     if(readJsonFile(path.c_str(), &m_hs_conf) < 0) {
         AFB_ERROR("read %s failed.", hs_conf_json.c_str());
         return -1;
     }
 
-    path = rootdir + "/etc/" + lastmode_json;
+    path = root_dir + "/etc/" + lastmode_json;
     if(readJsonFile(path.c_str(), &m_lastmode) < 0) {
         AFB_ERROR("read %s failed.", lastmode_json.c_str());
         m_lastmode = nullptr;
@@ -109,7 +113,7 @@ int HS_Config::parseConfig(void)
 
 /**
  * get recover application information
- * appid, visibility, display area
+ * appid, visibility
  *
  * #### Parameters
  *  - obj : application information
@@ -134,12 +138,6 @@ std::vector<struct recover_app_info> HS_Config::getRecoverAppInfo(struct json_ob
             v_app_info.clear();
             return v_app_info;
         }
-        if(json_object_object_get_ex(info_obj, key_area.c_str(), &value_obj)) {
-            info.area = json_object_get_string(value_obj);
-        }
-        else {
-            info.area = "normal.full";
-        }
         if(json_object_object_get_ex(info_obj, key_visibility.c_str(), &value_obj)) {
             std::string visibility = json_object_get_string(value_obj);
             info.visibility = (visibility == "visible") ? true:false;