- tor-commits - lists.torproject.org

[orbot/master] updated changelog
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit 92029abb6ae7206153144c2f6852648166a317f3 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 9 00:24:05 2012 -0500 updated changelog --- CHANGELOG | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 2c6a339..94ccca6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,14 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +1.0.7 +- updated openssl to 1.0.0f to address recent SSLv3 threat +- check for root mode uses "which su" command and does not look for Superuser.apk +- changed tor binary res/raw storage mechanism to use the "mp3" file ext trick + +1.0.6.1 +- small fixes to wizard UI +- fixed "exit" problem, after running wizard + 1.0.6 - updated tablet layout graphic sizing - stopped Orweb from being transparent proxied (not needed)

1 0

[orbot/master] moved layout for high-res screens
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit 369b043408c5f5fdf283defeb5d6e34950262b0a Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 9 01:38:56 2012 -0500 moved layout for high-res screens --- res/layout-sw720dp/layout_main.xml | 55 ------------------------------------ res/layout-xlarge/layout_main.xml | 55 ++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/res/layout-sw720dp/layout_main.xml b/res/layout-sw720dp/layout_main.xml deleted file mode 100644 index ac19112..0000000 --- a/res/layout-sw720dp/layout_main.xml +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:background="@drawable/bgtitanium" android:orientation="vertical"> - - <RelativeLayout android:id="@+id/layoutHeaderMain" - android:layout_width="fill_parent" - android:layout_height="30dp" - android:layout_gravity="center_horizontal" - android:background="#A0909090"> - <ImageView android:id="@+id/radioModeImage" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="3px" - android:layout_marginRight="3px" - android:gravity="right" - android:layout_toRightOf="@+id/radioModeLabel" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:src="@drawable/tor25" - /> - <TextView android:id="@+id/radioModeText" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="powered by The Tor Project " - android:layout_marginTop="8px" - android:layout_marginRight="0px" - android:gravity="right" - android:layout_toLeftOf="@+id/radioModeImage" - android:textColor="#cccccc" /> - </RelativeLayout> - - <ImageView - android:id="@+id/imgStatus" - android:layout_width="fill_parent" - android:layout_margin="15dip" - android:layout_height="400dp" - android:layout_gravity="center_horizontal" - android:src="@drawable/toroff" android:layout_weight="1"/> - - <TextView android:id="@+id/lblStatus" - android:text="@string/press_to_start" - android:layout_gravity="center_horizontal" - android:textStyle="bold" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - - android:textColor="#ffffff" - /> - - - -</LinearLayout> - diff --git a/res/layout-xlarge/layout_main.xml b/res/layout-xlarge/layout_main.xml new file mode 100644 index 0000000..ac19112 --- /dev/null +++ b/res/layout-xlarge/layout_main.xml @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:background="@drawable/bgtitanium" android:orientation="vertical"> + + <RelativeLayout android:id="@+id/layoutHeaderMain" + android:layout_width="fill_parent" + android:layout_height="30dp" + android:layout_gravity="center_horizontal" + android:background="#A0909090"> + <ImageView android:id="@+id/radioModeImage" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="3px" + android:layout_marginRight="3px" + android:gravity="right" + android:layout_toRightOf="@+id/radioModeLabel" + android:layout_alignParentRight="true" + android:layout_alignParentTop="true" + android:src="@drawable/tor25" + /> + <TextView android:id="@+id/radioModeText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="powered by The Tor Project " + android:layout_marginTop="8px" + android:layout_marginRight="0px" + android:gravity="right" + android:layout_toLeftOf="@+id/radioModeImage" + android:textColor="#cccccc" /> + </RelativeLayout> + + <ImageView + android:id="@+id/imgStatus" + android:layout_width="fill_parent" + android:layout_margin="15dip" + android:layout_height="400dp" + android:layout_gravity="center_horizontal" + android:src="@drawable/toroff" android:layout_weight="1"/> + + <TextView android:id="@+id/lblStatus" + android:text="@string/press_to_start" + android:layout_gravity="center_horizontal" + android:textStyle="bold" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + + android:textColor="#ffffff" + /> + + + +</LinearLayout> +

1 0

