openharmony/ability_dmsfwk
1
0
Fork 0
mirror of https://gitee.com/openharmony/ability_dmsfwk synced 2024-11-27 00:20:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!1106 接续时，应用卸载通知图标消失

Browse Source 
Merge pull request !1106 from MisterE/master
This commit is contained in:
openharmony_ci 2024-09-25 08:39:41 +00:00 committed by Gitee
commit 8386097070
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
7 changed files with 102 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/dtbschedmgr/include/mission/distributed_bm_storage.h
View File

@ -73,7 +73,7 @@ public:
int32_t CloudSync();
void FindProvishionInfo(OHOS::sptr<OHOS::AppExecFwk::IBundleMgr> bundleMgr,
AppExecFwk::AppProvisionInfo appProvisionInfo, std::vector<AccountSA::OsAccountInfo> accounts,
uint32_t result, const std::string& bundleName);
int32_t result, const std::string& bundleName);
void DmsPutBatch(const std::vector<DmsBundleInfo> &dmsBundleInfos);
bool UpdatePublicRecords(const std::string &localUdid);
bool DelDataOfLogoutDev(const std::string &udid, const std::string &uuid);

1
services/dtbschedmgr/include/mission/dms_continue_recv_manager.h
View File

@ -84,6 +84,7 @@ public:
int32_t RegisterOffListener(const std::string& type, const sptr<IRemoteObject>& obj);
void NotifyDied(const sptr<IRemoteObject>& obj);
void NotifyDeviceOffline(const std::string& networkId);
void NotifyPackageRemoved(const std::string& sinkBundleName);
void OnDeviceScreenOff();
void OnContinueSwitchOff();
std::string GetContinueType(const std::string& bundleName);

2
services/dtbschedmgr/src/bundle/bundle_manager_internal.cpp
View File

@ -292,7 +292,7 @@ bool BundleManagerInternal::GetAppProvisionInfo4CurrentUser(const std::string &b
HILOGE("Get userId from active Os AccountIds fail, ret : %{public}d", ret);
return false;
}
uint32_t result = bundleMgr->GetAppProvisionInfo(bundleName, ids[0], appProvisionInfo);
ErrCode result = bundleMgr->GetAppProvisionInfo(bundleName, ids[0], appProvisionInfo);
HILOGI("find dst bundle name for diff bundle continue. dst developer id: %{public}s; ",
GetAnonymStr(appProvisionInfo.developerId).c_str());
return result == ERR_OK;

3
services/dtbschedmgr/src/common_event_listener.cpp
View File

