From 7bd561f1d2119cb7fcc19f89fa536d846dc40e80 Mon Sep 17 00:00:00 2001 From: Tomasz Marciniak Date: Mon, 4 May 2015 09:01:11 +0200 Subject: [PATCH] [Notification] Moved checking privileges to JS layer. [Verification] Code compiles without errors. Change-Id: If73090dced65523ce1f4391f0d71ca364bccf629 Signed-off-by: Tomasz Marciniak --- src/notification/notification_api.js | 9 +++++++++ src/notification/notification_instance.cc | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/notification/notification_api.js b/src/notification/notification_api.js index 1b42396c..52c17c93 100644 --- a/src/notification/notification_api.js +++ b/src/notification/notification_api.js @@ -7,6 +7,7 @@ var type_ = utils_.type; var converter_ = utils_.converter; var validator_ = utils_.validator; var types_ = validator_.Types; +var privilege_ = xwalk.utils.privilege; var native_ = new xwalk.utils.NativeManager(extension); function convertColorToInt(rgbaColor) { @@ -69,6 +70,8 @@ function NotificationManager() {} NotificationManager.prototype.post = function(notification) { + xwalk.utils.checkPrivilegeAccess(privilege_.NOTIFICATION); + var args = validator_.validateArgs(arguments, [ {name: 'notification', type: types_.PLATFORM_OBJECT, values: StatusNotification} ]); @@ -92,6 +95,8 @@ NotificationManager.prototype.post = function(notification) { }; NotificationManager.prototype.update = function(notification) { + xwalk.utils.checkPrivilegeAccess(privilege_.NOTIFICATION); + var args = validator_.validateArgs(arguments, [ {name: 'notification', type: types_.PLATFORM_OBJECT, values: StatusNotification} ]); @@ -116,6 +121,8 @@ NotificationManager.prototype.update = function(notification) { }; NotificationManager.prototype.remove = function(id) { + xwalk.utils.checkPrivilegeAccess(privilege_.NOTIFICATION); + var args = validator_.validateArgs(arguments, [ {name: 'id', type: types_.STRING} ]); @@ -137,6 +144,8 @@ NotificationManager.prototype.remove = function(id) { }; NotificationManager.prototype.removeAll = function() { + xwalk.utils.checkPrivilegeAccess(privilege_.NOTIFICATION); + var result = native_.callSync('NotificationManager_removeAll', {}); if (native_.isFailure(result)) { diff --git a/src/notification/notification_instance.cc b/src/notification/notification_instance.cc index 01790d1a..68c81d79 100644 --- a/src/notification/notification_instance.cc +++ b/src/notification/notification_instance.cc @@ -15,11 +15,6 @@ namespace extension { namespace notification { -namespace { -// The privileges that required in Notification API -const std::string kPrivilegeNotification = "http://tizen.org/privilege/notification"; -} // namespace - using namespace common; NotificationInstance::NotificationInstance() { @@ -53,7 +48,6 @@ NotificationInstance::~NotificationInstance() { void NotificationInstance::NotificationManagerPost(const picojson::value& args, picojson::object& out) { - CHECK_PRIVILEGE_ACCESS(kPrivilegeNotification, &out); picojson::value val{picojson::object{}}; PlatformResult status = @@ -68,7 +62,6 @@ void NotificationInstance::NotificationManagerPost(const picojson::value& args, void NotificationInstance::NotificationManagerUpdate( const picojson::value& args, picojson::object& out) { - CHECK_PRIVILEGE_ACCESS(kPrivilegeNotification, &out); PlatformResult status = manager_->Update(args.get()); @@ -81,7 +74,6 @@ void NotificationInstance::NotificationManagerUpdate( void NotificationInstance::NotificationManagerRemove( const picojson::value& args, picojson::object& out) { - CHECK_PRIVILEGE_ACCESS(kPrivilegeNotification, &out); PlatformResult status = manager_->Remove(args.get()); @@ -94,7 +86,6 @@ void NotificationInstance::NotificationManagerRemove( void NotificationInstance::NotificationManagerRemoveAll( const picojson::value& args, picojson::object& out) { - CHECK_PRIVILEGE_ACCESS(kPrivilegeNotification, &out); PlatformResult status = manager_->RemoveAll(); -- 2.34.1