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 d98d9b791e18686fea56d6ce432c447ae013f682..9fbccd7d6e79d7d79ff691a87a8bf58ed9b8eca3 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 67bd749b06cc7a0480157d1b5e69a5cf19e14282..3629332c0f9e205e4eb3a8f2e6a61da486a761a4 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/requestauth/request_session.h b/services/devicemanagerservice/include/requestauth/request_session.h index aa805d9f95560e79f57247c83ddd9c14c962663b..b08b81ce69d3d62ea31c458ebf6727105bbb5007 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/include/timer/dm_timer.h b/services/devicemanagerservice/include/timer/dm_timer.h index f0deba4a7288ea167d3a120582e66a7102b0ecac..61b763e995ac27a779775df3c4ebbb7b4ccf5e78 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/lite/ipc_server_listener.cpp b/services/devicemanagerservice/src/ipc/lite/ipc_server_listener.cpp index ad2141de87959ccf469b6ab1058d4747ec9a832c..7fe96002cda0eca59dce719316e55774688f2832 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; diff --git a/services/devicemanagerservice/src/ipc/standard/ipc_server_stub.cpp b/services/devicemanagerservice/src/ipc/standard/ipc_server_stub.cpp index c259394f5a0bf9cb4e7d794b09482761d588a12c..7cf317ccdf180528d69eef3bd295c6de6ce65f22 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 ef3ede248ddd6be8d95b8ebe8659e7b1ce07a341..88ed64aab5cc5b5890e5362945fd0315de1952e6 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; diff --git a/services/devicemanagerservice/src/requestauth/auth_manager.cpp b/services/devicemanagerservice/src/requestauth/auth_manager.cpp index 2a01cd06084a813fc5977b60910be30d02471c0c..363377913a5d8cb675700d699bcfbc2dbc5cf2d0 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 5514cce0ca117d0e95c3febcbeaa7cb8f7f3efdf..939290965c1419a4b55238f77ff66654a072e4c5 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);