From 0594a4a2213d397013d093586b82233628af9152 Mon Sep 17 00:00:00 2001 From: Seokpil Park Date: Mon, 30 Sep 2013 20:26:38 +0900 Subject: [PATCH] Fix : Additionally avoiding naming collisions between core and native enums Change-Id: I0608f72900588c84812359e60c8330b15db1104a Signed-off-by: Seokpil Park --- src/FCnt_DownloadManagerImpl.cpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/FCnt_DownloadManagerImpl.cpp b/src/FCnt_DownloadManagerImpl.cpp index 5794a30..7c4ef3a 100644 --- a/src/FCnt_DownloadManagerImpl.cpp +++ b/src/FCnt_DownloadManagerImpl.cpp @@ -527,7 +527,7 @@ _DownloadManagerImpl::GetDownloadRequestN(RequestId reqId) char** pFields = null; char* pValue = null; char* pFileName = null; - download_network_type_e netType = (download_network_type_e)DOWNLOAD_NETWORK_DATA_NETWORK; + download_network_type_e netType = ::DOWNLOAD_NETWORK_DATA_NETWORK; ret = download_get_url(reqId, &pUrl); SysTryCatch(NID_CNT, (ret != DOWNLOAD_ERROR_ID_NOT_FOUND) && (ret != DOWNLOAD_ERROR_INVALID_PARAMETER), r = E_INVALID_ARG, E_INVALID_ARG, "[E_INVALID_ARG] The argument is not valid"); @@ -541,11 +541,26 @@ _DownloadManagerImpl::GetDownloadRequestN(RequestId reqId) SysTryCatch(NID_CNT, (ret != DOWNLOAD_ERROR_ID_NOT_FOUND) && (ret != DOWNLOAD_ERROR_INVALID_PARAMETER), r = E_INVALID_ARG, E_INVALID_ARG, "[E_INVALID_ARG] The argument is not valid"); ret = download_get_http_header_field_list(reqId, &pFields, &length); SysTryCatch(NID_CNT, (ret != DOWNLOAD_ERROR_ID_NOT_FOUND) && (ret != DOWNLOAD_ERROR_INVALID_PARAMETER), r = E_INVALID_ARG, E_INVALID_ARG, "[E_INVALID_ARG] The argument is not valid"); + pRequest = new (std::nothrow) DownloadRequest(pUrl, pPath); SysTryCatch(NID_CNT, pRequest != null, r = E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient."); + pRequest->SetFileName(pFileName); pRequest->SetNotification(notification); - pRequest->SetNetworkType((DownloadNetworkType)netType); + + if (netType == ::DOWNLOAD_NETWORK_DATA_NETWORK) + { + pRequest->SetNetworkType(DOWNLOAD_NETWORK_DATA_NETWORK); + } + else if (netType == ::DOWNLOAD_NETWORK_WIFI) + { + pRequest->SetNetworkType(DOWNLOAD_NETWORK_WIFI); + } + else + { + pRequest->SetNetworkType(DOWNLOAD_NETWORK_ALL); + } + //Get all the field values for (int i = 0; i < length; i++) { -- 2.7.4