Queue data for multiple requests while single mode launching

- It launches only once for single mode. If another request comes while
it's running, store the next and show them in order. And returns all responses
when popup dies as it has been.

- If the number of requested popup exceed max popup number then ignore
new request. In normal situation, it will not exceed the max popup
number because the askuser throw exception for duplicated requests.

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

diff --git a/common/include/common_utils.h b/common/include/common_utils.h
index 44d705e11d026d935008379c1a934e394cc1b8a6..50ae4bf678db4feac2413afc55e49138d44193d3 100644 (file)
--- a/common/include/common_utils.h
+++ b/common/include/common_utils.h
@@ -61,11 +61,25 @@ extern "C" {
 #define HOME_KEY "XF86Home"
 #define BACK_KEY "XF86Back"
 
+/* The number of privacy groups.
+ * Askuser determine duplicated requests and will not pass them to popup
+ * hence assume the number of requests will not exceed the number of privacy groups. */
+#define MAX_POPUP_NUM 13
+
 typedef struct {
        char* privacy;
        ppm_popup_response_e response;
 } privacy_data_s;
 
+typedef struct _popup_data_s {
+       int popup_id;
+       char* launch_type;
+
+       GList* privacy_list;
+       int privacy_num;
+       int privacy_idx;
+} popup_data_s;
+
 typedef struct _app_data_s {
        Evas_Object *win;
        Evas_Object *conform;
@@ -75,17 +89,15 @@ typedef struct _app_data_s {
        Evas_Object *btn_r;
        Evas_Object *ao_contents;
 
-       app_control_h caller;
        char* caller_pkgid;
 
        bool all_responded;
-       char* launch_type;
        app_control_launch_mode_e mode;
-       int popup_id;
+       int popup_num;
+       int popup_idx;
+
+       popup_data_s popups[MAX_POPUP_NUM];
 
-       GList* privacy_list;
-       int privacy_num;
-       int privacy_idx;
 } app_data_s;
 
 privacy_data_s* new_privacy_data();
@@ -93,6 +105,8 @@ privacy_data_s* new_privacy_data();
 void init_app_data(app_data_s *ad);
 void free_app_data(app_data_s *ad);
 
+void init_popup_data(popup_data_s *pd);
+
 #ifdef _cplusplus
 }
 #endif

diff --git a/common/src/common_utils.c b/common/src/common_utils.c
index ab181864c55e627422bb21ff20d3b7f6abcf1b49..b2653c30e65ba450513e6c0058c6b84e12b5e612 100644 (file)
--- a/common/src/common_utils.c
+++ b/common/src/common_utils.c
@@ -38,13 +38,19 @@ void init_app_data(app_data_s* ad)
 {
        ad->all_responded = false;
        ad->mode = APP_CONTROL_LAUNCH_MODE_GROUP;
-       ad->launch_type = NULL;
        ad->caller_pkgid = NULL;
-       ad->popup_id = 0;
 
-       ad->privacy_list = NULL;
-       ad->privacy_num = 0;
-       ad->privacy_idx = 0;
+       ad->popup_num = 0;
+       ad->popup_idx = 0;
+}
+
+void init_popup_data(popup_data_s *pd)
+{
+       pd->privacy_num = 0;
+       pd->privacy_idx = 0;
+       pd->launch_type = NULL;
+       pd->privacy_list = NULL;
+       pd->popup_id = 0;
 }
 
 void __free_privacy_data(privacy_data_s* pd)
@@ -63,8 +69,10 @@ void free_app_data(app_data_s* ad)
 {
        if (ad->caller_pkgid != NULL)
                free(ad->caller_pkgid);
-       if (ad->privacy_list != NULL)
-               g_list_free_full(ad->privacy_list, free_privacy_data);
-       if (ad->launch_type != NULL)
-               free(ad->launch_type);
+       int i = 0;
+       for (i = 0; i < ad->popup_num; ++i)
+       {
+               free(ad->popups[i].launch_type);
+               g_list_free_full(ad->popups[i].privacy_list, free_privacy_data);
+       }
 }

diff --git a/packaging/org.tizen.askuser-popup.xml b/packaging/org.tizen.askuser-popup.xml
index 443aba19f83209ccd5c169685649f7d9b6e53527..b123b0e4d932e509a5a6bcae3ed59a45ff3674d6 100755 (executable)
--- a/packaging/org.tizen.askuser-popup.xml
+++ b/packaging/org.tizen.askuser-popup.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" package="org.tizen.askuser-popup" api-version="6.0" version="0.1">
+<manifest xmlns="http://tizen.org/ns/packages" package="org.tizen.askuser-popup" api-version="6.0" version="0.1" support-mode="screen-reader|ultra-power-saving" removable="false">
        <ui-application appid="org.tizen.askuser-popup" launch_mode="caller" exec="org.tizen.askuser-popup" multiple="false" nodisplay="true" taskmanage="false" type="capp">
                <label>askuser popup</label>
        </ui-application>

diff --git a/ui/include/view.h b/ui/include/view.h
index bdf3e184b2b3284a2b3b42cd44004e28f13ef934..c31bc73e712e52772d6f2d0400272f1a889bf52a 100755 (executable)
--- a/ui/include/view.h
+++ b/ui/include/view.h
@@ -33,4 +33,3 @@
 #define LOG_TAG "ASKUSER_POPUP"
 
 void create_view(app_data_s *ad);
-void send_response(const char* response, app_data_s *ad);

diff --git a/ui/src/app_main.c b/ui/src/app_main.c
index 7b545e2679a35bd05eaf08e1cbd58fb0ded28bce..7895a0170a942b45c1ddb37c4cdd34799c46b3a3 100644 (file)
--- a/ui/src/app_main.c
+++ b/ui/src/app_main.c
@@ -77,8 +77,14 @@ static bool app_create(void * data)
 static void app_control(app_control_h app_control, void *data)
 {
        LOGD("app_control()");
+
        /* Handle the launch request. */
        app_data_s *ad = (app_data_s *)data;
+       if (ad->popup_num >= MAX_POPUP_NUM) {
+               LOGE("Requested popup num exceed MAX_POPUP_NUM. Ignore.");
+               return;
+       }
+
        int ret = 0;
 
        char* caller_appid = NULL;
@@ -104,17 +110,33 @@ static void app_control(app_control_h app_control, void *data)
                ui_app_exit();
        }
 
-       ret = app_info_get_package(app_info, &(ad->caller_pkgid));
+       char* caller_pkgid = NULL;
+
+       ret = app_info_get_package(app_info, &caller_pkgid);
        if (ret != APP_MANAGER_ERROR_NONE) {
                LOGE("app_info_get_package() failed. ret = %d", ret);
                ui_app_exit();
        }
 
+       if (!ad->caller_pkgid) {
+               ad->caller_pkgid = strdup(caller_pkgid);
+               free(caller_pkgid);
+       } else {
+               if (strcmp(caller_pkgid, ad->caller_pkgid) != 0) {
+                       LOGE("Received data isn't from the same caller app! Orig: %s, New: %s", ad->caller_pkgid, caller_pkgid);
+                       free(caller_pkgid);
+                       ui_app_exit();
+               }
+               free(caller_pkgid);
+       }
+
        if (ad->caller_pkgid == NULL) {
                LOGE("Failed to get caller_pkgid");
                ui_app_exit();
        }
 
+       init_popup_data(&(ad->popups[ad->popup_num]));
+
        bundle *b = NULL;
 
        ret = app_control_to_bundle(app_control, &b);
@@ -128,7 +150,7 @@ static void app_control(app_control_h app_control, void *data)
 
        ret = bundle_get_byte(b, "popup_id", (void**)&popup_id, &popup_id_size);
        if (ret == BUNDLE_ERROR_NONE) {
-               ad->popup_id = *popup_id;
+               ad->popups[ad->popup_num].popup_id = *popup_id;
                LOGD("popup_id = %d", *popup_id);
        } else {
                LOGE("caller pkgid [%s]: bundle_get_byte() failed. ret = %d", ad->caller_pkgid, ret);
@@ -142,33 +164,37 @@ static void app_control(app_control_h app_control, void *data)
                ui_app_exit();
        }
        if (privacy_num < 1) {
-               LOGE("caller_pkgid [%s]: key 'privacy_list' len: %d < 1", ad->caller_pkgid, ad->privacy_num);
+               LOGE("caller_pkgid [%s]: key 'privacy_list' len: %d < 1", ad->caller_pkgid, ad->popups[ad->popup_num].privacy_num);
                ui_app_exit();
        }
 
-       ad->privacy_num = privacy_num;
-       LOGD("privacy num = %d", ad->privacy_num);
+       ad->popups[ad->popup_num].privacy_num = privacy_num;
+       LOGD("privacy num = %d", ad->popups[ad->popup_num].privacy_num);
        int i = 0;
-       for (i = 0; i < ad->privacy_num; ++i) {
+       for (i = 0; i < ad->popups[ad->popup_num].privacy_num; ++i) {
                LOGD("privacy_list: %s", privacy_list[i]);
                privacy_data_s *pd = new_privacy_data();
                pd->privacy = strdup(privacy_list[i]);
-               ad->privacy_list = g_list_append(ad->privacy_list, pd);
+               ad->popups[ad->popup_num].privacy_list = g_list_append(ad->popups[ad->popup_num].privacy_list, pd);
        }
 
-       if (ad->privacy_num > 1) {
-               ad->launch_type = strdup("multi");
+       if (ad->popups[ad->popup_num].privacy_num > 1) {
+               ad->popups[ad->popup_num].launch_type = strdup("multi");
        } else {
-               ad->launch_type = strdup("single");
+               ad->popups[ad->popup_num].launch_type = strdup("single");
        }
 
-       if (!ad->launch_type) {
+       if (!ad->popups[ad->popup_num].launch_type) {
                LOGE("caller pkgid [%s]: strdup of 'launch_type' failed.", ad->caller_pkgid);
                ui_app_exit();
        }
 
-       LOGD("launch_type : %s", ad->launch_type);
-       create_view(ad);
+       LOGD("launch_type : %s", ad->popups[ad->popup_num].launch_type);
+       ad->popup_num++;
+       if (ad->popup_num == 1) {
+               ad->popup_idx = 0;
+               create_view(ad);
+       }
 }
 
 static void app_pause(void *data)
@@ -182,30 +208,42 @@ static void app_resume(void *data)
        /* Take necessary actions when application becomes visible. */
 }
 
-static void app_terminate(void *data)
+static bool send_response(app_data_s* ad, int idx)
 {
-       LOGD("app_terminate()");
-
-       app_data_s *ad = (app_data_s*)data;
        int ret = 0;
 
-       char *privacies[ad->privacy_num];
-       ppm_popup_response_e responses[ad->privacy_num];
+       char *privacies[ad->popups[idx].privacy_num];
+       ppm_popup_response_e responses[ad->popups[idx].privacy_num];
 
        int i = 0;
-       for (i = 0; i < ad->privacy_num; ++i) {
-               privacy_data_s *pd = (privacy_data_s*)g_list_nth_data(ad->privacy_list, i);
+       for (i = 0; i < ad->popups[idx].privacy_num; ++i) {
+               privacy_data_s *pd = (privacy_data_s*)g_list_nth_data(ad->popups[idx].privacy_list, i);
                privacies[i] = strdup(pd->privacy);
                responses[i] = pd->response;
        }
-       ret = ppm_popup_send_response(ad->popup_id, (const char**)privacies, responses, ad->privacy_num);
+       ret = ppm_popup_send_response(ad->popups[idx].popup_id, (const char**)privacies, responses, ad->popups[idx].privacy_num);
 
-       for (i = 0; i < ad->privacy_num; ++i) {
+       for (i = 0; i < ad->popups[idx].privacy_num; ++i) {
                free(privacies[i]);
        }
 
-       if (ret != PRIVACY_PRIVILEGE_MANAGER_ERROR_NONE)
+       if (ret != PRIVACY_PRIVILEGE_MANAGER_ERROR_NONE) {
                LOGE("ppm_popup_send_response() failed. ret = %d", ret);
+               return false;
+       }
+       return true;
+}
+
+static void app_terminate(void *data)
+{
+       LOGD("app_terminate()");
+
+       app_data_s *ad = (app_data_s*)data;
+       int i = 0;
+       for (i = 0; i < ad->popup_num; ++i) {
+               if (!send_response(ad, i))
+                       LOGE("send_response() failed.");
+       }
 
        free_app_data(ad);
 
@@ -227,7 +265,6 @@ static void ui_app_lang_changed(app_event_info_h event_info, void *user_data)
 
 int main(int argc, char *argv[])
 {
-       LOGD("main");
        int ret = 0;
        app_data_s ad;
        memset(&ad, 0x0, sizeof(app_data_s));

diff --git a/ui/src/popup.c b/ui/src/popup.c
index 2dc8983426f5949ea17a88faac715c49006b5e30..5093c4dbab9fdd9b751dc17c7d411a82604f6d4d 100644 (file)
--- a/ui/src/popup.c
+++ b/ui/src/popup.c
@@ -46,11 +46,10 @@
 
 void save_response(ppm_popup_response_e response, app_data_s *ad)
 {
-       privacy_data_s *pd = (privacy_data_s *)g_list_nth_data(ad->privacy_list, ad->privacy_idx);
+       privacy_data_s *pd = (privacy_data_s *)g_list_nth_data(ad->popups[ad->popup_idx].privacy_list, ad->popups[ad->popup_idx].privacy_idx);
        pd->response = response;
 }
 
-
 static char* __get_privacy_display(const char* privacy)
 {
        int ret = 0;
@@ -175,16 +174,16 @@ static char* __get_popup_contents(const char* pkgid, const char* privacy,
 
 static void __set_popup_contents(app_data_s *ad)
 {
-       privacy_data_s *pd = (privacy_data_s *)g_list_nth_data(ad->privacy_list, ad->privacy_idx);
+       privacy_data_s *pd = (privacy_data_s *)g_list_nth_data(ad->popups[ad->popup_idx].privacy_list, ad->popups[ad->popup_idx].privacy_idx);
 
        char* contents = NULL;
        char* ao_contents = NULL;
-       if (!strcmp(ad->launch_type, "single")) {
+       if (!strcmp(ad->popups[ad->popup_idx].launch_type, "single")) {
                contents = __get_popup_contents(ad->caller_pkgid, (const char*)pd->privacy, -1, -1, false);
                ao_contents = __get_popup_contents(ad->caller_pkgid, (const char*)pd->privacy, -1, -1, true);
-       } else if (!strcmp(ad->launch_type, "multi")) {
-               contents = __get_popup_contents(ad->caller_pkgid, (const char*)pd->privacy, (ad->privacy_idx) + 1, ad->privacy_num, false);
-               ao_contents = __get_popup_contents(ad->caller_pkgid, (const char*)pd->privacy, (ad->privacy_idx) + 1, ad->privacy_num, true);
+       } else if (!strcmp(ad->popups[ad->popup_idx].launch_type, "multi")) {
+               contents = __get_popup_contents(ad->caller_pkgid, (const char*)pd->privacy, (ad->popups[ad->popup_idx].privacy_idx) + 1, ad->popups[ad->popup_idx].privacy_num, false);
+               ao_contents = __get_popup_contents(ad->caller_pkgid, (const char*)pd->privacy, (ad->popups[ad->popup_idx].privacy_idx) + 1, ad->popups[ad->popup_idx].privacy_num, true);
        }
 
        elm_object_part_text_set(ad->popup, "default", contents);
@@ -206,10 +205,15 @@ static char* __get_accessible_popup_contents_cb(void *data, Evas_Object *obj)
 static void __check_next_privacy(app_data_s *ad)
 {
        LOGD("__check_next_privacy()");
-       ad->privacy_idx++;
-       if (ad->privacy_idx >= ad->privacy_num) {
-               ad->all_responded = true;
-               LOGD("all_responded, close the popup");
+       ad->popups[ad->popup_idx].privacy_idx++;
+       if (ad->popups[ad->popup_idx].privacy_idx >= ad->popups[ad->popup_idx].privacy_num) {
+               ad->popup_idx++;
+               if (ad->popup_idx >= ad->popup_num) {
+                       ad->all_responded = true;
+                       LOGD("all_responded, close the popup");
+               } else {
+                       __set_popup_contents(ad);
+               }
        } else {
                __set_popup_contents(ad);
        }