[orbot/master] adding in binaries with .mp3 extensions for dev CI
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit 1bdbf57ffabe08669a8c695902c0aea9aaa1f5dc Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 9 00:32:20 2012 -0500 adding in binaries with .mp3 extensions for dev CI --- res/raw/geoip.mp3 | Bin 0 -> 966562 bytes res/raw/tor.mp3 | Bin 0 -> 1637412 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/res/raw/geoip.mp3 b/res/raw/geoip.mp3 new file mode 100644 index 0000000..e3f1d8f Binary files /dev/null and b/res/raw/geoip.mp3 differ diff --git a/res/raw/tor.mp3 b/res/raw/tor.mp3 new file mode 100644 index 0000000..bc02210 Binary files /dev/null and b/res/raw/tor.mp3 differ

1 0

[orbot/master] fixing build.xml for CI server
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit 45eb3b2afd5d44e187977c1a0a8dad2d569730c2 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 9 00:35:41 2012 -0500 fixing build.xml for CI server --- build.xml | 122 +++++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 70 insertions(+), 52 deletions(-) diff --git a/build.xml b/build.xml index 08dd4a6..8a95dfb 100644 --- a/build.xml +++ b/build.xml @@ -1,67 +1,85 @@ <?xml version="1.0" encoding="UTF-8"?> -<project name="Orbot"> +<project name="Orbot" default="help">  - <property file="local.properties" /> + It contains the path to the SDK. It should *NOT* be checked into + Version Control Systems. --> + <loadproperties srcFile="local.properties" /> -  - <property file="build.properties" /> - -  - <property file="default.properties" /> - -  - <path id="android.antlibs"> - <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" /> - <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" /> - <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" /> - <pathelement path="${sdk.dir}/tools/lib/apkbuilder.jar" /> - <pathelement path="${sdk.dir}/tools/lib/jarutils.jar" /> - </path> - - <taskdef name="setup" - classname="com.android.ant.SetupTask" - classpathref="android.antlibs" /> - -  + <loadproperties srcFile="project.properties" /> + +  + <fail + message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'" + unless="sdk.dir" + /> + + + + + +  - <setup /> +  + <import file="${sdk.dir}/tools/ant/build.xml" /> </project>

1 0

