From: ByungWoo Lee Date: Fri, 16 Jan 2015 07:12:43 +0000 (+0900) Subject: [package] Remove unused code X-Git-Tag: submit/tizen_tv/20150603.064601~1^2~615 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e19b84333aa431785c9eb96ffdf8ca71336a857d;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git [package] Remove unused code Change-Id: Ifa03b1cb8e0abd2326c1df034bf7061f8dba68b0 --- diff --git a/src/package/package_info_provider.h b/src/package/package_info_provider.h index e2910fde..10c6e645 100644 --- a/src/package/package_info_provider.h +++ b/src/package/package_info_provider.h @@ -19,7 +19,16 @@ class PackageInfoProvider { PackageInfoProvider(); virtual ~PackageInfoProvider(); + /* out["status"] = "success" or "error" + * If status is "success", then the result(picojson::value) will be stored in out["informationArray"]. + * If status is "error", then the error(picojson::value) will be stored in out["error"]. + */ static void GetPackagesInfo(picojson::object& out); + + /* out["status"] = "success" or "error" + * If status is "success", then the result(picojson::value) will be stored in out["result"]. + * If status is "error", then the error(picojson::value) will be stored in out["error"]. + */ static void GetPackageInfo(picojson::object& out); static void GetPackageInfo(const char* packageId, picojson::object& out); static bool GetPackageInfo(const pkgmgrinfo_pkginfo_h info, picojson::object& out); diff --git a/src/package/package_instance.cc b/src/package/package_instance.cc index c202dbdc..b88e633f 100644 --- a/src/package/package_instance.cc +++ b/src/package/package_instance.cc @@ -25,7 +25,7 @@ const std::string kPrivilegePackageInfo = "http://tizen.org/privilege/package.in using namespace common; using namespace extension::package; -typedef enum PackageThreadWork { +typedef enum _PackageThreadWorkType { PackageThreadWorkNone = 0, PackageThreadWorkGetPackagesInfo, } PackageThreadWorkType; @@ -45,31 +45,6 @@ class PackageUserData { }; typedef std::shared_ptr PackageUserDataPtr; -/* -static void ReplyAsync(PackageInstance* instance, PackageThreadWorkType cbfunc, - int callbackId, picojson::object& param) { - LoggerD("Enter"); - - param["callbackId"] = picojson::value(static_cast(callbackId)); - - picojson::value result = picojson::value(param); - instance->PostMessage(result.serialize().c_str()); -} -*/ - -/* -static gboolean PackageIdleCb(gpointer data) { - LoggerD("Enter"); - PackageUserData* userData = static_cast(data); - - picojson::object param; - ReplyAsync(userData->instance, PackageThreadWorkGetPackagesInfo, userData->callbackId, param); - delete userData; - - return G_SOURCE_REMOVE; -} -*/ - static void* PackageThreadWork(const PackageUserDataPtr& userData) { LoggerD("Enter"); @@ -141,6 +116,45 @@ static void PackageRequestCb( } } +static void PackageListenerCb( + const char *type, const char *package, package_manager_event_type_e event_type, + package_manager_event_state_e event_state, int progress, package_manager_error_e error, void *user_data) { + LoggerD("Enter"); + + PackageInstance* instance = static_cast(user_data); + if(!instance) { + LoggerE("instance is NULL"); + return; + } + + if(error != PACKAGE_MANAGER_ERROR_NONE) { + LoggerE("Failed"); + return; + } + + picojson::object param; + if(event_type == PACKAGE_MANAGER_EVENT_TYPE_INSTALL && event_state == PACKAGE_MANAGER_EVENT_STATE_COMPLETED) { + LoggerD("[Installed]"); + param["status"] = picojson::value("installed"); + picojson::object info; + PackageInfoProvider::GetPackageInfo(package, info); + param["info"] = picojson::value(info["result"]); + instance->InvokeListener(param); + } else if(event_type == PACKAGE_MANAGER_EVENT_TYPE_UNINSTALL && event_state == PACKAGE_MANAGER_EVENT_STATE_COMPLETED) { + LoggerD("[Uninstalled]"); + param["status"] = picojson::value("uninstalled"); + param["id"] = picojson::value(std::string(package)); + instance->InvokeListener(param); + } else if(event_type == PACKAGE_MANAGER_EVENT_TYPE_UPDATE && event_state == PACKAGE_MANAGER_EVENT_STATE_COMPLETED) { + LoggerD("[Updated]"); + param["status"] = picojson::value("updated"); + picojson::object info; + PackageInfoProvider::GetPackageInfo(package, info); + param["info"] = picojson::value(info["result"]); + instance->InvokeListener(param); + } +} + PackageInstance::PackageInstance() { LoggerD("Enter"); @@ -315,45 +329,6 @@ void PackageInstance::PackageManagerGetpackageinfo(const picojson::value& args, } } -static void PackageListenerCb( - const char *type, const char *package, package_manager_event_type_e event_type, - package_manager_event_state_e event_state, int progress, package_manager_error_e error, void *user_data) { - LoggerD("Enter"); - - PackageInstance* instance = static_cast(user_data); - if(!instance) { - LoggerE("instance is NULL"); - return; - } - - if(error != PACKAGE_MANAGER_ERROR_NONE) { - LoggerE("Failed"); - return; - } - - picojson::object param; - if(event_type == PACKAGE_MANAGER_EVENT_TYPE_INSTALL && event_state == PACKAGE_MANAGER_EVENT_STATE_COMPLETED) { - LoggerD("[Installed]"); - param["status"] = picojson::value("installed"); - picojson::object info; - PackageInfoProvider::GetPackageInfo(package, info); - param["info"] = picojson::value(info["result"]); - instance->InvokeListener(param); - } else if(event_type == PACKAGE_MANAGER_EVENT_TYPE_UNINSTALL && event_state == PACKAGE_MANAGER_EVENT_STATE_COMPLETED) { - LoggerD("[Uninstalled]"); - param["status"] = picojson::value("uninstalled"); - param["id"] = picojson::value(std::string(package)); - instance->InvokeListener(param); - } else if(event_type == PACKAGE_MANAGER_EVENT_TYPE_UPDATE && event_state == PACKAGE_MANAGER_EVENT_STATE_COMPLETED) { - LoggerD("[Updated]"); - param["status"] = picojson::value("updated"); - picojson::object info; - PackageInfoProvider::GetPackageInfo(package, info); - param["info"] = picojson::value(info["result"]); - instance->InvokeListener(param); - } -} - void PackageInstance::InvokeListener(picojson::object& param) { LoggerD("Enter");