diff options
6 files changed, 17 insertions, 25 deletions
diff --git a/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcCardEmulationAdapter.cs b/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcCardEmulationAdapter.cs index a1a0a5c..c0ed2a2 100755 --- a/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcCardEmulationAdapter.cs +++ b/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcCardEmulationAdapter.cs @@ -326,7 +326,7 @@ namespace Tizen.Network.Nfc /// <returns>List of NfcRegisteredAidInformation objects.</returns> /// <param name="seType">The type of Secure Element.</param> /// <param name="category">Enumeration value of category.</param> - public IEnumerable<NfcRegisteredAidInformation> ForeachRegisteredAidInformations(NfcSecureElementType seType, NfcCardEmulationCategoryType category) + public IEnumerable<NfcRegisteredAidInformation> GetRegisteredAidInformation(NfcSecureElementType seType, NfcCardEmulationCategoryType category) { List<NfcRegisteredAidInformation> infoList = new List<NfcRegisteredAidInformation>(); Interop.Nfc.SecureElementRegisteredAidCallback callback = (int type, IntPtr aid, bool readOnly, IntPtr userData) => diff --git a/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcEventArgs.cs b/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcEventArgs.cs index 5aa93a2..81a9a75 100644 --- a/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcEventArgs.cs +++ b/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcEventArgs.cs @@ -126,9 +126,9 @@ namespace Tizen.Network.Nfc { _ndef = new NfcNdefMessage(messageHandle); } - + /// <summary> - /// Tag object + /// The NdefMessage object that is most recently received via NFC p2p mode or tag mode /// </summary> public NfcNdefMessage NdefMessage { diff --git a/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcManager.cs b/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcManager.cs index 85bc8df..14294f7 100755 --- a/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcManager.cs +++ b/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcManager.cs @@ -305,10 +305,10 @@ namespace Tizen.Network.Nfc } /// <summary> - /// Activates Nfc asynchronously. + /// Activates Nfc asynchronously. /// </summary> /// <returns>A task indicates whether the Activate method is done or not.</returns> - static public Task SetActivateAsync(bool activation) + static public Task SetActivationAsync(bool activation) { bool isNfcSupported = SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported); @@ -319,7 +319,7 @@ namespace Tizen.Network.Nfc try { - return NfcManagerImpl.Instance.SetActivateAsync(activation); + return NfcManagerImpl.Instance.SetActivationAsync(activation); } catch (TypeInitializationException e) { diff --git a/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcManagerImpl.cs b/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcManagerImpl.cs index ca2ce6d..801a9d1 100755 --- a/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcManagerImpl.cs +++ b/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcManagerImpl.cs @@ -236,7 +236,7 @@ namespace Tizen.Network.Nfc } } - internal Task SetActivateAsync(bool activation) + internal Task SetActivationAsync(bool activation) { TaskCompletionSource<bool> task = new TaskCompletionSource<bool>(); IntPtr id = IntPtr.Zero; @@ -256,15 +256,15 @@ namespace Tizen.Network.Nfc { _callback_map.Remove(key); } - };
-
- int ret = Interop.Nfc.SetActivation(activation, _callback_map[id], id);
- if (ret != (int)NfcError.None)
- {
- Log.Error(Globals.LogTag, "Failed to activate nfc, Error - " + (NfcError)ret);
- NfcErrorFactory.ThrowNfcException(ret);
- }
- }
+ }; + + int ret = Interop.Nfc.SetActivation(activation, _callback_map[id], id); + if (ret != (int)NfcError.None) + { + Log.Error(Globals.LogTag, "Failed to activate nfc, Error - " + (NfcError)ret); + NfcErrorFactory.ThrowNfcException(ret); + } + } return task.Task; } } diff --git a/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcNdefRecord.cs b/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcNdefRecord.cs index ca755f6..e8815f8 100755 --- a/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcNdefRecord.cs +++ b/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcNdefRecord.cs @@ -46,14 +46,6 @@ namespace Tizen.Network.Nfc return NfcConvertUtil.IntLengthIntPtrToByteArray(id, idLength); } - set - { - int ret = Interop.Nfc.NdefRecord.SetId(_recordHandle, value, value.Length); - if (ret != (int)NfcError.None) - { - Log.Error(Globals.LogTag, "Failed to set id, Error - " + (NfcError)ret); - } - } } /// <summary> diff --git a/packaging/csapi-network-nfc.spec b/packaging/csapi-network-nfc.spec index d0fc70a..c6b18f9 100755 --- a/packaging/csapi-network-nfc.spec +++ b/packaging/csapi-network-nfc.spec @@ -8,7 +8,7 @@ Name: csapi-network-nfc Summary: Tizen Nfc API for C# -Version: 1.0.5 +Version: 1.0.6 Release: 1 Group: Development/Libraries License: Apache-2.0 |