From cdde57347348a7519658514f41c326f6e20a5912 Mon Sep 17 00:00:00 2001 From: Woowon Date: Mon, 9 Dec 2013 16:31:41 +0900 Subject: [PATCH] Merge branch 'tizen_2.2' into tizen Change-Id: I478a1dbff7507dff10e32099f858473e4b9c7fc1 Signed-off-by: Woowon --- CMakeLists.txt | 5 +- inc/FNetNfc.h | 8 +-- inc/FNetNfcINdefMessageDiscoveryEventListener.h | 18 +++--- inc/FNetNfcINdefPushManagerListener.h | 8 +-- inc/FNetNfcINdefTagConnectionListener.h | 19 +++--- inc/FNetNfcINfcDeviceDiscoveryEventListener.h | 4 +- inc/FNetNfcINfcManagerEventListener.h | 4 +- inc/FNetNfcINfcTagDiscoveryEventListener.h | 15 ++--- inc/FNetNfcITagConnectionListener.h | 12 ++-- inc/FNetNfcNdefMessage.h | 63 +++++++++--------- inc/FNetNfcNdefPushManager.h | 65 +++++++++---------- inc/FNetNfcNdefRecord.h | 22 +++---- inc/FNetNfcNdefRecordType.h | 30 ++++----- inc/FNetNfcNdefTagConnection.h | 12 ++-- inc/FNetNfcNfcManager.h | 86 ++++++++++++------------- inc/FNetNfcNfcTag.h | 22 +++---- inc/FNetNfcNfcTypes.h | 12 ++-- inc/FNetNfcTagConnection.h | 20 +++--- packaging/osp-nfc.spec | 15 ++++- src/FNetNfcNfcManager.cpp | 24 ++----- src/FNetNfc_NdefMessageImpl.cpp | 10 ++- src/FNetNfc_NdefMessageUtil.cpp | 16 ++--- src/FNetNfc_NdefRecordImpl.cpp | 18 ++---- src/FNetNfc_NdefRecordTypeImpl.cpp | 11 ++-- src/FNetNfc_NfcIpcProxy.cpp | 50 +++++++------- src/FNetNfc_NfcIpcProxy.h | 11 ---- src/FNetNfc_NfcManagerImpl.cpp | 10 +-- src/FNetNfc_NfcSystemAdapter.cpp | 28 +++++++- src/FNetNfc_NfcSystemAdapter.h | 10 +++ src/inc/FNetNfc_ConnectivityIpcMessages.h | 3 +- 30 files changed, 318 insertions(+), 313 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 26ac70c..c57cb49 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,6 @@ SET (${this_target}_SOURCE_FILES src/FNetNfc_NdefMessageUtil.cpp src/FNetNfc_NdefRecordImpl.cpp src/FNetNfc_NdefRecordTypeImpl.cpp - src/FNetNfc_NfcAuthorityController.cpp src/FNetNfc_NfcIpcMessages.cpp src/FNetNfc_NfcIpcProxy.cpp src/FNetNfc_NfcManagerEvent.cpp @@ -84,6 +83,10 @@ INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/ DESTINATION lib/osp INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/inc/ DESTINATION include/osp FILES_MATCHING PATTERN "*.h") INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/inc/ DESTINATION include/osp/net FILES_MATCHING PATTERN "*.h") +SET(PC_NAME ${this_target}) +SET(VERSION ${FULLVER}) +SET(PC_LDFLAGS -l${this_target}) + # pkgconfig file SET(PC_LDFLAGS -l${this_target}) CONFIGURE_FILE(${this_target}.pc.in ${CMAKE_SOURCE_DIR}/${this_target}.pc @ONLY) diff --git a/inc/FNetNfc.h b/inc/FNetNfc.h index 2325f42..afa47ef 100644 --- a/inc/FNetNfc.h +++ b/inc/FNetNfc.h @@ -44,14 +44,14 @@ namespace Tizen { namespace Net { /** * @namespace Tizen::Net::Nfc - * @brief This namespace contains the classes and interfaces for the Near Field Communication (NFC) services. + * @brief This namespace contains classes and interfaces for Near Field Communication (NFC) services. * @since 2.0 * * @remarks @b Header @b %file: @b \#include @b @n - * @b Library : @b osp-nfc @n + * @b Library: @b osp-nfc * - * The %Nfc namespace contains the various classes and interfaces for the Near Field Communication (NFC) programming - * that enables the devices to share information within a distance of less than @c 4 centimeters. + * The %Nfc namespace contains various classes and interfaces for Near Field Communication (NFC) programming + * that enables devices to share information within a distance of less than @c 4 centimeters. * * For more information on the NFC namespace features, see * NFC Guide. diff --git a/inc/FNetNfcINdefMessageDiscoveryEventListener.h b/inc/FNetNfcINdefMessageDiscoveryEventListener.h index f8c5471..e09edd8 100644 --- a/inc/FNetNfcINdefMessageDiscoveryEventListener.h +++ b/inc/FNetNfcINdefMessageDiscoveryEventListener.h @@ -33,12 +33,12 @@ class NdefMessage; /** * @interface INdefMessageDiscoveryEventListener - * @brief This interface provides a listener for the events related to the NDEF message discovery. + * @brief This interface provides a listener for the events related to an NDEF message discovery. * * @since 2.0 * - * The %INdefMessageDiscoveryEventListener interface specifies the methods used for creating notifications about the - * NDEF message discovered from the target tag. + * The %INdefMessageDiscoveryEventListener interface specifies the methods used for creating notifications about an + * NDEF message discovered from a target tag. * * For more information on the class features, see * NFC Guide. @@ -56,18 +56,18 @@ public: virtual ~INdefMessageDiscoveryEventListener(void) {} /** - * Called to notify the application when an NDEF message, that includes the NDEF records with the specified filter + * Called to notify the application when an NDEF message, that includes NDEF records with the specified filter * type, is detected. * * @since 2.0 * * @param[in] pMessage The detected NDEF message * @remarks - * - This method can be used for read-only access to the data on the target without opening a - * connection to it. - * - The input NdefMessage object must be deleted by the application after use, even outside this - * method. The NdefMessage::RemoveAllRecords() method must be called with @c true as the input value - * immediately before the NdefMessage object is deleted. + * - This method can be used for providing read-only access to the data on the target without opening a + * connection to it. + * - The input NdefMessage object must be deleted by the application after use, even outside this + * method. The NdefMessage::RemoveAllRecords() method must be called with @c true as the input value + * immediately before the %NdefMessage object is deleted. */ virtual void OnNdefMessageDetectedN(NdefMessage* pMessage) = 0; diff --git a/inc/FNetNfcINdefPushManagerListener.h b/inc/FNetNfcINdefPushManagerListener.h index df9e1df..1d0cba6 100644 --- a/inc/FNetNfcINdefPushManagerListener.h +++ b/inc/FNetNfcINdefPushManagerListener.h @@ -31,10 +31,10 @@ namespace Tizen { namespace Net { namespace Nfc { /** * @interface INdefPushManagerListener - * @brief This interface provides a listener for the events related to the %NfcPushManager. + * @brief This interface provides a listener for the events related to %NfcPushManager. * @since 2.0 * - * The %INdefPushManagerListener interface specifies the methods used for receiving the status of the pushed NDEF + * The %INdefPushManagerListener interface specifies the methods used for receiving the status of a pushed NDEF * message asynchronously. * * For more information on the class features, see @@ -53,11 +53,11 @@ public: virtual ~INdefPushManagerListener(void) {} /** - * Called when the push operation to the target device is completed. + * Called when a push operation to the target device is completed. * * @since 2.0 * - * @param[in] r The result of pushed NDEF message @n + * @param[in] r The result of a pushed NDEF message @n * The following exceptions may be given through this parameter. * @exception E_SUCCESS The method is successful. * @exception E_NOT_RESPONDING The device is not responding. diff --git a/inc/FNetNfcINdefTagConnectionListener.h b/inc/FNetNfcINdefTagConnectionListener.h index 1944dc3..a3b872b 100644 --- a/inc/FNetNfcINdefTagConnectionListener.h +++ b/inc/FNetNfcINdefTagConnectionListener.h @@ -34,12 +34,12 @@ class NdefMessage; /** * @interface INdefTagConnectionListener - * @brief This interface provides a listener for the events related to the NDEF tag connection. + * @brief This interface provides a listener for the events related to an NDEF tag connection. * * @since 2.0 * - * The %INdefTagConnectionListener interface specifies the methods used for creating the notifications about the result - * of an action for the NdefTagConnection, such as reading and writing the NDEF data. + * The %INdefTagConnectionListener interface specifies the methods used for creating notifications about the result + * of an action performed for NdefTagConnection, such as reading and writing the NDEF data. * * For more information on the class features, see * NFC Guide. @@ -57,12 +57,12 @@ public: virtual ~INdefTagConnectionListener(void) {} /** - * Called to notify the application when the read operation from the target tag is completed. + * Called to notify the application when a read operation from the target tag is completed. * * @since 2.0 * * @param[in] pMessage The read NdefMessage object, @n - * else @c null if the method is not successful + * else @c null if it fails * @param[in] r An error code * @exception E_SUCCESS The method is successful. * @exception E_DATA_NOT_FOUND The target tag has no NDEF record. @@ -77,15 +77,16 @@ public: virtual void OnNdefReadCompletedN(NdefMessage* pMessage, result r) = 0; /** - * Called to notify the application when the write operation on the target tag is completed. + * Called to notify the application when a write operation on the target tag is completed. * * @since 2.0 * * @param[in] r An error code * @exception E_SUCCESS The method is successful. - * @exception E_ILLEGAL_ACCESS The write operation on the target tag is denied. @n - * The target tag is locked or protected for the write operation. - * @exception E_STORAGE_FULL The storage capacity of the target tag is full. + * @exception E_ILLEGAL_ACCESS Either of the following conditions has occurred: + * - The write operation on the target tag is denied. + * - The target tag is locked or protected for the write operation. + * @exception E_STORAGE_FULL The storage capacity of the target tag has reached the maximum limit. * @exception E_NOT_RESPONDING The target tag is not responding. * @exception E_SYSTEM A system error has occurred. * @see NdefTagConnection::Write() diff --git a/inc/FNetNfcINfcDeviceDiscoveryEventListener.h b/inc/FNetNfcINfcDeviceDiscoveryEventListener.h index 178fba6..4488f83 100644 --- a/inc/FNetNfcINfcDeviceDiscoveryEventListener.h +++ b/inc/FNetNfcINfcDeviceDiscoveryEventListener.h @@ -32,10 +32,10 @@ namespace Tizen { namespace Net { namespace Nfc /** * @interface INfcDeviceDiscoveryEventListener - * @brief This interface provides a listener for the events related to device discovery. + * @brief This interface provides a listener for the events related to a device discovery. * @since 2.0 * - * The %INfcDeviceDiscoveryEventListener interface specifies the methods used for creating the notifications + * The %INfcDeviceDiscoveryEventListener interface specifies the methods used for creating notifications * about detecting a device. * * For more information on the class features, see diff --git a/inc/FNetNfcINfcManagerEventListener.h b/inc/FNetNfcINfcManagerEventListener.h index 3c43b95..05cbc12 100644 --- a/inc/FNetNfcINfcManagerEventListener.h +++ b/inc/FNetNfcINfcManagerEventListener.h @@ -37,8 +37,8 @@ namespace Tizen { namespace Net { namespace Nfc * * @since 2.0 * - * The %INfcManagerEventListener interface specifies the method used for creating the notifications about a change in - * the NfcManager status. + * The %INfcManagerEventListener interface specifies the methods used for creating notifications about a change in + * the NfcManager's status. * * For more information on the class features, see * NFC Guide. diff --git a/inc/FNetNfcINfcTagDiscoveryEventListener.h b/inc/FNetNfcINfcTagDiscoveryEventListener.h index 402bb62..9a7bcde 100644 --- a/inc/FNetNfcINfcTagDiscoveryEventListener.h +++ b/inc/FNetNfcINfcTagDiscoveryEventListener.h @@ -33,12 +33,12 @@ class TagConnection; /** * @interface INfcTagDiscoveryEventListener - * @brief This interface provides a listener for the events related to tag discovery. + * @brief This interface provides a listener for the events related to a tag discovery. * * @since 2.0 * - * The %INfcTagDiscoveryEventListener interface specifies the methods used for creating the notifications about - * detecting the target tag. + * The %INfcTagDiscoveryEventListener interface specifies the methods used for creating notifications about + * detecting a target tag. * * For more information on the class features, see * NFC Guide. @@ -56,24 +56,23 @@ public: virtual ~INfcTagDiscoveryEventListener(void) {} /** - * Called to notify the application when the tag is detected by the device. + * Called to notify the application when a tag is detected by the device. * * @since 2.0 * * @param[in] pConnection The connection established with the detected tag * @remarks TagConnection is inherited by NdefTagConnection if the current attached tag supports NDEF - * operations. - * To verify this, use TagConnection::IsNdefConnection(). + * operations. To verify this, use TagConnection::IsNdefConnection(). */ virtual void OnNfcTagDetectedN(TagConnection* pConnection) = 0; /** - * Called to notify the application when the tag is lost by the device. + * Called to notify the application when a tag is lost by the device. * * @since 2.0 * * @remarks The operations of TagConnection returned by OnNfcTagDetectedN() are not processed further after - * this event is called, that is, the target tag is lost. Moreover, the TagConnection object cannot be + * this event is called, that is, the target tag is lost. Moreover, the %TagConnection object cannot be * reused even though the same tag is detected again by the device. */ virtual void OnNfcTagLost(void) = 0; diff --git a/inc/FNetNfcITagConnectionListener.h b/inc/FNetNfcITagConnectionListener.h index 930942f..ab926f0 100644 --- a/inc/FNetNfcITagConnectionListener.h +++ b/inc/FNetNfcITagConnectionListener.h @@ -37,12 +37,12 @@ namespace Tizen { namespace Net { namespace Nfc /** * @interface ITagConnectionListener - * @brief This interface provides a listener for the events related to the tag connection. + * @brief This interface provides a listener for the events related to a tag connection. * * @since 2.0 * - * The %ITagConnectionListener interface provides methods that are used for creating notifications for the result of - * the actions of the TagConnection, such as sending a command. + * The %ITagConnectionListener interface provides methods that are used for creating notifications about the result of + * an action performed for TagConnection, such as sending a command. * * For more information on the class features, see * NFC Guide. @@ -60,12 +60,12 @@ public: virtual ~ITagConnectionListener(void) {} /** - * Called to notify the application when the response is received from the remote tag. + * Called to notify the application when a response is received from a remote tag. * * @since 2.0 * - * @param[in] pResponse The response of the command as the Tizen::Base::ByteBuffer object, @n - * else @c null if the method is not successful + * @param[in] pResponse The response of the command as a Tizen::Base::ByteBuffer object, @n + * else @c null if it fails * @param[in] r An error code * @exception E_SUCCESS The method is successful. * @exception E_ILLEGAL_ACCESS The sent command is denied by the target. @n diff --git a/inc/FNetNfcNdefMessage.h b/inc/FNetNfcNdefMessage.h index 75b4743..5bddbef 100644 --- a/inc/FNetNfcNdefMessage.h +++ b/inc/FNetNfcNdefMessage.h @@ -45,8 +45,8 @@ class NdefRecord; * * @since 2.0 * - * The %NdefMessage class represents an NDEF message. An NDEF message is composed of 1 or more NDEF records. Therefore, - * this class has NdefRecord instances and provides the operations to manipulate the list of those instances. These + * The %NdefMessage class represents an NDEF message. An NDEF message is composed of @c 1 or more NDEF records. Therefore, + * this class has NdefRecord instances and provides operations to manipulate the list of those instances. These * operations are very similar to those of the Tizen::Base::Collection::IList class. * * If a new NDEF record is inserted, the uniqueness of its payload identifier is checked. This class also provides @@ -71,8 +71,8 @@ public: * * @since 2.0 * - * @param[in] value An instance of %NdefMessage - * @remarks This performs a deep copy. + * @param[in] value An instance of %NdefMessage to copy + * @remarks This method performs a deep copy. */ NdefMessage(const NdefMessage& value); @@ -84,12 +84,11 @@ public: virtual ~NdefMessage(void); /** - * Compares the calling instance with the specified instance. + * Compares the specified instance with the current instance. * * @since 2.0 * - * @return @c true if the specified instance of Tizen::Base::Object is equal to the calling %NdefMessage - * instance, @n + * @return @c true if the specified instance of Tizen::Base::Object is equal to the current %NdefMessage instance, @n * else @c false * @param[in] obj The object to compare * @remark Two %NdefMessage instances are equal only if they contain the same NdefRecord instances in the @@ -137,9 +136,10 @@ public: * else @c null if the index is not valid * @param[in] index The index of the NDEF record to get * @exception E_SUCCESS The method is successful. - * @exception E_OUT_OF_RANGE The specified index is outside the bounds of the record list. @n - * The specified @c index parameter is either greater than or equal to the number - * of elements or less than @c 0. + * @exception E_OUT_OF_RANGE Either of the following conditions has occurred: + * - The specified @c index is outside the bounds of the record list. + * - The specified @c index is either greater than or equal to the number of elements. + * - The specified @c index is less than @c 0. * @remarks The specific error code can be accessed using the GetLastResult() method. */ NdefRecord* GetRecordAt(int index) const; @@ -153,7 +153,7 @@ public: * else @c null if no record matches * @param[in] payloadId The payload identifier of the NDEF record to get * @exception E_SUCCESS The method is successful. - * @exception E_OBJ_NOT_FOUND The specified @c id is not found in any of the NDEF records. + * @exception E_OBJ_NOT_FOUND The specified @c payloadId is not found in any of the NDEF records. * @remarks The specific error code can be accessed using the GetLastResult() method. */ NdefRecord* GetRecord(const Tizen::Base::String& payloadId) const; @@ -170,7 +170,7 @@ public: * For example, the record has the same payload identifier as the other records in * this NDEF message. * @exception E_OUT_OF_MEMORY The memory is insufficient. - * @remarks This method performs a shallow copy. It adds just the pointer, not the NdefRecord instance. + * @remarks This method performs a shallow copy. It adds just the pointer and not the NdefRecord instance. */ result AppendRecord(const NdefRecord& record); @@ -181,19 +181,20 @@ public: * * @return An error code * @param[in] record The NDEF record to insert - * @param[in] index The index at which the NDEF record must be inserted + * @param[in] index The index at which the NDEF record is inserted * @exception E_SUCCESS The method is successful. - * @exception E_OUT_OF_RANGE The specified index is outside the bounds of the record list. @n - * The specified @c index is greater than the number of elements or less than - * @c 0. + * @exception E_OUT_OF_RANGE Either of the following conditions has occurred: + * - The specified @c index is outside the bounds of the record list. + * - The specified @c index is greater than the number of elements. + * - The specified @c index is less than @c 0. * @exception E_INVALID_ARG The specified NDEF record is invalid. @n * For example, the record has the same payload identifier as the other records in * this NDEF message. * @exception E_OUT_OF_MEMORY The memory is insufficient. * @remarks - * - The NDEF records that appear after the insertion point move downwards to accommodate the inserted - * NDEF record. - * - This method performs a shallow copy. It adds just the pointer, not the NdefRecord instance. + * - The NDEF records that appear after the insertion point move downwards to accommodate the inserted + * NDEF record. + * - This method performs a shallow copy. It adds just the pointer and not the NdefRecord instance. */ result InsertRecordAt(const NdefRecord& record, int index); @@ -208,18 +209,19 @@ public: * @param[in] deallocate Set to @c true to deallocate the replaced record, @n * else @c false * @exception E_SUCCESS The method is successful. - * @exception E_OUT_OF_RANGE The specified index is outside the bounds of the record list. @n - * The specified @c index is either equal to or greater than the number of - * elements or less than @c 0. + * @exception E_OUT_OF_RANGE Either of the following conditions has occurred: + * - The specified @c index is outside the bounds of the record list. + * - The specified @c index is either greater than or equal to the number of elements. + * - The specified @c index is less than @c 0. * @exception E_INVALID_ARG The specified NDEF record is invalid. @n * For example, the record has the same payload identifier as the other records in * this NDEF message. - * @remarks This method performs a shallow copy. It adds just the pointer, not the NdefRecord instance. + * @remarks This method performs a shallow copy. It adds just the pointer and not the NdefRecord instance. */ result SetRecordAt(const NdefRecord& record, int index, bool deallocate = false); /** - * Removes the NDEF record from a specified location. + * Removes the NDEF record from the specified location. * * @since 2.0 * @@ -228,16 +230,17 @@ public: * @param[in] deallocate Set to @c true to deallocate the record, @n * else @c false * @exception E_SUCCESS The method is successful. - * @exception E_OUT_OF_RANGE The specified index is outside the bounds of the record list. @n - * The specified @c index is either equal to or greater than the number of - * elements or less than @c 0. + * @exception E_OUT_OF_RANGE Either of the following conditions has occurred: + * - The specified @c index is outside the bounds of the record list. + * - The specified @c index is either greater than or equal to the number of elements. + * - The specified @c index is less than @c 0. * @remarks The NDEF records that appear after the deletion point move upwards to occupy the vacated spot. */ result RemoveRecordAt(int index, bool deallocate = false); /** * Removes all the records in the NDEF message. @n - * If the specified @c deallocate parameter is set to @c true, it deallocates all the NdefRecord instances in the + * If the specified @c deallocate is set to @c true, it deallocates all the NdefRecord instances in the * message. * * @since 2.0 @@ -269,7 +272,7 @@ public: * * @return The instance of the created NDEF message, @n * else @c null if the conversion fails - * @param[in] buffer An NDEF message as a byte sequence + * @param[in] buffer The NDEF message as a byte sequence * @exception E_SUCCESS The method is successful. * @exception E_INVALID_FORMAT The specified @c buffer cannot be formulated to the NDEF message. * @exception E_OUT_OF_MEMORY The memory is insufficient. @@ -284,7 +287,7 @@ public: * @since 2.0 * * @return A reference to the %NdefMessage instance - * @param[in] rhs A reference to the %NdefMessage instance to copy + * @param[in] rhs A reference to the %NdefMessage instance to copy */ NdefMessage& operator =(const NdefMessage& rhs); diff --git a/inc/FNetNfcNdefPushManager.h b/inc/FNetNfcNdefPushManager.h index bac5380..4e90a2e 100755 --- a/inc/FNetNfcNdefPushManager.h +++ b/inc/FNetNfcNdefPushManager.h @@ -47,13 +47,13 @@ class _NdefPushManagerImpl; /** * @class NdefPushManager - * @brief This is the class for pushing an NDEF message to a device. + * @brief This class provides methods for pushing an NDEF message to a device. * * @since 2.0 * * @final This class is not intended for extension. * - * The %NdefPushManager class is the class for pushing an NDEF message to a device. + * The %NdefPushManager class provides methods for pushing an NDEF message to a device. * * For more information on the class features, see * NFC Guide. @@ -112,7 +112,7 @@ class _NdefPushManagerImpl; * __pNdefPushManager->SetNdefPushManagerListener(this); * } * - * // This method is invoked when a NFC device is detected + * // This method is invoked when an NFC device is detected * void * MyClass::OnNfcDeviceDetected(void) * { @@ -167,8 +167,8 @@ public: * @feature %http://tizen.org/feature/network.nfc * * @return An error code - * @param[in] pListener An instance of %INdefPushManagerListener. @n - * If it is null, it will reset the listener. + * @param[in] pListener An instance of INdefPushManagerListener @n + * If it is @c null, it resets the listener. * @exception E_SUCCESS The method is successful. * @exception E_OUT_OF_MEMORY The memory is insufficient. * @exception E_UNSUPPORTED_OPERATION The Emulator or target device does not support the required feature. @@ -177,7 +177,7 @@ public: * Application Filtering. * @exception E_OPERATION_FAILED The operation has failed. * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. - * @exception E_USER_NOT_CONSENTED The user blocks an application from calling this method. @b Since: @b 2.1 + * @exception E_USER_NOT_CONSENTED The user has blocked the application from calling this method. @b Since: @b 2.1 * @remarks Before calling this method, check whether the feature is supported by * Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&). */ @@ -194,12 +194,12 @@ public: * @return An error code * @param[in] message The NDEF message to send * @exception E_SUCCESS The method is successful. - * @exception E_DEVICE_BUSY The device is processing preceding job. + * @exception E_DEVICE_BUSY The device is processing a preceding job. * @exception E_OUT_OF_MEMORY The memory is insufficient. * @exception E_INVALID_STATE This instance is in an invalid state. @n * For example, the NFC feature is not activated or a peer device is not * attached. - * @exception E_INVALID_ARG The input @c message is invalid. @n + * @exception E_INVALID_ARG The specified @c message is invalid. @n * For example, it does not contain any NDEF records. * @exception E_UNSUPPORTED_OPERATION The Emulator or target device does not support the required feature. * For more information, see @@ -207,14 +207,14 @@ public: * Application Filtering. * @exception E_OPERATION_FAILED The operation has failed. * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. - * @exception E_USER_NOT_CONSENTED The user blocks an application from calling this method. @b Since: @b 2.1 + * @exception E_USER_NOT_CONSENTED The user has blocked the application from calling this method. @b Since: @b 2.1 * @remarks Before calling this method, check whether the feature is supported by * Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&). */ result Push(const NdefMessage& message); /** - * Activates the Reserved Push feature that sends the preselected NDEF message to the connected NFC peer device on + * Activates the Reserved Push feature that sends a preselected NDEF message to the connected NFC peer device on * behalf of the application. * * @since 2.1 @@ -225,8 +225,7 @@ public: * * @return An error code * @exception E_SUCCESS The method is successful. - * @exception E_INVALID_OPERATION The current state of the instance prohibits the execution of the specified - * operation. @n + * @exception E_INVALID_OPERATION The current state of the instance prohibits the execution of the specified operation. @n * For example, Reserved Push is already activated. * @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. @@ -236,13 +235,13 @@ public: * @exception E_SYSTEM The method cannot proceed due to a severe system error. * @remarks Before calling this method, check whether the feature is supported by * Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&). - * @see + * @see * The NFC Reserved Push guide */ result ActivateReservedPush(void); /** - * Deactivates the Reserved Push feature that sends the preselected NDEF message to the connected NFC peer device on + * Deactivates the Reserved Push feature that sends a preselected NDEF message to the connected NFC peer device on * behalf of the application. * * @since 2.1 @@ -280,20 +279,20 @@ public: bool IsReservedPushActivated(void) const; /** - * Gets information of all the Reserved Push candidates. @n Each element of the result Tizen::Base::Collection::IMap consists of the package ID + * Gets the information of all the Reserved Push candidates. @n Each element of the result Tizen::Base::Collection::IMap consists of the package ID * of the application that registered the NDEF message and the description about the registered NDEF message. * * @since 2.1 * - * @return An IMapT containing the pairs of package ID and message description if successful, @n - * else @c null - * @remarks The key of the returned Tizen::Base::Collection::IMap should be casted to Tizen::App::PackageId pointer and the value should - * be casted to Tizen::Base::String pointer. + * @return A Tizen::Base::Collection::IMap that contains the package ID and message description pairs, @n + * else @c null if it fails + * @remarks The key of the returned Tizen::Base::Collection::IMap should be cast to the Tizen::App::PackageId pointer and the value should + * be cast to the Tizen::Base::String pointer. */ Tizen::Base::Collection::IMap* GetReservedPushCandidatesN(void) const; /** - * Picks out an NDEF message among all the Reserved Push candidates by the application ID. @n The selected NDEF message is + * Picks out an NDEF message from all the Reserved Push candidates by the application ID. @n The selected NDEF message is * pushed when a peer device is detected. * * @since 2.1 @@ -314,23 +313,23 @@ public: * @exception E_SYSTEM The method cannot proceed due to a severe system error. * * @remarks - * - The only one message can be selected to push. So the previously selected message will be replaced - * by the new one. - * - Before calling this method, check whether the feature is supported by - * Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&). + * - Only one message can be selected to push. So the previously selected message is replaced + * by the new one. + * - Before calling this method, check whether the feature is supported by + * Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&). * @see * The NFC Reserved Push guide */ result PickReservedPushMessage(const Tizen::App::PackageId& packageId); /** - * Gets the owner application ID of the picked NDEF message among all the Reserved Push candidates. + * Gets the owner application ID of the picked NDEF message from all the Reserved Push candidates. * * @since 2.1 * @feature %http://tizen.org/feature/network.nfc and %http://tizen.org/feature/network.nfc.reserved_push @n * Both the features are required. * - * @return The package ID of the application which is the owner of the picked Reserved Push message @n + * @return The package ID of the application which is the owner of the picked Reserved Push message, @n * else an empty string if an error occurs * @exception E_SUCCESS The method is successful. * @exception E_OBJ_NOT_FOUND There is no element in the Reserved Push candidate list. @@ -350,7 +349,7 @@ public: /** * Registers an NDEF message as a Reserved Push candidate. @n - * If the message is picked out among the candidates, it is pushed to the detected peer device when the home screen + * If the message is picked out from the candidates, it is pushed to the detected peer device when the home screen * or the main menu is on top of the screen in the local device. * * @since 2.0 @@ -362,20 +361,20 @@ public: * @return An error code * @param[in] message The NDEF message to register * @param[in] description The description for the NDEF message to register @n - * This description can be used in Reserved Push UI, for example, UI for - * getting user consent to send the registered message. + * This description can be used in the Reserved Push UI, for example, the UI for + * getting the user's consent to send the registered message. * @exception E_SUCCESS The method is successful. - * @exception E_INVALID_ARG The input @c message is invalid. @n + * @exception E_INVALID_ARG The specified @c message is invalid. @n * For example, it does not contain any NDEF records. * @exception E_UNSUPPORTED_OPERATION The Emulator or target device does not support the required feature. * For more information, see * * Application Filtering. * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. - * @exception E_USER_NOT_CONSENTED The user blocks an application from calling this method. @b Since: @b 2.1 + * @exception E_USER_NOT_CONSENTED The user has blocked the application from calling this method. @b Since: @b 2.1 * @exception E_SYSTEM The method cannot proceed due to a severe system error. * @remarks - * - An application can register only one NDEF message. So the previously registered message will be + * - An application can register only one NDEF message. So the previously registered message is * replaced by the new one. * - The registered NDEF message is pushed only if it is selected by the user through the Setting * application. @@ -402,7 +401,7 @@ public: * * Application Filtering. * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. - * @exception E_USER_NOT_CONSENTED The user blocks an application from calling this method. @b Since: @b 2.1 + * @exception E_USER_NOT_CONSENTED The user has blocked the application from calling this method. @b Since: @b 2.1 * @exception E_SYSTEM The method cannot proceed due to a severe system error. * @remarks Before calling this method, check whether the feature is supported by * Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&). diff --git a/inc/FNetNfcNdefRecord.h b/inc/FNetNfcNdefRecord.h index 67360bd..122666f 100644 --- a/inc/FNetNfcNdefRecord.h +++ b/inc/FNetNfcNdefRecord.h @@ -47,7 +47,7 @@ class NdefRecordType; * @since 2.0 * * The %NdefRecord class represents an NDEF record, including certain attributes such as the type, the payload, and the - * payload identifier. It provides the operations to manipulate them. However, this class does not expose all the + * payload identifier. It provides operations to manipulate them. However, this class does not expose all the * attributes of an NDEF record. Some attributes defined in the NDEF specification are hidden because they are not * important for applications. @n * The NDEF record may contain an NDEF message in the payload. It can be converted from a Tizen::Base::ByteBuffer @@ -65,7 +65,7 @@ public: * * @since 2.0 * - * @param[in] recordType A specified NDEF record type + * @param[in] recordType The specified NDEF record type */ NdefRecord(const NdefRecordType& recordType); @@ -74,8 +74,8 @@ public: * * @since 2.0 * - * @param[in] value An instance of %NdefRecord - * @remarks It performs a deep copy. + * @param[in] value An instance of %NdefRecord to copy + * @remarks This method performs a deep copy. */ NdefRecord(const NdefRecord& value); @@ -87,14 +87,14 @@ public: virtual ~NdefRecord(void); /** - * Compares the calling instance with the specified instance. + * Compares the specified instance with the current instance. * * @since 2.0 * - * @return @c true if the specified instance of Tizen::Base::Object is equal to the calling %NdefRecord instance, @n + * @return @c true if the specified instance of Tizen::Base::Object is equal to the current %NdefRecord instance, @n * else @c false * @param[in] obj The object to compare - * @remark Two %NdefRecord instances are equal only if they contain the same NdefRecordType instances, + * @remark Two %NdefRecord instances are equal only if they contain the same NdefRecordType instance, * payload ID, and payload. */ virtual bool Equals(const Tizen::Base::Object& obj) const; @@ -146,7 +146,7 @@ public: * @return An error code * @param[in] type The record type to set * @exception E_SUCCESS The method is successful. - * @exception E_INVALID_ARG The input argument is invalid. @n + * @exception E_INVALID_ARG The specified input parameter is invalid. @n * For example, @c NDEF_TNF_EMPTY is not allowed as the input value if the identifier * is not an empty string or the payload is not @c null. */ @@ -185,18 +185,18 @@ public: * @exception E_OUT_OF_MEMORY The memory is insufficient. * @exception E_INVALID_ARG The @c payload is invalid. @n * For example, @c payload is not constructed. - * @remarks The view of the specified @c payload parameter is copied and the data is shared. Therefore, if the + * @remarks The view of the specified @c payload is copied and the data is shared. Therefore, if the * data of @c payload is modified after setting, the data of the payload in this record also changes. */ result SetPayload(const Tizen::Base::ByteBuffer& payload); /** - * Assigns the value of a specified instance to the current instance of %NdefRecord. + * Assigns the value of the specified instance to the current instance of %NdefRecord. * * @since 2.0 * * @return A reference to the %NdefRecord instance - * @param[in] rhs A reference to the %NdefRecord instance to copy + * @param[in] rhs A reference to the %NdefRecord instance to copy */ NdefRecord& operator =(const NdefRecord& rhs); diff --git a/inc/FNetNfcNdefRecordType.h b/inc/FNetNfcNdefRecordType.h index 81f398b..fac85c7 100644 --- a/inc/FNetNfcNdefRecordType.h +++ b/inc/FNetNfcNdefRecordType.h @@ -101,7 +101,7 @@ _OSP_EXPORT_ extern const wchar_t NFC_NDEF_RTD_URI[]; * * @since 2.0 * - * The %NdefRecordType class represents the type of an NDEF record. It encapsulates the name and the name format of the + * The %NdefRecordType class represents the type of an NDEF record. It encapsulates the name and the name format of an * NDEF record type. @n * The name format is represented by the enumeration type, Tizen::Net::Nfc::NdefRecordTypeNameFormat. The name is * encoded using the US_ASCII character set and follows the rules defined by the NFC forum RTDs and RFCs. The name does @@ -130,7 +130,7 @@ public: * * @since 2.0 * - * @param[in] recordType An instance of %NdefRecordType + * @param[in] recordType An instance of %NdefRecordType to copy */ NdefRecordType(const NdefRecordType& recordType); @@ -146,12 +146,12 @@ public: * * @since 2.0 * - * @param[in] rhs An instance of %NdefRecordType + * @param[in] rhs An instance of %NdefRecordType to copy */ NdefRecordType& operator =(const NdefRecordType& rhs); /** - * Compares the specified instance of Tizen::Base::Object with the calling instance of %NdefRecordType. + * Compares the specified instance of Tizen::Base::Object with the current instance of %NdefRecordType. * * @since 2.0 * @@ -218,13 +218,13 @@ public: * @since 2.0 * * @return The name of this record type, @n - * else an empty string if the name format is NDEF_TNF_EMPTY or NDEF_TNF_UNKNOWN + * else an empty string if the name format is ::NDEF_TNF_EMPTY or ::NDEF_TNF_UNKNOWN * @remarks - * - The returned name does not have the prefix @c "urn:nfc:wkt:" and @c "urn:nfc:ext:" defined by the - * NFC forum. - * - In case of @c NDEF_TNF_ABSOLUTE_URI name format, this method returns the name in the same format as - * it is given in the constructor, that is, with or without percent encoding. The name consists of - * the characters encoded using the US_ASCII character set. + * - The name does not have the prefix @c "urn:nfc:wkt:" and @c "urn:nfc:ext:" defined by the + * NFC forum. + * - In case of ::NDEF_TNF_ABSOLUTE_URI name format, this method returns the name in the same format as + * it is given in the constructor, that is, with or without percent encoding. + * - The name consists of the characters encoded using the US_ASCII character set. */ Tizen::Base::String GetName(void) const; @@ -234,17 +234,17 @@ public: * @since 2.0 * * @return An error code - * @param[in] name The name of this record type + * @param[in] name The name of this record type @n + * The input name must not have the prefix defined by the NFC forum such as @c "urn:nfc:wkt:" and + * @c "urn:nfc:ext:". * @exception E_SUCCESS The method is successful. - * @exception E_INVALID_OPERATION This operation is not allowed if the name format is NDEF_TNF_EMPTY, - * NDEF_TNF_UNKNOWN, or NDEF_TNF_ALL. + * @exception E_INVALID_OPERATION This operation is not allowed if the name format is ::NDEF_TNF_EMPTY, + * ::NDEF_TNF_UNKNOWN, or ::NDEF_TNF_ALL. * @exception E_INVALID_ENCODING_RANGE The specified input string contains the code points that are outside * the bounds specified by the US_ASCII encoding scheme. * @exception E_INVALID_FORMAT The specified format of the @c name is invalid as per the * specifications defined for each type of the name format. * @exception E_MAX_EXCEEDED The length of the name exceeds @c 256 characters. - * @remarks The input name must not have the prefix defined by the NFC forum such as @c "urn:nfc:wkt:" and - * @c "urn:nfc:ext:". */ result SetName(const Tizen::Base::String& name); diff --git a/inc/FNetNfcNdefTagConnection.h b/inc/FNetNfcNdefTagConnection.h index 7941dd1..cd0997b 100644 --- a/inc/FNetNfcNdefTagConnection.h +++ b/inc/FNetNfcNdefTagConnection.h @@ -36,12 +36,12 @@ class INdefTagConnectionListener; /** * @class NdefTagConnection - * @brief This class represents the connection with an NFC tag that has the NDEF data. + * @brief This class represents the connection with an NFC tag that has NDEF data. * * @since 2.0 * - * The %NdefTagConnection class provides the mechanism to communicate with the tag that has NFC Data Exchange Format - * (NDEF) data and supports the NDEF message operations. @n + * The %NdefTagConnection class provides the mechanism to communicate with a tag that has NFC Data Exchange Format + * (NDEF) data and supports NDEF message operations. @n * This class can be derived from the TagConnection class. Use the IsNdefConnection() method to check the availability * of the derivation. @n * Use the Read() and Write() methods to read and write the NDEF data. After the completion of the read and write @@ -179,7 +179,7 @@ public: * @exception E_SUCCESS The method is successful. * @exception E_IN_PROGRESS The read process is in progress. * @exception E_CONNECTION_BUSY The connection is busy. Therefore, the method cannot process the read request. - * @exception E_CONNECTION_FAILED The connection to the tag is closed or it has failed. + * @exception E_CONNECTION_FAILED The connection to the tag has closed or has failed. * @exception E_SYSTEM A system error has occurred. * @see INdefTagConnectionListener::OnNdefReadCompletedN() */ @@ -193,11 +193,11 @@ public: * @return An error code * @param[in] message The NDEF message to write to the target * @exception E_SUCCESS The method is successful. - * @exception E_INVALID_ARG The input @c message is invalid. @n + * @exception E_INVALID_ARG The specified @c message is invalid. @n * For example, it does not contain any NDEF records. * @exception E_IN_PROGRESS The write process is in progress. * @exception E_CONNECTION_BUSY The connection is busy. Therefore, the method cannot process the write request. - * @exception E_CONNECTION_FAILED The connection to the tag is closed or it has failed. + * @exception E_CONNECTION_FAILED The connection to the tag has closed or has failed. * @exception E_SYSTEM A system error has occurred. * @see INdefTagConnectionListener::OnNdefWriteCompleted() */ diff --git a/inc/FNetNfcNfcManager.h b/inc/FNetNfcNfcManager.h index f5f6a6b..3230767 100755 --- a/inc/FNetNfcNfcManager.h +++ b/inc/FNetNfcNfcManager.h @@ -46,17 +46,17 @@ class _NfcManagerImpl; * * @since 2.0 * - * The %NfcManager class is the manager class for NFC features that includes the methods for enabling and disabling the - * NFC feature of the device and the mechanism for establishing a connection with the detected tag. It is also used to - * detect the NFC tags and NDEF messages. @n + * The %NfcManager class is the manager class for the NFC features that include methods for enabling and disabling the + * NFC feature of a device and the mechanism for establishing a connection with the detected tag. It is also used to + * detect NFC tags and NDEF messages. @n * There are two ways to get the TagConnection instance established with the detected tag. @n * @li Use the INfcTagDiscoveryEventListener::OnNfcTagDetectedN() method that is invoked immediately when the target * tag is detected. * @li Invoke the GetCurrentTagConnectionN() method after the tag is detected. * * If the target tag is lost, the INfcTagDiscoveryEventListener::OnNfcTagLost() method is called and the old - * TagConnection instance becomes invalid. Therefore, the operations performed by the TagConnection class are not - * processed anymore. Moreover, the TagConnection instance cannot be used again even if the same tags are detected + * %TagConnection instance becomes invalid. Therefore, the operations performed by the %TagConnection class are not + * processed anymore. Moreover, the %TagConnection instance cannot be used again even if the same tags are detected * again by the device. * * For more information on the class features, see @@ -164,10 +164,6 @@ public: * For full construction, the Construct() method must be called right after calling this constructor. * * @since 2.0 - * - * @remarks After creating an instance of this class, the Construct() method must be called explicitly to - * initialize this instance. - * @see Construct() */ NfcManager(void); @@ -212,7 +208,7 @@ public: * operation. @n * For example, the NFC feature is already activated. * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. - * @exception E_USER_NOT_CONSENTED The user blocks an application from calling this method. @b Since: @b 2.1 + * @exception E_USER_NOT_CONSENTED The user has blocked the application from calling this method. @b Since: @b 2.1 * @exception E_SYSTEM A system error has occurred. * @see INfcManagerEventListener::OnNfcActivated() */ @@ -232,7 +228,7 @@ public: * operation. @n * For example, the NFC feature is already deactivated. * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. - * @exception E_USER_NOT_CONSENTED The user blocks an application from calling this method. @b Since: @b 2.1 + * @exception E_USER_NOT_CONSENTED The user has blocked the application from calling this method. @b Since: @b 2.1 * @exception E_SYSTEM A system error has occurred. * @see INfcManagerEventListener::OnNfcDeactivated() */ @@ -249,7 +245,7 @@ public: bool IsActivated(void) const; /** - * Checks whether the NFC tag is currently connected with the device. + * Checks whether an NFC tag is currently connected to the device. * * @since 2.0 * @@ -259,33 +255,33 @@ public: bool IsTagConnected(void) const; /** - * Gets the tag connection with the currently detected tag. + * Gets a tag connection with the currently detected tag. * * @since 2.0 * @privlevel public * @privilege %http://tizen.org/privilege/nfc.tag * * @return The tag connection with the currently detected tag, @n - * else @c null if no tag is connected or if the connection fails + * else @c null if no tag is connected or the connection fails * @exception E_SUCCESS The method is successful. * @exception E_INVALID_STATE This instance is in an invalid state. @n * For example, this instance has not been constructed as yet or the NFC * feature is not activated. - * @exception E_CONNECTION_FAILED The connection to the tag is closed or has failed. + * @exception E_CONNECTION_FAILED The connection to the tag has closed or has failed. * @exception E_OUT_OF_MEMORY The memory is insufficient. * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. - * @exception E_USER_NOT_CONSENTED The user blocks an application from calling this method. @b Since: @b 2.1 + * @exception E_USER_NOT_CONSENTED The user has blocked the application from calling this method. @b Since: @b 2.1 * @exception E_SYSTEM A system error has occurred. * @remarks * - The NdefTagConnection class can inherit the TagConnection class if the currently detected tag - * supports the NDEF operations. To check whether the %TagConnection class is inherited, use the + * supports NDEF operations. To check whether the %TagConnection class is inherited, use the * TagConnection::IsNdefConnection() method. * - The specific error code can be accessed using the GetLastResult() method. */ TagConnection* GetCurrentTagConnectionN(void) const; /** - * Adds the specified %INfcTagDiscoveryEventListener instance for the tag events with the specified tag type. + * Adds the specified INfcTagDiscoveryEventListener instance for the tag events with the specified tag type. * * @since 2.0 * @privlevel public @@ -297,7 +293,7 @@ public: * @exception E_SUCCESS The method is successful. * @exception E_OBJ_ALREADY_EXIST The listener with the specified type is already added. * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. - * @exception E_USER_NOT_CONSENTED The user blocks an application from calling this method. @b Since: @b 2.1 + * @exception E_USER_NOT_CONSENTED The user has blocked the application from calling this method. @b Since: @b 2.1 * @exception E_SYSTEM A system error has occurred. * @remarks This method can be invoked several times with different Tizen::Net::Nfc::NfcTagType values for the * same listener instance. In this case, the listener is called if the specified type of the target @@ -306,7 +302,7 @@ public: result AddTagDiscoveryEventListener(INfcTagDiscoveryEventListener& listener, NfcTagType type); /** - * Removes the specified %INfcTagDiscoveryEventListener instance. @n + * Removes the specified INfcTagDiscoveryEventListener instance. @n * The removed listener cannot listen to the events that are fired. * * @since 2.0 @@ -319,13 +315,13 @@ public: * @exception E_SUCCESS The method is successful. * @exception E_OBJ_NOT_FOUND The listener with the specified type is not found. * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. - * @exception E_USER_NOT_CONSENTED The user blocks an application from calling this method. @b Since: @b 2.1 + * @exception E_USER_NOT_CONSENTED The user has blocked the application from calling this method. @b Since: @b 2.1 * @exception E_SYSTEM A system error has occurred. */ result RemoveTagDiscoveryEventListener(INfcTagDiscoveryEventListener& listener, NfcTagType type); /** - * Adds the specified %INdefMessageDiscoveryEventListener instance for the events related to an NDEF message that + * Adds the specified INdefMessageDiscoveryEventListener instance for the events related to an NDEF message that * includes the NDEF record with the specified type. * * @since 2.0 @@ -338,23 +334,23 @@ public: * @exception E_SUCCESS The method is successful. * @exception E_INVALID_ARG The specified @c type is invalid. @n * For example, the name of the record type is an empty string if the name - * format is NDEF_TNF_WELL_KNOWN, NDEF_TNF_MIME_MEDIA, NDEF_TNF_ABSOLUTE_URI, - * or NDEF_TNF_EXTERNAL. - * @exception E_OBJ_ALREADY_EXIST The listener with the specified type is already added. + * format is ::NDEF_TNF_WELL_KNOWN, ::NDEF_TNF_MIME_MEDIA, ::NDEF_TNF_ABSOLUTE_URI, + * or ::NDEF_TNF_EXTERNAL. + * @exception E_OBJ_ALREADY_EXIST The listener with the specified @c type is already added. * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. - * @exception E_USER_NOT_CONSENTED The user blocks an application from calling this method. @b Since: @b 2.1 + * @exception E_USER_NOT_CONSENTED The user has blocked the application from calling this method. @b Since: @b 2.1 * @exception E_SYSTEM A system error has occurred. * @remarks * - This method can be invoked several times with different NdefRecordType values for the same * listener instance. In this case, the listener is called if the record type in the detected NDEF * records matches with one of the registered types. - * - In case of the MIME %Media type as Type Name Format (TNF), asterisks can be used in the type name + * - In case of a MIME %Media type such as Type Name Format (TNF), asterisks can be used in the type name * for wildcard matching, such as @htmlonly "image/*" @endhtmlonly. */ result AddNdefMessageDiscoveryEventListener(INdefMessageDiscoveryEventListener& listener, const NdefRecordType& type); /** - * Removes the specified %INdefMessageDiscoveryEventListener instance. @n + * Removes the specified INdefMessageDiscoveryEventListener instance. @n * The removed listener cannot listen to the events that are fired. * * @since 2.0 @@ -367,17 +363,17 @@ public: * @exception E_SUCCESS The method is successful. * @exception E_INVALID_ARG The specified @c type is invalid. @n * For example, the name of the record type is an empty string if the name - * format is NDEF_TNF_WELL_KNOWN, NDEF_TNF_MIME_MEDIA, NDEF_TNF_ABSOLUTE_URI, - * or NDEF_TNF_EXTERNAL. - * @exception E_OBJ_NOT_FOUND The listener with the specified type is not found. + * format is ::NDEF_TNF_WELL_KNOWN, ::NDEF_TNF_MIME_MEDIA, ::NDEF_TNF_ABSOLUTE_URI, + * or ::NDEF_TNF_EXTERNAL. + * @exception E_OBJ_NOT_FOUND The listener with the specified @c type is not found. * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. - * @exception E_USER_NOT_CONSENTED The user blocks an application from calling this method. @b Since: @b 2.1 + * @exception E_USER_NOT_CONSENTED The user has blocked the application from calling this method. @b Since: @b 2.1 * @exception E_SYSTEM A system error has occurred. */ result RemoveNdefMessageDiscoveryEventListener(INdefMessageDiscoveryEventListener& listener, const NdefRecordType& type); /** - * Adds the specified %INfcDeviceDiscoveryEventListener instance for the device discovery events. + * Adds the specified INfcDeviceDiscoveryEventListener instance for the device discovery events. * * @since 2.0 * @privlevel public @@ -389,13 +385,13 @@ public: * @exception E_OBJ_ALREADY_EXIST The listener has already been added. * @exception E_OUT_OF_MEMORY The memory is insufficient. * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. - * @exception E_USER_NOT_CONSENTED The user blocks an application from calling this method. @b Since: @b 2.1 + * @exception E_USER_NOT_CONSENTED The user has blocked the application from calling this method. @b Since: @b 2.1 * @exception E_SYSTEM A system error has occurred. */ result AddDeviceDiscoveryEventListener(INfcDeviceDiscoveryEventListener& listener); /** - * Removes the specified %INfcDeviceDiscoveryEventListener instance. @n + * Removes the specified INfcDeviceDiscoveryEventListener instance. @n * The removed listener cannot listen to the events that are fired. * * @since 2.0 @@ -407,32 +403,32 @@ public: * @exception E_SUCCESS The method is successful. * @exception E_OBJ_NOT_FOUND The listener is not found. * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. - * @exception E_USER_NOT_CONSENTED The user blocks an application from calling this method. @b Since: @b 2.1 + * @exception E_USER_NOT_CONSENTED The user has blocked the application from calling this method. @b Since: @b 2.1 * @exception E_SYSTEM A system error has occurred. */ result RemoveDeviceDiscoveryEventListener(INfcDeviceDiscoveryEventListener& listener); /** - * Checks whether peer device has been detected. + * Checks whether a peer device has been detected. * * @since 2.0 * - * @return @c true if peer device has been detected, @n + * @return @c true if a peer device has been detected, @n * else @c false */ bool IsDeviceDetected(void) const; /** - * Gets the NDEF message cached when the tag is detected. + * Gets the cached NDEF message when the tag is detected. * * @since 2.0 * @privlevel public * @privilege %http://tizen.org/privilege/nfc.common * @feature %http://tizen.org/feature/network.nfc * - * @return The cached %NdefMessage instance, @n - * else @c null if the method is not successful + * @return The cached NdefMessage instance, @n + * else @c null if it fails * @exception E_SUCCESS The method is successful. * @exception E_UNSUPPORTED_OPERATION The Emulator or target device does not support the required feature. * For more information, see @@ -443,18 +439,18 @@ public: * @exception E_INVALID_FORMAT The cached data cannot be converted to the NDEF message. * @exception E_OUT_OF_MEMORY The memory is insufficient. * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. - * @exception E_USER_NOT_CONSENTED The user blocks an application from calling this method. @b Since: @b 2.1 + * @exception E_USER_NOT_CONSENTED The user has blocked the application from calling this method. @b Since: @b 2.1 * @exception E_SYSTEM A system error has occurred. * @remarks * - The input NdefMessage instance should be deleted by the application after it is used, even * outside this method. The NdefMessage::RemoveAllRecords() method should be called with @c true as - * the input value immediately before the NdefMessage instance is deleted. + * the input value immediately before the %NdefMessage instance is deleted. * - The specific error code can be accessed using the GetLastResult() method. * - Before calling this method, check whether the feature is supported by * Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&). * @see * The Conditional NFC App Launch guide - * @see Tizen::App::AppManager::RegisterAppLaunch + * @see Tizen::App::AppManager::RegisterAppLaunch() */ static NdefMessage* GetCachedNdefMessageN(void); @@ -477,7 +473,7 @@ public: * * Application Filtering. * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. - * @exception E_USER_NOT_CONSENTED The user blocks an application from calling this method. @b Since: @b 2.1 + * @exception E_USER_NOT_CONSENTED The user has blocked the application from calling this method. @b Since: @b 2.1 * @exception E_SYSTEM A system error has occurred. * @remarks * - Note that this method is used to enable or disable the launch pop-up when the application is in diff --git a/inc/FNetNfcNfcTag.h b/inc/FNetNfcNfcTag.h index 932e4f0..96d85bf 100644 --- a/inc/FNetNfcNfcTag.h +++ b/inc/FNetNfcNfcTag.h @@ -44,13 +44,13 @@ class _NfcTagImpl; /** * @class NfcTag - * @brief This class represents the NFC target tag. + * @brief This class represents an NFC target tag. * * @since 2.0 * - * The %NfcTag class provides information about the detected NFC tag. @n + * The %NfcTag class provides information about a detected NFC tag. @n * This class has multiple tag types for the target tag. For example, the GetTagTypeList() method returns a list of tag - * types that include NFC_TAG_TYPE_MIFARE_UL and NFC_TAG_TYPE_FORUM_TYPE_2, because the tag is a Mifare Ultralight tag + * types that include ::NFC_TAG_TYPE_MIFARE_UL and ::NFC_TAG_TYPE_FORUM_TYPE_2, because the tag is a Mifare Ultralight tag * and it is also an NFC Forum tag type 2. * * For more information on the class features, see @@ -61,19 +61,19 @@ class _OSP_EXPORT_ NfcTag { public: /** - * Gets the list of the tag types. + * Gets the list of tag types. * * @since 2.0 * - * @return The list of the tag types - * @remarks The return list includes single or multiple tags. For example, if the target tag is Mifare - * Ultralight tag type and the NFC Forum tag 2 type, the list includes NFC_TAG_TYPE_MIFARE_UL and - * NFC_TAG_TYPE_FORUM_TYPE_2. + * @return The list of tag types @n + * The return list includes single or multiple tags. For example, if the target tag is Mifare + * Ultralight tag type and the NFC Forum tag 2 type, the list includes @c NFC_TAG_TYPE_MIFARE_UL and + * @c NFC_TAG_TYPE_FORUM_TYPE_2. */ const Tizen::Base::Collection::IListT * GetTagTypeList(void) const; /** - * Checks whether the tag has the specified tag type. + * Checks whether a tag has the specified tag type. * * @since 2.0 * @@ -84,13 +84,13 @@ public: bool HasTagType(NfcTagType type) const; /** - * Gets the ID of the tag. + * Gets the ID of a tag. * * @since 2.0 * * @return The ID of the tag, @n * else @c null if the tag has no ID - * @remarks Most tags have an unique ID (UID) or a random ID (RID) that is generated every time when they are + * @remarks Most tags have a unique ID (UID) or a random ID (RID) that is generated every time they are * discovered. Some tags, however, do not have any ID. */ const Tizen::Base::ByteBuffer* GetId(void) const; diff --git a/inc/FNetNfcNfcTypes.h b/inc/FNetNfcNfcTypes.h index d4c8c61..d864d25 100644 --- a/inc/FNetNfcNfcTypes.h +++ b/inc/FNetNfcNfcTypes.h @@ -18,7 +18,7 @@ * @file FNetNfcNfcTypes.h * @brief This is the header file for defining types in the %Nfc namespace. * -* This header file contains the definition of common types and enumerators for the %NFC features. +* This header file contains the definition of common types and enumerators for the NFC features. */ #ifndef _FNET_NFC_NFC_TYPES_H_ #define _FNET_NFC_NFC_TYPES_H_ @@ -29,15 +29,15 @@ namespace Tizen { namespace Net { namespace Nfc /** * @enum NfcTagType * - * Defines the types of the NFC tag. + * Defines the types of NFC tags. * * @since 2.0 */ enum NfcTagType { NFC_TAG_TYPE_UNKNOWN = 0x00, /**< The unknown tag type - * @remarks This type should not be used for the event filtering - * purpose as the input argument of + * @remarks This type should not be used for event filtering + * purposes as the input argument of * NfcManager::AddTagDiscoveryEventListener(). */ NFC_TAG_TYPE_ISO14443_3A, /**< The ISO14443 Part 3A tag type @n @@ -74,7 +74,7 @@ enum NfcTagType /** * @enum NdefRecordTypeNameFormat * - * Defines the type name formats of the NDEF record. + * Defines the type name formats of an NDEF record. * * @since 2.0 */ @@ -82,7 +82,7 @@ enum NfcTagType enum NdefRecordTypeNameFormat { NDEF_TNF_EMPTY = 0x00, /**< The empty record type */ - NDEF_TNF_WELL_KNOWN = 0x01, /**< The NFC forum defined record type */ + NDEF_TNF_WELL_KNOWN = 0x01, /**< The NFC forum-defined record type */ NDEF_TNF_MIME_MEDIA = 0x02, /**< The RFC2046 MIME media record type */ NDEF_TNF_ABSOLUTE_URI = 0x03, /**< The absolute URI record type */ NDEF_TNF_EXTERNAL = 0x04, /**< The user-defined record type (application specific) */ diff --git a/inc/FNetNfcTagConnection.h b/inc/FNetNfcTagConnection.h index 88e2f1f..a51965a 100644 --- a/inc/FNetNfcTagConnection.h +++ b/inc/FNetNfcTagConnection.h @@ -41,13 +41,13 @@ class ITagConnectionListener; /** * @class TagConnection - * @brief This class represents the connection with an NFC tag. It provides the mechanism to communicate with the NFC - * tag through ISO14443 or a general Radio Frequency Identification (RFID) manner. + * @brief This class represents the connection with an NFC tag. It provides a mechanism to communicate with the NFC + * tag through ISO14443 or in a general Radio Frequency Identification (RFID) manner. * * @since 2.0 * - * The %TagConnection class represents the connection with an NFC tag. It provides the mechanism to communicate with - * the NFC tag through ISO14443 or a general Radio Frequency Identification (RFID) manner. @n + * The %TagConnection class represents the connection with an NFC tag. It provides a mechanism to communicate with + * the NFC tag through ISO14443 or in a general Radio Frequency Identification (RFID) manner. @n * The class has an NfcTag instance that represents the target tag. This class can be inherited by the * NdefTagConnection class if the target tag supports the NFC Data Exchange Format (NDEF) operations. * @@ -169,16 +169,16 @@ public: const NfcTag* GetTargetTag(void) const; /** - * Sets a listener for receiving the response of the command sent on this tag connection. + * Sets a listener for receiving the response of a command sent on this tag connection. * * @since 2.0 * * @return An error code - * @param[in] pListener The listener to add + * @param[in] pListener The listener to add @n + * If it is @c null, the listener that is already registered gets unregistered. * @exception E_SUCCESS The method is successful. * @exception E_SYSTEM A system error has occurred. - * @remarks Only one event listener can be registered. If the input parameter is @c null, the listener that is - * already registered gets unregistered. + * @remarks Only one event listener can be registered. */ result SetTagConnectionListener(ITagConnectionListener* pListener); @@ -190,10 +190,10 @@ public: * @return An error code * @param[in] command The command to send * @exception E_SUCCESS The method is successful. - * @exception E_INVALID_ARG The input @c command is invalid. + * @exception E_INVALID_ARG The specified @c command is invalid. * @exception E_IN_PROGRESS The previous send request is in progress. * @exception E_CONNECTION_BUSY The connection is busy. Therefore, the method cannot process the send request. - * @exception E_CONNECTION_FAILED The connection to the tag is closed or it has failed. + * @exception E_CONNECTION_FAILED The connection to the tag has closed or has failed. * @exception E_SYSTEM A system error has occurred. * @see ITagConnectionListener::OnNfcResponseReceivedN() */ diff --git a/packaging/osp-nfc.spec b/packaging/osp-nfc.spec index 0426ee4..7e3f000 100755 --- a/packaging/osp-nfc.spec +++ b/packaging/osp-nfc.spec @@ -1,6 +1,6 @@ Name: osp-nfc Summary: osp nfc library -Version: 1.2.1.0 +Version: 1.2.2.0 Release: 2 Group: System/Libraries License: TO_BE/FILLED_IN @@ -43,11 +43,22 @@ osp nfc library (Internal-DEV) %setup -q %build +%if 0%{?tizen_build_binary_release_type_eng} +CXXFLAGS="$CXXFLAGS -D_SECURE_LOG" +%endif MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` %ifarch %{ix86} -CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_X86_ -D_OSP_EMUL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER} +%if 0%{?simulator} +CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_OSP_X86_ -D_OSP_EMUL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER} +%else +CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_OSP_X86_ " cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER} +%endif %else +%if 0%{?tizen_build_binary_release_type_eng} CXXFLAGS="-O2 -g -pipe -Wall -fno-exceptions -Wformat -Wformat-security -Wl,--as-needed -fmessage-length=0 -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -D__SOFTFP__ -mthumb -Wa,-mimplicit-it=thumb -funwind-tables -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_ARMEL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER} +%else +CXXFLAGS="-O2 -g -pipe -Wall -fno-exceptions -Wformat -Wformat-security -Wl,--as-needed -fmessage-length=0 -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -D__SOFTFP__ -mthumb -Wa,-mimplicit-it=thumb -funwind-tables -D_OSP_DEBUG_ -D_OSP_ARMEL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER} +%endif %endif # Call make instruction with smp support diff --git a/src/FNetNfcNfcManager.cpp b/src/FNetNfcNfcManager.cpp index 5645c7a..61f9ebb 100644 --- a/src/FNetNfcNfcManager.cpp +++ b/src/FNetNfcNfcManager.cpp @@ -59,8 +59,7 @@ NfcManager::Construct(INfcManagerEventListener& listener) bool isNfcSupported = false; r = _SystemInfoImpl::GetSysInfo(L"http://tizen.org/feature/network.nfc", isNfcSupported); - TryReturn((r == E_SUCCESS) && (isNfcSupported == true), E_UNSUPPORTED_OPERATION, - "[E_UNSUPPORTED_OPERATION] NFC is not supported."); + SysTryReturnResult(NID_NET_NFC, (r == E_SUCCESS) && (isNfcSupported == true), E_UNSUPPORTED_OPERATION, "NFC is not supported."); SysAssertf(__pImpl == null, "Already constructed. Calling Construct() twice or more on a same instance is not allowed for this class."); @@ -68,7 +67,7 @@ NfcManager::Construct(INfcManagerEventListener& listener) __pImpl = new (std::nothrow) _NfcManagerImpl; - TryReturn(__pImpl != null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Creating __pImpl instance failed."); + SysTryReturnResult(NID_NET_NFC, __pImpl != null, E_OUT_OF_MEMORY, "Creating __pImpl instance failed."); r = __pImpl->Construct(listener); r = TransExceptionsExclusive(r, E_SYSTEM, E_OUT_OF_MEMORY); @@ -141,16 +140,11 @@ NfcManager::GetCurrentTagConnectionN(void) const // Privilege check r = _AccessController::CheckUserPrivilege(_PRV_NFC_TAG); r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY, E_USER_NOT_CONSENTED); - TryCatch(r == E_SUCCESS, , "[%s] The application is not permitted to call this method.", GetErrorMessage(r)); + SysTryReturn(NID_NET_NFC, r == E_SUCCESS, null, r, "[%s] The application is not permitted to call this method.", GetErrorMessage(r)); SysAssertf(__pImpl != null, "Not yet constructed. Construct() should be called before use."); return __pImpl->GetCurrentTagConnectionN(); - - CATCH: - SetLastResult(r); - - return null; } NdefMessage* @@ -162,20 +156,15 @@ NfcManager::GetCachedNdefMessageN(void) ClearLastResult(); r = _SystemInfoImpl::GetSysInfo(L"http://tizen.org/feature/network.nfc", isNfcSupported); - TryCatch((r == E_SUCCESS) && (isNfcSupported == true), r = E_UNSUPPORTED_OPERATION, + SysTryReturn(NID_NET_NFC, (r == E_SUCCESS) && (isNfcSupported == true), null, E_UNSUPPORTED_OPERATION, "[E_UNSUPPORTED_OPERATION] NFC is not supported."); // Privilege check r = _AccessController::CheckUserPrivilege(_PRV_NFC_COMMON); r = TransExceptionsExclusive(r, E_PRIVILEGE_DENIED, E_OUT_OF_MEMORY, E_USER_NOT_CONSENTED); - TryCatch(r == E_SUCCESS, , "[%s] The application is not permitted to call this method.", GetErrorMessage(r)); + SysTryReturn(NID_NET_NFC, r == E_SUCCESS, null, r, "[%s] The application is not permitted to call this method.", GetErrorMessage(r)); return _NfcManagerImpl::GetCachedNdefMessageN(); - -CATCH: - SetLastResult(r); - - return null; } result @@ -185,8 +174,7 @@ NfcManager::SetLaunchPopupEnabled(bool enable) bool isNfcSupported = false; r = _SystemInfoImpl::GetSysInfo(L"http://tizen.org/feature/network.nfc", isNfcSupported); - TryReturn((r == E_SUCCESS) && (isNfcSupported == true), E_UNSUPPORTED_OPERATION, - "[E_UNSUPPORTED_OPERATION] NFC is not supported."); + SysTryReturnResult(NID_NET_NFC, (r == E_SUCCESS) && (isNfcSupported == true), E_UNSUPPORTED_OPERATION, "NFC is not supported."); // Privilege check r = _AccessController::CheckUserPrivilege(_PRV_NFC_COMMON); diff --git a/src/FNetNfc_NdefMessageImpl.cpp b/src/FNetNfc_NdefMessageImpl.cpp index 69704c9..9d542a7 100644 --- a/src/FNetNfc_NdefMessageImpl.cpp +++ b/src/FNetNfc_NdefMessageImpl.cpp @@ -110,8 +110,7 @@ _NdefMessageImpl::AppendRecord(const NdefRecord& record) { // Checks whether the same id already exists or not NdefRecord* pRecord = GetRecord(recordId); - TryReturn(pRecord == null, E_INVALID_ARG, - "[E_INVALID_ARG] Invalid argument is used. NDEF record with the same payload identifier already exists."); + SysTryReturnResult(NID_NET_NFC, pRecord == null, E_INVALID_ARG, "Invalid argument is used. NDEF record with the same payload identifier already exists."); } recordType = record.GetRecordType(); @@ -189,8 +188,7 @@ _NdefMessageImpl::InsertRecordAt(const NdefRecord& record, int index) { // Checks whether the same id already exists or not NdefRecord* pRecord = GetRecord(recordId); - TryReturn(pRecord == null, E_INVALID_ARG, - "[E_INVALID_ARG] Invalid argument is used. NDEF record with the same payload identifier already exists."); + SysTryReturnResult(NID_NET_NFC, pRecord == null, E_INVALID_ARG, "Invalid argument is used. NDEF record with the same payload identifier already exists."); } recordType = record.GetRecordType(); @@ -264,8 +262,8 @@ _NdefMessageImpl::SetRecordAt(const NdefRecord& record, int index, bool dealloca int searchIndex = -1; result res = E_SUCCESS; res = __pRecordList->IndexOf(*pRecord, searchIndex); - TryReturn(searchIndex == index, E_INVALID_ARG, - "[E_INVALID_ARG] Invalid argument is used. NDEF record with the same payload identifier already exists."); + SysTryReturnResult(NID_NET_NFC, searchIndex == index, E_INVALID_ARG, + "Invalid argument is used. NDEF record with the same payload identifier already exists."); } } diff --git a/src/FNetNfc_NdefMessageUtil.cpp b/src/FNetNfc_NdefMessageUtil.cpp index d947d6e..8259de4 100644 --- a/src/FNetNfc_NdefMessageUtil.cpp +++ b/src/FNetNfc_NdefMessageUtil.cpp @@ -409,7 +409,7 @@ _NdefMessageUtil::ToNdefMessageN(const Tizen::Base::ByteBuffer& buffer) String payloadId; pPayload = new (std::nothrow) ByteBuffer(); - TryCatch(pPayload != null, r = E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed."); + SysTryCatch(NID_NET_NFC, pPayload != null, r = E_OUT_OF_MEMORY, r, "[E_OUT_OF_MEMORY] Memory allocation failed."); r = ParseRecord(recordType, cf, payloadId, *pPayload, *pBuffer); if (r != E_SUCCESS) @@ -434,7 +434,7 @@ _NdefMessageUtil::ToNdefMessageN(const Tizen::Base::ByteBuffer& buffer) ByteBuffer* pAssembledPayload = null; pChunkedPayloadList = new (std::nothrow) LinkedList(); - TryCatch(pChunkedPayloadList != null, r = E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed."); + SysTryCatch(NID_NET_NFC, pChunkedPayloadList != null, r = E_OUT_OF_MEMORY, r, "[E_OUT_OF_MEMORY] Memory allocation failed."); int chunkedPayloadLen = pPayload->GetRemaining(); @@ -445,7 +445,7 @@ _NdefMessageUtil::ToNdefMessageN(const Tizen::Base::ByteBuffer& buffer) do { pPayload = new (std::nothrow) ByteBuffer(); - TryCatch(pPayload != null, r = E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed."); + SysTryCatch(NID_NET_NFC, pPayload != null, r = E_OUT_OF_MEMORY, r, "[E_OUT_OF_MEMORY] Memory allocation failed."); r = ParseRecord(recordType, cf, payloadId, *pPayload, *pBuffer); SysTryCatch(NID_NET_NFC, r == E_SUCCESS, r = E_INVALID_FORMAT, r, "[E_INVALID_FORMAT] Cannot be formulated to NDEF message"); @@ -461,7 +461,7 @@ _NdefMessageUtil::ToNdefMessageN(const Tizen::Base::ByteBuffer& buffer) // Assemble Payload; pAssembledPayload = new (std::nothrow) ByteBuffer(); - TryCatch(pAssembledPayload != null, r = E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed."); + SysTryCatch(NID_NET_NFC, pAssembledPayload != null, r = E_OUT_OF_MEMORY, r, "[E_OUT_OF_MEMORY] Memory allocation failed."); pAssembledPayload->Construct(payloadLen); for (int i = 0; i < pChunkedPayloadList->GetCount(); i++) { @@ -721,7 +721,7 @@ _NdefMessageUtil::GetEquivalentRecordTypesN(const NdefRecordType& recordType) String mimeName; pList = new (std::nothrow) LinkedList(); - TryCatch(pList != null, r = E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed."); + SysTryCatch(NID_NET_NFC, pList != null, r = E_OUT_OF_MEMORY, r, "[E_OUT_OF_MEMORY] Memory allocation failed."); switch (tnf) { @@ -731,7 +731,7 @@ _NdefMessageUtil::GetEquivalentRecordTypesN(const NdefRecordType& recordType) case NDEF_TNF_EXTERNAL: case NDEF_TNF_UNKNOWN: pRecordType = new (std::nothrow) NdefRecordType(recordType); - TryCatch(pRecordType != null, r = E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed."); + SysTryCatch(NID_NET_NFC, pRecordType != null, r = E_OUT_OF_MEMORY, r, "[E_OUT_OF_MEMORY] Memory allocation failed."); pList->Add(*pRecordType); break; @@ -739,7 +739,7 @@ _NdefMessageUtil::GetEquivalentRecordTypesN(const NdefRecordType& recordType) name = recordType.GetName(); pRecordType = new (std::nothrow) NdefRecordType(recordType); - TryCatch(pRecordType != null, r = E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed."); + SysTryCatch(NID_NET_NFC, pRecordType != null, r = E_OUT_OF_MEMORY, r, "[E_OUT_OF_MEMORY] Memory allocation failed."); pList->Add(*pRecordType); if (name.StartsWith(L"*", 0) == false) @@ -790,8 +790,6 @@ _NdefMessageUtil::GetEquivalentRecordTypesN(const NdefRecordType& recordType) return pList; CATCH: - SetLastResult(r); - if (pList != null) { pList->RemoveAll(true); diff --git a/src/FNetNfc_NdefRecordImpl.cpp b/src/FNetNfc_NdefRecordImpl.cpp index 53cd440..150e59a 100644 --- a/src/FNetNfc_NdefRecordImpl.cpp +++ b/src/FNetNfc_NdefRecordImpl.cpp @@ -155,11 +155,9 @@ _NdefRecordImpl::SetPayloadId(const Tizen::Base::String& id) result r = E_SUCCESS; NdefRecord* pNdefRecord = null; - TryReturn( - __type.GetNameFormat() != NDEF_TNF_EMPTY, E_INVALID_OPERATION, - "[E_INVALID_OPERATION] The record type is NDEF_TNF_EMPTY."); + SysTryReturnResult(NID_NET_NFC, __type.GetNameFormat() != NDEF_TNF_EMPTY, E_INVALID_OPERATION, "The record type is NDEF_TNF_EMPTY."); - TryReturn(id.GetLength() < 256, E_MAX_EXCEEDED, "[E_MAX_EXCEEDED] The length of the id should be less than 256."); + SysTryReturnResult(NID_NET_NFC, id.GetLength() < 256, E_MAX_EXCEEDED, "The length of the id should be less than 256."); if (id.IsEmpty() == false) { @@ -167,16 +165,15 @@ _NdefRecordImpl::SetPayloadId(const Tizen::Base::String& id) AsciiEncoding ascii; ByteBuffer* pBuff = ascii.GetBytesN(id); r = GetLastResult(); - TryReturn(pBuff != null, E_INVALID_ENCODING_RANGE, - "[E_INVALID_ENCODING_RANGE] Name contains characters outside US-ASCII range"); + SysTryReturnResult(NID_NET_NFC, pBuff != null, E_INVALID_ENCODING_RANGE, "Name contains characters outside US-ASCII range"); delete pBuff; // checks the uniqueness of id among all records in the NDEF message and return E_INVALID_ARG. if (__pMessageImpl != null) { pNdefRecord = __pMessageImpl->GetRecord(id); - TryReturn((pNdefRecord == null || pNdefRecord->__pImpl == this), E_INVALID_ARG, - "[E_INVALID_ARG] Invalid argument is used. The id already exists in the other records of the same NDEF message."); + SysTryReturnResult(NID_NET_NFC, (pNdefRecord == null || pNdefRecord->__pImpl == this), E_INVALID_ARG, + "Invalid argument is used. The id already exists in the other records of the same NDEF message."); } } __id = id; @@ -190,11 +187,10 @@ _NdefRecordImpl::SetPayload(const Tizen::Base::ByteBuffer& payload) result r = E_SUCCESS; unique_ptr pTempPayload; - TryReturn(__type.GetNameFormat() != NDEF_TNF_EMPTY, E_INVALID_OPERATION, - "[E_INVALID_OPERATION] The record type is NDEF_TNF_EMPTY"); + SysTryReturnResult(NID_NET_NFC, __type.GetNameFormat() != NDEF_TNF_EMPTY, E_INVALID_OPERATION, "The record type is NDEF_TNF_EMPTY"); pTempPayload.reset(new (std::nothrow) ByteBuffer()); - TryReturn(pTempPayload != null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed."); + SysTryReturnResult(NID_NET_NFC, pTempPayload != null, E_OUT_OF_MEMORY, "Memory allocation failed."); // Propagates the result (E_SUCCESS or E_INVALID_ARG) r = pTempPayload->Construct(payload); diff --git a/src/FNetNfc_NdefRecordTypeImpl.cpp b/src/FNetNfc_NdefRecordTypeImpl.cpp index 51f9faf..6e4f757 100644 --- a/src/FNetNfc_NdefRecordTypeImpl.cpp +++ b/src/FNetNfc_NdefRecordTypeImpl.cpp @@ -243,10 +243,10 @@ _NdefRecordTypeImpl::SetName(const Tizen::Base::String& name) AsciiEncoding ascii; ByteBuffer* pBuff = null; - TryReturn((__format != NDEF_TNF_EMPTY) && (__format != NDEF_TNF_UNKNOWN) && (__format != NDEF_TNF_ALL), - E_INVALID_OPERATION, "[E_INVALID_OPERATION] The record type is NDEF_TNF_EMPTY or NDEF_TNF_UNKNOWN"); + SysTryReturnResult(NID_NET_NFC, (__format != NDEF_TNF_EMPTY) && (__format != NDEF_TNF_UNKNOWN) && (__format != NDEF_TNF_ALL), + E_INVALID_OPERATION, " The record type is NDEF_TNF_EMPTY or NDEF_TNF_UNKNOWN"); - TryReturn(name.GetLength() < 256, E_MAX_EXCEEDED, "[E_MAX_EXCEEDED] The length of the name should be less than 256"); + SysTryReturnResult(NID_NET_NFC, name.GetLength() < 256, E_MAX_EXCEEDED, "The length of the name should be less than 256"); if (name.IsEmpty()) { @@ -257,12 +257,11 @@ _NdefRecordTypeImpl::SetName(const Tizen::Base::String& name) { // check if name includes non US-ASCII character or not pBuff = ascii.GetBytesN(name); - TryReturn(pBuff != null, E_INVALID_ENCODING_RANGE, - "[E_INVALID_ENCODING_RANGE] Name contains characters outside US-ASCII range"); + SysTryReturnResult(NID_NET_NFC, pBuff != null, E_INVALID_ENCODING_RANGE, "Name contains characters outside US-ASCII range"); delete pBuff; isValid = _NdefMessageUtil::IsValidRecordType(__format, name); - TryReturn(isValid == true, E_INVALID_FORMAT, "[E_INVALID_FORMAT] Invalid name"); + SysTryReturnResult(NID_NET_NFC, isValid == true, E_INVALID_FORMAT, "Invalid name"); } diff --git a/src/FNetNfc_NfcIpcProxy.cpp b/src/FNetNfc_NfcIpcProxy.cpp index 1c403fc..bd5047c 100644 --- a/src/FNetNfc_NfcIpcProxy.cpp +++ b/src/FNetNfc_NfcIpcProxy.cpp @@ -36,7 +36,7 @@ using namespace Tizen::Io; namespace Tizen { namespace Net { namespace Nfc { - +typedef IMapEnumeratorT _NfcCandidatesMapEnumerator; _NfcIpcProxy* _NfcIpcProxy::__pSingleton = null; _NfcIpcProxy::_NfcIpcProxy(void) : @@ -124,25 +124,6 @@ _NfcIpcProxy::InitializeNfc(void) const } result -_NfcIpcProxy::SetLaunchPopupEnabled(bool enable) const -{ - result r = E_SUCCESS; - IPC::Message* pMessage = null; - unsigned long ret = 0; - - pMessage = new (std::nothrow) ConnectivityNfcServiceMsg_setLaunchPopupEnabled(enable, &ret); - SysTryReturnResult(NID_NET_NFC, pMessage != null, E_OUT_OF_MEMORY, "Memory allocation failed."); - - r = __pIpcClient->SendRequest(*pMessage); - delete pMessage; - SysTryReturnResult(NID_NET_NFC, r == E_SUCCESS && ret == E_SUCCESS, E_SYSTEM, "A system error occurred."); - - SysLog(NID_NET_NFC, "Setting the NFC popup enabled option through IPC is successful."); - - return ret; -} - -result _NfcIpcProxy::RegisterNdefPushMessage(const Tizen::Base::ByteBuffer& message, const Tizen::Base::String& description) const { result r = E_SUCCESS; @@ -244,13 +225,19 @@ _NfcIpcProxy::GetReservedPushCandidatesN(void) const { result r = E_SUCCESS; IPC::Message* pMessage = null; - unique_ptr pCandidates; + unique_ptr pCandidatesHashMap; + unique_ptr<_StringMap> pCandidates; + unique_ptr pAppPkgId; + unique_ptr pMsgDesc; unsigned long ret = 0; - pCandidates.reset(new (std::nothrow) HashMap(SingleObjectDeleter)); + pCandidates.reset(new (std::nothrow) _StringMap()); SysTryReturn(NID_NET_NFC, pCandidates != null, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed."); - pCandidates->Construct(); + pCandidatesHashMap.reset(new (std::nothrow) HashMap(SingleObjectDeleter)); + SysTryReturn(NID_NET_NFC, pCandidatesHashMap != null, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed."); + + pCandidatesHashMap->Construct(); pMessage = new (std::nothrow) ConnectivityNfcServiceMsg_getReservedPushCandidates(pCandidates.get(), &ret); SysTryReturn(NID_NET_NFC, pMessage != null, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed."); @@ -262,7 +249,22 @@ _NfcIpcProxy::GetReservedPushCandidatesN(void) const SysLog(NID_NET_NFC, "Getting the Reserved Push candidate list through IPC is successful."); - return pCandidates.release(); + unique_ptr<_NfcCandidatesMapEnumerator> pCandidatesEnum(pCandidates->GetMapEnumeratorN()); + + while (pCandidatesEnum->MoveNext() == E_SUCCESS) + { + pAppPkgId.reset(new (std::nothrow) String()); + SysTryReturn(NID_NET_NFC, pAppPkgId != null, null, E_OUT_OF_MEMORY, "Memory allocation failed."); + + pMsgDesc.reset(new (std::nothrow) String()); + SysTryReturn(NID_NET_NFC, pMsgDesc != null, null, E_OUT_OF_MEMORY, "Memory allocation failed."); + + pCandidatesEnum->GetKey(*pAppPkgId); + pCandidatesEnum->GetValue(*pMsgDesc); + pCandidatesHashMap->Add(pAppPkgId.release(), pMsgDesc.release()); + } + + return pCandidatesHashMap.release(); } result diff --git a/src/FNetNfc_NfcIpcProxy.h b/src/FNetNfc_NfcIpcProxy.h index 123c1d4..a8c2a25 100644 --- a/src/FNetNfc_NfcIpcProxy.h +++ b/src/FNetNfc_NfcIpcProxy.h @@ -73,17 +73,6 @@ public: */ result InitializeNfc(void) const; - /** - * Sets the enabling option of NFC Conditional Launch Popup through IPC. - * - * @return An error code - * @param[in] enable Set to @c true to enable the Conditional NFC App Launch pop-up, @n - * @c else false - * @exception E_SUCCESS The method was successful. - * @exception E_SYSTEM A system error occurred. - */ - result SetLaunchPopupEnabled(bool enable) const; - /** * Registers an NDEF message to be pushed through IPC. * diff --git a/src/FNetNfc_NfcManagerImpl.cpp b/src/FNetNfc_NfcManagerImpl.cpp index c14d4b0..5eace6e 100644 --- a/src/FNetNfc_NfcManagerImpl.cpp +++ b/src/FNetNfc_NfcManagerImpl.cpp @@ -45,7 +45,6 @@ #include "FNetNfc_NdefMessageUtil.h" #include "FNetNfc_NfcTagImpl.h" #include "FNetNfc_TagConnectionImpl.h" -#include "FNetNfc_NfcAuthorityController.h" #include "FNetNfc_NfcSystemAdapter.h" #include "FNetNfc_NfcDeviceDiscoveryEvent.h" #include "FNetNfc_NfcDeviceDiscoveryEventArg.h" @@ -858,15 +857,8 @@ result _NfcManagerImpl::SetLaunchPopupEnabled(bool enable) { result r = E_SYSTEM; - _NfcAuthorityController* pController = null; - - pController = _NfcAuthorityController::GetInstance(); - - if (pController) - { - r = pController->SetLaunchPopupEnabled(enable); - } + r = _NfcSystemAdapter::GetInstance()->SetLaunchPopupEnabled(enable); SysTryReturn(NID_NET_NFC, r == E_SUCCESS, r, r, "[%s] error occurred on %s the launch popup.", GetErrorMessage(r), enable ? "enabling" : "disabling"); diff --git a/src/FNetNfc_NfcSystemAdapter.cpp b/src/FNetNfc_NfcSystemAdapter.cpp index 9280b5c..45455c4 100644 --- a/src/FNetNfc_NfcSystemAdapter.cpp +++ b/src/FNetNfc_NfcSystemAdapter.cpp @@ -24,6 +24,7 @@ #include #include #include +#include "FNetNfc_NfcIpcProxy.h" #include "FNetNfc_NfcSystemAdapter.h" #include "FNetNfc_NfcTagImpl.h" #include "FNetNfc_NdefMessageUtil.h" @@ -86,6 +87,7 @@ _NfcSystemAdapter::_NfcSystemAdapter(void) , __tagHandle(null) , __p2pTargetHandle(null) , __isConnected(false) + , __pIpcProxy(null) { } @@ -143,6 +145,13 @@ _NfcSystemAdapter::Construct(void) SysTryReturnResult(NID_NET_NFC, res == NFC_ERROR_NONE, E_SYSTEM, "Failed to initialize the NFC from the result."); SysLog(NID_NET_NFC, "nfc_manager_initialize_sync() is invoked successfully."); + __pIpcProxy = _NfcIpcProxy::GetInstance(); + SysTryReturnResult(NID_NET_NFC, __pIpcProxy != null, E_SYSTEM, "Failed to create _NfcIpcProxy."); + + r = __pIpcProxy->InitializeNfc(); + SysTryReturnResult(NID_NET_NFC, r == E_SUCCESS, E_SYSTEM, + "Failed to initialize the NFC service of osp-connectivity-service."); + // set the response callback nfc_manager_set_activation_changed_cb(&OnNfcActivationChanged, this); nfc_manager_set_tag_discovered_cb(&OnNfcTagDiscovered, this); @@ -461,7 +470,7 @@ _NfcSystemAdapter::Write(const NdefMessage& message) result r = E_SUCCESS; int res = NFC_ERROR_NONE; nfc_ndef_message_h ndefMessageH = NULL; - int length = 0; + unsigned int length = 0; // convert NdefMessage to ByteBuffer unique_ptr pByteBuffer(message.ToByteBufferN()); @@ -497,7 +506,7 @@ _NfcSystemAdapter::Push(const NdefMessage& message) int res = NFC_ERROR_NONE; result r = E_SUCCESS; nfc_ndef_message_h ndefMessageH = NULL; - int length = 0; + unsigned int length = 0; // convert NdefMessage to ByteBuffer unique_ptr pByteBuffer(message.ToByteBufferN()); @@ -524,6 +533,19 @@ _NfcSystemAdapter::Push(const NdefMessage& message) return E_SUCCESS; } +result +_NfcSystemAdapter::SetLaunchPopupEnabled(bool enable) +{ + int res = NFC_ERROR_NONE; + result r = E_SUCCESS; + + res = nfc_manager_set_system_handler_enable(enable); + _NfcConvertErrorResult(res != NFC_ERROR_NONE, r, E_SYSTEM); + SysTryReturnResult(NID_NET_NFC, r == E_SUCCESS, r, "Failed to %s system handler. [0x%08X]", enable ? "enabling" : "disabling", res); + + return r; +} + void _NfcSystemAdapter::OnNfcActivationCompleted(nfc_error_e error, void* pUserData) { @@ -864,7 +886,7 @@ _NfcSystemAdapter::GetNdefMessageN(const nfc_ndef_message_h& messageHandle) int res = NFC_ERROR_NONE; result r = E_SUCCESS; byte* pTempBuffer = null; - int bufSize = 0; + unsigned int bufSize = 0; ByteBuffer byteMessage; ClearLastResult(); diff --git a/src/FNetNfc_NfcSystemAdapter.h b/src/FNetNfc_NfcSystemAdapter.h index a8de5d3..0d37069 100644 --- a/src/FNetNfc_NfcSystemAdapter.h +++ b/src/FNetNfc_NfcSystemAdapter.h @@ -49,6 +49,7 @@ class _INfcDeviceDiscoveryEventListener; class _NfcManagerImpl; class _TagConnectionImpl; class _NdefPushManagerImpl; +class _NfcIpcProxy; /** * @class _NfcSystemAdapter @@ -278,6 +279,14 @@ public: */ result Push(const NdefMessage& message); + /** + * Enables or disables the Conditional NFC App Launch pop-up. + * + * @return An error code + * @exception E_SUCCESS The method is successful. + * @exception E_SYSTEM A system error has occurred. + */ + result SetLaunchPopupEnabled(bool enable); /** * Callback to notify that the NFC activation or deactivation is completed. @@ -371,6 +380,7 @@ private: nfc_p2p_target_h __p2pTargetHandle; bool __isConnected; // TODO: temporary defined due to get the current tag connection state. static _NfcSystemAdapter* __pSingleton; + _NfcIpcProxy* __pIpcProxy; friend class std::default_delete< _NfcSystemAdapter >; }; // _NfcSystemAdapter diff --git a/src/inc/FNetNfc_ConnectivityIpcMessages.h b/src/inc/FNetNfc_ConnectivityIpcMessages.h index 94eee4d..4a11b5e 100644 --- a/src/inc/FNetNfc_ConnectivityIpcMessages.h +++ b/src/inc/FNetNfc_ConnectivityIpcMessages.h @@ -33,12 +33,11 @@ // Client -> Server (sync) IPC_SYNC_MESSAGE_CONTROL0_1(ConnectivityNfcServiceMsg_initialize, unsigned long /* result */) -IPC_SYNC_MESSAGE_CONTROL1_1(ConnectivityNfcServiceMsg_setLaunchPopupEnabled, bool /* enable */, unsigned long /* result */) IPC_SYNC_MESSAGE_CONTROL2_1(ConnectivityNfcServiceMsg_registerPushMessage, Tizen::Base::ByteBuffer /* message */, Tizen::Base::String /* description */, unsigned long /* result */) IPC_SYNC_MESSAGE_CONTROL0_1(ConnectivityNfcServiceMsg_unregisterPushMessage, unsigned long /* result */) IPC_SYNC_MESSAGE_CONTROL0_1(ConnectivityNfcServiceMsg_activateReservedPush, unsigned long /* result */) IPC_SYNC_MESSAGE_CONTROL0_1(ConnectivityNfcServiceMsg_deactivateReservedPush, unsigned long /* result */) IPC_SYNC_MESSAGE_CONTROL0_1(ConnectivityNfcServiceMsg_isReservedPushActivated, bool /* isActivated */) -IPC_SYNC_MESSAGE_CONTROL0_2(ConnectivityNfcServiceMsg_getReservedPushCandidates, Tizen::Base::Collection::HashMap /* candidates */, unsigned long /* result */) +IPC_SYNC_MESSAGE_CONTROL0_2(ConnectivityNfcServiceMsg_getReservedPushCandidates, Tizen::Io::_StringMap /* candidates */, unsigned long /* result */) IPC_SYNC_MESSAGE_CONTROL1_1(ConnectivityNfcServiceMsg_pickReservedPushMessage, Tizen::Base::String /* appId */, unsigned long /* result */) IPC_SYNC_MESSAGE_CONTROL0_2(ConnectivityNfcServiceMsg_getPickedReservedPushMessage, Tizen::Base::String /* appId */, unsigned long /* result */) -- 2.7.4