mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-17 02:42:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

pbap_client: add pbap_get_vcard_listing_size

Browse Source
This commit is contained in:
Matthias Ringwald 2025-04-11 16:32:01 +02:00
parent 954d3502c3
commit 086d09eaa3
2 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/classic/pbap_client.c
View File

@ -736,6 +736,7 @@ static void pbap_handle_can_send_now(pbap_client_t *pbap_client) {
goep_client_execute(pbap_client->goep_cid);
break;
case PBAP_CLIENT_W2_GET_CARD_LIST:
case PBAP_CLIENT_W2_GET_CARD_LIST_SIZE:
// prepare request
goep_client_request_create_get(pbap_client->goep_cid);
if (pbap_client->request_number == 0){
@ -756,8 +757,15 @@ static void pbap_handle_can_send_now(pbap_client_t *pbap_client) {
if (pbap_client->order){
pos += pbap_client_application_params_add_order(pbap_client, &application_parameters[pos], pbap_client->order);
}
if (pbap_client->max_list_count){
pos += pbap_client_application_params_add_max_list_count(pbap_client, &application_parameters[pos], pbap_client->max_list_count);
// add max_list_count if set or if we get size
uint16_t max_list_count = pbap_client->max_list_count;
bool add_max_list_count = max_list_count > 0;
if (pbap_client->state == PBAP_CLIENT_W2_GET_CARD_LIST_SIZE){
max_list_count = 0;
add_max_list_count = true;
}
if (add_max_list_count){
pos += pbap_client_application_params_add_max_list_count(pbap_client, &application_parameters[pos], max_list_count);
}
if (pbap_client->list_start_offset){
pos += pbap_client_application_params_add_list_start_offset (pbap_client, &application_parameters[pos], pbap_client->list_start_offset);
@ -767,7 +775,11 @@ static void pbap_handle_can_send_now(pbap_client_t *pbap_client) {
pbap_client_prepare_srm_header(pbap_client);
}
// state
pbap_client->state = PBAP_CLIENT_W4_GET_CARD_LIST_COMPLETE;
if (pbap_client->state == PBAP_CLIENT_W2_GET_CARD_LIST_SIZE) {
pbap_client->state = PBAP_CLIENT_W4_GET_CARD_LIST_SIZE_COMPLETE;
} else {
pbap_client->state = PBAP_CLIENT_W4_GET_CARD_LIST_COMPLETE;
}
// prepare response
pbap_client_prepare_get_operation(pbap_client);
// send packet
@ -974,6 +986,7 @@ static void pbap_packet_handler_goep(pbap_client_t *client, uint8_t *packet, uin
}
break;
case PBAP_CLIENT_W4_GET_PHONEBOOK_SIZE_COMPLETE:
case PBAP_CLIENT_W4_GET_CARD_LIST_SIZE_COMPLETE:
switch (op_info.response_code) {
case OBEX_RESP_SUCCESS:
if (client->phonebook_size_parser.have_size) {
@ -1163,7 +1176,7 @@ uint8_t pbap_disconnect(uint16_t pbap_cid){
return ERROR_CODE_SUCCESS;
}
uint8_t pbap_get_phonebook_size(uint16_t pbap_cid, const char * path){
static uint8_t pbap_get_phonebook_size_general(uint16_t pbap_cid, const char * path, pbap_client_state_t state){
pbap_client_t * pbap_client = pbap_client_for_cid(pbap_cid);
if (pbap_client == NULL){
return ERROR_CODE_UNKNOWN_CONNECTION_IDENTIFIER;
@ -1171,13 +1184,21 @@ uint8_t pbap_get_phonebook_size(uint16_t pbap_cid, const char * path){
if (pbap_client->state != PBAP_CLIENT_CONNECTED){
return BTSTACK_BUSY;
}
pbap_client->state = PBAP_CLIENT_W2_GET_PHONEBOOK_SIZE;
pbap_client->state = state;
pbap_client->phonebook_path = path;
pbap_client->request_number = 0;
goep_client_request_can_send_now(pbap_client->goep_cid);
return ERROR_CODE_SUCCESS;
}
uint8_t pbap_get_phonebook_size(uint16_t pbap_cid, const char * path) {
return pbap_get_phonebook_size_general(pbap_cid, path, PBAP_CLIENT_W2_GET_PHONEBOOK_SIZE);
}
uint8_t pbap_get_vcard_listing_size(uint16_t pbap_cid, const char * path){
return pbap_get_phonebook_size_general(pbap_cid, path, PBAP_CLIENT_W2_GET_CARD_LIST_SIZE);
}
uint8_t pbap_pull_phonebook(uint16_t pbap_cid, const char * path){
pbap_client_t * pbap_client = pbap_client_for_cid(pbap_cid);
if (pbap_client == NULL){

15
src/classic/pbap_client.h
View File

@ -86,6 +86,8 @@ typedef enum {
// - pull vacard liast
PBAP_CLIENT_W2_GET_CARD_LIST,
PBAP_CLIENT_W4_GET_CARD_LIST_COMPLETE,
PBAP_CLIENT_W2_GET_CARD_LIST_SIZE,
PBAP_CLIENT_W4_GET_CARD_LIST_SIZE_COMPLETE,
// - pull vcard entry
PBAP_CLIENT_W2_GET_CARD_ENTRY,
PBAP_CLIENT_W4_GET_CARD_ENTRY_COMPLETE,
@ -338,7 +340,8 @@ uint8_t pbap_set_search_value(uint16_t pbap_cid, const char * search_value);
/**
* @brief Get size of phone book from PSE. The result is reported via PBAP_SUBEVENT_PHONEBOOK_SIZE event.
*
* @note This function uses the PullPhoneBook command
*
* @param pbap_cid
* @param path - note: path is not copied, common path 'telecom/pb.vcf'
* @return status ERROR_CODE_SUCCESS on success, otherwise BTSTACK_BUSY if in a wrong state.
@ -355,6 +358,16 @@ uint8_t pbap_get_phonebook_size(uint16_t pbap_cid, const char * path);
*/
uint8_t pbap_pull_phonebook(uint16_t pbap_cid, const char * path);
/**
* @brief Get size of phone book from PSE. The result is reported via PBAP_SUBEVENT_PHONEBOOK_SIZE event.
*
* @note This function uses the PullvCardListing command
* @param pbap_cid
* @param path - note: path is not copied, common path 'telecom/pb.vcf'
* @return status ERROR_CODE_SUCCESS on success, otherwise BTSTACK_BUSY if in a wrong state.
*/
uint8_t pbap_get_vcard_listing_size(uint16_t pbap_cid, const char * path);
/**
* @brief Pull vCard listing. vCard data is emitted via PBAP_SUBEVENT_CARD_RESULT event.
* Event PBAP_SUBEVENT_OPERATION_COMPLETED marks the end of vCard listing.