From f6571fb896ddf53cbbacb0e1f00641de42ca8ce2 Mon Sep 17 00:00:00 2001
From: Nathan Freitas <nathan@freitas.net>
Date: Tue, 21 Sep 2010 01:26:40 +0000
Subject: [PATCH] fixed permission issues; added green notification icon;
 improved root/su checking logic

svn:r23269
---
 AndroidManifest.xml                           |   6 +-
 AndroidManifest.xml.debug                     |   5 +-
 AndroidManifest.xml.production                |   4 +-
 CHANGELOG                                     |   5 +-
 build.xml                                     |   2 +-
 res/drawable/tornotification.png              | Bin 1310 -> 828 bytes
 res/drawable/tornotificationgimpsrc.xcf       | Bin 0 -> 3042 bytes
 res/drawable/tornotificationoff.png           | Bin 1310 -> 828 bytes
 res/drawable/tornotificationon.png            | Bin 0 -> 875 bytes
 res/layout-land/layout_main.xml               |   6 +-
 res/layout/layout_apps.xml                    |   4 +-
 res/layout/layout_apps_item.xml               |  22 +--
 res/layout/layout_main.xml                    |   4 +-
 src/org/torproject/android/Orbot.java         |  33 ++--
 .../android/SettingsPreferences.java          |  17 +-
 src/org/torproject/android/WizardHelper.java  |   6 +
 .../android/service/TorService.java           | 173 ++++++++++--------
 .../android/service/TorTransProxy.java        |  41 +++--
 18 files changed, 179 insertions(+), 149 deletions(-)
 create mode 100644 res/drawable/tornotificationgimpsrc.xcf
 create mode 100644 res/drawable/tornotificationon.png

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 363c1b1d..cfafd2d3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.torproject.android" android:versionName="1.0.4" android:versionCode="10">
+      package="org.torproject.android" android:versionName="0.2.2.14-orbot-alpha-1.0.3" android:versionCode="9">
        
        <uses-permission android:name="android.permission.INTERNET" />
 
  
-    <application android:icon="@drawable/icon" android:label="@string/app_name"  android:debuggable="false">
+    <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="false">
       
         <activity android:name=".Orbot"
                   android:theme="@android:style/Theme.NoTitleBar">
@@ -44,7 +44,7 @@
     	
     </application>
     
-    <uses-sdk android:minSdkVersion="3"/>
+    <uses-sdk android:minSdkVersion="4"/>
 
 
 
diff --git a/AndroidManifest.xml.debug b/AndroidManifest.xml.debug
index 471b1213..215ac4d7 100644
--- a/AndroidManifest.xml.debug
+++ b/AndroidManifest.xml.debug
@@ -41,6 +41,7 @@
             </intent-filter>
     	</service>
     	
+    	<!--
     	<receiver android:name=".OnBootReceiver">
 			<intent-filter>
 			<action
@@ -48,11 +49,11 @@
 			<category android:name="android.intent.category.HOME" />
 			</intent-filter>
 		</receiver>
-    	
+    	-->
     	
     </application>
     
-    <uses-sdk android:minSdkVersion="3"/>
+    <uses-sdk android:minSdkVersion="4"/>
 
 
 
diff --git a/AndroidManifest.xml.production b/AndroidManifest.xml.production
index 426230bb..cfafd2d3 100644
--- a/AndroidManifest.xml.production
+++ b/AndroidManifest.xml.production
@@ -5,7 +5,7 @@
        <uses-permission android:name="android.permission.INTERNET" />
 
  
-    <application android:icon="@drawable/icon" android:label="@string/app_name">
+    <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="false">
       
         <activity android:name=".Orbot"
                   android:theme="@android:style/Theme.NoTitleBar">
@@ -44,7 +44,7 @@
     	
     </application>
     
-    <uses-sdk android:minSdkVersion="3"/>
+    <uses-sdk android:minSdkVersion="4"/>
 
 
 
diff --git a/CHANGELOG b/CHANGELOG
index 398b1641..c3d93cd4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,7 +3,10 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at http
 1.0.4
 - Added Russian, Persian, Arabic and other .po translations (see res/values-* folders)
 - Fixed incorrect try to clear iptables rules for non-root devices
-- Fixed bug that stopped wizard helper from showing
+- Fixed bug that stopped wizard helper from showing first time
+- Added new green notification icon when Tor is connected
+- Fixed app selector layout in settings
+- Moved minSDK to 4 (Android 1.6); discontinued 1.5 support
 
 1.0.3
 - Fixed spanish language issues with settings screen
