[tor-commits] [orbot/master] a little bit of cleanup of new binary installs

[n8fr8@xxxxxxxxxxxxxx]

commit 8140b32714587e8975bbc0244e2446eab23c42cb
Author: Nathan Freitas <nathan@xxxxxxxxxxx>
Date:   Fri Apr 4 10:19:23 2014 -0400

    a little bit of cleanup of new binary installs
---
 external/appcompat/.classpath                                |    2 +-
 src/org/torproject/android/service/TorResourceInstaller.java |    4 +++-
 src/org/torproject/android/service/TorService.java           |    1 -
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/external/appcompat/.classpath b/external/appcompat/.classpath
index b436a5a..2566cbd 100644
--- a/external/appcompat/.classpath
+++ b/external/appcompat/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="src" path="src"/>
 	<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-v7-appcompat.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
diff --git a/src/org/torproject/android/service/TorResourceInstaller.java b/src/org/torproject/android/service/TorResourceInstaller.java
index 9ff06ed..b1a85a7 100644
--- a/src/org/torproject/android/service/TorResourceInstaller.java
+++ b/src/org/torproject/android/service/TorResourceInstaller.java
@@ -45,6 +45,9 @@ public class TorResourceInstaller implements TorServiceConstants {
 		InputStream is;
         File outFile;
         
+        if (!installFolder.exists())
+        	installFolder.mkdirs();
+        
 		is = context.getResources().openRawResource(R.raw.torrc);
 		outFile = new File(installFolder, TORRC_ASSET_KEY);
 		streamToFile(is,outFile, false, false);
@@ -69,7 +72,6 @@ public class TorResourceInstaller implements TorServiceConstants {
 		outFile = new File(installFolder, OBFSPROXY_ASSET_KEY);
 		streamToFile(is,outFile, false, true);
 		
-
 		is = context.getResources().openRawResource(R.raw.xtables);
 		outFile = new File(installFolder, IPTABLES_ASSET_KEY);
 		streamToFile(is,outFile, false, true);
diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index 638ea15..55e2a7f 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -537,7 +537,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 		enableBinExec(fileObfsProxy);
 		enableBinExec(fileXtables);
 		
-		
     }
 
     private boolean enableBinExec (File fileBin) throws Exception



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits