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
This commit is contained in:
akwizgran
2018-01-29 15:37:41 +00:00
8 changed files with 130 additions and 46 deletions

View File

@@ -120,6 +120,11 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
}
}
@Override
void setEnabledByUs() {
wasEnabledByUs = true;
}
@Override
@Nullable
String getBluetoothAddress() {