From 2f5c9b176876d0c1a1a2598169910e1db934c9dc Mon Sep 17 00:00:00 2001 From: DotnetBuild Date: Tue, 19 Sep 2017 09:00:30 +0900 Subject: [PATCH] Release 4.0.0-preview1-00220 --- packaging/csapi-tizenfx.spec | 4 ++-- .../ConnectionInternalManager.cs | 18 ++++++++++------ .../Tizen.Network.WiFi/WiFiAP.cs | 22 ++++++++++++++----- .../Tizen.Network.WiFi/WiFiManagerImpl.cs | 25 +++++++++++++++++----- 4 files changed, 51 insertions(+), 18 deletions(-) diff --git a/packaging/csapi-tizenfx.spec b/packaging/csapi-tizenfx.spec index 8c62ab6..e769719 100644 --- a/packaging/csapi-tizenfx.spec +++ b/packaging/csapi-tizenfx.spec @@ -7,7 +7,7 @@ Name: csapi-tizenfx Summary: Assemblies of Tizen .NET -Version: 4.0.0.219 +Version: 4.0.0.220 Release: 1 Group: Development/Libraries License: Apache-2.0 @@ -132,7 +132,7 @@ rm -fr %{_tizenfx_bin_path} export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true ./build.sh --full ./build.sh --dummy -./build.sh --pack 4.0.0-preview1-00219 +./build.sh --pack 4.0.0-preview1-00220 %install mkdir -p %{buildroot}%{DOTNET_ASSEMBLY_PATH} diff --git a/src/Tizen.Network.Connection/Tizen.Network.Connection/ConnectionInternalManager.cs b/src/Tizen.Network.Connection/Tizen.Network.Connection/ConnectionInternalManager.cs index f9aa0be..2725077 100755 --- a/src/Tizen.Network.Connection/Tizen.Network.Connection/ConnectionInternalManager.cs +++ b/src/Tizen.Network.Connection/Tizen.Network.Connection/ConnectionInternalManager.cs @@ -809,8 +809,10 @@ namespace Tizen.Network.Connection Log.Error(Globals.LogTag, "Error occurs during set default cellular profile, " + Result); task.SetException(new InvalidOperationException("Error occurs during set default cellular profile, " + Result)); } - - task.SetResult(true); + else + { + task.SetResult(true); + } }; int ret = Interop.Connection.SetDefaultCellularServiceProfileAsync(GetHandle(), (int)type, profile.ProfileHandle, Callback, (IntPtr)0); @@ -894,8 +896,10 @@ namespace Tizen.Network.Connection Log.Error(Globals.LogTag, "Error occurs during connecting profile, " + Result); task.SetException(new InvalidOperationException("Error occurs during connecting profile, " + Result)); } - - task.SetResult(true); + else + { + task.SetResult(true); + } }; int ret = Interop.Connection.OpenProfile(GetHandle(), profile.ProfileHandle, Callback, IntPtr.Zero); @@ -930,8 +934,10 @@ namespace Tizen.Network.Connection Log.Error(Globals.LogTag, "Error occurs during disconnecting profile, " + Result); task.SetException(new InvalidOperationException("Error occurs during disconnecting profile, " + Result)); } - - task.SetResult(true); + else + { + task.SetResult(true); + } }; int ret = Interop.Connection.CloseProfile(GetHandle(), profile.ProfileHandle, Callback, IntPtr.Zero); diff --git a/src/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiAP.cs b/src/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiAP.cs index 350b275..b5fd4ae 100755 --- a/src/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiAP.cs +++ b/src/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiAP.cs @@ -228,7 +228,10 @@ namespace Tizen.Network.WiFi Log.Error(Globals.LogTag, "Error occurs during WiFi connecting, " + (WiFiError)error); task.SetException(new InvalidOperationException("Error occurs during WiFi connecting, " + (WiFiError)error)); } - task.SetResult(true); + else + { + task.SetResult(true); + } lock (_callback_map) { _callback_map.Remove(key); @@ -283,7 +286,10 @@ namespace Tizen.Network.WiFi Log.Error(Globals.LogTag, "Error occurs during WiFi connecting, " + (WiFiError)error); task.SetException(new InvalidOperationException("Error occurs during WiFi connecting, " + (WiFiError)error)); } - task.SetResult(true); + else + { + task.SetResult(true); + } lock (_callback_map) { _callback_map.Remove(key); @@ -357,8 +363,11 @@ namespace Tizen.Network.WiFi Log.Error(Globals.LogTag, "Error occurs during WiFi connecting, " + (WiFiError)error); task.SetException(new InvalidOperationException("Error occurs during WiFi connecting, " + (WiFiError)error)); } - WiFiAP ap = WiFiManagerImpl.Instance.GetConnectedAP(); - task.SetResult(ap); + else + { + WiFiAP ap = WiFiManagerImpl.Instance.GetConnectedAP(); + task.SetResult(ap); + } lock (s_callbackMap) { s_callbackMap.Remove(key); @@ -431,7 +440,10 @@ namespace Tizen.Network.WiFi Log.Error(Globals.LogTag, "Error occurs during WiFi disconnecting, " + (WiFiError)error); task.SetException(new InvalidOperationException("Error occurs during WiFi disconnecting, " + (WiFiError)error)); } - task.SetResult(true); + else + { + task.SetResult(true); + } lock (_callback_map) { _callback_map.Remove(key); diff --git a/src/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiManagerImpl.cs b/src/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiManagerImpl.cs index 10865c4..bd56b97 100755 --- a/src/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiManagerImpl.cs +++ b/src/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiManagerImpl.cs @@ -287,7 +287,10 @@ namespace Tizen.Network.WiFi Log.Error(Globals.LogTag, "Error occurs during WiFi activating, " + (WiFiError)error); task.SetException(new InvalidOperationException("Error occurs during WiFi activating, " + (WiFiError)error)); } - task.SetResult(true); + else + { + task.SetResult(true); + } lock (_callback_map) { _callback_map.Remove(key); @@ -319,7 +322,10 @@ namespace Tizen.Network.WiFi Log.Error(Globals.LogTag, "Error occurs during WiFi activating, " + (WiFiError)error); task.SetException(new InvalidOperationException("Error occurs during WiFi activating, " + (WiFiError)error)); } - task.SetResult(true); + else + { + task.SetResult(true); + } lock (_callback_map) { _callback_map.Remove(key); @@ -351,7 +357,10 @@ namespace Tizen.Network.WiFi Log.Error(Globals.LogTag, "Error occurs during WiFi deactivating, " + (WiFiError)error); task.SetException(new InvalidOperationException("Error occurs during WiFi deactivating, " + (WiFiError)error)); } - task.SetResult(true); + else + { + task.SetResult(true); + } lock (_callback_map) { _callback_map.Remove(key); @@ -383,7 +392,10 @@ namespace Tizen.Network.WiFi Log.Error(Globals.LogTag, "Error occurs during WiFi scanning, " + (WiFiError)error); task.SetException(new InvalidOperationException("Error occurs during WiFi scanning, " + (WiFiError)error)); } - task.SetResult(true); + else + { + task.SetResult(true); + } lock (_callback_map) { _callback_map.Remove(key); @@ -415,7 +427,10 @@ namespace Tizen.Network.WiFi Log.Error(Globals.LogTag, "Error occurs during WiFi scanning, " + (WiFiError)error); task.SetException(new InvalidOperationException("Error occurs during WiFi scanning, " + (WiFiError)error)); } - task.SetResult(true); + else + { + task.SetResult(true); + } lock (_callback_map) { _callback_map.Remove(key); -- 2.7.4