Add conditional statement to check the channel

 - OnReueestEvent
 - To suport reporter_get_by_channel, get_all

Change-Id: I7423210a1c18544ca89deea52f04b9f2080d2fbd
Signed-off-by: mk5004.lee <mk5004.lee@samsung.com>

diff --git a/src/badge_service.c b/src/badge_service.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/main.cc b/src/main.cc
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/notification_ex_service.cc b/src/notification_ex_service.cc
index 1982098e50da6cd6f9437657d8dc76ecf12f0250..50fefef176155808c905d3af9bf4d312c60398ec 100644 (file)
--- a/src/notification_ex_service.cc
+++ b/src/notification_ex_service.cc
@@ -615,16 +615,21 @@ class DPMManager : public Manager {
     list<shared_ptr<item::AbstractItem>> item_list;
     uid_t uid = facade_->GetUid(info);
     if (info.GetItemId().empty()) {
-      /* get */
-      item_list = DBManager::GetNotificationList(info.GetOwner(), uid);
-      facade_->TranslateText(item_list);
-
-      return item_list;
+      if (!info.GetChannel().empty()) {
+        /* get by channel */
+        item_list = DBManager::GetNotificationList(info.GetOwner(), uid, info.GetChannel());
+        facade_->TranslateText(item_list);
+        return item_list;
+      } else {
+        /* get all*/
+        item_list = DBManager::GetNotificationList(info.GetOwner(), uid);
+        facade_->TranslateText(item_list);
+        return item_list;
+      }
     } else {
       /*  FindByRootID */
       item_list = DBManager::GetNotificationList(info.GetOwner(), info.GetItemId(), uid);
       facade_->TranslateText(item_list);
-
       return item_list;
     }
   }

diff --git a/src/notification_service.c b/src/notification_service.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/pkgmgr.c b/src/pkgmgr.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/service_common.c b/src/service_common.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/shortcut_service.c b/src/shortcut_service.c
old mode 100755 (executable)
new mode 100644 (file)