fix TC failure

[framework/osp/social.git] / src / FSclPerson.cpp

diff --git a/src/FSclPerson.cpp b/src/FSclPerson.cpp
index f251206..91a33fb 100644 (file)
--- a/src/FSclPerson.cpp
+++ b/src/FSclPerson.cpp
@@ -1,5 +1,4 @@
 //
-// Open Service Platform
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the License);
@@ -81,8 +80,9 @@ Person::GetId(void) const
 result
 Person::SetAsFavorite(bool isFavorite)
 {
-       SysTryReturn(NID_SCL, _AccessController::CheckUserPrivilege(_PRV_CONTACT_WRITE) == E_SUCCESS, E_PRIVILEGE_DENIED, E_PRIVILEGE_DENIED
-               , "[%s] The application does not have the privilege to call this method.", GetErrorMessage(E_PRIVILEGE_DENIED));
+       result r = _AccessController::CheckUserPrivilege(_PRV_CONTACT_WRITE);
+       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_USER_NOT_CONSENTED);
+       SysTryReturn(NID_SCL, r == E_SUCCESS, r, r, "[%s] The application is not permitted to call this method.", GetErrorMessage(r));
 
        return __pPersonImpl->SetAsFavorite(isFavorite);
 }
@@ -126,8 +126,9 @@ Person::GetAccountIdsN(void) const
 result
 Person::SetAsPrimaryPhoneNumber(const PhoneNumber& phoneNumber)
 {
-       SysTryReturn(NID_SCL, _AccessController::CheckUserPrivilege(_PRV_CONTACT_WRITE) == E_SUCCESS, E_PRIVILEGE_DENIED, E_PRIVILEGE_DENIED
-               , "[%s] The application does not have the privilege to call this method.", GetErrorMessage(E_PRIVILEGE_DENIED));
+       result r = _AccessController::CheckUserPrivilege(_PRV_CONTACT_WRITE);
+       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_USER_NOT_CONSENTED);
+       SysTryReturn(NID_SCL, r == E_SUCCESS, r, r, "[%s] The application is not permitted to call this method.", GetErrorMessage(r));
 
        return __pPersonImpl->SetAsPrimaryPhoneNumber(phoneNumber);     
 }
@@ -135,17 +136,19 @@ Person::SetAsPrimaryPhoneNumber(const PhoneNumber& phoneNumber)
 result
 Person::SetAsPrimaryEmail(const Email& email)
 {
-       SysTryReturn(NID_SCL, _AccessController::CheckUserPrivilege(_PRV_CONTACT_WRITE) == E_SUCCESS, E_PRIVILEGE_DENIED, E_PRIVILEGE_DENIED
-               , "[%s] The application does not have the privilege to call this method.", GetErrorMessage(E_PRIVILEGE_DENIED));
+       result r = _AccessController::CheckUserPrivilege(_PRV_CONTACT_WRITE);
+       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_USER_NOT_CONSENTED);
+       SysTryReturn(NID_SCL, r == E_SUCCESS, r, r, "[%s] The application is not permitted to call this method.", GetErrorMessage(r));
 
        return __pPersonImpl->SetAsPrimaryEmail(email);
 }
 
 PhoneNumber
 Person::GetPrimaryPhoneNumber(void) const
-{      
-       SysTryReturn(NID_SCL, _AccessController::CheckUserPrivilege(_PRV_CONTACT_READ) == E_SUCCESS, PhoneNumber(), E_PRIVILEGE_DENIED
-               , "[%s] The application does not have the privilege to call this method.", GetErrorMessage(E_PRIVILEGE_DENIED));
+{
+       result r = _AccessController::CheckUserPrivilege(_PRV_CONTACT_READ);
+       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_USER_NOT_CONSENTED);
+       SysTryReturn(NID_SCL, r == E_SUCCESS, PhoneNumber(), r, "[%s] The application is not permitted to call this method.", GetErrorMessage(r));
 
        return __pPersonImpl->GetPrimaryPhoneNumber();
 }
@@ -153,8 +156,9 @@ Person::GetPrimaryPhoneNumber(void) const
 Email
 Person::GetPrimaryEmail(void) const
 {
-       SysTryReturn(NID_SCL, _AccessController::CheckUserPrivilege(_PRV_CONTACT_READ) == E_SUCCESS, Email(), E_PRIVILEGE_DENIED
-               , "[%s] The application does not have the privilege to call this method.", GetErrorMessage(E_PRIVILEGE_DENIED));
+       result r = _AccessController::CheckUserPrivilege(_PRV_CONTACT_READ);
+       r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_USER_NOT_CONSENTED);
+       SysTryReturn(NID_SCL, r == E_SUCCESS, Email(), r, "[%s] The application is not permitted to call this method.", GetErrorMessage(r));
 
        return __pPersonImpl->GetPrimaryEmail();
 }