privilege changed and "already set" exception added.

Change-Id: I402365181534b270cff0dc3687dea3c4eb037ebd
Signed-off-by: Byounghui <byounghui.lim@samsung.com>

diff --git a/inc/FMsgEmailManager.h b/inc/FMsgEmailManager.h
index bc6526b..37803c8 100644 (file)
--- a/inc/FMsgEmailManager.h
+++ b/inc/FMsgEmailManager.h
@@ -146,6 +146,7 @@ namespace Tizen { namespace Messaging
                * @since                2.0
                * @privlevel    public
                * @privilege    %http://tizen.org/privilege/messaging.write
+               *                               (%http://tizen.org/privilege/messaging.email is deprecated.)
                *
                * @return                       An error code
                * @param[in]    message                                 The message to send

diff --git a/inc/FMsgMmsManager.h b/inc/FMsgMmsManager.h
index 6decadb..9a66cad 100644 (file)
--- a/inc/FMsgMmsManager.h
+++ b/inc/FMsgMmsManager.h
@@ -151,6 +151,7 @@ namespace Tizen { namespace Messaging
                * @since                2.0
                * @privlevel    public
                * @privilege    %http://tizen.org/privilege/messaging.write
+               *                               (%http://tizen.org/privilege/messaging.mms is deprecated.)
                *
                * @return               An error code
                * @param[in]    message                                 The message to send

diff --git a/inc/FMsgSmsManager.h b/inc/FMsgSmsManager.h
index 192fe07..efbd29b 100644 (file)
--- a/inc/FMsgSmsManager.h
+++ b/inc/FMsgSmsManager.h
@@ -202,6 +202,7 @@ namespace Tizen { namespace Messaging
                *
                * @privlevel    public
                * @privilege    %http://tizen.org/privilege/messaging.read
+               *                               (%http://tizen.org/privilege/messaging.sms is deprecated.)
                *
                * @return               An error code
                * @param[in]    eventListener                   The listener to receive SMS messages
@@ -221,6 +222,7 @@ namespace Tizen { namespace Messaging
                *
                * @privlevel    public
                * @privilege    %http://tizen.org/privilege/messaging.read
+               *                               (%http://tizen.org/privilege/messaging.sms is deprecated.)
                *
                * @return               An error code
                * @param[in]    eventListener                   The listener to receive SMS messages
@@ -269,6 +271,7 @@ namespace Tizen { namespace Messaging
                *
                * @privlevel    public
                * @privilege    %http://tizen.org/privilege/messaging.read
+               *                               (%http://tizen.org/privilege/messaging.sms is deprecated.)
                *
                * @return               The total number of SMS messages in the specified message box
                * @param[in]    type                            The type of message box
@@ -288,6 +291,7 @@ namespace Tizen { namespace Messaging
                *
                * @privlevel    public
                * @privilege    %http://tizen.org/privilege/messaging.read
+               *                               (%http://tizen.org/privilege/messaging.sms is deprecated.)
                *
                * @return               A pointer to the list of the SmsMessage class instances
                * @param[in]    pKeyword                        A part of the body text as a keyword (partial match) @n
@@ -323,6 +327,7 @@ namespace Tizen { namespace Messaging
                *
                * @privlevel    public
                * @privilege    %http://tizen.org/privilege/messaging.read
+               *                               (%http://tizen.org/privilege/messaging.sms is deprecated.)
                *
                * @return               A pointer to the list of the SmsMessage class instances
                * @param[in]    type                            The type of message box
@@ -356,6 +361,7 @@ namespace Tizen { namespace Messaging
                *
                * @privlevel    public
                * @privilege    %http://tizen.org/privilege/messaging.read
+               *                               (%http://tizen.org/privilege/messaging.sms is deprecated.)
                *
                * @return               The full text of the specified SMS message
                * @param[in]    messageId                       The unique ID of the message

diff --git a/inc/FMsgSmsMessage.h b/inc/FMsgSmsMessage.h
index bd21148..acba400 100644 (file)
--- a/inc/FMsgSmsMessage.h
+++ b/inc/FMsgSmsMessage.h
@@ -148,6 +148,7 @@ namespace Tizen { namespace Messaging
                *
                * @privlevel    public
                * @privilege    %http://tizen.org/privilege/messaging.read
+               *                               (%http://tizen.org/privilege/messaging.sms is deprecated.)
                *
                * @return                       The sender address of the SMS message
                * @exception    E_SUCCESS                               The method is successful.
@@ -164,6 +165,7 @@ namespace Tizen { namespace Messaging
                *
                * @privlevel    public
                * @privilege    %http://tizen.org/privilege/messaging.read
+               *                               (%http://tizen.org/privilege/messaging.sms is deprecated.)
                *
                * @return                       The received time of the SMS message
                * @exception    E_SUCCESS                               The method is successful.
@@ -181,6 +183,7 @@ namespace Tizen { namespace Messaging
                *
                * @privlevel    public
                * @privilege    %http://tizen.org/privilege/messaging.read
+               *                               (%http://tizen.org/privilege/messaging.sms is deprecated.)
                *
                * @return               The unique ID of the SMS message
                * @exception    E_SUCCESS                               The method is successful.
@@ -198,6 +201,7 @@ namespace Tizen { namespace Messaging
                *
                * @privlevel    public
                * @privilege    %http://tizen.org/privilege/messaging.read
+               *                               (%http://tizen.org/privilege/messaging.sms is deprecated.)
                *
                * @return               The sent time of the SMS message
                * @exception    E_SUCCESS                               The method is successful.
@@ -215,6 +219,7 @@ namespace Tizen { namespace Messaging
                *
                * @privlevel    public
                * @privilege    %http://tizen.org/privilege/messaging.read
+               *                               (%http://tizen.org/privilege/messaging.sms is deprecated.)
                *
                * @return               The type of the SMS message box
                * @exception    E_SUCCESS                               The method is successful.
@@ -232,6 +237,7 @@ namespace Tizen { namespace Messaging
                *
                * @privlevel    public
                * @privilege    %http://tizen.org/privilege/messaging.read
+               *                               (%http://tizen.org/privilege/messaging.sms is deprecated.)
                *
                * @return               The list of the recipient
                * @exception    E_SUCCESS                               The method is successful.
@@ -248,6 +254,7 @@ namespace Tizen { namespace Messaging
                *
                * @privlevel    public
                * @privilege    %http://tizen.org/privilege/messaging.read
+               *                               (%http://tizen.org/privilege/messaging.sms is deprecated.)
                *
                * @return               @c true if this SMS message contains more than @c 160 bytes for the body text, @n
                *                               else @c false

diff --git a/inc/FMsgWapPushManager.h b/inc/FMsgWapPushManager.h
old mode 100755 (executable)
new mode 100644 (file)
index 041cd2e..b18b1f2
--- a/inc/FMsgWapPushManager.h
+++ b/inc/FMsgWapPushManager.h
@@ -155,6 +155,7 @@ public:
        * @exception    E_PRIVILEGE_DENIED      The application does not have the privilege to call this method.
        * @exception    E_UNSUPPORTED_OPERATION The Emulator or target device does not support the required feature. @b Since: @b 2.1
        *                                                                               For more information, see <a href="../org.tizen.gettingstarted/html/tizen_overview/application_filtering.htm">Application Filtering</a>.
+       * @exception    E_ALREADY_SET           The condition is already registered.
        * @remarks      Before calling this method, check whether the feature is supported by %Tizen::System::SystemInfo::GetValue() methods.
        * @see                  RegisterCondition()
        */

diff --git a/src/FMsg_WapPushManagerImpl.cpp b/src/FMsg_WapPushManagerImpl.cpp
index 580c3b7..b50aa1a 100644 (file)
--- a/src/FMsg_WapPushManagerImpl.cpp
+++ b/src/FMsg_WapPushManagerImpl.cpp
@@ -313,6 +313,10 @@ _WapPushManagerImpl::ConvertException(int err) const
                r = E_SUCCESS;
                break;
 
+       case MSG_ERR_DB_ROW:
+               r = E_ALREADY_SET;
+       break;
+               
        case MSG_ERR_INVALID_PARAMETER:
        case MSG_ERR_INVALID_MESSAGE:
        case MSG_ERR_NULL_POINTER: