diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/BluetoothConstants.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/BluetoothConstants.java index 9176bdeb4..915dfbbab 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/BluetoothConstants.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/BluetoothConstants.java @@ -11,6 +11,6 @@ public interface BluetoothConstants { String PREF_BT_ENABLE = "enable"; - int REASON_USER = 1; + // Reason code returned by Plugin#getReasonDisabled() int REASON_NO_BT_ADAPTER = 2; } diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/Plugin.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/Plugin.java index b7247967c..ee26500f1 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/Plugin.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/Plugin.java @@ -35,12 +35,18 @@ public interface Plugin { } /** - * Reason code returned by {@link #getReasonDisabled()} ()} to indicate - * that the plugin is disabled because it has not been started or has been + * Reason code returned by {@link #getReasonDisabled()} to indicate that + * the plugin is disabled because it has not been started or has been * stopped. */ int REASON_STARTING_STOPPING = 0; + /** + * Reason code returned by {@link #getReasonDisabled()} to indicate that + * the plugin has been disabled by the user. + */ + int REASON_USER = 1; + /** * Returns the plugin's transport identifier. */ @@ -75,9 +81,9 @@ public interface Plugin { * Returns an integer code indicating why the plugin is * {@link State#DISABLED disabled}, or -1 if the plugin is not disabled. *

- * The codes used are plugin-specific, except the generic code - * {@link #REASON_STARTING_STOPPING}, which may be used by - * any plugin. + * The codes used are plugin-specific, except the generic codes + * {@link #REASON_STARTING_STOPPING} and {@link #REASON_USER}, which may + * be used by any plugin. */ int getReasonDisabled(); diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TcpConstants.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TcpConstants.java index 8e008b0ae..503f2cb88 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TcpConstants.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TcpConstants.java @@ -3,6 +3,4 @@ package org.briarproject.bramble.api.plugin; public interface TcpConstants { String PREF_TCP_ENABLE = "enable"; - - int REASON_USER = 1; } diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TorConstants.java b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TorConstants.java index 6199ddd35..727dab4b4 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TorConstants.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TorConstants.java @@ -24,7 +24,7 @@ public interface TorConstants { int PREF_TOR_NETWORK_WITH_BRIDGES = 2; int PREF_TOR_NETWORK_NEVER = 3; - int REASON_USER = 1; + // Reason codes returned by Plugin#getReasonDisabled() int REASON_BATTERY = 2; int REASON_MOBILE_DATA = 3; int REASON_COUNTRY_BLOCKED = 4; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java index 1ac111bb0..f1506ed5f 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java @@ -52,7 +52,6 @@ import static org.briarproject.bramble.api.plugin.Plugin.State.ACTIVE; import static org.briarproject.bramble.api.plugin.Plugin.State.DISABLED; import static org.briarproject.bramble.api.plugin.Plugin.State.INACTIVE; import static org.briarproject.bramble.api.plugin.TcpConstants.PREF_TCP_ENABLE; -import static org.briarproject.bramble.api.plugin.TcpConstants.REASON_USER; import static org.briarproject.bramble.util.IoUtils.tryToClose; import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.bramble.util.PrivacyUtils.scrubSocketAddress; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java index 01adb72e6..c8c6a1512 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java @@ -88,7 +88,6 @@ import static org.briarproject.bramble.api.plugin.TorConstants.PROP_ONION_V3; import static org.briarproject.bramble.api.plugin.TorConstants.REASON_BATTERY; import static org.briarproject.bramble.api.plugin.TorConstants.REASON_COUNTRY_BLOCKED; import static org.briarproject.bramble.api.plugin.TorConstants.REASON_MOBILE_DATA; -import static org.briarproject.bramble.api.plugin.TorConstants.REASON_USER; import static org.briarproject.bramble.plugin.tor.TorRendezvousCrypto.SEED_BYTES; import static org.briarproject.bramble.util.IoUtils.copyAndClose; import static org.briarproject.bramble.util.IoUtils.tryToClose;