#endif
#define LOG_TAG "STICKER_PARSER"
-#define STICKER_DIRECTORY tzplatform_mkpath(TZ_SYS_SHARE, "sticker-data")
-#define STICKER_INFO_CREATE_TABLE "CREATE TABLE IF NOT EXISTS sticker_info(sticker_info_id INTEGER PRIMARY KEY AUTOINCREMENT, app_id TEXT NOT NULL, type INTEGER NOT NULL, uri TEXT NOT NULL, thumbnail TEXT, description TEXT, group_name TEXT NOT NULL, date TEXT NOT NULL)"
+#define STICKER_DIRECTORY "/opt/usr/share/sticker-data"
+#define STICKER_INFO_CREATE_TABLE "CREATE TABLE IF NOT EXISTS sticker_info(sticker_info_id INTEGER PRIMARY KEY AUTOINCREMENT, app_id TEXT NOT NULL, type INTEGER NOT NULL, uri TEXT NOT NULL, thumbnail TEXT, description TEXT, group_name TEXT NOT NULL, date TEXT NOT NULL, display_type INTEGER)"
#define STICKER_KEYWORD_INFO_CREATE_TABLE "CREATE TABLE IF NOT EXISTS sticker_keyword_info(keyword_id INTEGER PRIMARY KEY AUTOINCREMENT, sticker_info_id INTEGER, keyword TEXT NOT NULL, FOREIGN KEY (sticker_info_id) REFERENCES sticker_info(sticker_info_id) ON DELETE CASCADE)"
#define STICKER_WHITELIST_INFO_CREATE_TABLE "CREATE TABLE IF NOT EXISTS sticker_whitelist_info(whitelist_id INTEGER PRIMARY KEY AUTOINCREMENT, provider_id TEXT NOT NULL, consumer_id TEXT NOT NULL)"
+#define STICKER_RECENT_HISTORY_INFO_CREATE_TABLE "CREATE TABLE IF NOT EXISTS sticker_recent_history_info(history_id INTEGER PRIMARY KEY AUTOINCREMENT, sticker_info_id INTEGER, count INTEGER NOT NULL, timestamp TEXT NOT NULL, FOREIGN KEY (sticker_info_id) REFERENCES sticker_info(sticker_info_id) ON DELETE CASCADE)"
#define UIFW_ID 502
#define APPFW_ID 301
#define MAX_ERROR_BUFFER 256
goto cleanup;
}
+ ret = sqlite3_exec(db, STICKER_RECENT_HISTORY_INFO_CREATE_TABLE, NULL, NULL, &err);
+ if (ret != SQLITE_OK) {
+ LOGE("Failed to create sticker_recent_history_info table : %s", err);
+ goto cleanup;
+ }
+
is_corrupted = FALSE;
cleanup:
goto cleanup;
}
+ ret = sqlite3_exec(db, STICKER_RECENT_HISTORY_INFO_CREATE_TABLE, NULL, NULL, &err);
+ if (ret != SQLITE_OK) {
+ LOGE("Failed to create sticker_recent_history_info table : %s", err);
+ goto cleanup;
+ }
+
ret = sqlite3_exec(db, "PRAGMA journal_mode = WAL", NULL, NULL, &err);
if (ret != SQLITE_OK) {
LOGE("Failed to set journal_mode : %s", err);
return ret;
}
-static char* __convert_sticker_uri(const char *uri, const char *appid, const char *app_path)
+static char* __convert_sticker_uri(char *uri, const char *appid, const char *app_path)
{
int ret;
- char *rel_path = strdup(uri);
- __remove_app_path(rel_path, app_path);
- int len = strlen(STICKER_DIRECTORY) + strlen(appid) + strlen(rel_path) + 2;
+ __remove_app_path(uri, app_path);
+ int len = strlen(STICKER_DIRECTORY) + strlen(appid) + strlen(uri) + 2;
char *new_path = (char *)calloc(len, sizeof(char));
- if (new_path == NULL) {
- free(rel_path);
- rel_path = NULL;
+ if (new_path == NULL)
return NULL;
- }
- snprintf(new_path, len, "%s/%s%s",STICKER_DIRECTORY, appid, rel_path);
+ snprintf(new_path, len, "%s/%s%s",STICKER_DIRECTORY, appid, uri);
if (access(new_path, F_OK) == 0) {
LOGE("sticker file already exists");
LOGE("failed to change ownership");
cleanup:
- free(rel_path);
- rel_path = NULL;
-
if (ret == 0) {
return new_path;
} else {
}
}
-static void __insert_sticker_info(const char *app_id, int type, const char *uri, const char *group, const char *thumbnail, const char *description)
+static void __insert_sticker_info(const char *app_id, int type, const char *uri, const char *group, const char *thumbnail, const char *description, int disp_type)
{
int ret;
sqlite3 *db = NULL;
if (!db)
return;
- ret = sqlite3_prepare_v2(db, "INSERT INTO sticker_info (app_id, type, uri, thumbnail, description, group_name, date) VALUES (?, ?, ?, ?, ?, ?, DateTime('now','localtime'))",-1, &stmt, NULL);
+ ret = sqlite3_prepare_v2(db, "INSERT INTO sticker_info (app_id, type, uri, thumbnail, description, group_name, date, display_type) VALUES (?, ?, ?, ?, ?, ?, DateTime('now','localtime'), ?)",-1, &stmt, NULL);
if (ret == SQLITE_OK) {
sqlite3_bind_text(stmt, 1, app_id, -1, SQLITE_TRANSIENT);
sqlite3_bind_int(stmt, 2, type);
sqlite3_bind_text(stmt, 4, thumbnail, -1, SQLITE_TRANSIENT);
sqlite3_bind_text(stmt, 5, description, -1, SQLITE_TRANSIENT);
sqlite3_bind_text(stmt, 6, group, -1, SQLITE_TRANSIENT);
+ sqlite3_bind_int(stmt, 7, disp_type);
ret = sqlite3_step(stmt);
if (ret != SQLITE_OK && ret != SQLITE_DONE)
char *uri = NULL;
char *group = NULL;
char *description = NULL;
- char *thumbnail = NULL;
+ char *thumbnail_path = NULL;
char *uri_path = NULL;
parser = json_parser_new();
if (!group)
goto free_memory;
- thumbnail = __get_string_from_object(info_object, "thumbnail");
+ char *rel_thumbnail = __get_string_from_object(info_object, "thumbnail");
+ if (rel_thumbnail) {
+ if (rel_thumbnail[0] != '\0')
+ thumbnail_path = __convert_sticker_uri(rel_thumbnail, appid, app_path);
+
+ free(rel_thumbnail);
+ }
+
description = __get_string_from_object(info_object, "description");
+ int disp_type = __get_int_from_object(info_object, "display_type");
JsonArray *keyword_arr = json_object_get_array_member(info_object, "keyword");
int keyword_arr_len = json_array_get_length(keyword_arr);
char *new_uri = __convert_sticker_uri(uri, appid, app_path);
if (!new_uri)
goto free_memory;
- __insert_sticker_info(appid, type, new_uri, group, thumbnail, description);
+ __insert_sticker_info(appid, type, new_uri, group, thumbnail_path, description, disp_type);
if (new_uri) {
free(new_uri);
uri_path = NULL;
goto free_memory;
}
- __insert_sticker_info(appid, type, new_uri, group, thumbnail, description);
+ __insert_sticker_info(appid, type, new_uri, group, thumbnail_path, description, disp_type);
free(new_uri);
new_uri = NULL;
}
}
} else {
- __insert_sticker_info(appid, type, uri, group, thumbnail, description);
+ __insert_sticker_info(appid, type, uri, group, thumbnail_path, description, disp_type);
}
for (int j = 0; j < keyword_arr_len; j++) {
group = NULL;
}
- if (thumbnail) {
- free(thumbnail);
- thumbnail = NULL;
+ if (thumbnail_path) {
+ free(thumbnail_path);
+ thumbnail_path = NULL;
}
if (description) {