Change db create logic for shortcut 65/72965/1 accepted/tizen/common/20160603.151121 accepted/tizen/ivi/20160606.050205 accepted/tizen/mobile/20160603.122454 submit/tizen/20160603.090144
authorjunkyu han <junkyu.han@samsung.com>
Fri, 3 Jun 2016 08:48:54 +0000 (17:48 +0900)
committerjunkyu han <junkyu.han@samsung.com>
Fri, 3 Jun 2016 08:48:54 +0000 (17:48 +0900)
Change-Id: Ifb51ad96583191d8d3a35dade15298d1e1222283

data/org.tizen.menu-screen.xml.in
src/db.c

index f43a00247e0a680f22f97b5b94109ece521db45c..e2cdfcfef6b93a73d39e55feaa8b766946bb0bc8 100644 (file)
@@ -14,5 +14,6 @@
                <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
                <privilege>http://tizen.org/privilege/packagemanager.admin</privilege>
                <privilege>http://tizen.org/privilege/notification</privilege>
+               <privilege>http://tizen.org/privilege/shortcut</privilege>
        </privileges>
 </manifest>
index 7fccec5e602ac7a7d0a51fbd980eec9bb5f2b28c..35813612a92e9078322193d86137701b900b1c45 100644 (file)
--- a/src/db.c
+++ b/src/db.c
@@ -79,22 +79,9 @@ HAPI menu_screen_error_e db_open(const char *db_file)
                return MENU_SCREEN_ERROR_OK;
        }
 
-       FILE *fp = fopen(db_file_path, "r");
-       if (fp) {
-               fclose(fp);
-               _D("Apps DB[%s] exist", db_file_path);
-               return MENU_SCREEN_ERROR_OK;
-       }
-
        ret = sqlite3_open(db_file_path, &db_info.db);
        if (ret != SQLITE_OK) {
-               _E("SQL error(%d) : %s", ret, db_file_path);
-       }
-
-       ret = sqlite3_exec(db_info.db, "PRAGMA journal_mode = PERSIST", NULL, NULL, &errMsg);
-       if (ret != SQLITE_OK) {
-               _E("SQL error(%d) : %s", ret, errMsg);
-               sqlite3_free(errMsg);
+               _E("sqlite3_open error : %s", sqlite3_errmsg(db_info.db));
                return MENU_SCREEN_ERROR_FAIL;
        }
 
@@ -103,8 +90,17 @@ HAPI menu_screen_error_e db_open(const char *db_file)
                _E("SQL error(%d) : %s", ret, errMsg);
                sqlite3_free(errMsg);
                return MENU_SCREEN_ERROR_FAIL;
+       } else {
+               _D("SQL result(%d) : %s", ret, errMsg);
+               _D("Create DB[%s] : [%s] OK", db_file, CREATE_APPS_DB_TABLE);
+
+               ret = sqlite3_exec(db_info.db, "PRAGMA journal_mode = WAL", NULL, NULL, &errMsg);
+               if (ret != SQLITE_OK) {
+                       _E("SQL error(%d) : %s", ret, errMsg);
+                       sqlite3_free(errMsg);
+                       return MENU_SCREEN_ERROR_FAIL;
+               }
        }
-       _D("Create DB[%s] : [%s] OK", db_file, CREATE_APPS_DB_TABLE);
 
        return MENU_SCREEN_ERROR_OK;
 }