fix(ble): fix listener.Close on java

Signed-off-by: Sacha Froment <sfroment42@gmail.com>
berty · Nov 29, 2018 · 0f781a8 · 0f781a8
1 parent b7e106c
commit 0f781a8
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 0 deletions.
diff --git a/client/react-native/android/ble/src/main/java/chat/berty/ble/Manager.java b/client/react-native/android/ble/src/main/java/chat/berty/ble/Manager.java
@@ -172,6 +172,15 @@ public void initScannerAndAdvertiser() {
         }
     }
 
+    public void closeScannerAndAdvertiser() {
+        stopScanning();
+        stopAdvertising();
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+            mBluetoothGattServer.close();
+        }
+    }
+
     public static Manager getInstance() {
         if (instance == null) {
             synchronized (Manager.class) {
@@ -495,6 +504,12 @@ public void startAdvertising() {
         }
     }
 
+    public void stopAdvertising() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            mBluetoothLeAdvertiser.stopAdvertising(mAdvertisingCallback);
+        }
+    }
+
     public void startScanning() {
         ScanSettings settings = createScanSetting();
         ScanFilter filter = makeFilter();
@@ -504,6 +519,12 @@ public void startScanning() {
         }
     }
 
+    public void stopScanning() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            mBluetoothLeScanner.stopScan(mScanCallback);
+        }
+    }
+
     protected BluetoothGattCallback mGattCallback;
 
     public @Nullable BertyDevice getDeviceFromAddr(String addr) {

diff --git a/client/react-native/gomobile/core/java.go b/client/react-native/gomobile/core/java.go
@@ -17,6 +17,7 @@ func initBleFunc() {
 	ble.Write = Manager.GetInstance().Write
 	ble.DialPeer = Manager.GetInstance().DialPeer
 	ble.InitScannerAndAdvertiser = Manager.GetInstance().InitScannerAndAdvertiser
+	ble.CloseScannerAndAdvertiser = Manager.GetInstance().CloseScannerAndAdvertiser
 }
 
 func JavaToGo() string {

diff --git a/core/network/ble/darwin.go b/core/network/ble/darwin.go
@@ -153,3 +153,7 @@ func AddToPeerStoreC(peerID *C.char, rAddr *C.char) {
 	goRAddr := C.GoString(rAddr)
 	AddToPeerStore(goPeerID, goRAddr)
 }
+
+func (b *Listener) closeNative() {
+
+}
diff --git a/core/network/ble/java.go b/core/network/ble/java.go
@@ -18,6 +18,7 @@ var StartAdvertising func() = nil
 var Write func(p []byte, ma string) bool = nil
 var DialPeer func(ma string) bool = nil
 var InitScannerAndAdvertiser func() = nil
+var CloseScannerAndAdvertiser func() = nil
 
 func (t *Transport) Dial(ctx context.Context, rAddr ma.Multiaddr, p peer.ID) (tpt.Conn, error) {
 	// if int(C.isDiscovering()) != 1 {
@@ -105,3 +106,7 @@ func (b *Conn) IsClosed() bool {
 
 	return b.closed
 }
+
+func (b *Listener) closeNative() {
+	CloseScannerAndAdvertiser()
+}
diff --git a/core/network/ble/listener.go b/core/network/ble/listener.go
@@ -88,6 +88,7 @@ func (b *Listener) Close() error {
 			return fmt.Errorf("ble listerner already closed")
 		}
 	default:
+		b.closeNative()
 		close(b.closer)
 	}
 	return nil

diff --git a/core/network/ble/os_other.go b/core/network/ble/os_other.go
@@ -55,3 +55,7 @@ func (t *Transport) Proxy() bool {
 func (t *Transport) String() string {
 	return "ble"
 }
+
+func (b *Listener) closeNative() {
+
+}