Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 10:49:06 +01:00
Code Issues Projects Releases Wiki Activity

Load bridges from file res/raw/bridges

Browse Source
This commit is contained in:
Torsten Grote
2018-07-04 16:21:49 -03:00
parent 7e05a49bda
commit 331c09a02a
7 changed files with 53 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/BridgeProvider.java
View File

@@ -1,9 +1,14 @@
package org.briarproject.bramble.plugin.tor;
import android.content.Context;
import org.briarproject.bramble.api.lifecycle.IoExecutor;
import java.util.List;
public interface BridgeProvider {
List<String> getBridges();
@IoExecutor
List<String> getBridges(Context context);
}

40
bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/BridgeProviderImpl.java
View File

@@ -1,20 +1,42 @@
package org.briarproject.bramble.plugin.tor;
import java.util.Arrays;
import android.content.Context;
import android.content.res.Resources;
import org.briarproject.bramble.api.lifecycle.IoExecutor;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Scanner;
import javax.annotation.Nullable;
public class BridgeProviderImpl implements BridgeProvider {
final static String[] BRIDGES = {
"Bridge 131.252.210.150:8081 0E858AC201BF0F3FA3C462F64844CBFFC7297A42",
// "Bridge 128.105.214.161:8081 1E326AAFB3FCB515015250D8FCCC8E37F91A153B",
"Bridge 67.205.189.122:8443 12D64D5D44E20169585E7378580C0D33A872AD98",
"Bridge 45.32.148.146:8443 0CE016FB2462D8BF179AE71F7D702D09DEAC3F1D",
};
private final static String BRIDGE_FILE_NAME = "bridges";
@Nullable
private volatile List<String> bridges = null;
@Override
public List<String> getBridges() {
return Arrays.asList(BRIDGES);
@IoExecutor
public List<String> getBridges(Context context) {
if (this.bridges != null) return this.bridges;
Resources res = context.getResources();
int resId = res.getIdentifier(BRIDGE_FILE_NAME, "raw",
context.getPackageName());
InputStream is = context.getResources().openRawResource(resId);
Scanner scanner = new Scanner(is);
List<String> bridges = new ArrayList<>();
while (scanner.hasNextLine()) {
String line = scanner.nextLine();
if (!line.startsWith("#")) bridges.add(line);
}
this.bridges = bridges;
return bridges;
}
}

5
bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorNetworkMetadata.java
View File

@@ -9,13 +9,14 @@ class TorNetworkMetadata {
/**
* Countries where Tor is blocked, i.e. vanilla Tor connection won't work.
*/
private static final String[] BLOCKED = { "CN", "IR", "EG", "SY", "VE" };
private static final String[] BLOCKED =
{"CN", "IR", "EG", "BY", "TR", "SY", "VE"};
/**
* Countries where vanilla bridge connection are likely to work.
* Should be a subset of {@link #BLOCKED}.
*/
private static final String[] BRIDGES = { "SY", "VE" };
private static final String[] BRIDGES = { "EG", "BY", "TR", "SY", "VE" };
// See https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
// and https://trac.torproject.org/projects/tor/wiki/doc/OONI/censorshipwiki

2
bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
View File

@@ -507,7 +507,7 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
if (enable) {
Collection<String> conf = new ArrayList<>();
conf.add("UseBridges 1");
conf.addAll(bridgeProvider.getBridges());
conf.addAll(bridgeProvider.getBridges(appContext));
controlConnection.setConf(conf);
} else {
controlConnection.setConf("UseBridges", "0");