[orbot/master] only bind service if variable currently null
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit e206a241ab5a4c95d0bbbc4d93826343e7117c5b Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 9 00:23:23 2012 -0500 only bind service if variable currently null --- src/org/torproject/android/Orbot.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index b7bb62f..a93586d 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -390,8 +390,13 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants autoStartOnBind = true; if (mService == null) + { bindService(); - + } + else + { + //already running! + } } else {

1 0

[orbot/master] updated version strings
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit 78fc2d946ddf533af0aebfac5f4d79a2ccdf340a Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 9 00:22:16 2012 -0500 updated version strings --- res/layout/layout_about.xml | 9 ++++++++- res/values/strings.xml | 5 +++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/res/layout/layout_about.xml b/res/layout/layout_about.xml index fbc8cae..ca765ff 100644 --- a/res/layout/layout_about.xml +++ b/res/layout/layout_about.xml @@ -106,8 +106,15 @@ android:layout_height="wrap_content" android:autoLink="web" android:textColorLink="#ffffff" + android:paddingLeft="15px" + android:textColor="#ffffff"/> + <TextView android:text="@string/openssl_version" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:autoLink="web" + android:textColorLink="#ffffff" android:paddingLeft="15px" - android:textColor="#ffffff" /> + android:textColor="#ffffff" /> </LinearLayout> </ScrollView> </LinearLayout> diff --git a/res/values/strings.xml b/res/values/strings.xml index 30db5d5..08bc34b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -133,7 +133,7 @@ <string name="wizard_permissions_title">Permissions</string> <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string> <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string> - <string name="wizard_permissions_no_root_msg">Your device is running in standard mode, and does not support root or \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string> + <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string>  <string name="wizard_tips_title">Orbot-Enabled Apps</string> <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string> @@ -237,10 +237,11 @@ <string name="the_tor_license">The Tor License</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">3rd-Party-Software: </string> -<string name="tor_version">Tor v0.2.3.7-alpha: https://www.torproject.org</string> +<string name="tor_version">Tor v0.2.3.10-alpha: https://www.torproject.org</string> <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> +<string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string> <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string> <string name="found_existing_tor_process">found existing Tor process...</string> <string name="something_bad_happened">Something bad happened. Check the log</string>

1 0

[orbot/master] tweaked root request on/off preference UI
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit 331c4956d718a889415fb2be3135758b91b6d68f Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jan 12 15:46:54 2012 -0500 tweaked root request on/off preference UI --- src/org/torproject/android/Orbot.java | 2 +- .../android/settings/SettingsPreferences.java | 45 +++++++++++++++----- 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index a93586d..5452a5a 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -107,7 +107,7 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants mItemOnOff.setAlphabeticShortcut('t'); mItem = menu.add(0, 4, Menu.NONE, getString(R.string.menu_settings)); - mItem.setIcon(R.drawable.ic_menu_register); + mItem.setIcon(R.drawable.ic_menu_settings); mItem = menu.add(0, 7, Menu.NONE, getString(R.string.menu_verify)); mItem.setIcon(R.drawable.ic_menu_check); diff --git a/src/org/torproject/android/settings/SettingsPreferences.java b/src/org/torproject/android/settings/SettingsPreferences.java index c3b5942..bb5b24b 100644 --- a/src/org/torproject/android/settings/SettingsPreferences.java +++ b/src/org/torproject/android/settings/SettingsPreferences.java @@ -18,6 +18,7 @@ import android.preference.PreferenceManager; import android.preference.Preference.OnPreferenceClickListener; import android.preference.PreferenceActivity; import android.preference.PreferenceCategory; +import android.widget.Toast; public class SettingsPreferences @@ -27,11 +28,13 @@ public class SettingsPreferences private CheckBoxPreference prefcBTransProxyAll = null; private Preference prefTransProxyApps = null; private CheckBoxPreference prefHiddenServices = null; + private CheckBoxPreference prefRequestRoot = null; private boolean hasRoot = false; private final static int HIDDEN_SERVICE_PREF_IDX = 6; + private final static int TRANSPROXY_GROUP_IDX = 1; protected void onCreate(Bundle savedInstanceState) { @@ -55,27 +58,31 @@ public class SettingsPreferences super.onResume(); + int REQUEST_ROOT_IDX = 1; + int GENERAL_GROUP_IDX = 0; + + prefRequestRoot = ((CheckBoxPreference)((PreferenceCategory)getPreferenceScreen().getPreference(GENERAL_GROUP_IDX)).getPreference(REQUEST_ROOT_IDX)); + prefRequestRoot.setOnPreferenceClickListener(this); + + prefCBTransProxy = ((CheckBoxPreference)((PreferenceCategory)this.getPreferenceScreen().getPreference(TRANSPROXY_GROUP_IDX)).getPreference(0)); + prefcBTransProxyAll = (CheckBoxPreference)((PreferenceCategory)this.getPreferenceScreen().getPreference(TRANSPROXY_GROUP_IDX)).getPreference(1); + prefTransProxyApps = ((PreferenceCategory)this.getPreferenceScreen().getPreference(TRANSPROXY_GROUP_IDX)).getPreference(2); + - int transProxyGroupIdx = 1; + prefCBTransProxy.setOnPreferenceClickListener(this); + prefcBTransProxyAll.setOnPreferenceClickListener(this); + prefTransProxyApps.setOnPreferenceClickListener(this); if (!hasRoot) { - getPreferenceScreen().getPreference(transProxyGroupIdx).setEnabled(false); + getPreferenceScreen().getPreference(TRANSPROXY_GROUP_IDX).setEnabled(false); } else { - prefCBTransProxy = ((CheckBoxPreference)((PreferenceCategory)this.getPreferenceScreen().getPreference(transProxyGroupIdx)).getPreference(0)); - prefcBTransProxyAll = (CheckBoxPreference)((PreferenceCategory)this.getPreferenceScreen().getPreference(transProxyGroupIdx)).getPreference(1); - prefTransProxyApps = ((PreferenceCategory)this.getPreferenceScreen().getPreference(transProxyGroupIdx)).getPreference(2); prefcBTransProxyAll.setEnabled(prefCBTransProxy.isChecked()); - prefTransProxyApps.setEnabled(prefCBTransProxy.isChecked() && (!prefcBTransProxyAll.isChecked())); - prefCBTransProxy.setOnPreferenceClickListener(this); - prefcBTransProxyAll.setOnPreferenceClickListener(this); - prefTransProxyApps.setOnPreferenceClickListener(this); - } @@ -105,7 +112,23 @@ public class SettingsPreferences setResult(1010); - if (preference == prefTransProxyApps) + if (preference == prefRequestRoot) + { + + if (prefRequestRoot.isChecked()) + { + boolean canRoot = TorServiceUtils.isRootPossible(); + + getPreferenceScreen().getPreference(TRANSPROXY_GROUP_IDX).setEnabled(canRoot); + prefRequestRoot.setChecked(canRoot); + + if (!canRoot) + { + Toast.makeText(this, R.string.wizard_permissions_no_root_msg, Toast.LENGTH_LONG).show(); + } + } + } + else if (preference == prefTransProxyApps) { startActivity(new Intent(this, AppManager.class));

1 0

[orbot/master] added new menu icon
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit 7efd63742d9c8849ff0a48f315f991dc6dbf9cbc Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jan 12 15:48:08 2012 -0500 added new menu icon --- res/drawable/ic_menu_settings.png | Bin 0 -> 2905 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/res/drawable/ic_menu_settings.png b/res/drawable/ic_menu_settings.png new file mode 100644 index 0000000..2e88b0f Binary files /dev/null and b/res/drawable/ic_menu_settings.png differ

1 0

[orbot/master] updated menu icons
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit 805b823a5fb9649a935b30e67ee236a2580fdd09 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jan 12 15:46:33 2012 -0500 updated menu icons --- res/drawable/bak/tornotification.png | Bin 1181 -> 0 bytes res/drawable/bak/tornotificationoff.png | Bin 1184 -> 0 bytes res/drawable/bak/toroff.png | Bin 14728 -> 0 bytes res/drawable/bak/toron.png | Bin 25892 -> 0 bytes res/drawable/bak/torstarting.png | Bin 19360 -> 0 bytes res/drawable/bak/torstopping.png | Bin 14633 -> 0 bytes res/drawable/ic_menu_check.png | Bin 459 -> 2709 bytes res/drawable/ic_menu_exit.png | Bin 1636 -> 2693 bytes res/drawable/ic_menu_register.png | Bin 2144 -> 0 bytes 9 files changed, 0 insertions(+), 0 deletions(-) diff --git a/res/drawable/bak/tornotification.png b/res/drawable/bak/tornotification.png deleted file mode 100755 index 978aa88..0000000 Binary files a/res/drawable/bak/tornotification.png and /dev/null differ diff --git a/res/drawable/bak/tornotificationoff.png b/res/drawable/bak/tornotificationoff.png deleted file mode 100755 index 3bee170..0000000 Binary files a/res/drawable/bak/tornotificationoff.png and /dev/null differ diff --git a/res/drawable/bak/toroff.png b/res/drawable/bak/toroff.png deleted file mode 100755 index 7e2602b..0000000 Binary files a/res/drawable/bak/toroff.png and /dev/null differ diff --git a/res/drawable/bak/toron.png b/res/drawable/bak/toron.png deleted file mode 100755 index 5a8bd36..0000000 Binary files a/res/drawable/bak/toron.png and /dev/null differ diff --git a/res/drawable/bak/torstarting.png b/res/drawable/bak/torstarting.png deleted file mode 100755 index e0bca5d..0000000 Binary files a/res/drawable/bak/torstarting.png and /dev/null differ diff --git a/res/drawable/bak/torstopping.png b/res/drawable/bak/torstopping.png deleted file mode 100755 index 0e8eeed..0000000 Binary files a/res/drawable/bak/torstopping.png and /dev/null differ diff --git a/res/drawable/ic_menu_check.png b/res/drawable/ic_menu_check.png index 167ffb1..c187304 100644 Binary files a/res/drawable/ic_menu_check.png and b/res/drawable/ic_menu_check.png differ diff --git a/res/drawable/ic_menu_exit.png b/res/drawable/ic_menu_exit.png old mode 100755 new mode 100644 index 40183eb..d301ea6 Binary files a/res/drawable/ic_menu_exit.png and b/res/drawable/ic_menu_exit.png differ diff --git a/res/drawable/ic_menu_register.png b/res/drawable/ic_menu_register.png deleted file mode 100755 index b8e7141..0000000 Binary files a/res/drawable/ic_menu_register.png and /dev/null differ

1 0

[orbot/master] updated version
by n8fr8＠torproject.org 12 Jan '12

12 Jan '12

commit 186264eeba7ec179b9f78b8e20703da9ee77e140 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jan 12 15:47:53 2012 -0500 updated version --- AndroidManifest.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c8f2801..8a8231f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.torproject.android" android:versionName="0.2.3.10-alpha-orbot-1.0.7-ALPHA" android:versionCode="22"> + package="org.torproject.android" android:versionName="0.2.3.10-alpha-orbot-1.0.7-RC1" android:versionCode="23"> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>

1 0