From: Ji-hoon Lee <dalton.lee@samsung.com>
Date: Fri, 10 Apr 2020 11:21:57 +0000 (+0900)
Subject: Merge branch 'tizen_5.5' into tizen
X-Git-Tag: submit/tizen/20200528.071502~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F45%2F230545%2F1;p=platform%2Fcore%2Fuifw%2Fmulti-assistant.git

Merge branch 'tizen_5.5' into tizen

Change-Id: Ica10866224fb6872f8a7fe5ac059fd3532396182
---

74159700a3ee8def173a4a377cb284008257ef71
diff --cc client/ma_dbus.c
index 3163676,b2724c5..bbce2ad
--- a/client/ma_dbus.c
+++ b/client/ma_dbus.c
@@@ -1642,163 -1642,3 +1642,163 @@@ int ma_dbus_set_assistant_wakeup_langua
  
  	return 0;
  }
 +
 +int ma_dbus_add_wake_word(int pid, const char* wake_word, const char* language)
 +{
 +	if (0 != __dbus_check()) {
 +		return MA_ERROR_OPERATION_FAILED;
 +	}
 +
 +	DBusMessage* msg;
 +
 +	msg = dbus_message_new_method_call(
 +			  MA_SERVER_SERVICE_NAME,
 +			  MA_SERVER_SERVICE_OBJECT_PATH,
 +			  MA_SERVER_SERVICE_INTERFACE,
 +			  MA_METHOD_ADD_WAKE_WORD);
 +
 +	if (NULL == msg) {
 +		MA_SLOGE("@@ Request multi-assistant add wake word : Fail to make message"); //LCOV_EXCL_LINE
 +		return MA_ERROR_OPERATION_FAILED;
 +	} else {
 +		MA_SLOGD("[DEBUG] multi-assistant add wake word");
 +	}
 +
 +	char* tmp_wake_word = NULL;
 +	if (NULL != wake_word) {
 +		tmp_wake_word = strdup(wake_word);
 +	} else {
 +		tmp_wake_word = strdup("#NULL");
 +	}
 +
 +	char* tmp_language = NULL;
 +	if (NULL != language) {
 +		tmp_language = strdup(language);
 +	} else {
 +		tmp_language = strdup("#NULL");
 +	}
 +
 +	dbus_message_append_args(msg,
 +		DBUS_TYPE_INT32, &pid,
 +		DBUS_TYPE_STRING, &tmp_wake_word,
 +		DBUS_TYPE_STRING, &tmp_language,
 +		DBUS_TYPE_INVALID);
 +
 +	dbus_message_set_no_reply(msg, TRUE);
 +
 +	DBusError error;
 +	dbus_error_init (&error);
 +	if (!dbus_connection_send(g_conn_sender, msg, NULL)) {
 +		if (dbus_error_is_set (&error)) {
 +			MA_SLOGE("[Dbus ERROR] Fail to Send : %s", error.message); //LCOV_EXCL_LINE
 +			dbus_error_free (&error);
 +		} else {
 +			MA_SLOGE("[Dbus ERROR] Fail to Send"); //LCOV_EXCL_LINE
 +		}
 +		if (NULL != tmp_wake_word) {
 +			free(tmp_wake_word);
 +			tmp_wake_word = NULL;
 +		}
 +		if (NULL != tmp_language) {
 +			free(tmp_language);
 +			tmp_language = NULL;
 +		}
 +		return MA_ERROR_OPERATION_FAILED;
 +	} else {
 +		MA_SLOGD("[Dbus DEBUG] Success to Send");
 +		dbus_connection_flush(g_conn_sender);
 +	}
 +
 +	if (NULL != tmp_wake_word) {
 +		free(tmp_wake_word);
 +		tmp_wake_word = NULL;
 +	}
 +	if (NULL != tmp_language) {
 +		free(tmp_language);
 +		tmp_language = NULL;
 +	}
 +
 +	dbus_message_unref(msg);
 +
 +	return 0;
 +}
 +
 +int ma_dbus_remove_wake_word(int pid, const char* wake_word, const char* language)
 +{
 +	if (0 != __dbus_check()) {
 +		return MA_ERROR_OPERATION_FAILED;
 +	}
 +
 +	DBusMessage* msg;
 +
 +	msg = dbus_message_new_method_call(
 +			  MA_SERVER_SERVICE_NAME,
 +			  MA_SERVER_SERVICE_OBJECT_PATH,
 +			  MA_SERVER_SERVICE_INTERFACE,
 +			  MA_METHOD_REMOVE_WAKE_WORD);
 +
 +	if (NULL == msg) {
 +		MA_SLOGE("@@ Request multi-assistant remove wake word : Fail to make message"); //LCOV_EXCL_LINE
 +		return MA_ERROR_OPERATION_FAILED;
 +	} else {
 +		MA_SLOGD("[DEBUG] multi-assistant remove wake word");
 +	}
 +
 +	char* tmp_wake_word = NULL;
 +	if (NULL != wake_word) {
 +		tmp_wake_word = strdup(wake_word);
 +	} else {
 +		tmp_wake_word = strdup("#NULL");
 +	}
 +
 +	char* tmp_language = NULL;
 +	if (NULL != language) {
 +		tmp_language = strdup(language);
 +	} else {
 +		tmp_language = strdup("#NULL");
 +	}
 +
 +	dbus_message_append_args(msg,
 +		DBUS_TYPE_INT32, &pid,
 +		DBUS_TYPE_STRING, &tmp_wake_word,
 +		DBUS_TYPE_STRING, &tmp_language,
 +		DBUS_TYPE_INVALID);
 +
 +	dbus_message_set_no_reply(msg, TRUE);
 +
 +	DBusError error;
 +	dbus_error_init (&error);
 +	if (!dbus_connection_send(g_conn_sender, msg, NULL)) {
 +		if (dbus_error_is_set (&error)) {
 +			MA_SLOGE("[Dbus ERROR] Fail to Send : %s", error.message); //LCOV_EXCL_LINE
 +			dbus_error_free (&error);
 +		} else {
 +			MA_SLOGE("[Dbus ERROR] Fail to Send"); //LCOV_EXCL_LINE
 +		}
 +		if (NULL != tmp_wake_word) {
 +			free(tmp_wake_word);
 +			tmp_wake_word = NULL;
 +		}
 +		if (NULL != tmp_language) {
 +			free(tmp_language);
 +			tmp_language = NULL;
 +		}
 +		return MA_ERROR_OPERATION_FAILED;
 +	} else {
 +		MA_SLOGD("[Dbus DEBUG] Success to Send");
 +		dbus_connection_flush(g_conn_sender);
 +	}
 +
 +	if (NULL != tmp_wake_word) {
 +		free(tmp_wake_word);
 +		tmp_wake_word = NULL;
 +	}
 +	if (NULL != tmp_language) {
 +		free(tmp_language);
 +		tmp_language = NULL;
 +	}
 +
 +	dbus_message_unref(msg);
 +
 +	return 0;
- }
++}
diff --cc packaging/multi-assistant.spec
index 143b30d,1a56a6c..9f4477a
--- a/packaging/multi-assistant.spec
+++ b/packaging/multi-assistant.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:       multi-assistant
  Summary:    Multi Assistant client library and daemon
- Version:    0.2.15
 -Version:    0.2.17
++Version:    0.3.1
  Release:    1
  Group:      Graphics & UI Framework/Voice Framework
  License:    Apache-2.0