Fixed group chat info bugs

Change-Id: I764202c8d817dcf80a87b0fbfbfe1b081ac45808

diff --git a/TelegramTizen/src/tg_messaging_view.c b/TelegramTizen/src/tg_messaging_view.c
index 09293a3..f25e193 100644 (file)
--- a/TelegramTizen/src/tg_messaging_view.c
+++ b/TelegramTizen/src/tg_messaging_view.c
@@ -2322,7 +2322,15 @@ void on_user_presence_state_changed(appdata_s* ad, int buddy_id)
                                online_members++;
                        }
 
-                       char *buddy_full_name = get_buddy_name_from_id(chat_info->chat_users[i]);
+                       char *buddy_full_name = NULL;
+                       int buddy_id = chat_info->chat_users[i];
+
+                       if (buddy_id == ad->current_user_data->user_id.id) {
+                               buddy_full_name = strdup(ad->current_user_data->print_name);
+                       } else {
+                               buddy_full_name = get_buddy_name_from_id(buddy_id);
+                       }
+
                        if (buddy_full_name) {
                                char *buddy_name =  replace(buddy_full_name, '_', " ");
                                if (buddy_name) {
@@ -2335,6 +2343,7 @@ void on_user_presence_state_changed(appdata_s* ad, int buddy_id)
                                                strcat(names_of_buddies, buddy_name);
                                        }
                                }
+                               free(buddy_full_name);
                        }
                }
 

diff --git a/TelegramTizen/src/tg_user_main_view.c b/TelegramTizen/src/tg_user_main_view.c
index 837e927..644985c 100644 (file)
--- a/TelegramTizen/src/tg_user_main_view.c
+++ b/TelegramTizen/src/tg_user_main_view.c
@@ -532,7 +532,7 @@ void on_main_chat_item_selected(void *data, Evas_Object *obj, void *event_info)
                if (sel_item->peer_type == TGL_PEER_CHAT) {
 
                        tg_chat_info_s* chat_info = get_chat_info(sel_item->peer_id);
-                       if (!chat_info) {
+                       if (!chat_info || (chat_info && chat_info->user_list_size <= 0)) {
                                // request chat info
                                //show_toast(ad, "Loading chat info. Please wait.");
                                show_loading_popup(ad);