Skip to content

Commit

Permalink
feat(java): populate all charact
Browse files Browse the repository at this point in the history 
Signed-off-by: Sacha Froment <sfroment42@gmail.com>
  • Loading branch information
@sfroment
sfroment committed Nov 9, 2018
1 parent 8dba2b3 commit a2ddc03
Show file tree
Hide file tree
Showing 2 changed files with 74 additions and 12 deletions.
8 changes: 8 additions & 0 deletions client/react-native/android/ble/src/main/java/chat/berty/ble/BertyDevice.java
View file
Expand Up @@ -2,6 +2,7 @@

import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothGatt;
import android.bluetooth.BluetoothGattCharacteristic;

public class BertyDevice {

Expand All @@ -10,6 +11,13 @@ public class BertyDevice {
public String ma;
public long mtu;

protected BluetoothGattCharacteristic acceptCharacteristic;
protected BluetoothGattCharacteristic maCharacteristic;
protected BluetoothGattCharacteristic peerIDCharacteristic;
protected BluetoothGattCharacteristic writerCharacteristic;
protected BluetoothGattCharacteristic isRdyCharacteristic;
protected BluetoothGattCharacteristic closerCharacteristic;

public BluetoothGatt gatt;

public BluetoothDevice device;
Expand Down
78 changes: 66 additions & 12 deletions client/react-native/android/ble/src/main/java/chat/berty/ble/Manager.java
View file
Expand Up @@ -2,8 +2,6 @@

import android.app.Activity;
import android.app.ActivityManager;
import android.app.AlertDialog;
import android.arch.core.util.Function;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothGattCallback;
Expand All @@ -23,25 +21,23 @@
import android.bluetooth.le.ScanResult;
import android.bluetooth.le.ScanSettings;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.Build;
import android.os.ParcelUuid;
import android.support.annotation.Nullable;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.util.Log;

import android.Manifest;

import java.lang.reflect.Array;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;

import android.bluetooth.BluetoothGatt;

Expand Down Expand Up @@ -445,8 +441,45 @@ public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState
@Override
public void onServicesDiscovered(BluetoothGatt gatt, int status) {
BluetoothGattService svc = gatt.getService(SERVICE_UUID);
gatt.readCharacteristic(svc.getCharacteristic(MA_UUID));
gatt.readCharacteristic(svc.getCharacteristic(PEER_ID_UUID));
BertyDevice bDevice = getDeviceFromAddr(gatt.getDevice().getAddress());
ExecutorService es = Executors.newFixedThreadPool(6);
List<PopulateCharacteristic> todo = new ArrayList<PopulateCharacteristic>(6);

todo.add(new PopulateCharacteristic(MA_UUID, bDevice));
todo.add(new PopulateCharacteristic(PEER_ID_UUID, bDevice));
todo.add(new PopulateCharacteristic(CLOSER_UUID, bDevice));
todo.add(new PopulateCharacteristic(WRITER_UUID, bDevice));
todo.add(new PopulateCharacteristic(IS_READY_UUID, bDevice));
todo.add(new PopulateCharacteristic(ACCEPT_UUID, bDevice));

try {
List<Future<BluetoothGattCharacteristic>> answers = es.invokeAll(todo);
for (Future<BluetoothGattCharacteristic> future:answers) {
BluetoothGattCharacteristic c = future.get();
if (c.getUuid().equals(MA_UUID)) {
bDevice.maCharacteristic = c;
} else if (c.getUuid().equals(PEER_ID_UUID)) {
bDevice.peerIDCharacteristic = c;
} else if (c.getUuid().equals(CLOSER_UUID)) {
bDevice.closerCharacteristic = c;
} else if (c.getUuid().equals(WRITER_UUID)) {
bDevice.writerCharacteristic = c;
} else if (c.getUuid().equals(IS_READY_UUID)) {
bDevice.isRdyCharacteristic = c;
} else if (c.getUuid().equals(ACCEPT_UUID)) {
bDevice.acceptCharacteristic = c;
} else {
Log.e(TAG, "UNKNOW CHARACT");
}

Log.e(TAG, "UUID "+c.getUuid());
}
} catch (Exception e) {
e.printStackTrace();
}

gatt.readCharacteristic(bDevice.maCharacteristic);
gatt.readCharacteristic(bDevice.peerIDCharacteristic);

super.onServicesDiscovered(gatt, status);
}
Expand Down Expand Up @@ -537,6 +570,27 @@ public void handleConnectionStateChange(BertyDevice device, int status, int newS
}
} else if (newState == STATE_DISCONNECTED) {
Log.e(TAG, "disconnected device " + device.addr);
synchronized (bertyDevices) {
bertyDevices.remove(device.addr);
}
}
}

public class PopulateCharacteristic implements Callable<BluetoothGattCharacteristic> {
private UUID uuid;
private BertyDevice device;

public PopulateCharacteristic(UUID charactUUID, BertyDevice bDevice) {
uuid = charactUUID;
device = bDevice;
}

public @Nullable BluetoothGattCharacteristic call() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
return device.gatt.getService(SERVICE_UUID).getCharacteristic(uuid);
}

return null;
}
}
}

0 comments on commit a2ddc03

Please sign in to comment.