Modified to send the device name to d2d-conv-syspopup.

Signed-off-by: segwon <segwon.han@samsung.com>
Change-Id: I93a8a2d540d9706f08d721b22d12b4d7cf3a04b7

diff --git a/daemon/access_control/ACLManager.cpp b/daemon/access_control/ACLManager.cpp
index 326e2e9..279dfb8 100644 (file)
--- a/daemon/access_control/ACLManager.cpp
+++ b/daemon/access_control/ACLManager.cpp
@@ -138,34 +138,40 @@ void conv::acl_manager::LaunchPasskeyShowPopup(const char *deviceName)
        bundle_free(b);
 }
 
-static void LaunchToast(char *type)
+static void LaunchToast(char *type, char *data)
 {
        app_control_h app_control;
        app_control_create(&app_control);
        app_control_set_app_id(app_control, "org.tizen.d2d-conv-syspopup");
        app_control_add_extra_data(app_control, "MESSAGE", type);
+
+       char *device_name = (char *)data;
+       if (device_name != NULL) {
+               app_control_add_extra_data(app_control, "DEVICE_NAME", device_name);
+       }
+
        app_control_send_launch_request(app_control, LaunchPasskeyInputPopupCallback, info);
        app_control_destroy(app_control);
 }
 
 void conv::acl_manager::LaunchPopupCancelToast()
 {
-       LaunchToast((char*)"CANCEL");
+       LaunchToast((char*)"CANCEL", NULL);
 }
 
 void conv::acl_manager::LaunchPasskeyWrongToast()
 {
-       LaunchToast((char*)"WRONG_PASSKEY");
+       LaunchToast((char*)"WRONG_PASSKEY", NULL);
 }
 
-void conv::acl_manager::LaunchAccessAllowedToast()
+void conv::acl_manager::LaunchAccessAllowedToast(char *device_name)
 {
-       LaunchToast((char*)"ACCESS_ALLOWED");
+       LaunchToast((char*)"ACCESS_ALLOWED", device_name);
 }
 
 void conv::acl_manager::LaunchAccessRejectedToast()
 {
-       LaunchToast((char*)"REJECTED");
+       LaunchToast((char*)"REJECTED", NULL);
 }
 
 static char convert_mac(char c)

diff --git a/daemon/access_control/ACLManager.h b/daemon/access_control/ACLManager.h
index 2ed0c6a..5f49a14 100644 (file)
--- a/daemon/access_control/ACLManager.h
+++ b/daemon/access_control/ACLManager.h
@@ -58,7 +58,7 @@ namespace conv {
 
     void LaunchPopupCancelToast();
     void LaunchPasskeyWrongToast();
-    void LaunchAccessAllowedToast();
+    void LaunchAccessAllowedToast(char *device_name);
     void LaunchAccessRejectedToast();
 
     ACLResult PasskeyChecker(char *input_passkey);

diff --git a/daemon/service_provider/RemoteAppControlServiceProvider.cpp b/daemon/service_provider/RemoteAppControlServiceProvider.cpp
index 10c1f8e..320f4a2 100755 (executable)
--- a/daemon/service_provider/RemoteAppControlServiceProvider.cpp
+++ b/daemon/service_provider/RemoteAppControlServiceProvider.cpp
@@ -295,7 +295,7 @@ static int __access_control(iotcon_request_h request, iotcon_attributes_h attrib
                if (ret == ACLResult_OK) {
                        policy = CONV_ACCESS_CONTROL_PASSKEY_RIGHT;
                        conv::acl_manager::SetDeviceInfoAndACL(macAddress, deviceType, deviceName, ip.c_str(), ACMANAGER_POLICY_P);
-                       conv::acl_manager::LaunchAccessAllowedToast();
+                       conv::acl_manager::LaunchAccessAllowedToast(deviceName);
                } else if (ret == ACLResult_Error) {
                        policy = CONV_ACCESS_CONTROL_PASSKEY_WRONG;
                } else if (ret == ACLResult_Close) {
@@ -627,7 +627,7 @@ static void __on_access_response(iotcon_remote_resource_h resource, iotcon_error
        } else if (!strcmp(CONV_ACCESS_CONTROL_PASSKEY_RIGHT, accessControlResult)) {
 #if defined(_D2D_INTERNAL_ACL_)
                _D("__on_access_response PASSKEY RIGHT");
-               conv::acl_manager::LaunchAccessAllowedToast();
+               conv::acl_manager::LaunchAccessAllowedToast((char*)svcInfo->deviceName.c_str());
                conv::Json result;
                svcInfo->accessControlState = ACCESS_CONTROL_STATE_PERMITTED;
                sendResponse(result, CONV_JSON_ON_START, CONV_ERROR_NONE, svcInfo->registeredRequest);