From fcd77c39b6c3d978f3edbd95740123cfb94a2506 Mon Sep 17 00:00:00 2001 From: ohos-lsw Date: Wed, 30 Mar 2022 11:31:12 +0800 Subject: [PATCH 1/3] modify codex Signed-off-by: ohos-lsw --- OAT.xml | 5 ++-- README.en.md | 1 - README.md | 1 - .../account/include/account_change_event.h | 2 +- .../account/include/account_data_collection.h | 2 +- .../account/src/account_data_collection.cpp | 2 +- ability/account/src/account_sync.cpp | 26 +++++++++-------- ability/checkpermission/.gitignore | 4 --- ability/common/include/common.h | 6 ++-- ability/common/include/contacts_columns.h | 4 +-- .../utils/include/contacts_common_event.h | 2 +- .../include/database_disaster_recovery.h | 4 +-- .../src/database_disaster_recovery.cpp | 18 ++++++------ ability/merge/src/candidate_status.cpp | 2 +- ability/merge/src/merger_contacts.cpp | 4 +-- contacts/include/contacts_api.h | 14 +++++----- contacts/include/contacts_napi_common.h | 2 +- contacts/src/contacts_api.cpp | 28 +++++++++---------- contacts/src/contacts_build.cpp | 12 ++++---- contacts/src/result_convert.cpp | 4 +-- .../contacts/include/contacts_account.h | 2 +- dataBusiness/contacts/src/contacts.cpp | 4 +-- .../contacts/src/contacts_account.cpp | 10 +++---- .../contacts/src/contacts_data_ability.cpp | 2 +- .../contacts/src/contacts_database.cpp | 10 +++---- .../contacts/src/contacts_update_helper.cpp | 10 +++---- .../contacts/src/profile_database.cpp | 4 +-- dataBusiness/contacts/src/raw_contacts.cpp | 6 ++-- jstest/Calllog_test.js | 2 +- jstest/List.test.js | 7 ----- jstest/Voicemail_test.js | 2 +- jstest/common.js | 2 +- test/unittest/include/calllogability_test.h | 10 +++++-- test/unittest/include/contactability_test.h | 10 +++++-- test/unittest/include/voicemailability_test.h | 10 +++++-- test/unittest/src/contactprofile_test.cpp | 12 +++----- test/unittest/src/recovery_test.cpp | 6 ++-- 37 files changed, 129 insertions(+), 123 deletions(-) delete mode 100644 ability/checkpermission/.gitignore diff --git a/OAT.xml b/OAT.xml index 850de47..bb6bfd8 100644 --- a/OAT.xml +++ b/OAT.xml @@ -12,9 +12,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. +--> - This is the configuration file template for OpenHarmony OSS Audit Tool, please copy it to your project root dir and modify it refer to OpenHarmony/tools_oat/README. - + diff --git a/README.en.md b/README.en.md index d801960..9d613e5 100644 --- a/README.en.md +++ b/README.en.md @@ -21,7 +21,6 @@ query means for each user's management, which greatly facilitates users to reaso /foundation/contactsdataability/ ├── ability │   ├── account #Account Management -│   ├── checkpermission #Permission Check │   ├── common #Public Method │   ├── datadisasterrecovery #Data Corruption Recovery │   ├── merge #Contacts Merge diff --git a/README.md b/README.md index 41fb02f..e18bd62 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,6 @@ /foundation/contactsdataability/ ├── ability │   ├── account #账户管理 -│   ├── checkpermission #权限检测 │   ├── common #公共方法:log,utils等 │   ├── datadisasterrecovery #数据损坏恢复 │   ├── merge #联系人合并 diff --git a/ability/account/include/account_change_event.h b/ability/account/include/account_change_event.h index 7933a6a..8f05ab9 100644 --- a/ability/account/include/account_change_event.h +++ b/ability/account/include/account_change_event.h @@ -24,7 +24,7 @@ namespace Contacts { class AccountChangeEvent : public OHOS::EventFwk::CommonEventSubscriber { public: ~AccountChangeEvent(); - AccountChangeEvent(const OHOS::EventFwk::CommonEventSubscribeInfo &sp); + explicit AccountChangeEvent(const OHOS::EventFwk::CommonEventSubscribeInfo &sp); void OnReceiveEvent(const OHOS::EventFwk::CommonEventData &data) override; private: const static std::string SPLIT_SYMBOL_VERTICAL = "||"; diff --git a/ability/account/include/account_data_collection.h b/ability/account/include/account_data_collection.h index 620ac06..cdcbec7 100644 --- a/ability/account/include/account_data_collection.h +++ b/ability/account/include/account_data_collection.h @@ -29,7 +29,7 @@ public: ~AccountDataCollection(); AccountDataCollection(std::string accountName, std::string accountType, std::string dataColletion); // Judge whether local account - bool IsDefualtAccount(); + bool IsDefaultAccount(); // Judge whether the system account bool ContainSysAccounts(std::vector sysAccounts); std::string GetcAccountName(); diff --git a/ability/account/src/account_data_collection.cpp b/ability/account/src/account_data_collection.cpp index c1cf2fd..8c0bafa 100644 --- a/ability/account/src/account_data_collection.cpp +++ b/ability/account/src/account_data_collection.cpp @@ -52,7 +52,7 @@ std::string AccountDataCollection::GetcDataCollection() return this->cDataCollection_; } -bool AccountDataCollection::IsDefualtAccount() +bool AccountDataCollection::IsDefaultAccount() { return AccountData::ACCOUNT_NAME == this->cAccountName_ && AccountData::ACCOUNT_TYPE == this->cAccountType_; } diff --git a/ability/account/src/account_sync.cpp b/ability/account/src/account_sync.cpp index ceaf248..5100b76 100644 --- a/ability/account/src/account_sync.cpp +++ b/ability/account/src/account_sync.cpp @@ -62,8 +62,8 @@ void AccountSync::getShouldUpdateAndAddAccounts(std::vector store = nullptr; @@ -90,14 +91,15 @@ void AccountSync::SyncUpdateAccount(std::vector accounts = g_contactsAccount->GetAccountFromLoacl(store); + std::vector accounts = g_contactsAccount->GetAccountFromLocal(store); std::vector notInSysAccounts; for (size_t i = 0; i < accounts.size(); i++) { auto iter = accounts[i]; // if account is not default and not in sysAccounts then this should remove - if (!iter.IsDefualtAccount() && !iter.ContainSysAccounts(sysAccounts)) { + if (!iter.IsDefaultAccount() && !iter.ContainSysAccounts(sysAccounts)) { notInSysAccounts.push_back(iter); } } @@ -129,27 +131,27 @@ int AccountSync::ClearData(std::shared_ptr store, int { RawContacts contactsRawContact; Contacts contactsContact; - if (accountId > ID_EMPTITY) { + if (accountId > ID_EMPTY) { int needDeleteRawContactId = contactsRawContact.GetDeleteRawContactIdByAccountId(store, accountId); - HILOG_INFO("GetDeleteRawContactIdByAccountId successfuly , needDeleteRawContactId is %{public}d", + HILOG_INFO("GetDeleteRawContactIdByAccountId successfully, needDeleteRawContactId is %{public}d", needDeleteRawContactId); int needDeleteContactId = contactsRawContact.GetDeleteContactIdByAccountId(store, accountId); - HILOG_INFO("GetDeleteContactIdByAccountId successfuly needDeleteContactId is %{public}d", needDeleteContactId); + HILOG_INFO("GetDeleteContactIdByAccountId successfully needDeleteContactId is %{public}d", needDeleteContactId); g_contactsAccount->DeleteDataByRawId(store, needDeleteRawContactId); int ret = store->Commit(); - HILOG_INFO("DeleteDataByRawId successfuly commit ret %{public}d", ret); + HILOG_INFO("DeleteDataByRawId successfully commit ret %{public}d", ret); contactsRawContact.DeleteRawcontactByRawId(store, needDeleteRawContactId); ret = store->Commit(); - HILOG_INFO("DeleteRawcontactByRawId successfuly commit ret %{public}d", ret); + HILOG_INFO("DeleteRawcontactByRawId successfully commit ret %{public}d", ret); contactsContact.DeleteContactById(store, needDeleteContactId); ret = store->Commit(); - HILOG_INFO("DeletecontactsById successfuly commit ret %{public}d", ret); + HILOG_INFO("DeletecontactsById successfully commit ret %{public}d", ret); g_contactsAccount->DeleteGroupsByAccountId(store, accountId); ret = store->Commit(); - HILOG_INFO("DeleteGroupsByAccountId successfuly commit ret %{public}d", ret); + HILOG_INFO("DeleteGroupsByAccountId successfully commit ret %{public}d", ret); g_contactsAccount->DeleteAccountByAccountId(store, accountId); ret = store->Commit(); - HILOG_INFO("DeleteAccountByAccountId successfuly commit ret %{public}d", ret); + HILOG_INFO("DeleteAccountByAccountId successfully commit ret %{public}d", ret); } return RDB_EXECUTE_OK; } diff --git a/ability/checkpermission/.gitignore b/ability/checkpermission/.gitignore deleted file mode 100644 index 86d0cb2..0000000 --- a/ability/checkpermission/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -# Ignore everything in this directory -* -# Except this file -!.gitignore \ No newline at end of file diff --git a/ability/common/include/common.h b/ability/common/include/common.h index 9fdfb14..26c210b 100644 --- a/ability/common/include/common.h +++ b/ability/common/include/common.h @@ -31,12 +31,12 @@ constexpr int RDB_OBJECT_EMPTY = -1; constexpr int PARAMETER_EMPTY = -1; constexpr int DELETE_MARK = 1; -constexpr int ID_EMPTITY = 0; +constexpr int ID_EMPTY = 0; constexpr int BATCH_INSERT_COUNT = 40; // ResultSet get Num -constexpr int RESEULT_GET_ONE = 1; -constexpr int RESEULT_GET_TWO = 2; +constexpr int RESULT_GET_ONE = 1; +constexpr int RESULT_GET_TWO = 2; // contact table has Judge constexpr int HAS_NAME = 1; diff --git a/ability/common/include/contacts_columns.h b/ability/common/include/contacts_columns.h index 8aad569..877f17b 100644 --- a/ability/common/include/contacts_columns.h +++ b/ability/common/include/contacts_columns.h @@ -183,8 +183,8 @@ public: static constexpr const char *EXTEND3 = "extend3"; static constexpr const char *EXTEND4 = "extend4"; static constexpr const char *ALPHA_NAME = "alpha_name"; - static constexpr const char *OTHRE_LAN_LAST_NAME = "other_lan_last_name"; - static constexpr const char *OTHRE_LAN_FIRST_NAME = "other_lan_first_name"; + static constexpr const char *OTHER_LAN_LAST_NAME = "other_lan_last_name"; + static constexpr const char *OTHER_LAN_FIRST_NAME = "other_lan_first_name"; static constexpr const char *EXTEND5 = "extend5"; static constexpr const char *PHONETIC_NAME = "phonetic_name"; static constexpr const char *LAN_STYLE = "lan_style"; diff --git a/ability/common/utils/include/contacts_common_event.h b/ability/common/utils/include/contacts_common_event.h index 7e1245e..bb58cbd 100644 --- a/ability/common/utils/include/contacts_common_event.h +++ b/ability/common/utils/include/contacts_common_event.h @@ -36,7 +36,7 @@ constexpr int CONTACT_DELETE = 2; class ContactsCommonEvent : public OHOS::EventFwk::CommonEventSubscriber { public: - ContactsCommonEvent(const OHOS::EventFwk::CommonEventSubscribeInfo &subscriberInfo) + explicit ContactsCommonEvent(const OHOS::EventFwk::CommonEventSubscribeInfo &subscriberInfo) : CommonEventSubscriber(subscriberInfo) { } diff --git a/ability/datadisasterrecovery/include/database_disaster_recovery.h b/ability/datadisasterrecovery/include/database_disaster_recovery.h index 7bbe38b..328c9c0 100644 --- a/ability/datadisasterrecovery/include/database_disaster_recovery.h +++ b/ability/datadisasterrecovery/include/database_disaster_recovery.h @@ -26,7 +26,7 @@ class DataBaseDisasterRecovery { public: static std::shared_ptr GetInstance(); ~DataBaseDisasterRecovery(); - int SQLliteCheckDb(); + int SQLiteCheckDb(); int BackDatabase(); int BackDatabase(std::string dataBaseName); std::string GetBackUpDatabase(const std::shared_ptr &store_); @@ -36,7 +36,7 @@ private: DataBaseDisasterRecovery(); static std::shared_ptr instance_; static std::map> redbStoreMap; - int SQLliteCheckDb(std::shared_ptr rdbStore, std::string dataBaseName); + int SQLiteCheckDb(std::shared_ptr rdbStore, std::string dataBaseName); static const std::string BACKUP_LINK_SYMBOL; static const std::string BACKUP_SUFFIX; static const std::string DB_OK; diff --git a/ability/datadisasterrecovery/src/database_disaster_recovery.cpp b/ability/datadisasterrecovery/src/database_disaster_recovery.cpp index dda993e..870e560 100644 --- a/ability/datadisasterrecovery/src/database_disaster_recovery.cpp +++ b/ability/datadisasterrecovery/src/database_disaster_recovery.cpp @@ -50,7 +50,7 @@ DataBaseDisasterRecovery::~DataBaseDisasterRecovery() { } -int DataBaseDisasterRecovery::SQLliteCheckDb() +int DataBaseDisasterRecovery::SQLiteCheckDb() { g_mtx.lock(); int ret = OPERATION_ERROR; @@ -65,13 +65,14 @@ int DataBaseDisasterRecovery::SQLliteCheckDb() } if (redbStoreMap.empty()) { HILOG_ERROR("DataBaseDisasterRecovery SQLliteCheck redbStoreMap is empty"); + g_mtx.unlock(); return RDB_OBJECT_EMPTY; } for (auto &kv : redbStoreMap) { std::shared_ptr store_ = kv.second; - ret = SQLliteCheckDb(store_, kv.first); + ret = SQLiteCheckDb(store_, kv.first); if (ret != OHOS::NativeRdb::E_OK) { - HILOG_ERROR("DataBaseDisasterRecovery SQLliteCheckDb ERROR."); + HILOG_ERROR("DataBaseDisasterRecovery SQLiteCheckDb ERROR."); g_mtx.unlock(); return ret; } @@ -81,7 +82,7 @@ int DataBaseDisasterRecovery::SQLliteCheckDb() return RDB_EXECUTE_OK; } -int DataBaseDisasterRecovery::SQLliteCheckDb( +int DataBaseDisasterRecovery::SQLiteCheckDb( std::shared_ptr rdbStore, std::string dataBaseName) { // default switch @@ -137,6 +138,7 @@ int DataBaseDisasterRecovery::BackDatabase(std::string dataBaseName) std::shared_ptr store_ = iter->second; if (store_ == nullptr) { HILOG_ERROR("DataBaseDisasterRecovery BackDatabase %{public}s store_ is nullptr", dataBaseName.c_str()); + g_mtx.unlock(); return RDB_OBJECT_EMPTY; } std::string dbPath = ContactsPath::RDB_BACKUP_PATH + dataBaseName + BACKUP_SUFFIX; @@ -182,11 +184,11 @@ std::string DataBaseDisasterRecovery::GetBackUpDatabase(const std::shared_ptr sto } /** - * @brief Query operation for ensure if candidate has ture merge_status + * @brief Query operation for ensure if candidate has true merge_status * * @param store Conditions for query operation * @param rawId Contacts's raw_contact_id to query diff --git a/ability/merge/src/merger_contacts.cpp b/ability/merge/src/merger_contacts.cpp index 4ed1f28..bc383cd 100644 --- a/ability/merge/src/merger_contacts.cpp +++ b/ability/merge/src/merger_contacts.cpp @@ -45,7 +45,7 @@ MergerContacts::~MergerContacts() int MergerContacts::ContactMerge(std::shared_ptr store) { if (store == nullptr) { - HILOG_ERROR("stroe is empty"); + HILOG_ERROR("store is empty"); return RDB_OBJECT_EMPTY; } HILOG_INFO("MergerContacts::ContactMerge is starting"); @@ -594,7 +594,7 @@ bool MergerContacts::isNameMatch(std::shared_ptr stor int MergerContacts::ForceContactMerge(std::shared_ptr store, std::set ids) { if (store == nullptr) { - HILOG_ERROR("stroe is empty"); + HILOG_ERROR("store is empty"); return RDB_OBJECT_EMPTY; } int minId = 0; diff --git a/contacts/include/contacts_api.h b/contacts/include/contacts_api.h index 97ab9ed..c1ff602 100644 --- a/contacts/include/contacts_api.h +++ b/contacts/include/contacts_api.h @@ -63,21 +63,21 @@ std::shared_ptr GetDataAbilityHelper(napi_e void HolderPredicates(const Holder &holder, NativeRdb::DataAbilityPredicates &predicates); void HoldersStructure(std::map &holders, Holder &holder); void AttributesPredicates(ContactAttributes &attrs, NativeRdb::DataAbilityPredicates &predicates); -NativeRdb::DataAbilityPredicates BuildQureyContactPredicates( +NativeRdb::DataAbilityPredicates BuildQueryContactPredicates( napi_env env, std::string key, napi_value hold, napi_value attr); NativeRdb::DataAbilityPredicates BuildUpdateContactPredicates(napi_env env, napi_value contacts, napi_value attr); -NativeRdb::DataAbilityPredicates BuildQuerytContactData(napi_env env, napi_value &contactsObject, +NativeRdb::DataAbilityPredicates BuildQueryContactData(napi_env env, napi_value &contactsObject, napi_value &attrObject, std::vector &valueContactData); std::vector BuildUpdateContactColumns(); void BuildUpdateContactConvertParams( napi_env env, napi_value &contacts, napi_value &attr, ExecuteHelper &executeHelper); -NativeRdb::DataAbilityPredicates BuildQureyContactsPredicates(napi_env env, napi_value hold, napi_value attr); -NativeRdb::DataAbilityPredicates BuildQureyContactsByEmailPredicates( +NativeRdb::DataAbilityPredicates BuildQueryContactsPredicates(napi_env env, napi_value hold, napi_value attr); +NativeRdb::DataAbilityPredicates BuildQueryContactsByEmailPredicates( napi_env env, std::string email, napi_value hold, napi_value attr); -NativeRdb::DataAbilityPredicates BuildQureyContactsByPhoneNumberPredicates( +NativeRdb::DataAbilityPredicates BuildQueryContactsByPhoneNumberPredicates( napi_env env, std::string phoneNumber, napi_value hold, napi_value attr); -NativeRdb::DataAbilityPredicates BuildQureyGroupsPredicates(napi_env env, napi_value hold); -NativeRdb::DataAbilityPredicates BuildQureyKeyPredicates(napi_env env, int id, napi_value hold); +NativeRdb::DataAbilityPredicates BuildQueryGroupsPredicates(napi_env env, napi_value hold); +NativeRdb::DataAbilityPredicates BuildQueryKeyPredicates(napi_env env, int id, napi_value hold); NativeRdb::DataAbilityPredicates BuildQueryMyCardPredicates(napi_env env, napi_value attr); NativeRdb::DataAbilityPredicates BuildIsLocalContactPredicates(napi_env env, napi_value id); NativeRdb::DataAbilityPredicates BuildIsMyCardPredicates(napi_env env, napi_value id); diff --git a/contacts/include/contacts_napi_common.h b/contacts/include/contacts_napi_common.h index 3bcbc3c..a4ac58d 100644 --- a/contacts/include/contacts_napi_common.h +++ b/contacts/include/contacts_napi_common.h @@ -104,7 +104,7 @@ struct ExecuteHelper { std::vector valueContactData; // dataAbilityHelper std::shared_ptr dataAbilityHelper; -}; +} } // namespace ContactsApi } // namespace OHOS #endif // CONTACT_NAPI_COMMON_H \ No newline at end of file diff --git a/contacts/src/contacts_api.cpp b/contacts/src/contacts_api.cpp index 7fac544..fbb40c9 100644 --- a/contacts/src/contacts_api.cpp +++ b/contacts/src/contacts_api.cpp @@ -259,7 +259,7 @@ NativeRdb::DataAbilityPredicates BuildDeleteContactPredicates(napi_env env, napi * @param hold Conditions for resolve object interface operation * @param attr Conditions for resolve object interface operation */ -NativeRdb::DataAbilityPredicates BuildQureyContactPredicates( +NativeRdb::DataAbilityPredicates BuildQueryContactPredicates( napi_env env, napi_value key, napi_value hold, napi_value attr) { ContactsBuild contactsBuild; @@ -297,7 +297,7 @@ void HoldersStructure(std::map &holders, Holder &holde * @param hold Conditions for resolve object interface operation * @param attr Conditions for resolve object interface operation */ -NativeRdb::DataAbilityPredicates BuildQureyContactsPredicates(napi_env env, napi_value hold, napi_value attr) +NativeRdb::DataAbilityPredicates BuildQueryContactsPredicates(napi_env env, napi_value hold, napi_value attr) { ContactsBuild contactsBuild; Holder holder = contactsBuild.GetHolder(env, hold); @@ -344,7 +344,7 @@ NativeRdb::DataAbilityPredicates BuildQureyContactsPredicates(napi_env env, napi * @param hold Conditions for resolve object interface operation * @param attr Conditions for resolve object interface operation */ -NativeRdb::DataAbilityPredicates BuildQureyContactsByEmailPredicates( +NativeRdb::DataAbilityPredicates BuildQueryContactsByEmailPredicates( napi_env env, napi_value emailobject, napi_value hold, napi_value attr) { ContactsBuild contactsBuild; @@ -372,7 +372,7 @@ NativeRdb::DataAbilityPredicates BuildQureyContactsByEmailPredicates( * @param hold Conditions for resolve object interface operation * @param attr Conditions for resolve object interface operation */ -NativeRdb::DataAbilityPredicates BuildQureyContactsByPhoneNumberPredicates( +NativeRdb::DataAbilityPredicates BuildQueryContactsByPhoneNumberPredicates( napi_env env, napi_value number, napi_value hold, napi_value attr) { ContactsBuild contactsBuild; @@ -398,7 +398,7 @@ NativeRdb::DataAbilityPredicates BuildQureyContactsByPhoneNumberPredicates( * @param env Conditions for resolve object interface operation * @param hold Conditions for resolve object interface operation */ -NativeRdb::DataAbilityPredicates BuildQureyGroupsPredicates(napi_env env, napi_value hold) +NativeRdb::DataAbilityPredicates BuildQueryGroupsPredicates(napi_env env, napi_value hold) { ContactsBuild contactsBuild; Holder holder = contactsBuild.GetHolder(env, hold); @@ -427,7 +427,7 @@ NativeRdb::DataAbilityPredicates BuildQureyGroupsPredicates(napi_env env, napi_v * @param id Conditions for resolve object interface operation * @param hold Conditions for resolve object interface operation */ -NativeRdb::DataAbilityPredicates BuildQureyKeyPredicates(napi_env env, napi_value id, napi_value hold) +NativeRdb::DataAbilityPredicates BuildQueryKeyPredicates(napi_env env, napi_value id, napi_value hold) { ContactsBuild contactsBuild; int value = contactsBuild.GetInt(env, id); @@ -467,7 +467,7 @@ NativeRdb::DataAbilityPredicates BuildQueryMyCardPredicates(napi_env env, napi_v return predicates; } -NativeRdb::DataAbilityPredicates BuildQuerytContactData(napi_env env, napi_value &contactObject, napi_value &attrObject, +NativeRdb::DataAbilityPredicates BuildQueryContactData(napi_env env, napi_value &contactObject, napi_value &attrObject, std::vector &valueContactData) { ContactsBuild contactsBuild; @@ -516,7 +516,7 @@ void BuildUpdateContactConvertParams(napi_env env, napi_value &contact, napi_val { executeHelper->valueContactData.clear(); NativeRdb::DataAbilityPredicates predicates = - BuildQuerytContactData(env, contact, attr, executeHelper->valueContactData); + BuildQueryContactData(env, contact, attr, executeHelper->valueContactData); executeHelper->columns = BuildUpdateContactColumns(); ContactsControl contactsControl; std::shared_ptr resultSet = @@ -852,19 +852,19 @@ NativeRdb::DataAbilityPredicates ConvertParamsSwitchSplit( NativeRdb::DataAbilityPredicates predicates; switch (code) { case QUERY_CONTACT: - predicates = BuildQureyContactPredicates(env, key, hold, attr); + predicates = BuildQueryContactPredicates(env, key, hold, attr); break; case QUERY_CONTACTS: - predicates = BuildQureyContactsPredicates(env, hold, attr); + predicates = BuildQueryContactsPredicates(env, hold, attr); break; case QUERY_CONTACTS_BY_EMAIL: - predicates = BuildQureyContactsByEmailPredicates(env, key, hold, attr); + predicates = BuildQueryContactsByEmailPredicates(env, key, hold, attr); break; case QUERY_CONTACTS_BY_PHONE_NUMBER: - predicates = BuildQureyContactsByPhoneNumberPredicates(env, key, hold, attr); + predicates = BuildQueryContactsByPhoneNumberPredicates(env, key, hold, attr); break; case QUERY_GROUPS: - predicates = BuildQureyGroupsPredicates(env, hold); + predicates = BuildQueryGroupsPredicates(env, hold); break; case QUERY_HOLDERS: break; @@ -912,7 +912,7 @@ void SetChildActionCodeAndConvertParams(napi_env env, napi_callback_info info, E executeHelper->predicates = BuildIsMyCardPredicates(env, id); break; case QUERY_KEY: - executeHelper->predicates = BuildQureyKeyPredicates(env, id, hold); + executeHelper->predicates = BuildQueryKeyPredicates(env, id, hold); break; default: executeHelper->predicates = ConvertParamsSwitchSplit(executeHelper->actionCode, env, key, hold, attr); diff --git a/contacts/src/contacts_build.cpp b/contacts/src/contacts_build.cpp index 177fe9a..f24e9ca 100644 --- a/contacts/src/contacts_build.cpp +++ b/contacts/src/contacts_build.cpp @@ -533,17 +533,17 @@ Portrait ContactsBuild::GetUri(napi_env env, napi_value object) std::vector ContactsBuild::GetEmails(napi_env env, napi_value object) { std::vector emailVec; - napi_value EamilArray = GetArrayByKey(env, object, "emails"); - if (EamilArray == nullptr) { - HILOG_ERROR("ContactsBuild GetEmail napiValueEamil is null "); + napi_value EmailArray = GetArrayByKey(env, object, "emails"); + if (EmailArray == nullptr) { + HILOG_ERROR("ContactsBuild GetEmail napiValueEmail is null "); return emailVec; } uint32_t size = 0; - napi_get_array_length(env, EamilArray, &size); + napi_get_array_length(env, EmailArray, &size); for (uint32_t i = 0; i < size; i++) { Email email; napi_value object; - napi_get_element(env, EamilArray, i, &object); + napi_get_element(env, EmailArray, i, &object); email.email = GetStringValueByKey(env, object, "email"); email.labelName = GetStringValueByKey(env, object, "labelName"); email.displayName = GetStringValueByKey(env, object, "displayName"); @@ -785,7 +785,7 @@ Holder ContactsBuild::GetHolder(napi_env env, napi_value object) { Holder holder; if (object == nullptr) { - HILOG_ERROR("GetHolder Holoder is null "); + HILOG_ERROR("GetHolder Holder is null "); return holder; } holder.bundleName = GetStringValueByKey(env, object, "bundleName"); diff --git a/contacts/src/result_convert.cpp b/contacts/src/result_convert.cpp index b925ec6..91b5c88 100644 --- a/contacts/src/result_convert.cpp +++ b/contacts/src/result_convert.cpp @@ -406,8 +406,8 @@ void ResultConvert::ConvertName( napi_value nameSuffixValue = GetResultValue(env, nameSuffixKey, resultSet); napi_value napiFullNameKey = CreateNapiStringValue(env, "fullName"); napi_set_property(env, objectElement, napiFullNameKey, fullNameValue); - napi_value napifamilyNameKey = CreateNapiStringValue(env, "familyName"); - napi_set_property(env, objectElement, napifamilyNameKey, familyNameValue); + napi_value napiFamilyNameKey = CreateNapiStringValue(env, "familyName"); + napi_set_property(env, objectElement, napiFamilyNameKey, familyNameValue); napi_value napiFamilyNamePhoneticKey = CreateNapiStringValue(env, "phonetic_name"); napi_set_property(env, objectElement, napiFamilyNamePhoneticKey, familyNamePhoneticValue); napi_value napiGivenNameKey = CreateNapiStringValue(env, "givenName"); diff --git a/dataBusiness/contacts/include/contacts_account.h b/dataBusiness/contacts/include/contacts_account.h index 9de1319..7e6af21 100644 --- a/dataBusiness/contacts/include/contacts_account.h +++ b/dataBusiness/contacts/include/contacts_account.h @@ -33,7 +33,7 @@ public: int LookupAccountTypeId( std::shared_ptr rdbStore, std::string accountName, std::string accountType); void PrepopulateCommonAccountTypes(std::shared_ptr rdbStore); - std::vector GetAccountFromLoacl(std::shared_ptr rdbStore); + std::vector GetAccountFromLocal(std::shared_ptr rdbStore); int GetNotExistAccount(std::shared_ptr rdbStore, AccountDataCollection collection); int DeleteDataByRawId(std::shared_ptr rdbStore, int needDeleteRawContactId); int DeleteGroupsByAccountId(std::shared_ptr rdbStore, int accountId); diff --git a/dataBusiness/contacts/src/contacts.cpp b/dataBusiness/contacts/src/contacts.cpp index 1861214..23aecea 100644 --- a/dataBusiness/contacts/src/contacts.cpp +++ b/dataBusiness/contacts/src/contacts.cpp @@ -33,7 +33,7 @@ Contacts::~Contacts() * @brief Insert the raw_contact table at the same time as the contact table * * @param rdbStore Database operation object - * @param outRawContactId raw_conatct table id + * @param outRawContactId raw_contact table id * @param rawContactValues insert raw_contact values * @param contactId contact_id address * @@ -126,7 +126,7 @@ int Contacts::DeleteContactById(std::shared_ptr rdbSt HILOG_ERROR("ContactsAccount DeletecontactById store is nullptr"); return RDB_OBJECT_EMPTY; } - if (needDeleteContactId < ID_EMPTITY) { + if (needDeleteContactId < ID_EMPTY) { HILOG_ERROR("ContactsAccount DeleteDataByRawId needDeleteContactId illegal"); return OPERATION_ERROR; } diff --git a/dataBusiness/contacts/src/contacts_account.cpp b/dataBusiness/contacts/src/contacts_account.cpp index 7def65d..922f872 100644 --- a/dataBusiness/contacts/src/contacts_account.cpp +++ b/dataBusiness/contacts/src/contacts_account.cpp @@ -108,13 +108,13 @@ int ContactsAccount::LookupAccountTypeId( return accountId; } -std::vector ContactsAccount::GetAccountFromLoacl( +std::vector ContactsAccount::GetAccountFromLocal( std::shared_ptr rdbStore) { std::shared_ptr &store_ = rdbStore; std::vector values; if (store_ == nullptr) { - HILOG_ERROR("ContactsAccount GetAccountFromLoacl store_ is nullptr"); + HILOG_ERROR("ContactsAccount GetAccountFromLocal store_ is nullptr"); return values; } std::string buildQuery = ""; @@ -203,7 +203,7 @@ int ContactsAccount::DeleteAccountByAccountId(std::shared_ptr instance = OHOS::Contacts::DataBaseDisasterRecovery::GetInstance(); - int retCode = instance->SQLliteCheckDb(); + int retCode = instance->SQLiteCheckDb(); if (retCode == 0) { retCode = instance->BackDatabase(); } diff --git a/dataBusiness/contacts/src/contacts_database.cpp b/dataBusiness/contacts/src/contacts_database.cpp index 74614b9..17d6e88 100644 --- a/dataBusiness/contacts/src/contacts_database.cpp +++ b/dataBusiness/contacts/src/contacts_database.cpp @@ -945,9 +945,9 @@ std::vector ContactsDataBase::QueryContactDataRawContactId( std::vector typeIdVector; int resultSetNum = resultSet->GoToFirstRow(); while (resultSetNum == OHOS::NativeRdb::E_OK) { - std::string colummName = ContactDataColumns::RAW_CONTACT_ID; + std::string columnName = ContactDataColumns::RAW_CONTACT_ID; int columnIndex = 0; - resultSet->GetColumnIndex(colummName, columnIndex); + resultSet->GetColumnIndex(columnName, columnIndex); int rawContactId = 0; resultSet->GetInt(columnIndex, rawContactId); std::string typeIdKey = ContactDataColumns::TYPE_ID; @@ -1047,8 +1047,8 @@ std::string ContactsDataBase::StructureDeleteContactJson( contentColumns.push_back(ContactDataColumns::EXTEND3); contentColumns.push_back(ContactDataColumns::EXTEND4); contentColumns.push_back(ContactDataColumns::ALPHA_NAME); - contentColumns.push_back(ContactDataColumns::OTHRE_LAN_LAST_NAME); - contentColumns.push_back(ContactDataColumns::OTHRE_LAN_FIRST_NAME); + contentColumns.push_back(ContactDataColumns::OTHER_LAN_LAST_NAME); + contentColumns.push_back(ContactDataColumns::OTHER_LAN_FIRST_NAME); contentColumns.push_back(ContactDataColumns::EXTEND5); contentColumns.push_back(ContactDataColumns::LAN_STYLE); contentColumns.push_back(ContactDataColumns::CUSTOM_DATA); @@ -1143,7 +1143,7 @@ void ContactsDataBase::DestroyInstanceAndRestore(std::string restorePath) { g_mtx.lock(); if (access(restorePath.c_str(), F_OK) != 0) { - HILOG_ERROR("Restore file %{public}s does not exist", restorePath.c_str()); + HILOG_ERROR("Restore file %{private}s does not exist", restorePath.c_str()); g_mtx.unlock(); return; } diff --git a/dataBusiness/contacts/src/contacts_update_helper.cpp b/dataBusiness/contacts/src/contacts_update_helper.cpp index 36b3053..a2b89b8 100644 --- a/dataBusiness/contacts/src/contacts_update_helper.cpp +++ b/dataBusiness/contacts/src/contacts_update_helper.cpp @@ -212,8 +212,8 @@ void ContactsUpdateHelper::DataToUpdateCallLog( if (!isDelete) { resultSet->GetString(0, name); } - resultSet->GetString(RESEULT_GET_ONE, phoneNumber); - resultSet->GetString(RESEULT_GET_TWO, quickSearch); + resultSet->GetString(RESULT_GET_ONE, phoneNumber); + resultSet->GetString(RESULT_GET_TWO, quickSearch); UpdateCallLog(phoneNumber, name, quickSearch, isDelete, true); UpdateCallLog(phoneNumber, name, quickSearch, isDelete, false); resultSetNum = resultSet->GoToNextRow(); @@ -403,11 +403,11 @@ OHOS::NativeRdb::ValuesBucket ContactsUpdateHelper::GetUpdateCompanyValuesBucket return valuesBucket; } if (linkDataDataValues.HasColumn(ContactDataColumns::DETAIL_INFO)) { - std::string commpany; + std::string company; OHOS::NativeRdb::ValueObject typeValue; linkDataDataValues.GetObject(ContactDataColumns::DETAIL_INFO, typeValue); - typeValue.GetString(commpany); - valuesBucket.PutString(RawContactColumns::COMPANY, commpany); + typeValue.GetString(company); + valuesBucket.PutString(RawContactColumns::COMPANY, company); } if (linkDataDataValues.HasColumn(ContactDataColumns::POSITION)) { std::string position; diff --git a/dataBusiness/contacts/src/profile_database.cpp b/dataBusiness/contacts/src/profile_database.cpp index 8c1cbfe..9164794 100644 --- a/dataBusiness/contacts/src/profile_database.cpp +++ b/dataBusiness/contacts/src/profile_database.cpp @@ -71,7 +71,7 @@ void ProfileDatabase::DestroyInstanceAndRestore(std::string restorePath) { g_mtx.lock(); if (access(restorePath.c_str(), F_OK) != 0) { - HILOG_ERROR("Restore file %{public}s does not exist", restorePath.c_str()); + HILOG_ERROR("Restore file %{private}s does not exist", restorePath.c_str()); g_mtx.unlock(); return; } @@ -85,7 +85,7 @@ void ProfileDatabase::DestroyInstanceAndRestore(std::string restorePath) bool ProfileDatabase::Restore(std::string restorePath) { if (rename(restorePath.c_str(), g_databaseName.c_str())) { - HILOG_ERROR("Restore rename oldFileName = %{public}s to newFileName %{public}s", restorePath.c_str(), + HILOG_ERROR("Restore rename oldFileName = %{private}s to newFileName %{private}s", restorePath.c_str(), g_databaseName.c_str()); return true; } diff --git a/dataBusiness/contacts/src/raw_contacts.cpp b/dataBusiness/contacts/src/raw_contacts.cpp index 0ba6514..675c0fc 100644 --- a/dataBusiness/contacts/src/raw_contacts.cpp +++ b/dataBusiness/contacts/src/raw_contacts.cpp @@ -91,7 +91,7 @@ int RawContacts::GetDeleteContactIdByAccountId(std::shared_ptrvalues = values; this->result = result; + this->predicatesId = -1; + this->predicatesDeleteId = -1; } CallLogAsync(OHOS::NativeRdb::ValuesBucket &updateValues, int &predicatesId) { this->updateValues = updateValues; this->predicatesId = predicatesId; + this->predicatesDeleteId = -1; } CallLogAsync(std::vector> resultSet, @@ -50,10 +53,13 @@ public: { this->resultSet = resultSet; this->predicatesQueryId = predicatesQueryId; + this->predicatesId = -1; + this->predicatesDeleteId = -1; } - CallLogAsync(int &predicatesDeleteId) + explicit CallLogAsync(int &predicatesDeleteId) { + this->predicatesId = -1; this->predicatesDeleteId = predicatesDeleteId; } void Insert() diff --git a/test/unittest/include/contactability_test.h b/test/unittest/include/contactability_test.h index 655e0dd..649b2b9 100644 --- a/test/unittest/include/contactability_test.h +++ b/test/unittest/include/contactability_test.h @@ -21,7 +21,7 @@ namespace Contacts { namespace Test { -namespace { +namespace Lock { std::mutex mtx_; } @@ -38,11 +38,14 @@ public: { this->values = values; this->result = result; + this->predicatesId = -1; + this->predicatesDeleteId = -1; } ContactAsync(OHOS::NativeRdb::ValuesBucket &updateValues, int &predicatesId) { this->updateValues = updateValues; this->predicatesId = predicatesId; + this->predicatesDeleteId = -1; } ContactAsync(std::vector> resultSet, @@ -50,10 +53,13 @@ public: { this->resultSet = resultSet; this->predicatesQueryId = predicatesQueryId; + this->predicatesId = -1; + this->predicatesDeleteId = -1; } - ContactAsync(int &predicatesDeleteId) + explicit ContactAsync(int &predicatesDeleteId) { + this->predicatesId = -1; this->predicatesDeleteId = predicatesDeleteId; } void Insert() diff --git a/test/unittest/include/voicemailability_test.h b/test/unittest/include/voicemailability_test.h index 378444b..c8da27d 100644 --- a/test/unittest/include/voicemailability_test.h +++ b/test/unittest/include/voicemailability_test.h @@ -21,7 +21,7 @@ namespace Contacts { namespace Test { -namespace { +namespace Lock { std::mutex mtx_; } class VoicemailAsync { @@ -37,11 +37,14 @@ public: { this->values = values; this->result = result; + this->predicatesId = -1; + this->predicatesDeleteId = -1; } VoicemailAsync(OHOS::NativeRdb::ValuesBucket &updateValues, int &predicatesId) { this->updateValues = updateValues; this->predicatesId = predicatesId; + this->predicatesDeleteId = -1; } VoicemailAsync(std::vector> resultSet, @@ -49,10 +52,13 @@ public: { this->resultSet = resultSet; this->predicatesQueryId = predicatesQueryId; + this->predicatesId = -1; + this->predicatesDeleteId = -1; } - VoicemailAsync(int &predicatesDeleteId) + explicit VoicemailAsync(int &predicatesDeleteId) { + this->predicatesId = -1; this->predicatesDeleteId = predicatesDeleteId; } void Insert() diff --git a/test/unittest/src/contactprofile_test.cpp b/test/unittest/src/contactprofile_test.cpp index b3a8cd9..6362b84 100644 --- a/test/unittest/src/contactprofile_test.cpp +++ b/test/unittest/src/contactprofile_test.cpp @@ -182,29 +182,25 @@ void ContactProfileTest::QueryAndExpectResult(std::string &tableName, OHOS::Nati int64_t ContactProfileTest::RawContactInsertValues(OHOS::NativeRdb::ValuesBucket &values) { OHOS::Uri uriRawContact(ProfileUri::RAW_CONTACT); - int64_t code = contactsDataAbility.Insert(uriRawContact, values); - return code; + return contactsDataAbility.Insert(uriRawContact, values); } int64_t ContactProfileTest::ContactDataInsertValues(OHOS::NativeRdb::ValuesBucket &values) { OHOS::Uri uriContactData(ProfileUri::CONTACT_DATA); - int64_t code = contactsDataAbility.Insert(uriContactData, values); - return code; + return contactsDataAbility.Insert(uriContactData, values); } int64_t ContactProfileTest::GroupsInsertValues(OHOS::NativeRdb::ValuesBucket &values) { OHOS::Uri uriGroups(ProfileUri::GROUPS); - int64_t code = contactsDataAbility.Insert(uriGroups, values); - return code; + return contactsDataAbility.Insert(uriGroups, values); } int64_t ContactProfileTest::ContactBlocklistInsertValues(OHOS::NativeRdb::ValuesBucket &values) { OHOS::Uri uriContactBolcklist(ProfileUri::BLOCKLIST); - int64_t code = contactsDataAbility.Insert(uriContactBolcklist, values); - return code; + return contactsDataAbility.Insert(uriContactBolcklist, values); } void ContactProfileTest::GetAllRawContactColumns( diff --git a/test/unittest/src/recovery_test.cpp b/test/unittest/src/recovery_test.cpp index 542e091..ce2c8e8 100644 --- a/test/unittest/src/recovery_test.cpp +++ b/test/unittest/src/recovery_test.cpp @@ -64,13 +64,13 @@ HWTEST_F(RecoveryTest, recovery_test_100, testing::ext::TestSize.Level1) std::shared_ptr instance = OHOS::Contacts::DataBaseDisasterRecovery::GetInstance(); std::shared_ptr contactDatabase = OHOS::Contacts::ContactsDataBase::GetInstance(); - int result = instance->SQLliteCheckDb(); - HILOG_INFO("--- recovery_test_100 SQLliteCheckDb ret ! --- %{public}d", result); + int result = instance->SQLiteCheckDb(); + HILOG_INFO("--- recovery_test_100 SQLiteCheckDb ret ! --- %{public}d", result); if (result == 0) { instance->BackDatabase(); } std::string backupPath = instance->GetBackUpDatabase(contactDatabase->contactStore_); - HILOG_INFO("--- recovery_test_100 is end! --- %{public}s ", backupPath.c_str()); + HILOG_INFO("--- recovery_test_100 is end! --- %{private}s ", backupPath.c_str()); ClearData(); } -- Gitee From f237f2153c2299ae35ed490649127e646cc07cad Mon Sep 17 00:00:00 2001 From: ohos-lsw Date: Wed, 30 Mar 2022 12:03:21 +0800 Subject: [PATCH 2/3] modify codex Signed-off-by: ohos-lsw --- contacts/include/contacts_napi_common.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contacts/include/contacts_napi_common.h b/contacts/include/contacts_napi_common.h index a4ac58d..f4ffee8 100644 --- a/contacts/include/contacts_napi_common.h +++ b/contacts/include/contacts_napi_common.h @@ -81,7 +81,7 @@ constexpr int SIP_ADDRESS = 17; struct ExecuteHelper { ExecuteHelper() : work(nullptr), deferred(nullptr), dataValue(nullptr), sync(1), argc(0), actionCode(-1), callBack(nullptr), - info(nullptr), childActionCode(0), promise(nullptr) {}; + info(nullptr), childActionCode(0), promise(nullptr) {} napi_async_work work; napi_deferred deferred; napi_value dataValue; @@ -104,7 +104,7 @@ struct ExecuteHelper { std::vector valueContactData; // dataAbilityHelper std::shared_ptr dataAbilityHelper; -} +}; } // namespace ContactsApi } // namespace OHOS #endif // CONTACT_NAPI_COMMON_H \ No newline at end of file -- Gitee From a32f6a19e4c001f649ef4e44e3d95409b135db47 Mon Sep 17 00:00:00 2001 From: ohos-lsw Date: Wed, 30 Mar 2022 16:39:30 +0800 Subject: [PATCH 3/3] modify codex Signed-off-by: ohos-lsw --- ability/account/src/account_sync.cpp | 3 +-- bundle.json | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/ability/account/src/account_sync.cpp b/ability/account/src/account_sync.cpp index 5100b76..5e8a299 100644 --- a/ability/account/src/account_sync.cpp +++ b/ability/account/src/account_sync.cpp @@ -62,8 +62,7 @@ void AccountSync::getShouldUpdateAndAddAccounts(std::vector