Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

briar
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

711475d4

Commit 711475d4 authored 7 years ago by akwizgran

Downloads
- Plain Diff

Merge branch '1001-bluetooth-connects-to-contacts' into 'master'

Don't make Bluetooth connections when configured not to

Closes #1001

See merge request akwizgran/briar!663

parents 3fd47fc1 0c7c465e

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 6
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java 25 additions, 47 deletions

...ject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java
bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java 59 additions, 19 deletions

...riarproject/bramble/plugin/bluetooth/BluetoothPlugin.java
bramble-j2se/src/main/java/org/briarproject/bramble/plugin/DesktopPluginModule.java 3 additions, 2 deletions

.../org/briarproject/bramble/plugin/DesktopPluginModule.java
bramble-j2se/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothPlugin.java 6 additions, 1 deletion

...project/bramble/plugin/bluetooth/JavaBluetoothPlugin.java
bramble-j2se/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothPluginFactory.java 9 additions, 3 deletions

.../bramble/plugin/bluetooth/JavaBluetoothPluginFactory.java
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java 0 additions, 8 deletions

...briarproject/briar/android/settings/SettingsFragment.java

with 102 additions and 80 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment