Fix a bug when package id of notification can not be found

Change-Id: Iac68eef4333f13228709a0a755162fd9e7ddadb9
Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>

diff --git a/data/default_icon.png b/data/default_icon.png
new file mode 100755 (executable)
index 0000000..9765b1b
Binary files /dev/null and b/data/default_icon.png differ

diff --git a/packaging/krate.spec b/packaging/krate.spec
index fa9ee49..1050b89 100644 (file)
--- a/packaging/krate.spec
+++ b/packaging/krate.spec
@@ -38,6 +38,7 @@ krates.
 %attr(700,root,root) %{_sbindir}/krate-volume-manager
 %{_unitdir}/krate.service
 %{_unitdir}/multi-user.target.wants/krate.service
+%attr(644,root,root) %{TZ_SYS_RO_ICONS}/krate/default_icon.png
 %attr(644,root,root) %{TZ_SYS_RO_ICONS}/krate/shortcut_icon.png
 %attr(644,root,root) %{TZ_SYS_RO_ICONS}/krate/indicator_icon.png
 %attr(644,root,root) %{TZ_SYS_RO_ICONS}/krate/notification_sub_icon.png

diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 91bc477..0cdaa7e 100644 (file)
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -64,6 +64,7 @@ CONFIGURE_FILE(systemd/krate.service.in systemd/krate.service)
 INSTALL(TARGETS ${SERVER_NAME} DESTINATION ${BIN_DIR})
 INSTALL(FILES systemd/krate.service DESTINATION ${SYSTEMD_UNIT_DIR})
 
+INSTALL(FILES ${KRATE_DATA}/default_icon.png DESTINATION ${ICON_DIR})
 INSTALL(FILES ${KRATE_DATA}/indicator_icon.png DESTINATION ${ICON_DIR})
 INSTALL(FILES ${KRATE_DATA}/notification_sub_icon.png DESTINATION ${ICON_DIR})
 INSTALL(FILES ${KRATE_DATA}/shortcut_icon.png DESTINATION ${ICON_DIR})

diff --git a/server/manager.cpp b/server/manager.cpp
index c96e877..1acd6d9 100644 (file)
--- a/server/manager.cpp
+++ b/server/manager.cpp
@@ -42,6 +42,7 @@
 #include "rmi/manager.h"
 
 #define KRATE_DELEGATOR_APP  "org.tizen.keyguard"
+#define DEFAULT_ICON_PATH  ICON_PATH "/default_icon.png"
 #define NOTIFICATION_SUB_ICON_PATH  ICON_PATH "/notification_sub_icon.png"
 
 namespace Krate {
@@ -344,8 +345,13 @@ void notiProxyInsert(const runtime::User& owner, const runtime::User& user, int
        notification_clone(noti, &newNoti);
 
        notification_get_pkgname(noti, &pkgId);
-       PackageInfo pkg(pkgId, user.getUid());
-       notification_set_image(newNoti, NOTIFICATION_IMAGE_TYPE_ICON, pkg.getIcon().c_str());
+       try {
+               PackageInfo pkg(pkgId, user.getUid());
+               notification_set_image(newNoti, NOTIFICATION_IMAGE_TYPE_ICON, pkg.getIcon().c_str());
+       } catch (runtime::Exception &e) {
+               notification_set_image(newNoti, NOTIFICATION_IMAGE_TYPE_ICON, DEFAULT_ICON_PATH);
+       }
+
        notification_set_image(newNoti, NOTIFICATION_IMAGE_TYPE_ICON_SUB, NOTIFICATION_SUB_ICON_PATH);
 
        notification_get_launch_option(newNoti, NOTIFICATION_LAUNCH_OPTION_APP_CONTROL, (void *)&appControl);