Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 21:59:54 +01:00
Code Issues Projects Releases Wiki Activity

Minor refactoring of TorPlugin.

Browse Source
This commit is contained in:
akwizgran
2014-04-04 23:46:16 +01:00
parent 08b91d2483
commit e3a8db6b7a
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
briar-android/src/org/briarproject/plugins/tor/TorPlugin.java
View File

@@ -21,7 +21,6 @@ import java.net.Socket;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Scanner; import java.util.Scanner;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
@@ -474,7 +473,7 @@ class TorPlugin implements DuplexPlugin, EventHandler {
} }
} }
private void publishHiddenService(final String port) { private void publishHiddenService(String port) {
if(!running) return; if(!running) return;
if(!hostnameFile.exists()) { if(!hostnameFile.exists()) {
LOG.info("Creating hidden service"); LOG.info("Creating hidden service");
@@ -580,21 +579,17 @@ class TorPlugin implements DuplexPlugin, EventHandler {
public void poll(Collection<ContactId> connected) { public void poll(Collection<ContactId> connected) {
if(!isRunning()) return; if(!isRunning()) return;
Map<ContactId, TransportProperties> remote = for(ContactId c : callback.getRemoteProperties().keySet())
callback.getRemoteProperties(); if(!connected.contains(c)) connectAndCallBack(c);
for(final ContactId c : remote.keySet()) {
if(connected.contains(c)) continue;
pluginExecutor.execute(new Runnable() {
public void run() {
connectAndCallBack(c);
}
});
}
} }
private void connectAndCallBack(ContactId c) { private void connectAndCallBack(final ContactId c) {
DuplexTransportConnection d = createConnection(c); pluginExecutor.execute(new Runnable() {
if(d != null) callback.outgoingConnectionCreated(c, d); public void run() {
DuplexTransportConnection d = createConnection(c);
if(d != null) callback.outgoingConnectionCreated(c, d);
}
});
} }
public DuplexTransportConnection createConnection(ContactId c) { public DuplexTransportConnection createConnection(ContactId c) {