Skip to content

Commit f6d1e67

Browse files
fix(ios): resolve when services are set (#58)
1 parent 95f5369 commit f6d1e67

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

ios/BleDidcomm.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ class BleDidcomm: React.RCTEventEmitter {
6666
centralManager.setService(
6767
serviceUUID: serviceUUID, writeCharacteristicUUID: writeCharacteristicUUID,
6868
indicationCharacteristicUUID: indicationCharacteristicUUID)
69+
70+
resolve(nil)
6971
}
7072

7173
@objc func startCentral(

ios/CentralManager.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,7 @@ class CentralManager: NSObject {
3838

3939
func shutdownCentral() {
4040
if let cp = self.connectedPeripheral {
41-
do {
42-
try self.centralManager.cancelPeripheralConnection(cp)
43-
} catch {
44-
// We don't care and proceed
45-
}
41+
self.centralManager.cancelPeripheralConnection(cp)
4642
}
4743
if (self.centralManager.isScanning) {
4844
self.stopScan()

ios/PeripheralManager.swift

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class PeripheralManager: NSObject {
2828
self.peripheralManager = CBPeripheralManager(
2929
delegate: self,
3030
queue: nil,
31-
options: [CBPeripheralManagerOptionShowPowerAlertKey: true]
31+
options: [CBPeripheralManagerOptionShowPowerAlertKey: false]
3232
)
3333

3434
while !isPoweredOn { Thread.sleep(forTimeInterval: 0.05) }
@@ -58,7 +58,9 @@ class PeripheralManager: NSObject {
5858
self.indicationCharacteristic = CBMutableCharacteristic(
5959
type: CBUUID(string: indicationCharacteristicUUID), properties: [.indicate], value: nil,
6060
permissions: [.writeable])
61-
guard let wc = self.writeCharacteristic, let ic = self.indicationCharacteristic,
61+
guard
62+
let wc = self.writeCharacteristic,
63+
let ic = self.indicationCharacteristic,
6264
let s = self.service
6365
else {
6466
throw PeripheralManagerError.NotConnectedToCentral
@@ -76,11 +78,11 @@ class PeripheralManager: NSObject {
7678
}
7779

7880
func stopAdvertising() throws {
79-
guard let service = self.service else {
81+
guard self.service != nil else {
8082
throw PeripheralManagerError.NoDefinedService
8183
}
8284
self.peripheralManager.stopAdvertising()
83-
}
85+
}
8486

8587
func indicate(message: Data) throws {
8688
guard let connectedCentral = connectedCentral else {

0 commit comments

Comments
 (0)