@ -81,8 +81,9 @@ void CommonEventListener::OnReceiveEvent(const EventFwk::CommonEventData &eventD
DmsBmStorage::GetInstance()->SaveStorageDistributeInfo(want.GetElement().GetBundleName(), true);
break;
case PACKAGE_REMOVED :
HILOGI("PACKAGE_REMOVED");
HILOGI("PACKAGE_REMOVED: %{public}s", want.GetElement().GetBundleName().c_str());
DmsBmStorage::GetInstance()->DeleteStorageDistributeInfo(want.GetElement().GetBundleName());
DMSContinueRecvMgr::GetInstance().NotifyPackageRemoved(want.GetElement().GetBundleName());
break;
default:
HILOGW("OnReceiveEvent undefined action");

10
services/dtbschedmgr/src/mission/distributed_bm_storage.cpp
View File

@ -109,7 +109,7 @@ bool DmsBmStorage::SaveStorageDistributeInfo(const std::string &bundleName, bool
AppExecFwk::AppProvisionInfo appProvisionInfo;
std::vector<AccountSA::OsAccountInfo> accounts;
uint32_t result = AccountSA::OsAccountManager::QueryAllCreatedOsAccounts(accounts);
ErrCode result = AccountSA::OsAccountManager::QueryAllCreatedOsAccounts(accounts);
if (result == ERR_OK && !accounts.empty()) {
for (auto &account: accounts) {
result = bundleMgr->GetAppProvisionInfo(bundleName, account.GetLocalId(), appProvisionInfo);
@ -442,10 +442,12 @@ bool DmsBmStorage::GetDistributedBundleInfo(const std::string &networkId,
if (reduRiskEntries.size() > 1) {
HILOGE("Redundant data needs to be deleted.");
DelReduData(networkId, reduRiskEntries);
distributeBundleInfo = DmsBundleInfo();
return false;
}
if (remoteEntries.empty()) {
if (reduRiskEntries.empty()) {
HILOGE("get distributedBundleInfo failed.");
return false;
}
HILOGI("end.");
return true;
@ -746,7 +748,7 @@ int32_t DmsBmStorage::CloudSync()
void DmsBmStorage::FindProvishionInfo(OHOS::sptr<OHOS::AppExecFwk::IBundleMgr> bundleMgr,
AppExecFwk::AppProvisionInfo appProvisionInfo, std::vector<AccountSA::OsAccountInfo> accounts,
uint32_t result, const std::string& bundleName)
int32_t result, const std::string& bundleName)
{
if (result == ERR_OK && !accounts.empty()) {
for (auto &account: accounts) {
@ -782,7 +784,7 @@ void DmsBmStorage::UpdateDistributedData()
AppExecFwk::AppProvisionInfo appProvisionInfo;
std::vector<AccountSA::OsAccountInfo> accounts;
uint32_t result = AccountSA::OsAccountManager::QueryAllCreatedOsAccounts(accounts);
int32_t result = AccountSA::OsAccountManager::QueryAllCreatedOsAccounts(accounts);
std::vector<DmsBundleInfo> dmsBundleInfos;
for (const auto &bundleInfo: bundleInfos) {

42
services/dtbschedmgr/src/mission/dms_continue_recv_manager.cpp
View File

@ -561,6 +561,48 @@ void DMSContinueRecvMgr::NotifyDeviceOffline(const std::string& networkId)
HILOGI("NotifyDeviceOffline end");
}
void DMSContinueRecvMgr::NotifyPackageRemoved(const std::string& sinkBundleName)
{
if (sinkBundleName.empty()) {
HILOGE("NotifyPackageRemoved sinkBundleName empty");
return;
}
if (iconInfo_.bundleName != sinkBundleName) {
HILOGI("NotifyPackageRemoved current sinkBundleName: %{public}s; removed package: %{public}s.",
iconInfo_.bundleName.c_str(), sinkBundleName.c_str());
return;
}
HILOGI("NotifyPackageRemoved begin. sinkBundleName: %{public}s.", sinkBundleName.c_str());
std::string senderNetworkId;
std::string bundleName;
std::string continueType;
{
std::lock_guard<std::mutex> currentIconLock(iconMutex_);
senderNetworkId = iconInfo_.senderNetworkId;
bundleName = iconInfo_.bundleName;
continueType = iconInfo_.continueType;
iconInfo_.senderNetworkId = "";
iconInfo_.bundleName = "";
iconInfo_.continueType = "";
}
HILOGI("Saved iconInfo cleared, sinkBundleName: %{public}s.", bundleName.c_str());
{
std::lock_guard<std::mutex> registerOnListenerMapLock(eventMutex_);
auto iterItem = registerOnListener_.find(onType_);
if (iterItem == registerOnListener_.end()) {
HILOGI("Get iterItem failed from registerOnListener_, nobody registed");
return;
}
std::vector<sptr<IRemoteObject>> objs = iterItem->second;
for (auto iter : objs) {
NotifyRecvBroadcast(iter,
currentIconInfo(senderNetworkId, iconInfo_.sourceBundleName, bundleName, continueType),
INACTIVE);
}
}
HILOGI("NotifyPackageRemoved end");
}
std::string DMSContinueRecvMgr::GetContinueType(const std::string& bundleName)
{
std::lock_guard<std::mutex> currentIconLock(iconMutex_);

49
services/dtbschedmgr/test/unittest/mission/dms_continue_manager_test.cpp
View File

@ -686,6 +686,55 @@ HWTEST_F(DMSContinueManagerTest, testNotifyDeviceOffline003, TestSize.Level1)
DTEST_LOG << "DMSContinueManagerTest testNotifyDeviceOffline003 end" << std::endl;
}
/**
* @tc.name: NotifyPackageRemoved001
* @tc.desc: test NotifyPackageRemoved normal
* @tc.type: FUNC
*/
HWTEST_F(DMSContinueManagerTest, notifyPackageRemoved001, TestSize.Level1)
{
DTEST_LOG << "DMSContinueManagerTest notifyPackageRemoved001 start" << std::endl;
sptr<IRemoteObject> obj01(new RemoteOnListenerStubTest());
DMSContinueRecvMgr::GetInstance().RegisterOnListener(TYPE, obj01);
EXPECT_NE(DMSContinueRecvMgr::GetInstance().registerOnListener_.size(), 0);
DMSContinueRecvMgr::GetInstance().iconInfo_.bundleName = BUNDLENAME_01;
DMSContinueRecvMgr::GetInstance().NotifyPackageRemoved(BUNDLENAME_01);
EXPECT_EQ(DMSContinueRecvMgr::GetInstance().iconInfo_.bundleName, "");
DTEST_LOG << "DMSContinueManagerTest notifyPackageRemoved001 end" << std::endl;
}
/**
* @tc.name: NotifyPackageRemoved002
* @tc.desc: test NotifyPackageRemoved bundleName empty
* @tc.type: FUNC
*/
HWTEST_F(DMSContinueManagerTest, notifyPackageRemoved002, TestSize.Level1)
{
DTEST_LOG << "DMSContinueManagerTest notifyPackageRemoved002 start" << std::endl;
DMSContinueRecvMgr::GetInstance().iconInfo_.bundleName = BUNDLENAME_01;
DMSContinueRecvMgr::GetInstance().NotifyPackageRemoved("");
EXPECT_EQ(DMSContinueRecvMgr::GetInstance().iconInfo_.bundleName, BUNDLENAME_01);
DTEST_LOG << "DMSContinueManagerTest notifyPackageRemoved002 end" << std::endl;
}
/**
* @tc.name: NotifyPackageRemoved003
* @tc.desc: test NotifyPackageRemoved bundleName not match
* @tc.type: FUNC
*/
HWTEST_F(DMSContinueManagerTest, notifyPackageRemoved003, TestSize.Level1)
{
DTEST_LOG << "DMSContinueManagerTest notifyPackageRemoved003 start" << std::endl;
DMSContinueRecvMgr::GetInstance().iconInfo_.bundleName = BUNDLENAME_01;
DMSContinueRecvMgr::GetInstance().NotifyPackageRemoved(BUNDLENAME_02);
EXPECT_EQ(DMSContinueRecvMgr::GetInstance().iconInfo_.bundleName, BUNDLENAME_01);
DTEST_LOG << "DMSContinueManagerTest notifyPackageRemoved003 end" << std::endl;
}
/**
* @tc.name: testNotifyDataRecv001
* @tc.desc: NotifyDataRecv