Initial fix for #1381

shinyorg · Mar 6, 2024 · 2226cb5 · 2226cb5
1 parent c748ac0
commit 2226cb5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/Shiny.BluetoothLE/Platforms/Android/Peripheral_Characteristics.cs b/src/Shiny.BluetoothLE/Platforms/Android/Peripheral_Characteristics.cs
@@ -82,6 +82,8 @@ public IObservable<BleCharacteristicResult> NotifyCharacteristic(string serviceU
                         .Switch()
                         .Select(ch => this.operations.QueueToObservable(async ct =>
                         {
+                            characteristic = ch;
+
                             this.FromNative(ch).AssertNotify();
                             this.logger.LogDebug("Char InstanceID: " + ch.InstanceId);
 
@@ -95,13 +97,13 @@ public IObservable<BleCharacteristicResult> NotifyCharacteristic(string serviceU
                             if (nativeDescriptor == null)
                                 throw new BleException("Characteristic notification descriptor not found");
 
+                            ct.ThrowIfCancellationRequested();
                             await this.WriteDescriptor(nativeDescriptor, notifyBytes, ct).ConfigureAwait(false);
                             this.logger.HookedCharacteristic(serviceUuid, characteristicUuid, "Subscribed");
 
                             this.AddNotify(ch);
                             this.charSubSubj.OnNext(this.FromNative(ch));
 
-                            characteristic = ch;
                             return ch;
                         }))
                         .Switch()
@@ -167,7 +169,7 @@ public IObservable<BleCharacteristicInfo> WhenCharacteristicSubscriptionChanged(
     protected void TryNotificationCleanup(BluetoothGattCharacteristic ch, string serviceUuid, string characteristicUuid)
     {
         try
-        {            
+        {
             this.RemoveNotify(ch);
 
             if (this.Status == ConnectionState.Connected)

diff --git a/src/Shiny.BluetoothLE/Platforms/Apple/Peripheral_Characteristics.cs b/src/Shiny.BluetoothLE/Platforms/Apple/Peripheral_Characteristics.cs
@@ -38,9 +38,9 @@ public IObservable<BleCharacteristicResult> NotifyCharacteristic(string serviceU
                         .Switch()
                         .Select(ch =>
                         {
+                            native = ch;
                             this.FromNative(ch).AssertNotify();
 
-                            native = ch;
                             this.logger.CharacteristicInfo("Hooking Notification Characteristic", serviceUuid, characteristicUuid);
                             this.Native.SetNotifyValue(true, ch);