[privacy setting] Modify to display packages according to the new privacy whitelist API

- It refers to https://review.tizen.org/gerrit/#/c/106321/

Change-Id: Id9631ce26fd328bdf8cdb1f42b697d2cd5dd8ea6
Signed-off-by: Yunjin Lee <yunjin-.lee@samsung.com>

diff --git a/ui/src/privacy_guard_package_list_view.c b/ui/src/privacy_guard_package_list_view.c
index 7a5b8814130a8cbc5b95a422c3f02ba26b1a1de7..7b8ad3df165c41f5acb7541be0cc3cce6927ba1d 100644 (file)
--- a/ui/src/privacy_guard_package_list_view.c
+++ b/ui/src/privacy_guard_package_list_view.c
@@ -73,9 +73,8 @@ static char* _gl_text_get_cb(void *data, Evas_Object *obj, const char *part)
 {
        pg_item_data_s *id = data;
 
-       if (!strcmp(part, "elm.text")) {
+       if (!strcmp(part, "elm.text"))
                return strdup(id->label);
-       }
 
        if (!strcmp(part, "elm.text.sub") && id->index != 0) {
                if (id->description == NULL)
@@ -139,7 +138,7 @@ void create_privacy_guard_package_list_view(struct app_data_s* ad)
        Evas_Object *genlist = NULL;
 
        /* Get privacy guard data (pkg, count, policy) list by a privacy */
-       if (pg_data_list!= NULL) {
+       if (pg_data_list != NULL) {
                g_list_free(pg_data_list);
                pg_data_list = NULL;
        }
@@ -239,7 +238,7 @@ void create_privacy_guard_package_list_view(struct app_data_s* ad)
                                localtime_r(&data->time, &timeinfo);
                                char buf[32];
                                LOGD("time: %s", asctime_r(&timeinfo, buf));
-                               strftime (str_time, 32, "%d/%m/%Y %I:%M %p", &timeinfo);
+                               strftime(str_time, 32, "%d/%m/%Y %I:%M %p", &timeinfo);
                                char *str_count = dgettext("privacy-setting", "IDS_CLD_BODY_PD_TIMES");
                                snprintf(str_temp, sizeof(str_temp), str_count, data->count);
                                snprintf(str_label, sizeof(str_label), "<font_size=27>%s <font color=#3DB9CCFF>%s</font></font_size>", str_time, str_temp);
@@ -287,7 +286,7 @@ void create_privacy_guard_package_list_view(struct app_data_s* ad)
        /* TODO: change nf_it_title to proper DID : use dgettext() */
        char* privacy_display = NULL;
        int ret = privilege_info_get_privacy_display(ad->privacy, &privacy_display);
-    log_if(ret != PRVMGR_ERR_NONE, 1, "privacy_display = %s", privacy_display);
+       log_if(ret != PRVMGR_ERR_NONE, 1, "privacy_display = %s", privacy_display);
 
        /* Push naviframe item */
        Elm_Object_Item *nf_it = elm_naviframe_item_push(ad->nf, privacy_display, common_back_btn_add(ad), NULL, genlist, NULL);

diff --git a/ui/src/privacy_package_list_view.c b/ui/src/privacy_package_list_view.c
index 795708d306c8b707b1d5750e1ac8acb7978e01a3..e043235e2eaba7fecf13dccb26551641a8f2019b 100644 (file)
--- a/ui/src/privacy_package_list_view.c
+++ b/ui/src/privacy_package_list_view.c
@@ -35,10 +35,9 @@ static GList* pkg_list;
 static GList* privilege_list;
 static GList* pkg_data_list;
 static char* privacy_display = NULL;
-static bool is_location = false;
+static char* privacy_name = NULL;
 
 #define DEFAULT_ICON_PATH _TZ_SYS_RO_APP"/org.tizen.privacy-setting/res/icon/default.png"
-#define LOCATION_PRIVACY "http://tizen.org/privacy/location"
 #define UIDMAXLEN 10
 
 static void privacy_package_check_changed_cb(void *data, Evas_Object *obj, void *event_info);
@@ -307,12 +306,10 @@ static int pkg_list_cb(pkgmgrinfo_pkginfo_h filter_handle, void *user_data)
        ret = pkgmgrinfo_pkginfo_get_pkginfo(pkgid, &pkg_handle);
        return_if(ret != PMINFO_R_OK, , -1, "pkgmgrinfo_pkginfo_get_pkginfo failed");
 
-       /* See if the package is preloaded */
-       bool is_preload = false;
-       ret = pkgmgrinfo_pkginfo_is_preload(pkg_handle, &is_preload);
-       return_if(ret != PMINFO_R_OK, pkgmgrinfo_pkginfo_destroy_pkginfo(pkg_handle), -1, "pkgmgrinfo_pkginfo_is_preload failed");
+       /* See if the package is user-settable */
+       int is_settable = privilege_info_is_user_settable(pkgid, privacy_name);
 
-       if (!is_preload || is_location) {
+       if (is_settable == 1) {
 
                pkg_list = g_list_append(pkg_list, pkgidd);
 
@@ -412,11 +409,8 @@ void create_privacy_package_list_view(struct app_data_s* ad)
 {
        /* Add Evas_Object */
        Evas_Object *genlist;
+       privacy_name = ad->privacy;
 
-       if (!strcmp(ad->privacy, LOCATION_PRIVACY))
-               is_location = true;
-       else
-               is_location = false;
        log_if(privilege_info_get_privacy_display(ad->privacy, &privacy_display) != PRVMGR_ERR_NONE, 1, "Couldn't get privacy display : %s", ad->privacy);
 
        /* Get privilege list by privacy */