diff --git a/services/distributeddataservice/app/BUILD.gn b/services/distributeddataservice/app/BUILD.gn index 9368b28c5a544bf2bddefb8a242eec58f21a73d3..2415418df037b7c284bdc81fbd2ac9f8f1bccdcb 100644 --- a/services/distributeddataservice/app/BUILD.gn +++ b/services/distributeddataservice/app/BUILD.gn @@ -93,7 +93,6 @@ ohos_shared_library("distributeddataservice") { ubsan = true } sources = [ - "${data_service_path}/service/common/xcollie.cpp", "src/clone/clone_backup_info.cpp", "src/clone/secret_key_backup_data.cpp", "src/db_info_handle_impl.cpp", diff --git a/services/distributeddataservice/service/BUILD.gn b/services/distributeddataservice/service/BUILD.gn index 0eb4d94fe49a6d2366011e1eb79953098eec00d7..799699962afa099106f9e7689d8452ef1fc65e57 100644 --- a/services/distributeddataservice/service/BUILD.gn +++ b/services/distributeddataservice/service/BUILD.gn @@ -73,6 +73,7 @@ ohos_shared_library("distributeddatasvc") { "${data_service_path}/adapter/account:distributeddata_account", "${data_service_path}/adapter/communicator:distributeddata_communicator", "${data_service_path}/adapter/dfx:distributeddata_dfx", + "${data_service_path}/adapter/network:distributeddata_network", "${data_service_path}/adapter/utils:distributeddata_utils", "${data_service_path}/framework:distributeddatasvcfwk", "${data_service_path}/service/backup:distributeddata_backup", diff --git a/services/distributeddataservice/service/cloud/BUILD.gn b/services/distributeddataservice/service/cloud/BUILD.gn index a0772df87bf197871a8def67705dfecbcc7744cd..1b874d23ae0d6ab7a22d91b0f3ec4c305adefa5d 100755 --- a/services/distributeddataservice/service/cloud/BUILD.gn +++ b/services/distributeddataservice/service/cloud/BUILD.gn @@ -63,7 +63,6 @@ ohos_source_set("distributeddata_cloud") { ] deps = [ - "${data_service_path}/adapter/network:distributeddata_network", "${data_service_path}/adapter/schema_helper:distributeddata_schema_helper", ] diff --git a/services/distributeddataservice/service/common/xcollie.h b/services/distributeddataservice/service/common/xcollie.h index 68f8436cef7a57a3fa2074e4472d65c75fe1b4b2..c5a880c0d6c9735fdeeb0032ad725f882f6a6c0e 100644 --- a/services/distributeddataservice/service/common/xcollie.h +++ b/services/distributeddataservice/service/common/xcollie.h @@ -18,6 +18,7 @@ #include #include "xcollie/xcollie.h" +#include "visibility.h" namespace OHOS::DistributedData { class XCollie { @@ -26,9 +27,9 @@ public: XCOLLIE_LOG = 0x1, XCOLLIE_RECOVERY = 0x2 }; - XCollie(const std::string &tag, uint32_t flag, uint32_t timeoutSeconds = RESTART_TIME_THRESHOLD, + API_EXPORT XCollie(const std::string &tag, uint32_t flag, uint32_t timeoutSeconds = RESTART_TIME_THRESHOLD, std::function func = nullptr, void *arg = nullptr); - ~XCollie(); + API_EXPORT ~XCollie(); private: int32_t id_ = -1; diff --git a/services/distributeddataservice/service/kvdb/kvdb_service_impl.cpp b/services/distributeddataservice/service/kvdb/kvdb_service_impl.cpp index 06373b517c50497e72112c3f063d012b41ee9b7c..7c628c8d4f6f6d3363074ee4b8c47570bf3ef183 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_service_impl.cpp +++ b/services/distributeddataservice/service/kvdb/kvdb_service_impl.cpp @@ -1040,7 +1040,8 @@ Status KVDBServiceImpl::DoCloudSync(const StoreMetaData &meta, const SyncInfo &s if (instance == nullptr) { return Status::CLOUD_DISABLED; } - if (!NetworkDelegate::GetInstance()->IsNetworkAvailable()) { + auto network = NetworkDelegate::GetInstance(); + if (network == nullptr || !network->IsNetworkAvailable()) { return Status::NETWORK_ERROR; } std::vector users;