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

Use PIE Tor binary on API version 16+.

Browse Source
This commit is contained in:
akwizgran
2015-03-23 11:03:00 +00:00
parent 0be467f4f5
commit 10924709d0
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
briar-android/AndroidManifest.xml
View File

@@ -7,7 +7,6 @@
<uses-sdk <uses-sdk
android:minSdkVersion="7" android:minSdkVersion="7"
android:targetSdkVersion="20" android:targetSdkVersion="20"
android:maxSdkVersion="20"
/> />
<uses-feature android:name="android.hardware.bluetooth" /> <uses-feature android:name="android.hardware.bluetooth" />

BIN
briar-android/assets/tor-pie.zip Normal file
View File

Binary file not shown.

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

@@ -226,7 +226,7 @@ class TorPlugin implements DuplexPlugin, EventHandler {
copy(in, out); copy(in, out);
// Make the Tor binary executable // Make the Tor binary executable
if(!setExecutable(torFile)) { if(!setExecutable(torFile)) {
LOG.warning("Could not make Tor executable"); LOG.warning("Could not make Tor binary executable");
return false; return false;
} }
return true; return true;
@@ -266,14 +266,23 @@ class TorPlugin implements DuplexPlugin, EventHandler {
} }
private InputStream getTorInputStream() throws IOException { private InputStream getTorInputStream() throws IOException {
InputStream in = appContext.getResources().getAssets().open("tor.zip"); String filename;
if(Build.VERSION.SDK_INT >= 16) {
LOG.info("Installing PIE Tor binary");
filename = "tor-pie.zip";
} else {
LOG.info("Installing non-PIE Tor binary");
filename = "tor.zip";
}
InputStream in = appContext.getResources().getAssets().open(filename);
ZipInputStream zin = new ZipInputStream(in); ZipInputStream zin = new ZipInputStream(in);
if(zin.getNextEntry() == null) throw new IOException(); if(zin.getNextEntry() == null) throw new IOException();
return zin; return zin;
} }
private InputStream getGeoIpInputStream() throws IOException { private InputStream getGeoIpInputStream() throws IOException {
InputStream in = appContext.getResources().getAssets().open("geoip.zip"); String filename = "geoip.zip";
InputStream in = appContext.getResources().getAssets().open(filename);
ZipInputStream zin = new ZipInputStream(in); ZipInputStream zin = new ZipInputStream(in);
if(zin.getNextEntry() == null) throw new IOException(); if(zin.getNextEntry() == null) throw new IOException();
return zin; return zin;