Send error signal to manager client when widget doesn't start recording

Change-Id: Id9adae3e2a86f5eb8f7433a103c586bce0d05270
Signed-off-by: Wonnam Jang <wn.jang@samsung.com>
(cherry picked from commit 58d8c3f96d0da340dd31c9f7ecb76e82a5c6c6c1)

diff --git a/server/vcd_client_data.c b/server/vcd_client_data.c
index c18b8b2..358ddb7 100644 (file)
--- a/server/vcd_client_data.c
+++ b/server/vcd_client_data.c
@@ -1413,7 +1413,7 @@ int vcd_client_widget_set_waiting_for_recording(int pid, bool waiting)
 
        g_is_waiting_recording = waiting;
        g_waiting_recording_pid = pid;
-       SLOG(LOG_INFO, TAG_VCD, "[INFO] Success to set waiting for recording, pid(%d), waiting(%d)", pid, waiting);
+       SLOG(LOG_ERROR, TAG_VCD, "[INFO] Success to set waiting for recording, pid(%d), waiting(%d)", pid, waiting);
        return 0;
 }
 
@@ -1425,7 +1425,7 @@ int vcd_client_widget_get_waiting_for_recording(int pid, bool* waiting)
        }
 
        *waiting = g_is_waiting_recording;
-       SLOG(LOG_INFO, TAG_VCD, "[INFO] Success to get waiting for recording, waiting(%d)", *waiting);
+       SLOG(LOG_ERROR, TAG_VCD, "[INFO] Success to get waiting for recording, waiting(%d)", *waiting);
        return 0;
 }
 

diff --git a/server/vcd_server.c b/server/vcd_server.c
index 65fb25b..ecdd61c 100755 (executable)
--- a/server/vcd_server.c
+++ b/server/vcd_server.c
@@ -39,6 +39,7 @@
 static GList *g_proc_list = NULL;
 
 static Ecore_Timer *g_restart_timer = NULL;
+static Ecore_Timer *g_check_widget_client_timer = NULL;
 
 /**
 * @brief Enumerations of send event type.
@@ -1465,10 +1466,45 @@ int vcd_server_mgr_set_client_info(int pid)
        return VCD_ERROR_NONE;
 }
 
+static int __reset_waiting_for_widget_recording(void)
+{
+       SLOG(LOG_ERROR, TAG_VCD, "[Server] Reet waiting for widget recording");
+       // Delete timer to check that widget client is terminated
+       if (g_check_widget_client_timer) {
+               ecore_timer_del(g_check_widget_client_timer);
+               g_check_widget_client_timer = NULL;
+       }
+       // Reset flag to wait for recording from widget client
+       vcd_client_widget_set_waiting_for_recording(-1, false);
+       return 0;
+}
+
+static Eina_Bool __send_waiting_timeout_error_to_manager(void* data)
+{
+       SLOG(LOG_ERROR, TAG_VCD, "Widget client didn't send to start recording, pid(%d)", (int)data);
+       __reset_waiting_for_widget_recording();
+
+       vcdc_send_error_signal_to_manager(vcd_client_manager_get_pid(), VCD_ERROR_OPERATION_FAILED, "voice_engine.error.proc_fail");
+       return EINA_FALSE;
+}
+
+static int __set_waiting_for_widget_recording(int pid)
+{
+       SLOG(LOG_ERROR, TAG_VCD, "[Server] Set waiting for widget recording, pid(%d)", pid);
+
+       // Check if the app included widget client is terminated or not. If it is terminated, vcd_server_widget_finalize() function will be called
+       // In that function, it will start recording
+       g_check_widget_client_timer = ecore_timer_add(2.0, __send_waiting_timeout_error_to_manager, (void*)pid);
+
+       // Set flag to wait for recording from widget client
+       vcd_client_widget_set_waiting_for_recording(pid, true);
+       return 0;
+}
+
 static int __start_internal_recognition()
 {
        int ret;
-       vcd_client_widget_set_waiting_for_recording(-1, false);
+       __reset_waiting_for_widget_recording();
 
        if (0 != vcd_client_command_collect_command()) {
                SLOG(LOG_ERROR, TAG_VCD, "[Client Data ERROR] Fail to collect command");
@@ -1558,7 +1594,7 @@ int vcd_server_mgr_start(vcd_recognition_mode_e recognition_mode, bool exclusive
                SLOG(LOG_DEBUG, TAG_VCD, "[Server] Manager is NOT available.");
                return VCD_ERROR_OPERATION_FAILED;
        }
-       vcd_client_widget_set_waiting_for_recording(-1, false);
+       __reset_waiting_for_widget_recording();
 
        SLOG(LOG_ERROR, TAG_VCD, "[Server] set recognition mode = %d", recognition_mode);
        vcd_client_set_recognition_mode(recognition_mode);
@@ -1571,7 +1607,8 @@ int vcd_server_mgr_start(vcd_recognition_mode_e recognition_mode, bool exclusive
                        if (-1 != pid) {
                                SLOG(LOG_ERROR, TAG_VCD, "[Server] Request tooltip show and widget command");
                                ecore_timer_add(0, __vcd_request_show_tooltip, (void*)true);
-                               vcd_client_widget_set_waiting_for_recording(pid, true);
+
+                               __set_waiting_for_widget_recording(pid);
                                return 0;
                        }
                }
@@ -2208,10 +2245,11 @@ int vcd_server_widget_initialize(int pid)
 
 static void __vcd_server_widget_start_recording(void *data)
 {
+       SLOG(LOG_ERROR, TAG_VCD, "[Server INFO] start recording");
+
        if (0 != __start_internal_recognition()) {
                SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to start recongition");
        }
-       vcd_client_widget_set_waiting_for_recording(-1, false);
 }
 
 int vcd_server_widget_finalize(int pid)
@@ -2239,7 +2277,7 @@ int vcd_server_widget_finalize(int pid)
        }
 
        if (true == is_waiting) {
-               SLOG(LOG_INFO, TAG_VCD, "[Server INFO] invoke to start recording");
+               SLOG(LOG_ERROR, TAG_VCD, "[Server INFO] invoke to start recording");
                ecore_main_loop_thread_safe_call_async(__vcd_server_widget_start_recording, NULL);
        }
        return VCD_ERROR_NONE;
@@ -2253,6 +2291,12 @@ int vcd_server_widget_start_recording(int pid, bool widget_command)
                return VCD_ERROR_INVALID_PARAMETER;
        }
 
+       bool waiting;
+       if (0 != vcd_client_widget_get_waiting_for_recording(pid, &waiting) || false == waiting) {
+               SLOG(LOG_ERROR, TAG_VCD, "[Server] Server is not waiting for recording, pid(%d), waiting(%d)", pid, waiting);
+               return 0;
+       }
+
        if (true == widget_command) {
                vcd_client_widget_set_command(pid);
                SLOG(LOG_DEBUG, TAG_VCD, "[Server] widget command is available");