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

Signed-off-by: ma-shaoyin <mashaoyin1@huawei.com>

Browse Source 
Changes to be committed:
This commit is contained in:
ma-shaoyin 2023-10-25 21:58:27 +08:00
parent 93713be68d
commit ab11368cf0
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
services/src/ime_info_inquirer.cpp
View File

@ -53,8 +53,8 @@ constexpr uint32_t BLOCK_RETRY_TIMES = 1000;
void from_json(const nlohmann::json &jsonConfigs, ImeConfig &config)
{
json jsonCfg = jsonConfigs[SYSTEM_CONFIG];
if (jsonConfigs.find(SYSTEM_INPUT_METHOD_CONFIG_ABILITY) != jsonConfigs.end() &&
jsonConfigs[SYSTEM_INPUT_METHOD_CONFIG_ABILITY].is_string()) {
if (jsonConfigs.find(SYSTEM_INPUT_METHOD_CONFIG_ABILITY) != jsonConfigs.end()
&& jsonConfigs[SYSTEM_INPUT_METHOD_CONFIG_ABILITY].is_string()) {
jsonConfigs.at(SYSTEM_INPUT_METHOD_CONFIG_ABILITY).get_to(config.systemInputMethodConfigAbility);
}
if (jsonConfigs.find(DEFAULT_INPUT_METHOD) != jsonConfigs.end() && jsonConfigs[DEFAULT_INPUT_METHOD].is_string()) {
@ -76,7 +76,11 @@ bool ImeInfoInquirer::QueryImeExtInfos(const int32_t userId, std::vector<Extensi
IMSA_HILOGE("GetBundleMgr failed");
return false;
}
return bundleMgr->QueryExtensionAbilityInfos(ExtensionAbilityType::INPUTMETHOD, userId, infos);
if (!bundleMgr->QueryExtensionAbilityInfos(ExtensionAbilityType::INPUTMETHOD, userId, infos)) {
IMSA_HILOGF("Query extension infos failed from bundleMgr!");
return false;
}
return true;
}
int32_t ImeInfoInquirer::GetExtInfosByBundleName(
@ -84,8 +88,10 @@ int32_t ImeInfoInquirer::GetExtInfosByBundleName(
{
IMSA_HILOGD("userId: %{public}d, bundleName: %{public}s", userId, bundleName.c_str());
std::vector<AppExecFwk::ExtensionAbilityInfo> tempExtInfos;
BlockRetry(RETRY_INTERVAL, BLOCK_RETRY_TIMES,
[this, &userId, &tempExtInfos]() -> bool { return QueryImeExtInfos(userId, tempExtInfos); });
if (!QueryImeExtInfos(userId, tempExtInfos)) {
IMSA_HILOGE("QueryImeExtInfos failed!");
return ErrorCode::ERROR_BAD_PARAMETERS;
}
for (const auto &extInfo : tempExtInfos) {
if (extInfo.bundleName == bundleName) {
extInfos.emplace_back(extInfo);
@ -295,8 +301,10 @@ int32_t ImeInfoInquirer::ListInputMethod(const int32_t userId, std::vector<Prope
{
IMSA_HILOGD("userId: %{public}d", userId);
std::vector<ExtensionAbilityInfo> extensionInfos;
BlockRetry(RETRY_INTERVAL, BLOCK_RETRY_TIMES,
[this, &userId, &extensionInfos]() -> bool { return QueryImeExtInfos(userId, extensionInfos); });
if (!QueryImeExtInfos(userId, extensionInfos)) {
IMSA_HILOGE("QueryImeExtInfos failed!");
return ErrorCode::ERROR_BAD_PARAMETERS;
}
for (const auto &extension : extensionInfos) {
auto it = std::find_if(props.begin(), props.end(),
[&extension](const Property &prop) { return prop.name == extension.bundleName; });
@ -671,7 +679,7 @@ int32_t ImeInfoInquirer::GetInputMethodConfig(const int32_t userId, AppExecFwk::
return ErrorCode::NO_ERROR;
}
int32_t ImeInfoInquirer::GetDefaultInputMethod(const int32_t userId, std::shared_ptr<Property>& prop)
int32_t ImeInfoInquirer::GetDefaultInputMethod(const int32_t userId, std::shared_ptr<Property> &prop)
{
IMSA_HILOGD("userId: %{public}d", userId);
auto imeInfo = GetDefaultImeInfo(userId);
@ -798,8 +806,7 @@ bool ImeInfoInquirer::ParseSubProp(const std::vector<std::string> &profiles, std
bool ImeInfoInquirer::ParseSubProp(const json &jsonSubProps, std::vector<SubProperty> &subProps)
{
if (!jsonSubProps.contains("subtypes") || !jsonSubProps["subtypes"].is_array() ||
jsonSubProps["subtypes"].empty()) {
if (!jsonSubProps.contains("subtypes") || !jsonSubProps["subtypes"].is_array() || jsonSubProps["subtypes"].empty()) {
IMSA_HILOGE("the context of json file is abnormal");
return false;
}