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

Make REASON_USER into a generic reason code.

Browse Source
This commit is contained in:
akwizgran
2020-01-16 17:56:31 +00:00
parent 40f2c1923b
commit c1aade221a
6 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bramble-api/src/main/java/org/briarproject/bramble/api/plugin/BluetoothConstants.java
View File

@@ -11,6 +11,6 @@ public interface BluetoothConstants {
String PREF_BT_ENABLE = "enable"; String PREF_BT_ENABLE = "enable";
int REASON_USER = 1; // Reason code returned by Plugin#getReasonDisabled()
int REASON_NO_BT_ADAPTER = 2; int REASON_NO_BT_ADAPTER = 2;
} }

16
bramble-api/src/main/java/org/briarproject/bramble/api/plugin/Plugin.java
View File

@@ -35,12 +35,18 @@ public interface Plugin {
} }
/** /**
* Reason code returned by {@link #getReasonDisabled()} ()} to indicate * Reason code returned by {@link #getReasonDisabled()} to indicate that
* that the plugin is disabled because it has not been started or has been * the plugin is disabled because it has not been started or has been
* stopped. * stopped.
*/ */
int REASON_STARTING_STOPPING = 0; 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. * Returns the plugin's transport identifier.
*/ */
@@ -75,9 +81,9 @@ public interface Plugin {
* Returns an integer code indicating why the plugin is * Returns an integer code indicating why the plugin is
* {@link State#DISABLED disabled}, or -1 if the plugin is not disabled. * {@link State#DISABLED disabled}, or -1 if the plugin is not disabled.
* <p> * <p>
* The codes used are plugin-specific, except the generic code * The codes used are plugin-specific, except the generic codes
* {@link #REASON_STARTING_STOPPING}, which may be used by * {@link #REASON_STARTING_STOPPING} and {@link #REASON_USER}, which may
* any plugin. * be used by any plugin.
*/ */
int getReasonDisabled(); int getReasonDisabled();

2
bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TcpConstants.java
View File

@@ -3,6 +3,4 @@ package org.briarproject.bramble.api.plugin;
public interface TcpConstants { public interface TcpConstants {
String PREF_TCP_ENABLE = "enable"; String PREF_TCP_ENABLE = "enable";
int REASON_USER = 1;
} }

2
bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TorConstants.java
View File

@@ -24,7 +24,7 @@ public interface TorConstants {
int PREF_TOR_NETWORK_WITH_BRIDGES = 2; int PREF_TOR_NETWORK_WITH_BRIDGES = 2;
int PREF_TOR_NETWORK_NEVER = 3; int PREF_TOR_NETWORK_NEVER = 3;
int REASON_USER = 1; // Reason codes returned by Plugin#getReasonDisabled()
int REASON_BATTERY = 2; int REASON_BATTERY = 2;
int REASON_MOBILE_DATA = 3; int REASON_MOBILE_DATA = 3;
int REASON_COUNTRY_BLOCKED = 4; int REASON_COUNTRY_BLOCKED = 4;

1
bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java
View File

@@ -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.DISABLED;
import static org.briarproject.bramble.api.plugin.Plugin.State.INACTIVE; 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.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.IoUtils.tryToClose;
import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.bramble.util.LogUtils.logException;
import static org.briarproject.bramble.util.PrivacyUtils.scrubSocketAddress; import static org.briarproject.bramble.util.PrivacyUtils.scrubSocketAddress;

1
bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
View File

@@ -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_BATTERY;
import static org.briarproject.bramble.api.plugin.TorConstants.REASON_COUNTRY_BLOCKED; 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_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.plugin.tor.TorRendezvousCrypto.SEED_BYTES;
import static org.briarproject.bramble.util.IoUtils.copyAndClose; import static org.briarproject.bramble.util.IoUtils.copyAndClose;
import static org.briarproject.bramble.util.IoUtils.tryToClose; import static org.briarproject.bramble.util.IoUtils.tryToClose;