fix(ble): fix os_android and os_other function signature/name

berty · Jun 21, 2019 · f8a4b8a · f8a4b8a
1 parent 94287b1
commit f8a4b8a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/...react-native/gomobile/core/android_ble.go → .../react-native/gomobile/core/os_android.go b/...react-native/gomobile/core/android_ble.go → .../react-native/gomobile/core/os_android.go
@@ -12,15 +12,15 @@ import (
 
 func initBleFunc() {
 	// TODO: Refactor this, see core/network/protocol/ble/driver/os_android.go
+	bledrv.InitScannerAndAdvertiser = BleManager.InitBluetoothService
+	bledrv.CloseScannerAndAdvertiser = BleManager.CloseBluetoothService
 	bledrv.SetMa = BleManager.SetMultiAddr
 	bledrv.SetPeerID = BleManager.SetPeerID
 	bledrv.StartScanning = BleManager.StartScanning
 	bledrv.StartAdvertising = BleManager.StartAdvertising
 	bledrv.Write = DeviceManager.WriteToDevice
 	bledrv.DialPeer = DeviceManager.DialPeer
-	bledrv.InitScannerAndAdvertiser = BleManager.InitBluetoothService
-	bledrv.CloseScannerAndAdvertiser = BleManager.CloseBluetoothService
-	bledrv.CloseConnFromMa = DeviceManager.DisconnectFromDevice
+	bledrv.CloseConnWithDevice = DeviceManager.DisconnectFromDevice
 }
 
 // TODO: Rename this function

diff --git a/core/network/protocol/ble/driver/os_android.go b/core/network/protocol/ble/driver/os_android.go
@@ -17,7 +17,7 @@ ConnClosedWithDevice(remoteMa string)
 NotifyPeerFound(remoteAddr string, remoteID string)
 */
 
-var InitScannerAndAdvertiser func() bool = nil
+var InitScannerAndAdvertiser func() = nil
 var CloseScannerAndAdvertiser func() = nil
 
 var SetMa func(string) = nil

diff --git a/core/network/protocol/ble/driver/os_other.go b/core/network/protocol/ble/driver/os_other.go
@@ -1,4 +1,4 @@
-// +build !darwin,!android
+// +build !android,!darwin
 
 package driver
 
@@ -15,11 +15,11 @@ See client/react-native/gomobile/core/android_ble.go
 */
 
 // Noop implementation for platform that are not Darwin or Android
-func InitScannerAndAdvertiser() bool  { return false }
-func CloseScannerAndAdvertiser() bool { return false }
+func InitScannerAndAdvertiser()  {}
+func CloseScannerAndAdvertiser() {}
 
-func setMa(_ string)     {}
-func setPeerID(_ string) {}
+func SetMa(_ string)     {}
+func SetPeerID(_ string) {}
 
 func StartScanning()    {}
 func StartAdvertising() {}