update exceptions and log messages

Change-Id: I45c559237b852b83ac01d226d6a8a9b5c5863f61

diff --git a/src/core/FShellNotificationManager.cpp b/src/core/FShellNotificationManager.cpp
index 8b38bc2..38e3034 100644 (file)
--- a/src/core/FShellNotificationManager.cpp
+++ b/src/core/FShellNotificationManager.cpp
@@ -53,7 +53,7 @@ NotificationManager::Construct(void)
                        "Already constructed. Calling Construct() twice or more on a same instance is not allowed for this class.");
 
        __pNotificationManagerImpl = new (std::nothrow) _NotificationManagerImpl();
-       SysTryReturnResult(NID_SHELL, __pNotificationManagerImpl != null, E_OUT_OF_MEMORY, "Allocation failed.");
+       SysTryReturnResult(NID_SHELL, __pNotificationManagerImpl != null, E_OUT_OF_MEMORY, "The memory is insufficient.");
 
        return __pNotificationManagerImpl->Construct();
 }
@@ -140,7 +140,7 @@ NotificationManager::GetBadgeNumberByAppId(const AppId& appId)
 {
        SysAssertf(__pNotificationManagerImpl != null, "Not yet constructed. Construct() should be called before use.");
 
-       result r = _AccessController::CheckUserPrivilege(_PRV_NOTIFICATION);
+       result r = _AccessController::CheckUserPrivilege(_PRV_NOTIFICATION, _PRV_NOTIFICATIONMANAGER);
        SysTryReturn(NID_SHELL, !IsFailed(r), -1, E_PRIVILEGE_DENIED, "[E_PRIVILEGE_DENIED] The application does not have the privilege to call this method.");
 
        return __pNotificationManagerImpl->GetBadgeNumber(appId);

diff --git a/src/core/FShell_NotificationManagerImpl.cpp b/src/core/FShell_NotificationManagerImpl.cpp
index 2f4e6d4..ff46cdb 100644 (file)
--- a/src/core/FShell_NotificationManagerImpl.cpp
+++ b/src/core/FShell_NotificationManagerImpl.cpp
@@ -35,8 +35,7 @@
 #include <FShellNotificationRequest.h>
 #include <FShellIBadgeEventListener.h>
 
-//#include <FBaseInternalTypes.h>
-#include <FBase_StringConverter.h>
+#include "FBase_StringConverter.h"
 #include "FApp_AppInfo.h"
 #include "FApp_Aul.h"
 #include "FIoFile.h"
@@ -102,34 +101,6 @@ ConvertAppManagerResult(int error)
        }
 }
 
-bool
-IsPosted(ui_notification_h handle)
-{
-       struct ui_notification_s
-       {
-               void* raw_handle;
-               bool ongoing;
-               bool posted;
-               bool removed;
-               char *icon;
-               struct tm *time;
-               char *title;
-               char *content;
-               service_h service;
-               char *sound;
-               bool vibration;
-       };
-
-       if (handle == NULL)
-       {
-               return false;
-       }
-
-       ui_notification_s* pStruct = reinterpret_cast<ui_notification_s*>(handle);
-
-       return pStruct->posted;
-}
-
 } // namespace
 
 
