From fcbac83fb46444aaad30e4fa4cd34422a7dc82af Mon Sep 17 00:00:00 2001 From: "mk5004.lee" Date: Mon, 16 Mar 2020 13:09:12 +0900 Subject: [PATCH 01/16] Release version 1.6.18 - Add delete by appid func Change-Id: I8471c865dd8e08b2e042183addb506e0eb98c3df 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 628046f..1367fc6 100644 --- 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.17 +Version: 1.6.18 Release: 1 Group: Applications/Core Applications License: Apache-2.0 -- 2.7.4 From 6d7d3649a822d52a91d1e39aa4899ac728c44114 Mon Sep 17 00:00:00 2001 From: "mk5004.lee" Date: Fri, 20 Mar 2020 16:39:59 +0900 Subject: [PATCH 02/16] To get deleted item's info when viewer delete all Change-Id: Ic4df886c738171fc72bb5b92c0838d0009ec9ff0 Signed-off-by: mk5004.lee --- src/notification_ex_service.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/notification_ex_service.cc b/src/notification_ex_service.cc index 5603c2b..1740179 100644 --- a/src/notification_ex_service.cc +++ b/src/notification_ex_service.cc @@ -373,9 +373,10 @@ class DPMReporter : public Reporter { else noti_list = DBManager::GetNotificationList( facade_->GetUid(info), info.GetChannel()); - for (auto& i : noti_list) { - DoDelete(info, i); - } + + EventInfo event_info(EventInfo::Delete, info.GetOwner(), info.GetChannel()); + for (auto& i : noti_list) + DoDelete(event_info, i); } else { DoDelete(info, deletedItem); } -- 2.7.4 From e7984484d4e16071e731f6ef5533173ce06484d0 Mon Sep 17 00:00:00 2001 From: "mk5004.lee" Date: Fri, 20 Mar 2020 17:07:32 +0900 Subject: [PATCH 03/16] Release version 1.6.19 - To get deleted item's info when viewer delete all Change-Id: Idac0fbde7ef174acc93311f35ec39afcebe89449 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 1367fc6..cc6f6c9 100644 --- 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.18 +Version: 1.6.19 Release: 1 Group: Applications/Core Applications License: Apache-2.0 -- 2.7.4 From 963d5c4f0dce8cc9256e7287cbbcc4f5abc6a4d3 Mon Sep 17 00:00:00 2001 From: "mk5004.lee" Date: Tue, 17 Mar 2020 15:08:03 +0900 Subject: [PATCH 04/16] Support to update/delete by noti list Change-Id: Ia0c8bd04e586c495134e9e2acadc49e52fa4870d Signed-off-by: mk5004.lee --- src/notification_ex_service.cc | 184 ++++++++++++++++++++--------------------- 1 file changed, 89 insertions(+), 95 deletions(-) diff --git a/src/notification_ex_service.cc b/src/notification_ex_service.cc index 1740179..20ed93b 100644 --- a/src/notification_ex_service.cc +++ b/src/notification_ex_service.cc @@ -75,18 +75,13 @@ class DPMFacade { } void DelegateReporterEvent(const IEventInfo& info, - shared_ptr item) { - reporter_->SendEvent(info, item); - } - - void DelegateReporterEvent(const IEventInfo& info, - std::list> itemList) { + list> itemList) { reporter_->SendEvent(info, itemList); } void DelegateManagerEvent(const IEventInfo& info, - shared_ptr noti) { - manager_->SendEvent(info, noti); + list> itemList) { + manager_->SendEvent(info, itemList); } void LaunchDefaultViewer(list> item, @@ -105,6 +100,7 @@ class DPMFacade { static_pointer_cast( item.front()->GetInfo())->GetUid()); } + void LaunchDefaultViewer(shared_ptr item, notification_op_type_e status) { LaunchDefaultViewer( @@ -187,6 +183,7 @@ class DPMFacade { return true; } + bool CheckDoNoDisturbStatus(uid_t uid, const string& owner) { int ret; bool do_not_disturb = false; @@ -318,7 +315,7 @@ static DPMFacade* facade_; class DPMReporter : public Reporter { protected: void OnUpdate(const IEventInfo& info, - shared_ptr updatedItem) { + list> updatedItem) { DBG("Update !!!"); int ret; @@ -346,7 +343,7 @@ class DPMReporter : public Reporter { } void DoDelete(const IEventInfo& info, - shared_ptr deletedItem) { + list> deletedItem) { int ret = DBManager::DeleteNotification(deletedItem); if (ret == ERROR_NONE) { /* noti owner */ @@ -363,7 +360,7 @@ class DPMReporter : public Reporter { } void OnDelete(const IEventInfo& info, - shared_ptr deletedItem) { + list> deletedItem) { DBG("Delete !!!"); if (info.GetEventType() == IEventInfo::EventType::DeleteAll) { list> noti_list; @@ -375,8 +372,7 @@ class DPMReporter : public Reporter { facade_->GetUid(info), info.GetChannel()); EventInfo event_info(EventInfo::Delete, info.GetOwner(), info.GetChannel()); - for (auto& i : noti_list) - DoDelete(event_info, i); + DoDelete(event_info, noti_list); } else { DoDelete(info, deletedItem); } @@ -386,25 +382,22 @@ class DPMReporter : public Reporter { list> noti_list) override { LOGI("Event received (%d) !!", (int)info.GetEventType()); int type = info.GetEventType(); - if (type == IEventInfo::EventType::DeleteAll) { - OnDelete(info, nullptr); - return; - } else if (type == IEventInfo::EventType::Register) { - OnRegister(info); - return; - } - for (auto& i : noti_list) { - switch (type) { + switch (type) { case IEventInfo::EventType::Update: - OnUpdate(info, i); + OnUpdate(info, noti_list); break; case IEventInfo::EventType::Delete: - OnDelete(info, i); + OnDelete(info, noti_list); + break; + case IEventInfo::EventType::DeleteAll: + OnDelete(info, noti_list); + break; + case IEventInfo::EventType::Register: + OnRegister(info); break; default : break; - } } } @@ -428,49 +421,50 @@ class DPMReporter : public Reporter { return DBManager::GetNotificationList(facade_->GetUid(info)).size(); } - int UpdateHideApp(shared_ptr updatedItem) { + int UpdateHideApp(list> updatedItem) { 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(); - - /* Check new hide app */ - auto noti = facade_->hide_map_.find(map_key); - if (noti == facade_->hide_map_.end()) { - if (updated_hide_list.size() > 0) { - for (auto& i : updated_hide_list) - hide_list += i + ";"; - - ret = DBManager::UpdateHideList(updatedItem, hide_list); - if (ret != ERROR_NONE) - return ret; - - facade_->hide_map_[map_key] = hide_list; - return ERROR_NONE; - } else { - DBG("Empty hide viewer list"); - return ERROR_NOT_EXIST_ID; + for (auto& i : updatedItem) { + string hide_list; + int uid = static_pointer_cast(i->GetInfo())->GetUid(); + DBG("try update hide app_id(%s) sender(%s) uid(%s)", + i->GetId().c_str(), + i->GetSenderAppId().c_str(), string(to_string(uid)).c_str()); + string map_key = i->GetId() + i->GetSenderAppId() + string(to_string(uid)); + list updated_hide_list = static_pointer_cast(i->GetInfo())->GetHideViewerList(); + + /* Check new hide app */ + auto noti = facade_->hide_map_.find(map_key); + if (noti == facade_->hide_map_.end()) { + if (updated_hide_list.size() > 0) { + for (auto& j : updated_hide_list) + hide_list += j + ";"; + + ret = DBManager::UpdateHideList(i, hide_list); + if (ret != ERROR_NONE) + return ret; + + facade_->hide_map_[map_key] = hide_list; + return ERROR_NONE; + } else { + DBG("Empty hide viewer list"); + return ERROR_NOT_EXIST_ID; + } } - } - /* Check new hide app */ - hide_list = noti->second; - for (auto& i : updated_hide_list) { - 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) - return ret; - - facade_->hide_map_[map_key] = new_hide_list; - return ERROR_NONE; + /* Check new hide app */ + hide_list = noti->second; + for (auto& j : updated_hide_list) { + if (hide_list.find(j + ";") == string::npos) { + string new_hide_list = hide_list + j + ";"; + ret = DBManager::UpdateHideList(i, new_hide_list); + if (ret != ERROR_NONE) + return ret; + + facade_->hide_map_[map_key] = new_hide_list; + return ERROR_NONE; + } } } - return ERROR_NOT_EXIST_ID; } @@ -497,30 +491,6 @@ class DPMReporter : public Reporter { class DPMManager : public Manager { protected: - void UpdateHideApp(shared_ptr updatedItem) { - string hide_list; - int uid = static_pointer_cast(updatedItem->GetInfo())->GetUid(); - string map_key = updatedItem->GetId() + updatedItem->GetSenderAppId() + string(to_string(uid)); - list updated_hide_list = - static_pointer_cast(updatedItem->GetInfo())->GetHideViewerList(); - - auto noti = facade_->hide_map_.find(map_key); - if (noti == facade_->hide_map_.end()) - return; - - /* hide app list synchronization */ - hide_list = noti->second; - istringstream stream(hide_list); - string hide_app_id; - - while (getline(stream, hide_app_id, ';')) { - list::iterator iter = std::find(updated_hide_list.begin(), - updated_hide_list.end(), hide_app_id); - if (iter == updated_hide_list.end()) - static_pointer_cast(updatedItem->GetInfo())->AddHideViewer(hide_app_id); - } - } - void OnAdd(const IEventInfo& info, list> addedItem) override { DBG("Add !!!"); @@ -554,7 +524,7 @@ class DPMManager : public Manager { } void OnUpdate(const IEventInfo& info, - shared_ptr updatedItem) override { + list> updatedItem) override { DBG("Update !!!"); int ret; @@ -586,7 +556,7 @@ class DPMManager : public Manager { } int DoDelete(const IEventInfo& info, - shared_ptr deletedItem) { + list> deletedItem) { int ret; ret = DBManager::DeleteNotification(deletedItem); @@ -601,16 +571,14 @@ class DPMManager : public Manager { } void OnDelete(const IEventInfo& info, - shared_ptr deletedItem) override { + list> deletedItem) override { DBG("Delete !!!"); if (info.GetEventType() == IEventInfo::EventType::DeleteAll) { list> noti_list = DBManager::GetNotificationList(info.GetOwner(), facade_->GetUid(info), - info.GetChannel()); - for (auto& i : noti_list) { - EventInfo event_info(EventInfo::Delete, info.GetOwner(), info.GetChannel()); - DoDelete(event_info, i); - } + info.GetChannel()); + EventInfo event_info(EventInfo::Delete, info.GetOwner(), info.GetChannel()); + DoDelete(event_info, noti_list); facade_->LaunchDefaultViewer(noti_list, NOTIFICATION_OP_DELETE); } else { int ret = DoDelete(info, deletedItem); @@ -643,6 +611,32 @@ class DPMManager : public Manager { } } + void UpdateHideApp(list> updatedItem) { + for (auto& i : updatedItem) { + string hide_list; + int uid = static_pointer_cast(i->GetInfo())->GetUid(); + string map_key = i->GetId() + i->GetSenderAppId() + string(to_string(uid)); + list updated_hide_list = + static_pointer_cast(i->GetInfo())->GetHideViewerList(); + + auto noti = facade_->hide_map_.find(map_key); + if (noti == facade_->hide_map_.end()) + return; + + /* hide app list synchronization */ + hide_list = noti->second; + istringstream stream(hide_list); + string hide_app_id; + + while (getline(stream, hide_app_id, ';')) { + list::iterator iter = std::find(updated_hide_list.begin(), + updated_hide_list.end(), hide_app_id); + if (iter == updated_hide_list.end()) + static_pointer_cast(i->GetInfo())->AddHideViewer(hide_app_id); + } + } + } + void SetIndirectRequest(const IEventInfo& info, list> addedItem) { for (auto& i : addedItem) -- 2.7.4 From 5dd9e5c6c37955dcff2e23d0fa8137a59499008e Mon Sep 17 00:00:00 2001 From: "mk5004.lee" Date: Thu, 26 Mar 2020 17:32:29 +0900 Subject: [PATCH 05/16] Change func argument name Change-Id: Iefb2645e5ea43aa69b10aca66124ea3a8aa236e4 Signed-off-by: mk5004.lee --- src/notification_ex_service.cc | 102 ++++++++++++++++++++--------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/src/notification_ex_service.cc b/src/notification_ex_service.cc index 20ed93b..243a975 100644 --- a/src/notification_ex_service.cc +++ b/src/notification_ex_service.cc @@ -315,12 +315,12 @@ static DPMFacade* facade_; class DPMReporter : public Reporter { protected: void OnUpdate(const IEventInfo& info, - list> updatedItem) { + list> updatedList) { DBG("Update !!!"); int ret; /* check Manager::Hide() */ - ret = UpdateHideApp(updatedItem); + ret = UpdateHideApp(updatedList); if (ret == ERROR_NONE) return; @@ -329,30 +329,30 @@ class DPMReporter : public Reporter { return; } - ret = DBManager::UpdateNotification(updatedItem); + ret = DBManager::UpdateNotification(updatedList); if (ret == ERROR_NONE) { - facade_->TranslateText(updatedItem); + facade_->TranslateText(updatedList); /* noti owner */ - facade_->DelegateManagerEvent(info, updatedItem); + facade_->DelegateManagerEvent(info, updatedList); /* noti to viewers */ - facade_->DelegateReporterEvent(info, updatedItem); + facade_->DelegateReporterEvent(info, updatedList); } else { SendError(info, static_cast(ret)); } } void DoDelete(const IEventInfo& info, - list> deletedItem) { - int ret = DBManager::DeleteNotification(deletedItem); + list> deletedList) { + int ret = DBManager::DeleteNotification(deletedList); if (ret == ERROR_NONE) { /* noti owner */ - facade_->DelegateManagerEvent(info, deletedItem); + facade_->DelegateManagerEvent(info, deletedList); /* noti to viewers */ - facade_->DelegateReporterEvent(info, deletedItem); + facade_->DelegateReporterEvent(info, deletedList); - facade_->shared_file_.RemovePrivateSharing(deletedItem, + facade_->shared_file_.RemovePrivateSharing(deletedList, facade_->receiver_group_list_); } else { SendError(info, static_cast(ret)); @@ -360,7 +360,7 @@ class DPMReporter : public Reporter { } void OnDelete(const IEventInfo& info, - list> deletedItem) { + list> deletedList) { DBG("Delete !!!"); if (info.GetEventType() == IEventInfo::EventType::DeleteAll) { list> noti_list; @@ -374,7 +374,7 @@ class DPMReporter : public Reporter { EventInfo event_info(EventInfo::Delete, info.GetOwner(), info.GetChannel()); DoDelete(event_info, noti_list); } else { - DoDelete(info, deletedItem); + DoDelete(info, deletedList); } } @@ -421,9 +421,9 @@ class DPMReporter : public Reporter { return DBManager::GetNotificationList(facade_->GetUid(info)).size(); } - int UpdateHideApp(list> updatedItem) { + int UpdateHideApp(list> updatedList) { int ret; - for (auto& i : updatedItem) { + for (auto& i : updatedList) { string hide_list; int uid = static_pointer_cast(i->GetInfo())->GetUid(); DBG("try update hide app_id(%s) sender(%s) uid(%s)", @@ -492,31 +492,31 @@ class DPMReporter : public Reporter { class DPMManager : public Manager { protected: void OnAdd(const IEventInfo& info, - list> addedItem) override { + list> addedList) override { DBG("Add !!!"); int ret; - ret = ValidateUid(info, addedItem); + ret = ValidateUid(info, addedList); if (ret != ERROR_NONE) { SendError(info, static_cast(ret)); return; } - SetIndirectRequest(info, addedItem); + SetIndirectRequest(info, addedList); - if (facade_->CheckAllowedToNotify(addedItem) == false) + if (facade_->CheckAllowedToNotify(addedList) == false) return; - facade_->SetDoNoDisturbPolicy(addedItem); - facade_->SetPopUpPolicy(addedItem); + facade_->SetDoNoDisturbPolicy(addedList); + facade_->SetPopUpPolicy(addedList); - ret = DBManager::InsertNotification(addedItem); + ret = DBManager::InsertNotification(addedList); if (ret == ERROR_NONE) { - facade_->shared_file_.SetPrivateSharing(addedItem, + facade_->shared_file_.SetPrivateSharing(addedList, facade_->receiver_group_list_); - facade_->TranslateText(addedItem); - facade_->DelegateReporterEvent(info, addedItem); - facade_->LaunchDefaultViewer(addedItem, NOTIFICATION_OP_INSERT); + facade_->TranslateText(addedList); + facade_->DelegateReporterEvent(info, addedList); + facade_->LaunchDefaultViewer(addedList, NOTIFICATION_OP_INSERT); } else { DBG("SendError !!!"); SendError(info, static_cast(ret)); @@ -524,45 +524,45 @@ class DPMManager : public Manager { } void OnUpdate(const IEventInfo& info, - list> updatedItem) override { + list> updatedList) override { DBG("Update !!!"); int ret; - ret = ValidateUid(info, updatedItem); + ret = ValidateUid(info, updatedList); if (ret != ERROR_NONE) { SendError(info, static_cast(ret)); return; } - UpdateHideApp(updatedItem); - SetIndirectRequest(info, updatedItem); + UpdateHideApp(updatedList); + SetIndirectRequest(info, updatedList); - if (facade_->CheckAllowedToNotify(updatedItem) == false) + if (facade_->CheckAllowedToNotify(updatedList) == false) return; - facade_->SetDoNoDisturbPolicy(updatedItem); - facade_->SetPopUpPolicy(updatedItem); + facade_->SetDoNoDisturbPolicy(updatedList); + facade_->SetPopUpPolicy(updatedList); - ret = DBManager::UpdateNotification(updatedItem); + ret = DBManager::UpdateNotification(updatedList); if (ret == ERROR_NONE) { - facade_->shared_file_.UpdatePrivateSharing(updatedItem, + facade_->shared_file_.UpdatePrivateSharing(updatedList, facade_->receiver_group_list_); - facade_->TranslateText(updatedItem); - facade_->DelegateReporterEvent(info, updatedItem); - facade_->LaunchDefaultViewer(updatedItem, NOTIFICATION_OP_UPDATE); + facade_->TranslateText(updatedList); + facade_->DelegateReporterEvent(info, updatedList); + facade_->LaunchDefaultViewer(updatedList, NOTIFICATION_OP_UPDATE); } else { SendError(info, static_cast(ret)); } } int DoDelete(const IEventInfo& info, - list> deletedItem) { + list> deletedList) { int ret; - ret = DBManager::DeleteNotification(deletedItem); + ret = DBManager::DeleteNotification(deletedList); if (ret == ERROR_NONE) { - facade_->DelegateReporterEvent(info, deletedItem); - facade_->shared_file_.RemovePrivateSharing(deletedItem, + facade_->DelegateReporterEvent(info, deletedList); + facade_->shared_file_.RemovePrivateSharing(deletedList, facade_->receiver_group_list_); } else { SendError(info, static_cast(ret)); @@ -571,7 +571,7 @@ class DPMManager : public Manager { } void OnDelete(const IEventInfo& info, - list> deletedItem) override { + list> deletedList) override { DBG("Delete !!!"); if (info.GetEventType() == IEventInfo::EventType::DeleteAll) { list> noti_list = @@ -581,9 +581,9 @@ class DPMManager : public Manager { DoDelete(event_info, noti_list); facade_->LaunchDefaultViewer(noti_list, NOTIFICATION_OP_DELETE); } else { - int ret = DoDelete(info, deletedItem); + int ret = DoDelete(info, deletedList); if (ret == ERROR_NONE) - facade_->LaunchDefaultViewer(deletedItem, NOTIFICATION_OP_DELETE); + facade_->LaunchDefaultViewer(deletedList, NOTIFICATION_OP_DELETE); } } @@ -611,8 +611,8 @@ class DPMManager : public Manager { } } - void UpdateHideApp(list> updatedItem) { - for (auto& i : updatedItem) { + void UpdateHideApp(list> updatedList) { + for (auto& i : updatedList) { string hide_list; int uid = static_pointer_cast(i->GetInfo())->GetUid(); string map_key = i->GetId() + i->GetSenderAppId() + string(to_string(uid)); @@ -638,8 +638,8 @@ class DPMManager : public Manager { } void SetIndirectRequest(const IEventInfo& info, - list> addedItem) { - for (auto& i : addedItem) + list> addedList) { + for (auto& i : addedList) SetIndirectRequest(info, i); } @@ -694,9 +694,9 @@ class DPMManager : public Manager { bundle_free(b); } - int ValidateUid(const IEventInfo& info, list> addedItem) { + int ValidateUid(const IEventInfo& info, list> addedList) { int ret; - for (auto& i : addedItem) { + for (auto& i : addedList) { ret = ValidateUid(info, i); if (ret != ERROR_NONE) return ret; -- 2.7.4 From c0f8cc4fa6037e174d53c3017a9eaa96d5c1766a Mon Sep 17 00:00:00 2001 From: "mk5004.lee" Date: Mon, 30 Mar 2020 10:24:19 +0900 Subject: [PATCH 06/16] Release version 1.6.20 - Change func argument name Support to update/delete by noti list Change-Id: I0be48b567831ee18918fab3fd1e21522a52d2f20 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 cc6f6c9..06dd1c3 100644 --- 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.19 +Version: 1.6.20 Release: 1 Group: Applications/Core Applications License: Apache-2.0 -- 2.7.4 From 4b9f2cd92020d23679050b41109e16afad969e11 Mon Sep 17 00:00:00 2001 From: "mk5004.lee" Date: Mon, 30 Mar 2020 10:24:19 +0900 Subject: [PATCH 07/16] Release version 1.6.20 - Change func argument name Support to update/delete by noti list Change-Id: I0be48b567831ee18918fab3fd1e21522a52d2f20 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 cc6f6c9..06dd1c3 100644 --- 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.19 +Version: 1.6.20 Release: 1 Group: Applications/Core Applications License: Apache-2.0 -- 2.7.4 From 3dddb1647d4f34179ff9720ca272fc3838467296 Mon Sep 17 00:00:00 2001 From: "sanghyeok.oh" Date: Tue, 21 Apr 2020 21:27:17 +0900 Subject: [PATCH 08/16] [fix] Rename dbus auto-activation service file Naming rule for dbus auto-activation service file : well-known name + ".service" https://bugs.freedesktop.org/show_bug.cgi?id=99874 Change-Id: I2ca997c8d3bd8d036047a5e91b7f3c3cf300d895 --- CMakeLists.txt | 4 ++-- packaging/data-provider-master.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 824361f..5e0345c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,7 +54,7 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS}) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) CONFIGURE_FILE(data-provider-master.conf.in data-provider-master.conf @ONLY) -CONFIGURE_FILE(org.tizen.data-provider-master.service.in org.tizen.data-provider-master.service @ONLY) +CONFIGURE_FILE(org.tizen.data-provider-master.service.in org.tizen.data_provider_service.service @ONLY) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.tizen.data-provider-master.service DESTINATION ${SHARE_INSTALL_PREFIX}/dbus-1/system-services/) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.tizen.data_provider_service.service DESTINATION ${SHARE_INSTALL_PREFIX}/dbus-1/system-services/) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.conf DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d/) diff --git a/packaging/data-provider-master.spec b/packaging/data-provider-master.spec index 06dd1c3..85eafcb 100644 --- a/packaging/data-provider-master.spec +++ b/packaging/data-provider-master.spec @@ -69,7 +69,7 @@ install -m 0644 %SOURCE1 %{buildroot}%{_unitdir}/data-provider-master.service %license LICENSE %attr(0755,root,root) %{_bindir}/data-provider-master %attr(0644,root,root) %{_unitdir}/data-provider-master.service -%attr(0644,root,root) %{_datadir}/dbus-1/system-services/org.tizen.data-provider-master.service +%attr(0644,root,root) %{_datadir}/dbus-1/system-services/org.tizen.data_provider_service.service %config %{_sysconfdir}/dbus-1/system.d/data-provider-master.conf %{_prefix}/bin/%{name} #%defattr(-,owner,users,-) -- 2.7.4 From 4f665a72e12988671644053a3e01315f1778b895 Mon Sep 17 00:00:00 2001 From: "mk5004.lee" Date: Wed, 29 Apr 2020 10:40:28 +0900 Subject: [PATCH 09/16] Release version 1.6.21 - [fix] Rename dbus auto-activation service file Change-Id: I7d1e4501e6f5cabe2cb7cf5088b07f7977bc64b1 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 85eafcb..25473ca 100644 --- 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.20 +Version: 1.6.21 Release: 1 Group: Applications/Core Applications License: Apache-2.0 -- 2.7.4 From e767855bc12918191975224e18cc22f8495bddd7 Mon Sep 17 00:00:00 2001 From: "mk5004.lee" Date: Thu, 7 May 2020 16:33:16 +0900 Subject: [PATCH 10/16] Delete unnecessary dbus policy Change-Id: Icd1e9a3e1360651a668c56f6e465ed6eb7609217 Signed-off-by: mk5004.lee --- data-provider-master.conf.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/data-provider-master.conf.in b/data-provider-master.conf.in index 73d64ec..ddcc557 100644 --- a/data-provider-master.conf.in +++ b/data-provider-master.conf.in @@ -30,10 +30,6 @@ - - - - -- 2.7.4 From 598a04c29df84a4594060e96d9233f12febb1555 Mon Sep 17 00:00:00 2001 From: "mk5004.lee" Date: Wed, 20 May 2020 14:46:26 +0900 Subject: [PATCH 11/16] Support OnrequestNumber for reporter Change-Id: I8a4acd68fde49356e0145cdb33b0a96473e10aad Signed-off-by: mk5004.lee --- src/notification_ex_service.cc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/notification_ex_service.cc b/src/notification_ex_service.cc index 243a975..e9acbc1 100644 --- a/src/notification_ex_service.cc +++ b/src/notification_ex_service.cc @@ -611,6 +611,13 @@ class DPMManager : public Manager { } } + int OnRequestNumber(const IEventInfo& info) override { + int count = 0; + DBG("Get count !!! %s, %s", info.GetOwner().c_str(), info.GetChannel().c_str()); + DBManager::GetCount(info.GetOwner(), info.GetChannel(), facade_->GetUid(info), &count); + return count; + } + void UpdateHideApp(list> updatedList) { for (auto& i : updatedList) { string hide_list; -- 2.7.4 From f982359a5e21c4b03d7785b2fd9c9fbb50d41190 Mon Sep 17 00:00:00 2001 From: "mk5004.lee" Date: Wed, 20 May 2020 15:39:51 +0900 Subject: [PATCH 12/16] Release version 1.6.21 - Support OnrequestNumber for reporter Delete unnecessary dbus policy Change-Id: I90b73132ead626066d30758942f5e74b3c3b341a 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 25473ca..e98634b 100644 --- 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.21 +Version: 1.6.22 Release: 1 Group: Applications/Core Applications License: Apache-2.0 -- 2.7.4 From 0951b6ccf5416990bd2a5f5363bab87fc4fbf014 Mon Sep 17 00:00:00 2001 From: Jusung Son Date: Wed, 27 May 2020 11:30:11 +0900 Subject: [PATCH 13/16] Support pure noti-ex deletion Change-Id: Ib7819401690f895c13494b781ce15c8c379930ff Signed-off-by: Jusung Son --- src/notification_ex_service.cc | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/notification_ex_service.cc b/src/notification_ex_service.cc index e9acbc1..509a510 100644 --- a/src/notification_ex_service.cc +++ b/src/notification_ex_service.cc @@ -578,10 +578,20 @@ class DPMManager : public Manager { DBManager::GetNotificationList(info.GetOwner(), facade_->GetUid(info), info.GetChannel()); EventInfo event_info(EventInfo::Delete, info.GetOwner(), info.GetChannel()); + DoDelete(event_info, noti_list); facade_->LaunchDefaultViewer(noti_list, NOTIFICATION_OP_DELETE); } else { - int ret = DoDelete(info, deletedList); + int64_t priv_id = static_pointer_cast + (deletedList.front()->GetInfo())->GetPrivateId(); + list> noti_list; + if (priv_id == 0) { + noti_list = DBManager::GetNotificationList(info.GetOwner(), + deletedList.front()->GetId(), facade_->GetUid(info)); + } else { + noti_list = deletedList; + } + int ret = DoDelete(info, noti_list); if (ret == ERROR_NONE) facade_->LaunchDefaultViewer(deletedList, NOTIFICATION_OP_DELETE); } -- 2.7.4 From a4bdc55481b62d40c64b04b59216dd33c92cfa2d Mon Sep 17 00:00:00 2001 From: Jusung Son Date: Wed, 27 May 2020 13:42:54 +0900 Subject: [PATCH 14/16] Release version 1.6.23 Changes: - Support pure noti-ex deletion Change-Id: I7d932b121c685eabd36b17b857eb7460fe64e7db Signed-off-by: Jusung Son --- 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 e98634b..cdf1691 100644 --- 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.22 +Version: 1.6.23 Release: 1 Group: Applications/Core Applications License: Apache-2.0 -- 2.7.4 From d4f78a7a5f3a31add693b8687f6e64ab6226c189 Mon Sep 17 00:00:00 2001 From: "mk5004.lee" Date: Thu, 7 May 2020 17:21:36 +0900 Subject: [PATCH 15/16] Add dbus conf for notification.admin privilege Change-Id: I1faede8ec010aad7e014bdfce3fb42b897441073 Signed-off-by: mk5004.lee --- data-provider-master.conf.in | 4 ++++ src/main.cc | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/data-provider-master.conf.in b/data-provider-master.conf.in index ddcc557..d443b11 100644 --- a/data-provider-master.conf.in +++ b/data-provider-master.conf.in @@ -14,14 +14,17 @@ + + + @@ -34,5 +37,6 @@ + diff --git a/src/main.cc b/src/main.cc index 945c259..889eb36 100644 --- a/src/main.cc +++ b/src/main.cc @@ -73,6 +73,10 @@ static inline int app_create(int restart_count) lang_key_changed_cb(NULL, NULL); + ret = notification_service_init(restart_count); + if (ret < 0) + WARN("notification [%d]", ret); + ret = notification_ex_service_init(restart_count); if (ret < 0) WARN("notification_ex [%d]", ret); @@ -84,10 +88,6 @@ static inline int app_create(int restart_count) if (ret < 0) WARN("shortcut [%d]", ret); - ret = notification_service_init(restart_count); - if (ret < 0) - WARN("notification [%d]", ret); - ret = badge_service_init(); if (ret < 0) WARN("badge [%d]", ret); -- 2.7.4 From d83872bb8c9b3e45662a1316b903f03f655f5498 Mon Sep 17 00:00:00 2001 From: "mk5004.lee" Date: Thu, 11 Jun 2020 17:51:49 +0900 Subject: [PATCH 16/16] Release version 1.6.24 - Add dbus conf for notification.admin privilege Change-Id: Ie9b7e1a7803b2869ce7cd68e3820c03510b003c0 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 cdf1691..2d70156 100644 --- 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.23 +Version: 1.6.24 Release: 1 Group: Applications/Core Applications License: Apache-2.0 -- 2.7.4