From a97974c9ba756a6fa67195514b19eb46f6476502 Mon Sep 17 00:00:00 2001 From: Nathan Freitas Date: Sat, 28 Nov 2009 15:41:28 +0000 Subject: [PATCH] Orbot 0.0.2: major UI improvements w/ editable settings and more svn:r21042 --- Orbot/.classpath | 3 +- Orbot/BUILD | 10 + Orbot/CHANGELOG | 8 +- Orbot/assets/torrc | 4 +- Orbot/build.xml | 2 +- Orbot/default.properties | 14 +- Orbot/res/drawable/bgdarkdroid.png | Bin 0 -> 37969 bytes Orbot/res/drawable/ic_menu_about.png | Bin 0 -> 1771 bytes Orbot/res/drawable/ic_menu_goto.png | Bin 0 -> 1636 bytes Orbot/res/drawable/ic_menu_home.png | Bin 0 -> 2048 bytes Orbot/res/drawable/ic_menu_register.png | Bin 0 -> 2144 bytes Orbot/res/drawable/ic_menu_reports.png | Bin 0 -> 2379 bytes Orbot/res/drawable/icon.png | Bin 2953 -> 7432 bytes Orbot/res/drawable/toroff.png | Bin 7721 -> 13815 bytes Orbot/res/drawable/toron.png | Bin 5732 -> 13694 bytes Orbot/res/drawable/torstarting.png | Bin 0 -> 13822 bytes Orbot/res/drawable/torstopping.png | Bin 0 -> 13826 bytes Orbot/res/drawable/vidalia.png | Bin 0 -> 16062 bytes Orbot/res/layout/layout_log.xml | 12 +- Orbot/res/layout/layout_main.xml | 101 ++--- Orbot/res/layout/layout_settings.xml | 8 +- .../src/org/torproject/android/HttpProxy.java | 13 +- .../android/TorBinaryInstaller.java | 4 +- .../org/torproject/android/TorConstants.java | 14 + .../torproject/android/TorControlPanel.java | 246 ++++++++--- .../org/torproject/android/TorService.java | 406 +++++++++++++----- 26 files changed, 590 insertions(+), 255 deletions(-) create mode 100644 Orbot/res/drawable/bgdarkdroid.png create mode 100644 Orbot/res/drawable/ic_menu_about.png create mode 100644 Orbot/res/drawable/ic_menu_goto.png create mode 100644 Orbot/res/drawable/ic_menu_home.png create mode 100755 Orbot/res/drawable/ic_menu_register.png create mode 100644 Orbot/res/drawable/ic_menu_reports.png create mode 100644 Orbot/res/drawable/torstarting.png create mode 100644 Orbot/res/drawable/torstopping.png create mode 100644 Orbot/res/drawable/vidalia.png diff --git a/Orbot/.classpath b/Orbot/.classpath index c4756d90..4db39efd 100644 --- a/Orbot/.classpath +++ b/Orbot/.classpath @@ -3,6 +3,7 @@ - + + diff --git a/Orbot/BUILD b/Orbot/BUILD index 0a6cb66f..4c93a408 100644 --- a/Orbot/BUILD +++ b/Orbot/BUILD @@ -91,6 +91,16 @@ We need to build our Java SOCKS library: ant jar cp bin/jar/asocks.jar ../Orbot/libs +We need to get the TorControl library for Java (https://svn.torproject.org/svn/torctl/trunk/doc/howto.txt): + + git clone git://git.torproject.org/git/jtorctl + cd jtorctl + mkdir bin + javac net/freehaven/tor/control/TorControlConnection.java -d bin + cd bin + jar cvf jtorctrl.jar * + cp jtorctrl.jar {Orbot Home}/libs + Finally, we'll make a proper Android package with ant and the Android App SDK: export APP_SDK=~/Documents/projects/android/android-sdk-linux_x86-1.5_r3/tools diff --git a/Orbot/CHANGELOG b/Orbot/CHANGELOG index 6f0da51c..2f45cc38 100644 --- a/Orbot/CHANGELOG +++ b/Orbot/CHANGELOG @@ -1,6 +1,12 @@ +0.0.2 - 2009-11-27 +- Major improvement to the user interface including relative layout for different screens +- New graphics resources +- Implemented Tor Control Port using official Java library +- Added 'clear' button to the log screen +- Added 'save' and editable textbox for the settings screen +- Moved screen navigation to a pop-up menu Changes in version 0.0.1-alpha - 2009-10-21 - First code release - Major Features: Tor binary application is fully operational, UI: Start/Stop Tor, View Message Log, View Settings (torrc) - diff --git a/Orbot/assets/torrc b/Orbot/assets/torrc index 68601080..f3085477 100644 --- a/Orbot/assets/torrc +++ b/Orbot/assets/torrc @@ -52,11 +52,11 @@ DataDirectory /data/data/org.torproject.android/data ## The port on which Tor will listen for local connections from Tor ## controller applications, as documented in control-spec.txt. -#ControlPort 9051 +ControlPort 9051 ## If you enable the controlport, be sure to enable one of these ## authentication methods, to prevent attackers from accessing it. #HashedControlPassword 16:872860B76453A77D60CA2BB8C1A7042072093276A3D701AD684053EC4C -#CookieAuthentication 1 +CookieAuthentication 1 ############### This section is just for location-hidden services ### diff --git a/Orbot/build.xml b/Orbot/build.xml index 6d8e0ff7..2ec1d94c 100644 --- a/Orbot/build.xml +++ b/Orbot/build.xml @@ -1,5 +1,5 @@ - +