Merged from tizen_2.4 to tizen_3.0submit/tizen/20151029.065142accepted/tizen/wearable/20151029.090008accepted/tizen/tv/20151029.085956accepted/tizen/mobile/20151029.085946

Change-Id: I45fc8920cfadae1384fe13c540329140edce3c4d

5 files changed, 65 insertions, 29 deletions

diff --git a/email-core/include/email-core-cynara.h b/email-core/include/email-core-cynara.h
index 2f844c3..fd33155 100644..100755
--- a/email-core/include/email-core-cynara.h
+++ b/email-core/include/email-core-cynara.h
@@ -4,7 +4,7 @@
 * Copyright (c) 2015 Samsung Electronics Co., Ltd. All rights reserved.
 *
 * Contact: Sunghyun Kwon <sh0701.kwon@samsung.com>, Minsoo Kim <minnsoo.kim@samsung.com>
-* 
+*
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
@@ -26,11 +26,11 @@
  * @file	email-core-cynara.h
  * @author	sh0701.kwon@samsung.com
  * @version	0.1
- * @brief	This file contains functionality to provide cynara support in email-service. 
+ * @brief	This file contains functionality to provide cynara support in email-service.
  */
 
 INTERNAL_FUNC int emcore_init_cynara();
 
 INTERNAL_FUNC void emcore_finish_cynara();
 
-INTERNAL_FUNC int emcore_check_privilege(int socket_fd);
+INTERNAL_FUNC int emcore_check_privilege(unsigned int socket_fd);
diff --git a/email-core/include/email-core-mail.h b/email-core/include/email-core-mail.h
index 78312db..3ff9400 100755
--- a/email-core/include/email-core-mail.h
+++ b/email-core/include/email-core-mail.h
@@ -4,7 +4,7 @@
 * Copyright (c) 2012 - 2013 Samsung Electronics Co., Ltd. All rights reserved.
 *
 * Contact: Kyuho Jo <kyuho.jo@samsung.com>, Sunghyun Kwon <sh0701.kwon@samsung.com>
-* 
+*
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
@@ -24,9 +24,9 @@
  * File :  email-core-mail.h
  * Desc :  Mail Operation Header
  *
- * Auth : 
+ * Auth :
  *
- * History : 
+ * History :
  *    2006.08.16  :  created
  *****************************************************************************/
 #ifndef __EMAIL_CORE_MESSAGE_H__
@@ -40,7 +40,7 @@ extern "C" {
 
 #ifdef __FEATURE_BULK_DELETE_MOVE_UPDATE_REQUEST_OPTI__
 
-#define MAX_SUBSET_STRING_SIZE 260	
+#define MAX_SUBSET_STRING_SIZE 260
 #define MAX_IMAP_COMMAND_LENGTH 1000
 #define MAX_TAG_SIZE 16
 
@@ -50,9 +50,7 @@ typedef struct _emf_uid_range_set
 	char *uid_range;
 	unsigned long lowest_uid;
 	unsigned long highest_uid;
-	
 	struct _emf_uid_range_set *next;
-	
 } email_uid_range_set;
 
 #endif
@@ -206,7 +204,7 @@ struct _m_mesg {
 	int                      size;            /* text size if not contain multipart */
 };
 
