dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update installer for new geoip uncompressed format

This commit is contained in:
n8fr8 2018-01-03 22:49:40 -05:00
parent b9a30b71d0
commit b4cdbff06b
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tor-android-binary/src/main/java/org/torproject/android/binary/TorResourceInstaller.java
View File

@ -53,13 +53,12 @@ public class TorResourceInstaller implements TorServiceConstants {
} }
} }
private final static String COMMAND_RM_FORCE = "rm -f ";
private final static String MP3_EXT = ".mp3"; private final static String MP3_EXT = ".mp3";
// //
/* /*
* Extract the Tor resources from the APK file using ZIP * Extract the Tor resources from the APK file using ZIP
*/ */
public boolean installResources () throws IOException, FileNotFoundException, TimeoutException public boolean installResources () throws IOException, TimeoutException
{ {
InputStream is; InputStream is;
@ -150,19 +149,19 @@ public class TorResourceInstaller implements TorServiceConstants {
* Extract the Tor binary from the APK file using ZIP * Extract the Tor binary from the APK file using ZIP
*/ */
private boolean installGeoIP () throws IOException, FileNotFoundException private boolean installGeoIP () throws IOException
{ {
InputStream is; InputStream is;
File outFile; File outFile;
outFile = new File(installFolder, GEOIP_ASSET_KEY); outFile = new File(installFolder, GEOIP_ASSET_KEY);
is = context.getAssets().open(COMMON_ASSET_KEY + GEOIP_ASSET_KEY + MP3_EXT); is = context.getAssets().open(COMMON_ASSET_KEY + GEOIP_ASSET_KEY);
streamToFile(is, outFile, false, true); streamToFile(is, outFile, false, false);
is = context.getAssets().open(COMMON_ASSET_KEY + GEOIP6_ASSET_KEY + MP3_EXT); is = context.getAssets().open(COMMON_ASSET_KEY + GEOIP6_ASSET_KEY);
outFile = new File(installFolder, GEOIP6_ASSET_KEY); outFile = new File(installFolder, GEOIP6_ASSET_KEY);
streamToFile(is, outFile, false, true); streamToFile(is, outFile, false, false);
return true; return true;
} }