From: Piotr Kosko Date: Wed, 27 May 2015 10:50:40 +0000 (+0200) Subject: [Contact] Added logs in methods onEntered and onReturn X-Git-Tag: submit/tizen_mobile/20150612.133019^2~2^2~107 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=23e20356132277b24a21f35eb72394713afa1d75;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git [Contact] Added logs in methods onEntered and onReturn Change-Id: Ibb59af948464fcc172602163c5ee4daca6189a2a Signed-off-by: Piotr Kosko --- diff --git a/src/contact/addressbook.cc b/src/contact/addressbook.cc index 467c82d0..49c6f317 100644 --- a/src/contact/addressbook.cc +++ b/src/contact/addressbook.cc @@ -49,6 +49,7 @@ inline bool IsUnified(long id) { return id == kUnifiedAddressBookId; } } // anonymous namespace PlatformResult AddressBookGet(const JsonObject& args, JsonObject& out) { + LoggerD("Enter"); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -78,6 +79,7 @@ PlatformResult AddressBookGet(const JsonObject& args, JsonObject& out) { } PlatformResult AddressBookAdd(const JsonObject& args, JsonObject& out) { + LoggerD("Enter"); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -131,6 +133,7 @@ PlatformResult AddressBookAdd(const JsonObject& args, JsonObject& out) { } PlatformResult AddressBookUpdate(const JsonObject& args, JsonObject& out) { + LoggerD("Enter"); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -306,6 +309,7 @@ PlatformResult AddressBookAddBatch(const JsonObject& args, JsonArray& out) { PlatformResult AddressBookBatchFunc(NativeFunction impl, const char* single_arg_name, const JsonObject& args, JsonArray& out) { + LoggerD("Enter"); const JsonArray& batch_args = FromJson(args, "batchArgs"); const JsonObject& address_book = FromJson(args, "addressBook"); @@ -413,6 +417,7 @@ PlatformResult AddressBookFind(const JsonObject& args, JsonArray& array) { } PlatformResult AddressBookAddGroup(const JsonObject& args, JsonObject& out) { + LoggerD("Enter"); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -456,6 +461,7 @@ PlatformResult AddressBookAddGroup(const JsonObject& args, JsonObject& out) { } PlatformResult AddressBookGetGroup(const JsonObject& args, JsonObject& out) { + LoggerD("Enter"); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -498,6 +504,7 @@ PlatformResult AddressBookGetGroup(const JsonObject& args, JsonObject& out) { } PlatformResult AddressBookUpdateGroup(const JsonObject& args, JsonObject&) { + LoggerD("Enter"); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -560,6 +567,7 @@ PlatformResult AddressBookUpdateGroup(const JsonObject& args, JsonObject&) { } PlatformResult AddressBookRemoveGroup(const JsonObject& args, JsonObject&) { + LoggerD("Enter"); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -601,6 +609,7 @@ PlatformResult AddressBookRemoveGroup(const JsonObject& args, JsonObject&) { } PlatformResult AddressBookGetGroups(const JsonObject& args, JsonArray& out) { + LoggerD("Enter"); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -842,6 +851,7 @@ void AddressBookListenerCallback(const char* view_uri, void* user_data) { } PlatformResult AddressBookStartListening(ContactInstance& instance, const JsonObject&, JsonObject& out) { + LoggerD("Enter"); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; int current_state = 0; @@ -871,6 +881,7 @@ PlatformResult AddressBookStartListening(ContactInstance& instance, const JsonOb } PlatformResult AddressBookStopListening(ContactInstance& instance) { + LoggerD("Enter"); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; diff --git a/src/contact/contact_manager.cc b/src/contact/contact_manager.cc index e48a641f..352b3fd9 100644 --- a/src/contact/contact_manager.cc +++ b/src/contact/contact_manager.cc @@ -41,6 +41,7 @@ using namespace common; PlatformResult ContactManagerGetAddressBooks(const JsonObject& args, JsonArray& out) { + LoggerD("Enter"); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -120,6 +121,7 @@ PlatformResult ContactManagerGetAddressBooks(const JsonObject& args, PlatformResult ContactManagerGetAddressBook(const JsonObject& args, JsonObject& out) { + LoggerD("Enter"); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -164,6 +166,7 @@ PlatformResult ContactManagerGetAddressBook(const JsonObject& args, namespace { PlatformResult ContactManagerGetInternal(int person_id, JsonObject* out) { + LoggerD("Enter"); contacts_record_h contacts_record = nullptr; int error_code = contacts_db_get_record(_contacts_person._uri, person_id, @@ -186,6 +189,7 @@ PlatformResult ContactManagerGetInternal(int person_id, JsonObject* out) { PlatformResult ContactManagerAddAddressBook(const JsonObject& args, JsonObject& out) { + LoggerD("Enter"); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -240,6 +244,7 @@ PlatformResult ContactManagerAddAddressBook(const JsonObject& args, PlatformResult ContactManagerRemoveAddressBook(const JsonObject& args, JsonObject& out) { + LoggerD("Enter"); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -268,6 +273,7 @@ PlatformResult ContactManagerRemoveAddressBook(const JsonObject& args, } PlatformResult ContactManagerGet(const JsonObject& args, JsonObject& out) { + LoggerD("Enter"); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -277,6 +283,7 @@ PlatformResult ContactManagerGet(const JsonObject& args, JsonObject& out) { } PlatformResult ContactManagerUpdate(const JsonObject& args, JsonObject&) { + LoggerD("Enter"); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -307,6 +314,7 @@ PlatformResult ContactManagerUpdate(const JsonObject& args, JsonObject&) { } PlatformResult ContactManagerRemove(const JsonObject& args, JsonObject&) { + LoggerD("Enter"); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -327,6 +335,7 @@ PlatformResult ContactManagerRemove(const JsonObject& args, JsonObject&) { } PlatformResult ContactManagerFind(const JsonObject& args, JsonArray& out) { + LoggerD("Enter"); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -757,6 +766,7 @@ PlatformResult ContactManagerFind(const JsonObject& args, JsonArray& out) { PlatformResult ContactManagerImportFromVCard(const JsonObject& args, JsonObject& out) { + LoggerD("Enter"); // I'm not sure how to call it. Should it be 'Contact', 'vCard' or what? PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -911,6 +921,7 @@ void ContactManagerListenerCallback(const char* view_uri, char* changes, PlatformResult ContactManagerStartListening(ContactInstance& instance, const JsonObject& /*args*/, JsonObject& /*out*/) { + LoggerD("Enter"); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -928,6 +939,7 @@ PlatformResult ContactManagerStartListening(ContactInstance& instance, const Jso PlatformResult ContactManagerStopListening(ContactInstance& instance, const JsonObject& /*args*/, JsonObject& /*out*/) { + LoggerD("Enter"); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; diff --git a/src/contact/contact_util.cc b/src/contact/contact_util.cc index cf1ca84d..5d0bd61b 100644 --- a/src/contact/contact_util.cc +++ b/src/contact/contact_util.cc @@ -151,6 +151,7 @@ static const char kContactInstantMessageTypeCustom[] = "CUSTOM"; } PlatformResult ErrorChecker(int err, const char* message) { + LoggerD("Enter"); if (CONTACTS_ERROR_NONE != err) { LoggerE("%s, error code: %i", message, err); return PlatformResult(ErrorCode::UNKNOWN_ERR, message); @@ -161,6 +162,7 @@ PlatformResult ErrorChecker(int err, const char* message) { PlatformResult GetStrFromRecord(contacts_record_h record, unsigned int property_id, char** value) { + LoggerD("Enter"); int err = contacts_record_get_str_p(record, property_id, value); if (CONTACTS_ERROR_NONE != err) { LoggerE("Error during getting contact record, error code: %i", err); @@ -173,6 +175,7 @@ PlatformResult GetStrFromRecord(contacts_record_h record, PlatformResult GetIntFromRecord(contacts_record_h record, unsigned int property_id, int* value) { + LoggerD("Enter"); int err = contacts_record_get_int(record, property_id, value); if (CONTACTS_ERROR_NONE != err) { LoggerE("Error during getting contact record, error code: %i", err); @@ -185,6 +188,7 @@ PlatformResult GetIntFromRecord(contacts_record_h record, PlatformResult GetBoolFromRecord(contacts_record_h record, unsigned int property_id, bool* value) { + LoggerD("Enter"); int err = contacts_record_get_bool(record, property_id, value); if (CONTACTS_ERROR_NONE != err) { LoggerE("Error during getting contact record, error code: %i", err); @@ -197,6 +201,7 @@ PlatformResult GetBoolFromRecord(contacts_record_h record, PlatformResult SetStrInRecord(contacts_record_h record, unsigned int property_id, const char* value) { + LoggerD("Enter"); int err = contacts_record_set_str(record, property_id, value); if (CONTACTS_ERROR_NONE != err) { LoggerE("Error during setting str contact record property, error code: %i", @@ -210,6 +215,7 @@ PlatformResult SetStrInRecord(contacts_record_h record, PlatformResult SetIntInRecord(contacts_record_h record, unsigned int property_id, int value) { + LoggerD("Enter"); int err = contacts_record_set_int(record, property_id, value); if (CONTACTS_ERROR_NONE != err) { LoggerE("Error during getting contact record, error code: %i", err); @@ -222,6 +228,7 @@ PlatformResult SetIntInRecord(contacts_record_h record, PlatformResult SetBoolInRecord(contacts_record_h record, unsigned int property_id, bool value) { + LoggerD("Enter"); int err = contacts_record_set_bool(record, property_id, value); if (CONTACTS_ERROR_NONE != err) { LoggerE("Error during getting contact record, error code: %i", err); @@ -234,6 +241,7 @@ PlatformResult SetBoolInRecord(contacts_record_h record, PlatformResult ClearAllContactRecord(contacts_record_h contacts_record, unsigned int property_id) { + LoggerD("Enter"); // contacts_record is protected by unique_ptr and its ownership is not passed // here if (!contacts_record) { @@ -244,7 +252,10 @@ PlatformResult ClearAllContactRecord(contacts_record_h contacts_record, int record_count; PlatformResult status = GetNumberOfChildRecord(contacts_record, property_id, &record_count); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } for (unsigned int i = 0; i < record_count; ++i) { unsigned int actual_index = record_count - 1 - i; @@ -253,13 +264,19 @@ PlatformResult ClearAllContactRecord(contacts_record_h contacts_record, contacts_record, property_id, actual_index, &phone_record); PlatformResult status = ContactUtil::ErrorChecker(err, "Error during getting phone record"); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } err = contacts_record_remove_child_record(contacts_record, property_id, phone_record); status = ContactUtil::ErrorChecker(err, "Error during getting phone record"); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } return PlatformResult(ErrorCode::NO_ERROR); @@ -268,6 +285,7 @@ PlatformResult ClearAllContactRecord(contacts_record_h contacts_record, PlatformResult GetNumberOfChildRecord(contacts_record_h contacts_record, unsigned int property_id, int* child_count) { + LoggerD("Enter"); assert(child_count); int err = CONTACTS_ERROR_NONE; @@ -284,6 +302,7 @@ PlatformResult GetNumberOfChildRecord(contacts_record_h contacts_record, PlatformResult ImportContactNameFromContactsRecord( contacts_record_h contacts_record, JsonObject* out_ptr, bool* is_contact_name) { + LoggerD("Enter"); JsonObject& out = *out_ptr; if (!contacts_record) { LoggerW("Contacts record is null"); @@ -295,7 +314,10 @@ PlatformResult ImportContactNameFromContactsRecord( _contacts_contact.name, &count); PlatformResult status = ContactUtil::ErrorChecker(err, "Contacts child record get count error"); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } if (count > 1) { LoggerE("More than one ContactName for one Contact"); @@ -314,7 +336,10 @@ PlatformResult ImportContactNameFromContactsRecord( contacts_record, _contacts_contact.name, 0, &contact_name); status = ContactUtil::ErrorChecker(err, "Contacts name record get childerror"); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } // Documentation says: // child_record MUST NOT be released by you. @@ -324,56 +349,80 @@ PlatformResult ImportContactNameFromContactsRecord( char* char_value = nullptr; status = ContactUtil::GetStrFromRecord(contact_name, _contacts_name.prefix, &char_value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("prefix", char_value ? JsonValue{char_value} : JsonValue{})); status = ContactUtil::GetStrFromRecord(contact_name, _contacts_name.suffix, &char_value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("suffix", char_value ? JsonValue{char_value} : JsonValue{})); status = ContactUtil::GetStrFromRecord(contact_name, _contacts_name.first, &char_value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("firstName", char_value ? JsonValue{char_value} : JsonValue{})); status = ContactUtil::GetStrFromRecord(contact_name, _contacts_name.addition, &char_value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("middleName", char_value ? JsonValue{char_value} : JsonValue{})); status = ContactUtil::GetStrFromRecord(contact_name, _contacts_name.last, &char_value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("lastName", char_value ? JsonValue{char_value} : JsonValue{})); status = ContactUtil::GetStrFromRecord( contact_name, _contacts_name.phonetic_first, &char_value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("phoneticFirstName", char_value ? JsonValue{char_value} : JsonValue{})); status = ContactUtil::GetStrFromRecord( contact_name, _contacts_name.phonetic_middle, &char_value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("phoneticMiddleName", char_value ? JsonValue{char_value} : JsonValue{})); status = ContactUtil::GetStrFromRecord( contact_name, _contacts_name.phonetic_last, &char_value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("phoneticLastName", char_value ? JsonValue{char_value} : JsonValue{})); @@ -382,7 +431,10 @@ PlatformResult ImportContactNameFromContactsRecord( contacts_record, _contacts_contact.nickname, &count); status = ContactUtil::ErrorChecker(err, "Contacts child record get count error"); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } JsonArray nicknames; for (unsigned int i = 0; i < count; ++i) { @@ -391,11 +443,17 @@ PlatformResult ImportContactNameFromContactsRecord( contacts_record, _contacts_contact.nickname, i, &nickname); status = ContactUtil::ErrorChecker( err, "Contacts nicknames record get child error"); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } status = ContactUtil::GetStrFromRecord(nickname, _contacts_nickname.name, &char_value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } if (char_value) { nicknames.push_back(JsonValue{char_value}); @@ -409,6 +467,8 @@ PlatformResult ImportContactNameFromContactsRecord( PlatformResult ExportContactNameToContactsRecord( contacts_record_h contacts_record, const JsonObject& in) { + + LoggerD("Enter"); // contacts_record is protected by unique_ptr and its ownership is not passed // here if (!contacts_record) { @@ -425,7 +485,10 @@ PlatformResult ExportContactNameToContactsRecord( err = contacts_record_create(_contacts_name._uri, &contact_name); PlatformResult status = ContactUtil::ErrorChecker(err, "Contacts record create error"); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } update = false; } @@ -436,49 +499,73 @@ PlatformResult ExportContactNameToContactsRecord( PlatformResult status = ContactUtil::SetStrInRecord(*contacts_name_ptr, _contacts_name.prefix, FromJson(in, "prefix").c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } if (!IsNull(in, "suffix")) { PlatformResult status = ContactUtil::SetStrInRecord(*contacts_name_ptr, _contacts_name.suffix, FromJson(in, "suffix").c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } if (!IsNull(in, "firstName")) { PlatformResult status = ContactUtil::SetStrInRecord( *contacts_name_ptr, _contacts_name.first, FromJson(in, "firstName").c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } if (!IsNull(in, "middleName")) { PlatformResult status = ContactUtil::SetStrInRecord( *contacts_name_ptr, _contacts_name.addition, FromJson(in, "middleName").c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } if (!IsNull(in, "lastName")) { PlatformResult status = ContactUtil::SetStrInRecord( *contacts_name_ptr, _contacts_name.last, FromJson(in, "lastName").c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } if (!IsNull(in, "phoneticFirstName")) { PlatformResult status = ContactUtil::SetStrInRecord( *contacts_name_ptr, _contacts_name.phonetic_first, FromJson(in, "phoneticFirstName").c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } if (!IsNull(in, "phoneticMiddleName")) { PlatformResult status = ContactUtil::SetStrInRecord( *contacts_name_ptr, _contacts_name.phonetic_middle, FromJson(in, "phoneticMiddleName").c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } if (!IsNull(in, "phoneticLastName")) { PlatformResult status = ContactUtil::SetStrInRecord( *contacts_name_ptr, _contacts_name.phonetic_last, FromJson(in, "phoneticLastName").c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } // contact_name is being added as a child to contacts_record @@ -488,7 +575,10 @@ PlatformResult ExportContactNameToContactsRecord( contacts_record, _contacts_contact.name, *contacts_name_ptr); PlatformResult status = ContactUtil::ErrorChecker(err, "Contacts record add child error"); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } // and now unique_ptr can be released - contacts_name is protected // by its parent (contacts_record) @@ -504,7 +594,10 @@ PlatformResult ExportContactNameToContactsRecord( err = contacts_record_create(_contacts_nickname._uri, &nickname_record); PlatformResult status = ContactUtil::ErrorChecker(err, "Contacts record create error"); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } update = false; } @@ -513,14 +606,20 @@ PlatformResult ExportContactNameToContactsRecord( PlatformResult status = ContactUtil::SetStrInRecord(*nickname_ptr, _contacts_nickname.name, JsonCast(nickname).c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } if (!update) { err = contacts_record_add_child_record( contacts_record, _contacts_contact.nickname, *nickname_ptr); PlatformResult status = ContactUtil::ErrorChecker(err, "Contacts record add child error"); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } // Do not delete record, it is passed to the platform nickname_ptr.release(); @@ -534,6 +633,8 @@ PlatformResult ExportContactNameToContactsRecord( PlatformResult ImportContactEmailAddressFromContactsRecord( contacts_record_h contacts_record, unsigned int index, JsonObject* out_ptr) { + + LoggerD("Enter"); JsonObject& out = *out_ptr; // contacts_record is protected by unique_ptr and its ownership is not passed // here @@ -553,7 +654,10 @@ PlatformResult ImportContactEmailAddressFromContactsRecord( char* email = nullptr; PlatformResult status = ContactUtil::GetStrFromRecord( child_record, _contacts_email.email, &email); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } if (!email) { return PlatformResult(ErrorCode::NO_ERROR); @@ -563,21 +667,30 @@ PlatformResult ImportContactEmailAddressFromContactsRecord( bool is_default = false; status = ContactUtil::GetBoolFromRecord( child_record, _contacts_email.is_default, &is_default); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("isDefault", JsonValue{is_default})); char* label = nullptr; status = ContactUtil::GetStrFromRecord(child_record, _contacts_email.label, &label); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("label", label ? JsonValue{label} : JsonValue{})); int type = 0; status = ContactUtil::GetIntFromRecord(child_record, _contacts_email.type, &type); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } JsonArray types; if (type & CONTACTS_EMAIL_TYPE_HOME) { @@ -604,6 +717,8 @@ PlatformResult ImportContactEmailAddressFromContactsRecord( PlatformResult ExportContactEmailAddressToContactsRecord( contacts_record_h contacts_record, const JsonObject& in) { + + LoggerD("Enter"); contacts_record_h c_email_record_h = nullptr; // contacts_record is protected by unique_ptr and its ownership is not passed // here @@ -616,25 +731,37 @@ PlatformResult ExportContactEmailAddressToContactsRecord( err = contacts_record_create(_contacts_email._uri, &c_email_record_h); PlatformResult status = ContactUtil::ErrorChecker( err, "Failed to create email record in database"); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } ContactsRecordHPtr record(&c_email_record_h, ContactsDeleter); status = ContactUtil::SetStrInRecord(c_email_record_h, _contacts_email.email, FromJson(in, "email").c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } status = ContactUtil::SetBoolInRecord(c_email_record_h, _contacts_email.is_default, FromJson(in, "isDefault")); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } if (!IsNull(in, "label")) { status = ContactUtil::SetStrInRecord(c_email_record_h, _contacts_email.label, FromJson(in, "label").c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } int type_to_set = 0; @@ -654,13 +781,19 @@ PlatformResult ExportContactEmailAddressToContactsRecord( } status = ContactUtil::SetIntInRecord(c_email_record_h, _contacts_email.type, type_to_set); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } err = contacts_record_add_child_record( contacts_record, _contacts_contact.email, c_email_record_h); status = ContactUtil::ErrorChecker(err, "Fail to save email record into database"); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } // Do not delete record, it is passed to the platform record.release(); @@ -671,6 +804,8 @@ PlatformResult ExportContactEmailAddressToContactsRecord( PlatformResult ImportContactPhoneNumberFromContactsRecord( contacts_record_h contacts_record, unsigned int index, JsonObject* out_ptr) { + + LoggerD("Enter"); JsonObject& out = *out_ptr; contacts_record_h child_record = nullptr; // contacts_record is protected by unique_ptr and its ownership is not passed @@ -689,20 +824,29 @@ PlatformResult ImportContactPhoneNumberFromContactsRecord( char* phone = nullptr; PlatformResult status = ContactUtil::GetStrFromRecord( child_record, _contacts_number.number, &phone); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("number", JsonValue{phone})); bool is_default = false; status = ContactUtil::GetBoolFromRecord( child_record, _contacts_number.is_default, &is_default); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("isDefault", JsonValue{is_default})); int type = 0; status = ContactUtil::GetIntFromRecord(child_record, _contacts_number.type, &type); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } JsonArray types; if (type & CONTACTS_NUMBER_TYPE_HOME) { @@ -761,7 +905,10 @@ PlatformResult ImportContactPhoneNumberFromContactsRecord( char* label = nullptr; status = ContactUtil::GetStrFromRecord(child_record, _contacts_number.label, &label); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out["label"] = label ? JsonValue{label} : JsonValue{}; @@ -770,6 +917,8 @@ PlatformResult ImportContactPhoneNumberFromContactsRecord( PlatformResult ExportContactPhoneNumberToContactsRecord( contacts_record_h contacts_record, const JsonObject& in) { + + LoggerD("Enter"); contacts_record_h phone_record = nullptr; // contacts_record is protected by unique_ptr and its ownership is not passed // here @@ -781,25 +930,37 @@ PlatformResult ExportContactPhoneNumberToContactsRecord( int err = contacts_record_create(_contacts_number._uri, &phone_record); PlatformResult status = ContactUtil::ErrorChecker(err, "Fail to create phone_record in database"); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } ContactsRecordHPtr record(&phone_record, ContactsDeleter); status = ContactUtil::SetStrInRecord(phone_record, _contacts_number.number, FromJson(in, "number").c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } status = ContactUtil::SetBoolInRecord(phone_record, _contacts_number.is_default, FromJson(in, "isDefault")); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } if (!IsNull(in, "label")) { status = ContactUtil::SetStrInRecord(phone_record, _contacts_address.label, FromJson(in, "label").c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } int type_to_set = 0; @@ -845,13 +1006,19 @@ PlatformResult ExportContactPhoneNumberToContactsRecord( status = ContactUtil::SetIntInRecord(phone_record, _contacts_number.type, type_to_set); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } err = contacts_record_add_child_record( contacts_record, _contacts_contact.number, phone_record); status = ContactUtil::ErrorChecker( err, "Fail to set number value to phone_record"); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } // Do not delete record, it is passed to the platform record.release(); @@ -862,6 +1029,8 @@ PlatformResult ExportContactPhoneNumberToContactsRecord( PlatformResult ImportContactOrganizationFromContactsRecord( contacts_record_h contacts_record, unsigned int index, JsonObject* out_ptr) { + + LoggerD("Enter"); JsonObject& out = *out_ptr; // contacts_record is protected by unique_ptr and its ownership is not passed // here @@ -881,35 +1050,50 @@ PlatformResult ImportContactOrganizationFromContactsRecord( char* char_value = nullptr; PlatformResult status = ContactUtil::GetStrFromRecord( child_record, _contacts_company.name, &char_value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert( std::make_pair("name", char_value ? JsonValue{char_value} : JsonValue{})); status = ContactUtil::GetStrFromRecord( child_record, _contacts_company.department, &char_value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("department", char_value ? JsonValue{char_value} : JsonValue{})); status = ContactUtil::GetStrFromRecord( child_record, _contacts_company.job_title, &char_value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("title", char_value ? JsonValue{char_value} : JsonValue{})); status = ContactUtil::GetStrFromRecord(child_record, _contacts_company.role, &char_value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert( std::make_pair("role", char_value ? JsonValue{char_value} : JsonValue{})); status = ContactUtil::GetStrFromRecord(child_record, _contacts_company.logo, &char_value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("logoURI", char_value ? JsonValue{char_value} : JsonValue{})); @@ -919,6 +1103,8 @@ PlatformResult ImportContactOrganizationFromContactsRecord( PlatformResult ExportContactOrganizationToContactsRecord( contacts_record_h contacts_record, const JsonObject& in) { + + LoggerD("Enter"); // contacts_record is protected by unique_ptr and its ownership is not passed // here if (!contacts_record) { @@ -931,7 +1117,10 @@ PlatformResult ExportContactOrganizationToContactsRecord( err = contacts_record_create(_contacts_company._uri, &organization_record); PlatformResult status = ContactUtil::ErrorChecker( err, "Failed to create organization record in database"); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } ContactsRecordHPtr record(&organization_record, ContactsDeleter); @@ -939,39 +1128,57 @@ PlatformResult ExportContactOrganizationToContactsRecord( status = ContactUtil::SetStrInRecord(organization_record, _contacts_company.name, FromJson(in, "name").c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } if (!IsNull(in, "department")) { status = ContactUtil::SetStrInRecord( organization_record, _contacts_company.department, FromJson(in, "department").c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } if (!IsNull(in, "title")) { status = ContactUtil::SetStrInRecord( organization_record, _contacts_company.job_title, FromJson(in, "title").c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } if (!IsNull(in, "role")) { status = ContactUtil::SetStrInRecord(organization_record, _contacts_company.role, FromJson(in, "role").c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } if (!IsNull(in, "logoURI")) { std::string path = ContactUtil::ConvertUriToPath(FromJson(in, "logoURI")); status = ContactUtil::SetStrInRecord(organization_record, _contacts_company.logo, path.c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } err = contacts_record_add_child_record( contacts_record, _contacts_contact.company, organization_record); status = ContactUtil::ErrorChecker( err, "Fail to set company value to child_record"); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } // Do not delete record, it is passed to the platform record.release(); @@ -982,6 +1189,8 @@ PlatformResult ExportContactOrganizationToContactsRecord( PlatformResult ImportContactWebSiteFromContactsRecord( contacts_record_h contacts_record, unsigned int index, JsonObject* out_ptr) { + + LoggerD("Enter"); JsonObject& out = *out_ptr; // contacts_record is protected by unique_ptr and its ownership is not passed // here @@ -1001,26 +1210,34 @@ PlatformResult ImportContactWebSiteFromContactsRecord( char* char_value = nullptr; PlatformResult status = ContactUtil::GetStrFromRecord( child_record, _contacts_url.url, &char_value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair(std::string("logoURI"), - picojson::value(char_value ? char_value : ""))); + picojson::value(char_value ? char_value : ""))); int type = 0; status = ContactUtil::GetIntFromRecord(child_record, _contacts_url.type, &type); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair(std::string("logoURI"), - picojson::value((CONTACTS_URL_TYPE_HOME == type) - ? kContactWebSiteTypeHomePage - : kContactWebSiteTypeBlog))); + picojson::value((CONTACTS_URL_TYPE_HOME == type) + ? kContactWebSiteTypeHomePage + : kContactWebSiteTypeBlog))); return PlatformResult(ErrorCode::NO_ERROR); } PlatformResult ExportContactWebSiteToContactsRecord( contacts_record_h contacts_record, const JsonObject& in) { + + LoggerD("Enter"); // contacts_record is protected by unique_ptr and its ownership is not passed // here if (!contacts_record) { @@ -1044,13 +1261,19 @@ PlatformResult ExportContactWebSiteToContactsRecord( err = contacts_record_create(_contacts_url._uri, &website_record_h); PlatformResult status = ContactUtil::ErrorChecker( err, "Fail to create website record in database."); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } ContactsRecordHPtr record(&website_record_h, ContactsDeleter); status = ContactUtil::SetStrInRecord(website_record_h, _contacts_url.url, url.c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } int type_to_set = (FromJson(in, "type") == kContactWebSiteTypeHomePage) @@ -1059,13 +1282,19 @@ PlatformResult ExportContactWebSiteToContactsRecord( status = ContactUtil::SetIntInRecord(website_record_h, _contacts_url.type, type_to_set); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } err = contacts_record_add_child_record(contacts_record, _contacts_contact.url, website_record_h); status = ContactUtil::ErrorChecker( err, "Problem during saving WebSite urls into database."); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } // Do not delete record, it is passed to the platform record.release(); @@ -1076,6 +1305,8 @@ PlatformResult ExportContactWebSiteToContactsRecord( PlatformResult ImportContactAnniversariesFromContactsRecord( contacts_record_h contacts_record, unsigned int index, JsonObject* out_ptr, bool* ret) { + + LoggerD("Enter"); JsonObject& out = *out_ptr; // contacts_record is protected by unique_ptr and its ownership is not passed // here @@ -1096,7 +1327,10 @@ PlatformResult ImportContactAnniversariesFromContactsRecord( int value = 0; PlatformResult status = ContactUtil::GetIntFromRecord(child_record, _contacts_event.type, &value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } if (CONTACTS_EVENT_TYPE_BIRTH == value) { *ret = false; @@ -1106,14 +1340,20 @@ PlatformResult ImportContactAnniversariesFromContactsRecord( if (CONTACTS_EVENT_TYPE_ANNIVERSARY == value) { status = ContactUtil::GetIntFromRecord(child_record, _contacts_event.date, &value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("date", JsonValue{static_cast(value)})); char* label = nullptr; status = ContactUtil::GetStrFromRecord(child_record, _contacts_event.label, &label); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("label", label ? JsonValue{label} : JsonValue{})); } @@ -1124,6 +1364,8 @@ PlatformResult ImportContactAnniversariesFromContactsRecord( PlatformResult ExportContactAnniversariesToContactsRecord( contacts_record_h contacts_record, const JsonObject& in) { + + LoggerD("Enter"); // contacts_record is protected by unique_ptr and its ownership is not passed // here if (!contacts_record) { @@ -1141,30 +1383,45 @@ PlatformResult ExportContactAnniversariesToContactsRecord( err = contacts_record_create(_contacts_event._uri, &anniversary_record); PlatformResult status = ContactUtil::ErrorChecker( err, "Failed to create anniversary record in database"); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } ContactsRecordHPtr record(&anniversary_record, ContactsDeleter); status = ContactUtil::SetIntInRecord(anniversary_record, _contacts_event.type, CONTACTS_EVENT_TYPE_ANNIVERSARY); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } status = ContactUtil::SetIntInRecord(anniversary_record, _contacts_event.date, date); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } if (!IsNull(in, "label")) { status = ContactUtil::SetStrInRecord(anniversary_record, _contacts_event.label, FromJson(in, "label").c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } err = contacts_record_add_child_record( contacts_record, _contacts_contact.event, anniversary_record); status = ContactUtil::ErrorChecker( err, "Fail to save anniversary record in database"); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } // Do not delete record, it is passed to the platform record.release(); @@ -1175,6 +1432,8 @@ PlatformResult ExportContactAnniversariesToContactsRecord( PlatformResult ImportContactRelationshipFromContactsRecord( contacts_record_h contacts_record, unsigned int index, JsonObject* out_ptr) { + + LoggerD("Enter"); JsonObject& out = *out_ptr; // contacts_record is protected by unique_ptr and its ownership is not passed // here @@ -1194,76 +1453,82 @@ PlatformResult ImportContactRelationshipFromContactsRecord( char* relative = nullptr; PlatformResult status = ContactUtil::GetStrFromRecord( child_record, _contacts_relationship.name, &relative); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } if (!relative) { return PlatformResult(ErrorCode::NO_ERROR); } out.insert(std::make_pair(std::string("relativeName"), - picojson::value(JsonString{relative}))); + picojson::value(JsonString{relative}))); int type = 0; status = ContactUtil::GetIntFromRecord(child_record, _contacts_relationship.type, &type); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } // TODO Move out.insert outside of switch statement. switch (type) { case CONTACTS_RELATIONSHIP_TYPE_CUSTOM: out.insert( std::make_pair(std::string("type"), - picojson::value(JsonString{kContactRelationshipTypeCustom}))); + picojson::value(JsonString{kContactRelationshipTypeCustom}))); break; case CONTACTS_RELATIONSHIP_TYPE_ASSISTANT: out.insert(std::make_pair(std::string("type"), - picojson::value(JsonString{kContactRelationshipTypeAssistant}))); + picojson::value(JsonString{kContactRelationshipTypeAssistant}))); break; case CONTACTS_RELATIONSHIP_TYPE_BROTHER: out.insert( std::make_pair(std::string("type"), - picojson::value(JsonString{kContactRelationshipTypeBrother}))); + picojson::value(JsonString{kContactRelationshipTypeBrother}))); break; case CONTACTS_RELATIONSHIP_TYPE_CHILD: out.insert( std::make_pair(std::string("type"), - picojson::value(JsonString{kContactRelationshipTypeChild}))); + picojson::value(JsonString{kContactRelationshipTypeChild}))); break; case CONTACTS_RELATIONSHIP_TYPE_DOMESTIC_PARTNER: out.insert(std::make_pair( std::string("type"), - picojson::value( - JsonString{kContactRelationshipTypeDomesticPartner}))); + picojson::value( + JsonString{kContactRelationshipTypeDomesticPartner}))); break; case CONTACTS_RELATIONSHIP_TYPE_FATHER: out.insert( std::make_pair(std::string("type"), - picojson::value(JsonString{kContactRelationshipTypeFather}))); + picojson::value(JsonString{kContactRelationshipTypeFather}))); break; case CONTACTS_RELATIONSHIP_TYPE_FRIEND: out.insert( std::make_pair(std::string("type"), - picojson::value(JsonString{kContactRelationshipTypeFriend}))); + picojson::value(JsonString{kContactRelationshipTypeFriend}))); break; case CONTACTS_RELATIONSHIP_TYPE_MANAGER: out.insert( std::make_pair(std::string("type"), - picojson::value(JsonString{kContactRelationshipTypeManager}))); + picojson::value(JsonString{kContactRelationshipTypeManager}))); break; case CONTACTS_RELATIONSHIP_TYPE_MOTHER: out.insert( std::make_pair(std::string("type"), - picojson::value(JsonString{kContactRelationshipTypeMother}))); + picojson::value(JsonString{kContactRelationshipTypeMother}))); break; case CONTACTS_RELATIONSHIP_TYPE_PARENT: out.insert( std::make_pair(std::string("type"), - picojson::value(JsonString{kContactRelationshipTypeParent}))); + picojson::value(JsonString{kContactRelationshipTypeParent}))); break; case CONTACTS_RELATIONSHIP_TYPE_PARTNER: out.insert( std::make_pair(std::string("type"), - picojson::value(JsonString{kContactRelationshipTypePartner}))); + picojson::value(JsonString{kContactRelationshipTypePartner}))); break; case CONTACTS_RELATIONSHIP_TYPE_REFERRED_BY: out.insert(std::make_pair( @@ -1273,40 +1538,45 @@ PlatformResult ImportContactRelationshipFromContactsRecord( case CONTACTS_RELATIONSHIP_TYPE_RELATIVE: out.insert( std::make_pair(std::string("type"), - picojson::value(JsonString{kContactRelationshipTypeRelative}))); + picojson::value(JsonString{kContactRelationshipTypeRelative}))); break; case CONTACTS_RELATIONSHIP_TYPE_SISTER: out.insert( std::make_pair(std::string("type"), - picojson::value(JsonString{kContactRelationshipTypeSister}))); + picojson::value(JsonString{kContactRelationshipTypeSister}))); break; case CONTACTS_RELATIONSHIP_TYPE_SPOUSE: out.insert( std::make_pair(std::string("type"), - picojson::value(JsonString{kContactRelationshipTypeSpouse}))); + picojson::value(JsonString{kContactRelationshipTypeSpouse}))); break; case CONTACTS_RELATIONSHIP_TYPE_OTHER: default: out.insert( std::make_pair(std::string("type"), - picojson::value(JsonString{kContactRelationshipTypeOther}))); + picojson::value(JsonString{kContactRelationshipTypeOther}))); break; } char* label = nullptr; status = ContactUtil::GetStrFromRecord(child_record, _contacts_relationship.label, &label); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert( std::make_pair(std::string("label"), - picojson::value(label ? JsonValue{label} : JsonValue{}))); + picojson::value(label ? JsonValue{label} : JsonValue{}))); return PlatformResult(ErrorCode::NO_ERROR); } PlatformResult ExportContactRelationshipToContactsRecord( contacts_record_h contacts_record, const JsonObject& in) { + + LoggerD("Enter"); // contacts_record is protected by unique_ptr and its ownership is not passed // here if (!contacts_record) { @@ -1319,14 +1589,20 @@ PlatformResult ExportContactRelationshipToContactsRecord( err = contacts_record_create(_contacts_relationship._uri, &child_record); PlatformResult status = ContactUtil::ErrorChecker(err, "Fail to create child_record in database"); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } ContactsRecordHPtr record(&child_record, ContactsDeleter); status = ContactUtil::SetStrInRecord( child_record, _contacts_relationship.name, FromJson(in, "relativeName").c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } const JsonString& type = FromJson(in, "type"); int type_to_set; @@ -1366,20 +1642,29 @@ PlatformResult ExportContactRelationshipToContactsRecord( status = ContactUtil::SetIntInRecord( child_record, _contacts_relationship.type, type_to_set); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } if (!IsNull(in, "label")) { status = ContactUtil::SetStrInRecord(child_record, _contacts_relationship.label, FromJson(in, "label").c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } err = contacts_record_add_child_record( contacts_record, _contacts_contact.relationship, child_record); status = ContactUtil::ErrorChecker( err, "Fail to set number value to child_record"); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } record.release(); @@ -1389,6 +1674,8 @@ PlatformResult ExportContactRelationshipToContactsRecord( PlatformResult ImportContactInstantMessengerFromContactsRecord( contacts_record_h contacts_record, unsigned int index, JsonObject* out_ptr) { + + LoggerD("Enter"); JsonObject& out = *out_ptr; // contacts_record is protected by unique_ptr and its ownership is not passed // here @@ -1409,7 +1696,10 @@ PlatformResult ImportContactInstantMessengerFromContactsRecord( char* im_address = nullptr; PlatformResult status = ContactUtil::GetStrFromRecord( child_record, _contacts_messenger.im_id, &im_address); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } if (!im_address) { LoggerW("Skipping message with index %i. missing im address", index); @@ -1421,7 +1711,10 @@ PlatformResult ImportContactInstantMessengerFromContactsRecord( int type = 0; status = ContactUtil::GetIntFromRecord(child_record, _contacts_messenger.type, &type); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } // TODO Move out.insert outside of switch statement. switch (type) { @@ -1479,7 +1772,10 @@ PlatformResult ImportContactInstantMessengerFromContactsRecord( char* label = nullptr; status = ContactUtil::GetStrFromRecord(child_record, _contacts_messenger.label, &label); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("label", label ? JsonValue{label} : JsonValue{})); @@ -1488,6 +1784,8 @@ PlatformResult ImportContactInstantMessengerFromContactsRecord( PlatformResult ExportContactInstantMessengerToContactsRecord( contacts_record_h contacts_record, const JsonObject& in) { + + LoggerD("Enter"); // contacts_record is protected by unique_ptr and its ownership is not passed // here if (!contacts_record) { @@ -1500,14 +1798,20 @@ PlatformResult ExportContactInstantMessengerToContactsRecord( err = contacts_record_create(_contacts_messenger._uri, &child_record); PlatformResult status = ContactUtil::ErrorChecker(err, "Fail to create child_record in database"); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } ContactsRecordHPtr record(&child_record, ContactsDeleter); status = ContactUtil::SetStrInRecord( child_record, _contacts_messenger.im_id, FromJson(in, "imAddress").c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } int type_to_set = 0; const JsonString& type = FromJson(in, "type"); @@ -1539,20 +1843,29 @@ PlatformResult ExportContactInstantMessengerToContactsRecord( status = ContactUtil::SetIntInRecord(child_record, _contacts_messenger.type, type_to_set); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } if (!IsNull(in, "label")) { status = ContactUtil::SetStrInRecord(child_record, _contacts_messenger.label, FromJson(in, "label").c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } err = contacts_record_add_child_record( contacts_record, _contacts_contact.messenger, child_record); status = ContactUtil::ErrorChecker( err, "Fail to set number value to child_record"); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } record.release(); @@ -1562,6 +1875,8 @@ PlatformResult ExportContactInstantMessengerToContactsRecord( PlatformResult ImportContactAddressFromContactsRecord( contacts_record_h contacts_record, unsigned int index, JsonObject* out_ptr) { + + LoggerD("Enter"); JsonObject& out = *out_ptr; // contacts_record is protected by unique_ptr and its ownership is not passed // here @@ -1581,54 +1896,81 @@ PlatformResult ImportContactAddressFromContactsRecord( char* value = nullptr; PlatformResult status = ContactUtil::GetStrFromRecord( child_record, _contacts_address.country, &value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("country", value ? JsonValue{value} : JsonValue{})); status = ContactUtil::GetStrFromRecord(child_record, _contacts_address.region, &value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("region", value ? JsonValue{value} : JsonValue{})); status = ContactUtil::GetStrFromRecord(child_record, _contacts_address.locality, &value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("city", value ? JsonValue{value} : JsonValue{})); status = ContactUtil::GetStrFromRecord(child_record, _contacts_address.street, &value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert( std::make_pair("streetAddress", value ? JsonValue{value} : JsonValue{})); status = ContactUtil::GetStrFromRecord(child_record, _contacts_address.extended, &value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("additionalInformation", value ? JsonValue{value} : JsonValue{})); status = ContactUtil::GetStrFromRecord(child_record, _contacts_address.postal_code, &value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert( std::make_pair("postalCode", value ? JsonValue{value} : JsonValue{})); status = ContactUtil::GetStrFromRecord(child_record, _contacts_address.label, &value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("label", value ? JsonValue{value} : JsonValue{})); bool bool_value = false; status = ContactUtil::GetBoolFromRecord( child_record, _contacts_address.is_default, &bool_value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("isDefault", JsonValue{bool_value})); int int_value = 0; status = ContactUtil::GetIntFromRecord(child_record, _contacts_address.type, &int_value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } JsonArray types; if (int_value & CONTACTS_ADDRESS_TYPE_HOME) { @@ -1654,6 +1996,8 @@ PlatformResult ImportContactAddressFromContactsRecord( PlatformResult ExportContactAddressToContactsRecord( contacts_record_h contacts_record, const JsonObject& in) { + + LoggerD("Enter"); // contacts_record is protected by unique_ptr and its ownership is not passed // here if (!contacts_record) { @@ -1666,7 +2010,10 @@ PlatformResult ExportContactAddressToContactsRecord( err = contacts_record_create(_contacts_address._uri, &address_record); PlatformResult status = ContactUtil::ErrorChecker( err, "Failed to create address record in database"); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } ContactsRecordHPtr record(&address_record, ContactsDeleter); @@ -1674,49 +2021,73 @@ PlatformResult ExportContactAddressToContactsRecord( status = ContactUtil::SetStrInRecord( address_record, _contacts_address.country, FromJson(in, "country").c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } if (!IsNull(in, "region")) { status = ContactUtil::SetStrInRecord(address_record, _contacts_address.region, FromJson(in, "region").c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } if (!IsNull(in, "city")) { status = ContactUtil::SetStrInRecord(address_record, _contacts_address.locality, FromJson(in, "city").c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } if (!IsNull(in, "streetAddress")) { status = ContactUtil::SetStrInRecord( address_record, _contacts_address.street, FromJson(in, "streetAddress").c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } if (!IsNull(in, "additionalInformation")) { status = ContactUtil::SetStrInRecord( address_record, _contacts_address.extended, FromJson(in, "additionalInformation").c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } if (!IsNull(in, "postalCode")) { status = ContactUtil::SetStrInRecord( address_record, _contacts_address.postal_code, FromJson(in, "postalCode").c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } if (!IsNull(in, "label")) { status = ContactUtil::SetStrInRecord(address_record, _contacts_address.label, FromJson(in, "label").c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } status = ContactUtil::SetBoolInRecord(address_record, _contacts_address.is_default, FromJson(in, "isDefault")); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } int type_to_set = 0; const JsonArray& types = FromJson(in, "types"); @@ -1735,13 +2106,19 @@ PlatformResult ExportContactAddressToContactsRecord( status = ContactUtil::SetIntInRecord(address_record, _contacts_address.type, type_to_set); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } err = contacts_record_add_child_record( contacts_record, _contacts_contact.address, address_record); status = ContactUtil::ErrorChecker(err, "Fail to save address record in database"); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } // Do not delete record, it is passed to the platform record.release(); @@ -1751,6 +2128,8 @@ PlatformResult ExportContactAddressToContactsRecord( PlatformResult ImportContactNotesFromContactsRecord( contacts_record_h contacts_record, unsigned int index, JsonValue* val) { + + LoggerD("Enter"); // contacts_record is protected by unique_ptr and its ownership is not passed // here if (!contacts_record) { @@ -1769,7 +2148,10 @@ PlatformResult ImportContactNotesFromContactsRecord( char* note = nullptr; PlatformResult status = ContactUtil::GetStrFromRecord(notes_record, _contacts_note.note, ¬e); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } if (note) { *val = JsonValue{note}; @@ -1780,6 +2162,8 @@ PlatformResult ImportContactNotesFromContactsRecord( PlatformResult ExportNotesToContactsRecord(contacts_record_h contacts_record, const std::string& value) { + + LoggerD("Enter"); contacts_record_h notes_record = nullptr; // contacts_record is protected by unique_ptr and its ownership is not passed // here @@ -1792,19 +2176,28 @@ PlatformResult ExportNotesToContactsRecord(contacts_record_h contacts_record, err = contacts_record_create(_contacts_note._uri, ¬es_record); PlatformResult status = ContactUtil::ErrorChecker(err, "Fail to create note record in database"); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } ContactsRecordHPtr record(¬es_record, ContactsDeleter); status = ContactUtil::SetStrInRecord(notes_record, _contacts_note.note, value.c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } err = contacts_record_add_child_record(contacts_record, _contacts_contact.note, notes_record); status = ContactUtil::ErrorChecker(err, "Fail to save note record in database"); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } // Do not delete record, it is passed to the platform record.release(); @@ -1814,42 +2207,59 @@ PlatformResult ExportNotesToContactsRecord(contacts_record_h contacts_record, PlatformResult ImportContactFromContactsRecord( contacts_record_h contacts_record, JsonObject* out_ptr) { + + LoggerD("Enter"); JsonObject& out = *out_ptr; // contacts_record is protected by unique_ptr and its ownership is not passed // here if (!contacts_record) { - LoggerW("Contacts record is null"); + LoggerE("Contacts record is null"); return PlatformResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null"); } int id = 0; PlatformResult status = ContactUtil::GetIntFromRecord(contacts_record, _contacts_contact.id, &id); - if (status.IsError()) return status; - + if (status.IsError()) + { + LoggerE("Fail: GetIntFromRecord"); + return status; + } out.insert(std::make_pair("id", JsonValue{std::to_string(id)})); status = ContactUtil::GetIntFromRecord( contacts_record, _contacts_contact.address_book_id, &id); - if (status.IsError()) return status; - + if (status.IsError()) + { + LoggerE("Fail: GetIntFromRecord"); + return status; + } out.insert(std::make_pair("addressBookId", JsonValue{std::to_string(id)})); status = ContactUtil::GetIntFromRecord(contacts_record, _contacts_contact.person_id, &id); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("personId", JsonValue{std::to_string(id)})); bool is_favorite = false; status = ContactUtil::GetBoolFromRecord( contacts_record, _contacts_contact.is_favorite, &is_favorite); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("isFavorite", JsonValue{is_favorite})); int last_update = 0; status = ContactUtil::GetIntFromRecord( contacts_record, _contacts_contact.changed_time, &last_update); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("lastUpdated", JsonValue{static_cast(last_update)})); @@ -1859,17 +2269,20 @@ PlatformResult ImportContactFromContactsRecord( bool is_contact_name; status = ImportContactNameFromContactsRecord(contacts_record, &name, &is_contact_name); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } if (is_contact_name) { out.insert(std::make_pair(std::string("name"), picojson::value(name))); } else { out.insert(std::make_pair(std::string("name"), - picojson::value(JsonValue{}))); + picojson::value(JsonValue{}))); } typedef PlatformResult (*ImportFunc)(contacts_record_h, unsigned int, - JsonObject*); + JsonObject*); struct ImportData { const char* name; unsigned int property_id; @@ -1877,18 +2290,18 @@ PlatformResult ImportContactFromContactsRecord( }; ImportData imports[] = { {"emails", _contacts_contact.email, - ImportContactEmailAddressFromContactsRecord}, + ImportContactEmailAddressFromContactsRecord}, {"phoneNumbers", _contacts_contact.number, - ImportContactPhoneNumberFromContactsRecord}, + ImportContactPhoneNumberFromContactsRecord}, {"organizations", _contacts_contact.company, - ImportContactOrganizationFromContactsRecord}, + ImportContactOrganizationFromContactsRecord}, {"urls", _contacts_contact.url, ImportContactWebSiteFromContactsRecord}, {"addresses", _contacts_contact.address, - ImportContactAddressFromContactsRecord}, + ImportContactAddressFromContactsRecord}, {"messengers", _contacts_contact.messenger, - ImportContactInstantMessengerFromContactsRecord}, + ImportContactInstantMessengerFromContactsRecord}, {"relationships", _contacts_contact.relationship, - ImportContactRelationshipFromContactsRecord}, + ImportContactRelationshipFromContactsRecord}, }; for (auto& data : imports) { @@ -1898,7 +2311,10 @@ PlatformResult ImportContactFromContactsRecord( int child_rec_count; status = ContactUtil::GetNumberOfChildRecord( contacts_record, data.property_id, &child_rec_count); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } for (unsigned int i = 0; i < child_rec_count; ++i) { JsonValue val{JsonObject{}}; @@ -1910,12 +2326,15 @@ PlatformResult ImportContactFromContactsRecord( //### ContactAnniversary: ### JsonArray& anniversaries = out.insert(std::make_pair(std::string("anniversaries"), - picojson::value(JsonArray()))).first->second.get(); + picojson::value(JsonArray()))).first->second.get(); int child_rec_count; status = ContactUtil::GetNumberOfChildRecord( contacts_record, _contacts_contact.event, &child_rec_count); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } bool is_contact_anniv; for (unsigned int i = 0; i < child_rec_count; ++i) { @@ -1923,13 +2342,16 @@ PlatformResult ImportContactFromContactsRecord( PlatformResult status = ImportContactAnniversariesFromContactsRecord( contacts_record, i, &anniversary.get(), &is_contact_anniv); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } if (is_contact_anniv) { anniversaries.push_back(anniversary); } else { out.insert(std::make_pair(std::string("birthday"), - picojson::value(anniversaries))); + picojson::value(anniversaries))); } } @@ -1939,13 +2361,19 @@ PlatformResult ImportContactFromContactsRecord( status = ContactUtil::GetNumberOfChildRecord( contacts_record, _contacts_contact.note, &child_rec_count); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } for (unsigned int i = 0; i < child_rec_count; ++i) { JsonValue val{JsonObject{}}; status = ImportContactNotesFromContactsRecord(contacts_record, i, &val); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } notes.push_back(val); } @@ -1956,19 +2384,28 @@ PlatformResult ImportContactFromContactsRecord( char* value = nullptr; status = ContactUtil::GetStrFromRecord( contacts_record, _contacts_contact.image_thumbnail_path, &value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } std::make_pair("photoURI", value ? JsonValue{value} : JsonValue{}); status = ContactUtil::GetStrFromRecord( contacts_record, _contacts_contact.ringtone_path, &value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } std::make_pair("ringtoneURI", value ? JsonValue{value} : JsonValue{}); value = nullptr; status = ContactUtil::GetStrFromRecord( contacts_record, _contacts_contact.message_alert, &value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair( "messageAlertURI", @@ -1976,7 +2413,10 @@ PlatformResult ImportContactFromContactsRecord( value = nullptr; status = ContactUtil::GetStrFromRecord(contacts_record, _contacts_contact.vibration, &value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair( "vibrationURI", @@ -1999,7 +2439,10 @@ PlatformResult ExportContactToContactsRecord(contacts_record_h contacts_record, if (!IsNull(in, "name")) { PlatformResult status = ExportContactNameToContactsRecord( contacts_record, FromJson(in, "name")); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } typedef PlatformResult (*ExportFunc)(contacts_record_h, const JsonObject&); @@ -2010,26 +2453,29 @@ PlatformResult ExportContactToContactsRecord(contacts_record_h contacts_record, }; const ExportDataHelper exports[] = { {_contacts_contact.email, "emails", - ExportContactEmailAddressToContactsRecord}, + ExportContactEmailAddressToContactsRecord}, {_contacts_contact.number, "phoneNumbers", - ExportContactPhoneNumberToContactsRecord}, + ExportContactPhoneNumberToContactsRecord}, {_contacts_contact.company, "organizations", - ExportContactOrganizationToContactsRecord}, + ExportContactOrganizationToContactsRecord}, {_contacts_contact.url, "urls", ExportContactWebSiteToContactsRecord}, {_contacts_contact.event, "anniversaries", - ExportContactAnniversariesToContactsRecord}, + ExportContactAnniversariesToContactsRecord}, {_contacts_contact.address, "addresses", - ExportContactAddressToContactsRecord}, + ExportContactAddressToContactsRecord}, {_contacts_contact.messenger, "messengers", - ExportContactInstantMessengerToContactsRecord}, + ExportContactInstantMessengerToContactsRecord}, {_contacts_contact.relationship, "relationships", - ExportContactRelationshipToContactsRecord}, + ExportContactRelationshipToContactsRecord}, }; for (auto& data : exports) { PlatformResult status = ContactUtil::ClearAllContactRecord(contacts_record, data.property_id); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } const JsonArray& elements = FromJson(in, data.name); for (auto& element : elements) { @@ -2041,7 +2487,10 @@ PlatformResult ExportContactToContactsRecord(contacts_record_h contacts_record, //### m_notes: ### PlatformResult status = ContactUtil::ClearAllContactRecord( contacts_record, _contacts_contact.note); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } const JsonArray& elements = FromJson(in, "notes"); for (auto& element : elements) { @@ -2059,13 +2508,19 @@ PlatformResult ExportContactToContactsRecord(contacts_record_h contacts_record, int err = contacts_record_create(_contacts_image._uri, &child_record); PlatformResult status = ContactUtil::ErrorChecker( err, "Fail to create image uri record in database."); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } ContactsRecordHPtr record(&child_record, ContactsDeleter); err = contacts_record_add_child_record( contacts_record, _contacts_contact.image, child_record); status = ContactUtil::ErrorChecker(err, "Fail to add child to image uri."); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } // Do not delete record, it is passed to the platform record.release(); @@ -2078,7 +2533,10 @@ PlatformResult ExportContactToContactsRecord(contacts_record_h contacts_record, err = contacts_record_create(_contacts_image._uri, &child_record); PlatformResult status = ContactUtil::ErrorChecker( err, "Fail to create image uri record in database."); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } is_first = true; } @@ -2094,7 +2552,10 @@ PlatformResult ExportContactToContactsRecord(contacts_record_h contacts_record, ContactUtil::ConvertUriToPath(FromJson(in, "photoURI")); PlatformResult status = ContactUtil::SetStrInRecord( child_record, _contacts_image.path, real_path.c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } if (is_first) { @@ -2102,7 +2563,10 @@ PlatformResult ExportContactToContactsRecord(contacts_record_h contacts_record, contacts_record, _contacts_contact.image, child_record); PlatformResult status = ContactUtil::ErrorChecker(err, "Fail to add child to image uri."); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } // Do not delete record, it is passed to the platform record.release(); @@ -2114,10 +2578,16 @@ PlatformResult ExportContactToContactsRecord(contacts_record_h contacts_record, real_path = ContactUtil::ConvertUriToPath(FromJson(in, "ringtoneURI")); PlatformResult status = VerifyLocalPath(real_path); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } status = ContactUtil::SetStrInRecord( contacts_record, _contacts_contact.ringtone_path, real_path.c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } // Contact.messageAlertURI if (!IsNull(in, "messageAlertURI")) { @@ -2125,7 +2595,10 @@ PlatformResult ExportContactToContactsRecord(contacts_record_h contacts_record, FromJson(in, "messageAlertURI")); PlatformResult status = ContactUtil::SetStrInRecord( contacts_record, _contacts_contact.message_alert, real_path.c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } // Contact.vibrationURI @@ -2134,7 +2607,10 @@ PlatformResult ExportContactToContactsRecord(contacts_record_h contacts_record, ContactUtil::ConvertUriToPath(FromJson(in, "vibrationURI")); PlatformResult status = ContactUtil::SetStrInRecord( contacts_record, _contacts_contact.vibration, real_path.c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } return PlatformResult(ErrorCode::NO_ERROR); @@ -2154,14 +2630,20 @@ PlatformResult ImportContactGroupFromContactsRecord( int int_val = 0; PlatformResult status = ContactUtil::GetIntFromRecord( contacts_record, _contacts_group.id, &int_val); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("id", JsonValue{std::to_string(int_val)})); // addressBookId status = ContactUtil::GetIntFromRecord( contacts_record, _contacts_group.address_book_id, &int_val); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert( std::make_pair("addressBookId", JsonValue{std::to_string(int_val)})); @@ -2170,7 +2652,10 @@ PlatformResult ImportContactGroupFromContactsRecord( char* value = nullptr; status = ContactUtil::GetStrFromRecord(contacts_record, _contacts_group.name, &value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("name", value ? JsonValue{value} : JsonValue{})); @@ -2178,7 +2663,10 @@ PlatformResult ImportContactGroupFromContactsRecord( value = nullptr; status = ContactUtil::GetStrFromRecord(contacts_record, _contacts_group.image_path, &value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert( std::make_pair("photoURI", value ? JsonValue{value} : JsonValue{})); @@ -2187,7 +2675,10 @@ PlatformResult ImportContactGroupFromContactsRecord( value = nullptr; status = ContactUtil::GetStrFromRecord(contacts_record, _contacts_group.ringtone_path, &value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert( std::make_pair("ringtoneURI", value ? JsonValue{value} : JsonValue{})); @@ -2196,7 +2687,10 @@ PlatformResult ImportContactGroupFromContactsRecord( bool bool_value = false; status = ContactUtil::GetBoolFromRecord( contacts_record, _contacts_group.is_read_only, &bool_value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("readOnly", JsonValue{bool_value})); @@ -2209,7 +2703,10 @@ PlatformResult ExportContactGroupToContactsRecord( PlatformResult status = ContactUtil::SetStrInRecord(contacts_record, _contacts_group.name, FromJson(in, "name").c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } std::string real_path; // photoURI @@ -2217,7 +2714,10 @@ PlatformResult ExportContactGroupToContactsRecord( real_path = ConvertUriToPath(FromJson(in, "photoURI")); PlatformResult status = ContactUtil::SetStrInRecord( contacts_record, _contacts_group.image_path, real_path.c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } // ringtoneURI if (!IsNull(in, "ringtoneURI")) { @@ -2226,7 +2726,10 @@ PlatformResult ExportContactGroupToContactsRecord( // NOTE in the original code real path was not read PlatformResult status = ContactUtil::SetStrInRecord( contacts_record, _contacts_group.ringtone_path, real_path.c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } return PlatformResult(ErrorCode::NO_ERROR); @@ -2250,7 +2753,10 @@ PlatformResult ImportPersonFromContactsRecord(contacts_record_h record, // id PlatformResult status = ContactUtil::GetIntFromRecord(record, _contacts_person.id, &int_value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } arguments_obj.insert( std::make_pair("id", JsonValue(std::to_string(int_value)))); @@ -2259,7 +2765,10 @@ PlatformResult ImportPersonFromContactsRecord(contacts_record_h record, // displayName status = ContactUtil::GetStrFromRecord(record, _contacts_person.display_name, &char_value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } arguments_obj.insert(std::make_pair( "displayName", char_value ? JsonValue(char_value) : JsonValue{})); @@ -2267,7 +2776,10 @@ PlatformResult ImportPersonFromContactsRecord(contacts_record_h record, // contactCount status = ContactUtil::GetIntFromRecord(record, _contacts_person.link_count, &int_value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } arguments_obj.insert(std::make_pair( "contactCount", JsonValue(static_cast(int_value)))); @@ -2276,28 +2788,40 @@ PlatformResult ImportPersonFromContactsRecord(contacts_record_h record, // hasPhoneNumber status = ContactUtil::GetBoolFromRecord( record, _contacts_person.has_phonenumber, &bool_value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } arguments_obj.insert(std::make_pair("hasPhoneNumber", JsonValue(bool_value))); // hasEmail status = ContactUtil::GetBoolFromRecord(record, _contacts_person.has_email, &bool_value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } arguments_obj.insert(std::make_pair("hasEmail", JsonValue(bool_value))); // isFavorite status = ContactUtil::GetBoolFromRecord(record, _contacts_person.is_favorite, &bool_value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } arguments_obj.insert(std::make_pair("isFavorite", JsonValue(bool_value))); // photoURI status = ContactUtil::GetStrFromRecord( record, _contacts_person.image_thumbnail_path, &char_value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } arguments_obj.insert(std::make_pair( "photoURI", char_value ? JsonValue(char_value) : JsonValue{})); @@ -2305,7 +2829,10 @@ PlatformResult ImportPersonFromContactsRecord(contacts_record_h record, // ringtoneURI status = ContactUtil::GetStrFromRecord(record, _contacts_person.ringtone_path, &char_value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } arguments_obj.insert(std::make_pair( "ringtoneURI", char_value ? JsonValue(char_value) : JsonValue{})); @@ -2313,11 +2840,14 @@ PlatformResult ImportPersonFromContactsRecord(contacts_record_h record, // displayContactId status = ContactUtil::GetIntFromRecord( record, _contacts_person.display_contact_id, &int_value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } arguments_obj.insert( std::make_pair("displayContactId", - picojson::value(std::to_string(int_value)))); + picojson::value(std::to_string(int_value)))); return PlatformResult(ErrorCode::NO_ERROR); } @@ -2336,7 +2866,10 @@ PlatformResult ExportPersonToContactsRecord(contacts_record_h record, PlatformResult status = ContactUtil::SetBoolInRecord( record, _contacts_person.is_favorite, FromJson(args, "isFavorite")); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } if (!IsNull(args, "photoURI") && !FromJson(args, "photoURI").empty()) { @@ -2355,17 +2888,26 @@ PlatformResult ExportPersonToContactsRecord(contacts_record_h record, PlatformResult status = ContactUtil::SetStrInRecord( record, _contacts_person.ringtone_path, FromJson(args, "ringtoneURI").c_str()); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } else { PlatformResult status = ContactUtil::SetStrInRecord(record, _contacts_person.ringtone_path, ""); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } if (!IsNull(args, "displayContactId")) { PlatformResult status = ContactUtil::SetIntInRecord( record, _contacts_person.display_contact_id, common::stol(FromJson(args, "displayContactId"))); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } } return PlatformResult(ErrorCode::NO_ERROR); @@ -2377,25 +2919,37 @@ PlatformResult UpdateAdditionalInformation( int int_value = -1; PlatformResult status = ContactUtil::GetIntFromRecord( *contacts_record_ptr, _contacts_contact.person_id, &int_value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("personId", JsonValue{std::to_string(int_value)})); status = ContactUtil::GetIntFromRecord( *contacts_record_ptr, _contacts_contact.address_book_id, &int_value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert( std::make_pair("addressBookId", JsonValue{std::to_string(int_value)})); status = ContactUtil::GetIntFromRecord( *contacts_record_ptr, _contacts_contact.changed_time, &int_value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert( std::make_pair("lastUpdated", JsonValue{static_cast(int_value)})); bool bool_value = false; status = ContactUtil::GetBoolFromRecord( *contacts_record_ptr, _contacts_contact.is_favorite, &bool_value); - if (status.IsError()) return status; + if (status.IsError()) { + LoggerE("Error: %s", status.message().c_str()); + return status; + } out.insert(std::make_pair("isFavorite", JsonValue{bool_value})); diff --git a/src/contact/person.cc b/src/contact/person.cc index d4eab34b..178838ad 100644 --- a/src/contact/person.cc +++ b/src/contact/person.cc @@ -40,6 +40,7 @@ static const PersonPropertyMap personPropertyMap = { }; PlatformResult PersonLink(const JsonObject& args, JsonObject&) { + LoggerD("Enter"); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -67,6 +68,7 @@ PlatformResult PersonLink(const JsonObject& args, JsonObject&) { } PlatformResult PersonUnlink(const JsonObject& args, JsonObject& out) { + LoggerD("Enter"); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -129,6 +131,7 @@ PlatformResult PersonUnlink(const JsonObject& args, JsonObject& out) { PlatformResult PersonPropertyFromString(const std::string& name, PersonProperty* person_prop) { + LoggerD("Enter"); auto iter = personPropertyMap.find(name); if (iter == personPropertyMap.end()) { LoggerE("Invalid property name (not in map): %s", name.c_str());