static TapiHandle* __ctsvc_server_sim_get_tapi_handle(ctsvc_sim_info_s *info)
{
- if (info->handle == NULL) {
+ if (NULL == info->handle) {
int bReady = 0;
/* TODO: it should be changed API */
vconf_get_bool(VCONFKEY_TELEPHONY_READY, &bReady);
static inline void* __ctsvc_server_sim_get_return_data(void)
{
- RETVM_IF(greturn_data == NULL, NULL, "greturn_data is NULL");
+ RETVM_IF(NULL == greturn_data, NULL, "greturn_data is NULL");
return greturn_data;
}
-void ctsvc_server_sim_record_destroy(sim_contact_s *record)
+static void __ctsvc_server_sim_record_destroy(sim_contact_s *record)
{
- RETM_IF(record == NULL, "record is NULL");
+ RET_IF(NULL == record);
free(record->name);
free(record->number);
static sim_contact_s * __ctsvc_server_sim_record_clone(TelSimPbRecord_t *sim_record)
{
sim_contact_s *record = calloc(1,sizeof(sim_contact_s));
- if (NULL == record)
- {
+ if (NULL == record) {
CTS_ERR("calloc() Fail");
return NULL;
}
{
int ret;
- RETVM_IF(number == NULL, CONTACTS_ERROR_INVALID_PARAMETER, "invalid number");
+ RETVM_IF(NULL == number, CONTACTS_ERROR_INVALID_PARAMETER, "invalid number");
ret = contacts_record_create(_contacts_number._uri, record);
RETVM_IF(ret < CONTACTS_ERROR_NONE, ret, "contacts_record_create() Fail(%d)", ret);
{
int ret;
- RETVM_IF(email == NULL, CONTACTS_ERROR_INVALID_PARAMETER, "invalid email");
+ RETVM_IF(NULL == email, CONTACTS_ERROR_INVALID_PARAMETER, "invalid email");
ret = contacts_record_create(_contacts_email._uri, record);
RETVM_IF(ret < CONTACTS_ERROR_NONE, ret, "contacts_record_create() Fail(%d)", ret);
contacts_record_h number = NULL;
contacts_record_h email = NULL;
- RETVM_IF(contact == NULL, CONTACTS_ERROR_INVALID_PARAMETER, "Invalid parameter : contact is NULL");
+ RETV_IF(NULL == contact, CONTACTS_ERROR_INVALID_PARAMETER);
*contact = NULL;
- RETVM_IF(record == NULL, CONTACTS_ERROR_INVALID_PARAMETER, "Invalid parameter : record is NULL");
+ RETV_IF(NULL == record, CONTACTS_ERROR_INVALID_PARAMETER);
RETVM_IF(record->sim_index <= 0, CONTACTS_ERROR_INVALID_PARAMETER, "The index(%d) is invalid", record->sim_index);
CTS_DBG("insert record->sim_index %d", record->sim_index);
return -1;
}
+static void __ctsvc_server_sim_destroy_records(gpointer data)
+{
+ sim_contact_s *record = data;
+ __ctsvc_server_sim_record_destroy(record);
+}
+
+static void __ctsvc_server_sim_destroy_import_contacts(ctsvc_sim_info_s *info)
+{
+ GSList *cursor;
+ RET_IF(NULL == info);
+ RET_IF(NULL == info->import_contacts);
+
+ g_slist_free_full(info->import_contacts, __ctsvc_server_sim_destroy_records);
+ info->import_contacts = NULL;
+}
+
static int __ctsvc_server_sim_insert_records_to_db(ctsvc_sim_info_s *info)
{
CTS_FN_CALL;
int i;
int ret = 0;
+ int count = 0;
sim_contact_s *record = NULL;
contacts_record_h contact = NULL;
contacts_list_h list = NULL;
GSList *cursor = NULL;
/* insert contacts to DB */
+ ret = contacts_list_create(&list);
+ if (CONTACTS_ERROR_NONE != ret) {
+ CTS_ERR("contacts_list_create() Fail(%d)", ret);
+ return CONTACTS_ERROR_INTERNAL;
+ }
+
for (cursor = info->import_contacts, i=0;cursor;i++) {
- if (list == NULL)
- contacts_list_create(&list);
- ret = __ctsvc_server_sim_ctsvc_record_clone(cursor->data, DEFAULT_ADDRESS_BOOK_ID, &contact);
- contacts_list_add(list, contact);
- if (i == 50) {
- ret = contacts_db_insert_records(list, NULL, NULL);
- WARN_IF(ret < CONTACTS_ERROR_NONE, "contacts_db_insert_records() Fail(%d)", ret);
+ record = cursor->data;
+ ret = __ctsvc_server_sim_ctsvc_record_clone(record, DEFAULT_ADDRESS_BOOK_ID, &contact);
+ if (CONTACTS_ERROR_NONE != ret) {
+ CTS_ERR("__ctsvc_server_sim_ctsvc_record_clone() Fail(%d)", ret);
+ contacts_list_destroy(list, true);
+ return CONTACTS_ERROR_INTERNAL;
+ }
+ ret = contacts_list_add(list, contact);
+ if (CONTACTS_ERROR_NONE != ret) {
+ CTS_ERR("contacts_list_add() Fail(%d)", ret);
contacts_list_destroy(list, true);
- list = NULL;
- i = 0;
+ return CONTACTS_ERROR_INTERNAL;
}
cursor = cursor->next;
- info->import_contacts = g_slist_remove(info->import_contacts, record);
- ctsvc_server_sim_record_destroy(record);
}
- g_slist_free(info->import_contacts);
- info->import_contacts = NULL;
- if (list) {
- ret = contacts_db_insert_records(list, NULL, NULL);
- WARN_IF(ret < CONTACTS_ERROR_NONE, "contacts_db_insert_records() Fail(%d)", ret);
- contacts_list_destroy(list, true);
+ contacts_list_get_count(list, &count);
+ CTS_DBG("records count:%d", count);
+ if (0 < count) {
+ ret = ctsvc_db_insert_records(list, NULL, NULL);
+ if (CONTACTS_ERROR_NONE != ret) {
+ CTS_ERR("ctsvc_db_insert_records() Fail(%d)", ret);
+ contacts_list_destroy(list, true);
+ return ret;
+ }
}
+ contacts_list_destroy(list, true);
return CONTACTS_ERROR_NONE;
}
if (NULL == sim_info) {
CTS_ERR("sim_info is NULL, result = %d", access_rt);
- ret = ctsvc_server_socket_return(__ctsvc_server_sim_get_return_data(), ret, 0, NULL);
+ ret = ctsvc_server_socket_return(__ctsvc_server_sim_get_return_data(), CONTACTS_ERROR_SYSTEM, 0, NULL);
WARN_IF(CONTACTS_ERROR_NONE != ret, "ctsvc_server_socket_return() Fail(%d)", ret);
__ctsvc_server_sim_set_return_data(NULL);
return;
}
info = __ctsvc_server_sim_get_handle_by_tapi_handle(handle);
- if (info == NULL) {
+ if (NULL == info) {
CTS_ERR("__ctsvc_server_sim_get_handle_by_tapi_handle() Fail");
- ret = ctsvc_server_socket_return(__ctsvc_server_sim_get_return_data(), ret, 0, NULL);
+ ret = ctsvc_server_socket_return(__ctsvc_server_sim_get_return_data(), CONTACTS_ERROR_INTERNAL, 0, NULL);
WARN_IF(CONTACTS_ERROR_NONE != ret, "ctsvc_server_socket_return() Fail(%d)", ret);
__ctsvc_server_sim_set_return_data(NULL);
return;
}
- if (access_rt == TAPI_SIM_PB_INVALID_INDEX) {
+ if (TAPI_SIM_PB_INVALID_INDEX == access_rt) {
int start_index = 0;
if (user_data)
start_index = (int)user_data;
start_index++;
if (info->file_record[TAPI_PB_3G_NAME].index_max < start_index) {
CTS_ERR("start_index is invalid start_index = %d, total = %d", start_index,
- info->file_record[TAPI_PB_3G_NAME].index_max);
- ret = ctsvc_server_socket_return(__ctsvc_server_sim_get_return_data(), ret, 0, NULL);
+ info->file_record[TAPI_PB_3G_NAME].index_max);
+ ret = ctsvc_server_socket_return(__ctsvc_server_sim_get_return_data(), CONTACTS_ERROR_INTERNAL, 0, NULL);
WARN_IF(CONTACTS_ERROR_NONE != ret, "ctsvc_server_socket_return() Fail(%d)", ret);
+ __ctsvc_server_sim_destroy_import_contacts(info);
__ctsvc_server_sim_set_return_data(NULL);
return;
}
ret = tel_read_sim_pb_record(handle, info->sim_type, start_index,
- __ctsvc_server_sim_import_contact_cb, (void*)start_index);
- if (ret != TAPI_API_SUCCESS) {
+ __ctsvc_server_sim_import_contact_cb, (void*)start_index);
+ if (TAPI_API_SUCCESS != ret) {
CTS_ERR("SIM phonebook access Fail(%d) start_indext(%d)", access_rt,start_index);
- ret = ctsvc_server_socket_return(__ctsvc_server_sim_get_return_data(), ret, 0, NULL);
+ ret = ctsvc_server_socket_return(__ctsvc_server_sim_get_return_data(), CONTACTS_ERROR_SYSTEM, 0, NULL);
WARN_IF(CONTACTS_ERROR_NONE != ret, "ctsvc_server_socket_return() Fail(%d)", ret);
+ __ctsvc_server_sim_destroy_import_contacts(info);
__ctsvc_server_sim_set_return_data(NULL);
return;
}
+ return;
}
if (TAPI_SIM_PB_SUCCESS != access_rt) {
CTS_ERR("SIM phonebook access Fail(%d)", access_rt);
- ret = ctsvc_server_socket_return(__ctsvc_server_sim_get_return_data(), ret, 0, NULL);
+ ret = ctsvc_server_socket_return(__ctsvc_server_sim_get_return_data(), CONTACTS_ERROR_SYSTEM, 0, NULL);
WARN_IF(CONTACTS_ERROR_NONE != ret, "ctsvc_server_socket_return() Fail(%d)", ret);
+ __ctsvc_server_sim_destroy_import_contacts(info);
__ctsvc_server_sim_set_return_data(NULL);
return;
}
case TAPI_SIM_PB_SDN:
default:
CTS_ERR("Unknown storage type(%d)", sim_info->phonebook_type);
- ret = ctsvc_server_socket_return(__ctsvc_server_sim_get_return_data(), ret, 0, NULL);
+ ret = ctsvc_server_socket_return(__ctsvc_server_sim_get_return_data(), CONTACTS_ERROR_SYSTEM, 0, NULL);
WARN_IF(CONTACTS_ERROR_NONE != ret, "ctsvc_server_socket_return() Fail(%d)", ret);
+ __ctsvc_server_sim_destroy_import_contacts(info);
__ctsvc_server_sim_set_return_data(NULL);
return;
}
ret = tel_read_sim_pb_record(__ctsvc_server_sim_get_tapi_handle(info), sim_info->phonebook_type,
sim_info->next_index, __ctsvc_server_sim_import_contact_cb, NULL);
- WARN_IF(TAPI_API_SUCCESS != ret, "tel_read_sim_pb_record() Fail(%d)", ret);
+ if (TAPI_API_SUCCESS != ret) {
+ CTS_ERR("tel_read_sim_pb_record() Fail(%d)", ret);
+ ret = ctsvc_server_socket_return(__ctsvc_server_sim_get_return_data(), CONTACTS_ERROR_SYSTEM, 0, NULL);
+ WARN_IF(CONTACTS_ERROR_NONE != ret, "ctsvc_server_socket_return() Fail(%d)", ret);
+ __ctsvc_server_sim_destroy_import_contacts(info);
+ __ctsvc_server_sim_set_return_data(NULL);
+ return;
+ }
}
else {
/* insert imported contact to DB */
- __ctsvc_server_sim_insert_records_to_db(info);
+ ret = __ctsvc_server_sim_insert_records_to_db(info);
+ ret = ctsvc_server_socket_return(__ctsvc_server_sim_get_return_data(), ret, 0, NULL);
+ WARN_IF(CONTACTS_ERROR_NONE != ret, "ctsvc_server_socket_return() Fail(%d)", ret);
+ __ctsvc_server_sim_destroy_import_contacts(info);
+ __ctsvc_server_sim_set_return_data(NULL);
}
-
- ret = ctsvc_server_socket_return(__ctsvc_server_sim_get_return_data(), ret, 0, NULL);
- WARN_IF(CONTACTS_ERROR_NONE != ret, "ctsvc_server_socket_return() Fail(%d)", ret);
- __ctsvc_server_sim_set_return_data(NULL);
}
int ctsvc_server_sim_import_contact(void* data, int sim_slot_no)
ctsvc_sim_info_s *info;
info = __ctsvc_server_sim_get_handle_by_sim_slot_no(sim_slot_no);
- RETVM_IF(NULL == info, CONTACTS_ERROR_SYSTEM, "sim init is not completed");
- RETVM_IF(false == info->initialized, CONTACTS_ERROR_SYSTEM, "sim init is not completed");
+ RETV_IF(NULL == info, CONTACTS_ERROR_SYSTEM);
+ RETV_IF(false == info->initialized, CONTACTS_ERROR_SYSTEM);
RETVM_IF(__ctsvc_server_sim_get_return_data(), CONTACTS_ERROR_INTERNAL,
"Server is already processing with sim");
__ctsvc_server_sim_set_return_data(data);
- if (info->file_record[TAPI_PB_3G_NAME].used_count == 0) {
+ if (0 == info->file_record[TAPI_PB_3G_NAME].used_count) {
ret = ctsvc_server_socket_return(__ctsvc_server_sim_get_return_data(), CONTACTS_ERROR_NO_DATA, 0, NULL);
- WARN_IF(CONTACTS_ERROR_SYSTEM != ret, "helper_socket_return() Fail(%d)", ret);
+ WARN_IF(CONTACTS_ERROR_NONE != ret, "helper_socket_return() Fail(%d)", ret);
__ctsvc_server_sim_set_return_data(NULL);
return ret;
}
ret = tel_read_sim_pb_record(__ctsvc_server_sim_get_tapi_handle(info), info->sim_type, 1,
__ctsvc_server_sim_import_contact_cb, NULL);
- if (ret != TAPI_API_SUCCESS) {
+ if (TAPI_API_SUCCESS != ret) {
CTS_ERR("tel_read_sim_pb_record = %d",ret);
__ctsvc_server_sim_set_return_data(NULL);
return CONTACTS_ERROR_SYSTEM;
{
CTS_FN_CALL;
int ret=0;
- TelSimPbAccessResult_t sec_rt = result;
+ TelSimPbAccessResult_t access_rt = result;
TelSimPbRecord_t *sim_info = data;
ctsvc_sim_info_s *info = (ctsvc_sim_info_s*)user_data;
- RETM_IF(sim_info == NULL, "sim_info is NULL");
+ RET_IF(NULL == sim_info);
- if (TAPI_SIM_PB_SUCCESS != sec_rt) {
+ if (TAPI_SIM_PB_SUCCESS != access_rt) {
if (TAPI_SIM_PB_SDN == sim_info->phonebook_type &&
- TAPI_SIM_PB_INVALID_INDEX == sec_rt) {
+ TAPI_SIM_PB_INVALID_INDEX == access_rt) {
CTS_DBG("Index = %d", sim_info->index);
ret = tel_read_sim_pb_record(handle, sim_info->phonebook_type, sim_info->index+1,
__ctsvc_server_sim_sdn_read_cb, info);
- RETM_IF(ret != TAPI_API_SUCCESS, "tel_read_sim_pb_record() Fail(%d)", ret);
+ RETM_IF(TAPI_API_SUCCESS != ret, "tel_read_sim_pb_record() Fail(%d)", ret);
}
- CTS_ERR("SIM phonebook access Fail(%d)", sec_rt);
+ CTS_ERR("SIM phonebook access Fail(%d)", access_rt);
ctsvc_server_trim_memory();
return;
}
switch (sim_info->phonebook_type) {
case TAPI_SIM_PB_SDN:
ret = ctsvc_server_insert_sdn_contact((char *)sim_info->name, (char *)sim_info->number, info->sim_slot_no);
- WARN_IF(ret != CONTACTS_ERROR_NONE, "ctsvc_server_insert_sdn_contact() Fail(%d)", ret);
+ WARN_IF(CONTACTS_ERROR_NONE != ret, "ctsvc_server_insert_sdn_contact() Fail(%d)", ret);
break;
case TAPI_SIM_PB_ADN:
case TAPI_SIM_PB_3GSIM:
}
}
-static void __ctsvc_server_sim_sdn_meta_info_cb(TapiHandle *handle, int result, void *data, void *user_data)
+static void __ctsvc_server_sim_sdn_count_cb(TapiHandle *handle, int result, void *data, void *user_data)
{
CTS_FN_CALL;
int ret = 0;
- TelSimPbAccessResult_t sec_rt = result;
- TelSimPbEntryInfo_t *pe = data;
+ TelSimPbAccessResult_t access_rt = result;
+ TelSimPbStorageInfo_t *ps = data;
ctsvc_sim_info_s *info = (ctsvc_sim_info_s*)user_data;
- RETM_IF(TAPI_SIM_PB_SUCCESS != sec_rt, "TelSimPbAccessResult_t fail(%d)",sec_rt);
- RETM_IF(pe == NULL, "pe is NULL result =%d",sec_rt);
+ RETM_IF(TAPI_SIM_PB_SUCCESS != access_rt, "TelSimPbAccessResult:%d", access_rt);
+ RETM_IF(NULL == ps, "ps is NULL. TelSimPbAccessResult:%d", access_rt);
- if (0 < pe->PbUsedCount) {
+ if (0 < ps->UsedRecordCount) {
ret = tel_read_sim_pb_record(info->handle, TAPI_SIM_PB_SDN, 1, __ctsvc_server_sim_sdn_read_cb, info);
if (TAPI_API_SUCCESS != ret) {
CTS_ERR("tel_read_sim_pb_record() Fail(%d)", ret);
}
}
else {
- CTS_ERR("pe->PbUsedCount : 0 no sdn!!!!", ret);
+ CTS_ERR("ps->UsedRecordCount:0. No SDN!!!!");
}
ctsvc_server_trim_memory();
}
return ret;
}
- ret = tel_get_sim_pb_meta_info(info->handle, TAPI_SIM_PB_SDN, __ctsvc_server_sim_sdn_meta_info_cb, info);
+ ret = tel_get_sim_pb_count(info->handle, TAPI_SIM_PB_SDN, __ctsvc_server_sim_sdn_count_cb, info);
if (TAPI_API_SUCCESS != ret) {
CTS_ERR("tel_get_sim_pb_meta_info() Fail(%d)", ret);
ctsvc_server_trim_memory();
CTS_DBG("sim slot id :%d, sim_type = %d", info->sim_slot_no, info->sim_type);
if (TAPI_SIM_PB_3GSIM == info->sim_type) {
TelSimPbCapabilityInfo_t *capa = data;
- RETM_IF(capa == NULL, "capa is NULL result =%d",access_rt);
+ RETM_IF(NULL == capa, "capa is NULL result =%d",access_rt);
for (i=0; i < capa->FileTypeCount; i++) {
type = capa->FileTypeInfo[i].field_type;
}
else if (TAPI_SIM_PB_ADN == info->sim_type) {
TelSimPbEntryInfo_t *pe = data;
- RETM_IF(pe == NULL, "pe is NULL result =%d",access_rt);
+ RETM_IF(NULL == pe, "pe is NULL result =%d", access_rt);
info->file_record[CTSVC_2GSIM_NAME].support = true;
info->file_record[CTSVC_2GSIM_NAME].index_max = pe->PbIndexMax;
int ret;
int id;
- RETM_IF(access_rt != TAPI_SIM_ACCESS_SUCCESS, "tel_get_sim_iccid fail(%d)", access_rt);
+ RETM_IF(TAPI_SIM_ACCESS_SUCCESS != access_rt, "tel_get_sim_iccid Fail(%d)", access_rt);
CTS_DBG("%d, %s", iccid->icc_length, iccid->icc_num);
int ret = TAPI_API_SUCCESS;
int err = CONTACTS_ERROR_NONE;
- if (info->sim_type == TAPI_SIM_PB_UNKNOWNN) {
+ if (TAPI_SIM_PB_UNKNOWNN == info->sim_type) {
err = __ctsvc_server_sim_init_info(info);
WARN_IF(CONTACTS_ERROR_NONE != err, "__ctsvc_server_sim_init_info() Fail(%d)", err);
}
- if (info->sim_type == TAPI_SIM_PB_3GSIM) {
+ if (TAPI_SIM_PB_3GSIM == info->sim_type) {
ret = tel_get_sim_pb_usim_meta_info(info->handle, __ctsvc_server_sim_get_meta_info_cb, info);
}
- else if (info->sim_type == TAPI_SIM_PB_ADN) {
+ else if (TAPI_SIM_PB_ADN == info->sim_type) {
ret = tel_get_sim_pb_meta_info(info->handle, info->sim_type, __ctsvc_server_sim_get_meta_info_cb, info);
}
else {
return CONTACTS_ERROR_SYSTEM;
}
- RETVM_IF(ret != TAPI_API_SUCCESS, CONTACTS_ERROR_SYSTEM,
+ RETVM_IF(TAPI_API_SUCCESS != ret, CONTACTS_ERROR_SYSTEM,
"tel_get_sim_(usim)_meta_info(type:%d) Fail(%d)", info->sim_type, ret);
return CONTACTS_ERROR_NONE;
/* get sim_type */
ret = tel_get_sim_type(info->handle, &cardtype);
- RETVM_IF(ret != TAPI_API_SUCCESS, CONTACTS_ERROR_SYSTEM, "tel_get_sim_type Fail(%d)slot no(%d)", ret, info->sim_slot_no);
- if (cardtype == TAPI_SIM_CARD_TYPE_USIM) {
+ RETVM_IF(TAPI_API_SUCCESS != ret, CONTACTS_ERROR_SYSTEM, "tel_get_sim_type Fail(%d)slot no(%d)", ret, info->sim_slot_no);
+ if (TAPI_SIM_CARD_TYPE_USIM == cardtype) {
info->sim_type = TAPI_SIM_PB_3GSIM;
}
- else if (cardtype == TAPI_SIM_CARD_TYPE_GSM) {
+ else if (TAPI_SIM_CARD_TYPE_GSM == cardtype) {
info->sim_type = TAPI_SIM_PB_ADN;
}
else {
}
/* set iccid : unique info of SIM */
- ret = tel_get_sim_iccid (info->handle, __ctsvc_server_sim_get_iccid_cb, info);
- RETVM_IF(ret != TAPI_API_SUCCESS, CONTACTS_ERROR_SYSTEM, "tel_get_sim_iccid Fail(%d)", ret);
+ ret = tel_get_sim_iccid(info->handle, __ctsvc_server_sim_get_iccid_cb, info);
+ RETVM_IF(TAPI_API_SUCCESS != ret, CONTACTS_ERROR_SYSTEM, "tel_get_sim_iccid Fail(%d)", ret);
return CONTACTS_ERROR_NONE;
}
-static void __ctsvc_server_sim_data_remove(ctsvc_sim_info_s *info)
-{
- GSList *cursor;
- sim_contact_s *record = NULL;
-
- for (cursor=info->import_contacts;cursor;cursor=cursor->next) {
- record = cursor->data;
- info->import_contacts = g_slist_remove(info->import_contacts, record);
- ctsvc_server_sim_record_destroy(record);
- }
- g_slist_free(info->import_contacts);
- info->import_contacts = NULL;
-}
-
static void __ctsvc_server_sim_noti_pb_status(TapiHandle *handle, const char *noti_id, void *data, void *user_data)
{
CTS_FN_CALL;
int ret = 0;
ctsvc_sim_info_s *info = (ctsvc_sim_info_s*)user_data;
TelSimPbStatus_t *pb_status = (TelSimPbStatus_t *)data;
- RETM_IF(pb_status == NULL, "pb_status is null");
+ RET_IF(NULL == pb_status);
INFO("received pb status noti : b_3g[%d], b_adn[%d], b_fdn[%d]", pb_status->pb_list.b_3g, pb_status->pb_list.b_adn, pb_status->pb_list.b_fdn);
- if (pb_status->pb_list.b_3g == 1 || pb_status->pb_list.b_adn == 1) {
+ if ((1 == pb_status->pb_list.b_3g) || (1 == pb_status->pb_list.b_adn)) {
if (info->initialized)
return;
ret = __ctsvc_server_sim_init_meta_info(info);
WARN_IF(CONTACTS_ERROR_NONE != ret, "__ctsvc_server_sim_init_meta_info() Fail(%d)", ret);
}
/* FDN on : can not import sim contacts */
- else if (pb_status->pb_list.b_fdn ==1 && pb_status->pb_list.b_adn == 0 && info->sim_type == TAPI_SIM_PB_ADN) {
+ else if ((1 == pb_status->pb_list.b_fdn) && (0 == pb_status->pb_list.b_adn)
+ && (TAPI_SIM_PB_ADN == info->sim_type)) {
CTS_INFO("This is sim card is 2G and FDN on status. sim phonebook will be block");
info->initialized = false;
- __ctsvc_server_sim_data_remove(info);
+ __ctsvc_server_sim_destroy_import_contacts(info);
}
else {
CTS_ERR("This noti did not control !!!");
INFO("Recieved SIM Refresh event");
info->initialized = false;
- __ctsvc_server_sim_data_remove(info);
+ __ctsvc_server_sim_destroy_import_contacts(info);
}
static int __ctsvc_server_sim_info_init()
g_type_init();
#endif
cp_name = tel_get_cp_name_list();
- RETVM_IF(cp_name == NULL, CONTACTS_ERROR_SYSTEM, "tel_get_cp_name_list() Fail(cp_name is NULL)");
+ RETVM_IF(NULL == cp_name, CONTACTS_ERROR_SYSTEM, "tel_get_cp_name_list() Fail(cp_name is NULL)");
ret = ctsvc_server_delete_sdn_contact(-1);
WARN_IF(CONTACTS_ERROR_NONE != ret, "ctsvc_server_delete_sdn_contact() Fail(%d)", ret);
ret = __ctsvc_server_sim_init_info(info);
WARN_IF(CONTACTS_ERROR_NONE != ret, "__ctsvc_server_sim_init_info() Fail(%d)", ret);
ret = tel_get_sim_pb_init_info(handle, &sim_stat, &pb_list);
- if (TAPI_API_SUCCESS == ret && (pb_list.b_3g == 1 || pb_list.b_adn == 1)) {
+ if (TAPI_API_SUCCESS == ret && ((1 == pb_list.b_3g) || (1 == pb_list.b_adn))) {
ret = __ctsvc_server_sim_init_meta_info(info);
WARN_IF(CONTACTS_ERROR_NONE != ret, "__ctsvc_server_sim_init_meta_info() Fail(%d)", ret);
}
WARN_IF(TAPI_API_SUCCESS != ret, "tel_deinit() Fail(%d)", ret);
}
- for (cursor=info->import_contacts;cursor;cursor=cursor->next) {
- record = cursor->data;
- info->import_contacts = g_slist_remove(info->import_contacts, record);
- ctsvc_server_sim_record_destroy(record);
- }
- g_slist_free(info->import_contacts);
+ __ctsvc_server_sim_destroy_import_contacts(info);
free(info);
}
projects / platform / core / pim / contacts-service.git / commitdiff