Revert "[systemsetting] - Checking privileges moved to JS layer"

This reverts commit 2bbad674b5c99a6d4ccafc39d0f98b47a80c9c29.
This also applies changes from commit 8f7f932bde2e3b5bd4697d40a5ee61d10509abb9

[Verification] Code compiles. TCT pass didn't change against results on: http://168.219.209.56/confluence/display/WRT/TCT+results+-+WebAPI+for+Tizen+3.0+Mobile

Change-Id: I00cda286d339e4a1740e7fbcbac2474eb97a0480
Signed-off-by: Tomasz Marciniak <t.marciniak@samsung.com>

diff --git a/src/systemsetting/systemsetting_api.js b/src/systemsetting/systemsetting_api.js
index 464a33e263b602c9ffaf25a42c21d5cb110673a0..1f432a93f71221a443b46b34c9274c0c4db637be 100644 (file)
--- a/src/systemsetting/systemsetting_api.js
+++ b/src/systemsetting/systemsetting_api.js
@@ -16,23 +16,10 @@
 
 
 var validator_ = xwalk.utils.validator;
-var privilege_ = xwalk.utils.privilege;
 var type_ = xwalk.utils.type;
 var types_ = validator_.Types;
 var native_ = new xwalk.utils.NativeManager(extension);
 
-function throwException_(err) {
-    throw new WebAPIException(err.code, err.name, err.message);
-}
-
-function callSync_(msg) {
-    var ret = extension.internal.sendSyncMessage(JSON.stringify(msg));
-    var obj = JSON.parse(ret);
-    if (obj.error)
-        throwException_(obj.error);
-    return obj.result;
-}
-
 var SystemSettingTypeValues = ['HOME_SCREEN', 'LOCK_SCREEN', 'INCOMING_CALL', 'NOTIFICATION_EMAIL'];
 
 function SystemSettingManager() {
@@ -58,12 +45,14 @@ SystemSettingManager.prototype.getProperty = function() {
         type: args.type
     };
 
-    native_.call('SystemSettingManager_getProperty', callArgs, callback);
+    var result = native_.call('SystemSettingManager_getProperty', callArgs, callback);
+
+    if (native_.isFailure(result)) {
+      throw native_.getErrorObject(result);
+    }
 };
 
 SystemSettingManager.prototype.setProperty = function() {
-    xwalk.utils.checkPrivilegeAccess(privilege_.SETTING);
-
     var args = validator_.validateArgs(arguments, [
         { name: 'type', type: types_.ENUM, values: SystemSettingTypeValues },
         { name: 'value', type: types_.STRING },
@@ -85,7 +74,11 @@ SystemSettingManager.prototype.setProperty = function() {
         value: args.value
     };
 
-    native_.call('SystemSettingManager_setProperty', callArgs, callback);
+    var result = native_.call('SystemSettingManager_setProperty', callArgs, callback);
+
+    if (native_.isFailure(result)) {
+      throw native_.getErrorObject(result);
+    }
 };
 
 // Exports

diff --git a/src/systemsetting/systemsetting_instance.cc b/src/systemsetting/systemsetting_instance.cc
index 06728d81eedf0c3a885a6eb3e0106104161a7752..7877e8484a817a9e72e2fc7a172af2febcee2cf4 100644 (file)
--- a/src/systemsetting/systemsetting_instance.cc
+++ b/src/systemsetting/systemsetting_instance.cc
@@ -22,6 +22,7 @@
 #include "common/picojson.h"
 #include "common/task-queue.h"
 #include "common/virtual_fs.h"
+#include "common/tools.h"
 
 #include <system_settings.h>
 
@@ -34,6 +35,8 @@ const std::string SETTING_HOME_SCREEN = "HOME_SCREEN";
 const std::string SETTING_LOCK_SCREEN = "LOCK_SCREEN";
 const std::string SETTING_INCOMING_CALL = "INCOMING_CALL";
 const std::string SETTING_NOTIFICATION_EMAIL = "NOTIFICATION_EMAIL";
+
+const std::string kPrivilegeSetting = "http://tizen.org/privilege/setting";
 }
 
 using namespace common;
@@ -137,6 +140,8 @@ void SystemSettingInstance::setProperty(const picojson::value& args, picojson::o
 {
   LoggerD("Enter");
 
+  CHECK_PRIVILEGE_ACCESS(kPrivilegeSetting, &out);
+
   const double callback_id = args.get("callbackId").get<double>();
 
   const std::string& type = args.get("type").get<std::string>();