Bluetooth check, avoid crashing
This commit is contained in:
@@ -84,6 +84,34 @@ public sealed class BleManager : IBleService
|
||||
// ────────────────────────────────────────────────────────────────────────
|
||||
// SCANNING
|
||||
// ────────────────────────────────────────────────────────────────────────
|
||||
|
||||
/// <summary>Checks that a Bluetooth adapter exists, supports LE, and its radio is on.
|
||||
/// Never throws — any failure comes back as IsReady=false with a reason.</summary>
|
||||
public async Task<BluetoothAvailability> CheckBluetoothAsync()
|
||||
{
|
||||
try
|
||||
{
|
||||
var adapter = await BluetoothAdapter.GetDefaultAsync();
|
||||
if (adapter == null)
|
||||
return new BluetoothAvailability(false, "No Bluetooth adapter found on this PC.");
|
||||
if (!adapter.IsLowEnergySupported)
|
||||
return new BluetoothAvailability(false, "This PC's Bluetooth does not support Bluetooth LE.");
|
||||
|
||||
var radio = await adapter.GetRadioAsync();
|
||||
if (radio == null)
|
||||
return new BluetoothAvailability(false, "Could not access the Bluetooth radio.");
|
||||
if (radio.State != Windows.Devices.Radios.RadioState.On)
|
||||
return new BluetoothAvailability(false,
|
||||
"Bluetooth is turned off. Please turn it on, then press Scan.");
|
||||
|
||||
return new BluetoothAvailability(true, string.Empty);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return new BluetoothAvailability(false, $"Bluetooth is unavailable: {ex.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
public IObservable<BleDeviceInfo> StartScan()
|
||||
{
|
||||
var seen = new Dictionary<ulong, string>();
|
||||
@@ -117,7 +145,11 @@ public sealed class BleManager : IBleService
|
||||
}
|
||||
};
|
||||
|
||||
_watcher.Start();
|
||||
// Guard the radio-off / adapter-missing case so a scan start can never crash the
|
||||
// app. Callers should CheckBluetoothAsync() first, but this is the safety net.
|
||||
try { _watcher.Start(); }
|
||||
catch (Exception) { _watcher = null; }
|
||||
|
||||
return _scanSubject.AsObservable();
|
||||
}
|
||||
|
||||
|
||||
@@ -6,6 +6,10 @@ namespace TuneBoss.Core.BLE;
|
||||
/// <summary>
|
||||
/// Represents a discovered BLE device before connection.
|
||||
/// </summary>
|
||||
/// <summary>Result of a Bluetooth-adapter check: whether BLE is ready to scan, and a
|
||||
/// human-readable reason when it isn't (no adapter / no BLE support / radio off).</summary>
|
||||
public readonly record struct BluetoothAvailability(bool IsReady, string Message);
|
||||
|
||||
public sealed record BleDeviceInfo(
|
||||
ulong Address,
|
||||
string Name,
|
||||
@@ -69,6 +73,10 @@ public interface IBleService : IDisposable
|
||||
|
||||
// ── Scanning ─────────────────────────────────────────────────────────────
|
||||
|
||||
/// <summary>Whether a Bluetooth adapter is present and its radio is on. Call this
|
||||
/// before scanning so a radio that's off gives a friendly message instead of a crash.</summary>
|
||||
Task<BluetoothAvailability> CheckBluetoothAsync();
|
||||
|
||||
/// <summary>Starts BLE advertisement scanning. Emits discovered devices.</summary>
|
||||
IObservable<BleDeviceInfo> StartScan();
|
||||
|
||||
|
||||
@@ -41,6 +41,9 @@ public sealed class SimBleService : IBleService
|
||||
public IObservable<BleConnectionState> ConnectionStateChanged => _state.AsObservable();
|
||||
|
||||
// ── Scan ──────────────────────────────────────────────────────────────────
|
||||
public Task<BluetoothAvailability> CheckBluetoothAsync() =>
|
||||
Task.FromResult(new BluetoothAvailability(true, string.Empty));
|
||||
|
||||
public IObservable<BleDeviceInfo> StartScan() => Observable.Create<BleDeviceInfo>(o =>
|
||||
{
|
||||
o.OnNext(new BleDeviceInfo(0xAABBCCDDEEFF, "B_SIM-PG1", -42));
|
||||
|
||||
Reference in New Issue
Block a user