diff --git a/build.xml b/build.xml
index 0128a2de..08dd4a6c 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="Orbot" default="help">
+<project name="Orbot">
 
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked in in Version
diff --git a/res/drawable/tornotification.png b/res/drawable/tornotification.png
index cd6bf489d7d534503b730b7cea6096ba6a2174ee..799296536beba32dff493b04c08aae6b9a5d5865 100644
GIT binary patch
delta 805
zcmV+=1KRwa3cLo8B!2;OQb$4nuFf3k00006VoOIv0RI600RN!9r;`8x010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru+6fdFGbDT)14IA-0=!8?K~zY`-IcvcBT*E`e=~QY
zlQE-F7+6C@A;p4Vu>|o0VJ#Q25epw6Z{QQ`+SyrH`vMUgt$*xO*oa`KNSe`%N-$<(
zX3TutEmndA*Cb-G?12lzz4!co_ndp@9QfDm`1ttS=H}*CDW%%0&v)Piki86D*X8W&
ztel*jl&MszbN%E+4*=yAqyl{Db`l{3mSwTJy2{kl6t}mx9334|E|)vEI>0!<>oDI1
zD9WGn<Z?L*g?|DoD=Vm~N~u)Bw(YlE+Im{Axs+0(>pJ;-9>Xv=Jw0V_Z;zXso36e+
zLli|JnM~q&9**NsEEaJb2SrhkQhpA^G)>mm*BKrjW`BPl$8p*bb~CltC>o6hLI~E@
z))*Tb>+7kjz1~M6kzitC0>d!K=kp8>4t_2qoldi}vwuUOP@vgtvaqng#>NIiLqk15
zy57m+;v&1dyX0~?s?{n&2sBM&dU_heFgQFs<of#h<B`nI&r>WG$z(FvwvDD~D2hTV
zm7-FqkVqt0US1}hPJaxdsw!JsTL>YjR4Q1O1war47=}R*1lYDs7>3Nu%%G}j|LK~W
zn<Jaea({Ps$N2a-^?DsCWm_zYB3##P|0kwt^7#1JA0(U25{4loBO}ymH8f2lnM~4Z
zwFrWMMx%l2x(FfgeV-_b`cK#W{XKCU<GL<U6t!Vd6wz!paa|YR_whUr-}ec_uzyIY
zRH9m~0^s{TtyYUL4AFHR*LA7YYIvSU5Cl9uJ%921{M<hz2m-dZw~<m3$8j4VrR4JR
z631~+RTa<kux<O@@*-Y+|Lk16y1L^0{G8FzQR?+NhGB4acE-WM0S^xk?H3lu@!#}+
zbvCVcE1hLoEG;c@adAPpTt-TX=XqVrUgw1UUb`I_7?7DvMw+H6g%DB*(XB<l*~xyq
jv>ssj38V6&_n+Bs)5~E<+jF{%00000NkvXXu0mjfpEq}N

delta 1291
zcmV+m1@!v72A&F#B!2{FK}|sb0M^*lPgpVl000?uMObuGZ)S9NVRB^vL1b@YWgtmy
zVP|DhWnpA_ami&o000EANkl<Zc-o{^Sx6*T6n(F{+qF^Cwi{~1W#SgaC15l-AV@^e
zXc8wNNRmbj`jel4=ubeI7(s%c<Bu>f41NTcFn);(<VO)=jDNUAg?5RGYrD5gSG}D3
zum`ov(U1p4y{h-#z4x4Z?ycfN2=<uK-QCUF+S*t_K>@qCxL}o)m3()1H*08U$eEd$
zxnwXHT;t>8T6=rD+<()qkv(#7&fiWoO(P2?Tmk<6{w_E*A0HndVy=5ud8`wc%f(=b
z1qKFs!I(u=)qih%e0;wA3<FLImzI`zPEL*t;_g|AWMySV!lP*2_nQM$u$Y(_mYbW)
z($dmCJUTl1{`~yB5c~Eq|2-=!>vdgSovX96lMV`9Cp$Yk??iESc1DP``uh6d`T6-D
zfTD7JeVv)j=9fV896>liA;(=e!O}@XLxTqj_nZ<5nt#OL;2^WvY?%`i6JO9;US8gh
z`}_MX0RaK3qA1wP#eE`@PN0x`QM9(UGDPm>?d@&s>gxIg+<TXllyu<C&k+$3YJ7aW
zVl)~x3J9q5MWdI4o9orp)dGg!D=I2_etCKM^~T1AeQIjz8FKPBjB?~tfGUO{*y-sh
z+uPgokbm$)>Jo@nu~;k)9JW_fRG8D#(?b>(7Q(Kst{6#~^0~FO#a35W-#YkD5>81;
zp_<Todwbc~*qGwy=f|R=qQax2qd%INnPDcAiG_uQJzNI&B#Zb{Mn*<x?w6XHT7$$p
z78e&a<V7?$H}57SB-m)Js;bJppWn6XzVve9K7XLa#l=0rXl!X|u>loZUS1Y(#EBle
z-OhmU<>uz*Pf*_y#35y_7rdf_KspEt3d%r#dWFbsNl8h>yFg`gQV{Z?`TF{@($dmz
z6B83(;axJQ)AXv{!%10L8AEbu^9MCGH64wOjX7v18lo03!XZ^kHWi_=wzj4@olX@9
zKYxyljO@T#@O8BtbnC>8B0oQ0czJm-Nc6kf+S(i#(NNhuJUm=Fpze#pV<Z5qDJVwT
zPqaQgJUsjg0lff9ag9jaLPCc!GBTtLo0^&;ii?Y%1_uW-w*!*v!NGxaKuGA098f3V
z4u?a|(KyS{R!rA<;U08RQ4#Ou<>mAkLw~h^#>dbyWb}xbAxDf*Qa7dxNMu(=U*j}K
zAQrqgTdh`x0EI4Hqy~zJw12bvQlz1wp>l0|dt2^9wX>6x6Bz*B3tSxCK*O3!>x9+=
z2@Z+r>1o#A-%o~DAk$rPaLu_yK+fE~3H%cR=>%sry2HsjoE=fsW3MM&bbu-tEq{cg
zop1K_^$pNFQWPa02Bbl#ifCa(B~gXBO7%fK3(nqzgoIEa%H40uO$m#EfdNiv&;(!f
z^z;k>0kstchBP=(X%DGqc6L^UBLM*z;9NmL{)T{lO-@cGMC`7UTi^KM;b9_Efl~gN
zoSdu$nqN={pMxGHHa1pvSwcKII)7@QE<sd*p4UirBZ~EOZf;KYy2rG7S@mdq8Wd-R
ztP7#CPcbskao@*xM1`|8p!gG%y}|k6?Ck6lIKEXI5B;skV#4nZId_1H2^h2DZp6DY
zpi&_UJ81g@RQ-kT$SEoBoqsxy{qOoe<6i*=00}zrLF0p?Hvj+t07*qoL<FuvV1kXF
BXl4Ka

diff --git a/res/drawable/tornotificationgimpsrc.xcf b/res/drawable/tornotificationgimpsrc.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..e90ff6ba0cfd167f84ad84ca56a1e57f8040d157
GIT binary patch
literal 3042
zcmeHJeN0<b6hHlXEw7aF>4F5(DdS_>tx!Hg0t+xhjIw27#@rSyr7cxxfp*~|WW;3X
zbW`UdF6gFi>d4GAAu7?4uuaGWwq@u9bu8I}7zWJgC~U0ld)ITzdmCizul?a4a@zCW
zxxe2z_uO~i%{#|tud3G7o2@#lz0v|G(SlMt3{@h*O9ZMae;)u<lt@%LY69vbf=&IR
z&_5sVp*EaWZ?7`hEP7k5y&NGxUIIxjcSEH`=W<rs%ahq8tIh1Jbk^#U0yllFt<0n|
ztT6;+2_r?Ik}<SwiBOT(J=mb3^{#4@+3v9EQp8*cHY^1Sn0|-D?$+5I<_e38#yhQ6
zm&JW|fi(JlXdYP{O80@WnX0Nx!j3?sVNH5^;CWM0vQrJ&sae?>loLeK0T6U#e!xx(
zp!kaDj%zlWTy9Ib?io{qrIzvxDt$EsRVCQeF-WlS2J8Y`y}%A$U~3lGTD0k0qA1az
zIjD$7K^!9_eIdZyJ4?t(9g8vPPC5=Ep5vMIH3OZl&)REn&1&NLGPB+}aH5v%YnmS)
zTm5?D@QKzBE5F9El=!Y*!JqW%^dEiZ-uHV>_8lMx1BCMI^l9?@=`X(eu6vgIH~>u+
z6c!ZX|6+F|Ioxuzqq~RyC_pf9b8G4PJryk-Z<F)nsEC>KDqgEAfvo5iad_Y{83VVP
zNYN)fFG7YKWFR97m}MFvzWsdDs+^brB8O?kNm%{uc<;fQI6z2(ZWvc~>E@L)M|L~(
zLY!yY<kax!kH@Q>+hY|0Ckgz$p#+qDlY^6^KXkslskA^X;Me!=2kXeiYnMlQJ8gwe
z<?0kNx|&JW@Mr|I42}MFd91r*Yi3SbG`<u{gqL<lK=sh@(9|zo?Zs<TpNx<zA_Bzb
zu7pFO{X-Z29PIfZH&OqXN+t_K;xG0IXG}db{(5d~q^B-1Ii86UbMJmPX#{Exe>2#Y
z9;aj5G*K#=LIT(G*N12>orU;vgC-1C1%>BIDItR!+AYn;AZ~M_MhhXaI1z>A;8~Hk
za_x?nV#6bqOg2byR}hn}Q$=no3JKGKG6S&~vU~uR55V#l;Q#yuNCbaMq7*v}ANzDh
z6t*09<jK1__GEz;ZcD)UJ?ScBAQZf+x5%jkr03)-&;0y2eytFTKQ+5uMnfd*=j2re
zLuRnlr45jCM%rwsVOj!A*)ZYBkeNXshyuZF(+F_H)22cXZ_pvHpC=OH<9yy$1bolm
z;CLb<cX)0h7h{y*Q@rEliGp~!+l>e)Fdc+_ia`qE=jV3etUkqlFGoFmw_NDKP>+&-
zc#clv=O%IxQ-Ozh&&T`yyr1KJZ$dE4FmFuFV%C|7oifZjiz{Du;HPUBS~Ky{=0ejp
zY$-NsU=uBq3kyD5Y^l3f?WL4P`LC)z?IZ+YHwuQhTCDnP`C^Q9({Z!3=B^rn%j+jv
z!u982LEy(p7~#j!ip0wDu*#3o*~V}-u4tU*7%zfUx&U#7+UG2l7PH&#bm*Qnxn7}^
z*v5z(+KkwP+Nco0pSD+_s4`R(u_L0eAnFP<#H@&`vAGF|fT{P=k@2CQ`2HO;!oN(E
Bv;Y7A

literal 0
HcmV?d00001

diff --git a/res/drawable/tornotificationoff.png b/res/drawable/tornotificationoff.png
index cd6bf489d7d534503b730b7cea6096ba6a2174ee..fa5eb3ed0926e55db6dd3cc43c8df2590fe3afcc 100644
GIT binary patch
delta 805
zcmV+=1KRwa3cLo8B!2;OQb$4nuFf3k00006VoOIv0RI600RN!9r;`8x010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru+6fdFGZwVWQp5lN0=!8?K~zY`-IcvcBT*E`e=~QY
zlQE-F7+6C@A;p4Vu>|o0VJ#Q25epw6Z{QQ`+SyrH`vMUgt$*xO*oa`KNSe`%N-$<(
zX3TutEmndA*Cb-G?12lzz4!co_ndp@9QfDm`1ttS=H}*CDW%%0&v)Piki86D*X8W&
ztel*jl&MszbN%E+4*=yAqyl{Db`l{3mSwTJy2{kl6t}mx9334|E|)vEI>0!<>oDI1
zD9WGn<Z?L*g?|DoD=Vm~N~u)Bw(YlE+Im{Axs+0(>pJ;-9>Xv=Jw0V_Z;zXso36e+
zLli|JnM~q&9**NsEEaJb2SrhkQhpA^G)>mm*BKrjW`BPl$8p*bb~CltC>o6hLI~E@
z))*Tb>+7kjz1~M6kzitC0>d!K=kp8>4t_2qoldi}vwuUOP@vgtvaqng#>NIiLqk15
zy57m+;v&1dyX0~?s?{n&2sBM&dU_heFgQFs<of#h<B`nI&r>WG$z(FvwvDD~D2hTV
zm7-FqkVqt0US1}hPJaxdsw!JsTL>YjR4Q1O1war47=}R*1lYDs7>3Nu%%G}j|LK~W
zn<Jaea({Ps$N2a-^?DsCWm_zYB3##P|0kwt^7#1JA0(U25{4loBO}ymH8f2lnM~4Z
zwFrWMMx%l2x(FfgeV-_b`cK#W{XKCU<GL<U6t!Vd6wz!paa|YR_whUr-}ec_uzyIY
zRH9m~0^s{TtyYUL4AFHR*LA7YYIvSU5Cl9uJ%921{M<hz2m-dZw~<m3$8j4VrR4JR
z631~+RTa<kux<O@@*-Y+|Lk16y1L^0{G8FzQR?+NhGB4acE-WM0S^xk?H3lu@!#}+
zbvCVcE1hLoEG;c@adAPpTt-TX=XqVrUgw1UUb`I_7?7DvMw+H6g%DB*(XB<l*~xyq
jv>ssj38V6&_n+Bs)5~E<+jF{%00000NkvXXu0mjfVi9>A

delta 1291
zcmV+m1@!v72A&F#B!2{FK}|sb0M^*lPgpVl000?uMObuGZ)S9NVRB^vL1b@YWgtmy
zVP|DhWnpA_ami&o000EANkl<Zc-o{^Sx6*T6n(F{+qF^Cwi{~1W#SgaC15l-AV@^e
zXc8wNNRmbj`jel4=ubeI7(s%c<Bu>f41NTcFn);(<VO)=jDNUAg?5RGYrD5gSG}D3
zum`ov(U1p4y{h-#z4x4Z?ycfN2=<uK-QCUF+S*t_K>@qCxL}o)m3()1H*08U$eEd$
zxnwXHT;t>8T6=rD+<()qkv(#7&fiWoO(P2?Tmk<6{w_E*A0HndVy=5ud8`wc%f(=b
z1qKFs!I(u=)qih%e0;wA3<FLImzI`zPEL*t;_g|AWMySV!lP*2_nQM$u$Y(_mYbW)
z($dmCJUTl1{`~yB5c~Eq|2-=!>vdgSovX96lMV`9Cp$Yk??iESc1DP``uh6d`T6-D
zfTD7JeVv)j=9fV896>liA;(=e!O}@XLxTqj_nZ<5nt#OL;2^WvY?%`i6JO9;US8gh
z`}_MX0RaK3qA1wP#eE`@PN0x`QM9(UGDPm>?d@&s>gxIg+<TXllyu<C&k+$3YJ7aW
zVl)~x3J9q5MWdI4o9orp)dGg!D=I2_etCKM^~T1AeQIjz8FKPBjB?~tfGUO{*y-sh
z+uPgokbm$)>Jo@nu~;k)9JW_fRG8D#(?b>(7Q(Kst{6#~^0~FO#a35W-#YkD5>81;
zp_<Todwbc~*qGwy=f|R=qQax2qd%INnPDcAiG_uQJzNI&B#Zb{Mn*<x?w6XHT7$$p
z78e&a<V7?$H}57SB-m)Js;bJppWn6XzVve9K7XLa#l=0rXl!X|u>loZUS1Y(#EBle
z-OhmU<>uz*Pf*_y#35y_7rdf_KspEt3d%r#dWFbsNl8h>yFg`gQV{Z?`TF{@($dmz
z6B83(;axJQ)AXv{!%10L8AEbu^9MCGH64wOjX7v18lo03!XZ^kHWi_=wzj4@olX@9
zKYxyljO@T#@O8BtbnC>8B0oQ0czJm-Nc6kf+S(i#(NNhuJUm=Fpze#pV<Z5qDJVwT
zPqaQgJUsjg0lff9ag9jaLPCc!GBTtLo0^&;ii?Y%1_uW-w*!*v!NGxaKuGA098f3V
z4u?a|(KyS{R!rA<;U08RQ4#Ou<>mAkLw~h^#>dbyWb}xbAxDf*Qa7dxNMu(=U*j}K
zAQrqgTdh`x0EI4Hqy~zJw12bvQlz1wp>l0|dt2^9wX>6x6Bz*B3tSxCK*O3!>x9+=
z2@Z+r>1o#A-%o~DAk$rPaLu_yK+fE~3H%cR=>%sry2HsjoE=fsW3MM&bbu-tEq{cg
zop1K_^$pNFQWPa02Bbl#ifCa(B~gXBO7%fK3(nqzgoIEa%H40uO$m#EfdNiv&;(!f
z^z;k>0kstchBP=(X%DGqc6L^UBLM*z;9NmL{)T{lO-@cGMC`7UTi^KM;b9_Efl~gN
zoSdu$nqN={pMxGHHa1pvSwcKII)7@QE<sd*p4UirBZ~EOZf;KYy2rG7S@mdq8Wd-R
ztP7#CPcbskao@*xM1`|8p!gG%y}|k6?Ck6lIKEXI5B;skV#4nZId_1H2^h2DZp6DY
zpi&_UJ81g@RQ-kT$SEoBoqsxy{qOoe<6i*=00}zrLF0p?Hvj+t07*qoL<FuvV1kXF
BXl4Ka

diff --git a/res/drawable/tornotificationon.png b/res/drawable/tornotificationon.png
new file mode 100644
index 0000000000000000000000000000000000000000..01ab68a0da0361fe8f0f223d2cd344a883e0287f
GIT binary patch
literal 875
zcmV-x1C;!UP)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ige~
z7c&G$bt8-b00QetL_t(Y$K93BPgGYF$3OS|;0-?pl&K>!I5C1)0{)7d8W*~-(Xi~o
zA93Nfap8iE@kgSqi^jOoU03}FOkHY1)M#wlV5?NqRAY;Z;*4lvhBw2!H}md$#|4BS
z3JjJ-)05oQx#xV&x#!;dh5x$s_xEq>>+9PnB1W|_yMO^es##90BcJctD2bkCiLG?z
z`Uj@-0ib3<vOvpXl^CW$Jl(+V!@F4BmBf8o;Kt<}ynQ$}ck63l4Z!R+7X&CZRZm+_
zioM_NVe{ABh!b)D`XKp7?#DuA@>$iMrHBxV#Yp$2@YYT8_|6k<p1Q@@)A2=PtA?P!
zXjbINVGbGmbY_6ua2}-;BC<RXXO+X&6Pu__#Q636AntHsro%<&SXC2BQ5mmLU#aIn
z??LKXYnOD@jcVtiVv1x(k|w)}b^Fp74aV|9YEl-*t{vrM?`bB22{!NTVf&dan4g);
z14$oh<H~~{Ilkj0Zj{GXHZ_JrYUdih_-;FOn_~YC(zd^qt3O<$J>JP+a1YC<K`BLJ
zZ6mp%JZ6na$C35eYpqX&Sa9mX2~5-EPyLW~djkM|<P&$|1UlgLvr)oINb<|Xg7<V@
zSNf|qHY7UvOFyQ|>1H&{5)omlsX0VC!XNkX4IdG~PFe&Ry);Oob0wZC(PFjoN{`?u
zhbChMUg%K?%aq&_<*_o#R_LNev@HF&3NMOCB)rvc2&m9vrg)`C2qTSKF5u-nf}*D4
z1_XtW$o~Y$(B<c3C$gY~qAudeBo!%BZ#6Jc%2OKk2wY86jtIsBqRD9K5b=bI=Psc_
z1C1sK1DaTYh%o%e3*5hpC{q!*n$qt+g!2!6_G>yj*ZI%AF@AaWGqgu!Btv5?&aIa>
zx&8ee%9%3a3*G}CrPY*FeQ4jz6|Dt-I;X>?<KTKSzh!an7C|7)MOFOW@7u^ia%<En
ziFY-Kwb~NpAj)1;qDMYP-8U`4vJ5Lbo$r5U?*P<USsHSa|NH;|002ovPDHLkV1mna
Bp6dVr

literal 0
HcmV?d00001

diff --git a/res/layout-land/layout_main.xml b/res/layout-land/layout_main.xml
index 29f4d4d2..8959f974 100644
--- a/res/layout-land/layout_main.xml
+++ b/res/layout-land/layout_main.xml
@@ -49,7 +49,7 @@
 							<ImageView
 							android:id="@+id/imgStatus"
 							 android:layout_width="wrap_content"
-		   					 android:layout_height="175px"
+		   					 android:layout_height="225px"
 							android:src="@drawable/toroff"/>
 					</TableRow>
 					<TableRow>
@@ -58,8 +58,8 @@
 							android:layout_gravity="center_horizontal"
 							android:gravity="center_horizontal"
 							android:textStyle="bold"
-							android:width="240px"
-							android:height="50px"
+							android:width="320px"
+							android:height="100px"
 							android:textColor="#ffffff"
 							 />
 					</TableRow>
diff --git a/res/layout/layout_apps.xml b/res/layout/layout_apps.xml
index c314cb78..afd36181 100644
--- a/res/layout/layout_apps.xml
+++ b/res/layout/layout_apps.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:duplicateParentState="false">
-<TextView android:text="Select apps for Tor:"
+<TextView android:text="Select apps to use with Tor:"
 				android:layout_width="fill_parent" 
 				android:layout_height="wrap_content"
 				android:textSize="16sp"		
 				android:padding="3px" />
-	<ListView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/applistview"></ListView>
+	<ListView android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/applistview"></ListView>
 </LinearLayout>
diff --git a/res/layout/layout_apps_item.xml b/res/layout/layout_apps_item.xml
index 907f4353..49939644 100644
--- a/res/layout/layout_apps_item.xml
+++ b/res/layout/layout_apps_item.xml
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
+
+<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    >
-    
-    
+    android:stretchColumns="1">
+    <TableRow>
+    <ImageView android:id="@+id/itemicon" android:layout_width="wrap_content" android:layout_height="wrap_content"  android:padding="3dip"></ImageView>
 
-<ImageView android:id="@+id/itemicon" android:layout_width="48px" android:layout_height="48px"></ImageView>
+<TextView android:layout_height="wrap_content" android:id="@+id/itemtext" android:text="uid:packages"  android:textSize="18sp"  android:padding="3dip"></TextView>
 
-<TextView android:layout_height="wrap_content" android:id="@+id/itemtext" android:text="uid:packages" 
-android:layout_width="220px" android:textSize="18sp"></TextView>
+<CheckBox  android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/itemcheck" ></CheckBox>
+       
+    </TableRow>
+</TableLayout>
 
-<CheckBox  android:layout_width="48px" android:layout_height="48px" android:id="@+id/itemcheck"></CheckBox>
-
-
-</LinearLayout>
diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml
index ddbcbc55..811dbb53 100644
--- a/res/layout/layout_main.xml
+++ b/res/layout/layout_main.xml
@@ -58,8 +58,8 @@
 							android:layout_gravity="center_horizontal"
 							android:gravity="center_horizontal"
 							android:textStyle="bold"
-							android:width="240px"
-							android:height="50px"
+							android:width="320px"
+							android:height="100px"
 							android:textColor="#ffffff"
 							 />
 					</TableRow>
diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java
index f6c8f046..14d1bb8b 100644
--- a/src/org/torproject/android/Orbot.java
+++ b/src/org/torproject/android/Orbot.java
@@ -12,12 +12,10 @@ import java.util.StringTokenizer;
 import org.torproject.android.service.ITorService;
 import org.torproject.android.service.ITorServiceCallback;
 import org.torproject.android.service.TorServiceConstants;
-import org.torproject.android.service.TorTransProxy;
 
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.NotificationManager;
-import android.app.ProgressDialog;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -34,18 +32,11 @@ import android.os.RemoteException;
 import android.preference.PreferenceManager;
 import android.util.Log;
 import android.view.KeyEvent;
-import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -720,9 +711,9 @@ public class Orbot extends Activity implements OnClickListener, TorConstants
 		    	if (torStatus == STATUS_ON)
 		    	{
 		    		imgStatus.setImageResource(R.drawable.toron);
-		    		imgStatus.clearAnimation();
+		    	//	imgStatus.clearAnimation();
 		    		
-		    		String lblMsg = getString(R.string.status_activated) + ": " + torServiceMsg;
+		    		String lblMsg = getString(R.string.status_activated) + "\n" + torServiceMsg;
 		    		
 		    		lblStatus.setText(lblMsg);
 		    		
@@ -769,7 +760,7 @@ public class Orbot extends Activity implements OnClickListener, TorConstants
 		    		
 		    		lblStatus.setText(torServiceMsg);
 		    		
-		    		
+		    		/*
 	    			int idx = torServiceMsg.indexOf("%");
 	    			
 	    			if (idx != -1)
@@ -778,13 +769,13 @@ public class Orbot extends Activity implements OnClickListener, TorConstants
 	    				int ipComp = Integer.parseInt(pComp);
 	    			//	progressDialog.setProgress(ipComp);
 	    				
-	    			}
+	    			}*/
 		    			
 		    	}
 		    	else if (torStatus == STATUS_OFF)
 		    	{
 		    		imgStatus.setImageResource(R.drawable.torstopping);
-		    		imgStatus.clearAnimation();
+		    	//	imgStatus.clearAnimation();
 		    		
 		    		lblStatus.setText(getString(R.string.status_shutting_down));
 		    			
@@ -793,10 +784,10 @@ public class Orbot extends Activity implements OnClickListener, TorConstants
 		    	{
 
 		    		
-		    		imgStatus.clearAnimation();
+		    	//	imgStatus.clearAnimation();
 		    		
 		    		imgStatus.setImageResource(R.drawable.toroff);
-		    		lblStatus.setText(getString(R.string.status_disabled));
+		    		lblStatus.setText(getString(R.string.status_disabled) + "\n" + getString(R.string.press_to_start));
 		    		
 		    		
 		    		
@@ -827,11 +818,13 @@ public class Orbot extends Activity implements OnClickListener, TorConstants
     
     private void stopTor () throws RemoteException
     {
-    	mService.setProfile(PROFILE_ONDEMAND);	//these means turn off
+    	if (mService != null)
+    	{
+    		mService.setProfile(PROFILE_ONDEMAND);	//these means turn off
 		
-		Message msg = mHandler.obtainMessage(DISABLE_TOR_MSG);
-    	mHandler.sendMessage(msg);
-    	
+    		Message msg = mHandler.obtainMessage(DISABLE_TOR_MSG);
+    		mHandler.sendMessage(msg);
+    	}
     	
     }
     
diff --git a/src/org/torproject/android/SettingsPreferences.java b/src/org/torproject/android/SettingsPreferences.java
index 277f087d..1d829717 100644
--- a/src/org/torproject/android/SettingsPreferences.java
+++ b/src/org/torproject/android/SettingsPreferences.java
@@ -7,9 +7,12 @@ import org.torproject.android.service.TorServiceUtils;
 import org.torproject.android.service.TorTransProxy;
 
 import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
+import android.preference.PreferenceManager;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceCategory;
@@ -23,7 +26,6 @@ public class SettingsPreferences
 	private Preference prefTransProxyApps = null;
 	private CheckBoxPreference prefHiddenServices = null;
 	
-	
 	private boolean hasRoot = false;
 	
 	protected void onCreate(Bundle savedInstanceState)
@@ -31,8 +33,19 @@ public class SettingsPreferences
 		super.onCreate(savedInstanceState);
 		addPreferencesFromResource(R.xml.preferences);
 		
-		hasRoot = TorServiceUtils.checkRootAccess();
+		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
 		
+		if (prefs.contains("has_root"))
+		{
+			hasRoot = prefs.getBoolean("has_root",false);//TorServiceUtils.checkRootAccess();
+		}
+		else
+		{
+			hasRoot = TorServiceUtils.checkRootAccess();
+			Editor pEdit = prefs.edit();
+			pEdit.putBoolean("has_root",hasRoot);
+			pEdit.commit();
+		}
 	}
 	
 	
diff --git a/src/org/torproject/android/WizardHelper.java b/src/org/torproject/android/WizardHelper.java
index 772195bc..a73c45bb 100644
--- a/src/org/torproject/android/WizardHelper.java
+++ b/src/org/torproject/android/WizardHelper.java
@@ -87,6 +87,12 @@ public class WizardHelper implements TorConstants {
 				
 				boolean hasRoot = TorServiceUtils.checkRootAccess();
 				
+				SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+
+				Editor pEdit = prefs.edit();
+				pEdit.putBoolean("has_root",hasRoot);
+				pEdit.commit();
+				
 				if (hasRoot)
 				{
 					currentDialog.dismiss();
diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index 96f99cd4..2e89c3dc 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -29,6 +29,7 @@ import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
 import android.os.IBinder;
 import android.os.RemoteCallbackList;
 import android.os.RemoteException;
@@ -42,6 +43,7 @@ public class TorService extends Service implements TorServiceConstants, Runnable
 	private static int currentStatus = STATUS_READY;
 		
 	private TorControlConnection conn = null;
+	private Socket torConnSocket = null;
 	
 	private static TorService _torInstance;
 	
@@ -51,12 +53,12 @@ public class TorService extends Service implements TorServiceConstants, Runnable
 
     private ArrayList<String> configBuffer = null;
     
-    private boolean isBound = false;
-    
-    private String appHome = null;
-    private String torBinaryPath = null;
-    private String privoxyPath = null;
+   
+    private String appHome = "/data/data/" + TOR_APP_USERNAME + "/";;
+    private String torBinaryPath = appHome + TOR_BINARY_ASSET_KEY;
+    private String privoxyPath = appHome + PRIVOXY_ASSET_KEY;
     
+	
     private boolean hasRoot = false;
     
     /** Called when the activity is first created. */
@@ -83,7 +85,6 @@ public class TorService extends Service implements TorServiceConstants, Runnable
 				
  				initControlConnection();
 				
-				
 				currentStatus = STATUS_ON;
 				
 				return true;
@@ -124,7 +125,7 @@ public class TorService extends Service implements TorServiceConstants, Runnable
 		
 	//	logNotice( "onUnbind Called: " + intent.getAction());
 		
-		isBound = false;
+		
 		
 		return super.onUnbind(intent);
 		
@@ -172,7 +173,6 @@ public class TorService extends Service implements TorServiceConstants, Runnable
 	public void onRebind(Intent intent) {
 		super.onRebind(intent);
 		
-		isBound = true;
 		
 	}
 
@@ -182,9 +182,13 @@ public class TorService extends Service implements TorServiceConstants, Runnable
 	 */
 	public void onStart(Intent intent, int startId) {
 		super.onStart(intent, startId);
-		
-    	hasRoot = TorServiceUtils.checkRootAccess();
 
+		try {
+			checkTorBinaries ();
+		} catch (Exception e) {
+		
+			Log.e(TAG, "error checking tor binaries", e);
+		}
 	}
 	 
 	public void run ()
@@ -272,21 +276,33 @@ public class TorService extends Service implements TorServiceConstants, Runnable
     
     private void killTorProcess () throws Exception
     {
+		//android.os.Debug.waitForDebugger();
 		
+    	StringBuilder log = new StringBuilder();
+    	int procId = -1;
+    	
     	if (conn != null)
 		{
+    		logNotice("Using control port to shutdown Tor");
+    		
 			try {
 				logNotice("sending SHUTDOWN signal to Tor process");
 				conn.signal("SHUTDOWN");
+				//torConnSocket.close();
+				
 			} catch (Exception e) {
 				Log.d(TAG,"error shutting down Tor via connection",e);
 			}
+			
 			conn = null;
 		}
     	
-    	StringBuilder log = new StringBuilder();
+    	try //wait a second for this
+    	{ Thread.sleep(1000); }
+    	catch (Exception e) {}
     	
-		int procId = TorServiceUtils.findProcessId(torBinaryPath);
+    	logNotice("Checking for existing Tor process via path: " + torBinaryPath);
+		procId = TorServiceUtils.findProcessId(torBinaryPath);
 
 		while (procId != -1)
 		{
@@ -298,7 +314,9 @@ public class TorService extends Service implements TorServiceConstants, Runnable
 
 			procId = TorServiceUtils.findProcessId(torBinaryPath);
 		}
+    	
 		
+    	logNotice("Checking for existing Privoxy process via path: " + privoxyPath);
 		procId = TorServiceUtils.findProcessId(privoxyPath);
 
 		while (procId != -1)
@@ -383,15 +401,17 @@ public class TorService extends Service implements TorServiceConstants, Runnable
     {
     	
     	
-    	logNotice( "checking Tor binaries");
+		appHome = "/data/data/" + TOR_APP_USERNAME + "/";
+		//appHome = getApplicationContext().getFilesDir().getAbsolutePath();
     	
-    	//appHome = getApplicationContext().getFilesDir().getAbsolutePath();
-    	appHome = "/data/data/" + TOR_APP_USERNAME + "/";
-    	
-    	logNotice( "appHome=" + appHome);
+		logNotice( "appHome=" + appHome);
+		torBinaryPath = appHome + TOR_BINARY_ASSET_KEY;
+    	privoxyPath = appHome + PRIVOXY_ASSET_KEY;
     	
+		logNotice( "checking Tor binaries");
+	    	
     	String apkPath = findAPK();
-    	
+		    	
     	logNotice( "found apk at: " + apkPath);
     	
     	boolean apkExists = new File(apkPath).exists();
@@ -400,11 +420,11 @@ public class TorService extends Service implements TorServiceConstants, Runnable
     	{
     		Log.w(TAG,"APK file not found at: " + apkPath);
     		Log.w(TAG,"Binary installation aborted");
+    		logNotice(getString(R.string.status_install_fail));
+    		sendCallbackStatusMessage(getString(R.string.status_install_fail));
     		return false;
     	}
     	
-    	torBinaryPath = appHome + TOR_BINARY_ASSET_KEY;
-    	privoxyPath = appHome + PRIVOXY_ASSET_KEY;
     	
 		boolean torBinaryExists = new File(torBinaryPath).exists();
 		boolean privoxyBinaryExists = new File(privoxyPath).exists();
@@ -440,12 +460,10 @@ public class TorService extends Service implements TorServiceConstants, Runnable
 		else
 		{
 			logNotice("Found Tor binary: " + torBinaryPath);
-
 			logNotice("Found Privoxy binary: " + privoxyPath);
 
-
 		}
-		
+	
 		StringBuilder log = new StringBuilder ();
 		
 		logNotice("(re)Setting permission on Tor binary");
@@ -455,7 +473,7 @@ public class TorService extends Service implements TorServiceConstants, Runnable
 		logNotice("(re)Setting permission on Privoxy binary");
 		String[] cmd2 = {SHELL_CMD_CHMOD + ' ' + CHMOD_EXE_VALUE + ' ' + privoxyPath};
 		TorServiceUtils.doShellCommand(cmd2, log, false, true);
-				
+		
 		
 		return true;
     }
@@ -472,25 +490,6 @@ public class TorService extends Service implements TorServiceConstants, Runnable
     		
     		killTorProcess ();
     		
-    		checkTorBinaries ();
-
-        	
-    		
-    		new Thread()
-    		{
-    			public void run ()
-    			{
-    				try {
-    		    		runPrivoxyShellCmd();
-
-					} catch (Exception e) {
-						currentStatus = STATUS_OFF;
-				    	 Log.d(TAG,"Unable to start Privoxy: " + e.getMessage(),e);
-	    			    sendCallbackLogMessage("Unable to start Privoxy: " + e.getMessage());
-
-					} 
-    			}
-    		}.start();
     		
     		new Thread()
     		{
@@ -500,6 +499,9 @@ public class TorService extends Service implements TorServiceConstants, Runnable
     		    		runTorShellCmd();
     		    		
     		    		setupTransProxy(true);
+    		    		
+       		    		runPrivoxyShellCmd();
+
 
     				} catch (Exception e) {
     			    	Log.d(TAG,"Unable to start Tor: " + e.getMessage(),e);	
@@ -518,34 +520,38 @@ public class TorService extends Service implements TorServiceConstants, Runnable
     	
     	StringBuilder log = new StringBuilder();
 		
-		
 		String torrcPath = appHome + TORRC_ASSET_KEY;
 		
 		String[] torCmd = {torBinaryPath + " -f " + torrcPath  + " || exit\n"};
-		TorServiceUtils.doShellCommand(torCmd, log, false, false);
-	
-		logNotice( "Starting tor process: " + torCmd[0]);
 		
-		Thread.sleep(1000);
-		int procId = TorServiceUtils.findProcessId(torBinaryPath);
-
+		boolean runAsRootFalse = false;
+		boolean waitForProcess = false;
+		
+		int procId = -1;
 		int attempts = 0;
+
+		int torRetryWaitTimeMS = 5000;
 		
 		while (procId == -1 && attempts < MAX_START_TRIES)
 		{
 			log = new StringBuilder();
 			
 			logNotice(torCmd[0]);
+			sendCallbackStatusMessage(getString(R.string.status_starting_up));
+			
+			TorServiceUtils.doShellCommand(torCmd, log, runAsRootFalse, waitForProcess);
+		
+			Thread.sleep(torRetryWaitTimeMS);
 			
-			TorServiceUtils.doShellCommand(torCmd, log, false, false);
 			procId = TorServiceUtils.findProcessId(torBinaryPath);
 			
+			logNotice("got tor proc id: " + procId);
+			
 			if (procId == -1)
 			{
-				sendCallbackStatusMessage("Couldn't start Tor process...\n" + log.toString());
-				Thread.sleep(1000);
-				sendCallbackStatusMessage(getString(R.string.status_starting_up));
-				Thread.sleep(3000);
+				
+				sendCallbackStatusMessage("Couldn't start Tor process.\nretrying..." + log.toString());
+				Thread.sleep(torRetryWaitTimeMS);
 				attempts++;
 			}
 			
@@ -637,8 +643,8 @@ public class TorService extends Service implements TorServiceConstants, Runnable
 					String baseMessage = getString(R.string.tor_process_connecting);
 					sendCallbackStatusMessage(baseMessage);
 					
-					Socket s = new Socket(IP_LOCALHOST, TOR_CONTROL_PORT);
-			        conn = TorControlConnection.getConnection(s);
+					torConnSocket = new Socket(IP_LOCALHOST, TOR_CONTROL_PORT);
+			        conn = TorControlConnection.getConnection(torConnSocket);
 			      //  conn.authenticate(new byte[0]); // See section 3.2
 			        
 					sendCallbackStatusMessage(getString(R.string.tor_process_connecting_step2));
@@ -790,7 +796,7 @@ public class TorService extends Service implements TorServiceConstants, Runnable
           if (msg.indexOf(TOR_CONTROL_PORT_MSG_BOOTSTRAP_DONE)!=-1)
           {
         	  currentStatus = STATUS_ON;
-        	  showToolbarNotification (getString(R.string.status_activated),R.drawable.tornotification);
+        	  showToolbarNotification (getString(R.string.status_activated),R.drawable.tornotificationon);
   			  
           }
          
@@ -893,22 +899,21 @@ public class TorService extends Service implements TorServiceConstants, Runnable
         // a single interface, you can just return it here without checking
         // the Intent.
         
-    	if (appHome == null)
-    	{
-    		try
-    		{
-    			checkTorBinaries();
-        	
-    			findExistingProc ();
-        	
-    			_torInstance = this;
-    		}
-    		catch (Exception e)
-    		{
-    			Log.d(TAG,"Unable to check for Tor binaries",e);
-    			return null;
-    		}
-    	}
+    	
+		try
+		{
+			
+			checkTorBinaries();
+    	
+			findExistingProc ();
+    	
+			_torInstance = this;
+		}
+		catch (Exception e)
+		{
+			Log.d(TAG,"Unable to check for Tor binaries",e);
+			return null;
+		}
     	
     	if (ITorService.class.getName().equals(intent.getAction())) {
             return mBinder;
@@ -1058,7 +1063,6 @@ public class TorService extends Service implements TorServiceConstants, Runnable
     
     private void sendCallbackStatusMessage (String newStatus)
     {
-    	 sendCallbackLogMessage (newStatus); //we want everything to go to the log!
     	 
         // Broadcast to all clients the new value.
         final int N = mCallbacks.beginBroadcast();
@@ -1277,6 +1281,18 @@ public class TorService extends Service implements TorServiceConstants, Runnable
     	
 		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplication());
 		
+		if (prefs.contains("has_root"))
+		{
+			hasRoot = prefs.getBoolean("has_root",false);//TorServiceUtils.checkRootAccess();
+		}
+		else
+		{
+			hasRoot = TorServiceUtils.checkRootAccess();
+			Editor pEdit = prefs.edit();
+			pEdit.putBoolean("has_root",hasRoot);
+			pEdit.commit();
+		}
+		
 		boolean enableTransparentProxy = prefs.getBoolean("pref_transparent", false);
 		boolean transProxyAll = prefs.getBoolean("pref_transparent_all", false);
 	
@@ -1309,12 +1325,9 @@ public class TorService extends Service implements TorServiceConstants, Runnable
 				}
 			}
 		}
-		else
+		else if (hasRoot)
 		{
-			if (hasRoot)
-			{
-				TorTransProxy.purgeIptables(this,AppManager.getApps(this));
-			}
+			TorTransProxy.purgeIptables(this,AppManager.getApps(this));
 		}
 		
 		return true;
diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java
index 883cb136..b9a44380 100644
--- a/src/org/torproject/android/service/TorTransProxy.java
+++ b/src/org/torproject/android/service/TorTransProxy.java
@@ -95,32 +95,34 @@ public class TorTransProxy implements TorServiceConstants {
     	StringBuilder res = new StringBuilder();
     	int code = -1;
     	
-			for (int i = 0; i < apps.length; i++)
-			{
+		for (int i = 0; i < apps.length; i++)
+		{
 
-				//flush nat for every app
-				script.append(baseDir);
-				script.append("iptables -t nat -m owner --uid-owner ");
-				script.append(apps[i].getUid());
-				script.append(" -F || exit\n");
-				script.append("iptables -t filter -m owner --uid-owner ");
-				script.append(apps[i].getUid());
-				script.append(" -F || exit\n");
-					
-			}
-			
-	    	
-	    	String[] cmd = {script.toString()};	    	
-			code = TorServiceUtils.doShellCommand(cmd, res, true, true);		
-			String msg = res.toString();
-			logNotice(cmd[0] + ";errCode=" + code + ";resp=" + msg);
+			//flush nat for every app
+			script.append(baseDir);
+			script.append("iptables -t nat -m owner --uid-owner ");
+			script.append(apps[i].getUid());
+			script.append(" -F || exit\n");
+			script.append("iptables -t filter -m owner --uid-owner ");
+			script.append(apps[i].getUid());
+			script.append(" -F || exit\n");
+				
+		}
+		
+    	
+    	String[] cmd = {script.toString()};	    	
+		code = TorServiceUtils.doShellCommand(cmd, res, true, true);		
+		String msg = res.toString();
+		logNotice(cmd[0] + ";errCode=" + code + ";resp=" + msg);
 			
 		
 		return code;
 		
 	}
 	
-
+	/*
+	 // 9/19/2010 - NF This code is in process... /etc path on System partition
+	 // is read-only on Android for now.
 	public static int redirectDNSResolvConf () throws Exception
 	{
     	StringBuilder script = new StringBuilder();
@@ -160,6 +162,7 @@ public class TorTransProxy implements TorServiceConstants {
 		
 		return code;
 	}
+	*/
 	
 	public static int setTransparentProxyingByApp(Context context, TorifiedApp[] apps, boolean forceAll) throws Exception
 	{