From: Ji-hoon Lee <dalton.lee@samsung.com>
Date: Thu, 15 Jun 2023 12:47:44 +0000 (+0900)
Subject: Update settings management policy
X-Git-Tag: accepted/tizen/unified/20230616.172429~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bec80f687b4e493231d24d1d9aad00eff0f8f2bd;p=platform%2Fcore%2Fuifw%2Fmulti-assistant.git

Update settings management policy

Change-Id: Ief2e6d5c63c174c9d37e539e720d0eb0d65652bd
---

diff --git a/common/multi_assistant_settings.c b/common/multi_assistant_settings.c
index 3274311..e2b8f55 100644
--- a/common/multi_assistant_settings.c
+++ b/common/multi_assistant_settings.c
@@ -77,7 +77,6 @@ int ma_settings_get_current_voice_assistant(char** app_id) {
 }
 
 int ma_settings_change_voice_assistant(const char* app_id) {
-	bool multiple = false;
 	int res = MA_ERROR_NONE;
 
 	if (!app_id) {
@@ -85,18 +84,9 @@ int ma_settings_change_voice_assistant(const char* app_id) {
 		return MA_ERROR_INVALID_PARAMETER;
 	}
 
-	res = ma_settings_is_multiple_mode(&multiple);
-	LOGD("multiple mode(%d). Error(%x)", multiple, res);
-	if (MA_ERROR_NONE != res) return res;
-
-	if (!multiple) {
-		if (0 == vconf_set_str(DEFAULT_ASSISTANT_URL, app_id)) {
-			LOGI("appid: %s", app_id);
-			res = MA_ERROR_NONE;
-		} else {
-			LOGE("Operation failed");
-			res = MA_ERROR_OPERATION_FAILED;
-		}
+	if (0 == vconf_set_str(DEFAULT_ASSISTANT_URL, app_id)) {
+		LOGI("appid: %s", app_id);
+		res = MA_ERROR_NONE;
 	} else {
 		LOGE("Operation failed");
 		res = MA_ERROR_OPERATION_FAILED;
@@ -162,8 +152,8 @@ int ma_settings_set_voice_assistant_enabled(const char* app_id, bool enabled) {
 		if (NULL != enabled_assistants) {
 			char* tmp = strstr(enabled_assistants, app_id);
 			if (tmp) {
-				LOGE("Not supported");
-				res = MA_ERROR_NOT_SUPPORTED;
+				LOGI("Already set as ENABLED : %s", app_id);
+				res = MA_ERROR_NONE;
 			} else {
 				char assistants[MAX_LEN] = "";
 				snprintf(assistants, MAX_LEN, "%s%s;", enabled_assistants, app_id);
@@ -175,7 +165,7 @@ int ma_settings_set_voice_assistant_enabled(const char* app_id, bool enabled) {
 				}
 			}
 		} else {
-			LOGE("Operation failed");
+			LOGE("Operation failed : Could not get vconf value");
 			res = MA_ERROR_OPERATION_FAILED;
 		}
 	} else {
diff --git a/tests/src/multiassistant_setting_multiple_on_unittest.cpp b/tests/src/multiassistant_setting_multiple_on_unittest.cpp
index 3131ad0..40d0d62 100644
--- a/tests/src/multiassistant_setting_multiple_on_unittest.cpp
+++ b/tests/src/multiassistant_setting_multiple_on_unittest.cpp
@@ -66,10 +66,10 @@ TEST_F(MultiAssistantSettingMultipleOnTest, utc_ma_settings_change_voice_assista
     EXPECT_EQ(ret, MA_ERROR_INVALID_PARAMETER);
 }
 
-TEST_F(MultiAssistantSettingMultipleOnTest, utc_ma_settings_change_voice_assistant_operation_failed)
+TEST_F(MultiAssistantSettingMultipleOnTest, utc_ma_settings_change_voice_assistant_error_none)
 {
     int ret = ma_settings_change_voice_assistant(TEST_VOICE_ASSISTANT_APPID);
-    EXPECT_EQ(ret, MA_ERROR_OPERATION_FAILED);
+    EXPECT_EQ(ret, MA_ERROR_NONE);
 }
 
 TEST_F(MultiAssistantSettingMultipleOnTest, utc_ma_settings_get_voice_assistant_enabled_invalid_parameter)