"INSERT OR REPLACE INTO rua_history ("
" pkg_name, app_path, arg, launch_time,"
" instance_id, instance_name, icon, uri,"
- " image) "
- "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)";
+ " image, comp_id) "
+ "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
int r;
sqlite3_stmt *stmt;
int idx = 1;
__BIND_TEXT(db, stmt, idx++, rec->icon ? rec->icon : "");
__BIND_TEXT(db, stmt, idx++, rec->uri ? rec->uri : "");
__BIND_TEXT(db, stmt, idx++, rec->image ? rec->image : "");
+ __BIND_TEXT(db, stmt, idx++, rec->comp_id ? rec->comp_id : "");
r = sqlite3_step(stmt);
if (r != SQLITE_DONE) {
{
static const char query[] =
"UPDATE rua_history SET launch_time=? "
- "WHERE pkg_name=? AND instance_id=?";
+ "WHERE pkg_name=? AND comp_id=? AND instance_id=?";
int r;
sqlite3_stmt *stmt;
int idx = 1;
__BIND_INT(db, stmt, idx++, (int)rec->launch_time);
__BIND_TEXT(db, stmt, idx++, rec->pkg_name);
+ __BIND_TEXT(db, stmt, idx++, rec->comp_id);
__BIND_TEXT(db, stmt, idx++, rec->instance_id);
r = sqlite3_step(stmt);
r = __update_history(db, rec);
else
r = __insert_history(db, rec);
+ if (r == -1) {
+ LOGE("Failed insert or update history");
+ sqlite3_close_v2(db);
+ return -1;
+ }
r = rua_dbus_send_update_signal(ADD);
if (r == -1) {
return rua_usr_db_add_history(rec, getuid());
}
-static int __update_image(sqlite3 *db, const char *pkg_name,
+static int __update_image(sqlite3 *db, const char *pkg_name, const char *comp_id,
const char *instance_id, const char *image)
{
static const char query[] =
"UPDATE rua_history SET image=? "
- "WHERE pkg_name=? AND instance_id=?";
+ "WHERE pkg_name=? AND comp_id=? AND instance_id=?";
sqlite3_stmt *stmt;
int idx = 1;
int r;
__BIND_TEXT(db, stmt, idx++, image);
__BIND_TEXT(db, stmt, idx++, pkg_name);
+ __BIND_TEXT(db, stmt, idx++, comp_id ? comp_id : "");
__BIND_TEXT(db, stmt, idx++, instance_id ? instance_id : "");
r = sqlite3_step(stmt);
return 0;
}
-API int rua_usr_db_update_image(const char *pkg_name, const char *instance_id,
- const char *image, uid_t uid)
+API int rua_usr_db_update_image(const char *pkg_name, const char *comp_id,
+ const char *instance_id, const char *image, uid_t uid)
{
int r;
sqlite3 *db;
return -1;
}
- r = __update_image(db, pkg_name, instance_id, image);
+ r = __update_image(db, pkg_name, comp_id, instance_id, image);
if (r < 0) {
LOGE("Failed to update image - appid(%s)", pkg_name);
sqlite3_close_v2(db);
return r;
}
-API int rua_db_update_image(const char *pkg_name, const char *instance_id,
- const char *image)
+API int rua_db_update_image(const char *pkg_name, const char *comp_id,
+ const char *instance_id, const char *image)
{
- return rua_usr_db_update_image(pkg_name, instance_id, image, getuid());
+ return rua_usr_db_update_image(
+ pkg_name, comp_id, instance_id, image, getuid());
}