Fix restore logic

[platform/core/uifw/stt.git] / client / stt_dbus.c

diff --git a/client/stt_dbus.c b/client/stt_dbus.c
index e5e7e3b..f6ddbf0 100644 (file)
--- a/client/stt_dbus.c
+++ b/client/stt_dbus.c
@@ -43,6 +43,8 @@ extern int __stt_cb_set_state(int uid, int state);
 
 extern int __stt_cb_set_volume(int uid, float volume);
 
+extern int __stt_cb_speech_status(int uid, int status);
+
 char* __stt_get_service_name(char* engine_id)
 {
        char* service_name = NULL;
@@ -58,7 +60,7 @@ char* __stt_get_service_name(char* engine_id)
                return NULL;
        }
        SLOG(LOG_DEBUG, TAG_STTC, "[DBUS-BUXTON2] buxton_open: %d", ret);
-       bux_layer = buxton_create_layer("user");
+       bux_layer = buxton_create_layer("system");
        if (NULL == bux_layer) {
                SLOG(LOG_ERROR, TAG_STTC, "[DBUS-BUXTON2] buxton_create_layer FAIL");
                buxton_close(bux_cli);
@@ -160,7 +162,7 @@ char* __stt_get_service_object(char* engine_id)
                SLOG(LOG_ERROR, TAG_STTC, "[DBUS-BUXTON2] Fail to open buxton client, ret(%d)", ret);
                return NULL;
        }
-       bux_layer = buxton_create_layer("user");
+       bux_layer = buxton_create_layer("system");
        if (NULL == bux_layer) {
                SLOG(LOG_DEBUG, TAG_STTC, "[DBUS-BUXTON2] buxton_create_layer FAIL");
                buxton_close(bux_cli);
@@ -261,7 +263,7 @@ char* __stt_get_service_interface(char* engine_id)
                SLOG(LOG_ERROR, TAG_STTC, "[DBUS-BUXTON2] Fail to open buxton client, ret(%d)", ret);
                return NULL;
        }
-       bux_layer = buxton_create_layer("user");
+       bux_layer = buxton_create_layer("system");
        if (NULL == bux_layer) {
                SLOG(LOG_ERROR, TAG_STTC, "[DBUS-BUXTON2] buxton_create_layer FAIL");
                buxton_close(bux_cli);
@@ -336,7 +338,7 @@ char* __stt_get_service_interface(char* engine_id)
        }
 
        char* ret_char = strchr(service_interface, '-');
-       while(NULL != ret_char) {
+       while (NULL != ret_char) {
                ret_char[0] = '_';
                ret_char = strchr(service_interface, '-');
        }
@@ -587,6 +589,52 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle
                        SLOG(LOG_DEBUG, TAG_STTC, " ");
                } /* STTD_METHOD_ERROR */
 
