Merge branch '299-disable-bluetooth-at-shutdown' into 'master' (5b5b5406) · Commits · Julian Dehm / briar · GitLab

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

5b5b5406

Commit 5b5b5406 authored 7 years ago by Torsten Grote

Downloads
- Plain Diff

Merge branch '299-disable-bluetooth-at-shutdown' into 'master'

Disable Bluetooth at shutdown if we enabled it

See merge request !602

parents 3c959886 9993bac3

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

bramble-android/src/main/java/org/briarproject/bramble/plugin/AndroidPluginModule.java 1 addition, 1 deletion

.../org/briarproject/bramble/plugin/AndroidPluginModule.java
bramble-android/src/main/java/org/briarproject/bramble/plugin/droidtooth/DroidtoothPlugin.java 49 additions, 6 deletions

...arproject/bramble/plugin/droidtooth/DroidtoothPlugin.java
bramble-android/src/main/java/org/briarproject/bramble/plugin/droidtooth/DroidtoothPluginFactory.java 10 additions, 3 deletions

...ct/bramble/plugin/droidtooth/DroidtoothPluginFactory.java
bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/DisableBluetoothEvent.java 15 additions, 0 deletions

...oject/bramble/api/plugin/event/DisableBluetoothEvent.java
bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/EnableBluetoothEvent.java 14 additions, 0 deletions

...roject/bramble/api/plugin/event/EnableBluetoothEvent.java
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ShowQrCodeFragment.java 5 additions, 10 deletions

...roject/briar/android/keyagreement/ShowQrCodeFragment.java
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java 5 additions, 12 deletions

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

with 99 additions and 32 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