[content] Change secure log

[platform/framework/native/content.git] / src / FCnt_ContentUtility.cpp

diff --git a/src/FCnt_ContentUtility.cpp b/src/FCnt_ContentUtility.cpp
index 454704f..c6bb8e9 100644 (file)
--- a/src/FCnt_ContentUtility.cpp
+++ b/src/FCnt_ContentUtility.cpp
@@ -21,8 +21,6 @@
  * This file contains implementation of the %_ContentUtility class.
  */
 
-// includes
-
 #include <unique_ptr.h>
 #include <FBaseSysLog.h>
 #include <FBaseInteger.h>
@@ -30,7 +28,6 @@
 #include <FBaseFloat.h>
 #include <FCnt_ContentUtility.h>
 
-// using namespace
 using namespace Tizen::Base;
 using namespace Tizen::Base::Collection;
 
@@ -94,6 +91,7 @@ _ContentUtility::FillContentData(media_info_h mediaHandle, ContentInfo::_Content
        std::unique_ptr<char, UtilCharDeleter> pProvider;
        std::unique_ptr<char, UtilCharDeleter> pKeyword;
        std::unique_ptr<char, UtilCharDeleter> pContentRating;
+       std::unique_ptr<char, UtilCharDeleter> pMimeType;
 
        media_content_type_e mediaType;
        media_content_storage_e storageType;
@@ -104,6 +102,8 @@ _ContentUtility::FillContentData(media_info_h mediaHandle, ContentInfo::_Content
        double longitude        = 0;
        double altitude         = 0;
 
+       bool isDrm = 0;
+
        char* pGetMediaValue = null;
        ret = media_info_get_media_id(mediaHandle, &pGetMediaValue);
        if (pGetMediaValue != null)
@@ -218,6 +218,9 @@ _ContentUtility::FillContentData(media_info_h mediaHandle, ContentInfo::_Content
                SysTryReturnResult(NID_CNT, ret == MEDIA_CONTENT_ERROR_NONE, MapCoreErrorToNativeResult(ret), "Failed to perform media_info_get_age_rating operation.");
        }
 
+       ret = media_info_is_drm(mediaHandle, &isDrm);
+       SysTryReturnResult(NID_CNT, ret == MEDIA_CONTENT_ERROR_NONE, MapCoreErrorToNativeResult(ret), "Failed to perform media_info_is_drm operation.");
+
        ret = media_info_get_added_time(mediaHandle, &addedTime);
        SysTryReturnResult(NID_CNT, ret == MEDIA_CONTENT_ERROR_NONE, MapCoreErrorToNativeResult(ret), "Failed to perform media_info_get_added_time operation.");
 
@@ -227,6 +230,16 @@ _ContentUtility::FillContentData(media_info_h mediaHandle, ContentInfo::_Content
        ret = media_info_get_media_type(mediaHandle, &mediaType);
        SysTryReturnResult(NID_CNT, ret == MEDIA_CONTENT_ERROR_NONE, MapCoreErrorToNativeResult(ret), "Failed to perform media_info_get_media_type operation.");
 
+       ret = media_info_get_mime_type(mediaHandle, &pGetMediaValue);
+       if (pGetMediaValue != null)
+       {
+               pMimeType.reset(pGetMediaValue);
+       }
+       else
+       {
+               SysTryReturnResult(NID_CNT, ret == MEDIA_CONTENT_ERROR_NONE, MapCoreErrorToNativeResult(ret), "Failed to perform media_info_get_mime_type operation.");
+       }
+
        ret = media_info_get_keyword(mediaHandle, &pGetMediaValue);
        if (pGetMediaValue != null)
        {
@@ -243,6 +256,9 @@ _ContentUtility::FillContentData(media_info_h mediaHandle, ContentInfo::_Content
                SysTryReturnResult(NID_CNT, r == E_SUCCESS, r, "Failed to perform UuId::Parse operation.");
        }
 
+       pContentData->isDrm = isDrm;
+       SysLog(NID_CNT, "pContentData->isDrm = %d", pContentData->isDrm);
+
        pContentData->contentSize       = contentSize;
        SysLog(NID_CNT, "pContentData->contentSize = %lu", pContentData->contentSize);
 
@@ -262,7 +278,7 @@ _ContentUtility::FillContentData(media_info_h mediaHandle, ContentInfo::_Content
        if (pMediaPath.get() != NULL)
        {
                pContentData->contentPath       = String(pMediaPath.get());
-               SysLog(NID_CNT, "pContentData->contentPath = %ls", pContentData->contentPath.GetPointer());
+               SysSecureLog(NID_CNT, "pContentData->contentPath = %ls", pContentData->contentPath.GetPointer());
        }
 
        if (pThumbnailPath.get() != NULL)
@@ -328,6 +344,12 @@ _ContentUtility::FillContentData(media_info_h mediaHandle, ContentInfo::_Content
                SysLog(NID_CNT, "pContentData->pKeyword = %ls", pContentData->pKeyword->GetPointer());
        }
 
+       if (pMimeType.get() != NULL)
+       {
+               pContentData->mimeType  = String(pMimeType.get());
+               SysLog(NID_CNT, "pContentData->mimeType = %ls", (pContentData->mimeType).GetPointer());
+       }
+
        switch (storageType)
        {
        case MEDIA_CONTENT_STORAGE_INTERNAL: