openharmony/inputmethod_imf
1
0
Fork 0
mirror of https://gitee.com/openharmony/inputmethod_imf synced 2024-11-27 17:01:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复包管理异常导致的空指针异常

Browse Source 
Signed-off-by: cy7717 <chenyu301@huawei.com>
This commit is contained in:
cy7717 2023-12-27 16:55:13 +08:00
parent a32377d8cb
commit 81c9c32268
3 changed files with 45 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frameworks/js/napi/inputmethodclient/js_utils.cpp
View File

@ -53,6 +53,7 @@ const std::map<int32_t, int32_t> JsUtils::ERROR_CODE_MAP = {
{ ErrorCode::ERROR_IME, EXCEPTION_IMENGINE },
{ ErrorCode::ERROR_PARAMETER_CHECK_FAILED, EXCEPTION_PARAMCHECK },
{ ErrorCode::ERROR_NOT_DEFAULT_IME, EXCEPTION_DEFAULTIME },
{ ErrorCode::ERROR_ENABLE_IME, EXCEPTION_IMMS },
};
const std::map<int32_t, std::string> JsUtils::ERROR_CODE_CONVERT_MESSAGE_MAP = {

1
services/include/ime_info_inquirer.h
View File

@ -112,6 +112,7 @@ private:
void ParseSubProp(const nlohmann::json &jsonSubProp, SubProperty &subProp);
void ParseLanguage(const std::string &locale, std::string &language);
bool QueryImeExtInfos(const int32_t userId, std::vector<OHOS::AppExecFwk::ExtensionAbilityInfo> &infos);
std::vector<std::string> GetEnableData(int32_t userId);
ImeConfig imeConfig_;
std::mutex currentImeInfoLock_;

77
services/src/ime_info_inquirer.cpp
View File

@ -344,54 +344,59 @@ int32_t ImeInfoInquirer::ListInputMethod(const int32_t userId, std::vector<Prope
return ErrorCode::NO_ERROR;
}
std::vector<std::string> ImeInfoInquirer::GetEnableData(int32_t userId)
{
std::vector<std::string> enableVec;
auto ret = EnableImeDataParser::GetInstance()->GetEnableData(EnableImeDataParser::ENABLE_IME, enableVec, userId);
if (ret != ErrorCode::NO_ERROR) {
IMSA_HILOGE("Get enable data failed, ret: %{public}d", ret);
return enableVec;
}
auto info = GetDefaultImeInfo(userId);
if (info != nullptr) {
enableVec.insert(enableVec.begin(), info->prop.name);
}
return enableVec;
}
int32_t ImeInfoInquirer::ListEnabledInputMethod(const int32_t userId, std::vector<Property> &props, bool enableOn)
{
IMSA_HILOGD("userId: %{public}d", userId);
IMSA_HILOGD("userId: %{public}d, enableOn: %{public}d", userId, enableOn);
int32_t ret = ListInputMethod(userId, props);
if (ret != ErrorCode::NO_ERROR) {
IMSA_HILOGE("userId: %{public}d listInputMethod failed", userId);
return ret;
}
if (enableOn) {
IMSA_HILOGD("enable on");
std::vector<std::string> enableVec;
ret = EnableImeDataParser::GetInstance()->GetEnableData(EnableImeDataParser::ENABLE_IME, enableVec, userId);
if (ret != ErrorCode::NO_ERROR) {
IMSA_HILOGE("Get enable data failed;");
return ret;
}
enableVec.insert(enableVec.begin(), GetDefaultImeInfo(userId)->prop.name);
auto newEnd = std::remove_if(props.begin(), props.end(), [&enableVec](const auto &prop) {
return std::find(enableVec.begin(), enableVec.end(), prop.name) == enableVec.end();
});
props.erase(newEnd, props.end());
if (!enableOn) {
return ErrorCode::NO_ERROR;
}
auto enableVec = GetEnableData(userId);
if (enableVec.empty()) {
return ErrorCode::ERROR_ENABLE_IME;
}
auto newEnd = std::remove_if(props.begin(), props.end(), [&enableVec](const auto &prop) {
return std::find(enableVec.begin(), enableVec.end(), prop.name) == enableVec.end();
});
props.erase(newEnd, props.end());
return ErrorCode::NO_ERROR;
}
int32_t ImeInfoInquirer::ListDisabledInputMethod(const int32_t userId, std::vector<Property> &props, bool enableOn)
{
IMSA_HILOGD("userId: %{public}d", userId);
IMSA_HILOGD("userId: %{public}d, enableOn: %{public}d", userId, enableOn);
if (!enableOn) {
IMSA_HILOGD("Enable mode off, get disabled ime.");
return ErrorCode::NO_ERROR;
}
auto ret = ListInputMethod(userId, props);
if (ret != ErrorCode::NO_ERROR) {
IMSA_HILOGE("userId: %{public}d listInputMethod failed", userId);
return ret;
}
std::vector<std::string> enableVec;
ret = EnableImeDataParser::GetInstance()->GetEnableData(EnableImeDataParser::ENABLE_IME, enableVec, userId);
if (ret != ErrorCode::NO_ERROR) {
IMSA_HILOGE("Get enable data failed;");
return ret;
auto enableVec = GetEnableData(userId);
if (enableVec.empty()) {
return ErrorCode::ERROR_ENABLE_IME;
}
enableVec.insert(enableVec.begin(), GetDefaultImeInfo(userId)->prop.name);
auto newEnd = std::remove_if(props.begin(), props.end(), [&enableVec](const auto &prop) {
return std::find(enableVec.begin(), enableVec.end(), prop.name) != enableVec.end();
});
@ -401,12 +406,10 @@ int32_t ImeInfoInquirer::ListDisabledInputMethod(const int32_t userId, std::vect
int32_t ImeInfoInquirer::GetNextSwitchInfo(SwitchInfo &switchInfo, int32_t userId, bool enableOn)
{
std::vector<Property> props = {};
switchInfo.bundleName = ImeInfoInquirer::GetInstance().GetDefaultImeInfo(userId)->prop.name;
switchInfo.subName = "";
std::vector<Property> props;
auto ret = ListEnabledInputMethod(userId, props, enableOn);
if (ret != ErrorCode::NO_ERROR) {
IMSA_HILOGE("userId: %{public}d ListEnabledInputMethod failed", userId);
if (ret != ErrorCode::NO_ERROR || props.empty()) {
IMSA_HILOGE("userId: %{public}d ListEnabledInputMethod failed, ret: %{public}d", userId, ret);
return ret;
}
auto currentImeBundle = ImeCfgManager::GetInstance().GetCurrentImeCfg(userId)->bundleName;
@ -414,10 +417,16 @@ int32_t ImeInfoInquirer::GetNextSwitchInfo(SwitchInfo &switchInfo, int32_t userI
[&currentImeBundle](const Property &property) { return property.name == currentImeBundle; });
if (iter == props.end()) {
IMSA_HILOGE("Can not found current ime");
} else {
auto nextIter = std::next(iter);
switchInfo.bundleName = nextIter == props.end() ? props[0].name.c_str() : nextIter->name;
auto info = GetDefaultImeInfo(userId);
if (info != nullptr) {
switchInfo.bundleName = info->prop.name;
return ErrorCode::NO_ERROR;
}
IMSA_HILOGE("bundle manager error");
return ErrorCode::ERROR_PACKAGE_MANAGER;
}
auto nextIter = std::next(iter);
switchInfo.bundleName = nextIter == props.end() ? props[0].name : nextIter->name;
IMSA_HILOGD("Next ime: %{public}s", switchInfo.bundleName.c_str());
return ErrorCode::NO_ERROR;
}