openharmony/appexecfwk_standard
1
0
Fork 0
mirror of https://github.com/openharmony/appexecfwk_standard.git synced 2026-07-19 22:14:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

!1380 【OpenHarmony开源贡献者计划2022】moduleName为空时处理有误

Browse Source 
Merge pull request !1380 from wangtiantian/moduleName
This commit is contained in:
openharmony_ci
2022-05-12 06:06:50 +00:00
committed by Gitee
parent bf9e10a43a 9949eed51a
commit 7bb888accd
2 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
interfaces/kits/js/bundlemgr/bundle_mgr.cpp
+24 -21
View File
@@ -1184,17 +1184,17 @@ static bool InnerGetApplicationInfos(napi_env env, int32_t flags, const int user
}
static std::string InnerGetAbilityLabel(napi_env env, std::string &bundleName, std::string &moduleName,
std::string &abilityName)
std::string &abilityName, bool hasModuleName)
{
auto iBundleMgr = GetBundleMgr();
if (iBundleMgr == nullptr) {
APP_LOGE("can not get iBundleMgr");
return "";
}
if (moduleName.empty()) {
return iBundleMgr->GetAbilityLabel(bundleName, abilityName);
if (hasModuleName) {
return iBundleMgr->GetAbilityLabel(bundleName, moduleName, abilityName);
}
return iBundleMgr->GetAbilityLabel(bundleName, moduleName, abilityName);
return iBundleMgr->GetAbilityLabel(bundleName, abilityName);
}
static void ProcessApplicationInfos(
@@ -1665,17 +1665,17 @@ static napi_value ParseString(napi_env env, std::string &param, napi_value args)
}
static bool InnerGetAbilityInfo(const std::string &bundleName, const std::string &moduleName,
const std::string &abilityName, AbilityInfo &abilityInfo)
const std::string &abilityName, AbilityInfo &abilityInfo, bool hasModuleName)
{
auto iBundleMgr = GetBundleMgr();
if (!iBundleMgr) {
APP_LOGE("can not get iBundleMgr");
return false;
}
if (moduleName.empty()) {
return iBundleMgr->GetAbilityInfo(bundleName, abilityName, abilityInfo);
if (hasModuleName) {
return iBundleMgr->GetAbilityInfo(bundleName, moduleName, abilityName, abilityInfo);
}
return iBundleMgr->GetAbilityInfo(bundleName, moduleName, abilityName, abilityInfo);
return iBundleMgr->GetAbilityInfo(bundleName, abilityName, abilityInfo);
}
void StartGetAbilityInfoExecuteCB(napi_env env, void *data)
@@ -1689,7 +1689,8 @@ void StartGetAbilityInfoExecuteCB(napi_env env, void *data)
if (!asyncCallbackInfo->err) {
asyncCallbackInfo->ret = InnerGetAbilityInfo(
asyncCallbackInfo->bundleName, asyncCallbackInfo->moduleName,
asyncCallbackInfo->abilityName, asyncCallbackInfo->abilityInfo);
asyncCallbackInfo->abilityName, asyncCallbackInfo->abilityInfo,
asyncCallbackInfo->hasModuleName);
}
APP_LOGI("%{public}s end.", __func__);
}
@@ -1763,14 +1764,14 @@ napi_value GetAbilityInfo(napi_env env, napi_callback_info info)
return nullptr;
}
std::unique_ptr<AsyncAbilityInfosCallbackInfo> callbackPtr {asyncCallbackInfo};
bool hasModuleName = HasModuleName(env, argc, argv);
asyncCallbackInfo->hasModuleName = HasModuleName(env, argc, argv);
for (size_t i = 0; i < argc; ++i) {
napi_valuetype valueType = napi_undefined;
NAPI_CALL(env, napi_typeof(env, argv[i], &valueType));
if ((i == PARAM0) && (valueType == napi_string)) {
ParseString(env, asyncCallbackInfo->bundleName, argv[i]);
} else if ((i == PARAM1) && (valueType == napi_string)) {
if (hasModuleName) {
if (asyncCallbackInfo->hasModuleName) {
ParseString(env, asyncCallbackInfo->moduleName, argv[i]);
} else {
ParseString(env, asyncCallbackInfo->abilityName, argv[i]);
@@ -5396,7 +5397,7 @@ void GetAbilityLabelExecute(napi_env env, void *data)
if (!asyncCallbackInfo->err) {
asyncCallbackInfo->abilityLabel =
InnerGetAbilityLabel(env, asyncCallbackInfo->bundleName, asyncCallbackInfo->moduleName,
asyncCallbackInfo->className);
asyncCallbackInfo->className, asyncCallbackInfo->hasModuleName);
if (asyncCallbackInfo->abilityLabel == "") {
asyncCallbackInfo->err = OPERATION_FAILED;
}
@@ -5507,14 +5508,14 @@ napi_value GetAbilityLabelWrap(napi_env env, napi_callback_info info, AsyncAbili
APP_LOGE("%{public}s, Wrong argument count.", __func__);
return nullptr;
}
bool hasModuleName = HasModuleName(env, argcAsync, args);
asyncCallbackInfo->hasModuleName = HasModuleName(env, argcAsync, args);
for (size_t i = 0; i < argcAsync; ++i) {
napi_valuetype valueType = napi_undefined;
NAPI_CALL(env, napi_typeof(env, args[i], &valueType));
if ((i == PARAM0) && (valueType == napi_string)) {
ParseString(env, asyncCallbackInfo->bundleName, args[i]);
} else if ((i == PARAM1) && (valueType == napi_string)) {
if (hasModuleName) {
if (asyncCallbackInfo->hasModuleName) {
ParseString(env, asyncCallbackInfo->moduleName, args[i]);
} else {
ParseString(env, asyncCallbackInfo->className, args[i]);
@@ -5602,7 +5603,8 @@ bool UnwrapAbilityInfo(napi_env env, napi_value param, OHOS::AppExecFwk::Ability
#ifdef BUNDLE_FRAMEWORK_GRAPHICS
static std::shared_ptr<Media::PixelMap> InnerGetAbilityIcon(
napi_env env, const std::string &bundleName, const std::string &moduleName, const std::string &abilityName)
napi_env env, const std::string &bundleName, const std::string &moduleName, const std::string &abilityName,
bool hasModuleName)
{
if (bundleName.empty() || abilityName.empty()) {
APP_LOGE("bundleName or abilityName is invalid param");
@@ -5613,10 +5615,10 @@ static std::shared_ptr<Media::PixelMap> InnerGetAbilityIcon(
APP_LOGE("can not get iBundleMgr");
return nullptr;
}
if (moduleName.empty()) {
return iBundleMgr->GetAbilityPixelMapIcon(bundleName, abilityName);
if (hasModuleName) {
return iBundleMgr->GetAbilityPixelMapIcon(bundleName, moduleName, abilityName);
}
return iBundleMgr->GetAbilityPixelMapIcon(bundleName, moduleName, abilityName);
return iBundleMgr->GetAbilityPixelMapIcon(bundleName, abilityName);
}
napi_value GetAbilityIcon(napi_env env, napi_callback_info info)
@@ -5635,14 +5637,14 @@ napi_value GetAbilityIcon(napi_env env, napi_callback_info info)
return nullptr;
}
std::unique_ptr<AsyncAbilityInfo> callbackPtr {asyncCallbackInfo};
bool hasModuleName = HasModuleName(env, argc, argv);
asyncCallbackInfo->hasModuleName = HasModuleName(env, argc, argv);
for (size_t i = 0; i < argc; ++i) {
napi_valuetype valueType = napi_undefined;
NAPI_CALL(env, napi_typeof(env, argv[i], &valueType));
if ((i == PARAM0) && (valueType == napi_string)) {
ParseString(env, asyncCallbackInfo->bundleName, argv[i]);
} else if ((i == PARAM1) && (valueType == napi_string)) {
if (hasModuleName) {
if (asyncCallbackInfo->hasModuleName) {
ParseString(env, asyncCallbackInfo->moduleName, argv[i]);
} else {
ParseString(env, asyncCallbackInfo->abilityName, argv[i]);
@@ -5673,7 +5675,8 @@ napi_value GetAbilityIcon(napi_env env, napi_callback_info info)
asyncCallbackInfo->pixelMap = InnerGetAbilityIcon(asyncCallbackInfo->env,
asyncCallbackInfo->bundleName,
asyncCallbackInfo->moduleName,
asyncCallbackInfo->abilityName);
asyncCallbackInfo->abilityName,
asyncCallbackInfo->hasModuleName);
if (!asyncCallbackInfo->pixelMap) {
asyncCallbackInfo->errCode = OPERATION_FAILED;
}
interfaces/kits/js/bundlemgr/bundle_mgr.h
+3
View File
@@ -65,6 +65,7 @@ struct AsyncAbilityInfosCallbackInfo : public AsyncWorkData {
std::string bundleName;
std::string abilityName;
std::string moduleName = "";
bool hasModuleName = false;
OHOS::AppExecFwk::AbilityInfo abilityInfo;
bool ret = false;
int32_t err = 0;
@@ -137,6 +138,7 @@ struct AsyncAbilityLabelCallbackInfo : public AsyncWorkData {
std::string bundleName;
std::string className;
std::string moduleName = "";
bool hasModuleName = false;
std::string abilityLabel;
int32_t err = 0;
std::string message;
@@ -270,6 +272,7 @@ struct AsyncAbilityInfo : public AsyncWorkData {
std::string bundleName;
std::string abilityName;
std::string moduleName = "";
bool hasModuleName = false;
#ifdef BUNDLE_FRAMEWORK_GRAPHICS
std::shared_ptr<Media::PixelMap> pixelMap;
#endif