From 2a92b72941dae3d69237f8d520ddb45bdc3e8824 Mon Sep 17 00:00:00 2001 From: Nathan Freitas Date: Sun, 13 Nov 2011 10:39:24 -0500 Subject: [PATCH] don't transproxy orweb --- src/org/torproject/android/service/TorServiceConstants.java | 1 + src/org/torproject/android/service/TorTransProxy.java | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index e47ed715..b06565e9 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -6,6 +6,7 @@ public interface TorServiceConstants { public final static String TOR_APP_USERNAME = "org.torproject.android"; + public final static String ORWEB_APP_USERNAME = "info.guardianproject.browser"; //home directory of Android application diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index 2c1119a4..73dac7c9 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -192,6 +192,12 @@ public class TorTransProxy implements TorServiceConstants { continue; } + if (apps[i].getUsername().equals(TorServiceConstants.ORWEB_APP_USERNAME)) + { + //should never trans proxy the Orbot app (and Tor or Privoxy) itself + continue; + } + TorService.logMessage("enabling transproxy for app: " + apps[i].getUsername() + "(" + apps[i].getUid() + ")"); //TCP