+               else if (dbus_message_is_signal(msg, if_name, STTD_METHOD_SPEECH_STATUS)) {
+                       SLOG(LOG_DEBUG, TAG_STTC, "===== Speech status");
+                       int uid = 0;
+                       int status = -1;
+
+                       dbus_message_get_args(msg, &err,
+                               DBUS_TYPE_INT32, &uid,
+                               DBUS_TYPE_INT32, &status,
+                               DBUS_TYPE_INVALID);
+
+                       if (dbus_error_is_set(&err)) {
+                               SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Get arguments error (%s)", err.message);
+                               dbus_error_free(&err);
+                       }
+
+                       if (uid > 0 && status >= 0) {
+                               SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt speech status : uid(%d), status(%d)", uid, status);
+                               __stt_cb_speech_status(uid, status);
+                       } else {
+                               SLOG(LOG_ERROR, TAG_STTC, "<<<< stt set status : invalid uid or status");
+                       }
+
+                       SLOG(LOG_DEBUG, TAG_STTC, "=====");
+                       SLOG(LOG_DEBUG, TAG_STTC, " ");
+               } /* STTD_METHOD_SPEECH_STATUS */
+
+               else if (dbus_message_is_signal(msg, "org.freedesktop.DBus", "NameOwnerChanged")) {
+                       SLOG(LOG_DEBUG, TAG_STTC, "===== Owner Changed");
+                       DBusError err;
+                       dbus_error_init(&err);
+
+                       /* remove a rule for daemon error */
+                       char rule_err[256] = {0, };
+                       snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", g_server_service_interface);
+                       dbus_bus_remove_match(g_conn_listener, rule_err, &err);
+                       dbus_connection_flush(g_conn_listener);
+                       if (dbus_error_is_set(&err)) {
+                               SLOG(LOG_ERROR, TAG_STTC, "Match Error (%s)", err.message);
+                               dbus_error_free(&err);
+                       }
+
+                       __stt_cb_error(-1, STT_ERROR_SERVICE_RESET, "Daemon Reset");
+                       SLOG(LOG_DEBUG, TAG_STTC, "=====");
+                       SLOG(LOG_DEBUG, TAG_STTC, " ");
+               } /* NameOwnerChanged */
+
                else {
                        SLOG(LOG_DEBUG, TAG_STTC, "Message is NOT valid");
                        dbus_message_unref(msg);
@@ -775,7 +823,7 @@ int stt_dbus_request_hello(int uid)
        int result = 0;
 
        if (g_conn_sender) {
-               if(NULL != client) {
+               if (NULL != client) {
                        __stt_dbus_service_free();
 
                        if (NULL == client->current_engine_id) {
@@ -795,7 +843,6 @@ int stt_dbus_request_hello(int uid)
                                        SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to allocate memory");
                                        return STT_ERROR_OUT_OF_MEMORY;
                                }
-                               SLOG(LOG_DEBUG, TAG_STTC, "[DBUS] service name: %s, object path: %s, interface: %s", g_server_service_name, g_server_service_object, g_server_service_interface);
 
                                msg = dbus_message_new_method_call(
                                        STT_SERVER_SERVICE_NAME,
@@ -841,12 +888,12 @@ int stt_dbus_request_hello(int uid)
        }
 
        if (NULL == msg) {
-               SLOG(LOG_ERROR, TAG_STTC, ">>>> Request stt hello : Fail to make message");
-               return STT_ERROR_OPERATION_FAILED;
+//             SLOG(LOG_ERROR, TAG_STTC, ">>>> Request stt hello : Fail to make message");
+               result = stt_dbus_reconnect();
+               if (0 != result)
+                       return STT_ERROR_OPERATION_FAILED;
        }
 
-
-
        if (g_conn_sender) {
                result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, g_waiting_short_time, &err);
                dbus_message_unref(msg);
@@ -869,11 +916,11 @@ int stt_dbus_request_hello(int uid)
                                dbus_error_free(&err);
                        }
 
-                       SLOG(LOG_ERROR, TAG_STTC, "STT_ERROR_TIME_OUT");
                        result = STT_ERROR_TIMED_OUT;
                }
        } else {
                SLOG(LOG_WARN, TAG_STTC, "[WARN] dbus connection handle is null (%p)", g_conn_sender);
+               stt_dbus_reconnect();
                result = STT_ERROR_OPERATION_FAILED;
        }
 
@@ -919,12 +966,17 @@ int stt_dbus_request_initialize(int uid, bool* silence_supported, bool* credenti
                }
 
                if (NULL != result_msg) {
+                       int int_silence_supported = 0;
+                       int int_credential_needed = 0;
                        dbus_message_get_args(result_msg, &err,
                                DBUS_TYPE_INT32, &result,
-                               DBUS_TYPE_INT32, silence_supported,
-                               DBUS_TYPE_INT32, credential_needed,
+                               DBUS_TYPE_INT32, &int_silence_supported,
+                               DBUS_TYPE_INT32, &int_credential_needed,
                                DBUS_TYPE_INVALID);
 
+                       *silence_supported = (bool)(int_silence_supported);
+                       *credential_needed = (bool)(int_credential_needed);
+
                        if (dbus_error_is_set(&err)) {
                                SLOG(LOG_ERROR, TAG_STTC, "<<<< Get arguments error (%s)", err.message);
                                dbus_error_free(&err);
@@ -934,6 +986,18 @@ int stt_dbus_request_initialize(int uid, bool* silence_supported, bool* credenti
                        if (0 == result) {
                                SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt initialize : result = %d, silence(%d), credential(%d)",
                                        result, *silence_supported, *credential_needed);
+
+                               /* add a rule for daemon error */
+                               char rule_err[256] = {0, };
+                               snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", g_server_service_interface);
+                               dbus_bus_add_match(g_conn_listener, rule_err, &err);
+                               dbus_connection_flush(g_conn_listener);
+
+                               if (dbus_error_is_set(&err)) {
+                                       SLOG(LOG_ERROR, TAG_STTC, "Match Error (%s)", err.message);
+                                       dbus_error_free(&err);
+                                       return STT_ERROR_OPERATION_FAILED;
+                               }
                        } else {
                                SLOG(LOG_ERROR, TAG_STTC, "<<<< stt initialize : result = %d", result);
                        }
@@ -956,6 +1020,19 @@ int stt_dbus_request_finalize(int uid)
 {
        DBusMessage* msg;
 
+       DBusError err;
+       dbus_error_init(&err);
+
+       /* remove a rule for daemon error */
+       char rule_err[256] = {0, };
+       snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", g_server_service_interface);
+       dbus_bus_remove_match(g_conn_listener, rule_err, &err);
+       dbus_connection_flush(g_conn_listener);
+       if (dbus_error_is_set(&err)) {
+               SLOG(LOG_ERROR, TAG_STTC, "Match Error (%s)", err.message);
+               dbus_error_free(&err);
+       }
+
        SLOG(LOG_DEBUG, TAG_STTC, "[dbus_info] service name: %s, service object: %s, service interface: %s", g_server_service_name, g_server_service_object, g_server_service_interface);
 
        msg = dbus_message_new_method_call(
@@ -973,9 +1050,6 @@ int stt_dbus_request_finalize(int uid)
 
        dbus_message_append_args(msg, DBUS_TYPE_INT32, &uid, DBUS_TYPE_INVALID);
 
-       DBusError err;
-       dbus_error_init(&err);
-
        DBusMessage* result_msg;
        int result = STT_ERROR_OPERATION_FAILED;
 
@@ -1050,12 +1124,18 @@ int stt_dbus_request_set_current_engine(int uid, const char* engine_id, bool* si
        }
 
        if (NULL != result_msg) {
+               int int_silence_supported = 0;
+               int int_credential_needed = 0;
+
                dbus_message_get_args(result_msg, &err, 
                        DBUS_TYPE_INT32, &result, 
-                       DBUS_TYPE_INT32, silence_supported,
-                       DBUS_TYPE_INT32, credential_needed,
+                       DBUS_TYPE_INT32, &int_silence_supported,
+                       DBUS_TYPE_INT32, &int_credential_needed,
                        DBUS_TYPE_INVALID);
 
+               *silence_supported = (bool)(int_silence_supported);
+               *credential_needed = (bool)(int_credential_needed);
+
                if (dbus_error_is_set(&err)) {
                        SLOG(LOG_ERROR, TAG_STTC, "<<<< Get arguments error (%s)", err.message);
                        dbus_error_free(&err);