Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 22:29:53 +01:00
Code Issues Projects Releases Wiki Activity

remove force disable

Browse Source
This commit is contained in:
MajorCrazed
2017-11-06 16:56:30 +01:00
parent 15fa44c1b1
commit 7e9153bd81
2 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bramble-android/src/main/java/org/briarproject/bramble/plugin/droidtooth/DroidtoothPlugin.java
View File

@@ -455,7 +455,7 @@ class DroidtoothPlugin implements DuplexPlugin, EventListener {
enableAdapterAsync(enable.getReason()); enableAdapterAsync(enable.getReason());
} else if (e instanceof DisableBluetoothEvent) { } else if (e instanceof DisableBluetoothEvent) {
DisableBluetoothEvent disable = (DisableBluetoothEvent) e; DisableBluetoothEvent disable = (DisableBluetoothEvent) e;
disableAdapterAsync(disable.getReason(), disable.isForced()); disableAdapterAsync(disable.getReason());
} }
} }
@@ -468,12 +468,11 @@ class DroidtoothPlugin implements DuplexPlugin, EventListener {
}); });
} }
private void disableAdapterAsync(final BluetoothEnableDisableReason reason, private void disableAdapterAsync(final BluetoothEnableDisableReason reason) {
final boolean force) {
ioExecutor.execute(new Runnable() { ioExecutor.execute(new Runnable() {
@Override @Override
public void run() { public void run() {
disableAdapter(reason, force); disableAdapter(reason, false);
} }
}); });
} }

12
bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/DisableBluetoothEvent.java
View File

@@ -12,19 +12,7 @@ import javax.annotation.concurrent.Immutable;
@Immutable @Immutable
@NotNullByDefault @NotNullByDefault
public class DisableBluetoothEvent extends BluetoothEvent { public class DisableBluetoothEvent extends BluetoothEvent {
private boolean force;
public DisableBluetoothEvent(BluetoothEnableDisableReason reason) { public DisableBluetoothEvent(BluetoothEnableDisableReason reason) {
super(reason); super(reason);
force = false;
}
public DisableBluetoothEvent(boolean force){
super(null);
this.force = force;
}
public boolean isForced(){
return force;
} }
} }