From 7e9153bd819904fd8be7b69917d3917dab3adb23 Mon Sep 17 00:00:00 2001 From: MajorCrazed Date: Mon, 6 Nov 2017 16:56:30 +0100 Subject: [PATCH] remove force disable --- .../bramble/plugin/droidtooth/DroidtoothPlugin.java | 7 +++---- .../api/plugin/event/DisableBluetoothEvent.java | 12 ------------ 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/bramble-android/src/main/java/org/briarproject/bramble/plugin/droidtooth/DroidtoothPlugin.java b/bramble-android/src/main/java/org/briarproject/bramble/plugin/droidtooth/DroidtoothPlugin.java index c60053a2b..4118e89eb 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/droidtooth/DroidtoothPlugin.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/droidtooth/DroidtoothPlugin.java @@ -455,7 +455,7 @@ class DroidtoothPlugin implements DuplexPlugin, EventListener { enableAdapterAsync(enable.getReason()); } else if (e instanceof DisableBluetoothEvent) { 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, - final boolean force) { + private void disableAdapterAsync(final BluetoothEnableDisableReason reason) { ioExecutor.execute(new Runnable() { @Override public void run() { - disableAdapter(reason, force); + disableAdapter(reason, false); } }); } diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/DisableBluetoothEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/DisableBluetoothEvent.java index 4dd48d458..8cafc359c 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/DisableBluetoothEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/DisableBluetoothEvent.java @@ -12,19 +12,7 @@ import javax.annotation.concurrent.Immutable; @Immutable @NotNullByDefault public class DisableBluetoothEvent extends BluetoothEvent { - private boolean force; - public DisableBluetoothEvent(BluetoothEnableDisableReason reason) { super(reason); - force = false; - } - - public DisableBluetoothEvent(boolean force){ - super(null); - this.force = force; - } - - public boolean isForced(){ - return force; } }