Fix privacy name getter to use privacy-manager

Change-Id: I089ea5b05bdbd361e14403bcd9317463551b6f5a
Signed-off-by: hb.min <hb.min@samsung.com>

diff --git a/src/security/FSec_PrivacyInfoImpl.cpp b/src/security/FSec_PrivacyInfoImpl.cpp
index 682bf32..941ac9c 100755 (executable)
--- a/src/security/FSec_PrivacyInfoImpl.cpp
+++ b/src/security/FSec_PrivacyInfoImpl.cpp
@@ -23,12 +23,12 @@
 #include <unique_ptr.h>
 #include <FSecPrivacyInfo.h>
 #include <FBaseSysLog.h>
-#include <FBaseUtilStringTokenizer.h>
+#include <FBase_StringConverter.h>
 #include <FSec_AccessController.h>
+#include <privacy_info_client.h>
 #include "FSec_PrivacyInfoImpl.h"
 
 using namespace Tizen::Base;
-using namespace Tizen::Base::Utility;
 using namespace Tizen::Base::Collection;
 using namespace Tizen::Security;
 
@@ -78,19 +78,27 @@ String
 _PrivacyInfoImpl::GetDisplayName(void) const
 {
        String displayName;
-    StringTokenizer strTok(__privacyId, L"/");
-    while(strTok.HasMoreTokens() == true)
-    {
-       strTok.GetNextToken(displayName);
-    }
 
+       int ret = PRIV_MGR_ERROR_SUCCESS;
+       char* pPrivacyDisplayName;
+       privacy_info_client_s privacyInfo;
+
+       std::unique_ptr<char[]> pPrivacyId(null);
+       pPrivacyId.reset(_StringConverter::CopyToCharArrayN(__privacyId));
+       SysTryReturn(NID_SEC, pPrivacyId != null, displayName, E_SYSTEM, "[E_SYSTEM] An unexpected system error occurred.");
+
+       privacyInfo.privacy_id = pPrivacyId.get();
+       ret = privacy_info_client_get_privacy_display_name(&privacyInfo, &pPrivacyDisplayName);
+       SysTryReturn(NID_SEC, ret == PRIV_MGR_ERROR_SUCCESS, displayName, E_SYSTEM, "[E_SYSTEM] An unexpected system error occurred.");
+
+       displayName.Append(pPrivacyDisplayName);
        return displayName;
 }
 
 String
 _PrivacyInfoImpl::GetDescription(void) const
 {
-       String description("undefined");
+       String description("Undefined");
        return description;
 }