Changed date format in message

Change-Id: I8966ef3d3f59595b8d6930678845ccc7d61d159a

diff --git a/TelegramTizen/src/server_requests.c b/TelegramTizen/src/server_requests.c
index eb17f29..46f6dc6 100644 (file)
--- a/TelegramTizen/src/server_requests.c
+++ b/TelegramTizen/src/server_requests.c
@@ -12,6 +12,7 @@ static void failed_to_communicate_server(appdata_s *ad)
        if (!ad)
                return;
 
+       show_toast(ad, "server is not ready");
        hide_loading_popup(ad);
        //show_toast(ad, "Check your network settings.");
 }

diff --git a/TelegramTizen/src/tg_db_wrapper.c b/TelegramTizen/src/tg_db_wrapper.c
index c84dc56..4554394 100644 (file)
--- a/TelegramTizen/src/tg_db_wrapper.c
+++ b/TelegramTizen/src/tg_db_wrapper.c
@@ -1897,6 +1897,7 @@ int insert_current_date_to_table(char* tb_name)
                        return -1;
                } else {
                        int cur_time = time(NULL);
+#if 0
                        time_t t = cur_time;
 
                        char *format = NULL;
@@ -1912,7 +1913,11 @@ int insert_current_date_to_table(char* tb_name)
                                                "using: '%s'\n",
                                                sizeof(res), format);
                        }
-
+#else
+                       // convert time to string
+                       char res[256];
+                       sprintf(res, "%d", cur_time);
+#endif
                        srand(time(NULL));
                        int r = rand();
                        tg_message_s date_msg;
@@ -1932,6 +1937,7 @@ int insert_current_date_to_table(char* tb_name)
 
        } else {
                int cur_time = time(NULL);
+#if 0
                time_t t = cur_time;
 
                char *format = NULL;
@@ -1947,6 +1953,11 @@ int insert_current_date_to_table(char* tb_name)
                                        "using: '%s'\n",
                                        sizeof(res), format);
                }
+#else
+               // convert time to string
+               char res[256];
+               sprintf(res, "%d", cur_time);
+#endif
                srand(time(NULL));
                int r = rand();
                tg_message_s date_msg;

diff --git a/TelegramTizen/src/tg_messaging_view.c b/TelegramTizen/src/tg_messaging_view.c
index 46eb476..9db4050 100644 (file)
--- a/TelegramTizen/src/tg_messaging_view.c
+++ b/TelegramTizen/src/tg_messaging_view.c
@@ -1412,7 +1412,26 @@ Evas_Object *on_message_item_content_get_cb(void *data, Evas_Object *obj, const
                                evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
                                evas_object_show(layout);
 
-                               elm_object_part_text_set(layout, "elm.text", msg->message);
+                               // convert date from string to int
+                               char *date_str = msg->message;
+                               int date_num = atoi(date_str);
+
+                               // convert date format
+                               time_t t = date_num;
+                               char *format = NULL;
+                               format = "%a, %e %b %Y";
+                               struct tm lt;
+                               char res[256];
+                               (void) localtime_r(&t, &lt);
+
+                               if (strftime(res, sizeof(res), format, &lt) == 0) {
+                                       (void) fprintf(stderr,  "strftime(3): cannot format supplied "
+                                                       "date/time into buffer of size %u "
+                                                       "using: '%s'\n",
+                                                       sizeof(res), format);
+                               }
+
+                               elm_object_part_text_set(layout, "elm.text", res);
                                return layout;
                        } else if (msg->service == 1) {
                                Evas_Object *layout = NULL;

diff --git a/TelegramTizen/src/tg_registration.c b/TelegramTizen/src/tg_registration.c
index e79e069..4578a11 100644 (file)
--- a/TelegramTizen/src/tg_registration.c
+++ b/TelegramTizen/src/tg_registration.c
@@ -59,8 +59,8 @@ static void on_naviframe_done_clicked(void *data, Evas_Object *obj, void *event_
                strcpy(phone_number, cunt_code);
                strcat(phone_number, phone_num);
                ad->phone_number = strdup(phone_number);
-               send_request_for_registration(ad, ad->service_client, ad->phone_number, EINA_TRUE);
                show_loading_popup(ad);
+               send_request_for_registration(ad, ad->service_client, ad->phone_number, EINA_TRUE);
        } else {
 
        }

diff --git a/tg-engine-service/src/tg_db_wrapper.c b/tg-engine-service/src/tg_db_wrapper.c
index 5a1fe7c..3be073c 100644 (file)
--- a/tg-engine-service/src/tg_db_wrapper.c
+++ b/tg-engine-service/src/tg_db_wrapper.c
@@ -722,10 +722,11 @@ int set_date_item_to_table(char* tb_name, int recent_msg_date)
                } else {
                        int cur_time = recent_msg_date;
                        time_t t = cur_time;
-
+                       char res[256];
+                       sprintf(res, "%d", cur_time);
+#if 0
                        char *format = NULL;
                        format = "%a, %d%b. %Y";
-
                        struct tm lt;
                        char res[256];
                        (void) localtime_r(&t, &lt);
@@ -736,7 +737,7 @@ int set_date_item_to_table(char* tb_name, int recent_msg_date)
                                                "using: '%s'\n",
                                                sizeof(res), format);
                        }
