From fa3fd354ed488b0f60d2b43afcdd8b360cee086c Mon Sep 17 00:00:00 2001 From: hyunho Date: Mon, 6 Aug 2018 19:22:27 +0900 Subject: [PATCH] Remove set type API Remove watchface_complication_provider_data_set_type. Framework will automatically fill in type for shared data Change-Id: Iec6cfa4aa05b76fb4549dad61730dfb22560fd94 Signed-off-by: hyunho Signed-off-by: jusung son --- .../include/watchface-complication-provider.h | 76 +++++----------------- .../watchface-complication-provider.cc | 21 ++---- 2 files changed, 23 insertions(+), 74 deletions(-) diff --git a/watchface-complication-provider/include/watchface-complication-provider.h b/watchface-complication-provider/include/watchface-complication-provider.h index 226c470..66c35f5 100644 --- a/watchface-complication-provider/include/watchface-complication-provider.h +++ b/watchface-complication-provider/include/watchface-complication-provider.h @@ -69,8 +69,6 @@ void _watchface_complication_provider_update_requested_cb( int num = rand(); if (type == WATCHFACE_COMPLICATION_TYPE_SHORT_TEXT) { - watchface_complication_provider_data_set_type(shared_data, - WATCHFACE_COMPLICATION_TYPE_SHORT_TEXT); if (strcmp(provider_id, AIR_POLLUTION_PROVIDER_ID) == 0) { snprintf(num_str, sizeof(num_str), "air %d", num % 200); watchface_complication_provider_data_set_short_text( @@ -280,41 +278,6 @@ int watchface_complication_provider_setup_get_context(app_control_h handle, bundle **context); /** - * @brief Sets shared data type. - * @details Developer can set different set of data for shared data depends on data type. - * WATCHFACE_COMPLICATION_TYPE_SHORT_TEXT : short text, icon, title, extra - * WATCHFACE_COMPLICATION_TYPE_LONG_TEXT : long text, icon, title, extra - * WATCHFACE_COMPLICATION_TYPE_RANGED_VALUE : short text, icon, title, current, min, max, extra - * WATCHFACE_COMPLICATION_TYPE_TIME : time, short text, icon, extra - * WATCHFACE_COMPLICATION_TYPE_ICON : icon_path, extra - * WATCHFACE_COMPLICATION_TYPE_IMAGE : image_path, extra - * @since_tizen 5.0 - * @param[in] shared_data The data which will be shared with watch application - * @param[in] type The data type of shared_data - * @return #WATCHFACE_COMPLICATION_ERROR_NONE on success, - * otherwise an error code (see #watchface_complication_error_e) on failure - * @retval #WATCHFACE_COMPLICATION_ERROR_NONE Successful - * @retval #WATCHFACE_COMPLICATION_ERROR_OUT_OF_MEMORY Out of memory - * @retval #WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #WATCHFACE_COMPLICATION_ERROR_IO_ERROR I/O error - * @retval #WATCHFACE_COMPLICATION_ERROR_NOT_SUPPORTED Not supported - * @see watchface_complication_type_e - * @par Sample code: - * @code -#include -void _watchface_complication_provider_update_requested_cb(const char *provider_id, - const char *req_appid, watchface_complication_type_e type, - const bundle *context, bundle *shared_data, void *user_data) -{ - watchface_complication_provider_data_set_type(shared_data, WATCHFACE_COMPLICATION_TYPE_SHORT_TEXT); - // Sets short text type data. -} - * @endcode - */ -int watchface_complication_provider_data_set_type(bundle *shared_data, - watchface_complication_type_e type); - -/** * @brief Sets short text data for shared data. * @since_tizen 5.0 * @remarks @a short_text data can be added only for #WATCHFACE_COMPLICATION_TYPE_SHORT_TEXT, @@ -329,7 +292,6 @@ int watchface_complication_provider_data_set_type(bundle *shared_data, * @retval #WATCHFACE_COMPLICATION_ERROR_IO_ERROR I/O error * @retval #WATCHFACE_COMPLICATION_ERROR_NOT_SUPPORTED Not supported * @see watchface_complication_type_e - * @see watchface_complication_provider_data_set_type() * @par Sample code: * @code #include @@ -337,8 +299,8 @@ void _watchface_complication_provider_update_requested_cb(const char *provider_i const char *req_appid, watchface_complication_type_e type, const bundle *context, bundle *shared_data, void *user_data) { - watchface_complication_provider_data_set_type(shared_data, WATCHFACE_COMPLICATION_TYPE_SHORT_TEXT); - watchface_complication_provider_data_set_short_text(shared_data, "text data"); + if (type == WATCHFACE_COMPLICATION_TYPE_SHORT_TEXT) + watchface_complication_provider_data_set_short_text(shared_data, "text data"); } * @endcode */ @@ -359,7 +321,6 @@ int watchface_complication_provider_data_set_short_text(bundle *shared_data, * @retval #WATCHFACE_COMPLICATION_ERROR_IO_ERROR I/O error * @retval #WATCHFACE_COMPLICATION_ERROR_NOT_SUPPORTED Not supported * @see watchface_complication_type_e - * @see watchface_complication_provider_data_set_type() * @par Sample code: * @code #include @@ -367,8 +328,8 @@ void _watchface_complication_provider_update_requested_cb(const char *provider_i const char *req_appid, watchface_complication_type_e type, const bundle *context, bundle *shared_data, void *user_data) { - watchface_complication_provider_data_set_type(shared_data, WATCHFACE_COMPLICATION_TYPE_LONG_TEXT); - watchface_complication_provider_data_set_long_text(shared_data, "long text data"); + if (type == WATCHFACE_COMPLICATION_TYPE_LONG_TEXT) + watchface_complication_provider_data_set_long_text(shared_data, "long text data"); } * @endcode */ @@ -390,7 +351,6 @@ int watchface_complication_provider_data_set_long_text(bundle *shared_data, * @retval #WATCHFACE_COMPLICATION_ERROR_IO_ERROR I/O error * @retval #WATCHFACE_COMPLICATION_ERROR_NOT_SUPPORTED Not supported * @see watchface_complication_type_e - * @see watchface_complication_provider_data_set_type() * @par Sample code: * @code #include @@ -398,8 +358,8 @@ void _watchface_complication_provider_update_requested_cb(const char *provider_i const char *req_appid, watchface_complication_type_e type, const bundle *context, bundle *shared_data, void *user_data) { - watchface_complication_provider_data_set_type(shared_data, WATCHFACE_COMPLICATION_TYPE_LONG_TEXT); - watchface_complication_provider_data_set_title(shared_data, "title"); + if (type == WATCHFACE_COMPLICATION_TYPE_SHORT_TEXT) + watchface_complication_provider_data_set_title(shared_data, "title"); } * @endcode */ @@ -420,7 +380,6 @@ int watchface_complication_provider_data_set_title(bundle *shared_data, * @retval #WATCHFACE_COMPLICATION_ERROR_IO_ERROR I/O error * @retval #WATCHFACE_COMPLICATION_ERROR_NOT_SUPPORTED Not supported * @see watchface_complication_type_e - * @see watchface_complication_provider_data_set_type() * @par Sample code: * @code #include @@ -430,9 +389,10 @@ void _watchface_complication_provider_update_requested_cb(const char *provider_i { time_t seconds; - seconds = time(NULL); - watchface_complication_provider_data_set_type(shared_data, WATCHFACE_COMPLICATION_TYPE_TIME); - watchface_complication_provider_data_set_timestamp(shared_data, seconds); + if (type == WATCHFACE_COMPLICATION_TYPE_TIME) { + seconds = time(NULL); + watchface_complication_provider_data_set_timestamp(shared_data, seconds); + } } * @endcode */ @@ -453,7 +413,6 @@ int watchface_complication_provider_data_set_timestamp(bundle *shared_data, * @retval #WATCHFACE_COMPLICATION_ERROR_IO_ERROR I/O error * @retval #WATCHFACE_COMPLICATION_ERROR_NOT_SUPPORTED Not supported * @see watchface_complication_type_e - * @see watchface_complication_provider_data_set_type() * @par Sample code: * @code #include @@ -461,8 +420,8 @@ void _watchface_complication_provider_update_requested_cb(const char *provider_i const char *req_appid, watchface_complication_type_e type, const bundle *context, bundle *shared_data, void *user_data) { - watchface_complication_provider_data_set_type(shared_data, WATCHFACE_COMPLICATION_TYPE_IMAGE); - watchface_complication_provider_data_set_image_path(shared_data, "path"); + if (type == WATCHFACE_COMPLICATION_TYPE_IMAGE) + watchface_complication_provider_data_set_image_path(shared_data, "path"); } * @endcode */ @@ -485,7 +444,6 @@ int watchface_complication_provider_data_set_image_path(bundle *shared_data, * @retval #WATCHFACE_COMPLICATION_ERROR_IO_ERROR I/O error * @retval #WATCHFACE_COMPLICATION_ERROR_NOT_SUPPORTED Not supported * @see watchface_complication_type_e - * @see watchface_complication_provider_data_set_type() * @par Sample code: * @code #include @@ -493,8 +451,8 @@ void _watchface_complication_provider_update_requested_cb(const char *provider_i const char *req_appid, watchface_complication_type_e type, const bundle *context, bundle *shared_data, void *user_data) { - watchface_complication_provider_data_set_type(shared_data, WATCHFACE_COMPLICATION_TYPE_RANGED_VALUE); - watchface_complication_provider_data_set_ranged_value(shared_data, 50.0, 0.0, 100.0); + if (type == WATCHFACE_COMPLICATION_TYPE_RANGED_VALUE) + watchface_complication_provider_data_set_ranged_value(shared_data, 50.0, 0.0, 100.0); } * @endcode */ @@ -516,7 +474,6 @@ int watchface_complication_provider_data_set_ranged_value(bundle *shared_data, * @retval #WATCHFACE_COMPLICATION_ERROR_IO_ERROR I/O error * @retval #WATCHFACE_COMPLICATION_ERROR_NOT_SUPPORTED Not supported * @see watchface_complication_type_e - * @see watchface_complication_provider_data_set_type() * @par Sample code: * @code #include @@ -524,8 +481,8 @@ void _watchface_complication_provider_update_requested_cb(const char *provider_i const char *req_appid, watchface_complication_type_e type, const bundle *context, bundle *shared_data, void *user_data) { - watchface_complication_provider_data_set_type(shared_data, WATCHFACE_COMPLICATION_TYPE_ICON); - watchface_complication_provider_data_set_icon_path(shared_data, "path"); + if (type == WATCHFACE_COMPLICATION_TYPE_ICON) + watchface_complication_provider_data_set_icon_path(shared_data, "path"); } * @endcode */ @@ -546,7 +503,6 @@ int watchface_complication_provider_data_set_icon_path(bundle *shared_data, * @retval #WATCHFACE_COMPLICATION_ERROR_IO_ERROR I/O error * @retval #WATCHFACE_COMPLICATION_ERROR_NOT_SUPPORTED Not supported * @see watchface_complication_type_e - * @see watchface_complication_provider_data_set_type() * @par Sample code: * @code #include diff --git a/watchface-complication-provider/watchface-complication-provider.cc b/watchface-complication-provider/watchface-complication-provider.cc index c36bfb7..1f25d55 100644 --- a/watchface-complication-provider/watchface-complication-provider.cc +++ b/watchface-complication-provider/watchface-complication-provider.cc @@ -40,6 +40,9 @@ #define LOG_TAG "WATCHFACE_COMPLICATION" +static int _add_bundle_data(bundle* shared_data, const char* key, + const char* value); + using namespace watchface_complication; class CallbackInfo { public: @@ -51,6 +54,10 @@ class CallbackInfo { ComplicationType type, const Bundle* context, Bundle* shared_data) { const bundle* context_data = context->GetConstRaw(); + char num_str[32] = {0, }; + + snprintf(num_str, sizeof(num_str), "%d", type); + _add_bundle_data(shared_data->GetRaw(), DATA_TYPE_KEY, num_str); cb_(provider_id.c_str(), sender_appid.c_str(), static_cast(type), context_data, shared_data->GetRaw(), user_data_); @@ -334,20 +341,6 @@ static int _get_data_type(bundle* shared_data, return WATCHFACE_COMPLICATION_ERROR_NONE; } -extern "C" EXPORT_API int watchface_complication_provider_data_set_type( - bundle* shared_data, watchface_complication_type_e type) { - char num_str[32] = {0, }; - - if (shared_data == NULL || - !util::CheckComplicationType(static_cast(type))) { - LOGE("Invalid param"); - return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER; - } - - snprintf(num_str, sizeof(num_str), "%d", type); - return _add_bundle_data(shared_data, DATA_TYPE_KEY, num_str); -} - extern "C" EXPORT_API int watchface_complication_provider_data_set_title( bundle* shared_data, const char* title) { int ret; -- 2.7.4