From 40fc541e9434ea12045d2f59eb54caca1cdca691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=83=B3=E4=B8=8D=E5=87=BA=E5=88=AB=E5=90=8D?= Date: Sun, 26 Sep 2021 10:58:33 +0800 Subject: [PATCH] Codex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 想不出别名 --- .../include/requestauth/request_session.h | 4 ++-- .../src/requestauth/auth_manager.cpp | 7 ++++++- .../src/requestauth/request_session.cpp | 15 ++------------- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/services/devicemanagerservice/include/requestauth/request_session.h b/services/devicemanagerservice/include/requestauth/request_session.h index aa805d9f9..b08b81ce6 100644 --- a/services/devicemanagerservice/include/requestauth/request_session.h +++ b/services/devicemanagerservice/include/requestauth/request_session.h @@ -28,8 +28,8 @@ namespace OHOS { namespace DistributedHardware { class RequestSession { public: - RequestSession(std::string &hostPkgName, const DmDeviceInfo &devReqInfo, const DmAppImageInfo &imageInfo, - std::string &extrasJson); + RequestSession(std::string &hostPkgName, std::string &targetPkgName, const DmDeviceInfo &devReqInfo, + const DmAppImageInfo &imageInfo); ~RequestSession() = default; std::vector GetRequestCommand(std::string &extrasJson); int32_t GetPinToken(); diff --git a/services/devicemanagerservice/src/requestauth/auth_manager.cpp b/services/devicemanagerservice/src/requestauth/auth_manager.cpp index 2a01cd060..363377913 100644 --- a/services/devicemanagerservice/src/requestauth/auth_manager.cpp +++ b/services/devicemanagerservice/src/requestauth/auth_manager.cpp @@ -64,6 +64,11 @@ void AuthManager::AuthAppGroup(std::string &hostPkgName, const DmDeviceInfo &dev DMLOG(DM_LOG_ERROR, "AuthAppGroup extrasJson error"); return; } + if (!jsonObject.contains(TARGET_PKG_NAME_KEY)) { + DMLOG(DM_LOG_ERROR, "TARGET_PKG_NAME is not in extrasJson"); + return; + } + std::string targetPkgName = jsonObject[TARGET_PKG_NAME_KEY]; if (!jsonObject.contains(DISPLAY_OWNER)) { DMLOG(DM_LOG_WARN, "AuthAppGroup DISPLAY_OWNER error"); @@ -77,7 +82,7 @@ void AuthManager::AuthAppGroup(std::string &hostPkgName, const DmDeviceInfo &dev mPendingReqSessionPtr_->NotifyHostAppAuthResult(ERROR_DUPLICATE_REQUEST); return; } - auto curSessionPtr = std::make_shared(hostPkgName, devReqInfo, imageInfo, extrasJson); + auto curSessionPtr = std::make_shared(hostPkgName, targetPkgName, devReqInfo, imageInfo); mPendingReqSessionPtr_ = curSessionPtr; std::vector msgInfo = curSessionPtr->GetRequestCommand(extrasJson); int32_t channelId = SoftbusSession::GetInstance().SendMessages(devReqInfo.deviceId, msgInfo); diff --git a/services/devicemanagerservice/src/requestauth/request_session.cpp b/services/devicemanagerservice/src/requestauth/request_session.cpp index 5514cce0c..939290965 100644 --- a/services/devicemanagerservice/src/requestauth/request_session.cpp +++ b/services/devicemanagerservice/src/requestauth/request_session.cpp @@ -31,23 +31,12 @@ namespace OHOS { namespace DistributedHardware { -RequestSession::RequestSession(std::string &hostPkgName, const DmDeviceInfo &devReqInfo, - const DmAppImageInfo &imageInfo, std::string &extrasJson) +RequestSession::RequestSession(std::string &hostPkgName, std::string &targetPkgName, const DmDeviceInfo &devReqInfo, + const DmAppImageInfo &imageInfo) { DMLOG(DM_LOG_INFO, "RequestSession construction started"); - nlohmann::json jsonObject = nlohmann::json::parse(extrasJson, nullptr, false); - if (jsonObject.is_discarded()) { - DMLOG(DM_LOG_ERROR, "extrasJson error"); - } - - if (!jsonObject.contains(TARGET_PKG_NAME_KEY)) { - DMLOG(DM_LOG_ERROR, "TARGET_PKG_NAME is not in extrasJson"); - return; - } - std::string targetPkgName = jsonObject[TARGET_PKG_NAME_KEY]; mDevInfo_ = devReqInfo; mImageInfo_ = imageInfo; - DMLOG(DM_LOG_ERROR, "imageinfo appIcon:%p:%p", mImageInfo_.GetAppIcon(), imageInfo.GetAppIcon()); mHostPkgName_ = hostPkgName; mTargetPkgName = targetPkgName; mPinToken_ = IpcServerAdapter::GenRandInt(MIN_PIN_TOKEN, MAX_PIN_TOKEN); -- Gitee