@@ -153,7 +124,7 @@ BadgeChangedCallback(unsigned int action, const char *pkgname, unsigned int coun
        {
                pListener = null;
                pEnum->GetCurrent(pListener);
-               if( !pListener)
+               if (!pListener)
                {
                        SysLog(NID_SHELL, "pListener is null!");
                        continue;
@@ -167,9 +138,11 @@ _BadgeManagerImpl*
 _BadgeManagerImpl::GetInstance(void)
 {
        static _BadgeManagerImpl* pTheInstance = null;
-       if( pTheInstance == null)
+       if (pTheInstance == null)
        {
                pTheInstance = new (std::nothrow) _BadgeManagerImpl;
+               SysTryReturn(NID_SHELL, pTheInstance != null, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient.");
+
                pTheInstance->Construct();
        }
        return pTheInstance;
@@ -187,7 +160,7 @@ _BadgeManagerImpl::AddPrimaryBadgeEventListener(IBadgeEventListener& primaryList
        if( __primaryBadgeEventListenerList.GetCount() == 0)
        {
                int ret = badge_register_changed_cb(BadgeChangedCallback, &__primaryBadgeEventListenerList);
-               SysTryReturnResult(NID_SHELL, ret == BADGE_ERROR_NONE, E_SYSTEM, "Failed to badge_unregister_changed_cb, (%d)", ret);
+               SysTryReturnResult(NID_SHELL, ret == BADGE_ERROR_NONE, E_SYSTEM, "Failed to badge_register_changed_cb, (%d)", ret);
        }
 
        return __primaryBadgeEventListenerList.Add(&primaryListener);
@@ -251,8 +224,7 @@ _NotificationManagerImpl::GetBadgeNumber(void) const
        std::unique_ptr<char[]> pAppId(_StringConverter::CopyToCharArrayN(pApp->GetAppId()));
 
        int count = GetBadgeCount(pAppId.get());
-       SysTryReturn(NID_SHELL, count != -1, count, E_OPERATION_FAILED, "[%s] The operation has failed. Badge may not exist.",
-                                GetErrorMessage(E_OPERATION_FAILED));
+       SysTryReturn(NID_SHELL, count != -1, count, E_OPERATION_FAILED, "[E_OPERATION_FAILED] The operation has failed. Badge may not exist.");
 
        return count;
 }
@@ -279,17 +251,21 @@ _NotificationManagerImpl::Notify(int badgeNumber)
        Tizen::App::App* pApp = Tizen::App::App::GetInstance();
        std::unique_ptr<char[]> pAppId(_StringConverter::CopyToCharArrayN(pApp->GetAppId()));
 
+       result r = E_SUCCESS;
+
        if (badgeNumber == 0)
        {
-               RemoveBadge(pAppId.get());
+               r = RemoveBadge(pAppId.get());
+               SysTryReturnResult(NID_SHELL, !IsFailed(r), r, "Failed to remove the badge.");
        }
        else
        if (badgeNumber > 0)
        {
-               SetBadgeCount(pAppId.get(), badgeNumber);
+               r = SetBadgeCount(pAppId.get(), badgeNumber);
+               SysTryReturnResult(NID_SHELL, !IsFailed(r), r, "Failed to set the badge.");
        }
 
-       return E_SUCCESS;
+       return r;
 }
 
 result
@@ -345,13 +321,12 @@ _NotificationManagerImpl::GetBadgeNumber(const AppId& appId) const
        ClearLastResult();
 
        bool b = _Aul::IsInstalled(appId);
-       SysTryReturn(NID_SHELL, b == true, -1, E_APP_NOT_INSTALLED, "[E_OBJ_NOT_FOUND] The application %ls is not installed",
+       SysTryReturn(NID_SHELL, b == true, -1, E_APP_NOT_INSTALLED, "[E_APP_NOT_INSTALLED] The application %ls is not installed",
                                 appId.GetPointer());
        std::unique_ptr<char[]> pAppId(_StringConverter::CopyToCharArrayN(appId));
        int count = GetBadgeCount(pAppId.get());
 
-       SysTryReturn(NID_SHELL, count != -1, count, E_OPERATION_FAILED, "[%s] The operation has failed. Badge may not exist.",
-                                GetErrorMessage(E_OPERATION_FAILED));
+       SysTryReturn(NID_SHELL, count != -1, count, E_OPERATION_FAILED, "[E_OPERATION_FAILED] The operation has failed. Badge may not exist.");
 
        return count;
 }
@@ -447,7 +422,13 @@ _NotificationManagerImpl::NotifyOngoingActivityByAppControl(const Tizen::Base::S
        return r;
 }
 
-
+//
+// E_SUCCESS
+// E_INVALID_ARG
+// E_APP_NOT_INSTALLED - If AppId is invalid, it can occur.
+// E_OPERATION_FAILED
+// E_OUT_OF_MEMORY
+//
 result
 _NotificationManagerImpl::NotifyMessage(_NotifyType notifyType, bool isOngoing, const NotificationRequest& notifyRequest, const AppId* pAppId,
                                                                                const Tizen::Base::String* pOperationId, const Tizen::Base::String* pUriData, const Tizen::Base::String* pDataType, const Tizen::Base::Collection::IMap* pExtraData)
@@ -460,22 +441,17 @@ _NotificationManagerImpl::NotifyMessage(_NotifyType notifyType, bool isOngoing,
        // Set pAppIdChar
        if ((notifyType == NOTIFY_TYPE_SIMPLE) || (notifyType == NOTIFY_TYPE_APP_CONTROL))
        {
-//             char* pkgname = null;
-//             app_get_id(&pkgname);   // AppId. (Not package Id)
-//             SysTryReturnResult(NID_SHELL, pkgname != NULL, E_OBJ_NOT_FOUND,"Cannot acquire package name for current application.");
-//             const String currentAppId(pkgname);
-//             free(pkgname);
                Tizen::App::App* pApp = Tizen::App::App::GetInstance();
                const String currentAppId = pApp->GetAppId();
                std::unique_ptr<char[]> pAppIdTemp(_StringConverter::CopyToCharArrayN(currentAppId));
                pAppIdChar = std::move(pAppIdTemp);
-               SysLog(NID_SHELL, "app_get_id: %ls", currentAppId.GetPointer());
+               SysLog(NID_SHELL, "App ID is %ls.", currentAppId.GetPointer());
        }
        else
        if (notifyType == NOTIFY_TYPE_APP_ID)
        {
                bool isAppInstalled = _Aul::IsInstalled(*pAppId);
-               SysTryReturnResult(NID_SHELL, isAppInstalled == true, E_APP_NOT_INSTALLED, "The application %ls is not installed", pAppId->GetPointer());
+               SysTryReturnResult(NID_SHELL, isAppInstalled == true, E_APP_NOT_INSTALLED, "The application %ls is not installed.", pAppId->GetPointer());
                std::unique_ptr<char[]> pAppIdTemp(_StringConverter::CopyToCharArrayN(*pAppId));
                pAppIdChar = std::move(pAppIdTemp);
        }
@@ -507,12 +483,14 @@ _NotificationManagerImpl::NotifyMessage(_NotifyType notifyType, bool isOngoing,
                {
                        if (badgeNumber == 0)
                        {
-                               RemoveBadge(pAppIdChar.get());
+                               r = RemoveBadge(pAppIdChar.get());
+                               SysTryReturnResult(NID_SHELL, !IsFailed(r), r, "Failed to remove the badge.");
                        }
                        else
                        if (badgeNumber > 0)
                        {
-                               SetBadgeCount(pAppIdChar.get(), badgeNumber);
+                               r = SetBadgeCount(pAppIdChar.get(), badgeNumber);
+                               SysTryReturnResult(NID_SHELL, !IsFailed(r), r, "Failed to set the badge.");
                        }
                }
                if (!(isOngoing || !contentText.IsEmpty()))
@@ -554,7 +532,7 @@ _NotificationManagerImpl::NotifyMessage(_NotifyType notifyType, bool isOngoing,
        {
                needUpdate = true;              // No need to notification_insert.
        }
-       SysTryReturnResult(NID_SHELL, notiHandle != null , E_SYSTEM, "A system error has been occurred. Notification creation/load failed ");
+       SysTryReturnResult(NID_SHELL, notiHandle != null, E_OPERATION_FAILED, "Notification creation or loading failed.");
 
        // Content text(Alert text)
        std::unique_ptr<char[]> pMsg(_StringConverter::CopyToCharArrayN(contentText));
@@ -576,7 +554,7 @@ _NotificationManagerImpl::NotifyMessage(_NotifyType notifyType, bool isOngoing,
                        std::unique_ptr<char[]> pTitleTextTemp(_StringConverter::CopyToCharArrayN(appName));
                        pTitleText = std::move(pTitleTextTemp);
                        free(pAppName);
-                       //SysLog(NID_SHELL, "Application Id is %ls.", appName.GetPointer());
+                       SysLog(NID_SHELL, "App name is %ls.", appName.GetPointer());
                }
                SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Failed to get title from app_manager_get_app_name for default setting.", GetErrorMessage(r));
        }
@@ -598,7 +576,7 @@ _NotificationManagerImpl::NotifyMessage(_NotifyType notifyType, bool isOngoing,
                        pIconPath = std::move(pIconPathTemp);
                        free(pDefaultIconPath);
                }
-               SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Notification Set icon path failed.", GetErrorMessage(r));
+               SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Setting the icon path failed.", GetErrorMessage(r));
        }
        // Sound file path
        std::unique_ptr<char[]> pSoundPath(null);
@@ -611,23 +589,23 @@ _NotificationManagerImpl::NotifyMessage(_NotifyType notifyType, bool isOngoing,
        if (notifyType == NOTIFY_TYPE_APP_ID)
        {
                r = ConvertNotificationResult(notification_set_pkgname(notiHandle, pAppIdChar.get()));
-               SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Notification Set Package name failed.", GetErrorMessage(r));
+               SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Setting the package name failed.", GetErrorMessage(r));
        }
        // Set - title text
        if (pTitleText.get())
        {
                r = ConvertNotificationResult(notification_set_text(notiHandle, NOTIFICATION_TEXT_TYPE_TITLE, pTitleText.get(), NULL, NOTIFICATION_VARIABLE_TYPE_NONE));
-               SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Notification Set Title Text failed.", GetErrorMessage(r));
+               SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Setting the title text failed.", GetErrorMessage(r));
        }
        // Set - content text
        if (pMsg.get())
        {
                r = ConvertNotificationResult(notification_set_text(notiHandle, NOTIFICATION_TEXT_TYPE_CONTENT, pMsg.get(), NULL, NOTIFICATION_VARIABLE_TYPE_NONE));
-               SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Notification Set Title Text failed.", GetErrorMessage(r));
+               SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Setting content text failed.", GetErrorMessage(r));
        }
        // Set - icon file path
        r = ConvertNotificationResult(notification_set_image(notiHandle, NOTIFICATION_IMAGE_TYPE_ICON, pIconPath.get()));
-       SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Notification Set icon path failed.", GetErrorMessage(r));
+       SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Setting the icon path failed.", GetErrorMessage(r));
        // Set - sound file path
        if (pSoundPath.get())
        {
@@ -651,7 +629,7 @@ _NotificationManagerImpl::NotifyMessage(_NotifyType notifyType, bool isOngoing,
                        r = ConvertNotificationResult(notification_set_sound(notiHandle, NOTIFICATION_SOUND_TYPE_DEFAULT, NULL));
                }
        }
-       SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Notification Set sound failed.", GetErrorMessage(r));
+       SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Setting the sound failed.", GetErrorMessage(r));
 
        // Set extended - text, thumbnail and background image
        if (!isOngoing)
@@ -681,7 +659,7 @@ _NotificationManagerImpl::NotifyMessage(_NotifyType notifyType, bool isOngoing,
                {
                        std::unique_ptr<char[]> pBgImageFilePath(_StringConverter::CopyToCharArrayN(bgImageFilePath));
                        r = ConvertNotificationResult(notification_set_image(notiHandle, NOTIFICATION_IMAGE_TYPE_BACKGROUND, pBgImageFilePath.get()));
-                       SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Notification Set Background image path failed.", GetErrorMessage(r));
+                       SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Setting the background image path failed.", GetErrorMessage(r));
                }
 
 
@@ -703,7 +681,7 @@ _NotificationManagerImpl::NotifyMessage(_NotifyType notifyType, bool isOngoing,
                                        const String* pThumbnailPath = static_cast<const String*>(pThumbnailList->GetAt(i));
                                        std::unique_ptr<char[]> filePath(_StringConverter::CopyToCharArrayN(*pThumbnailPath));
                                        r = ConvertNotificationResult(notification_set_image(notiHandle, thumbnailListEnum[i], filePath.get()));
-                                       SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Notification Set thumnail path  failed.", GetErrorMessage(r));
+                                       SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Setting the thumbnail path failed.", GetErrorMessage(r));
                                }
                        }
                }
@@ -724,14 +702,14 @@ _NotificationManagerImpl::NotifyMessage(_NotifyType notifyType, bool isOngoing,
                                                std::unique_ptr<char[]> leftText(_StringConverter::CopyToCharArrayN(subText));
                                                r = ConvertNotificationResult(notification_set_text(notiHandle, NOTIFICATION_TEXT_TYPE_INFO_1, leftText.get(),
                                                                                                                                                        NULL, NOTIFICATION_VARIABLE_TYPE_NONE));
-                                               SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Notification Set Info1 Text failed.", GetErrorMessage(r));
+                                               SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Setting the Info1 text failed.", GetErrorMessage(r));
                                                subText.Clear();
                                                if (E_SUCCESS == pText1->SubString(matchIndex+1, subText))
                                                {
                                                        std::unique_ptr<char[]> rightText(_StringConverter::CopyToCharArrayN(subText));
                                                        r = ConvertNotificationResult(notification_set_text(notiHandle, NOTIFICATION_TEXT_TYPE_INFO_SUB_1, rightText.get(),
                                                                                                                                                                NULL, NOTIFICATION_VARIABLE_TYPE_NONE));
-                                                       SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Notification Set Info1 Sub Text failed.", GetErrorMessage(r));
+                                                       SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Setting the Info1 sub text failed.", GetErrorMessage(r));
                                                }
                                        }
                                        else
@@ -739,7 +717,7 @@ _NotificationManagerImpl::NotifyMessage(_NotifyType notifyType, bool isOngoing,
                                                std::unique_ptr<char[]> leftText(_StringConverter::CopyToCharArrayN(*pText1));
                                                r = ConvertNotificationResult(notification_set_text(notiHandle, NOTIFICATION_TEXT_TYPE_INFO_1, leftText.get(),
                                                                                                                                                        NULL, NOTIFICATION_VARIABLE_TYPE_NONE));
-                                               SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Notification Set Info1 Text failed.", GetErrorMessage(r));
+                                               SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Setting the Info1 text failed.", GetErrorMessage(r));
                                        }
                                }
                                const String* pText2 = static_cast<const String*>(pMessageTextList->GetAt(1));
@@ -755,14 +733,14 @@ _NotificationManagerImpl::NotifyMessage(_NotifyType notifyType, bool isOngoing,
                                                std::unique_ptr<char[]> leftText(_StringConverter::CopyToCharArrayN(subText));
                                                r = ConvertNotificationResult(notification_set_text(notiHandle, NOTIFICATION_TEXT_TYPE_INFO_2, leftText.get(),
                                                                                                                                                        NULL, NOTIFICATION_VARIABLE_TYPE_NONE));
-                                               SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Notification Set Info2 Text failed.", GetErrorMessage(r));
+                                               SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Setting the Info2 text failed.", GetErrorMessage(r));
                                                subText.Clear();
                                                if (E_SUCCESS == pText2->SubString(matchIndex+1, subText))
                                                {
                                                        std::unique_ptr<char[]> rightText(_StringConverter::CopyToCharArrayN(subText));
                                                        r = ConvertNotificationResult(notification_set_text(notiHandle, NOTIFICATION_TEXT_TYPE_INFO_SUB_2, rightText.get(),
                                                                                                                                                                NULL, NOTIFICATION_VARIABLE_TYPE_NONE));
-                                                       SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Notification Set Info2 Sub Text failed.", GetErrorMessage(r));
+                                                       SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Setting the Info2 sub text failed.", GetErrorMessage(r));
                                                }
                                        }
                                        else
@@ -770,13 +748,13 @@ _NotificationManagerImpl::NotifyMessage(_NotifyType notifyType, bool isOngoing,
                                                std::unique_ptr<char[]> leftText(_StringConverter::CopyToCharArrayN(*pText2));
                                                r = ConvertNotificationResult(notification_set_text(notiHandle, NOTIFICATION_TEXT_TYPE_INFO_2, leftText.get(),
                                                                                                                                                        NULL, NOTIFICATION_VARIABLE_TYPE_NONE));
-                                               SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Notification Set Info2 Text failed.", GetErrorMessage(r));
+                                               SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Setting the Info2 text failed.", GetErrorMessage(r));
                                        }
                                }
                        }
                        else
                        if (needUpdate)
-                       {       // Reset text for update case. also must be check the previous text with get_text
+                       {       // Reset text for update case. also must be checked the previous text with get_text
                                char* pRetStr = null;
                                notification_get_text(notiHandle, NOTIFICATION_TEXT_TYPE_INFO_1, &pRetStr);
                                if (pRetStr)
@@ -785,7 +763,8 @@ _NotificationManagerImpl::NotifyMessage(_NotifyType notifyType, bool isOngoing,
                                                                                                                                                         NOTIFICATION_TEXT_TYPE_INFO_2, NOTIFICATION_TEXT_TYPE_INFO_SUB_2 };
                                        for (unsigned int i = 0; i < sizeof(infoTextEnums)/sizeof(infoTextEnums[0]); i++)
                                        {
-                                               notification_set_text(notiHandle, infoTextEnums[i], null, NULL, NOTIFICATION_VARIABLE_TYPE_NONE);
+                                               r = ConvertNotificationResult(notification_set_text(notiHandle, infoTextEnums[i], null, NULL, NOTIFICATION_VARIABLE_TYPE_NONE));
+                                               SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Setting the initial text failed.", GetErrorMessage(r));
                                        }
                                }
                        }
@@ -793,34 +772,39 @@ _NotificationManagerImpl::NotifyMessage(_NotifyType notifyType, bool isOngoing,
        }
 
        // Set - service
+       int retVal = SERVICE_ERROR_NONE;
+
        r = arg.Construct(launchArguments);
-       SysTryCatch(NID_SHELL, !IsFailed(r), , r, "[%s] Propagated.", GetErrorMessage(r));
+       SysTryCatch(NID_SHELL, !IsFailed(r), r = E_OPERATION_FAILED, r, "[E_OPERATION_FAILED] Failed to construct _AppArg.");
 
        pBundle = arg.GetBundle();
 
        service_create_request(pBundle, &hSvc);
-       SysTryCatch(NID_SHELL, hSvc != null, r = E_OPERATION_FAILED, r, "[E_OPERATION_FAILED] A system error has been occurred. service_create_request failed.");
+       SysTryCatch(NID_SHELL, hSvc != null, r = E_OPERATION_FAILED, r, "[E_OPERATION_FAILED] service_create_request failed.");
 
        if (notifyType == NOTIFY_TYPE_SIMPLE || notifyType == NOTIFY_TYPE_APP_ID)
        {
-               service_set_app_id(hSvc, pRequestImpl->IsAppBinding() ? pAppIdChar.get() : null);
+               retVal = service_set_app_id(hSvc, pRequestImpl->IsAppBinding() ? pAppIdChar.get() : null);
+               SysTryCatch(NID_SHELL, retVal == SERVICE_ERROR_NONE, r = E_OPERATION_FAILED, r, "[E_OPERATION_FAILED] service_set_app_id failed(%d).", retVal);
        }
        else
        if (notifyType == NOTIFY_TYPE_APP_CONTROL)
        {
                std::unique_ptr<char[]> pOperationIdChar(_StringConverter::CopyToCharArrayN(*pOperationId));
-               int retVal = service_set_operation(hSvc, pOperationIdChar.get());
-               SysTryCatch(NID_SHELL, retVal == SERVICE_ERROR_NONE, r = E_OPERATION_FAILED, r, "[E_OPERATION_FAILED] A system error has been occurred. service_create_request failed.");
+               retVal = service_set_operation(hSvc, pOperationIdChar.get());
+               SysTryCatch(NID_SHELL, retVal == SERVICE_ERROR_NONE, r = E_OPERATION_FAILED, r, "[E_OPERATION_FAILED] service_set_operation failed(%d).", retVal);
 
                if (pUriData)
                {
                        std::unique_ptr<char[]> pUri(_StringConverter::CopyToCharArrayN(*pUriData));
-                       service_set_uri(hSvc, pUri.get());
+                       retVal = service_set_uri(hSvc, pUri.get());
+                       SysTryLog(NID_SHELL, retVal == SERVICE_ERROR_NONE, "service_set_uri failed(%d).", retVal);
                }
                if (pDataType)
                {
                        std::unique_ptr<char[]> pMime(_StringConverter::CopyToCharArrayN(*pDataType));
-                       service_set_mime(hSvc, pMime.get());
+                       retVal = service_set_mime(hSvc, pMime.get());
+                       SysTryLog(NID_SHELL, retVal == SERVICE_ERROR_NONE, "service_set_mime failed(%d).", retVal);
                }
                if (pExtraData)
                {
@@ -835,30 +819,26 @@ _NotificationManagerImpl::NotifyMessage(_NotifyType notifyType, bool isOngoing,
                                        {
                                                std::unique_ptr<char[]> pKeyString(_StringConverter::CopyToCharArrayN(*pKey));
                                                std::unique_ptr<char[]> pValueString(_StringConverter::CopyToCharArrayN(*pValue));
-                                               service_add_extra_data(hSvc, pKeyString.get(), pValueString.get());
+                                               retVal = service_add_extra_data(hSvc, pKeyString.get(), pValueString.get());
+                                               SysTryLog(NID_SHELL, retVal == SERVICE_ERROR_NONE, "service_add_extra_data failed(%d).", retVal);
                                        }
                                        else
                                        {
-                                               SysLog(NID_SHELL, "pKey or pValue is ivalid.");
+                                               SysLog(NID_SHELL, "pKey or pValue is invalid.");
                                        }
                                }
                        }
                }
        }
 
-       if (service_to_bundle(hSvc, &service_data) == SERVICE_ERROR_NONE)
-       {
-               r = ConvertNotificationResult(notification_set_property(notiHandle, 0));
-               SysTryLog(NID_SHELL, !IsFailed(r), "[%s] notification_set_property failed.", GetErrorMessage(r));
-               r = ConvertNotificationResult(notification_set_execute_option(notiHandle, NOTIFICATION_EXECUTE_TYPE_SINGLE_LAUNCH,
-                                                                                                                                         NULL, NULL, service_data));
-               SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Nnotification_set_execute_option failed.", GetErrorMessage(r));
-               SysLog(NID_SHELL, "notification_set_execute_option");
-       }
-       else
-       {
-               SysLog(NID_SHELL, "service_to_bundle failed");
-       }
+       retVal = service_to_bundle(hSvc, &service_data);
+       SysTryCatch(NID_SHELL, retVal == SERVICE_ERROR_NONE, r = E_OPERATION_FAILED, r, "[E_OPERATION_FAILED] service_to_bundle failed(%d).", retVal);
+
+       r = ConvertNotificationResult(notification_set_property(notiHandle, 0));
+       SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Setting the notification property failed.", GetErrorMessage(r));
+
+       r = ConvertNotificationResult(notification_set_execute_option(notiHandle, NOTIFICATION_EXECUTE_TYPE_SINGLE_LAUNCH, NULL, NULL, service_data));
+       SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Setting the execute option failed.", GetErrorMessage(r));
 
        // Set layout
        if (isOngoing)
@@ -874,7 +854,7 @@ _NotificationManagerImpl::NotifyMessage(_NotifyType notifyType, bool isOngoing,
                }
        }
        r = ConvertNotificationResult(notification_set_layout(notiHandle, layout));
