Revert "Use appid between homescreen-service and apps"

This reverts commit b5702d25b7b5386fabd6a81a748ea2d6fe647fcd.

Bug-AGL: SPEC-1685

Change-Id: If5b526a5a5406ff0c3e59cc4a578b977386bda14
Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>

diff --git a/doc/ApplicationGuide.md b/doc/ApplicationGuide.md
index dd3f1f0..5bbf234 100644 (file)
--- a/doc/ApplicationGuide.md
+++ b/doc/ApplicationGuide.md
@@ -134,7 +134,7 @@ The port and token is provided by Application Framework
 Execute the "tapShortcut()" function.
 
 ```
 Execute the "tapShortcut()" function.
 
 ```

-libhs->tapShortcut("application_id");
+libhs->tapShortcut("application_name");

 ```
 
 Regarding the detail of tap_shortcut() API, please refer [this](#HomeScreen\ API) section.
 ```
 
 Regarding the detail of tap_shortcut() API, please refer [this](#HomeScreen\ API) section.


@@ -190,7 +190,7 @@ The communication protocols between libhomescreen and upper binder, upper binder
 
 - [LibHomeScreen ()](api-ref/html/de/dd0/class_lib_home_screen.html#a724bd949c4154fad041f96a15ef0f5dc)
 - [init (const int port, const std::string &token)](api-ref/html/de/dd0/class_lib_home_screen.html#a6a57b573cc767725762ba9beab032220)
 
 - [LibHomeScreen ()](api-ref/html/de/dd0/class_lib_home_screen.html#a724bd949c4154fad041f96a15ef0f5dc)
 - [init (const int port, const std::string &token)](api-ref/html/de/dd0/class_lib_home_screen.html#a6a57b573cc767725762ba9beab032220)

-- [tapShortcut(const char *application_id)](api-ref/html/de/dd0/class_lib_home_screen.html#afb571c9577087b47065eb23e7fdbc903)
+- [tapShortcut(const char *application_name)](api-ref/html/de/dd0/class_lib_home_screen.html#afb571c9577087b47065eb23e7fdbc903)

 - [onScreenMessage(const char *display_message)](api-ref/html/de/dd0/class_lib_home_screen.html#ac336482036a72b51a822725f1929523c)
 - [onScreenReply(const char *reply_message)](api-ref/html/de/dd0/class_lib_home_screen.html#a6c065f41f2c5d1f58d2763bfb4da9c37)
 - [registerCallback (void(*event_cb)(const std::string &event, struct json_object *event_contents), void(*reply_cb)(struct json_object *reply_contents), void(*hangup_cb)(void)=nullptr)](api-ref/html/de/dd0/class_lib_home_screen.html#a2789e8a5372202cc36f48e71dbb9b7cf)
 - [onScreenMessage(const char *display_message)](api-ref/html/de/dd0/class_lib_home_screen.html#ac336482036a72b51a822725f1929523c)
 - [onScreenReply(const char *reply_message)](api-ref/html/de/dd0/class_lib_home_screen.html#a6c065f41f2c5d1f58d2763bfb4da9c37)
 - [registerCallback (void(*event_cb)(const std::string &event, struct json_object *event_contents), void(*reply_cb)(struct json_object *reply_contents), void(*hangup_cb)(void)=nullptr)](api-ref/html/de/dd0/class_lib_home_screen.html#a2789e8a5372202cc36f48e71dbb9b7cf)


@@ -286,8 +286,8 @@ note over App
     LibHomeScreen::Event_TapShortcut
 end note
 
     LibHomeScreen::Event_TapShortcut
 end note
 

-HomeScreenGUI->HomeScreenBinder: tapShortcut(application_id)
-HomeScreenBinder->App: event_handler(application_id)
+HomeScreenGUI->HomeScreenBinder: tapShortcut(application_name)
+HomeScreenBinder->App: event_handler(application_name)

 @enduml
 ```
 
 @enduml
 ```
 

diff --git a/src/homescreen.c b/src/homescreen.c
index ee4b9b5..f1a8fcd 100644 (file)
--- a/src/homescreen.c
+++ b/src/homescreen.c
@@ -47,7 +47,7 @@ static struct afb_event ev_reserved;
 
 static const char _error[] = "error";
 
 
 static const char _error[] = "error";
 

-static const char _application_id[] = "application_id";
+static const char _application_name[] = "application_name";

 static const char _display_message[] = "display_message";
 static const char _reply_message[] = "reply_message";
 
 static const char _display_message[] = "display_message";
 static const char _reply_message[] = "reply_message";
 


@@ -69,7 +69,7 @@ static void pingSample(struct afb_req request)
   *
  * #### Parameters
  * Request key
   *
  * #### Parameters
  * Request key

- * - application_id   : application id
+ * - application_name   : application name

  *
  * #### Return
  * Nothing
  *
  * #### Return
  * Nothing


@@ -80,14 +80,14 @@ static void tap_shortcut (struct afb_req request)
     HMI_NOTICE("homescreen-service","called.");
 
     int ret = 0;
     HMI_NOTICE("homescreen-service","called.");
 
     int ret = 0;

-    const char* value = afb_req_value(request, _application_id);
+    const char* value = afb_req_value(request, _application_name);

     if (value) {
 
       HMI_NOTICE("homescreen-service","request params = %s.", value);
 
       struct json_object* push_obj = json_object_new_object();
       hs_add_object_to_json_object_str( push_obj, 2,
     if (value) {
 
       HMI_NOTICE("homescreen-service","request params = %s.", value);
 
       struct json_object* push_obj = json_object_new_object();
       hs_add_object_to_json_object_str( push_obj, 2,

-      _application_id, value);
+      _application_name, value);

       afb_event_push(ev_tap_shortcut, push_obj);
     } else {
       afb_req_fail_f(request, "failed", "called %s, Unknown palameter", __FUNCTION__);
       afb_event_push(ev_tap_shortcut, push_obj);
     } else {
       afb_req_fail_f(request, "failed", "called %s, Unknown palameter", __FUNCTION__);