-
+#endif
                        srand(time(NULL));
                        int r = rand();
                        struct tgl_message date_msg;
@@ -762,7 +763,10 @@ int set_date_item_to_table(char* tb_name, int recent_msg_date)
        } else {
                int cur_time = recent_msg_date;
                time_t t = cur_time;
+               char res[256];
+               sprintf(res, "%d", cur_time);
 
+#if 0
                char *format = NULL;
                format = "%a, %d%b. %Y";
 
@@ -776,6 +780,7 @@ int set_date_item_to_table(char* tb_name, int recent_msg_date)
                                        "using: '%s'\n",
                                        sizeof(res), format);
                }
+#endif
                srand(time(NULL));
                int r = rand();
                struct tgl_message date_msg;
@@ -823,7 +828,9 @@ int update_current_date_to_table(char* tb_name, int recent_msg_date)
                } else {
                        int cur_time = time(NULL);
                        time_t t = cur_time;
-
+                       char res[256];
+                       sprintf(res, "%d", cur_time);
+#if 0
                        char *format = NULL;
                        format = "%a, %d%b. %Y";
 
@@ -833,11 +840,11 @@ int update_current_date_to_table(char* tb_name, int recent_msg_date)
 
                        if (strftime(res, sizeof(res), format, &lt) == 0) {
                                (void) fprintf(stderr,  "strftime(3): cannot format supplied "
-                                               "date/time into buffer of size %u "
+                                               "date/time into buffer of size %u "strftime
                                                "using: '%s'\n",
                                                sizeof(res), format);
                        }
-
+#endif
                        srand(time(NULL));
                        int r = rand();
                        struct tgl_message date_msg;
@@ -862,7 +869,10 @@ int update_current_date_to_table(char* tb_name, int recent_msg_date)
        } else {
                int cur_time = time(NULL);
                time_t t = cur_time;
+               char res[256];
+               sprintf(res, "%d", cur_time);
 
+#if 0
                char *format = NULL;
                format = "%a, %d%b. %Y";
 
@@ -876,6 +886,7 @@ int update_current_date_to_table(char* tb_name, int recent_msg_date)
                                        "using: '%s'\n",
                                        sizeof(res), format);
                }
+#endif
                srand(time(NULL));
                int r = rand();
                struct tgl_message date_msg;
@@ -924,7 +935,7 @@ int insert_current_date_to_table(char* tb_name)
                } else {
                        int cur_time = time(NULL);
                        time_t t = cur_time;
-
+#if 0
                        char *format = NULL;
                        format = "%a, %d%b. %Y";
 
@@ -938,7 +949,11 @@ int insert_current_date_to_table(char* tb_name)
                                                "using: '%s'\n",
                                                sizeof(res), format);
                        }
-
+#else
+                       // convert time to string
+                       char res[256];
+                       sprintf(res, "%d", cur_time);
+#endif
                        srand(time(NULL));
                        int r = rand();
                        struct tgl_message date_msg;
@@ -963,7 +978,7 @@ int insert_current_date_to_table(char* tb_name)
        } else {
                int cur_time = time(NULL);
                time_t t = cur_time;
-
+#if 0
                char *format = NULL;
                format = "%a, %d%b. %Y";
 
@@ -977,6 +992,11 @@ int insert_current_date_to_table(char* tb_name)
                                        "using: '%s'\n",
                                        sizeof(res), format);
                }
+#else
+               // convert time to string
+               char res[256];
+               sprintf(res, "%d", cur_time);
+#endif
                srand(time(NULL));
                int r = rand();
                struct tgl_message date_msg;