From 1de1e3a41971ec72b32b8205adb08b10fbca69ee Mon Sep 17 00:00:00 2001 From: hyunho Date: Tue, 16 Apr 2019 18:53:56 +0900 Subject: [PATCH 01/16] Fix update hide logic Without this patch, DPMReporter will unintentionally skip event which hide viewer list is empty Change-Id: I1216dd6e5be63cec9aa78c851d8ff71151f8d929 Signed-off-by: hyunho --- src/notification_ex_service.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/notification_ex_service.cc b/src/notification_ex_service.cc index a1d94f0..34670a2 100755 --- a/src/notification_ex_service.cc +++ b/src/notification_ex_service.cc @@ -143,6 +143,9 @@ class DPMReporter : public Reporter { int ret; string hide_list; int uid = static_pointer_cast(updatedItem->GetInfo())->GetUid(); + DBG("try update hide app_id(%s) sender(%s) uid(%s)", + updatedItem->GetId().c_str(), + updatedItem->GetSenderAppId().c_str(), string(to_string(uid)).c_str()); string map_key = updatedItem->GetId() + updatedItem->GetSenderAppId() + string(to_string(uid)); list updated_hide_list = static_pointer_cast(updatedItem->GetInfo())->GetHideViewerList(); @@ -159,6 +162,9 @@ class DPMReporter : public Reporter { facade_->hide_map_[map_key] = hide_list; return ERROR_NONE; + } else { + DBG("Empty hide viewer list"); + return ERROR_NOT_EXIST_ID; } } -- 2.7.4 From 4ed7b9018fdf867d036b0738950952522ea4297f Mon Sep 17 00:00:00 2001 From: hyunho Date: Tue, 16 Apr 2019 19:17:16 +0900 Subject: [PATCH 02/16] Add notification-ex require for .spec Change-Id: If5b209b20712acc5be5b1270e8be7d0ef9a2c3fa Signed-off-by: hyunho --- packaging/data-provider-master.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/data-provider-master.spec b/packaging/data-provider-master.spec index 46617ca..ff2f363 100755 --- a/packaging/data-provider-master.spec +++ b/packaging/data-provider-master.spec @@ -31,8 +31,8 @@ BuildRequires: pkgconfig(libsystemd-daemon) BuildRequires: pkgconfig(alarm-service) BuildRequires: pkgconfig(libtzplatform-config) +Requires: notification-ex Requires(post): dbus - %description %prep -- 2.7.4 From 4af34f3fbb0f404728ad87b016b6971c692534db Mon Sep 17 00:00:00 2001 From: hyunho Date: Wed, 17 Apr 2019 11:06:22 +0900 Subject: [PATCH 03/16] Release version 1.6.4 Changes: - Fix update hide logic - Add notification-ex require for .spec Change-Id: I17f4f1113e7289e22ccf750e7d9dce3a90dca966 Signed-off-by: hyunho --- packaging/data-provider-master.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/data-provider-master.spec b/packaging/data-provider-master.spec index ff2f363..3412fec 100755 --- a/packaging/data-provider-master.spec +++ b/packaging/data-provider-master.spec @@ -2,7 +2,7 @@ Name: data-provider-master Summary: Master service provider for badge, shortcut, notification -Version: 1.6.3 +Version: 1.6.4 Release: 1 Group: Applications/Core Applications License: Apache-2.0 -- 2.7.4 From 9d99a9bfa9948a255c308b26aa2dedeb9ea7a64f Mon Sep 17 00:00:00 2001 From: "mk5004.lee" Date: Wed, 24 Apr 2019 14:07:57 +0900 Subject: [PATCH 04/16] Check c++ coding style - cpplint tool Change-Id: I422f557ddc22bea22cb3212c57de137d6299c875 Signed-off-by: mk5004.lee --- src/notification_ex_service.cc | 61 ++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 35 deletions(-) diff --git a/src/notification_ex_service.cc b/src/notification_ex_service.cc index 34670a2..f2f8c23 100755 --- a/src/notification_ex_service.cc +++ b/src/notification_ex_service.cc @@ -17,6 +17,7 @@ #include #include #include + #include #include #include @@ -39,37 +40,36 @@ #include "debug.h" #include "notification_ex_service.h" -using namespace notification; using namespace std; +using namespace notification; using namespace notification::item; class DPMFacade { - public: - DPMFacade(unique_ptr reporter, unique_ptr manager) - : reporter_(move(reporter)), manager_(move(manager)) { - DBManager::InitializeDB(); - DBManager::InitializeData(); - hide_map_ = DBManager::GetHideMap(); - } - - void DelegateReporterEvent(const IEventInfo& info, shared_ptr item) { - reporter_->SendEvent(info, item); - } - - void DelegateManagerEvent(const IEventInfo& info, shared_ptr noti) { - manager_->SendEvent(info, noti); - } - - unique_ptr reporter_; - unique_ptr manager_; - map hide_map_; + public: + DPMFacade(unique_ptr reporter, unique_ptr manager) + : reporter_(move(reporter)), manager_(move(manager)) { + DBManager::InitializeDB(); + DBManager::InitializeData(); + hide_map_ = DBManager::GetHideMap(); + } + + void DelegateReporterEvent(const IEventInfo& info, shared_ptr item) { + reporter_->SendEvent(info, item); + } + + void DelegateManagerEvent(const IEventInfo& info, shared_ptr noti) { + manager_->SendEvent(info, noti); + } + + unique_ptr reporter_; + unique_ptr manager_; + map hide_map_; }; static DPMFacade* facade_; class DPMReporter : public Reporter { protected: - void OnUpdate(const IEventInfo& info, shared_ptr updatedItem) { DBG("Update !!!"); @@ -95,7 +95,6 @@ class DPMReporter : public Reporter { } else { SendError(info, static_cast(ret)); } - } void OnDelete(const IEventInfo& info, @@ -113,7 +112,6 @@ class DPMReporter : public Reporter { } else { SendError(info, static_cast(ret)); } - } void OnEvent(const IEventInfo& info, @@ -121,7 +119,7 @@ class DPMReporter : public Reporter { LOGI("Event received (%d) !!", (int)info.GetEventType()); int type = info.GetEventType(); for (auto& i : noti_list) { - switch(type) { + switch (type) { case IEventInfo::EventType::Update: OnUpdate(info, i); break; @@ -171,7 +169,7 @@ class DPMReporter : public Reporter { /* Check new hide app */ hide_list = noti->second; for (auto& i : updated_hide_list) { - if(hide_list.find(i + ";") == string::npos) { + if (hide_list.find(i + ";") == string::npos) { string new_hide_list = hide_list + i + ";"; ret = DBManager::UpdateHideList(updatedItem, new_hide_list); if (ret != ERROR_NONE) @@ -218,7 +216,7 @@ class DPMManager : public Manager { } } - void OnAdd(const IEventInfo& info, + void OnAdd(const IEventInfo& info, list> addedItem) override { DBG("Add !!!"); int ret; @@ -230,7 +228,6 @@ class DPMManager : public Manager { } else { DBG("SendError !!!"); SendError(info, static_cast(ret)); - } } @@ -260,7 +257,6 @@ class DPMManager : public Manager { } else { SendError(info, static_cast(ret)); } - } list> OnRequestEvent(const IEventInfo& info) override { @@ -289,16 +285,11 @@ HAPI int notification_ex_service_init() { unique_ptr( new DPMReporter( unique_ptr(new DBusSender(Manager::GetPath())), - unique_ptr(new DBusEventListener(Reporter::GetPath())) - ) - ), + unique_ptr(new DBusEventListener(Reporter::GetPath())))), unique_ptr( new DPMManager( unique_ptr(new DBusSender(Reporter::GetPath())), - unique_ptr(new DBusEventListener(Manager::GetPath())) - ) - ) - ); + unique_ptr(new DBusEventListener(Manager::GetPath()))))); return ERROR_NONE; } -- 2.7.4 From 6307040b7ef1809fa0072bec1e5619e3f64ba2db Mon Sep 17 00:00:00 2001 From: "mk5004.lee" Date: Thu, 25 Apr 2019 10:28:02 +0900 Subject: [PATCH 05/16] Release version 1.6.5 - Check c++ coding style Change-Id: I4a24bb9dbf0fda5fcdad902da68adc8b23dda7e8 Signed-off-by: mk5004.lee --- packaging/data-provider-master.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/data-provider-master.spec b/packaging/data-provider-master.spec index 3412fec..1446386 100755 --- a/packaging/data-provider-master.spec +++ b/packaging/data-provider-master.spec @@ -2,7 +2,7 @@ Name: data-provider-master Summary: Master service provider for badge, shortcut, notification -Version: 1.6.4 +Version: 1.6.5 Release: 1 Group: Applications/Core Applications License: Apache-2.0 -- 2.7.4 From 92179b065c236ffe5e82efb153468f9468f1036e Mon Sep 17 00:00:00 2001 From: hyunho Date: Fri, 26 Apr 2019 13:47:42 +0900 Subject: [PATCH 06/16] Add delete all, get count implementation Change-Id: Ieda636fbd0562f033e2e00b7497e4d1f863ab12e Signed-off-by: hyunho --- src/notification_ex_service.cc | 56 +++++++++++++++++++++++++++++++++--------- 1 file changed, 45 insertions(+), 11 deletions(-) diff --git a/src/notification_ex_service.cc b/src/notification_ex_service.cc index f2f8c23..8d2e5ae 100755 --- a/src/notification_ex_service.cc +++ b/src/notification_ex_service.cc @@ -97,12 +97,9 @@ class DPMReporter : public Reporter { } } - void OnDelete(const IEventInfo& info, + void DoDelete(const IEventInfo& info, shared_ptr deletedItem) { - DBG("Delete !!!"); - int ret; - - ret = DBManager::DeleteNotification(deletedItem); + int ret = DBManager::DeleteNotification(deletedItem); if (ret == ERROR_NONE) { /* noti owner */ facade_->DelegateManagerEvent(info, deletedItem); @@ -114,10 +111,29 @@ class DPMReporter : public Reporter { } } + void OnDelete(const IEventInfo& info, + shared_ptr deletedItem) { + DBG("Delete !!!"); + if (info.GetEventType() == IEventInfo::EventType::DeleteAll) { + list> noti_list = + DBManager::GetNotificationList(((const IEventInfoInternal&)info).GetUid()); + for (auto& i : noti_list) { + DoDelete(info, i); + } + } else { + DoDelete(info, deletedItem); + } + } + void OnEvent(const IEventInfo& info, list> noti_list) override { LOGI("Event received (%d) !!", (int)info.GetEventType()); int type = info.GetEventType(); + if (type == IEventInfo::EventType::DeleteAll) { + OnDelete(info, nullptr); + return; + } + for (auto& i : noti_list) { switch (type) { case IEventInfo::EventType::Update: @@ -137,6 +153,12 @@ class DPMReporter : public Reporter { return DBManager::GetNotificationList(((const IEventInfoInternal&)info).GetUid()); } + int OnRequestNumber(const IEventInfo& info) override { + DBG("Get count !!! %s", info.GetItemId().c_str()); + return DBManager::GetNotificationList( + ((const IEventInfoInternal&)info).GetUid()).size(); + } + int UpdateHideApp(shared_ptr updatedItem) { int ret; string hide_list; @@ -246,12 +268,9 @@ class DPMManager : public Manager { } } - void OnDelete(const IEventInfo& info, - shared_ptr deletedItem) override { - DBG("Delete !!!"); - int ret; - - ret = DBManager::DeleteNotification(deletedItem); + void DoDelete(const IEventInfo& info, + shared_ptr deletedItem) { + int ret = DBManager::DeleteNotification(deletedItem); if (ret == ERROR_NONE) { facade_->DelegateReporterEvent(info, deletedItem); } else { @@ -259,6 +278,21 @@ class DPMManager : public Manager { } } + void OnDelete(const IEventInfo& info, + shared_ptr deletedItem) override { + DBG("Delete !!!"); + if (info.GetEventType() == IEventInfo::EventType::DeleteAll) { + list> noti_list = + DBManager::GetNotificationList(info.GetOwner(), + ((const IEventInfoInternal&)info).GetUid()); + for (auto& i : noti_list) { + DoDelete(info, i); + } + } else { + DoDelete(info, deletedItem); + } + } + list> OnRequestEvent(const IEventInfo& info) override { DBG("Get !!! %s", info.GetOwner().c_str()); -- 2.7.4 From 9ab04c5a1aba71214167941df635f7026ad0b04c Mon Sep 17 00:00:00 2001 From: hyunho Date: Fri, 26 Apr 2019 15:55:18 +0900 Subject: [PATCH 07/16] Release version 1.6.6 Changes: - Add delete all, get count implementation Change-Id: Ifd54c15bb59cdf76084f5d7a0fb4e582507757f5 Signed-off-by: hyunho --- packaging/data-provider-master.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/data-provider-master.spec b/packaging/data-provider-master.spec index 1446386..387177c 100755 --- a/packaging/data-provider-master.spec +++ b/packaging/data-provider-master.spec @@ -2,7 +2,7 @@ Name: data-provider-master Summary: Master service provider for badge, shortcut, notification -Version: 1.6.5 +Version: 1.6.6 Release: 1 Group: Applications/Core Applications License: Apache-2.0 -- 2.7.4 From 7fa4cd6526d4674380ce328fae1ee8a5e5e73b8c Mon Sep 17 00:00:00 2001 From: hyunho Date: Wed, 5 Jun 2019 17:27:41 +0900 Subject: [PATCH 08/16] Modify conf file for owning org.tizen.notification_ex Change-Id: Ib54e57006e566e92176fa0b524aef48415d1f460 Signed-off-by: hyunho --- data-provider-master.conf.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/data-provider-master.conf.in b/data-provider-master.conf.in index aafed87..8b0a72b 100644 --- a/data-provider-master.conf.in +++ b/data-provider-master.conf.in @@ -5,13 +5,19 @@ - + + + + + + + -- 2.7.4 From 9682f0f40d64ad8fee4561e9f9d7189bdb968705 Mon Sep 17 00:00:00 2001 From: hyunho Date: Wed, 5 Jun 2019 19:07:50 +0900 Subject: [PATCH 09/16] Release version 1.6.7 Changes: - Modify conf file for owning org.tizen.notification_ex Change-Id: I97f65de8612118f7158edb1a6655664abc51d4bf Signed-off-by: hyunho --- packaging/data-provider-master.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/data-provider-master.spec b/packaging/data-provider-master.spec index 387177c..b663373 100755 --- a/packaging/data-provider-master.spec +++ b/packaging/data-provider-master.spec @@ -2,7 +2,7 @@ Name: data-provider-master Summary: Master service provider for badge, shortcut, notification -Version: 1.6.6 +Version: 1.6.7 Release: 1 Group: Applications/Core Applications License: Apache-2.0 -- 2.7.4 From b9641f89e8f435f848ce8ddf63ef2c22fbbbf878 Mon Sep 17 00:00:00 2001 From: hyunho Date: Mon, 10 Jun 2019 10:10:29 +0900 Subject: [PATCH 10/16] Fix dbus conf file error Change-Id: I346673fbc24871426093ede500fffe5bb0520550 Signed-off-by: hyunho --- data-provider-master.conf.in | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/data-provider-master.conf.in b/data-provider-master.conf.in index 8b0a72b..ff95f88 100644 --- a/data-provider-master.conf.in +++ b/data-provider-master.conf.in @@ -12,12 +12,20 @@ + + + + + + + + - + -- 2.7.4 From 220e5057d03ae358daca294e80b049c0d04b04b0 Mon Sep 17 00:00:00 2001 From: hyunho Date: Mon, 10 Jun 2019 10:39:44 +0900 Subject: [PATCH 11/16] Release version 1.6.8 Changes: - Fix dbus conf file error Change-Id: If3700c8e4dec01ea05a94af2cd49e505fa0f07ad Signed-off-by: hyunho --- packaging/data-provider-master.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/data-provider-master.spec b/packaging/data-provider-master.spec index b663373..f35d75d 100755 --- a/packaging/data-provider-master.spec +++ b/packaging/data-provider-master.spec @@ -2,7 +2,7 @@ Name: data-provider-master Summary: Master service provider for badge, shortcut, notification -Version: 1.6.7 +Version: 1.6.8 Release: 1 Group: Applications/Core Applications License: Apache-2.0 -- 2.7.4 From 54bc0c8b0b1bce1b7c0b99a9d78de512dadc66fb Mon Sep 17 00:00:00 2001 From: "SukHyung, Kang" Date: Fri, 21 Jun 2019 17:40:06 +0900 Subject: [PATCH 12/16] change to send item list when post Change-Id: Ic7b77617716fb6dfa0e20eb4b3d5b46ea269808c Signed-off-by: SukHyung, Kang --- src/notification_ex_service.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/notification_ex_service.cc b/src/notification_ex_service.cc index 8d2e5ae..a16d198 100755 --- a/src/notification_ex_service.cc +++ b/src/notification_ex_service.cc @@ -57,6 +57,11 @@ class DPMFacade { reporter_->SendEvent(info, item); } + void DelegateReporterEvent(const IEventInfo& info, + std::list> itemList) { + reporter_->SendEvent(info, itemList); + } + void DelegateManagerEvent(const IEventInfo& info, shared_ptr noti) { manager_->SendEvent(info, noti); } @@ -245,8 +250,7 @@ class DPMManager : public Manager { ret = DBManager::InsertNotification(addedItem); if (ret == ERROR_NONE) { - for (auto& i : addedItem) - facade_->DelegateReporterEvent(info, i); + facade_->DelegateReporterEvent(info, addedItem); } else { DBG("SendError !!!"); SendError(info, static_cast(ret)); @@ -295,7 +299,6 @@ class DPMManager : public Manager { list> OnRequestEvent(const IEventInfo& info) override { DBG("Get !!! %s", info.GetOwner().c_str()); - if (info.GetItemId().empty()) { /* get */ return DBManager::GetNotificationList(info.GetOwner(), -- 2.7.4 From fac9c0863caa9b326d937077750cdf369616124b Mon Sep 17 00:00:00 2001 From: "SukHyung, Kang" Date: Thu, 27 Jun 2019 10:58:24 +0900 Subject: [PATCH 13/16] Release version 1.6.9 Changes: - change to send item list when post Change-Id: Ie0c226dc578973dc4cea2f8507bf48b6fc1057ba Signed-off-by: SukHyung, Kang --- packaging/data-provider-master.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/data-provider-master.spec b/packaging/data-provider-master.spec index f35d75d..b944c64 100755 --- a/packaging/data-provider-master.spec +++ b/packaging/data-provider-master.spec @@ -2,7 +2,7 @@ Name: data-provider-master Summary: Master service provider for badge, shortcut, notification -Version: 1.6.8 +Version: 1.6.9 Release: 1 Group: Applications/Core Applications License: Apache-2.0 -- 2.7.4 From 53c68a4f2c0cb75d0204462e19e2425d41db4f0f Mon Sep 17 00:00:00 2001 From: hyunho Date: Tue, 2 Jul 2019 17:08:38 +0900 Subject: [PATCH 14/16] Add Get by a channel feature Change-Id: Ic27b128bd08dd7969f534174d155b9bc91f12fb4 Signed-off-by: hyunho --- src/notification_ex_service.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/notification_ex_service.cc b/src/notification_ex_service.cc index a16d198..b9f44f4 100755 --- a/src/notification_ex_service.cc +++ b/src/notification_ex_service.cc @@ -155,7 +155,9 @@ class DPMReporter : public Reporter { list> OnRequestEvent(const IEventInfo& info) override { DBG("Get report !!! %s", info.GetItemId().c_str()); - return DBManager::GetNotificationList(((const IEventInfoInternal&)info).GetUid()); + return DBManager::GetNotificationList( + ((const IEventInfoInternal&)info).GetUid(), + ((const IEventInfoInternal&)info).GetChannel().c_str()); } int OnRequestNumber(const IEventInfo& info) override { -- 2.7.4 From 370cbbf9f5012a19cdf40b30bdeb357b65d1721e Mon Sep 17 00:00:00 2001 From: "mk5004.lee" Date: Tue, 9 Jul 2019 18:28:03 +0900 Subject: [PATCH 15/16] Release version 1.6.10 - Add Get by a channel feature Change-Id: I648e59cf8977a7f525a8fa0d854e69ae3b7bb35e Signed-off-by: mk5004.lee --- packaging/data-provider-master.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/data-provider-master.spec b/packaging/data-provider-master.spec index b944c64..06b06d1 100755 --- a/packaging/data-provider-master.spec +++ b/packaging/data-provider-master.spec @@ -2,7 +2,7 @@ Name: data-provider-master Summary: Master service provider for badge, shortcut, notification -Version: 1.6.9 +Version: 1.6.10 Release: 1 Group: Applications/Core Applications License: Apache-2.0 -- 2.7.4 From 6d44a71c9af7f966a566868b0f6c2d0d0cb6982d Mon Sep 17 00:00:00 2001 From: INSUN PYO Date: Mon, 8 Jul 2019 19:43:20 +0900 Subject: [PATCH 16/16] Delete meaningless configuration Change-Id: Ic2fa84634b75fd0885c05421b1e29101ffe2dcd9 --- org.tizen.data-provider-master.service.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/org.tizen.data-provider-master.service.in b/org.tizen.data-provider-master.service.in index d95dab5..49d12da 100644 --- a/org.tizen.data-provider-master.service.in +++ b/org.tizen.data-provider-master.service.in @@ -2,5 +2,3 @@ Name=org.tizen.data_provider_service Exec=/bin/false SystemdService=data-provider-master.service -User=app_fw -Group=app_fw -- 2.7.4