Merge branch 'bluetooth-connection-limiter' into 'master'
Don't make or accept Bluetooth contact connections during key agreement See merge request akwizgran/briar!770
Showing
- bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java 6 additions, 3 deletions...ject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java
- bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPluginFactory.java 5 additions, 3 deletions...amble/plugin/bluetooth/AndroidBluetoothPluginFactory.java
- bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothTransportConnection.java 10 additions, 2 deletions...plugin/bluetooth/AndroidBluetoothTransportConnection.java
- bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/event/KeyAgreementStoppedListeningEvent.java 9 additions, 0 deletions...keyagreement/event/KeyAgreementStoppedListeningEvent.java
- bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementTaskImpl.java 2 additions, 0 deletions...iarproject/bramble/keyagreement/KeyAgreementTaskImpl.java
- bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothConnectionLimiter.java 47 additions, 0 deletions.../bramble/plugin/bluetooth/BluetoothConnectionLimiter.java
- bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothConnectionLimiterImpl.java 115 additions, 0 deletions...mble/plugin/bluetooth/BluetoothConnectionLimiterImpl.java
- bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java 26 additions, 5 deletions...riarproject/bramble/plugin/bluetooth/BluetoothPlugin.java
- bramble-j2se/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothPlugin.java 5 additions, 3 deletions...project/bramble/plugin/bluetooth/JavaBluetoothPlugin.java
- bramble-j2se/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothPluginFactory.java 4 additions, 2 deletions.../bramble/plugin/bluetooth/JavaBluetoothPluginFactory.java
- bramble-j2se/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothTransportConnection.java 10 additions, 2 deletions...le/plugin/bluetooth/JavaBluetoothTransportConnection.java
Loading
Please register or sign in to comment