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)
void LaunchPopupCancelToast();
void LaunchPasskeyWrongToast();
- void LaunchAccessAllowedToast();
+ void LaunchAccessAllowedToast(char *device_name);
void LaunchAccessRejectedToast();
ACLResult PasskeyChecker(char *input_passkey);
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) {
} 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);