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

7ec05ac0

Commit 7ec05ac0 authored 7 years ago by akwizgran

Downloads
- Plain Diff

Merge branch '790-ask-before-turning-on-bluetooth' into 'master'

Ask before turning on Bluetooth to add a contact

Closes #790

See merge request akwizgran/briar!664

parents 1b2a1d65 df0613f2

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

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

...ject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java
bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/BluetoothEnabledEvent.java 15 additions, 0 deletions

...oject/bramble/api/plugin/event/BluetoothEnabledEvent.java
bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/EnableBluetoothEvent.java 1 addition, 1 deletion

...roject/bramble/api/plugin/event/EnableBluetoothEvent.java
bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java 6 additions, 2 deletions

...riarproject/bramble/plugin/bluetooth/BluetoothPlugin.java
bramble-j2se/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothPlugin.java 5 additions, 0 deletions

...project/bramble/plugin/bluetooth/JavaBluetoothPlugin.java
briar-android/src/main/java/org/briarproject/briar/android/activity/RequestCodes.java 1 addition, 0 deletions

...org/briarproject/briar/android/activity/RequestCodes.java
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementActivity.java 95 additions, 6 deletions

...ject/briar/android/keyagreement/KeyAgreementActivity.java
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ShowQrCodeFragment.java 2 additions, 37 deletions

...roject/briar/android/keyagreement/ShowQrCodeFragment.java

with 130 additions and 46 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