diff --git a/bundle.json b/bundle.json index dc8f96493db1e1c15ae741e1029fb115b98699f1..331f01d85313539daa32d027e4aacfe8f125a169 100644 --- a/bundle.json +++ b/bundle.json @@ -90,6 +90,7 @@ "//foundation/filemanagement/dfs_service/interfaces/kits/js/ani:ani_package", "//foundation/filemanagement/dfs_service/interfaces/kits/js/cloudsyncmanager:cloudsyncmanager", "//foundation/filemanagement/dfs_service/interfaces/kits/js/cloudfilesync:cloudsync", + "//foundation/filemanagement/dfs_service/interfaces/kits/ndk/clouddiskmanager/src:ohclouddiskmanager", "//foundation/filemanagement/dfs_service/adapter/cloud_adapter_example:cloud_adapter_example_target" ] }, @@ -170,6 +171,15 @@ "header_base": "//foundation/filemanagement/dfs_service/utils/inner_api" } }, + { + "name": "//foundation/filemanagement/dfs_service/interfaces/kits/ndk/clouddiskmanager/src:ohclouddiskmanager", + "header": { + "header_files": [ + "oh_cloud_disk_manager.h" + ], + "header_base": "//foundation/filemanagement/dfs_service/interfaces/kits/ndk/clouddiskmanager/include" + } + }, { "name": "//foundation/filemanagement/dfs_service/services/distributedfiledaemon:distributed_file_daemon_kit_inner", "header": { diff --git a/interfaces/kits/ndk/clouddiskmanager/src/oh_cloud_disk_manager.cpp b/interfaces/kits/ndk/clouddiskmanager/src/oh_cloud_disk_manager.cpp index b0b09e26656db07c17ba81060bd0f9cd23b6d987..7f545ce2fc5c72042c89e7fcf9383cbacb5ae0df 100644 --- a/interfaces/kits/ndk/clouddiskmanager/src/oh_cloud_disk_manager.cpp +++ b/interfaces/kits/ndk/clouddiskmanager/src/oh_cloud_disk_manager.cpp @@ -103,7 +103,7 @@ void CloudDiskServiceCallbackImpl::OnChangeData(const std::string &syncFolder, CloudDisk_ChangeData *dataDatas = new (std::nothrow) CloudDisk_ChangeData[changeData.size()]; if (dataDatas == nullptr) { LOGE("Failed to allocate memory for changeDatas"); - delete[] syncFolderPath.value = nullptr; + delete[] syncFolderPath.value; syncFolderPath.value = nullptr; return; } @@ -154,7 +154,7 @@ CloudDisk_ErrorCode string(syncFolderPath.value, syncFolderPath.length), callbackImpl); if (ret != CloudDiskServiceErrCode::E_OK) { LOGE("Register sync folder change failed, ret: %{public}d", ret); - return CovertToErrorCode(ret); + return ConvertToErrorCode(ret); } return CloudDisk_ErrorCode::CLOUD_DISK_ERR_OK; } @@ -169,7 +169,7 @@ CloudDisk_ErrorCode OH_CloudDisk_UnregisterSyncFolderChanges(const CloudDisk_Syn string(syncFolderPath.value, syncFolderPath.length)); if (ret != CloudDiskServiceErrCode::E_OK) { LOGE("Unegister sync folder change failed, ret: %{public}d", ret); - return CovertToErrorCode(ret); + return ConvertToErrorCode(ret); } return CloudDisk_ErrorCode::CLOUD_DISK_ERR_OK; } @@ -188,7 +188,7 @@ CloudDisk_ErrorCode OH_CloudDisk_GetSyncFolderChanges(const CloudDisk_SyncFolder string(syncFolderPath.value, syncFolderPath.length), count, startUsn, changesRes); if (ret != CloudDiskServiceErrCode::E_OK) { LOGE("Get sync folder change failed, ret: %{public}d", ret); - return CovertToErrorCode(ret); + return ConvertToErrorCode(ret); } *changesResult = (CloudDisk_ChangesResult *)malloc(sizeof(CloudDisk_ChangesResult) + sizeof(CloudDisk_ChangeData) * changesRes.changesData.size()); @@ -200,10 +200,6 @@ CloudDisk_ErrorCode OH_CloudDisk_GetSyncFolderChanges(const CloudDisk_SyncFolder (*changesResult)->nextUsn = changesRes.nextUsn; (*changesResult)->isEof = changesRes.isEof; for (auto &item : changesRes.changesData) { - LOGD("change data: fileId=%{public}s, parentFileId=%{public}s, relativePath=%{public}s, " - "updateSequenceNumber=%{public}lu, operationType=%{public}hhu", - item.fileId.c_str(), item.parentFileId.c_str(), item.relativePath.c_str(), item.updateSequenceNumber, - item.operationType); CloudDisk_ChangeData data; data.fileId.value = AllocField(item.fileId.c_str(), item.fileId.length()); CHECK_NULLPTR_AND_CONTINUE(data.fileId.value); @@ -247,7 +243,7 @@ CloudDisk_ErrorCode OH_CloudDisk_SetFileSyncStates(const CloudDisk_SyncFolderPat string(syncFolderPath.value, syncFolderPath.length), syncStatesVec, failedVec); if (ret != CloudDiskServiceErrCode::E_OK) { LOGE("Get sync folder change failed, ret: %{public}d", ret); - return CovertToErrorCode(ret); + return ConvertToErrorCode(ret); } *failedCount = failedVec.size(); if (*failedCount == 0) { @@ -260,8 +256,6 @@ CloudDisk_ErrorCode OH_CloudDisk_SetFileSyncStates(const CloudDisk_SyncFolderPat return CloudDisk_ErrorCode::CLOUD_DISK_INTERNAL_ERROR; } for (size_t index = 0; index < *failedCount; ++index) { - LOGD("failed list: path=%{public}s, errorReason=%{public}d", - failedVec[index].path.c_str(), failedVec[index].error); (*failedLists)[index].pathInfo.value = AllocField(failedVec[index].path.c_str(), failedVec[index].path.length()); CHECK_NULLPTR_AND_CONTINUE((*failedLists)[index].pathInfo.value); @@ -294,7 +288,7 @@ CloudDisk_ErrorCode OH_CloudDisk_GetFileSyncStates(const CloudDisk_SyncFolderPat string(syncFolderPath.value, syncFolderPath.length), pathVec, resultVec); if (ret != CloudDiskServiceErrCode::E_OK) { LOGE("Get file sync state failed, ret: %{public}d", ret); - return CovertToErrorCode(ret); + return ConvertToErrorCode(ret); } *resultCount = resultVec.size(); if (*resultCount == 0) { @@ -307,9 +301,6 @@ CloudDisk_ErrorCode OH_CloudDisk_GetFileSyncStates(const CloudDisk_SyncFolderPat return CloudDisk_ErrorCode::CLOUD_DISK_INTERNAL_ERROR; } for (size_t index = 0; index < *resultCount; ++index) { - LOGD("result list: path=%{public}s, isSuccess=%{public}d, syncState=%{public}d, errorReason=%{public}d", - resultVec[index].path.c_str(), resultVec[index].isSuccess, resultVec[index].state, - resultVec[index].error); (*resultLists)[index].pathInfo.value = AllocField(resultVec[index].path.c_str(), resultVec[index].path.length()); (*resultLists)[index].pathInfo.length = resultVec[index].path.length(); diff --git a/interfaces/kits/ndk/clouddiskmanager/src/oh_cloud_disk_utils.cpp b/interfaces/kits/ndk/clouddiskmanager/src/oh_cloud_disk_utils.cpp index 3e54411b9d0c653609eb9fb81188d5211deda270..794e871932cf7ee57d530d1f7f01d6e3c59a624d 100644 --- a/interfaces/kits/ndk/clouddiskmanager/src/oh_cloud_disk_utils.cpp +++ b/interfaces/kits/ndk/clouddiskmanager/src/oh_cloud_disk_utils.cpp @@ -15,10 +15,11 @@ #include "oh_cloud_disk_utils.h" -CloudDisk_ErrorCode CovertToErrorCode(int32_t innerErrorCode) +CloudDisk_ErrorCode ConvertToErrorCode(int32_t innerErrorCode) { - if (innerToNErrTable.find(innerErrorCode) != innerToNErrTable.end()) { - return innerToNErrTable.at(innerErrorCode); + auto iter = innerToNErrTable.find(innerErrorCode); + if (iter != innerToNErrTable.end()) { + return iter->second; } else { return CloudDisk_ErrorCode::CLOUD_DISK_INTERNAL_ERROR; }