X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=popup-wifidirect%2Fsrc%2Fwfd-app-popup-view.c;h=6a007afdbf245e73c761820fe58637c0a58e4d9c;hb=ea0eb10918bf56338ccea1405cab0eaa5fac0782;hp=b658be9aa916f108fbf0c64448d2125a368a8109;hpb=35cc30241437eeacaae7ca61aeac70e16ef0c1ad;p=apps%2Fnative%2Fug-wifi-direct.git diff --git a/popup-wifidirect/src/wfd-app-popup-view.c b/popup-wifidirect/src/wfd-app-popup-view.c index b658be9..6a007af 100755 --- a/popup-wifidirect/src/wfd-app-popup-view.c +++ b/popup-wifidirect/src/wfd-app-popup-view.c @@ -1,13 +1,13 @@ /* * WiFi-Direct UG * -* Copyright 2012 Samsung Electronics Co., Ltd +* Copyright 2012 Samsung Electronics Co., Ltd -* Licensed under the Flora License, Version 1.1 (the "License"); +* Licensed under the Flora License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at -* http://floralicense.org/license +* http://www.tizenopensource.org/license * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -28,19 +28,74 @@ #include #include +#include +#include +#include +#if defined(X) +#include +#include +#include +#include +#endif #include +#include +#include +#include -#include "wifi-direct.h" #include "wfd-app.h" #include "wfd-app-strings.h" #include "wfd-app-util.h" +#include "wfd-app-popup-view.h" extern wfd_appdata_t *g_wfd_ad; extern wfd_popup_t *g_wfd_pop; extern unsigned char g_wfd_peer_mac[6]; extern unsigned char g_wfd_peer_name[32]; static Ecore_Timer *pb_timer = NULL; +static Ecore_Timer *keypad_popup_timer = NULL; +static int keypad_popup_timeout = 0; +void _replace_1PS_2PD(char *buf, int buf_len, char *format_str, char* SD_1, int PD_2); + +static void mouseup_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) +{ + Evas_Event_Mouse_Up *ev = event_info; + if (ev->button == 3) { + evas_object_del(obj); + } +} + +/*static void keydown_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) +{ + Evas_Event_Key_Down *ev = event_info; + if (!strcmp(ev->keyname, KEY_BACK)) { + evas_object_del(obj); + } +}*/ +static Eina_Bool __rotate(void *data, int type, void *event) +{ + __WFD_APP_FUNC_ENTER__; + wfd_appdata_t *ad = (wfd_appdata_t *)data; +#if defined(X) + Ecore_X_Event_Client_Message *ev = event; +#endif + int rots[4] = {0, 90, 180, 270}; + + if (ad == NULL || ad->win == NULL) { + WFD_APP_LOG(WFD_APP_LOG_ERROR, "Parameter NULL"); + return EINA_FALSE; + } + +#if defined(X) + if (ev->message_type == ECORE_X_ATOM_E_ILLUME_ROTATE_ROOT_ANGLE) { + WFD_APP_LOG(WFD_APP_LOG_LOW, "ev->message_type: [%d]\n", ev->message_type); + elm_win_wm_rotation_available_rotations_set(ad->win, rots, 1); + } +#endif + + __WFD_APP_FUNC_EXIT__; + return EINA_FALSE; +} /** * This function let the ug make a callback for click the button in popup @@ -51,151 +106,108 @@ static Ecore_Timer *pb_timer = NULL; */ static void __popup_resp_cb(void *data, Evas_Object * obj, void *event_info) { - __WDPOP_LOG_FUNC_ENTER__; + __WFD_APP_FUNC_ENTER__; wfd_appdata_t *ad = wfd_get_appdata(); + wfd_connection_info_s *connection = ad->connection; int result = -1; int resp = (int) data; char msg[WFD_POP_STR_MAX_LEN] = {0}; - WDPOP_LOGI( "popup resp : %d\n", resp); + WFD_APP_LOG(WFD_APP_LOG_HIGH, "popup resp : %d\n", resp); + + if (ad->rotate_event_handler) { + ecore_event_handler_del(ad->rotate_event_handler); + ad->rotate_event_handler = NULL; + } switch (resp) { case /* MT */ WFD_POP_RESP_APRV_CONNECT_PBC_YES: { - WDPOP_LOGI( + WFD_APP_LOG(WFD_APP_LOG_HIGH, "WFD_POP_RESP_APRV_CONNECT_PBC_YES\n"); wfd_destroy_popup(); - result = wifi_direct_accept_connection(ad->peer_mac); - WDPOP_LOGD( - "wifi_direct_accept_connection() result=[%d]\n", - result); - if (result == WIFI_DIRECT_ERROR_NONE) { - /* tickernoti popup */ - notification_status_message_post(_("IDS_WFD_POP_CONNECTING")); - } else { - WDPOP_LOGE( - "wifi_direct_accept_connection() FAILED!!\n"); + result = wifi_direct_accept_connection(connection->peer_addr); + if (result != WIFI_DIRECT_ERROR_NONE) { + WFD_APP_LOG(WFD_APP_LOG_ERROR, "Failed to accept connection(%d)", result); evas_object_hide(ad->win); /* tickernoti popup */ - snprintf(msg, WFD_POP_STR_MAX_LEN, IDS_WFD_POP_CONNECT_FAILED, ad->peer_name); + snprintf(msg, WFD_POP_STR_MAX_LEN, _("IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"), + connection->peer_name); notification_status_message_post(msg); } + WFD_APP_LOG(WFD_APP_LOG_LOW, "Succeeded to accept connection"); } break; - case WFD_POP_RESP_APRV_CONNECT_INVITATION_YES: - WDPOP_LOGI( - "WFD_POP_RESP_APRV_CONNECT_INVITATION_YES [" MACSTR "]\n", MAC2STR(ad->peer_mac)); - wfd_destroy_popup(); - - result = wifi_direct_connect(ad->peer_mac); - WDPOP_LOGD( - "wifi_direct_connect() result=[%d]\n", - result); - if (result == WIFI_DIRECT_ERROR_NONE) { - /* tickernoti popup */ - notification_status_message_post(_("IDS_WFD_POP_CONNECTING")); - } else { - WDPOP_LOGE( - "wifi_direct_connect() FAILED!!\n"); - evas_object_hide(ad->win); - - /* tickernoti popup */ - snprintf(msg, WFD_POP_STR_MAX_LEN, IDS_WFD_POP_CONNECT_FAILED, ad->peer_name); - notification_status_message_post(msg); - } - - break; - case /* MT */ WFD_POP_RESP_APRV_CONNECT_DISPLAY_OK: { - char *pin = NULL; - - WDPOP_LOGI( + WFD_APP_LOG(WFD_APP_LOG_HIGH, "WFD_POP_RESP_APRV_CONNECT_DISPLAY_OK\n"); wfd_destroy_popup(); - if (wifi_direct_generate_wps_pin() != WIFI_DIRECT_ERROR_NONE) { - WDPOP_LOGD( "wifi_direct_generate_wps_pin() is failed\n"); - return; - } - - if (wifi_direct_get_wps_pin(&pin) != WIFI_DIRECT_ERROR_NONE) { - WDPOP_LOGD( "wifi_direct_generate_wps_pin() is failed\n"); - return; - } - - strncpy(ad->pin_number, pin, 64); - ad->pin_number[63] = '\0'; - free(pin); - pin = NULL; - WDPOP_LOGD( "button ok: pin [%s]", ad->pin_number); - - result = wifi_direct_accept_connection(ad->peer_mac); + result = wifi_direct_accept_connection(connection->peer_addr); if (result == WIFI_DIRECT_ERROR_NONE) { wfd_prepare_popup(WFD_POP_PROG_CONNECT_WITH_PIN, NULL); } else { - WDPOP_LOGD( + WFD_APP_LOG(WFD_APP_LOG_LOW, "wifi_direct_accept_connection() failed. result=[%d]\n", result); /* tickernoti popup */ - snprintf(msg, WFD_POP_STR_MAX_LEN, IDS_WFD_POP_CONNECT_FAILED, ad->peer_name); - notification_status_message_post(msg); + notification_status_message_post(_("IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS")); } } break; case /* MO */ WFD_POP_RESP_PROG_CONNECT_KEYPAD_OK: { - WDPOP_LOGI( + int result = 0; + WFD_APP_LOG(WFD_APP_LOG_HIGH, "WFD_POP_RESP_PROG_CONNECT_KEYPAD_OK\n"); wfd_destroy_popup(); - int len = strlen(ad->pin_number); - WDPOP_LOGD( "button ok: pin [%s]", ad->pin_number); + int len = strlen(connection->wps_pin); + WFD_APP_LOGSECURE(WFD_APP_LOG_LOW, "PIN [%s]", connection->wps_pin); - if (len != 8) { - if (len > 8) - notification_status_message_post(_("IDS_CST_BODY_PASSWORD_TOO_LONG")); - else - notification_status_message_post(_("IDS_ST_BODY_PASSWORD_TOO_SHORT")); + if (len < 8 || len > 64) { + WFD_APP_LOG(WFD_APP_LOG_ERROR, "Error, Incorrect PIN!!\n"); + keypad_popup_timeout--; + /* tickernoti popup */ + notification_status_message_post(_("IDS_COM_BODY_PINS_DO_NOT_MATCH")); + + /* redraw the popup */ wfd_prepare_popup(WFD_POP_PROG_CONNECT_WITH_KEYPAD, (void *) NULL); - return; + break; } + keypad_popup_timeout = 0; - int result = 0; - WDPOP_LOGD( "pin=[%s]\n", ad->pin_number); - - result = wifi_direct_set_wps_pin(ad->pin_number); + result = wifi_direct_set_wps_pin(connection->wps_pin); if (result != WIFI_DIRECT_ERROR_NONE) { /* tickernoti popup */ - snprintf(msg, WFD_POP_STR_MAX_LEN, IDS_WFD_POP_CONNECT_FAILED, ad->peer_name); + snprintf(msg, WFD_POP_STR_MAX_LEN, _("IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"), + connection->peer_name); notification_status_message_post(msg); return; } - //result = wifi_direct_activate_pushbutton(); - result = wifi_direct_accept_connection(ad->peer_mac); - WDPOP_LOGD( - "wifi_direct_accept_connection(%s) result=[%d]\n", - ad->peer_mac, result); + result = wifi_direct_accept_connection(connection->peer_addr); if (result != WIFI_DIRECT_ERROR_NONE) { - WDPOP_LOGE( - "wifi_direct_accept_connection() FAILED!!\n"); + WFD_APP_LOG(WFD_APP_LOG_ERROR, "Failed to accept connection(%d)", result); evas_object_hide(ad->win); /* tickernoti popup */ - snprintf(msg, WFD_POP_STR_MAX_LEN, IDS_WFD_POP_CONNECT_FAILED, ad->peer_name); + snprintf(msg, WFD_POP_STR_MAX_LEN, _("IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"), + connection->peer_name); notification_status_message_post(msg); } + WFD_APP_LOG(WFD_APP_LOG_LOW, "Succeeded to connect with [%s]", connection->peer_addr); } break; case /* MT */ WFD_POP_RESP_APRV_CONNECT_KEYPAD_YES: { - WDPOP_LOGI( + WFD_APP_LOG(WFD_APP_LOG_HIGH, "WFD_POP_RESP_APRV_CONNECT_KEYPAD_YES\n"); wfd_destroy_popup(); if (pb_timer) { @@ -209,31 +221,36 @@ static void __popup_resp_cb(void *data, Evas_Object * obj, void *event_info) case /* MT */ WFD_POP_RESP_APRV_CONNECT_NO: { - WDPOP_LOGI( + WFD_APP_LOG(WFD_APP_LOG_HIGH, "WFD_POP_RESP_APRV_CONNECT_NO: destroy_popup...\n"); - wfd_destroy_popup(); + if (connection->peer_addr[0] != '\0') { + result = wifi_direct_reject_connection(connection->peer_addr); + if (result != WIFI_DIRECT_ERROR_NONE) + WFD_APP_LOG(WFD_APP_LOG_ERROR, "Failed to reject connection(%d)", result); + } else { + WFD_APP_LOG(WFD_APP_LOG_ERROR, "Peer's address is Zero MAC"); + } + if (pb_timer) { ecore_timer_del(pb_timer); pb_timer = NULL; } - result = wifi_direct_disconnect(ad->peer_mac); - WDPOP_LOGD( - "wifi_direct_disconnect[%s] result=[%d]\n", - ad->peer_mac, result); + wfd_destroy_popup(); + keypad_popup_timeout = 0; } break; default: { - WDPOP_LOGE( "Unknown respone\n"); - evas_object_hide(ad->win); + WFD_APP_LOG(WFD_APP_LOG_ERROR, "Unknown respone\n"); + wfd_destroy_popup(); } break; } - __WDPOP_LOG_FUNC_EXIT__; + __WFD_APP_FUNC_EXIT__; } /** @@ -243,14 +260,19 @@ static void __popup_resp_cb(void *data, Evas_Object * obj, void *event_info) */ void wfd_destroy_popup() { - __WDPOP_LOG_FUNC_ENTER__; + __WFD_APP_FUNC_ENTER__; wfd_appdata_t *ad = wfd_get_appdata(); if (ad == NULL) { - WDPOP_LOGE( "ad is NULL\n"); + WFD_APP_LOG(WFD_APP_LOG_ERROR, "ad is NULL\n"); return; } + if (keypad_popup_timer) { + ecore_timer_del(keypad_popup_timer); + keypad_popup_timer = NULL; + } + if (ad->popup) { evas_object_del(ad->popup); ad->popup = NULL; @@ -261,12 +283,125 @@ void wfd_destroy_popup() ad->popup_timeout_handle = 0; } - evas_object_hide(ad->win); + if (ad->win) { + evas_object_hide(ad->win); + } - __WDPOP_LOG_FUNC_EXIT__; + if (pb_timer) { + ecore_timer_del(pb_timer); + pb_timer = NULL; + } + __WFD_APP_FUNC_EXIT__; return; } +#if defined(X) +static int __get_window_property(Display *dpy, Window win, Atom atom, + Atom type, unsigned int *val, unsigned int len) +{ + __WFD_APP_FUNC_ENTER__; + unsigned char *prop_ret = NULL; + Atom type_ret = -1; + unsigned long bytes_after = 0; + unsigned long num_ret = -1; + int format_ret = -1; + unsigned int i = 0; + int num = 0; + + prop_ret = NULL; + if (XGetWindowProperty(dpy, win, atom, 0, 0x7fffffff, False, + type, &type_ret, &format_ret, &num_ret, + &bytes_after, &prop_ret) != Success) { + return -1; + } + + if (type_ret != type || format_ret != 32) { + num = -1; + } else if (num_ret == 0 || !prop_ret) { + num = 0; + } else { + if (num_ret < len) { + len = num_ret; + } + for (i = 0; i < len; i++) { + val[i] = ((unsigned long *)prop_ret)[i]; + } + num = len; + } + + if (prop_ret) { + XFree(prop_ret); + } + + __WFD_APP_FUNC_EXIT__; + return num; +} + +static int __x_rotation_get(Display *dpy, void* win) +{ + __WFD_APP_FUNC_ENTER__; + Window active_win = 0; + Window root_win = 0; + int rotation = -1; + int ret = -1; + + Atom atom_active_win; + Atom atom_win_rotate_angle; + root_win = XDefaultRootWindow(dpy); + + atom_active_win = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", False); + ret = __get_window_property(dpy, root_win, atom_active_win, + XA_WINDOW, (unsigned int *)&active_win, 1); + + if (ret != 1) { + return 0; + } + + atom_win_rotate_angle = + XInternAtom(dpy, "_E_ILLUME_ROTATE_WINDOW_ANGLE", False); + ret = __get_window_property(dpy, active_win , + atom_win_rotate_angle, XA_CARDINAL, + (unsigned int *)&rotation, 1); + + __WFD_APP_FUNC_EXIT__; + + if (ret == 1) { + return rotation; + } else { + return 0; + } +} +void __set_parent_rotate_angle(wfd_appdata_t *ad) +{ + __WFD_APP_FUNC_ENTER__; + + int rotate_angle = 0; + int rots1[1] = {0}; + int rots2[4] = {0, 90, 180, 270}; + + if (ad == NULL || ad->win == NULL) { + WFD_APP_LOG(WFD_APP_LOG_ERROR, "Parameter NULL"); + return; + } + + rotate_angle = __x_rotation_get(ecore_x_display_get(), NULL); + + WFD_APP_LOG(WFD_APP_LOG_LOW, "rotate_angle: [%d]\n", rotate_angle); + + if (rotate_angle < 0) { + rotate_angle = 0; + } + + if (rotate_angle == 0) { + elm_win_wm_rotation_available_rotations_set(ad->win, rots1, 1); + } else { + elm_win_wm_rotation_available_rotations_set(ad->win, rots2, 1); + } + + __WFD_APP_FUNC_EXIT__; + return; +} +#endif /** * This function let the app create a popup which includes no button * @return popup @@ -275,17 +410,29 @@ void wfd_destroy_popup() */ static Evas_Object *wfd_draw_pop_type_a(Evas_Object * win, wfd_popup_t * pop) { - __WDPOP_LOG_FUNC_ENTER__; + __WFD_APP_FUNC_ENTER__; + + wfd_appdata_t *ad = wfd_get_appdata(); Evas_Object *popup; popup = elm_popup_add(win); + elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 1.0); + eext_object_event_callback_add(popup, EA_CALLBACK_BACK, __popup_resp_cb, NULL); + evas_object_event_callback_add(popup, EVAS_CALLBACK_MOUSE_UP, mouseup_cb, ad); +// evas_object_event_callback_add(popup, EVAS_CALLBACK_KEY_DOWN, keydown_cb, ad); evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_object_text_set(popup, pop->text); + elm_object_domain_translatable_text_set(popup, PACKAGE, pop->text); elm_popup_timeout_set(popup, pop->timeout); +#if defined(X) + __set_parent_rotate_angle(ad); +#endif evas_object_show(popup); evas_object_show(win); +#if defined(X) + ad->rotate_event_handler = ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE, __rotate, ad); +#endif - __WDPOP_LOG_FUNC_EXIT__; + __WFD_APP_FUNC_EXIT__; return popup; } @@ -297,24 +444,35 @@ static Evas_Object *wfd_draw_pop_type_a(Evas_Object * win, wfd_popup_t * pop) */ static Evas_Object *wfd_draw_pop_type_b(Evas_Object * win, wfd_popup_t * pop) { - __WDPOP_LOG_FUNC_ENTER__; + __WFD_APP_FUNC_ENTER__; Evas_Object *popup = NULL; Evas_Object *btn = NULL; + wfd_appdata_t *ad = wfd_get_appdata(); popup = elm_popup_add(win); + elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 1.0); + eext_object_event_callback_add(popup, EA_CALLBACK_BACK, __popup_resp_cb, (void *) pop->resp_data1); + evas_object_event_callback_add(popup, EVAS_CALLBACK_MOUSE_UP, mouseup_cb, ad); +// evas_object_event_callback_add(popup, EVAS_CALLBACK_KEY_DOWN, keydown_cb, ad); evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_object_text_set(popup, pop->text); + elm_object_domain_translatable_text_set(popup, PACKAGE, pop->text); btn = elm_button_add(popup); - elm_object_style_set(btn, "popup_button/default"); - elm_object_text_set(btn, pop->label1); + elm_object_style_set(btn, "popup"); + elm_object_domain_translatable_text_set(btn, PACKAGE, pop->label1); elm_object_part_content_set(popup, "button1", btn); evas_object_smart_callback_add(btn, "clicked", __popup_resp_cb, (void *) pop->resp_data1); +#if defined(X) + __set_parent_rotate_angle(ad); +#endif evas_object_show(popup); evas_object_show(win); +#if defined(X) + ad->rotate_event_handler = ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE, __rotate, ad); +#endif - __WDPOP_LOG_FUNC_EXIT__; + __WFD_APP_FUNC_EXIT__; return popup; } @@ -326,86 +484,141 @@ static Evas_Object *wfd_draw_pop_type_b(Evas_Object * win, wfd_popup_t * pop) */ static Evas_Object *wfd_draw_pop_type_c(Evas_Object * win, wfd_popup_t * pop) { - __WDPOP_LOG_FUNC_ENTER__; + __WFD_APP_FUNC_ENTER__; Evas_Object *popup = NULL; Evas_Object *btn1 = NULL, *btn2 = NULL; + wfd_appdata_t *ad = wfd_get_appdata(); popup = elm_popup_add(win); + elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 1.0); + eext_object_event_callback_add(popup, EA_CALLBACK_BACK, __popup_resp_cb, (void *) pop->resp_data2); + evas_object_event_callback_add(popup, EVAS_CALLBACK_MOUSE_UP, mouseup_cb, ad); +// evas_object_event_callback_add(popup, EVAS_CALLBACK_KEY_DOWN, keydown_cb, ad); evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_object_text_set(popup, pop->text); + elm_object_domain_translatable_part_text_set(popup, "title,text", + PACKAGE, _("IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB")); + elm_object_domain_translatable_text_set(popup, PACKAGE, pop->text); btn1 = elm_button_add(popup); - elm_object_style_set(btn1, "popup_button/default"); - elm_object_text_set(btn1, pop->label1); + elm_object_style_set(btn1, "popup"); + elm_object_domain_translatable_text_set(btn1, PACKAGE, pop->label2); elm_object_part_content_set(popup, "button1", btn1); evas_object_smart_callback_add(btn1, "clicked", __popup_resp_cb, - (void *) pop->resp_data1); + (void *) pop->resp_data2); btn2 = elm_button_add(popup); - elm_object_style_set(btn2, "popup_button/default"); - elm_object_text_set(btn2, pop->label2); + elm_object_style_set(btn2, "popup"); + elm_object_domain_translatable_text_set(btn2, PACKAGE, pop->label1); elm_object_part_content_set(popup, "button2", btn2); evas_object_smart_callback_add(btn2, "clicked", __popup_resp_cb, - (void *) pop->resp_data2); + (void *) pop->resp_data1); +#if defined(X) + __set_parent_rotate_angle(ad); +#endif evas_object_show(popup); evas_object_show(win); +#if defined(X) + ad->rotate_event_handler = ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE, __rotate, ad); +#endif - __WDPOP_LOG_FUNC_EXIT__; + __WFD_APP_FUNC_EXIT__; return popup; } -/** - * This function let the ug make a change callback for password input - * @return void - * @param[in] data the pointer to the main data structure - * @param[in] obj the pointer to the evas object - * @param[in] event_info the pointer to the event information - */ -static void _smart_ime_cb(void *data, Evas_Object * obj, void *event_info) +static void _wfd_ug_automatic_turn_off_popup_cb(void *data, Evas_Object *obj, void *event_info) { - __WDPOP_LOG_FUNC_ENTER__; + __WFD_APP_FUNC_ENTER__; wfd_appdata_t *ad = wfd_get_appdata(); - Ecore_IMF_Context *imf_context = NULL; - imf_context = (Ecore_IMF_Context *) ad->pin_entry; + if (ad->popup) { + evas_object_del(ad->popup); + ad->popup = NULL; + } - if (NULL == imf_context) { - WDPOP_LOGE( "Error!!! Ecore_IMF_Context is NULL!!"); - return; + if (ad->rotate_event_handler) { + ecore_event_handler_del(ad->rotate_event_handler); + ad->rotate_event_handler = NULL; } - const char *txt = elm_entry_markup_to_utf8(elm_entry_entry_get((const Evas_Object *) imf_context)); - if (NULL != txt) { - WDPOP_LOGD( "* text [%s], len=[%d]", txt, strlen(txt)); - strncpy(ad->pin_number, txt, 64); - ad->pin_number[63] = '\0'; - free(txt); - } else { - WDPOP_LOGD( "Err!"); + if (ad->win) { + evas_object_hide(ad->win); } - __WDPOP_LOG_FUNC_EXIT__; + __WFD_APP_FUNC_EXIT__; +} + +Evas_Object *wfd_draw_pop_type_auto_deactivation(Evas_Object *win, void *userdata) +{ + __WFD_APP_FUNC_ENTER__; + + Evas_Object *popup = NULL; + Evas_Object *btn = NULL; + char popup_text[MAX_POPUP_TEXT_SIZE] = {0}; + wfd_appdata_t *ad = wfd_get_appdata(); + + popup = elm_popup_add(win); + elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 1.0); + eext_object_event_callback_add(popup, EA_CALLBACK_BACK, _wfd_ug_automatic_turn_off_popup_cb, userdata); + evas_object_event_callback_add(popup, EVAS_CALLBACK_MOUSE_UP, mouseup_cb, ad); +// evas_object_event_callback_add(popup, EVAS_CALLBACK_KEY_DOWN, keydown_cb, ad); + evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_object_domain_translatable_part_text_set(popup, "title,text", + PACKAGE, "IDS_WIFI_BODY_WI_FI_DIRECT_ABB"); + snprintf(popup_text, MAX_POPUP_TEXT_SIZE, + "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG", 5); + elm_object_domain_translatable_text_set(popup, PACKAGE, popup_text); + + btn = elm_button_add(popup); + elm_object_style_set(btn, "popup"); + elm_object_domain_translatable_text_set(btn, PACKAGE, "IDS_BR_SK_OK"); + elm_object_part_content_set(popup, "button1", btn); + evas_object_smart_callback_add(btn, "clicked", _wfd_ug_automatic_turn_off_popup_cb, userdata); + +#if defined(X) + __set_parent_rotate_angle(ad); +#endif + evas_object_show(popup); + evas_object_show(win); +#if defined(X) + ad->rotate_event_handler = ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE, __rotate, ad); +#endif + + __WFD_APP_FUNC_EXIT__; + return popup; } /** - * This function let the app make a change callback for password checkbox + * This function let the ug make a change callback for password input * @return void * @param[in] data the pointer to the main data structure * @param[in] obj the pointer to the evas object * @param[in] event_info the pointer to the event information */ -static void _check_changed_cb(void *data, Evas_Object * obj, void *event_info) +static void _smart_ime_cb(void *data, Evas_Object * obj, void *event_info) { + __WFD_APP_FUNC_ENTER__; wfd_appdata_t *ad = wfd_get_appdata(); + wfd_connection_info_s *connection = ad->connection; + + Ecore_IMF_Context *imf_context = NULL; + imf_context = (Ecore_IMF_Context *) ad->pin_entry; - if (obj == NULL) { + if (NULL == imf_context) { + WFD_APP_LOG(WFD_APP_LOG_ERROR, "Error!!! Ecore_IMF_Context is NULL!!"); return; } - Eina_Bool state = elm_check_state_get(obj); - elm_entry_password_set(ad->pin_entry, !state); - elm_entry_autocapital_type_set(ad->pin_entry, ELM_AUTOCAPITAL_TYPE_NONE); + char *txt = elm_entry_markup_to_utf8(elm_entry_entry_get((const Evas_Object *) imf_context)); + if (NULL != txt) { + WFD_APP_LOG(WFD_APP_LOG_LOW, "* text [%s], len=[%d]", txt, strlen(txt)); + strncpy(connection->wps_pin, txt, sizeof(connection->wps_pin) - 1); + WFD_IF_FREE_MEM(txt); + } else { + WFD_APP_LOG(WFD_APP_LOG_LOW, "Err!"); + } + + __WFD_APP_FUNC_EXIT__; } /** @@ -421,7 +634,7 @@ static Eina_Bool _fn_pb_timer(void *data) wfd_wps_display_popup_t *wps_display_popup = (wfd_wps_display_popup_t *) data; if (NULL == wps_display_popup) { - WDPOP_LOGE( "Param is NULL.\n"); + WFD_APP_LOG(WFD_APP_LOG_ERROR, "Param is NULL.\n"); return ECORE_CALLBACK_CANCEL; } @@ -432,8 +645,12 @@ static Eina_Bool _fn_pb_timer(void *data) time = wps_display_popup->time; value = elm_progressbar_value_get(progressbar); + wps_display_popup->step++; + step = wps_display_popup->step; + value = ((double)step) / WFD_POP_TIMER_120; + if (value >= 1.0) { - WDPOP_LOGE( "Progress end.\n"); + WFD_APP_LOG(WFD_APP_LOG_LOW, "Progress end.\n"); if (pb_timer) { ecore_timer_del(pb_timer); pb_timer = NULL; @@ -442,11 +659,8 @@ static Eina_Bool _fn_pb_timer(void *data) return ECORE_CALLBACK_CANCEL; } - wps_display_popup->step++; - step = wps_display_popup->step; - value = ((double)step) / WFD_POP_TIMER_120; elm_progressbar_value_set(progressbar, value); - WDPOP_LOGD( "step: %d, value: %f\n", wps_display_popup->step, value); + WFD_APP_LOG(WFD_APP_LOG_LOW, "step: %d, value: %f\n", wps_display_popup->step, value); /* show the time label */ if (step < 60) { @@ -463,11 +677,90 @@ static Eina_Bool _fn_pb_timer(void *data) } } - elm_object_text_set(time, time_label); + char *remaining_time_str = g_strdup_printf( + "%s", time_label); + elm_object_text_set(time, remaining_time_str); + g_free(remaining_time_str); return ECORE_CALLBACK_RENEW; } +static Eina_Bool _keypad_popup_timer_cb(void *data) +{ + __WFD_APP_FUNC_ENTER__; + + char msg1[WFD_POP_STR_MAX_LEN] = {0}; + char msg2[WFD_POP_STR_MAX_LEN] = {0}; + + Evas_Object *label = (Evas_Object*) data; + wfd_appdata_t *ad = wfd_get_appdata(); + wfd_connection_info_s *connection = ad->connection; + WFD_RETV_IF(NULL == ad, FALSE, "NULL parameters(ad)\n"); + WFD_RETV_IF(NULL == label, FALSE, "NULL parameters(label)\n"); + if (NULL == ad->popup) { + keypad_popup_timeout = 0; + return ECORE_CALLBACK_CANCEL; + } + + keypad_popup_timeout --; + + if (keypad_popup_timeout > 0) { + _replace_1PS_2PD((char *)msg1, sizeof(msg1), + _("IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"), + connection->peer_name, keypad_popup_timeout); + + strcat(msg1, " "); + snprintf(msg2, sizeof(msg2), _("IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"), + connection->peer_name); + strcat(msg1, msg2); + elm_object_domain_translatable_text_set(label, PACKAGE, msg1); + + } + + if (keypad_popup_timeout <= 0) { + wfd_destroy_popup(); + keypad_popup_timeout = 0; + __WFD_APP_FUNC_EXIT__; + return ECORE_CALLBACK_CANCEL; + } + + __WFD_APP_FUNC_EXIT__; + return ECORE_CALLBACK_RENEW; +} + +/* This callback is for showing(hiding) X marked button. */ +/*static void _changed_cb(void *data, Evas_Object *obj, void *event_info) +{ + if (elm_object_focus_get(obj)) { + if (elm_entry_is_empty(obj)) + elm_object_signal_emit(data, "elm,state,eraser,hide", ""); + else + elm_object_signal_emit(data, "elm,state,eraser,show", ""); + } +}*/ + +/* Focused callback will show X marked button and hide guidetext. */ +/*static void _focused_cb(void *data, Evas_Object *obj, void *event_info) +{ + if (!elm_entry_is_empty(obj)) + elm_object_signal_emit(data, "elm,state,eraser,show", ""); + elm_object_signal_emit(data, "elm,state,rename,hide", ""); +}*/ + +/* Unfocused callback will show guidetext and hide X marked button. */ +/*static void _unfocused_cb(void *data, Evas_Object *obj, void *event_info) +{ + elm_object_signal_emit(data, "elm,state,eraser,hide", ""); + elm_object_signal_emit(data, "elm,state,rename,show", ""); +}*/ + +/* When X marked button clicked, make string as empty. */ +/*static void _eraser_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +{ + elm_object_focus_set(data, EINA_TRUE); + elm_entry_entry_set(data, ""); +}*/ + /** * This function let the app create a edit filed * @return edit filed @@ -477,7 +770,7 @@ static Eina_Bool _fn_pb_timer(void *data) * @param[in] single_line whether it can support single line * @param[in] is_editable whether it is avaliable to edit */ -static Evas_Object *_add_edit_field(Evas_Object *parent, const char *title, const char *guide, Eina_Bool single_line, Eina_Bool is_editable) +/*static Evas_Object *_add_edit_field(Evas_Object *parent, const char *title, const char *guide, Eina_Bool single_line, Eina_Bool is_editable) { assertm_if(NULL == parent, "parent is NULL!!"); @@ -485,30 +778,36 @@ static Evas_Object *_add_edit_field(Evas_Object *parent, const char *title, cons assertm_if(NULL == layout, "layout is NULL!!"); if (title && title[0] != '\0') { - elm_layout_theme_set(layout, "layout", "editfield", "title"); + elm_layout_theme_set(layout, "layout", "dialogue/editfield/title", "default"); elm_object_part_text_set(layout, "elm.text", title); } else { - elm_layout_theme_set(layout, "layout", "editfield", "default"); + elm_layout_theme_set(layout, "layout", "dialogue/editfield", "default"); } - Evas_Object *entry = elm_entry_add(parent); + Evas_Object *entry = elm_entry_add(layout); assertm_if(NULL == entry, "entry is NULL!!"); - elm_object_part_content_set(layout, "elm.swallow.content", entry); - evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - if (guide && guide[0] != '\0') { elm_object_part_text_set(layout, "elm.guidetext", guide); } + evas_object_smart_callback_add(entry, "changed", _changed_cb, layout); + evas_object_smart_callback_add(entry, "focused", _focused_cb, layout); + evas_object_smart_callback_add(entry, "unfocused", _unfocused_cb, layout); + + elm_object_part_content_set(layout, "elm.icon.entry", entry); + evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL); + elm_entry_single_line_set(entry, single_line); elm_entry_scrollable_set(entry, single_line); - elm_entry_editable_set(entry, is_editable); - elm_object_signal_emit(layout, "elm,state,eraser,hide", "elm"); - evas_object_show(layout); + Evas_Object *button = elm_button_add(parent); + elm_object_style_set(button, "editfield_clear"); + elm_object_part_content_set(layout, "elm.icon.eraser", button); + evas_object_smart_callback_add(button, "clicked", _eraser_btn_clicked_cb, entry); return layout; -} +}*/ /** * This function let the app create a display popup @@ -518,96 +817,353 @@ static Evas_Object *_add_edit_field(Evas_Object *parent, const char *title, cons */ Evas_Object *wfd_draw_pop_type_display(Evas_Object * win, wfd_popup_t * pop) { - __WDPOP_LOG_FUNC_ENTER__; + __WFD_APP_FUNC_ENTER__; + WFD_APP_LOG(WFD_APP_LOG_LOW, "wfd_draw_pop_type_display\n"); Evas_Object *popup = NULL; - Evas_Object *label = NULL; Evas_Object *progressbar = NULL; Evas_Object *time = NULL; + Evas_Object *layout; static wfd_wps_display_popup_t wps_display_popup; + wfd_appdata_t *ad = wfd_get_appdata(); popup = elm_popup_add(win); + elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 1.0); + evas_object_event_callback_add(popup, EVAS_CALLBACK_MOUSE_UP, mouseup_cb, ad); +// evas_object_event_callback_add(popup, EVAS_CALLBACK_KEY_DOWN, keydown_cb, ad); evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, 0.0); + elm_object_domain_translatable_part_text_set(popup, "title,text", + PACKAGE, _("IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB")); - Evas_Object *box = elm_box_add(popup); - if (!box) { - evas_object_del(popup); - popup = NULL; + layout = elm_layout_add(popup); + if (layout == NULL) { + WFD_APP_LOG(WFD_APP_LOG_LOW, "Layout failed so returning !!"); return NULL; } - evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, 0.0); - evas_object_size_hint_align_set(box, EVAS_HINT_FILL, 0.0); - elm_object_part_content_set(popup, NULL, box); - evas_object_show(box); - - /* add label */ - label = elm_label_add(box); - elm_object_style_set(label, "popup/default"); - elm_label_line_wrap_set(label, ELM_WRAP_MIXED); - elm_object_text_set(label, pop->text); - evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, 0.0); - evas_object_size_hint_align_set(label, EVAS_HINT_FILL, 0.0); - elm_box_pack_end(box, label); - evas_object_show(label); + elm_layout_file_set(layout, WFD_EDJ_POPUP_PATH, "popup_wps_pin_layout"); + elm_object_domain_translatable_part_text_set(layout, "elm.text.description", + PACKAGE, pop->text); + evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); /* add progressbar */ - progressbar = elm_progressbar_add(box); + progressbar = elm_progressbar_add(layout); elm_object_style_set(progressbar, "list_progress"); elm_progressbar_horizontal_set(progressbar, EINA_TRUE); - evas_object_size_hint_align_set(progressbar, EVAS_HINT_FILL, 0.0); - evas_object_size_hint_weight_set(progressbar, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(progressbar, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(progressbar, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_progressbar_value_set(progressbar, 0.0); - elm_box_pack_end(box, progressbar); evas_object_show(progressbar); /* add time */ - time = elm_label_add(box); - elm_object_style_set(time, "popup/default"); - elm_object_text_set(time, "00:00"); + time = elm_label_add(layout); + elm_label_line_wrap_set(time, ELM_WRAP_MIXED); + elm_object_text_set(time, _("00:00")); evas_object_size_hint_weight_set(time, EVAS_HINT_EXPAND, 0.0); - evas_object_size_hint_align_set(time, EVAS_HINT_FILL, 0.0); - elm_box_pack_end(box, time); + evas_object_size_hint_align_set(time, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(time); + elm_object_part_content_set(layout, "slider", progressbar); + elm_object_part_content_set(layout, "timer_label", time); + + /* start progressbar timer */ wps_display_popup.step = 0; wps_display_popup.progressbar = progressbar; wps_display_popup.time = time; - if(pb_timer) - ecore_timer_del(pb_timer); pb_timer = ecore_timer_add(1, _fn_pb_timer, &wps_display_popup); /* add buttons */ - if (pop->resp_data1 == WFD_POP_RESP_APRV_CONNECT_KEYPAD_YES || - pop->resp_data1 == WFD_POP_RESP_APRV_CONNECT_NO) { - Evas_Object *btn1 = NULL; - btn1 = elm_button_add(popup); - elm_object_style_set(btn1, "popup_button/default"); - elm_object_text_set(btn1, pop->label1); - elm_object_part_content_set(popup, "button1", btn1); - evas_object_smart_callback_add(btn1, "clicked", __popup_resp_cb, - (void *) pop->resp_data1); - } - if (pop->resp_data2 == WFD_POP_RESP_APRV_CONNECT_NO) { Evas_Object *btn2 = NULL; btn2 = elm_button_add(popup); - elm_object_style_set(btn2, "popup_button/default"); - elm_object_text_set(btn2, pop->label2); - elm_object_part_content_set(popup, "button2", btn2); + elm_object_style_set(btn2, "popup"); + elm_object_domain_translatable_text_set(btn2, PACKAGE, pop->label2); + elm_object_part_content_set(popup, "button1", btn2); evas_object_smart_callback_add(btn2, "clicked", __popup_resp_cb, (void *) pop->resp_data2); + eext_object_event_callback_add(popup, EA_CALLBACK_BACK, __popup_resp_cb, (void *) pop->resp_data2); + } + + if (pop->resp_data1 == WFD_POP_RESP_APRV_CONNECT_KEYPAD_YES || pop->resp_data1 == WFD_POP_RESP_APRV_CONNECT_PBC_YES ) { + Evas_Object *btn1 = NULL; + btn1 = elm_button_add(popup); + elm_object_style_set(btn1, "popup"); + elm_object_domain_translatable_text_set(btn1, PACKAGE, pop->label1); + elm_object_part_content_set(popup, "button2", btn1); + evas_object_smart_callback_add(btn1, "clicked", __popup_resp_cb, + (void *) pop->resp_data1); + eext_object_event_callback_add(popup, EA_CALLBACK_BACK, __popup_resp_cb, (void *) pop->resp_data1); } - elm_object_content_set(popup, box); + elm_object_content_set(popup, layout); +#if defined(X) + __set_parent_rotate_angle(ad); +#endif evas_object_show(popup); evas_object_show(win); +#if defined(X) + ad->rotate_event_handler = ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE, __rotate, ad); +#endif - __WDPOP_LOG_FUNC_EXIT__; + __WFD_APP_FUNC_EXIT__; return popup; } +static void __popup_eraser_clicked_cb(void *data, Evas_Object *obj, void *event_info) +{ + __WFD_APP_FUNC_ENTER__; + elm_entry_entry_set(data, ""); + __WFD_APP_FUNC_EXIT__; +} + +static void _entry_changed_cb(void *data, Evas_Object *obj, void *event_info) +{ + __WFD_APP_FUNC_ENTER__; + if (elm_object_part_content_get(obj, "elm.swallow.clear")) { + if (elm_object_focus_get(obj)) { + if (elm_entry_is_empty(obj)) + elm_object_signal_emit(obj, "elm,state,clear,hidden", ""); + else + elm_object_signal_emit(obj, "elm,state,clear,visible", ""); + } + } + __WFD_APP_FUNC_EXIT__; +} + +static void _entry_focused_cb(void *data, Evas_Object *obj, void *event_info) +{ + __WFD_APP_FUNC_ENTER__; + + if (elm_object_part_content_get(obj, "elm.swallow.clear")) { + if (!elm_entry_is_empty(obj)) + elm_object_signal_emit(obj, "elm,state,clear,visible", ""); + else + elm_object_signal_emit(obj, "elm,state,clear,hidden", ""); + } + elm_object_signal_emit(obj, "elm,state,focus,on", ""); + __WFD_APP_FUNC_EXIT__; +} + +static void _entry_keydown_cb(void *data, Evas *e, Evas_Object *obj, + void *event_info) +{ + __WFD_APP_FUNC_ENTER__; + + Evas_Event_Key_Down *ev; + Evas_Object *entry = obj; + + WFD_RET_IF(data == NULL, "Incorrect parameter data(NULL)\n"); + WFD_RET_IF(event_info == NULL, "Incorrect parameter event_info(NULL)\n"); + WFD_RET_IF(entry == NULL, "Incorrect parameter entry(NULL)\n"); + + ev = (Evas_Event_Key_Down *)event_info; + + if (g_strcmp0(ev->key, "KP_Enter") == 0 || g_strcmp0(ev->key, "Return") == 0) { + Ecore_IMF_Context *imf_context; + + imf_context = (Ecore_IMF_Context*)elm_entry_imf_context_get(entry); + if (imf_context) { + ecore_imf_context_input_panel_hide(imf_context); + } + + elm_object_focus_set(entry, EINA_FALSE); + } +} + +static char *__wfd_main_desc_label_get(void *data, Evas_Object *obj, + const char *part) +{ + __WFD_APP_FUNC_ENTER__; + if (obj == NULL || part == NULL) { + return NULL; + } + WFD_APP_LOG(WFD_APP_LOG_LOW, "wfd_rename desc\n"); + char msg1[WFD_POP_STR_MAX_LEN] = {0, }; + char msg2[WFD_POP_STR_MAX_LEN] = {0, }; + wfd_appdata_t *ad = wfd_get_appdata(); + WFD_RETV_IF(ad == NULL, NULL, "Incorrect parameter(NULL)\n"); + wfd_connection_info_s *connection = ad->connection; + WFD_RETV_IF(connection == NULL, NULL, "Incorrect parameter(NULL)\n"); + + if (!g_strcmp0(part, "elm.text.multiline")) { + if (keypad_popup_timeout > 0) { + ad->timeout = keypad_popup_timeout; + } + _replace_1PS_2PD((char *)msg1, sizeof(msg1), + _("IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"), + connection->peer_name, ad->timeout); + + strcat(msg1, " "); + snprintf(msg2, sizeof(msg2), + _("IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"), + connection->peer_name); + strcat(msg1, msg2); + WFD_APP_LOG(WFD_APP_LOG_LOW, "string %s", msg1); + __WFD_APP_FUNC_EXIT__; + return g_strdup(msg1); + } + __WFD_APP_FUNC_EXIT__; + return NULL; +} + +static Evas_Object *__wfd_pin_entry_icon_get(void *data, Evas_Object *obj, + const char *part) +{ + __WFD_APP_FUNC_ENTER__; + if (obj == NULL || part == NULL) { + return NULL; + } + wfd_appdata_t *ad = wfd_get_appdata(); + WFD_RETV_IF(ad == NULL, NULL, "Incorrect parameter(NULL)\n"); + Evas_Object *entry = NULL; + Evas_Object *button = NULL; + Ecore_IMF_Context *imf_context; + if (g_strcmp0(part, "elm.icon.entry")) { + __WFD_APP_FUNC_EXIT__; + return NULL; + } + static Elm_Entry_Filter_Accept_Set accept_set = {"0123456789", NULL}; + entry = elm_entry_add(obj); + elm_entry_single_line_set(entry, EINA_TRUE); + elm_object_style_set(entry, "editfield"); + elm_entry_scrollable_set(entry, EINA_TRUE); + + eext_entry_selection_back_event_allow_set(entry, EINA_TRUE); + evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL); + elm_entry_cnp_mode_set(entry, ELM_CNP_MODE_PLAINTEXT); + elm_entry_password_set(entry, EINA_TRUE); + elm_entry_prediction_allow_set(entry, EINA_FALSE); + + elm_entry_markup_filter_append(entry, + elm_entry_filter_accept_set,&accept_set); + elm_entry_input_panel_layout_set(entry, + ELM_INPUT_PANEL_LAYOUT_DATETIME); + elm_object_signal_emit(entry, "elm,action,hide,search_icon", ""); + elm_object_domain_translatable_part_text_set(entry, "elm.guide", + PACKAGE, _("IDS_WIFI_POP_PIN")); + elm_entry_input_panel_return_key_autoenabled_set(entry,EINA_TRUE); + elm_entry_input_panel_return_key_type_set(entry, + ELM_INPUT_PANEL_RETURN_KEY_TYPE_DONE); + + ad->pin_entry = entry; + imf_context = (Ecore_IMF_Context*)elm_entry_imf_context_get(entry); + if (imf_context) { + ecore_imf_context_input_panel_return_key_type_set(imf_context, + ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_DONE); + } + + button = elm_button_add(obj); + elm_object_style_set(button, "search_clear"); + elm_object_focus_allow_set(button, EINA_FALSE); + elm_object_part_content_set(entry, "elm.swallow.clear", button); + evas_object_smart_callback_add(button, "clicked", + __popup_eraser_clicked_cb, entry); + + elm_object_signal_emit (entry, "elm,action,hide,search_icon", ""); + evas_object_smart_callback_add(entry, "changed", + _entry_changed_cb, NULL); + evas_object_smart_callback_add(entry, "preedit,changed", + _entry_changed_cb, NULL); + evas_object_smart_callback_add(entry, "focused", + _entry_focused_cb, NULL); + evas_object_event_callback_add(entry, EVAS_CALLBACK_KEY_DOWN, + _entry_keydown_cb, ad); + + elm_object_content_set(obj,entry); + evas_object_show(entry); + evas_object_smart_callback_add(entry, "changed", _smart_ime_cb, NULL); + elm_object_focus_set(entry, EINA_TRUE); + __WFD_APP_FUNC_EXIT__; + return entry; +} + +static void _chk_changed_cb(void *data, Evas_Object *obj, void *ei) +{ + __WFD_APP_FUNC_ENTER__; + if (obj == NULL || data == NULL) { + return; + } + Eina_Bool state = elm_check_state_get(obj); + if (state) { + elm_entry_password_set((Evas_Object *)data, EINA_FALSE); + } else { + elm_entry_password_set((Evas_Object *)data, EINA_TRUE); + } + __WFD_APP_FUNC_EXIT__; +} + +static void _gl_pswd_check_box_sel(void *data, Evas_Object *obj, void *ei) +{ + __WFD_APP_FUNC_ENTER__; + Elm_Object_Item *item = NULL; + item = (Elm_Object_Item *)ei; + if (item == NULL) { + return; + } + wfd_appdata_t *ad = wfd_get_appdata(); + if (ad == NULL) { + WFD_APP_LOG(WFD_APP_LOG_LOW, "Incorrect parameter(NULL)\n"); + return; + } + Evas_Object *ck = elm_object_item_part_content_get(ei, "elm.icon.left"); + elm_genlist_item_selected_set(item, EINA_FALSE); + Eina_Bool state = elm_check_state_get(ck); + elm_check_state_set(ck, !state); + if (ad) { + _chk_changed_cb(ad->pin_entry, ck, NULL); + } + __WFD_APP_FUNC_EXIT__; +} + +static char *__wfd_password_label(void *data, Evas_Object *obj, const char *part) +{ + __WFD_APP_FUNC_ENTER__; + + if (data == NULL || part == NULL) { + return NULL; + } + WFD_APP_LOG(WFD_APP_LOG_LOW, "Part %s", part); + + if (!g_strcmp0(part, "elm.text.main.right")) { + __WFD_APP_FUNC_EXIT__; + return g_strdup(" Show password"); + } + __WFD_APP_FUNC_EXIT__; + return NULL; +} + +static Evas_Object *__wfd_password_check(void *data, Evas_Object *obj, + const char *part) +{ + __WFD_APP_FUNC_ENTER__; + if (obj == NULL || part == NULL) { + return NULL; + } + wfd_appdata_t *ad = wfd_get_appdata(); + WFD_RETV_IF(ad == NULL, NULL, "Incorrect parameter(NULL)\n"); + Evas_Object *check = NULL; + + WFD_APP_LOG(WFD_APP_LOG_LOW, "Part %s", part); + + if (!g_strcmp0(part, "elm.icon.left")) { + check = elm_check_add(obj); + evas_object_propagate_events_set(check, EINA_FALSE); + evas_object_size_hint_align_set(check, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(check, + EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_smart_callback_add(check, "changed", + _chk_changed_cb, ad->pin_entry); + elm_object_focus_allow_set(check, EINA_FALSE); + __WFD_APP_FUNC_EXIT__; + return check; + } + __WFD_APP_FUNC_EXIT__; + return check; +} + + /** * This function let the app create a keypad popup * @return keypad popup @@ -616,119 +1172,168 @@ Evas_Object *wfd_draw_pop_type_display(Evas_Object * win, wfd_popup_t * pop) */ Evas_Object *wfd_draw_pop_type_keypad(Evas_Object * win, wfd_popup_t * pop) { - __WDPOP_LOG_FUNC_ENTER__; + __WFD_APP_FUNC_ENTER__; wfd_appdata_t *ad = wfd_get_appdata(); + WFD_RETV_IF(ad == NULL, NULL, "Incorrect parameter(NULL)\n"); + wfd_connection_info_s *connection = ad->connection; + WFD_RETV_IF(connection == NULL, NULL, "Incorrect parameter(NULL)\n"); - Evas_Object *conformant = NULL; - Evas_Object *layout = NULL; Evas_Object *pinpopup = NULL; - Evas_Object *label = NULL; Evas_Object *btn1 = NULL, *btn2 = NULL; - - conformant = elm_conformant_add(win); - assertm_if(NULL == conformant, "conformant is NULL!!"); - elm_win_conformant_set(win, EINA_TRUE); - elm_win_resize_object_add(win, conformant); - evas_object_size_hint_weight_set(conformant, EVAS_HINT_EXPAND, 0.0); - evas_object_size_hint_align_set(conformant, EVAS_HINT_FILL, 0.0); - evas_object_show(conformant); - - layout = elm_layout_add(conformant); - elm_object_content_set(conformant, layout); - - pinpopup = elm_popup_add(layout); - assertm_if(NULL == pinpopup, "pinpopup is NULL!!"); - evas_object_size_hint_weight_set(pinpopup, EVAS_HINT_EXPAND, 0.0); - elm_object_part_text_set(pinpopup, "title,text", _("IDS_WFD_POP_TITILE_CONNECTION")); - - Evas_Object *box = elm_box_add(pinpopup); - if (!box) { - evas_object_del(pinpopup); - pinpopup = NULL; - return NULL; - } - - evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, 0.0); - evas_object_size_hint_align_set(box, EVAS_HINT_FILL, 0.0); - elm_object_part_content_set(pinpopup, NULL, box); - evas_object_show(box); - - /* add label */ - label = elm_label_add(box); - elm_object_style_set(label, "popup/default"); - elm_label_line_wrap_set(label, ELM_WRAP_MIXED); - elm_object_text_set(label, pop->text); - evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, 0.0); - evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_box_pack_end(box, label); - evas_object_show(label); - - /* add password */ - Evas_Object *body = elm_layout_add(box); - if (!body) { - evas_object_del(pinpopup); - pinpopup = NULL; - return NULL; + Evas_Object *genlist = NULL; + Elm_Object_Item *git = NULL; + + ad->timeout = pop->timeout; + + pinpopup = elm_popup_add(ad->layout); + elm_popup_align_set(pinpopup, ELM_NOTIFY_ALIGN_FILL, 1.0); + eext_object_event_callback_add(pinpopup, EA_CALLBACK_BACK, eext_popup_back_cb, + NULL); + evas_object_size_hint_weight_set(pinpopup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_object_domain_translatable_part_text_set(pinpopup, "title,text", + PACKAGE, _("IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB")); + + genlist = elm_genlist_add(pinpopup); + elm_genlist_homogeneous_set(genlist, EINA_TRUE); + evas_object_size_hint_weight_set(genlist, + EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL); + elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS); + elm_scroller_content_min_limit(genlist, EINA_FALSE, EINA_TRUE); + + /* Entry genlist item */ + ad->pin_desc_itc = elm_genlist_item_class_new(); + if(ad->pin_desc_itc != NULL) { + ad->pin_desc_itc->item_style = "multiline_main"; + ad->pin_desc_itc->func.text_get = __wfd_main_desc_label_get; + ad->pin_desc_itc->func.content_get = NULL; + ad->pin_desc_itc->func.state_get = NULL; + ad->pin_desc_itc->func.del = NULL; + + git = elm_genlist_item_append(genlist, ad->pin_desc_itc, ad, NULL, + ELM_GENLIST_ITEM_NONE, NULL, NULL); + if(git != NULL) + elm_genlist_item_select_mode_set(git, + ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); + + keypad_popup_timeout = pop->timeout; + keypad_popup_timer = ecore_timer_add(1, _keypad_popup_timer_cb, + ad->pin_desc_itc); } - elm_layout_theme_set(body, "layout", "dialogue", "1icon"); - evas_object_size_hint_weight_set(body, EVAS_HINT_EXPAND, 0.0); - evas_object_size_hint_align_set(body, EVAS_HINT_FILL, 0.0); + ad->pin_entry_itc = elm_genlist_item_class_new(); + if(ad->pin_entry_itc != NULL) { + ad->pin_entry_itc->item_style = "entry"; + ad->pin_entry_itc->func.text_get = NULL; + ad->pin_entry_itc->func.content_get = __wfd_pin_entry_icon_get; + ad->pin_entry_itc->func.state_get = NULL; + ad->pin_entry_itc->func.del = NULL; - Evas_Object *editfield_pin = _add_edit_field(body, NULL, NULL, EINA_TRUE, EINA_TRUE); - Evas_Object *entry_pin = elm_object_part_content_get(editfield_pin, "elm.swallow.content"); - ad->pin_entry = entry_pin; - evas_object_smart_callback_add(ad->pin_entry, "changed", _smart_ime_cb, NULL); - elm_object_part_content_set(body, "elm.icon", editfield_pin); - elm_box_pack_end(box, body); - evas_object_show(body); + elm_genlist_item_append(genlist, ad->pin_entry_itc, pinpopup, + NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + } - elm_entry_password_set(ad->pin_entry, TRUE); + ad->paswd_itc = elm_genlist_item_class_new(); + if(ad->paswd_itc != NULL) { + ad->paswd_itc->item_style = "1line"; + ad->paswd_itc->func.text_get = __wfd_password_label; + ad->paswd_itc->func.content_get = __wfd_password_check; + ad->paswd_itc->func.state_get = NULL; + ad->paswd_itc->func.del = NULL; - Evas_Object *check = elm_check_add(box); - elm_object_text_set(check, _("Show password")); - elm_object_focus_allow_set(check, EINA_FALSE); - evas_object_size_hint_weight_set(check, EVAS_HINT_EXPAND, 0.0); - evas_object_size_hint_align_set(check, EVAS_HINT_FILL, 0.0); - evas_object_smart_callback_add(check, "changed", _check_changed_cb, NULL); - evas_object_show(check); - elm_box_pack_end(box, check); + elm_genlist_item_append(genlist, ad->paswd_itc, pinpopup, + NULL, ELM_GENLIST_ITEM_NONE, _gl_pswd_check_box_sel, (void *)ad ); + } - /* add buttons */ btn1 = elm_button_add(pinpopup); - elm_object_style_set(btn1, "popup_button/default"); - elm_object_text_set(btn1, pop->label1); + elm_object_style_set(btn1, "popup"); + elm_object_domain_translatable_text_set(btn1, PACKAGE, pop->label2); elm_object_part_content_set(pinpopup, "button1", btn1); - evas_object_smart_callback_add(btn1, "clicked", __popup_resp_cb, (void *)pop->resp_data1); + evas_object_smart_callback_add(btn1, "clicked", __popup_resp_cb, + (void *)pop->resp_data2); btn2 = elm_button_add(pinpopup); - elm_object_style_set(btn2, "popup_button/default"); - elm_object_text_set(btn2, pop->label2); + elm_object_style_set(btn2, "popup"); + elm_object_domain_translatable_text_set(btn2, PACKAGE, pop->label1); elm_object_part_content_set(pinpopup, "button2", btn2); - evas_object_smart_callback_add(btn2, "clicked", __popup_resp_cb, (void *)pop->resp_data2); - - elm_object_content_set(pinpopup, box); + evas_object_smart_callback_add(btn2, "clicked", __popup_resp_cb, + (void *)pop->resp_data1); +#if defined(GENLIST_REALIZATION_MOTE_SET) + elm_genlist_realization_mode_set(genlist, EINA_TRUE); +#endif + evas_object_show(genlist); + elm_object_content_set(pinpopup, genlist); + +#if defined(X) + __set_parent_rotate_angle(ad); +#endif evas_object_show(pinpopup); evas_object_show(win); elm_object_focus_set(ad->pin_entry, EINA_TRUE); +#if defined(X) + ad->rotate_event_handler = ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE, + __rotate, ad); +#endif - __WDPOP_LOG_FUNC_EXIT__; + __WFD_APP_FUNC_EXIT__; return pinpopup; } + +void _replace_int(char *haystack, int size, char *niddle, int value) +{ + __WFD_APP_FUNC_ENTER__; + char*buf = NULL; + char *p = NULL; + char *q = NULL; + + if (haystack == NULL || niddle == NULL || size <= 1) + return; + + buf = g_strdup(haystack); + p = strstr(buf, niddle); + if (p==NULL) { + free(buf); + return; + } + q = p + strlen(niddle); + *p = '\0'; + + snprintf(haystack, size-1, "%s%d%s", buf, value, q); + free(buf); + __WFD_APP_FUNC_EXIT__; +} + +void _replace_1PS_2PD(char *buf, int buf_len, char *format_str, char* SD_1, int PD_2) +{ + __WFD_APP_FUNC_ENTER__; + char text[WFD_POP_STR_MAX_LEN] = {0, }; + + strncpy(text, format_str, WFD_POP_STR_MAX_LEN-1); + _replace_int(text, WFD_POP_STR_MAX_LEN, "%d", PD_2); + _replace_int(text, WFD_POP_STR_MAX_LEN, "%2$d", PD_2); + snprintf(buf, buf_len-1, text, SD_1); + __WFD_APP_FUNC_EXIT__; +} + + /** * This function let the app create a popup * @return void * @param[in] type the type of popup * @param[in] userdata the pointer to the data which will be used */ -void wfd_prepare_popup(int type, void *userdata) +void wfd_prepare_popup(int type, void *user_data) { - __WDPOP_LOG_FUNC_ENTER__; + __WFD_APP_FUNC_ENTER__; wfd_appdata_t *ad = wfd_get_appdata(); wfd_popup_t *pop = ad->popup_data; - + wfd_connection_info_s *connection = ad->connection; + char text[WFD_POP_STR_MAX_LEN+1] = {0, }; + char text1[WFD_POP_STR_MAX_LEN+1] = {0, }; wfd_destroy_popup(); + char *peer_name; + peer_name = elm_entry_utf8_to_markup(connection->peer_name); memset(pop, 0, sizeof(wfd_popup_t)); @@ -736,32 +1341,26 @@ void wfd_prepare_popup(int type, void *userdata) switch (pop->type) { case /* MT */ WFD_POP_APRV_CONNECTION_WPS_PUSHBUTTON_REQ: - snprintf(pop->text, sizeof(pop->text), IDS_WFD_POP_CONNECT_Q, - ad->peer_name); - snprintf(pop->label1, sizeof(pop->label1), "%s", dgettext("sys_string", "IDS_COM_SK_YES")); - snprintf(pop->label2, sizeof(pop->label2), "%s", dgettext("sys_string", "IDS_COM_SK_NO")); - pop->resp_data1 = WFD_POP_RESP_APRV_CONNECT_PBC_YES; - pop->resp_data2 = WFD_POP_RESP_APRV_CONNECT_NO; - ad->popup = wfd_draw_pop_type_c(ad->win, pop); - break; + _replace_1PS_2PD((char *)pop->text, sizeof(pop->text), + _("IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"), + peer_name, WFD_POP_TIMER_120); - case WFD_POP_APRV_CONNECTION_INVITATION_REQ: - snprintf(pop->text, sizeof(pop->text), IDS_WFD_POP_CONNECT_Q, - ad->peer_name); - snprintf(pop->label1, sizeof(pop->label1), "%s", dgettext("sys_string", "IDS_COM_SK_YES")); - snprintf(pop->label2, sizeof(pop->label2), "%s", dgettext("sys_string", "IDS_COM_SK_NO")); - pop->resp_data1 = WFD_POP_RESP_APRV_CONNECT_INVITATION_YES; + snprintf(pop->label1, sizeof(pop->label1), "%s", _("IDS_WIFI_SK2_OK")); + snprintf(pop->label2, sizeof(pop->label2), "%s", _("IDS_WIFI_SK_CANCEL")); + pop->timeout = WFD_POP_TIMER_120; + pop->resp_data1 = WFD_POP_RESP_APRV_CONNECT_PBC_YES; pop->resp_data2 = WFD_POP_RESP_APRV_CONNECT_NO; - ad->popup = wfd_draw_pop_type_c(ad->win, pop); + ad->popup = wfd_draw_pop_type_display(ad->win, pop); break; case /* MT */ WFD_POP_APRV_CONNECTION_WPS_DISPLAY_REQ: - snprintf(pop->text, sizeof(pop->text), IDS_WFD_POP_ENTER_PIN_WITH_KEYPAD, - ad->peer_name); - snprintf(pop->label1, sizeof(pop->label1), "%s", dgettext("sys_string", "IDS_COM_SK_OK")); - snprintf(pop->label2, sizeof(pop->label2), "%s", dgettext("sys_string", "IDS_COM_POP_CANCEL")); + snprintf(pop->text, sizeof(pop->text), + _("IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"), + peer_name); + snprintf(pop->label1, sizeof(pop->label1), "%s", _("IDS_WIFI_BUTTON_ALLOW")); + snprintf(pop->label2, sizeof(pop->label2), "%s", _("IDS_BR_SK_CANCEL")); pop->timeout = WFD_POP_TIMER_120; pop->resp_data1 = WFD_POP_RESP_APRV_CONNECT_DISPLAY_OK; pop->resp_data2 = WFD_POP_RESP_APRV_CONNECT_NO; @@ -770,20 +1369,21 @@ void wfd_prepare_popup(int type, void *userdata) break; case /* MT */ WFD_POP_APRV_CONNECTION_WPS_KEYPAD_REQ: - snprintf(pop->text, sizeof(pop->text), IDS_WFD_POP_ENTER_PIN, - ad->peer_name, WFD_POP_TIMER_120); - snprintf(pop->label1, sizeof(pop->label1), "%s", dgettext("sys_string", "IDS_COM_SK_OK")); - snprintf(pop->label2, sizeof(pop->label2), "%s", dgettext("sys_string", "IDS_COM_POP_CANCEL")); + _replace_1PS_2PD((char *)pop->text, sizeof(pop->text), + _("IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"), + peer_name, WFD_POP_TIMER_120); + snprintf(pop->label1, sizeof(pop->label1), "%s", _("IDS_BR_SK_OK")); + snprintf(pop->label2, sizeof(pop->label2), "%s", _("IDS_BR_SK_CANCEL")); pop->timeout = WFD_POP_TIMER_120; pop->resp_data1 = WFD_POP_RESP_APRV_CONNECT_KEYPAD_YES; pop->resp_data2 = WFD_POP_RESP_APRV_CONNECT_NO; - ad->popup = wfd_draw_pop_type_c(ad->win, pop); + ad->popup = wfd_draw_pop_type_display(ad->win, pop); break; case /* MT */ WFD_POP_PROG_CONNECT: - snprintf(pop->text, sizeof(pop->text), "%s", _("IDS_WFD_POP_CONNECTING")); - snprintf(pop->label1, sizeof(pop->label1), "%s", dgettext("sys_string", "IDS_COM_POP_CANCEL")); + snprintf(pop->text, sizeof(pop->text), "%s", _("IDS_WIFI_BODY_CONNECTING_ING")); + snprintf(pop->label1, sizeof(pop->label1), "%s", _("IDS_BR_SK_CANCEL")); pop->timeout = WFD_POP_TIMER_120; pop->resp_data1 = WFD_POP_RESP_APRV_CONNECT_NO; @@ -791,10 +1391,17 @@ void wfd_prepare_popup(int type, void *userdata) break; case /* MO */ WFD_POP_PROG_CONNECT_WITH_KEYPAD: - snprintf(pop->text, sizeof(pop->text), IDS_WFD_POP_CONNECTING_WITH_KEYPAD, - ad->peer_name, WFD_POP_TIMER_120, ad->peer_name); - snprintf(pop->label1, sizeof(pop->label1), "%s", dgettext("sys_string", "IDS_COM_SK_OK")); - snprintf(pop->label2, sizeof(pop->label2), "%s", dgettext("sys_string", "IDS_COM_POP_CANCEL")); + _replace_1PS_2PD((char *)text, sizeof(text), + _("IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"), + peer_name, WFD_POP_TIMER_120); + + snprintf(text1, WFD_POP_STR_MAX_LEN, "%s %s", + text, _("IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS")); + + snprintf(pop->text, sizeof(pop->text), text1, connection->peer_name); + + snprintf(pop->label1, sizeof(pop->label1), "%s", _("IDS_WIFI_SK_CONNECT")); + snprintf(pop->label2, sizeof(pop->label2), "%s", _("IDS_BR_SK_CANCEL")); pop->timeout = WFD_POP_TIMER_120; pop->resp_data1 = WFD_POP_RESP_PROG_CONNECT_KEYPAD_OK; pop->resp_data2 = WFD_POP_RESP_APRV_CONNECT_NO; @@ -803,17 +1410,25 @@ void wfd_prepare_popup(int type, void *userdata) break; case /* MO/MT */ WFD_POP_PROG_CONNECT_WITH_PIN: - snprintf(pop->text, sizeof(pop->text), IDS_WFD_POP_CONNECTING_WITH_PIN, - ad->peer_name, WFD_POP_TIMER_120, ad->pin_number); - snprintf(pop->label1, sizeof(pop->label1), "%s", dgettext("sys_string", "IDS_COM_POP_CANCEL")); + _replace_1PS_2PD((char *)text, sizeof(text), + _("IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"), + peer_name, WFD_POP_TIMER_120); + + snprintf(text1, WFD_POP_STR_MAX_LEN, "%s %s %s", + text, + "
", + _("IDS_WIFI_POP_PIN_CODE_PS")); + snprintf(pop->text, sizeof(pop->text), text1, connection->wps_pin); + + snprintf(pop->label2, sizeof(pop->label2), "%s", _("IDS_BR_SK_CANCEL")); pop->timeout = WFD_POP_TIMER_120; - pop->resp_data1 = WFD_POP_RESP_APRV_CONNECT_NO; + pop->resp_data2 = WFD_POP_RESP_APRV_CONNECT_NO; ad->popup = wfd_draw_pop_type_display(ad->win, pop); break; case WFD_POP_PROG_CONNECT_CANCEL: - snprintf(pop->text, sizeof(pop->text), "%s", dgettext("sys_string", "IDS_COM_POP_CANCEL")); + snprintf(pop->text, sizeof(pop->text), "%s", _("IDS_BR_SK_CANCEL")); pop->timeout = WFD_POP_TIMER_120; ad->popup = wfd_draw_pop_type_a(ad->win, pop); break; @@ -822,6 +1437,13 @@ void wfd_prepare_popup(int type, void *userdata) break; } - __WDPOP_LOG_FUNC_EXIT__; + /* feedback play */ + int ret = -1; + ret = feedback_play(FEEDBACK_PATTERN_GENERAL); + if (ret != FEEDBACK_ERROR_NONE) { + WFD_APP_LOG(WFD_APP_LOG_ERROR,"feedback_play error : %d\n", ret); + } + WFD_IF_FREE_MEM(peer_name); + __WFD_APP_FUNC_EXIT__; return; -} \ No newline at end of file +}