From a574772e829cf2ac8e48fe050d708777b008d55d 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: Fri, 24 Sep 2021 15:40:08 +0800 Subject: [PATCH 1/3] code style & bug fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 想不出别名 --- .../inner_kits/native_cpp/include/dm_app_image_info.h | 2 +- interfaces/kits/js/src/native_devicemanager_js.cpp | 2 +- services/devicemanagerservice/include/timer/dm_timer.h | 1 - .../src/ipc/standard/ipc_server_stub.cpp | 8 +++++--- .../devicemanagerservice/src/message/msg_request_auth.cpp | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/interfaces/inner_kits/native_cpp/include/dm_app_image_info.h b/interfaces/inner_kits/native_cpp/include/dm_app_image_info.h index d98d9b791..9fbccd7d6 100644 --- a/interfaces/inner_kits/native_cpp/include/dm_app_image_info.h +++ b/interfaces/inner_kits/native_cpp/include/dm_app_image_info.h @@ -68,7 +68,7 @@ public: return -1; } - if (memcpy_s(appThumbnail + copyIndex, appThumbnailLen - copyLen, srcBuffer, copyLen) != 0) { + if (memcpy_s(appThumbnail + copyIndex, appThumbnailLen - copyIndex, srcBuffer, copyLen) != 0) { return -1; } diff --git a/interfaces/kits/js/src/native_devicemanager_js.cpp b/interfaces/kits/js/src/native_devicemanager_js.cpp index 67bd749b0..3629332c0 100644 --- a/interfaces/kits/js/src/native_devicemanager_js.cpp +++ b/interfaces/kits/js/src/native_devicemanager_js.cpp @@ -392,7 +392,7 @@ void DeviceManagerNapi::DmAuthParamToJsAuthParamy(const napi_env &env, napi_create_arraybuffer(env, appIconLen, &appIcon, &appIconBuffer); if (appIcon != nullptr && memcpy_s(appIcon, appIconLen, reinterpret_cast(authParam.imageinfo.GetAppIcon()), - appIconLen) == 0) { + appIconLen) == 0) { napi_value appIconArray = nullptr; napi_create_typedarray(env, napi_uint8_array, appIconLen, appIconBuffer, 0, &appIconArray); napi_set_named_property(env, paramResult, "appIcon", appIconArray); diff --git a/services/devicemanagerservice/include/timer/dm_timer.h b/services/devicemanagerservice/include/timer/dm_timer.h index f0deba4a7..61b763e99 100644 --- a/services/devicemanagerservice/include/timer/dm_timer.h +++ b/services/devicemanagerservice/include/timer/dm_timer.h @@ -29,7 +29,6 @@ namespace OHOS { namespace DistributedHardware { - typedef void (*TimeoutHandle)(void *data); #define MAXEVENTS 255 diff --git a/services/devicemanagerservice/src/ipc/standard/ipc_server_stub.cpp b/services/devicemanagerservice/src/ipc/standard/ipc_server_stub.cpp index c259394f5..7cf317ccd 100644 --- a/services/devicemanagerservice/src/ipc/standard/ipc_server_stub.cpp +++ b/services/devicemanagerservice/src/ipc/standard/ipc_server_stub.cpp @@ -69,9 +69,11 @@ bool IpcServerStub::Init() registerToService_ = true; } - std::thread {[] { - IpcServerAdapter::GetInstance().ModuleInit(); - }}.detach(); + std::thread { + [] { + IpcServerAdapter::GetInstance().ModuleInit(); + } + }.detach(); return true; } diff --git a/services/devicemanagerservice/src/message/msg_request_auth.cpp b/services/devicemanagerservice/src/message/msg_request_auth.cpp index ef3ede248..88ed64aab 100644 --- a/services/devicemanagerservice/src/message/msg_request_auth.cpp +++ b/services/devicemanagerservice/src/message/msg_request_auth.cpp @@ -45,8 +45,8 @@ MsgRequestAuth::MsgRequestAuth(std::string &token, std::string hostPkgName, std: } mAuthType_ = jsonObject.contains(AUTH_TYPE) ? (int32_t)jsonObject[AUTH_TYPE] : AUTH_TYPE_QR; - mHead_ = std::make_shared(mAuthType_ == AUTH_TYPE_QR ? DmMsgType::MSG_TYPE_REQ_AUTH : - DmMsgType::MSG_TYPE_AUTH_BY_PIN); + mHead_ = std::make_shared((mAuthType_ == AUTH_TYPE_QR) ? (DmMsgType::MSG_TYPE_REQ_AUTH) : + (DmMsgType::MSG_TYPE_AUTH_BY_PIN)); char localDeviceId[DEVICE_UUID_LENGTH] = {0}; GetDevUdid(localDeviceId, DEVICE_UUID_LENGTH); mDeviceName_ = devReqInfo.deviceName; -- Gitee From d2b73107cae4ba53d13ab28fcfa7e544237b6f89 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: Fri, 24 Sep 2021 20:15:57 +0800 Subject: [PATCH 2/3] code style & bug fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 想不出别名 --- .../devicemanagerservice/src/ipc/lite/ipc_server_listener.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/devicemanagerservice/src/ipc/lite/ipc_server_listener.cpp b/services/devicemanagerservice/src/ipc/lite/ipc_server_listener.cpp index ad2141de8..7fe96002c 100644 --- a/services/devicemanagerservice/src/ipc/lite/ipc_server_listener.cpp +++ b/services/devicemanagerservice/src/ipc/lite/ipc_server_listener.cpp @@ -74,6 +74,9 @@ int32_t IpcServerListener::SendAll(int32_t cmdCode, std::shared_ptr req, SvcIdentity svc; IpcIo io; uint8_t data[MAX_DM_IPC_LEN] = {0}; + std::string pkgName = kv.first; + + req->SetPkgName(pkgName); if (IpcCmdRegister::GetInstance().SetRequest(cmdCode, req, io, data, MAX_DM_IPC_LEN) != DEVICEMANAGER_OK) { DMLOG(DM_LOG_DEBUG, "SetRequest failed cmdCode:%d", cmdCode); continue; -- Gitee From 351cf1accefcdb167e140e86d6e6d6901aa21824 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 11:47:47 +0800 Subject: [PATCH 3/3] 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