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

Upgrade onionwrapper to 0.0.4.

Browse Source
This commit is contained in:
akwizgran
2023-05-15 15:22:30 +01:00
parent 7d761710e6
commit 3cc5699fe0
6 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -311,6 +311,9 @@ class TorPlugin implements DuplexPlugin, EventListener {
tor.stop();
} catch (IOException e) {
logException(LOG, WARNING, e);
} catch (InterruptedException e) {
LOG.warning("Interrupted while stopping Tor");
Thread.currentThread().interrupt();
}
}
@@ -625,12 +628,21 @@ class TorPlugin implements DuplexPlugin, EventListener {
}
private synchronized State getState(TorState torState) {
if (torState == TorState.STARTING_STOPPING || !settingsChecked) {
// Treat TorState.STARTED as State.STARTING_STOPPING because it's
// only seen during startup, before TorWrapper#enableNetwork() is
// called for the first time
if (torState == TorState.NOT_STARTED ||
torState == TorState.STARTING ||
torState == TorState.STARTED ||
torState == TorState.STOPPING ||
torState == TorState.STOPPED ||
!settingsChecked) {
return STARTING_STOPPING;
}
if (reasonsDisabled != 0) return DISABLED;
if (torState == TorState.CONNECTING) return ENABLING;
if (torState == TorState.CONNECTED) return ACTIVE;
// The plugin is enabled in settings but the device is offline
return INACTIVE;
}