Fixed logout and re-login issues.

Change-Id: I6fc0afd3e1bbd9b3485768f9a96bd6e63fe50866

diff --git a/TelegramTizen/src/telegramtizen.c b/TelegramTizen/src/telegramtizen.c
index 47080c7..0fb06f4 100644 (file)
--- a/TelegramTizen/src/telegramtizen.c
+++ b/TelegramTizen/src/telegramtizen.c
@@ -2734,7 +2734,7 @@ static int _on_service_client_msg_received_cb(void *data, bundle *const rec_msg)
        } else if (strcmp(rec_key_val, "logout_completed") == 0) {
 
                free_app_data(app, EINA_TRUE);
-
+               hide_loading_popup(app);
                app->phone_number = NULL;
                app->buddy_list = NULL;
                app->unknown_buddy_list = NULL;
@@ -2766,10 +2766,13 @@ static int _on_service_client_msg_received_cb(void *data, bundle *const rec_msg)
                }
 
                init_service(app);
-               hide_loading_popup(app);
-               elm_naviframe_item_pop(app->nf);
-               ecore_timer_add(1, on_logout_completed, app);
 
+               elm_naviframe_item_pop(app->nf);
+               //ecore_timer_add(1, on_logout_completed, app);
+               elm_naviframe_item_pop(app->nf);
+               app->current_app_state = TG_REGISTRATION_STATE;
+               launch_init_screen(app);
+               return result;
        }
 
        if (strcmp(rec_key_val, "contacts_and_chats_load_done") == 0) {

diff --git a/tg-engine-service/src/tg-engine-service.c b/tg-engine-service/src/tg-engine-service.c
index 07e5e4f..2e8269f 100644 (file)
--- a/tg-engine-service/src/tg-engine-service.c
+++ b/tg-engine-service/src/tg-engine-service.c
@@ -152,6 +152,7 @@ static int _on_tg_server_msg_received_cb(void *data, bundle *const rec_msg)
                tg_data->mhash = NULL;
                tg_data->lazy_init_idler = NULL;
                tg_data->code_response_timer = NULL;
+               tg_data->get_string = NULL;
 
                init_tl_engine(data);
                tgl_login(tgl_engine_get_TLS());