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

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

Browse Source 
Changes to be committed:
This commit is contained in:
ma-shaoyin 2023-10-23 20:42:33 +08:00
parent 53d394a719
commit c94440a6c4
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
services/src/input_method_system_ability.cpp
View File

@ -251,10 +251,6 @@ int32_t InputMethodSystemAbility::StartInput(InputClientInfo &inputClientInfo, s
IMSA_HILOGE("PrepareInput failed");
return ret;
}
if (inputClientInfo.client == nullptr) {
IMSA_HILOGE("InputMethodSystemAbility::client is nullptr");
return ErrorCode::ERROR_CLIENT_NULL_POINTER;
}
return userSession_->OnStartInput(inputClientInfo.client, inputClientInfo.isShowKeyboard, agent);
};
@ -938,12 +934,12 @@ int32_t InputMethodSystemAbility::UnRegisteredProxyIme(UnRegisteredType type, co
return userSession_->OnUnRegisteredProxyIme(type, core);
}
bool InputMethodSystemAbility::IsSwitchPermitted(const SwitchInfo& switchInfo)
bool InputMethodSystemAbility::IsSwitchPermitted(const SwitchInfo &switchInfo)
{
auto currentBundleName = ImeCfgManager::GetInstance().GetCurrentImeCfg(userId_)->bundleName;
// if currentIme is switching subtype, permission verification is not performed.
if (identityChecker_->IsBundleNameValid(IPCSkeleton::GetCallingTokenID(), currentBundleName) &&
switchInfo.bundleName == currentBundleName && !switchInfo.subName.empty()) {
if (identityChecker_->IsBundleNameValid(IPCSkeleton::GetCallingTokenID(), currentBundleName)
&& switchInfo.bundleName == currentBundleName && !switchInfo.subName.empty()) {
return true;
}
if (!identityChecker_->HasPermission(IPCSkeleton::GetCallingTokenID(), PERMISSION_CONNECT_IME_ABILITY)) {
@ -954,12 +950,12 @@ bool InputMethodSystemAbility::IsSwitchPermitted(const SwitchInfo& switchInfo)
if (switchInfo.subName.empty()) {
return true;
}
if (identityChecker_->IsSystemApp(IPCSkeleton::GetCallingFullTokenID()) ||
identityChecker_->IsBundleNameValid(IPCSkeleton::GetCallingTokenID(), currentBundleName)) {
if (identityChecker_->IsSystemApp(IPCSkeleton::GetCallingFullTokenID())
|| identityChecker_->IsBundleNameValid(IPCSkeleton::GetCallingTokenID(), currentBundleName)) {
return true;
}
InputMethodSysEvent::GetInstance().InputmethodFaultReporter(ErrorCode::ERROR_STATUS_PERMISSION_DENIED,
switchInfo.bundleName, "switch inputmethod failed!");
InputMethodSysEvent::GetInstance().InputmethodFaultReporter(
ErrorCode::ERROR_STATUS_PERMISSION_DENIED, switchInfo.bundleName, "switch inputmethod failed!");
IMSA_HILOGE("not permitted");
return false;
}

2
services/src/peruser_session.cpp
View File

@ -428,7 +428,7 @@ void PerUserSession::UnBindClientWithIme(
return;
}
if (!isUnbindFromClient) {
IMSA_HILOGD("Unbind from client.");
IMSA_HILOGD("Unbind from service.");
StopClientInput(currentClientInfo->client);
}
StopImeInput(currentClientInfo->bindImeType, currentClientInfo->channel);