Add the 'privilege' parameter to popup response callback
[platform/core/security/askuser.git] / src / capi / test / privacy_privilege_manager_test.cpp
index b7866c7..5138b89 100644 (file)
@@ -60,7 +60,6 @@ typedef std::set<ServerPrivilegeRequest> PrivilegeRequestSet;
 
 struct ClientRequest {
     RequestId m_id;
-    Privilege m_privilege;
     GMainLoop *m_mainLoop;
     bool m_stopAppAfterDeny;
 };
@@ -156,6 +155,9 @@ void printClientError(ppm_error_e error)
         case PRIVACY_PRIVILEGE_MANAGER_ERROR_UNKNOWN:
             printf("Unknown error\n");
             break;
+        case PRIVACY_PRIVILEGE_MANAGER_ERROR_ALREADY_IN_PROGRESS:
+            printf("Operation already in progress\n");
+            break;
     }
 }
 
@@ -439,14 +441,15 @@ public:
 
 private:
 
-    static void popupResponseCallback(ppm_call_cause_e cause, ppm_popup_result_e result, void *user_data) {
+    static void popupResponseCallback(ppm_call_cause_e cause, ppm_popup_result_e result,
+                                      const char *privilege, void *user_data) {
         ClientRequest *request = static_cast<ClientRequest *>(user_data);
         if (request == nullptr) {
             printf("ERROR: User data is nullptr\n");
             return;
         }
 
-        printf("localId: %d privilege: \"%s\" ", request->m_id, request->m_privilege.c_str());
+        printf("localId: %d privilege: \"%s\" ", request->m_id, privilege);
 
         switch (cause) {
             case PRIVACY_PRIVILEGE_MANAGER_CALL_CAUSE_ANSWER:
@@ -498,7 +501,7 @@ private:
 
                 printf("sending localId: %d privilege: \"%s\"\n", clientRequestId, privilege);
 
-                request = new ClientRequest{ clientRequestId++, privilege, m_mainloop, stopAppAfterDeny };
+                request = new ClientRequest{ clientRequestId++, m_mainloop, stopAppAfterDeny };
                 err = static_cast<ppm_error_e>(ppm_popup_request(privilege, &AppContext::popupResponseCallback, request));
                 if (err != PRIVACY_PRIVILEGE_MANAGER_ERROR_NONE) {
                     delete request;