From 1447f95500834afcb9808637d1ec6fe5a9110c04 Mon Sep 17 00:00:00 2001 From: "polu.sandeep" Date: Thu, 4 Feb 2016 14:49:16 +0900 Subject: [PATCH] Fixed crashes in messaging view and added unsupported image for sticker Change-Id: Iaee432817dda8ef25f21b3332decf203646a751c --- TelegramTizen/res/images/T01_Nocontents_broken.png | Bin 0 -> 5678 bytes TelegramTizen/src/tg_messaging_view.c | 41 ++++++++++++++------- TelegramTizen/src/tg_user_main_view.c | 22 +++++++++++ TelegramTizen/tg_utils/tg_common.h | 2 + 4 files changed, 51 insertions(+), 14 deletions(-) create mode 100755 TelegramTizen/res/images/T01_Nocontents_broken.png diff --git a/TelegramTizen/res/images/T01_Nocontents_broken.png b/TelegramTizen/res/images/T01_Nocontents_broken.png new file mode 100755 index 0000000000000000000000000000000000000000..033ce0f389f045c26897d61dde2b742c57bc41ad GIT binary patch literal 5678 zcmchZ_cxqf*T*j*dQH(s7ott{jLt+5LDW&Bg;AnK?=4C~Mi54{L=wFPiEg5c9z-1_ zgCPi_Ohy^JlY6~uz4!C}0nZO-?X~x{&slqa&%Vz3JbR$8MMup}4FCY0j`kfR03fj? zuFI6<#K@hutBgcL<*jYu3jj1%|1J_BJC_vzs1019&<77(y!^a;UA(+`bf8ck?RRdz5nd|Bdx^XSv)2tfm^3xX zIKIA3Bt;;ilCK+z(LSf1p;+a8hlqWj_wCse0vtssDT(s6Q=kBnpa~jEpj|Jg z{T64!1;eJsYip9IrzGuuske10qpksJAqb5kKc9Qvsf1*KH-F=wSo@f>0x(HFJ*R@Jb0uaq;D@t)6 z3K&d+OL#UCnb2WLSe^i?Axa)^3*Tk*{= zt>)4|d$)h~Z-wE!JxjdwK>yJ-zu4PdB47}Z#gB^JP z)kd@6Wz*~|c6D{;Ublvo{QxZd9NuZ$4m*2%9HB(O<9?u)1)`;FqP575esm5U-Y?`F zO{041Fu#_fMQEV8Ab=+Lx^*0y%tfxP7+&!~+{sQpkSgSRrjd5DM{xY&(ejemDXGem zEb!4yg(Ngpyu`+l^pCC(qq$%EG9Cc-Tf92H3saItxx`{d121+}&$QkO0#VL7X+8k( z@Q#3l$v~ZIALZW>j28K*&T-hmD%MWU*>QQkgN9%y_f$imyHkTvgZfbv=M%e|6)_sZ z@xvcMB6i^KY9N_*Lznn;Z+eMN(?)t_Z-x_l%KQ%D)@Uj+^{5`a409M}S)c}wJ(s$+`F(T!8SN4t zP5~LFIVyQ7(x--*7B(7iyT^uQ#L8gFowB6VP2Xo5EtC|PFv+G^YE%}~8&w-7lw6hZ&xQ=gGVACT zR=&%aV0U40!Mj%f^lN5X$l%gPeuIqWq6CH!?Uxz$T?-MP-X+G^PipgC;4Z z4~@gC?wU#)uar`K&n!1B%X_e8%wY^KRV+y;gO_-jsD6mBID1BJ(RIJe0Q$l3ZH?_p zYcCItBU@dN7_U2BdAxtLZ1;_t;n}bNk(R78P)m|>S!n?TDt%8HR%dkZ%2}0SCCle1 z*H52nUAP!|5b=ER+V0Ken;bV5ZwtcA4TDI=Hj){SS47mBHine~(va8(jz?u8r$Eq4OHcoy$u<)a=(<=^)zUJPzq zKj91qpP8I_oD}15mDB9X(AXRyqB#p)jxvZ@tOlAr2O=ittV} zXCIS9$_9?jLw%R-oZQL0vzP;yG=Nl#-;)(lDU)zhnv-vqX;$r(aJCqlG|w~Fd92F` zkr1hp^L&h2B5WTdEaxrLtc0>;fxp^#2N#TV9>x_jmr7g_Q^-`ipQwNP)o*o1krL)) z!Tqa&f(Yv1PEaSD4?HF}mN)~o7U9z0*A~$WN&A)BDjO`&BV8zlZF(wH`m*&t-Tj3e zg?#4h03Hu1Wra4$*tFD_J{o1bdg=A>P57E~z+i<_T;b#Mo%<_EE;q9Ti0rX4x+}$@9+gCcTVAARf<8@);AoI1h z3O7itl20(2dgc0M(RefR3Z=&9^&%dV2Ibo@WK~4ljSxNe=!YExF&&>t+_z{1%@C-He4D%YPqueye2L0*rX5uOjiawK>Se0e?p>QiZXchjR$=W*wa zwMFrKEBeebQvl6GOVa-^1mQk4lW40}{FzEW3T;YasyFF8>2#`dT8CGydRDe^lzHl5 zQ>pLav)xBJPI^YcPhUUX^nDUEu54nIG9|jDMc>DbI?vk;6sMD;GkuZUyUg!>CwO%O zPql>SqEna)NDi&QP)u+KfZ!mon@0A2_T3!g>{BZTt7d~Cm9eSK#SnrPnwue4M#&=h z-hoNK>)b}nL^^zbG&wILFFZoxc-{{Eu0C|#ab(Gj!E3jf(GN4Od6BfP*s3^Uz2E4! zUyH_Gg*C#ms}*cLHvKl0&eJCh`dV^Zva6b`-J5no+CGOm<2N|+tL>rMw)!k|Az@P0>U@4?cRtdsJ@D

XSPqz3>Yf&dT|3joI#M7se1{N(+&U> zvH*a^E6uj&E|Etqbnd8|1kL?gSP14@2lZm$zQ;i!7U*UnIz+p7`Jdo_IRDD{Z>9ejI&+{J=}KVWKL2x(6fCK?59t@{|4NP9F>Vs( zMu$Nq!By$jxWj{rG$jFxS4mHrj-Rcs!y_wwj{@hoHwnvDLrG|XI8(ME$0lLb&$PR@ z`|;7|UFMld`$&dbJx#A6`!uD>|ro{Cz((o>M+3KM_otWf7xZ zNk4-dks>s99NY=pnEiT%*3D32z%=PMqRggxoobneB1D7*>p!>~yyZi>OatG2=@W}Q zO$2k=TSyF?GGjo3K8Y;LG+HO)`&-p%$>JQ#Gzp=PeKq17tC?(BgQi0@wB)^utS5hk zlR3GvJxr!9vf^%8LMhB}rARKG%owK)A|iTqhSGYFb@h)!J!0Ni_@C^4S~Hdx=WGm~l%lvWll<9C49@Rs2J>BioEswoXPQfOTHBI_P9z~+K znt|CTTSAYsO;bY#PH5{+xjG|ja2QidPRxTBj9l^z`reCIAU`I*8K9TKox0!5R zK&^&TUi!n9Vd&faHpKBuBP?R{8+WqidkQ4yDSa%?s?tR|t9ydda2&oos6*yOoir~9 zp>uhqVyV4ZDS*X#+o)K!WwEw=so^B0`w4$ zRd@xkL5uQ~@YY1Ms{dioio-)f25#ujD55KfqZq`GqUBsP?9wGj+$VPA^MimdaK%v!+v6FY4E)r)_ra*;q`q!r0nZO)l85@4|#xu+sPmKN?JYh+*56Z#4TzBH(G@tF^9yd*w+rq`we9d!`a#7Tkh+*)6R~sgE*nVQk$j0a=CTZt!wg zOnB-Ezi@>7x@H*L3HFpRQ(4J*+a}qTYWFq{A0=v|1lq%ji%}fG{n#5e>FTz}I#v+r ze4F}j9%d$u+dCzKy_VfaQ!Zw@bWcXb1Kaeu?}kAjc+nK)7TGt= zKIUx8gE^%Eg-Q8b5wo}jaid63ye2eA%OZuNUio$f?H*QuJvYMnOL%L=#r((6>IuJ= zpcV3NWcuvc!y@!vm(w(Os~pb zwJd7t1qqd^Ufb^dTVFBz4_n`(0(%1;6&%xId}yd%}l+aC6j79;i@ z;T3M9{uDu%UyItD=~D^FE3p1}Ef2Zk2%*`$NxgATTwGVTGu}4qpcj_N*rligL@AXdQJ3g(R9KGdv{2SKG zkO*FH-pVUHM=-w6R2+l$(e%`gPehfF?*!TgR`YA zh@GTr$RonX^+w*w>0|^!xvI=DRy_=IY_t1#6nWAT(C43`-2c08nO&6!l^Yg>Cigc3 zkp~R$=9&e{5Fg-2+tQvvd&;ND+?L54Cw7FWqbId3ix%{XwRX9n_fO^7TAT9|1F%N?J<`{{QCvVOWnxuz`y4-FQdE?!J%=1oGbBFO@Gt% zd+8Q9dd7&^)xSc(4)foTuAfmnsMa5aH8@QoN+IzWmHq*#LkH7Juz*fP4H@Bq#6Ypb z!>}ROrP?!2Wx=MKEZFoywJ=v&?=)Rek~66Q;Qx^8UzC+7J---BRIs9x?R-Hj`sm5x zJd{@dWesW6(WOK%uuQ{)0usSQhiI2+{t5nv^REozi{au#^;?O_HXd*HzjpGmime_type && strstr(media_msg->mime_type, "webp") != NULL) { - item_to_display = get_image_from_path(img_path, entry); + char *tmp = ui_utils_get_resource(BROKEN_IMAGE); + //item_to_display = get_image_from_path(img_path, entry); + // To be fixed + item_to_display = get_image_from_path(tmp, entry); evas_object_data_set(entry, "image_object", (void*)item_to_display); } else { item_to_display = get_image_from_path(img_path, entry); @@ -1469,7 +1472,11 @@ static void _create_image_item(tg_message_s *msg, Evas_Object *entry, char *imag if (img_path) { if (strstr(img_path, ".webp") != NULL) { - img_item = get_image_from_path(img_path, entry); + char *tmp = ui_utils_get_resource(BROKEN_IMAGE); + LOGE("broken image(webp): %s", tmp); + // To Be Fixed. + //img_item = get_image_from_path(img_path, entry); + img_item = get_image_from_path(tmp, entry); entry_h = 200; } else { if (msg->media_type == tgl_message_media_document) { @@ -2377,10 +2384,13 @@ void on_user_presence_state_changed(appdata_s* ad, int buddy_id) buddies_info *buddy = NULL; EINA_LIST_FREE(names_of_buddies, buddy) { if (buddy) { - if(buddy->name) free(buddy->name); + if(buddy->name) { + free(buddy->name); + } } } names_of_buddies = NULL; + evas_object_data_set(ad->nf, "names_of_buddies", NULL); } for (int i = 0; i < user_list_size; i++) { @@ -3657,16 +3667,14 @@ static Eina_Bool _pop_cb(void *data, Elm_Object_Item *it) } Eina_List *names_of_buddies = evas_object_data_get(ad->nf, "names_of_buddies"); - if(names_of_buddies != NULL){ - buddies_info *buddy = NULL; - EINA_LIST_FREE(names_of_buddies, buddy) { - if (buddy) { - if(buddy->name) free(buddy->name); - } + buddies_info *buddy = NULL; + EINA_LIST_FREE(names_of_buddies, buddy) { + if (buddy) { + free(buddy->name); } - names_of_buddies = NULL; } - + eina_list_free(names_of_buddies); + evas_object_data_set(ad->nf, "names_of_buddies", NULL); return EINA_TRUE; } @@ -3774,6 +3782,9 @@ void launch_messaging_view_cb(appdata_s* ad, int user_id) evas_object_show(layout); peer_with_pic_s *sel_item = eina_list_nth(ad->peer_list, user_id); + if (!sel_item) + return; + tg_peer_info_s* user = sel_item->use_data; /*************************** START: message list ************************************/ @@ -3952,11 +3963,13 @@ void launch_messaging_view_cb(appdata_s* ad, int user_id) snprintf(temp_name, 512, "%s", "unknown"); } } else { - snprintf(temp_name, 512, "%s", get_buddy_phone_num_from_id(sel_item->use_data->peer_id)); + if (phone_num) { + snprintf(temp_name, 512, "%s", phone_num); + } else { + snprintf(temp_name, 512, "%s", "unknown"); + } } free(phone_num); - - } else { char* user_name = replace(sel_item->use_data->print_name, '_', " "); snprintf(temp_name, 512, "%s", user_name); diff --git a/TelegramTizen/src/tg_user_main_view.c b/TelegramTizen/src/tg_user_main_view.c index 47ca331..d2a0511 100644 --- a/TelegramTizen/src/tg_user_main_view.c +++ b/TelegramTizen/src/tg_user_main_view.c @@ -586,6 +586,28 @@ void on_main_chat_item_selected(void *data, Evas_Object *obj, void *event_info) break; } } + + if (buddy_id == -1) { + load_peer_data(ad); + for (int i = 0; i < eina_list_count(ad->peer_list); i++) { + peer_with_pic_s* pic_item = eina_list_nth(ad->peer_list, i); + tg_peer_info_s* item = pic_item->use_data; + + if (item->peer_id == sel_item->peer_id) { + ad->peer_in_cahtting_data = pic_item; + buddy_id = i; + break; + } + } + } + + if (buddy_id == -1) { + show_toast(ad, "unable to get buddy info."); + ad->buddy_in_cahtting_data = NULL; + ad->peer_in_cahtting_data = NULL; + return; + } + ad->main_item_in_cahtting_data = sel_item; #if 0 if (ad->panel) { diff --git a/TelegramTizen/tg_utils/tg_common.h b/TelegramTizen/tg_utils/tg_common.h index 536d665..112a1ad 100644 --- a/TelegramTizen/tg_utils/tg_common.h +++ b/TelegramTizen/tg_utils/tg_common.h @@ -157,6 +157,8 @@ #define LIST_CONTACT_ROUND_MASK_ICON FM_ICON_PATH"/info_page_pic_mask.png" +#define BROKEN_IMAGE FM_ICON_PATH"/T01_Nocontents_broken.png" + #define TG_LIST_OF_COUNTIRES FM_ICON_PATH"countries.txt" -- 2.7.4