[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [orbot/master] install obfsclient binary
commit f485015f8380f77100f505f605b34603a8d3043d
Author: Nathan Freitas <nathan@xxxxxxxxxxx>
Date: Thu Apr 24 12:30:23 2014 -0400
install obfsclient binary
---
src/org/torproject/android/service/TorResourceInstaller.java | 4 ++--
src/org/torproject/android/service/TorService.java | 2 +-
src/org/torproject/android/service/TorServiceConstants.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/org/torproject/android/service/TorResourceInstaller.java b/src/org/torproject/android/service/TorResourceInstaller.java
index 799bdae..1b844ca 100644
--- a/src/org/torproject/android/service/TorResourceInstaller.java
+++ b/src/org/torproject/android/service/TorResourceInstaller.java
@@ -102,8 +102,8 @@ public class TorResourceInstaller implements TorServiceConstants {
shell.add(new SimpleCommand(COMMAND_RM_FORCE + outFile.getAbsolutePath())).waitForFinish();
streamToFile(is,outFile, false, true);
- is = context.getResources().openRawResource(R.raw.obfsproxy);
- outFile = new File(installFolder, OBFSPROXY_ASSET_KEY);
+ is = context.getResources().openRawResource(R.raw.obfsclient);
+ outFile = new File(installFolder, OBFSCLIENT_ASSET_KEY);
shell.add(new SimpleCommand(COMMAND_RM_FORCE + outFile.getAbsolutePath())).waitForFinish();
streamToFile(is,outFile, false, true);
diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index 976404e..3825fa4 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -532,7 +532,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
filePrivoxy = new File(appBinHome, PRIVOXY_ASSET_KEY);
- fileObfsProxy = new File(appBinHome, OBFSPROXY_ASSET_KEY);
+ fileObfsProxy = new File(appBinHome, OBFSCLIENT_ASSET_KEY);
fileTorRc = new File(appBinHome, TORRC_ASSET_KEY);
diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java
index 0b22b90..9dcd972 100644
--- a/src/org/torproject/android/service/TorServiceConstants.java
+++ b/src/org/torproject/android/service/TorServiceConstants.java
@@ -83,7 +83,7 @@ public interface TorServiceConstants {
public static final String PREF_BINARY_PRIVOXY_VERSION_INSTALLED = "BINARY_PRIVOXY_VERSION_INSTALLED";
//obfsproxy
- public static final String OBFSPROXY_ASSET_KEY = "obfsproxy";
+ public static final String OBFSCLIENT_ASSET_KEY = "obfsclient";
public static final int MESSAGE_TRAFFIC_COUNT = 5;
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits