Move the privilege checking code from Imple.

Change-Id: I0ce2e9d03830725c5763c9bcd632fe8574bd799f
Signed-off-by: SeungWon Lee <lsw2000.lee@samsung.com>

diff --git a/src/app/FAppAppSetting.cpp b/src/app/FAppAppSetting.cpp
index 712dab2..922828b 100644 (file)
--- a/src/app/FAppAppSetting.cpp
+++ b/src/app/FAppAppSetting.cpp
@@ -24,9 +24,11 @@
 #include <pthread.h>
 #include <FAppAppSetting.h>
 #include <FBaseSysLog.h>
+#include <FSec_AccessController.h>
 #include "FApp_AppSettingImpl.h"
 
 using namespace Tizen::Base::Collection;
+using namespace Tizen::Security;
 
 namespace Tizen { namespace App
 {
@@ -79,13 +81,20 @@ AppSetting::GetInstance(const Tizen::Base::String& version)
 AppSetting*
 AppSetting::GetInstanceByAppId(const AppId& appId)
 {
-       //TODO: Add privilege checking code
+       result r = _AccessController::CheckUserPrivilege(_PRV_APPSETTING);
+       SysTryReturn(NID_APP, !IsFailed(r), null, E_PRIVILEGE_DENIED,
+                                "[%s] The application does not have the privilege to call this method.", GetErrorMessage(E_PRIVILEGE_DENIED));
+
        return _AppSettingImpl::GetInstanceByAppId(appId);
 }
 
 result
 AppSetting::ReleaseInstanceByAppId(const AppId& appId)
 {
+       result r = _AccessController::CheckUserPrivilege(_PRV_APPSETTING);
+       SysTryReturnResult(NID_APP, !IsFailed(r), E_PRIVILEGE_DENIED,
+                                          "[%s] The application does not have the privilege to call this method.", GetErrorMessage(E_PRIVILEGE_DENIED));
+
        return _AppSettingImpl::ReleaseInstanceByAppId(appId);
 }
 

diff --git a/src/app/FApp_AppSettingImpl.cpp b/src/app/FApp_AppSettingImpl.cpp
index d9aab4b..bf89fb3 100644 (file)
--- a/src/app/FApp_AppSettingImpl.cpp
+++ b/src/app/FApp_AppSettingImpl.cpp
@@ -34,7 +34,6 @@
 #include <FAppPkgPackageInfo.h>
 #include <FAppPkgPackageManager.h>
 #include <FAppIAppSettingEventListener.h>
-#include <FSec_AccessController.h>
 #include "FApp_AppSettingImpl.h"
 #include "FApp_AppInfo.h"
 #include "FAppPkg_PackageManagerImpl.h"
@@ -45,7 +44,6 @@ using namespace Tizen::App::Package;
 using namespace Tizen::Base;
 using namespace Tizen::Base::Collection;
 using namespace Tizen::Io;
-using namespace Tizen::Security;
 using namespace Tizen::App;
 
 
@@ -145,10 +143,6 @@ _AppSettingImpl::_MutiInstanceManager::GetInstanceByAppId(const AppId& appId)
        AppSetting* pAppSettingInstance = null;
        String* pKeyStr = null;
 
-       r = _AccessController::CheckUserPrivilege(_PRV_APPSETTING);
-       SysTryReturn(NID_APP, !IsFailed(r), null, E_PRIVILEGE_DENIED,
-                               "[%s] The application does not have the privilege to call this method.", GetErrorMessage(E_PRIVILEGE_DENIED));
-
        // Convert AppId to package type id.
        String packageId;
        appId.SubString(0, APP_ID_LENTH, packageId);
@@ -203,10 +197,6 @@ CATCH:
 result
 _AppSettingImpl::_MutiInstanceManager::ReleaseInstanceByAppId(const AppId& appId)
 {
-       result r = _AccessController::CheckUserPrivilege(_PRV_APPSETTING);
-       SysTryReturnResult(NID_APP, !IsFailed(r), E_PRIVILEGE_DENIED,
-                                          "The application does not have the privilege to call this method.");
-
        // Convert AppId to package type id.
        String packageId;
        appId.SubString(0, APP_ID_LENTH, packageId);