-       SysTryLog(NID_SHELL, !IsFailed(r), "[%s] notification_set_layout failure.", GetErrorMessage(r));
+       SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Setting the notification layout failed.", GetErrorMessage(r));
 
        // For ongoing
        if (isOngoing)
@@ -888,27 +868,27 @@ _NotificationManagerImpl::NotifyMessage(_NotifyType notifyType, bool isOngoing,
                        if (needUpdate)
                        {
                                r = ConvertNotificationResult(notification_set_size(notiHandle, 0));    // Reset for override BYTE type
-                               SysTryLog(NID_SHELL, !IsFailed(r), "[%s] notification_set_size failure.", GetErrorMessage(r));
+                               SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Setting the notification size failed.", GetErrorMessage(r));
                        }
                        r = ConvertNotificationResult(notification_set_progress(notiHandle, progress/100.));
-                       SysTryLog(NID_SHELL, !IsFailed(r), "[%s] notification_set_progress failure.", GetErrorMessage(r));
+                       SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Setting the notification progress failed.", GetErrorMessage(r));
                        break;
 
                case ONGOING_ACTIVITY_TYPE_PROGRESS_BYTE:
                        if (needUpdate)
                        {
                                r = ConvertNotificationResult(notification_set_progress(notiHandle, 0.0));      // Reset for override PERCENTAGE type
-                               SysTryLog(NID_SHELL, !IsFailed(r), "[%s] notification_set_progress failure.", GetErrorMessage(r));
+                               SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Setting the notification progress failed.", GetErrorMessage(r));
                        }
                        r = ConvertNotificationResult(notification_set_size(notiHandle, progress));
-                       SysTryLog(NID_SHELL, !IsFailed(r), "[%s] notification_set_size failure.", GetErrorMessage(r));
+                       SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Setting the notification size failed.", GetErrorMessage(r));
                        break;
 
                case ONGOING_ACTIVITY_TYPE_TEXT:
                        r = ConvertNotificationResult(notification_set_progress(notiHandle, 0.0));      // Reset the progress
-                       SysTryLog(NID_SHELL, !IsFailed(r), "[%s] notification_set_size failure.", GetErrorMessage(r));
+                       SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Setting the notification progress failed.", GetErrorMessage(r));
                        r = ConvertNotificationResult(notification_set_size(notiHandle, 0));
-                       SysTryLog(NID_SHELL, !IsFailed(r), "[%s] notification_set_size failure.", GetErrorMessage(r));
+                       SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Setting the notification size failed.", GetErrorMessage(r));
                        break;
 
                default:
@@ -921,8 +901,10 @@ _NotificationManagerImpl::NotifyMessage(_NotifyType notifyType, bool isOngoing,
        if (!needUpdate)
        {       // new
                r = ConvertNotificationResult(notification_insert(notiHandle, &notiPrivateId));
-               SysLog(NID_SHELL, "Insert notification and get new notiPrivateId(%d)", notiPrivateId);
-               SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Notification post failure.", GetErrorMessage(r));
+               SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Setting new notification failed.", GetErrorMessage(r));
+
+               SysLog(NID_SHELL, "Getting new notiPrivateId(%d)", notiPrivateId);
+
                if (isOngoing)
                {
                        __notifyPrivateIdForOngoing  = notiPrivateId;
@@ -938,23 +920,23 @@ _NotificationManagerImpl::NotifyMessage(_NotifyType notifyType, bool isOngoing,
                if (isOngoing)
                {
                        r = ConvertNotificationResult(notification_get_display_applist(notiHandle, &previousDisplaySet));
-                       SysTryLog(NID_SHELL, !IsFailed(r), "[%s] notification_set_display_applist failure.", GetErrorMessage(r));
+                       SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Setting the notification area failed.", GetErrorMessage(r));
+
                        int newDisplaySet = previousDisplaySet & ~NOTIFICATION_DISPLAY_APP_TICKER;
                        r = ConvertNotificationResult(notification_set_display_applist(notiHandle, newDisplaySet));
-                       SysTryLog(NID_SHELL, !IsFailed(r), "[%s] notification_set_display_applist failure.", GetErrorMessage(r));
+                       SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Setting the notification area failed.", GetErrorMessage(r));
                }
 
                r = ConvertNotificationResult(notification_update(notiHandle));
-               SysTryLog(NID_SHELL, !IsFailed(r), "[%s] notification_update failure. notiPrivateId(%d)", GetErrorMessage(r), notiPrivateId);
+               SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Updating the notification failed. notiPrivateId(%d)", GetErrorMessage(r), notiPrivateId);
 
                if (isOngoing)
                {
                        r = ConvertNotificationResult(notification_set_display_applist(notiHandle, previousDisplaySet));
-                       SysTryLog(NID_SHELL, !IsFailed(r), "[%s] notification_set_display_applist failure.", GetErrorMessage(r));
+                       SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Setting the notification area failed.", GetErrorMessage(r));
                }
        }
 
-
 CATCH:
        service_destroy(hSvc);
        notification_free(notiHandle);
@@ -993,12 +975,12 @@ _NotificationManagerImpl::RemoveNotification(bool onGoing)
                {
                        SysLog(NID_SHELL, "Notification already deleted.");
                }
-               notification_free(notiHandle);
+               err = notification_free(notiHandle);
        }
        else
        {
                err = notification_delete_all_by_type(null, notiType);
-               SysLog(NID_SHELL, "All [%s] notification deleted.", onGoing ? "Ongoing" : "Normal");
+               SysLog(NID_SHELL, "All [%s] notifications deleted.", onGoing ? "Ongoing" : "Normal");
        }
 
        SysTryReturnResult(NID_SHELL, err == NOTIFICATION_ERROR_NONE, E_OPERATION_FAILED, "Failed to RemoveNotification with reason (%d).", err);
@@ -1029,46 +1011,53 @@ _NotificationManagerImpl::RemoveNotificationByAppId(const Tizen::App::AppId& app
                {
                        SysLog(NID_SHELL, "Notification already deleted.");
                }
-               notification_free(notiHandle);
+               err = notification_free(notiHandle);
        }
        else
        {
                err = notification_delete_all_by_type(pAppId.get(), notiType);
-               SysLog(NID_SHELL, "All [%s] notification deleted.", onGoing ? "Ongoing" : "Normal");
+               SysLog(NID_SHELL, "All [%s] notifications deleted.", onGoing ? "Ongoing" : "Normal");
        }
 
        SysTryReturnResult(NID_SHELL, err == NOTIFICATION_ERROR_NONE, E_OPERATION_FAILED, "Failed to RemoveNotificationByAppId with reason (%d).", err);
        return r;
 }
 
-void
+result
 _NotificationManagerImpl::RemoveBadge(const char* pkgName) const
 {
        bool badgeExist = false;
        badge_error_e badgeError = badge_is_existing(pkgName, &badgeExist);
-       SysLog(NID_SHELL, "badge_is_existing: exitst= %d, error= %d.", badgeExist, badgeError); //#####
+       SysTryLog(NID_SHELL, badgeError == BADGE_ERROR_NONE, "badge_is_existing failed(%d).", badgeError);
+
        if (badgeExist)
        {
                badgeError = badge_remove(pkgName);
-               SysLog(NID_SHELL, "badge_remove: error= %d.", badgeError);      //#####
+               SysTryReturnResult(NID_SHELL, badgeError == BADGE_ERROR_NONE, E_OPERATION_FAILED, "badge_remove failed(%d).", badgeError);
        }
-       SysLog(NID_SHELL, "Badge removed.");
+
+       SysLog(NID_SHELL, "Badge is removed.");
+       return E_SUCCESS;
 }
 
-void
+result
 _NotificationManagerImpl::SetBadgeCount(const char* pkgName, int badgeCount) const
 {
        bool badgeExist;
        badge_error_e badgeError = badge_is_existing(pkgName, &badgeExist);
-       SysLog(NID_SHELL, "badge_is_existing: error= %d.", badgeError); //#####
+       SysTryLog(NID_SHELL, badgeError == BADGE_ERROR_NONE, "badge_is_existing failed(%d).", badgeError);
+
        if (!badgeExist)
        {
                badgeError = badge_create(pkgName, pkgName);
-               SysLog(NID_SHELL, "badge_create: error= %d.", badgeError);      //#####
+               SysTryReturnResult(NID_SHELL, badgeError == BADGE_ERROR_NONE, E_OPERATION_FAILED, "badge_create failed(%d).", badgeError);
        }
 
-       badge_set_count(pkgName, badgeCount);
-       SysLog(NID_SHELL, "badge_set_count: badgeNumber= %d.", badgeCount);
+       badgeError = badge_set_count(pkgName, badgeCount);
+       SysTryLog(NID_SHELL, badgeError == BADGE_ERROR_NONE, "badge_set_count failed(%d).", badgeError);
+
+       SysLog(NID_SHELL, "Badge count is %d.", badgeCount);
+       return E_SUCCESS;
 }
 
 int
@@ -1079,12 +1068,12 @@ _NotificationManagerImpl::GetBadgeCount(const char* pkgName) const
        badge_error_e badgeError = badge_get_count(pkgName, &count);
        if (badgeError == BADGE_ERROR_NONE)
        {
-               SysLog(NID_SHELL, "badge_get_count: ret= %d.", count);
+               SysLog(NID_SHELL, "badge_get_count(%d)", count);
                return count;
        }
        else
        {
-               SysLog(NID_SHELL, "badge_get_count: error= %d.", badgeError);
+               SysLog(NID_SHELL, "badge_get_count(%d)", badgeError);
                return -1;
        }
 }
@@ -1105,7 +1094,8 @@ result
 _NotificationManagerImpl::RemoveBadgeEventListener(IBadgeEventListener& listener)
 {
        SysLog(NID_SHELL, "RemoveBadgeEventListener (%x)", &listener);
-       result r = __badgeEventListenerList.Remove(&listener);
+
+       result r = __badgeEventListenerList.Remove(&listener);  // Remove() can return E_SUCCESS and E_OBJ_NOT_FOUND.
        SysTryReturn(NID_SHELL, !IsFailed(r), r, r, "Failed to RemoveBadgeEventListener with reason (%s)", GetErrorMessage(r) );
 
        return _BadgeManagerImpl::GetInstance()->RemovePrimaryBadgeEventListener(*this);

diff --git a/src/inc/FShell_NotificationManagerImpl.h b/src/inc/FShell_NotificationManagerImpl.h
index fd95334..a1d7aec 100644 (file)
--- a/src/inc/FShell_NotificationManagerImpl.h
+++ b/src/inc/FShell_NotificationManagerImpl.h
@@ -488,8 +488,8 @@ private:
        _NotificationManagerImpl(const _NotificationManagerImpl& rhs);
        _NotificationManagerImpl& operator =(const _NotificationManagerImpl& rhs);
 
-       void RemoveBadge(const char* pkgName) const;
-       void SetBadgeCount(const char* pkgName, int badgeCount) const;
+       result RemoveBadge(const char* pkgName) const;
+       result SetBadgeCount(const char* pkgName, int badgeCount) const;
        int GetBadgeCount(const char* pkgName) const;
 
 private: