From: sandeepkpolu Date: Fri, 11 Mar 2016 02:56:04 +0000 (+0900) Subject: Fixed UI issues after code restructre. X-Git-Tag: release/160311~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b0ec38cfce8a5566df5a265ef8e916d22ec7e0d2;p=apps%2Fnative%2Ftelegram-tizen.git Fixed UI issues after code restructre. Change-Id: Ib8db1ce30129f792e09db0dc6639a21e1ab71be6 --- diff --git a/TelegramTizen/src/telegramtizen.c b/TelegramTizen/src/telegramtizen.c index aec27c8..179239f 100755 --- a/TelegramTizen/src/telegramtizen.c +++ b/TelegramTizen/src/telegramtizen.c @@ -1231,11 +1231,12 @@ static int on_message_received_from_buddy(appdata_s *app, bundle *const rec_msg, { int result = SVC_RES_FAIL; +#if 0 if (!app->peer_in_cahtting_data || !app->peer_in_cahtting_data->use_data) { LOGE("Wrong status, previous chatting data are freed!!!"); return result; } - +#endif char* from_id_str = NULL; result = bundle_get_str(rec_msg, "from_id", &from_id_str); diff --git a/TelegramTizen/src/tg_messaging_view.c b/TelegramTizen/src/tg_messaging_view.c index 4e08a05..577685b 100644 --- a/TelegramTizen/src/tg_messaging_view.c +++ b/TelegramTizen/src/tg_messaging_view.c @@ -3378,6 +3378,7 @@ void refresh_messaging_view(appdata_s *ad) static void click_user_name_cb(void *data, Evas_Object *obj, void *event_info) { +#if 0 appdata_s *ad = evas_object_data_get(obj,"app_data"); Elm_Object_Item *item = event_info; const char *clicked_name = elm_object_item_text_get(item); @@ -3409,6 +3410,7 @@ static void click_user_name_cb(void *data, Evas_Object *obj, void *event_info) ad->buddy_in_cahtting_data = prev_buddy_in_chatting_data; ad->peer_in_cahtting_data = prev_peer_in_chatting_data; +#endif } static void on_expand_button_clicked(void *data, Evas_Object *obj, void *event_info) diff --git a/TelegramTizen/src/tg_user_info_view.c b/TelegramTizen/src/tg_user_info_view.c index ce8fbc9..e724a05 100755 --- a/TelegramTizen/src/tg_user_info_view.c +++ b/TelegramTizen/src/tg_user_info_view.c @@ -316,10 +316,14 @@ void on_user_info_menu_option_selected_cb(void *data, Evas_Object *obj, void *ev ad->is_loading_from_profile_view = EINA_TRUE; on_create_new_contact(ad); break; +#if 0 case 2: show_toast(ad, i18n_get_text("IDS_TGRAM_OPT_SHARE")); break; case 3: +#else + case 2: +#endif if (user_data->peer_type == TGL_PEER_USER) { on_block_selected_cb(ad); } @@ -353,11 +357,14 @@ char* on_user_info_menu_text_get_cb(void *data, Evas_Object *obj, const char *pa return strdup(i18n_get_text("IDS_TGRAM_OPT_EDIT")); else return NULL; - +#if 0 case 2: return strdup(i18n_get_text("IDS_TGRAM_OPT_SHARE")); case 3: +#else + case 2: +#endif if (get_buddy_block_status(sel_item->use_data->peer_id) == 1) return strdup(i18n_get_text("IDS_TGRAM_OPT_UNBLOCK")); else @@ -405,11 +412,11 @@ void on_user_info_menu_button_clicked(void *data, Evas_Object *obj, void *event_ itc.func.state_get = NULL; itc.func.del = NULL; - int number_of_menus = 4; + int number_of_menus = 3; Eina_Bool is_need_continue = EINA_FALSE; peer_with_pic_s *sel_item = ad->peer_in_cahtting_data; if(sel_item && is_telegram_account(sel_item->use_data->peer_id)) { - number_of_menus = 3; + number_of_menus = 2; is_need_continue = EINA_TRUE; } diff --git a/TelegramTizen/tg_utils/tg_common.c b/TelegramTizen/tg_utils/tg_common.c index 40a0eaf..e5ccc8c 100644 --- a/TelegramTizen/tg_utils/tg_common.c +++ b/TelegramTizen/tg_utils/tg_common.c @@ -702,12 +702,12 @@ void set_peer_names(tg_peer_info_s* peer_info, main_list_item->buddy_display_name = strdup(i18n_get_text("IDS_TGRAM_OPT_DELETE")); main_list_item->peer_print_name = strdup(i18n_get_text("IDS_TGRAM_OPT_DELETE")); } else if (get_buddy_unknown_status(peer_info->peer_id)) { - char *number = get_buddy_phone_num_from_id(peer_info->peer_id); if (number && strlen(number)) main_list_item->peer_print_name = number; else main_list_item->peer_print_name = strdup(" "); + main_list_item->buddy_display_name = strdup(main_list_item->peer_print_name); } else { tmp_name = get_display_name_from_contact(peer_info); main_list_item->buddy_display_name = tmp_name ? tmp_name : strdup(" "); diff --git a/tg-engine-service/tg_engine/tg_engine.c b/tg-engine-service/tg_engine/tg_engine.c index 4ca1fb3..90e2c92 100644 --- a/tg-engine-service/tg_engine/tg_engine.c +++ b/tg-engine-service/tg_engine/tg_engine.c @@ -3171,7 +3171,7 @@ void on_new_buddy_added(struct tgl_state *TLS, void *callback_extra, int success char* msg_table = get_table_name_from_number(buddy->id.id); create_buddy_msg_table(msg_table); free(msg_table); - + buddy->is_unknown = 0; init_insert_buddy_into_db(BUDDY_INFO_TABLE_NAME, buddy); tgl_peer_t* UC = tgl_peer_get(TLS, buddy->id); if (UC) {