#include <glib.h>
#include <sys/stat.h>
#include <unistd.h>
+#include <thread>
#include <type_traits>
#include <app_control_internal.h>
LoggerE("app_manager_event_destroy failed, error: %d", ret);
}
}
+
+ // Calling order of reply_callback and result_callback of launchAppControl
+ // cannot be determined, reply_callback depends on application scenario, which
+ // cannot be predicted. Moreover reply_callback is optional and can be called or not,
+ // thus callback_data is relesed here at the end of application lifetime.
+ std::for_each(launch_app_control_set.begin(), launch_app_control_set.end(),
+ [](LaunchAppControlCallbackData* const& data) {
+ LoggerD("Releasing callback data: %p", data);
+ delete data;
+ });
}
void ApplicationManager::GetCurrentApplication(const std::string& app_id, picojson::object* out) {
picojson::value app_info = picojson::value(picojson::object());
picojson::object& app_info_obj = app_info.get<picojson::object>();
- ApplicationUtils::CreateApplicationInformation(handle, &app_info_obj);
+ utils::CreateApplicationInformation(handle, &app_info_obj);
pkgmgrinfo_appinfo_destroy_appinfo(handle);
picojson::value result = picojson::value(picojson::object());
const picojson::object& app_control_obj = control.get<picojson::object>();
app_control_h tmp_app_control = nullptr;
- auto result = ApplicationUtils::ApplicationControlToService(app_control_obj, &tmp_app_control);
+ auto result = utils::ApplicationControlToService(app_control_obj, &tmp_app_control);
std::unique_ptr<std::remove_pointer<app_control_h>::type, decltype(&app_control_destroy)>
app_control_ptr(tmp_app_control, &app_control_destroy);
reply_callback_id = reply.get<std::string>();
}
- struct LaunchAppControlCallbackData {
- ApplicationInstance* instance;
- std::shared_ptr<picojson::value> response;
- std::string reply_callback_id;
- }* launch_app_user_data = new (std::nothrow)
+ LaunchAppControlCallbackData* launch_app_user_data = new (std::nothrow)
LaunchAppControlCallbackData{&this->instance_, response, reply_callback_id};
if (!launch_app_user_data) {
if (APP_CONTROL_RESULT_SUCCEEDED == result) {
LoggerD("App started");
return_value_obj.insert(std::make_pair("data", picojson::value(picojson::array())));
- if (!ApplicationUtils::ServiceToApplicationControlDataArray(
+ if (!utils::ServiceToApplicationControlDataArray(
reply, &return_value_obj.find("data")->second.get<picojson::array>())) {
return_value_obj.erase("data");
}
}
Instance::PostMessage(callback_data->instance, return_value.serialize().c_str());
- delete callback_data;
+ // Calling order of reply_callback and result_callback cannot be determined,
+ // thus callback_data is not released here, but stored for release in destructor of
+ // ApplicationManager
};
}
LaunchAppControlCallbackData* callback_data =
static_cast<LaunchAppControlCallbackData*>(user_data);
- auto result = ApplicationUtils::TranslateAppControlError(launch_result);
+ auto result = utils::TranslateAppControlError(launch_result);
if (result.IsError()) {
LogAndReportError(result, &(callback_data->response->get<picojson::object>()));
Instance::PostMessage(callback_data->instance, callback_data->response->serialize().c_str());
- if (result.IsError() || (callback_data->reply_callback_id).empty()) {
- delete callback_data;
- }
+ // Calling order of reply_callback and result_callback cannot be determined,
+ // thus callback_data is not released here, but stored for release in destructor of
+ // ApplicationManager
};
/*
* New implementation, using app_control_send_launch_request_async makes only one attempt.
* If problems, such as failed application start occur, multiple attempts may solve the problem.
*/
- auto launch_result =
-
ApplicationUtils::TranslateAppControlError(static_cast<app_control_error_e>(app_control_send_launch_request_async(
+ auto launch_result = utils::TranslateAppControlError(
+ static_cast<app_control_error_e>(app_control_send_launch_request_async(
app_control_ptr.get(), result_callback, reply_callback, launch_app_user_data)));
if (launch_result.IsError()) {
delete launch_app_user_data;
AsyncResponse(launch_result, &response);
} else {
- LoggerD("App launched");
+ // Calling order of reply_callback and result_callback cannot be determined,
+ // reply_callback depends on application scenario, which cannot be predicted.
+ // Moreover reply_callback is optional and can be called or not,
+ // thus callback_data is stored for releasing in destructor of ApplicationManager
+ // at the end of application lifetime.
+ launch_app_control_set.insert(launch_app_user_data);
+ LoggerD("App launched, data %p stored for later release", launch_app_user_data);
}
}
-
namespace {
PlatformResult TranslateLaunchError(app_control_error_e return_code) {
ScopeLogger();
- auto result = ApplicationUtils::TranslateAppControlError(return_code);
+ auto result = utils::TranslateAppControlError(return_code);
if (ErrorCode::SECURITY_ERR == result.error_code()) {
result = PlatformResult(ErrorCode::UNKNOWN_ERR, "Unknown error.");
}
};
/*
- * TODO: Observe how often app_control_send_launch_request_async tries to launch the application.
+ * TODO: Observe how often app_control_send_resume_request tries to launch the application.
* Previous implementation, using synchronous app_control_send_launch_request,
* tries to launch the application 3 times, before reporting an error.
- * New implementation, using app_control_send_launch_request_async makes only one attempt.
+ * New implementation, using app_control_send_resume_request makes only one attempt.
* If problems, such as failed application start occur, multiple attempts may solve the problem.
*/
- auto launch_result = TranslateLaunchError(static_cast<app_control_error_e>(app_control_send_launch_request_async(
- app_control_ptr.get(), result_callback, nullptr, launch_user_data)));
+ auto launch_result = TranslateLaunchError(static_cast<app_control_error_e>(
+ app_control_send_resume_request(app_control_ptr.get(), result_callback, launch_user_data)));
if (launch_result.IsError()) {
delete launch_user_data;
const picojson::object& app_control_obj = control.get<picojson::object>();
app_control_h app_control = nullptr;
- result = ApplicationUtils::ApplicationControlToService(app_control_obj, &app_control);
+ result = utils::ApplicationControlToService(app_control_obj, &app_control);
std::shared_ptr<std::remove_pointer<app_control_h>::type> app_control_ptr(
app_control, &app_control_destroy); // automatically release the memory
picojson::array* array = static_cast<picojson::array*>(user_data);
array->push_back(picojson::value(picojson::object()));
- ApplicationUtils::CreateApplicationInformation(handle,
- &array->back().get<picojson::object>());
+ utils::CreateApplicationInformation(handle, &array->back().get<picojson::object>());
pkgmgrinfo_appinfo_destroy_appinfo(handle);
}
picojson::array* array = static_cast<picojson::array*>(user_data);
array->push_back(picojson::value(picojson::object()));
- if (!ApplicationUtils::CreateApplicationContext(app_context,
- &array->back().get<picojson::object>())) {
+ if (!utils::CreateApplicationContext(app_context, &array->back().get<picojson::object>())) {
array->pop_back();
return false;
}
}
picojson::value result = picojson::value(picojson::object());
-
ApplicationUtils::CreateApplicationContext(pid, app_id, &result.get<picojson::object>());
+
utils::CreateApplicationContext(pid, app_id, &result.get<picojson::object>());
ReportSuccess(result, *out);
}
picojson::array* array = static_cast<picojson::array*>(user_data);
array->push_back(picojson::value(picojson::object()));
- ApplicationUtils::CreateApplicationInformation(handle,
- &array->back().get<picojson::object>());
+ utils::CreateApplicationInformation(handle, &array->back().get<picojson::object>());
return 0;
};
}
picojson::value result = picojson::value(picojson::object());
-
ApplicationUtils::CreateApplicationInformation(handle, &result.get<picojson::object>());
+
utils::CreateApplicationInformation(handle, &result.get<picojson::object>());
pkgmgrinfo_appinfo_destroy_appinfo(handle);
ReportSuccess(result, *out);
picojson::array* array = static_cast<picojson::array*>(user_data);
array->push_back(picojson::value(picojson::object()));
- ApplicationUtils::CreateApplicationCertificate(cert_name, cert_value,
-
&array->back().get<picojson::object>());
+ utils::CreateApplicationCertificate(cert_name, cert_value,
+ &array->back().get<picojson::object>());
return true;
};
picojson::array* array = static_cast<picojson::array*>(user_data);
array->push_back(picojson::value(picojson::object()));
- ApplicationUtils::CreateApplicationMetaData(meta_key, meta_value,
- &array->back().get<picojson::object>());
+ utils::CreateApplicationMetaData(meta_key, meta_value, &array->back().get<picojson::object>());
return 0;
};
continue;
}
auto info = data_obj.insert(std::make_pair(kData, picojson::value(picojson::object())));
- ApplicationUtils::CreateApplicationInformation(
- handle, &info.first->second.get<picojson::object>());
+ utils::CreateApplicationInformation(handle, &info.first->second.get<picojson::object>());
pkgmgrinfo_appinfo_destroy_appinfo(handle);
} break;
case Event::kUninstalled:
return;
}
- ret = package_info_foreach_app_from_package(package_info, PACKAGE_INFO_ALLAPP,
+ ret = package_info_foreach_app_from_package(package_info, PACKAGE_INFO_APP_COMPONENT_TYPE_ALL,
ApplicationIdCallback, this);
if (PACKAGE_MANAGER_ERROR_NONE != ret) {
LoggerE("Failed to get application IDs: %d (%s)", ret, get_error_message(ret));
projects / platform / core / api / webapi-plugins.git / blobdiff