[Bluetooth][Non-ACR] Fix invalid sender issue (#1743)

Signed-off-by: Wootak Jung <wootak.jung@samsung.com>

diff --git a/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothAudio.cs b/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothAudio.cs
index 09ec09e..ee62604 100644 (file)
--- a/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothAudio.cs
+++ b/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothAudio.cs
@@ -29,23 +29,24 @@ namespace Tizen.Network.Bluetooth
     {
         internal BluetoothAudio()
         {
+            BluetoothAudioImpl.Instance.AgScoStateChanged += (s, e) => AgScoStateChanged?.Invoke(this, e);
+            BluetoothAudioImpl.Instance.AudioConnectionStateChanged += (s, e) => AudioConnectionStateChanged?.Invoke(this, e);
         }
 
         /// <summary>
         /// The AudioConnectionStateChanged event is called when the audio connection state is changed.
         /// </summary>
         /// <since_tizen> 3 </since_tizen>
-        public event EventHandler<AudioConnectionStateChangedEventArgs> AudioConnectionStateChanged
-        {
-            add
-            {
-                BluetoothAudioImpl.Instance.AudioConnectionStateChanged += value;
-            }
-            remove
-            {
-                BluetoothAudioImpl.Instance.AudioConnectionStateChanged -= value;
-            }
-        }
+        public event EventHandler<AudioConnectionStateChangedEventArgs> AudioConnectionStateChanged;
+
+        /// <summary>
+        /// This event is called when the AG(Audio Gateway) SCO(Synchronous Connection Oriented link) state is changed.
+        /// </summary>
+        /// <since_tizen> 6 </since_tizen>
+        /// <feature>http://tizen.org/feature/network.bluetooth</feature>
+        /// <feature>http://tizen.org/feature/network.bluetooth.audio.call</feature>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static event EventHandler<AgScoStateChangedEventArgs> AgScoStateChanged;
 
         /// <summary>
         /// Connects the remote device with the given audio profile.
@@ -153,25 +154,6 @@ namespace Tizen.Network.Bluetooth
         }
 
         /// <summary>
-        /// This event is called when the AG(Audio Gateway) SCO(Synchronous Connection Oriented link) state is changed.
-        /// </summary>
-        /// <since_tizen> 6 </since_tizen>
-        /// <feature>http://tizen.org/feature/network.bluetooth</feature>
-        /// <feature>http://tizen.org/feature/network.bluetooth.audio.call</feature>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public static event EventHandler<AgScoStateChangedEventArgs> AgScoStateChanged
-        {
-            add
-            {
-                BluetoothAudioImpl.Instance.AgScoStateChanged += value;
-            }
-            remove
-            {
-                BluetoothAudioImpl.Instance.AgScoStateChanged -= value;
-            }
-        }
-
-        /// <summary>
         /// Notifies the state of AG(Audio Gateway) voice recognition to the connected remote device.
         /// </summary>
         /// <param name="enable">The state of voice recognition. It is true if voice recognition state is enabled.</param>

diff --git a/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothAudioImpl.cs b/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothAudioImpl.cs
index c536f90..d9c494c 100644 (file)
--- a/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothAudioImpl.cs
+++ b/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothAudioImpl.cs
@@ -51,10 +51,7 @@ namespace Tizen.Network.Bluetooth
         {
             _audioConnectionChangedCallback = (int result, bool connected, string deviceAddress, int profileType, IntPtr userData) =>
             {
-                if (_audioConnectionChanged != null)
-                {
-                    _audioConnectionChanged(null, new AudioConnectionStateChangedEventArgs(result, connected, deviceAddress, (BluetoothAudioProfileType)profileType));
-                }
+                _audioConnectionChanged?.Invoke(this, new AudioConnectionStateChangedEventArgs(result, connected, deviceAddress, (BluetoothAudioProfileType)profileType));
             };
             int ret = Interop.Bluetooth.SetAudioConnectionStateChangedCallback(_audioConnectionChangedCallback, IntPtr.Zero);
             if (ret != (int)BluetoothError.None)

diff --git a/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothOpp.cs b/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothOpp.cs
index d3b76a0..6594ec6 100644 (file)
--- a/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothOpp.cs
+++ b/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothOpp.cs
@@ -36,55 +36,29 @@ namespace Tizen.Network.Bluetooth
         public BluetoothOppServer()
         {
             _impl = BluetoothOppServerImpl.Instance;
+            _impl.ConnectionRequested += (s, e) => ConnectionRequested?.Invoke(this, e);
+            _impl.TransferProgress += (s, e) => TransferProgress?.Invoke(this, e);
+            _impl.TransferFinished += (s, e) => TransferFinished?.Invoke(this, e);
         }
 
         /// <summary>
         /// (event) ConnectionRequested is called when OPP client requests for connection.
         /// </summary>
         /// <since_tizen> 4 </since_tizen>
-        public event EventHandler<ConnectionRequestedEventArgs> ConnectionRequested
-        {
-            add
-            {
-                _impl.ConnectionRequested += value;
-            }
-            remove
-            {
-                _impl.ConnectionRequested -= value;
-            }
-        }
+        public event EventHandler<ConnectionRequestedEventArgs> ConnectionRequested;
 
         /// <summary>
         /// (event) TransferProgress is called when the file transfer state is changed.
         /// </summary>
         /// <since_tizen> 4 </since_tizen>
-        public event EventHandler<TransferProgressEventArgs> TransferProgress
-        {
-            add
-            {
-                _impl.TransferProgress += value;
-            }
-            remove
-            {
-                _impl.TransferProgress -= value;
-            }
-        }
+        public event EventHandler<TransferProgressEventArgs> TransferProgress;
 
         /// <summary>
         /// (event) TransferFinished is called when the file tranfser is completed.
         /// </summary>
         /// <since_tizen> 4 </since_tizen>
-        public event EventHandler<TransferFinishedEventArgs> TransferFinished
-        {
-            add
-            {
-                _impl.TransferFinished += value;
-            }
-            remove
-            {
-                _impl.TransferFinished -= value;
-            }
-        }
+        public event EventHandler<TransferFinishedEventArgs> TransferFinished;
+
         /// <summary>
         /// Register the Opp Server with the Opp service.
         /// </summary>
@@ -270,55 +244,28 @@ namespace Tizen.Network.Bluetooth
     {
         internal BluetoothOppClient()
         {
+            BluetoothOppClientImpl.Instance.PushResponded += (s, e) => PushResponded?.Invoke(this, e);
+            BluetoothOppClientImpl.Instance.PushProgress += (s, e) => PushProgress?.Invoke(this, e);
+            BluetoothOppClientImpl.Instance.PushFinished += (s, e) => PushFinished?.Invoke(this, e);
         }
 
         /// <summary>
         /// (event) PushResponded is called when remote OPP Server responds to a File push request.
         /// </summary>
         /// <since_tizen> 4 </since_tizen>
-        public event EventHandler<PushRespondedEventArgs> PushResponded
-        {
-            add
-            {
-                BluetoothOppClientImpl.Instance.PushResponded += value;
-            }
-            remove
-            {
-                BluetoothOppClientImpl.Instance.PushResponded -= value;
-            }
-        }
+        public event EventHandler<PushRespondedEventArgs> PushResponded;
 
         /// <summary>
         /// (event) PushProgress is called when the file transfer state is changed.
         /// </summary>
         /// <since_tizen> 4 </since_tizen>
-        public event EventHandler<PushProgressEventArgs> PushProgress
-        {
-            add
-            {
-                BluetoothOppClientImpl.Instance.PushProgress += value;
-            }
-            remove
-            {
-                BluetoothOppClientImpl.Instance.PushProgress -= value;
-            }
-        }
+        public event EventHandler<PushProgressEventArgs> PushProgress;
 
         /// <summary>
         /// (event) PushFinished is called when the file tranfser is completed.
         /// </summary>
         /// <since_tizen> 4 </since_tizen>
-        public event EventHandler<PushFinishedEventArgs> PushFinished
-        {
-            add
-            {
-                BluetoothOppClientImpl.Instance.PushFinished += value;
-            }
-            remove
-            {
-                BluetoothOppClientImpl.Instance.PushFinished -= value;
-            }
-        }
+        public event EventHandler<PushFinishedEventArgs> PushFinished;
 
         /// <summary>
         /// Add File path to be pushed.

diff --git a/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothOppImpl.cs b/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothOppImpl.cs
index f87b862..8647160 100644 (file)
--- a/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothOppImpl.cs
+++ b/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothOppImpl.cs
@@ -20,58 +20,19 @@ namespace Tizen.Network.Bluetooth
 {
     internal class BluetoothOppServerImpl
     {
-        private event EventHandler<ConnectionRequestedEventArgs> _ConnectionRequested;
-        private Interop.Bluetooth.ConnectionRequestedCallback _ConnectionRequestedCallback;
-
-        private event EventHandler<TransferProgressEventArgs> _TransferProgress;
-        private Interop.Bluetooth.TransferProgressCallback _TransferProgressCallback;
-
-        private event EventHandler<TransferFinishedEventArgs> _TransferFinished;
-        private Interop.Bluetooth.TransferFinishedCallback _TransferFinishedCallback;
-
         private static readonly BluetoothOppServerImpl _instance = new BluetoothOppServerImpl();
 
-        internal event EventHandler<ConnectionRequestedEventArgs> ConnectionRequested
-        {
-            add
-            {
-                _ConnectionRequested += value;
-            }
-            remove
-            {
-                _ConnectionRequested -= value;
-            }
-        }
+        internal event EventHandler<ConnectionRequestedEventArgs> ConnectionRequested;
 
-        internal event EventHandler<TransferProgressEventArgs> TransferProgress
-        {
-            add
-            {
-                _TransferProgress += value;
-            }
-            remove
-            {
-                _TransferProgress -= value;
-            }
-        }
+        internal event EventHandler<TransferProgressEventArgs> TransferProgress;
 
-        internal event EventHandler<TransferFinishedEventArgs> TransferFinished
-        {
-            add
-            {
-                _TransferFinished += value;
-            }
-            remove
-            {
-                _TransferFinished -= value;
-            }
-        }
+        internal event EventHandler<TransferFinishedEventArgs> TransferFinished;
 
         internal int StartServer(string filePath)
         {
-            _ConnectionRequestedCallback = (string devAddress, IntPtr userData) =>
+            Interop.Bluetooth.ConnectionRequestedCallback _ConnectionRequestedCallback = (string devAddress, IntPtr userData) =>
             {
-                _ConnectionRequested?.Invoke(null, new ConnectionRequestedEventArgs(devAddress));
+                ConnectionRequested?.Invoke(this, new ConnectionRequestedEventArgs(devAddress));
             };
 
             int ret = Interop.Bluetooth.InitializeOppServerCustom(filePath, _ConnectionRequestedCallback, IntPtr.Zero);
@@ -105,14 +66,14 @@ namespace Tizen.Network.Bluetooth
             _transferId = -1;
             if (Globals.IsOppServerInitialized)
             {
-                _TransferProgressCallback = (string file, long size, int percent, IntPtr userData) =>
+                Interop.Bluetooth.TransferProgressCallback _TransferProgressCallback = (string file, long size, int percent, IntPtr userData) =>
                 {
-                    _TransferProgress?.Invoke(null, new TransferProgressEventArgs(file, size, percent));
+                    TransferProgress?.Invoke(this, new TransferProgressEventArgs(file, size, percent));
                 };
 
-                _TransferFinishedCallback = (int result, string file, long size, IntPtr userData) =>
+                Interop.Bluetooth.TransferFinishedCallback _TransferFinishedCallback = (int result, string file, long size, IntPtr userData) =>
                 {
-                    _TransferFinished?.Invoke(null, new TransferFinishedEventArgs(result, file, size));
+                    TransferFinished?.Invoke(this, new TransferFinishedEventArgs(result, file, size));
                 };
 
                 int ret = Interop.Bluetooth.OppServerAcceptPush(_TransferProgressCallback, _TransferFinishedCallback, name, IntPtr.Zero, out _transferId);
@@ -178,52 +139,13 @@ namespace Tizen.Network.Bluetooth
 
     internal class BluetoothOppClientImpl
     {
-        private event EventHandler<PushRespondedEventArgs> _PushResponded;
-        private Interop.Bluetooth.PushRespondedCallback _PushRespondedCallback;
-
-        private event EventHandler<PushProgressEventArgs> _PushProgress;
-        private Interop.Bluetooth.PushProgressCallback _PushProgressCallback;
-
-        private event EventHandler<PushFinishedEventArgs> _PushFinished;
-        private Interop.Bluetooth.PushFinishedCallback _PushFinishedCallback;
-
         private static readonly BluetoothOppClientImpl _instance = new BluetoothOppClientImpl();
 
-        internal event EventHandler<PushRespondedEventArgs> PushResponded
-        {
-            add
-            {
-                _PushResponded += value;
-            }
-            remove
-            {
-                _PushResponded -= value;
-            }
-        }
+        internal event EventHandler<PushRespondedEventArgs> PushResponded;
 
-        internal event EventHandler<PushProgressEventArgs> PushProgress
-        {
-            add
-            {
-                _PushProgress += value;
-            }
-            remove
-            {
-                _PushProgress -= value;
-            }
-        }
+        internal event EventHandler<PushProgressEventArgs> PushProgress;
 
-        internal event EventHandler<PushFinishedEventArgs> PushFinished
-        {
-            add
-            {
-                _PushFinished += value;
-            }
-            remove
-            {
-                _PushFinished -= value;
-            }
-        }
+        internal event EventHandler<PushFinishedEventArgs> PushFinished;
 
         private BluetoothOppClientImpl()
         {
@@ -286,19 +208,19 @@ namespace Tizen.Network.Bluetooth
 
             if (Globals.IsOppClientInitialized)
             {
-                _PushRespondedCallback = (int result, string address, IntPtr userData) =>
+                Interop.Bluetooth.PushRespondedCallback _PushRespondedCallback = (int result, string address, IntPtr userData) =>
                 {
-                    _PushResponded?.Invoke(null, new PushRespondedEventArgs(result, address));
+                    PushResponded?.Invoke(this, new PushRespondedEventArgs(result, address));
                 };
 
-                _PushProgressCallback = (string file, long size, int percent, IntPtr userData) =>
+                Interop.Bluetooth.PushProgressCallback _PushProgressCallback = (string file, long size, int percent, IntPtr userData) =>
                 {
-                    _PushProgress?.Invoke(null, new PushProgressEventArgs(file, size, percent));
+                    PushProgress?.Invoke(this, new PushProgressEventArgs(file, size, percent));
                 };
 
-                _PushFinishedCallback = (int result, string address, IntPtr userData) =>
+                Interop.Bluetooth.PushFinishedCallback _PushFinishedCallback = (int result, string address, IntPtr userData) =>
                 {
-                    _PushFinished?.Invoke(null, new PushFinishedEventArgs(result, address));
+                    PushFinished?.Invoke(this, new PushFinishedEventArgs(result, address));
                 };
 
                 int ret = Interop.Bluetooth.OppClientPushFile(Destination, _PushRespondedCallback, _PushProgressCallback, _PushFinishedCallback, IntPtr.Zero);