Update change log and spec for wrt-plugins-tizen_0.4.70

[framework/web/wrt-plugins-tizen.git] / src / Contact / JSContactManager.cpp

diff --git a/src/Contact/JSContactManager.cpp b/src/Contact/JSContactManager.cpp
index 601d06d..3961ae6 100755 (executable)
--- a/src/Contact/JSContactManager.cpp
+++ b/src/Contact/JSContactManager.cpp
@@ -34,7 +34,7 @@
 #include <FilterConverter.h>
 #include "ContactFactory.h"
 #include "ContactTypes.h"
-#include "plugin_config.h"
+#include "plugin_config_impl.h"
 #include "ContactManagerController.h"
 #include "ContactAsyncCallbackManager.h"
 #include "ContactListenerManager.h"
@@ -158,8 +158,7 @@ JSValueRef JSContactManager::getAddressBooks(JSContextRef context,
                return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
-       AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_CONTACT_MANAGER_GET_ADDRESS_BOOKS);
-       TIZEN_SYNC_ACCESS_HANDLER(status, context, exception);
+       TIZEN_CHECK_ACCESS(context, exception, controller, CONTACT_FUNCTION_API_CONTACT_MANAGER_GET_ADDRESS_BOOKS);
 
        BasicValidator validator = BasicValidatorFactory::getValidator(context, exception);
        try {
@@ -225,8 +224,7 @@ JSValueRef JSContactManager::getDefaultAddressBook(JSContextRef context,
                return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
-       AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_CONTACT_MANAGER_GET_DEFAULT_ADDRESS_BOOK);
-       TIZEN_SYNC_ACCESS_HANDLER(status, context, exception);
+       TIZEN_CHECK_ACCESS(context, exception, priv, CONTACT_FUNCTION_API_CONTACT_MANAGER_GET_DEFAULT_ADDRESS_BOOK);
 
        ContactManagerPtr contactManager;
        JSContextRef gContext;
@@ -275,7 +273,7 @@ JSValueRef JSContactManager::getDefaultAddressBook(JSContextRef context,
 
        JSValueRef resultValue;
        Try {
-               resultValue = converter->toJSValueRef(defaultAddressBook);
+               resultValue = converter->toJSValueRef(defaultAddressBook, priv);
        } Catch(Exception){
                LoggerE("Conversion error.");
                return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
@@ -301,8 +299,7 @@ JSValueRef JSContactManager::getUnifiedAddressBook(JSContextRef context,
                return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
-       AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_CONTACT_MANAGER_GET_UNIFIED_ADDRESS_BOOK);
-       TIZEN_SYNC_ACCESS_HANDLER(status, context, exception);
+       TIZEN_CHECK_ACCESS(context, exception, priv, CONTACT_FUNCTION_API_CONTACT_MANAGER_GET_UNIFIED_ADDRESS_BOOK);
 
        ContactManagerPtr contactManager;
        JSContextRef gContext;
@@ -351,7 +348,7 @@ JSValueRef JSContactManager::getUnifiedAddressBook(JSContextRef context,
 
        JSValueRef resultValue;
        Try {
-               resultValue = converter->toJSValueRef(unifiedAddressBook);
+               resultValue = converter->toJSValueRef(unifiedAddressBook, priv);
        } Catch(Exception){
                LoggerE("Conversion error.");
                return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
@@ -377,8 +374,7 @@ JSValueRef JSContactManager::getAddressBook(JSContextRef context,
                return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
-       AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_CONTACT_MANAGER_GET_ADDRESS_BOOK);
-       TIZEN_SYNC_ACCESS_HANDLER(status, context, exception);
+       TIZEN_CHECK_ACCESS(context, exception, priv, CONTACT_FUNCTION_API_CONTACT_MANAGER_GET_ADDRESS_BOOK);
 
        ContactManagerPtr contactManager;
        JSContextRef gContext;
@@ -442,7 +438,7 @@ JSValueRef JSContactManager::getAddressBook(JSContextRef context,
 
        JSValueRef resultValue;
        Try {
-               resultValue = converter->toJSValueRef(addressBook);
+               resultValue = converter->toJSValueRef(addressBook, priv);
        } Catch(Exception){
                LoggerE("Conversion error.");
                return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
@@ -475,8 +471,7 @@ JSValueRef JSContactManager::get(JSContextRef context,
                return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
-       AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_CONTACT_MANAGER_GET);
-       TIZEN_SYNC_ACCESS_HANDLER(status, context, exception);
+       TIZEN_CHECK_ACCESS(context, exception, controller, CONTACT_FUNCTION_API_CONTACT_MANAGER_GET);
 
        std::string id;
 
@@ -533,7 +528,7 @@ JSValueRef JSContactManager::get(JSContextRef context,
 
        JSValueRef result;
        Try {
-               result = converter->toJSValueRef(person);
+               result = converter->toJSValueRef(person, controller);
        } Catch(Exception) {
                LoggerE("Error on conversion : " << _rethrown_exception.GetMessage());
                return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::UNKNOWN_ERROR, "Internal error");
@@ -566,8 +561,7 @@ JSValueRef JSContactManager::update(JSContextRef context,
                return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
-       AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_CONTACT_MANAGER_UPDATE);
-       TIZEN_SYNC_ACCESS_HANDLER(status, context, exception);
+       TIZEN_CHECK_ACCESS(context, exception, controller, CONTACT_FUNCTION_API_CONTACT_MANAGER_UPDATE);
 
        try {
                ArgumentValidator validator(context, argumentCount, arguments);
@@ -658,8 +652,7 @@ JSValueRef JSContactManager::updateBatch(JSContextRef context,
                                JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
-       AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_CONTACT_MANAGER_UPDATE_BATCH);
-       TIZEN_SYNC_ACCESS_HANDLER(status, context, exception);
+       TIZEN_CHECK_ACCESS(context, exception, controller, CONTACT_FUNCTION_API_CONTACT_MANAGER_UPDATE_BATCH);
 
        try {
                ArgumentValidator validator(context, argumentCount, arguments);
@@ -747,8 +740,7 @@ JSValueRef JSContactManager::remove(JSContextRef context,
                return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
-       AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_CONTACT_MANAGER_REMOVE);
-       TIZEN_SYNC_ACCESS_HANDLER(status, context, exception);
+       TIZEN_CHECK_ACCESS(context, exception, controller, CONTACT_FUNCTION_API_CONTACT_MANAGER_REMOVE);
 
        std::string personId;
 
@@ -836,8 +828,7 @@ JSValueRef JSContactManager::removeBatch(JSContextRef context,
                return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
-       AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_CONTACT_MANAGER_REMOVE_BATCH);
-       TIZEN_SYNC_ACCESS_HANDLER(status, context, exception);
+       TIZEN_CHECK_ACCESS(context, exception, controller, CONTACT_FUNCTION_API_CONTACT_MANAGER_REMOVE_BATCH);
 
        try {
                ArgumentValidator validator(context, argumentCount, arguments);
@@ -929,8 +920,7 @@ JSValueRef JSContactManager::find(JSContextRef context,
                return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
-       AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_CONTACT_MANAGER_FIND);
-       TIZEN_SYNC_ACCESS_HANDLER(status, context, exception);
+       TIZEN_CHECK_ACCESS(context, exception, controller, CONTACT_FUNCTION_API_CONTACT_MANAGER_FIND);
 
        try {
                ArgumentValidator validator(context, argumentCount, arguments);
@@ -1041,8 +1031,7 @@ JSValueRef JSContactManager::addChangeListener(JSContextRef context,
                return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
-       AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_CONTACT_MANAGER_ADD_CHANGE_LISTENER);
-       TIZEN_SYNC_ACCESS_HANDLER(status, context, exception);
+       TIZEN_CHECK_ACCESS(context, exception, controller, CONTACT_FUNCTION_API_CONTACT_MANAGER_ADD_CHANGE_LISTENER);
 
        BasicValidator validator = BasicValidatorFactory::getValidator(context, exception);
        try {
@@ -1181,8 +1170,7 @@ JSValueRef JSContactManager::removeChangeListener(JSContextRef context,
                return JSWebAPIErrorFactory::postException(context, exception, JSWebAPIErrorFactory::TYPE_MISMATCH_ERROR, "Wrong object");
        }
 
-       AceSecurityStatus status = CONTACT_CHECK_ACCESS(CONTACT_FUNCTION_API_CONTACT_MANAGER_REMOVE_CHANGE_LISTENER);
-       TIZEN_SYNC_ACCESS_HANDLER(status, context, exception);
+       TIZEN_CHECK_ACCESS(context, exception, controller, CONTACT_FUNCTION_API_CONTACT_MANAGER_REMOVE_CHANGE_LISTENER);
 
        ContactConverterFactory::ConverterType converter = ContactConverterFactory::getConverter(context);