1 files changed, 160 insertions, 68 deletions

diff --git a/email-daemon/email-daemon-etc.c b/email-daemon/email-daemon-etc.c
index 351dfc8..d6e6aa9 100755
--- a/email-daemon/email-daemon-etc.c
+++ b/email-daemon/email-daemon-etc.c
@@ -40,15 +40,16 @@
 #include "email-internal-types.h"
 #include "email-core-event.h"
 #include "email-core-utils.h"
+#include "email-utilities.h"
 #include "email-storage.h"
 
 
-int emdaemon_register_event_callback(emf_action_t action, emf_event_callback callback, void* event_data)
+int emdaemon_register_event_callback(email_action_t action, email_event_callback callback, void* event_data)
 {
 	return emcore_register_event_callback(action, callback, event_data);
 }
 
-int emdaemon_unregister_event_callback(emf_action_t action, emf_event_callback callback)
+int emdaemon_unregister_event_callback(email_action_t action, email_event_callback callback)
 {
 	return emcore_unregister_event_callback(action, callback);
 }
@@ -58,7 +59,7 @@ INTERNAL_FUNC void emdaemon_get_event_queue_status(int* on_sending, int* on_rece
 	emcore_get_event_queue_status(on_sending, on_receiving);
 }
 
-INTERNAL_FUNC int emdaemon_get_pending_job(emf_action_t action, int account_id, int mail_id, emf_event_status_type_t* status)
+INTERNAL_FUNC int emdaemon_get_pending_job(email_action_t action, int account_id, int mail_id, email_event_status_type_t* status)
 {
 	EM_DEBUG_FUNC_BEGIN("action[%d], account_id[%d], mail_id[%d]", action, account_id, mail_id);
 
@@ -70,7 +71,7 @@ INTERNAL_FUNC int emdaemon_cancel_job(int account_id, int handle, int* err_code)
 	EM_DEBUG_FUNC_BEGIN("account_id[%d], handle[%d], err_code[%p]", account_id, handle, err_code);
 	
 	int ret = false;
-	int err = EMF_ERROR_NONE;
+	int err = EMAIL_ERROR_NONE;
 	
 	
 	if (!emcore_cancel_thread(handle, NULL, &err))  {
@@ -93,19 +94,19 @@ INTERNAL_FUNC int emdaemon_cancel_sending_mail_job(int account_id, int mail_id,
 	EM_DEBUG_FUNC_BEGIN("account_id[%d], mail_id[%d], err_code[%p]", account_id, mail_id, err_code);
 	
 	int ret = false;
-	int err = EMF_ERROR_NONE;	
+	int err = EMAIL_ERROR_NONE;	
 	int handle = 0;
-	emf_account_t* ref_account = NULL;
+	email_account_t* ref_account = NULL;
 	
 	if (account_id <= 0)  {
 		EM_DEBUG_EXCEPTION("account_id[%d], mail_id[%d]", account_id, mail_id);
-		err = EMF_ERROR_INVALID_PARAM;
+		err = EMAIL_ERROR_INVALID_PARAM;
 		goto FINISH_OFF;
 	}
 
 #ifdef __FEATURE_PROGRESS_IN_OUTBOX__
 
-	/*	h.gahlaut@samsung.com: Moved this code from email_cancel_send_mail API to email-service engine
+	/*	h.gahlaut@samsung.com: Moved this code from email_cancel_sending_mail API to email-service engine
 		since this code has update DB operation which is failing in context of email application process 
 		with an sqlite error -> sqlite3_step fail:8 */
 		
@@ -118,14 +119,14 @@ INTERNAL_FUNC int emdaemon_cancel_sending_mail_job(int account_id, int mail_id,
 	}
 
 	if (mail_tbl_data) {
-		if (mail_tbl_data->save_status == EMF_MAIL_STATUS_SEND_CANCELED) {
-			EM_DEBUG_EXCEPTION(">>>> EMF_MAIL_STATUS_SEND_CANCELED Already set for Mail ID [ %d ]", mail_id);
+		if (mail_tbl_data->save_status == EMAIL_MAIL_STATUS_SEND_CANCELED) {
+			EM_DEBUG_EXCEPTION(">>>> EMAIL_MAIL_STATUS_SEND_CANCELED Already set for Mail ID [ %d ]", mail_id);
 			goto FINISH_OFF;
 		}
 		else {			
-			mail_tbl_data->save_status = EMF_MAIL_STATUS_SEND_CANCELED;
+			mail_tbl_data->save_status = EMAIL_MAIL_STATUS_SEND_CANCELED;
 
-			if(!emstorage_set_field_of_mails_with_integer_value(mail_tbl_data->account_id, &mail_id, 1, "save_status", EMF_MAIL_STATUS_SEND_CANCELED, true, &err)) {
+			if(!emstorage_set_field_of_mails_with_integer_value(mail_tbl_data->account_id, &mail_id, 1, "save_status", EMAIL_MAIL_STATUS_SEND_CANCELED, true, &err)) {
 				EM_DEBUG_EXCEPTION("emstorage_set_field_of_mails_with_integer_value failed [%d]",err);
 				goto FINISH_OFF;
 			}
@@ -136,29 +137,20 @@ INTERNAL_FUNC int emdaemon_cancel_sending_mail_job(int account_id, int mail_id,
 
 	if(!emcore_get_handle_by_mailId_from_transaction_info(mail_id , &handle )) {
 		EM_DEBUG_EXCEPTION("emcore_get_handle_by_mailId_from_transaction_info failed for mail_id[%d]", mail_id);
-		err = EMF_ERROR_HANDLE_NOT_FOUND;
+		err = EMAIL_ERROR_HANDLE_NOT_FOUND;
 		goto FINISH_OFF;
 	}
 
 	if (!(ref_account = emdaemon_get_account_reference(account_id)))  {
 		EM_DEBUG_EXCEPTION("emdaemon_get_account_reference failed [%d]", account_id);
-		err = EMF_ERROR_INVALID_ACCOUNT;
+		err = EMAIL_ERROR_INVALID_ACCOUNT;
 		goto FINISH_OFF;
 	}
 
-	switch (ref_account->account_bind_type)  {
-		case EMF_BIND_TYPE_EM_CORE :
-			if (!emcore_cancel_send_mail_thread(handle, NULL, &err))  {
-				EM_DEBUG_EXCEPTION("emcore_cancel_send_mail_thread failed [%d]", err);
-				goto FINISH_OFF;
-			}
-			break;
-
-		default:
-			EM_DEBUG_EXCEPTION("unknown account bind type...");
-			err = EMF_ERROR_INVALID_ACCOUNT;
-			goto FINISH_OFF;
-	}	
+	if (!emcore_cancel_send_mail_thread(handle, NULL, &err))  {
+		EM_DEBUG_EXCEPTION("emcore_cancel_send_mail_thread failed [%d]", err);
+		goto FINISH_OFF;
+	}
 	
 	if(!emcore_delete_transaction_info_by_mailId(mail_id))
 		EM_DEBUG_EXCEPTION("emcore_delete_transaction_info_by_mailId failed for mail_id[%d]", mail_id);
@@ -178,53 +170,153 @@ FINISH_OFF:
 	return ret;
 }	
 
-INTERNAL_FUNC int emdaemon_search_mail_on_server(int input_account_id, const char *input_mailbox_name, email_search_filter_t *input_search_filter, int input_search_filter_count, unsigned int *output_handle)
+static char *_make_criteria_to_search_filter(email_search_filter_t *search_filter, int search_filter_count, int *err_code)
 {
-	EM_DEBUG_FUNC_BEGIN("input_account_id [%d], input_mailbox_name [%p], input_search_filter [%p], input_search_filter_count [%d], output_handle [%p]", input_account_id, input_mailbox_name, input_search_filter, input_search_filter_count, output_handle);
-	int error = EMF_ERROR_NONE;
+	EM_DEBUG_FUNC_BEGIN("search_filter : [%p], search_filter_count : [%d]", search_filter, search_filter_count);
+
 	int i = 0;
+	int err = EMAIL_ERROR_NONE;
+	char *criteria = NULL;
+	char *temp_criteria = NULL;
+	
+	if (search_filter == NULL || search_filter_count < 0) {
+		EM_DEBUG_EXCEPTION("Invalid paramter");
+		err = EMAIL_ERROR_INVALID_PARAM;
+		goto FINISH_OFF;
+	}
+
+	criteria = (char *)em_malloc(STRING_LENGTH_FOR_DISPLAY * search_filter_count);
+	if (criteria == NULL) {
+		EM_DEBUG_EXCEPTION("em_malloc failed");
+		err = EMAIL_ERROR_OUT_OF_MEMORY;
+		goto FINISH_OFF;
+	}
+
+	temp_criteria = (char *)em_malloc(STRING_LENGTH_FOR_DISPLAY);
+	if (temp_criteria == NULL) {
+		EM_DEBUG_EXCEPTION("em_malloc failed");
+		err = EMAIL_ERROR_OUT_OF_MEMORY;
+		goto FINISH_OFF;
+	}
+
+	for (i = 0; i < search_filter_count; i++) {
+		EM_DEBUG_LOG("search_filter_type [%d]", search_filter[i].search_filter_type);
+		memset(temp_criteria, 0x00, STRING_LENGTH_FOR_DISPLAY);
+
+		switch (search_filter[i].search_filter_type) {
+		case EMAIL_SEARCH_FILTER_TYPE_MESSAGE_NO :
+		case EMAIL_SEARCH_FILTER_TYPE_UID :
+		case EMAIL_SEARCH_FILTER_TYPE_SIZE_LARSER :
+		case EMAIL_SEARCH_FILTER_TYPE_SIZE_SMALLER :
+		case EMAIL_SEARCH_FILTER_TYPE_FLAGS_ANSWERED :
+		case EMAIL_SEARCH_FILTER_TYPE_FLAGS_DELETED :
+		case EMAIL_SEARCH_FILTER_TYPE_FLAGS_DRAFT :
+		case EMAIL_SEARCH_FILTER_TYPE_FLAGS_FLAGED :
+		case EMAIL_SEARCH_FILTER_TYPE_FLAGS_RECENT :
+		case EMAIL_SEARCH_FILTER_TYPE_FLAGS_SEEN :
+			EM_DEBUG_LOG("integer_type_key_value [%d]", search_filter[i].search_filter_key_value.integer_type_key_value);
+			break;
+
+		case EMAIL_SEARCH_FILTER_TYPE_BCC :
+		case EMAIL_SEARCH_FILTER_TYPE_CC :
+		case EMAIL_SEARCH_FILTER_TYPE_TO :
+		case EMAIL_SEARCH_FILTER_TYPE_MESSAGE_ID :
+			EM_DEBUG_LOG("string_type_key_value [%s]", search_filter[i].search_filter_key_value.string_type_key_value);
+			break;
+
+		case EMAIL_SEARCH_FILTER_TYPE_FROM :
+			EM_DEBUG_LOG("string_type_key_value [%s]", search_filter[i].search_filter_key_value.string_type_key_value);
+			SNPRINTF(temp_criteria, STRING_LENGTH_FOR_DISPLAY, "from %s ", search_filter[i].search_filter_key_value.string_type_key_value);
+			strncat(criteria, temp_criteria, strlen(temp_criteria));
+			break;
+
+		case EMAIL_SEARCH_FILTER_TYPE_SUBJECT :
+			EM_DEBUG_LOG("string_type_key_value [%s]", search_filter[i].search_filter_key_value.string_type_key_value);
+			SNPRINTF(temp_criteria, STRING_LENGTH_FOR_DISPLAY, "subject %s ", search_filter[i].search_filter_key_value.string_type_key_value);
+			strncat(criteria, temp_criteria, strlen(temp_criteria));
+			break;
+
+		case EMAIL_SEARCH_FILTER_TYPE_KEYWORD :
+			EM_DEBUG_LOG("string_type_key_value [%s]", search_filter[i].search_filter_key_value.string_type_key_value);
+			SNPRINTF(temp_criteria, STRING_LENGTH_FOR_DISPLAY, "keyword %s ", search_filter[i].search_filter_key_value.string_type_key_value);
+			strncat(criteria, temp_criteria, strlen(temp_criteria));
+			break;
+
+		case EMAIL_SEARCH_FILTER_TYPE_SENT_DATE_BEFORE :
+		case EMAIL_SEARCH_FILTER_TYPE_SENT_DATE_ON :
+		case EMAIL_SEARCH_FILTER_TYPE_SENT_DATE_SINCE :
+			EM_DEBUG_LOG("time_type_key_value [%d]", search_filter[i].search_filter_key_value.time_type_key_value);
+			break;
 
-	for(i = 0; i < input_search_filter_count; i++) {
-		EM_DEBUG_LOG("search_filter_type [%d]", input_search_filter->search_filter_type);
-
-		switch(input_search_filter->search_filter_type) {
-			case EMAIL_SEARCH_FILTER_TYPE_MESSAGE_NO       :
-			case EMAIL_SEARCH_FILTER_TYPE_UID              :
-			case EMAIL_SEARCH_FILTER_TYPE_SIZE_LARSER      :
-			case EMAIL_SEARCH_FILTER_TYPE_SIZE_SMALLER     :
-			case EMAIL_SEARCH_FILTER_TYPE_FLAGS_ANSWERED   :
-			case EMAIL_SEARCH_FILTER_TYPE_FLAGS_DELETED    :
-			case EMAIL_SEARCH_FILTER_TYPE_FLAGS_DRAFT      :
-			case EMAIL_SEARCH_FILTER_TYPE_FLAGS_FLAGED     :
-			case EMAIL_SEARCH_FILTER_TYPE_FLAGS_RECENT     :
-			case EMAIL_SEARCH_FILTER_TYPE_FLAGS_SEEN       :
-				EM_DEBUG_LOG("integer_type_key_value [%d]", input_search_filter->search_filter_key_value.integer_type_key_value);
-				break;
-
-			case EMAIL_SEARCH_FILTER_TYPE_BCC              :
-			case EMAIL_SEARCH_FILTER_TYPE_CC               :
-			case EMAIL_SEARCH_FILTER_TYPE_FROM             :
-			case EMAIL_SEARCH_FILTER_TYPE_KEYWORD          :
-			case EMAIL_SEARCH_FILTER_TYPE_SUBJECT          :
-			case EMAIL_SEARCH_FILTER_TYPE_TO               :
-			case EMAIL_SEARCH_FILTER_TYPE_MESSAGE_ID       :
-				EM_DEBUG_LOG("string_type_key_value [%s]", input_search_filter->search_filter_key_value.string_type_key_value);
-				break;
-
-			case EMAIL_SEARCH_FILTER_TYPE_SENT_DATE_BEFORE :
-			case EMAIL_SEARCH_FILTER_TYPE_SENT_DATE_ON     :
-			case EMAIL_SEARCH_FILTER_TYPE_SENT_DATE_SINCE  :
-				/* EM_DEBUG_LOG("time_type_key_value [%d]", input_search_filter->search_filter_key_value.time_type_key_value.); */
-				break;
-			default :
-				EM_DEBUG_LOG("not proper search_filter_type [%d]", input_search_filter->search_filter_type);
-				return FALSE;
+		default :
+			EM_DEBUG_EXCEPTION("Invalid list_filter_item_type [%d]", search_filter);
+			err = EMAIL_ERROR_INVALID_PARAM;
+			goto FINISH_OFF;
 		}
+
 	}
 
+FINISH_OFF:
+	
+	if (temp_criteria)
+		EM_SAFE_FREE(temp_criteria);
+
+	if (err_code != NULL)
+		*err_code = err;
+		
+	EM_DEBUG_FUNC_END();
+	return criteria;
+}
+
+INTERNAL_FUNC int emdaemon_search_mail_on_server(int input_account_id, int input_mailbox_id, email_search_filter_t *input_search_filter, int input_search_filter_count, unsigned int *output_handle, int *err_code)
+{
+	EM_DEBUG_FUNC_BEGIN("input_account_id [%d], mailbox_id [%d], input_search_filter [%p], input_search_filter_count [%d], output_handle [%p]", input_account_id, input_mailbox_id, input_search_filter, input_search_filter_count, output_handle);
+	int error = EMAIL_ERROR_NONE;
+	int ret = false;
+	char *criteria = NULL;
+	
+	if (input_mailbox_id == 0 || input_account_id < 0) {
+		EM_DEBUG_EXCEPTION("Invalid parameter");
+		error = EMAIL_ERROR_INVALID_PARAM;
+		goto FINISH_OFF;
+	}
+
+	email_event_t event_data;
+
+	memset(&event_data, 0x00, sizeof(email_event_t));
+
+	criteria = _make_criteria_to_search_filter(input_search_filter, input_search_filter_count, &error);
+	if (criteria == NULL) {
+		EM_DEBUG_EXCEPTION("_make_criteria_to_search_filter failed");
+		goto FINISH_OFF;
+	}
+		
+	event_data.type = EMAIL_EVENT_SEARCH_ON_SERVER;
+	event_data.account_id = input_account_id;
+	event_data.event_param_data_1 = EM_SAFE_STRDUP(criteria);
+	event_data.event_param_data_4 = input_mailbox_id;
+
+	if (!emcore_insert_event(&event_data, (int *)output_handle, &error)) {
+		EM_DEBUG_EXCEPTION("emcore_insert_event failed [%d]", error);
+		error = EMAIL_ERROR_NONE;
+		goto FINISH_OFF;
+	}
+
+	ret = true;
+
+FINISH_OFF:
+	if (!ret) {
+		EM_SAFE_FREE(event_data.event_param_data_1);
+		EM_SAFE_FREE(event_data.event_param_data_2);
+	}
+
+	EM_SAFE_FREE(criteria);
+	
+	if (err_code != NULL)
+		*err_code = error;
 
 	EM_DEBUG_FUNC_END("error [%d]", error);
-	return error;
+	return ret;
 }
 
 INTERNAL_FUNC int emdaemon_clear_all_mail_data(int* err_code)
@@ -232,7 +324,7 @@ INTERNAL_FUNC int emdaemon_clear_all_mail_data(int* err_code)
 	EM_DEBUG_FUNC_BEGIN();
 	
 	int ret = false;
-	int error = EMF_ERROR_NONE;
+	int error = EMAIL_ERROR_NONE;
 	
 	if (emdaemon_initialize(&error)) {
 		if (!emstorage_clear_mail_data(true, &error))
@@ -249,7 +341,7 @@ INTERNAL_FUNC int emdaemon_clear_all_mail_data(int* err_code)
 
 	ret = true;
 
-	if (!emstorage_create_table(EMF_CREATE_DB_NORMAL, &error)) 
+	if (!emstorage_create_table(EMAIL_CREATE_DB_NORMAL, &error)) 
 		EM_DEBUG_EXCEPTION("emstorage_create_table failed [%d]", error);
 	
 	emdaemon_finalize(&error);