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

a little bit of cleanup of new binary installs

This commit is contained in:
Nathan Freitas 2014-04-04 10:19:23 -04:00
parent a309cece79
commit 8140b32714
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/appcompat/.classpath vendored
View File

@ -4,7 +4,7 @@
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/> <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/> <classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/> <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry exported="true" kind="lib" path="libs/android-support-v4.jar"/> <classpathentry exported="true" kind="lib" path="libs/android-support-v4.jar"/>
<classpathentry exported="true" kind="lib" path="libs/android-support-v7-appcompat.jar"/> <classpathentry exported="true" kind="lib" path="libs/android-support-v7-appcompat.jar"/>
<classpathentry kind="output" path="bin/classes"/> <classpathentry kind="output" path="bin/classes"/>

4
src/org/torproject/android/service/TorResourceInstaller.java
View File

@ -45,6 +45,9 @@ public class TorResourceInstaller implements TorServiceConstants {
InputStream is; InputStream is;
File outFile; File outFile;
if (!installFolder.exists())
installFolder.mkdirs();
is = context.getResources().openRawResource(R.raw.torrc); is = context.getResources().openRawResource(R.raw.torrc);
outFile = new File(installFolder, TORRC_ASSET_KEY); outFile = new File(installFolder, TORRC_ASSET_KEY);
streamToFile(is,outFile, false, false); streamToFile(is,outFile, false, false);
@ -69,7 +72,6 @@ public class TorResourceInstaller implements TorServiceConstants {
outFile = new File(installFolder, OBFSPROXY_ASSET_KEY); outFile = new File(installFolder, OBFSPROXY_ASSET_KEY);
streamToFile(is,outFile, false, true); streamToFile(is,outFile, false, true);
is = context.getResources().openRawResource(R.raw.xtables); is = context.getResources().openRawResource(R.raw.xtables);
outFile = new File(installFolder, IPTABLES_ASSET_KEY); outFile = new File(installFolder, IPTABLES_ASSET_KEY);
streamToFile(is,outFile, false, true); streamToFile(is,outFile, false, true);

1
src/org/torproject/android/service/TorService.java
View File

@ -537,7 +537,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst
enableBinExec(fileObfsProxy); enableBinExec(fileObfsProxy);
enableBinExec(fileXtables); enableBinExec(fileXtables);
} }
private boolean enableBinExec (File fileBin) throws Exception private boolean enableBinExec (File fileBin) throws Exception