-struct _m_content_info 
+struct _m_content_info
 {
 	int grab_type;	/*  1 :  download text and get attachment names (no saving attachment) -
 							#define GRAB_TYPE_TEXT retrieve text and attachment names */
@@ -220,9 +218,9 @@ struct _m_content_info
 	int content_type; /* 1 : signed */
 	char *sections;
 
-	struct text_data 
+	struct text_data
 	{
-		int   plain_save_status; 
+		int   plain_save_status;
 		char *plain;             /*  body plain text */
 		char *plain_charset;     /*  charset of body text */
 		int   html_save_status;
@@ -275,7 +273,7 @@ INTERNAL_FUNC int emcore_move_mail(char *multi_user_name, int mail_ids[], int nu
 #ifdef __FEATURE_PARTIAL_BODY_DOWNLOAD__
 INTERNAL_FUNC int emcore_insert_pbd_activity(email_event_partial_body_thd *local_activity, int *activity_id, int *err_code) ;
 INTERNAL_FUNC int emcore_delete_pbd_activity(char *multi_user_name, int account_id, int mail_id, int activity_id, int *err_code);
-#endif 
+#endif
 
 INTERNAL_FUNC int emcore_get_mail_contact_info(char *multi_user_name, email_mail_contact_info_t *contact_info, char *full_address, int *err_code);
 INTERNAL_FUNC int emcore_get_mail_contact_info_with_update(char *multi_user_name, email_mail_contact_info_t *contact_info, char *full_address, int mail_id, int *err_code);
@@ -295,7 +293,13 @@ INTERNAL_FUNC int emcore_get_mail_data(char *multi_user_name, int input_mail_id,
 
 INTERNAL_FUNC int emcore_update_mail(char *multi_user_name, email_mail_data_t *input_mail_data, email_attachment_data_t *input_attachment_data_list, int input_attachment_count, email_meeting_request_t* input_meeting_request, int sync_server);
 
-INTERNAL_FUNC int emcore_delete_mails_from_local_storage(char *multi_user_name, int account_id, int *mail_ids, int num, int noti_param_1, int noti_param_2, int *err_code);
+INTERNAL_FUNC int emcore_delete_mails_from_local_storage(char *multi_user_name,
+															int account_id,
+															int *mail_ids,
+															int num,
+															int noti_param_1,
+															int noti_param_2,
+															int *err_code);
 INTERNAL_FUNC int emcore_get_mail_msgno_by_uid(email_account_t *account, email_internal_mailbox_t *mailbox, char *uid, int *msgno, int *err_code);
 INTERNAL_FUNC int emcore_expunge_mails_deleted_flagged_from_local_storage(char *multi_user_name, int input_mailbox_id);
 INTERNAL_FUNC int emcore_expunge_mails_deleted_flagged_from_remote_server(char *multi_user_name, int input_account_id, int input_mailbox_id);
@@ -304,6 +308,7 @@ INTERNAL_FUNC int emcore_expunge_mails_deleted_flagged_from_remote_server(char *
  * Delete mails.
  *
  * @param[in] account_id      Specifies the account id.
+ * @param[in] mailbox_id      Specifies the mailbox id.
  * @param[in] mail_id         Specifies the array for mail id.
  * @param[in] num             Specifies the number of id.
  * @param[in] from_server     Specifies whether mails is deleted from server.
@@ -314,7 +319,15 @@ INTERNAL_FUNC int emcore_expunge_mails_deleted_flagged_from_remote_server(char *
  * @remarks N/A
  * @return This function returns true on success or false on failure.
  */
-INTERNAL_FUNC int emcore_delete_mail(char *multi_user_name, int account_id, int mail_id[], int num, int from_server, int noti_param_1, int noti_param_2, int *err_code);
+INTERNAL_FUNC int emcore_delete_mail(char *multi_user_name,
+									int account_id,
+									int mailbox_id,
+									int mail_id[],
+									int num,
+									int from_server,
+									int noti_param_1,
+									int noti_param_2,
+									int *err_code);
 
 /**
  * Delete mails.
@@ -326,11 +339,11 @@ INTERNAL_FUNC int emcore_delete_mail(char *multi_user_name, int account_id, int
  * @return This function returns true on success or false on failure.
  */
 INTERNAL_FUNC int   emcore_delete_all_mails_of_acount(char *multi_user_name, int input_account_id);
-INTERNAL_FUNC int   emcore_delete_all_mails_of_mailbox(char *multi_user_name, 
-														int input_account_id, 
-														int input_mailbox_id, 
+INTERNAL_FUNC int   emcore_delete_all_mails_of_mailbox(char *multi_user_name,
+														int input_account_id,
+														int input_mailbox_id,
 														int input_mailbox_type,
-														int input_from_server, 
+														int input_from_server,
 														int *err_code);
 
 INTERNAL_FUNC void  emcore_free_mail_data_list(email_mail_data_t **mail_list, int count);
@@ -371,16 +384,25 @@ INTERNAL_FUNC int   emcore_delete_rule(char *multi_user_name, int filter_id);
  * @param[in] cancellable               Specifies the cancellable
  * @param[in] handle                    Specifies the handle for searching mails
  * @remarks N/A
- * @return EMAIL_ERROR_NONE on success or an error code (refer to EMAIL_ERROR_XXX) on failure 
+ * @return EMAIL_ERROR_NONE on success or an error code (refer to EMAIL_ERROR_XXX) on failure
  */
 
-INTERNAL_FUNC int   emcore_search_on_server(char *multi_user_name, 
-											int account_id, 
-											int mailbox_id, 
-											email_search_filter_t *input_search_filter, 
-											int input_search_filter_count, 
+INTERNAL_FUNC int   emcore_search_on_server(char *multi_user_name,
+											int account_id,
+											int mailbox_id,
+											email_search_filter_t *input_search_filter,
+											int input_search_filter_count,
 											int cancellable,
 											int event_handle);
+
+INTERNAL_FUNC int   emcore_search_on_server_ex(char *multi_user_name, 
+												int account_id, 
+												int mailbox_id, 
+												email_search_filter_t *input_search_filter, 
+												int input_search_filter_count, 
+												int cancellable,
+												int event_handle);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/email-core/include/email-core-mailbox-sync.h b/email-core/include/email-core-mailbox-sync.h
index 52d4165..e5b5e22 100755
--- a/email-core/include/email-core-mailbox-sync.h
+++ b/email-core/include/email-core-mailbox-sync.h
@@ -177,7 +177,6 @@ int emcore_get_uid(emcore_uid_list *uid_list, int msgno, char **uid, int *err_co
  * @return This function returns true on success or false on failure.
  */
 int emcore_free_uids(emcore_uid_list *uid_list, int *err_code);
-
 INTERNAL_FUNC int emcore_sync_mail_from_client_to_server(char *multi_user_name, int mail_id);
 INTERNAL_FUNC int emcore_update_attachment_except_inline(char *multi_user_name, 
                                                         struct _m_content_info *cnt_info, 
@@ -188,6 +187,10 @@ INTERNAL_FUNC int emcore_update_attachment_except_inline(char *multi_user_name,
                                                         int *output_attachment_count, 
                                                         int *output_inline_attachment_count);
 
+INTERNAL_FUNC int emcore_sync_mail_by_message_id(char *multi_user_name, 
+													int mail_id, 
+													int mailbox_id, 
+													char **output_server_uid);
 #ifdef __FEATURE_PARTIAL_BODY_DOWNLOAD__
 INTERNAL_FUNC int emcore_download_bulk_partial_mail_body(MAILSTREAM *stream, 
 														email_event_partial_body_thd *pbd_event, 
diff --git a/email-core/include/email-core-mailbox.h b/email-core/include/email-core-mailbox.h
index 3b8aea7..ebb7f7d 100755
--- a/email-core/include/email-core-mailbox.h
+++ b/email-core/include/email-core-mailbox.h
@@ -53,8 +53,19 @@ INTERNAL_FUNC int emcore_remove_connection_info(int account_id);
 #endif /* __FEATURE_KEEP_CONNECTION__ */
 /*  in SMTP case, path argument must be (ENCODED_PATH_SMTP) */
 /*  ex) emcore_connect_to_remote_mailbox(xxx, (char *)ENCODED_PATH_SMTP, xxx, xxx); */
-INTERNAL_FUNC int  emcore_connect_to_remote_mailbox_with_account_info(char *multi_user_name, email_account_t *ref_account, int input_mailbox_id, void **mail_stream, int *err_code);
-INTERNAL_FUNC int  emcore_connect_to_remote_mailbox(char *multi_user_name, int account_id, int input_mailbox_id, void **mail_stream, int *err_code);
+INTERNAL_FUNC int  emcore_connect_to_remote_mailbox_with_account_info(char *multi_user_name, 
+																		email_account_t *ref_account, 
+																		int input_mailbox_id, 
+																		int reusable,
+																		void **mail_stream, 
+																		int *err_code);
+
+INTERNAL_FUNC int  emcore_connect_to_remote_mailbox(char *multi_user_name, 
+													int account_id, 
+													int input_mailbox_id,
+													int reusable,
+													void **mail_stream, 
+													int *err_code);
 INTERNAL_FUNC int  emcore_close_mailbox(int account_id, void *mail_stream);
 #ifdef __FEATURE_KEEP_CONNECTION__
 INTERNAL_FUNC void emcore_close_mailbox_receiving_stream();
diff --git a/email-core/include/email-core-utils.h b/email-core/include/email-core-utils.h
index e78a144..e4c7e77 100755
--- a/email-core/include/email-core-utils.h
+++ b/email-core/include/email-core-utils.h
@@ -235,7 +235,7 @@ INTERNAL_FUNC int emcore_update_db_table_schema(char *multi_user_name);
 #endif /* #ifdef __FEATURE_UPDATE_DB_TABLE_SCHEMA__ */
 INTERNAL_FUNC int emcore_unescape_from_url(char *input_url, char **output_url);
 INTERNAL_FUNC char *__em_get_month_in_string(int month);
-INTERNAL_FUNC int emcore_make_date_string_for_search(time_t input_time, char *output_date_string);
+INTERNAL_FUNC int emcore_make_date_string_for_search(time_t input_time, char **output_date_string);
 INTERNAL_FUNC int emcore_make_uid_range_string(emcore_uid_list *uid_list, int total, char **output_uid_range_string);
 
 INTERNAL_FUNC char* emcore_convert_mutf7_to_utf8(char *mailbox_name);