From 1de84cfd63923e5321f70c32836aafd15dce1ad5 Mon Sep 17 00:00:00 2001 From: "mk5004.lee" Date: Wed, 4 Mar 2020 18:36:05 +0900 Subject: [PATCH] Add conditional statement to check the channel - OnReueestEvent - To suport reporter_get_by_channel, get_all Change-Id: I7423210a1c18544ca89deea52f04b9f2080d2fbd Signed-off-by: mk5004.lee --- src/badge_service.c | 0 src/main.cc | 0 src/notification_ex_service.cc | 17 +++++++++++------ src/notification_service.c | 0 src/pkgmgr.c | 0 src/service_common.c | 0 src/shortcut_service.c | 0 7 files changed, 11 insertions(+), 6 deletions(-) mode change 100755 => 100644 src/badge_service.c mode change 100755 => 100644 src/main.cc mode change 100755 => 100644 src/notification_service.c mode change 100755 => 100644 src/pkgmgr.c mode change 100755 => 100644 src/service_common.c mode change 100755 => 100644 src/shortcut_service.c diff --git a/src/badge_service.c b/src/badge_service.c old mode 100755 new mode 100644 diff --git a/src/main.cc b/src/main.cc old mode 100755 new mode 100644 diff --git a/src/notification_ex_service.cc b/src/notification_ex_service.cc index 1982098..50fefef 100644 --- a/src/notification_ex_service.cc +++ b/src/notification_ex_service.cc @@ -615,16 +615,21 @@ class DPMManager : public Manager { list> 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 new mode 100644 diff --git a/src/pkgmgr.c b/src/pkgmgr.c old mode 100755 new mode 100644 diff --git a/src/service_common.c b/src/service_common.c old mode 100755 new mode 100644 diff --git a/src/shortcut_service.c b/src/shortcut_service.c old mode 100755 new mode 100644 -- 2.7.4