feat(java): write ble for java

Signed-off-by: Sacha Froment <sfroment42@gmail.com>
berty · Nov 9, 2018 · c2cf5a5 · c2cf5a5
1 parent 55b599b
commit c2cf5a5
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 2 deletions.
diff --git a/client/react-native/android/ble/src/main/java/chat/berty/ble/BertyDevice.java b/client/react-native/android/ble/src/main/java/chat/berty/ble/BertyDevice.java
@@ -34,11 +34,17 @@ public class BertyDevice {
 
     public CountDownLatch waitReady;
 
+    public Semaphore isWaiting;
+
+    public List<byte[]> toSend;
+
     public BertyDevice(BluetoothDevice device, BluetoothGatt gatt, String address) {
         this.gatt = gatt;
         this.addr = address;
         this.device = device;
+        this.isWaiting = new Semaphore(1);
         waitReady = new CountDownLatch(2);
+        this.toSend = new ArrayList<>();
         new Thread(new Runnable() {
             @Override
             public void run() {
@@ -58,4 +64,29 @@ public void isRdy() {
             }
         }
     }
+
+    public void write(byte[] p) throws InterruptedException {
+        waitReady.await();
+        synchronized (toSend) {
+
+             int length = p.length;
+             int offset = 0;
+             do {
+                 int chunckSize = length - offset > mtu ? mtu : length - offset;
+                 byte[] chunck = Arrays.copyOfRange(p, offset, chunckSize);
+                 offset += chunckSize;
+                 toSend.add(chunck);
+             } while (offset < length);
+
+
+            while (!toSend.isEmpty()) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+                    writerCharacteristic.setValue(toSend.get(0));
+                    while (!gatt.writeCharacteristic(writerCharacteristic));
+                    isWaiting.acquire();
+                }
+                toSend.remove(0);
+            }
+        }
+    }
 }
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
@@ -259,10 +259,16 @@ public void onCharacteristicReadRequest(BluetoothDevice device, int requestId, i
                 public void onCharacteristicWriteRequest(BluetoothDevice device, int requestId, BluetoothGattCharacteristic characteristic, boolean preparedWrite, boolean responseNeeded, int offset, byte[] value) {
                     UUID charID = characteristic.getUuid();
                     BertyDevice bDevice = getDeviceFromAddr(device.getAddress());
-                    Log.e(TAG, "WRITE");
+
                     if (charID.equals(ACCEPT_UUID)) {
                         mBluetoothGattServer.sendResponse(device, requestId, GATT_SUCCESS, offset, null);
                     } else if (charID.equals(WRITER_UUID)) {
+//                        Log.e(TAG, "READER CALLED     " + Arrays.toString(value));
+                        try {
+                            bDevice.waitReady.await();
+                        } catch (Exception e) {
+                            Log.e(TAG, "FAIL AWAIT " + e.getMessage());
+                        }
                         Core.bytesToConn(bDevice.ma, value);
                         mBluetoothGattServer.sendResponse(device, requestId, GATT_SUCCESS, offset, null);
                     } else if (charID.equals(CLOSER_UUID)) {
@@ -590,7 +596,7 @@ public void onServicesDiscovered(BluetoothGatt gatt, int status) {
 
                     gatt.readCharacteristic(bDevice.maCharacteristic);
                     gatt.readCharacteristic(bDevice.peerIDCharacteristic);
-                    while (!gatt.requestMtu(111000));
+                    while (!gatt.requestMtu(512));
 
                     super.onServicesDiscovered(gatt, status);
                 }
@@ -605,6 +611,15 @@ public void onCharacteristicRead(BluetoothGatt gatt, BluetoothGattCharacteristic
 
                 @Override
                 public void onCharacteristicWrite(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {
+                    // Log.e(TAG, "charact writed");
+                    if (status == GATT_SUCCESS) {
+                        BertyDevice bDevice = getDeviceFromAddr(gatt.getDevice().getAddress());
+                        bDevice.isWaiting.release();
+
+
+                    } else {
+                        Log.e(TAG, "Error writing gatt " + status);
+                    }
                     super.onCharacteristicWrite(gatt, characteristic, status);
                 }
 
@@ -705,6 +720,23 @@ public void handleConnectionStateChange(BertyDevice device, int status, int newS
         }
     }
 
+    public boolean write(byte[] p, String ma) {
+        BertyDevice bDevice = getDeviceFromMa(ma);
+        if (bDevice == null) {
+            Log.e(TAG, "WRITING PAT3");
+            return false;
+        }
+
+        try {
+            bDevice.write(p);
+        } catch (Exception e) {
+            Log.e(TAG, "WRITING PAT2       " + e.getMessage());
+            return false;
+        }
+
+        return true;
+    }
+
     public class PopulateCharacteristic implements Callable<BluetoothGattCharacteristic> {
         private UUID uuid;
         private BertyDevice device;

diff --git a/client/react-native/gomobile/core/java.go b/client/react-native/gomobile/core/java.go
@@ -15,6 +15,8 @@ func initBleFunc() {
 	ble.SetPeerID = Manager.GetInstance().SetPeerID
 	ble.StartScanning = Manager.GetInstance().StartScanning
 	ble.StartAdvertising = Manager.GetInstance().StartAdvertising
+	ble.Write = Manager.GetInstance().Write
+	ble.DialPeer = Manager.GetInstance().DialPeer
 }
 
 func JavaExportTestFunc() {