- tor-commits - lists.torproject.org

[orbot/master] Merge branch 'master' of git://git.torproject.org/n8fr8/orbot
by n8fr8＠torproject.org 14 Nov '11

14 Nov '11

commit 821b911db3f89b91bff910a3aa678c390a5b636c Merge: 34ce453 4dda90e Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Fri Nov 4 01:21:50 2011 +0530 Merge branch 'master' of git://git.torproject.org/n8fr8/orbot .classpath | 1 + AndroidManifest.xml | 19 +- AndroidManifest.xml.debug | 61 --- AndroidManifest.xml.production | 61 --- BUILD | 15 +- libs/whispercore.jar | Bin 0 -> 9849 bytes res/drawable/background.jpg | Bin 33361 -> 0 bytes res/drawable/bgtitanium.jpg | Bin 122818 -> 40884 bytes res/drawable/error.png | Bin 0 -> 2922 bytes res/drawable/ic_launcher_gibberbot.png | Bin 7527 -> 6365 bytes res/drawable/icon_orweb.png | Bin 0 -> 8783 bytes res/drawable/tor.png | Bin 6682 -> 4766 bytes res/drawable/warning.png | Bin 2922 -> 2735 bytes res/layout/layout_about.xml | 2 +- res/layout/layout_apps.xml | 18 +- res/layout/layout_wizard_permissions.xml | 39 ++- res/layout/layout_wizard_tips.xml | 37 ++- res/layout/scrollingtext_buttons_view.xml | 18 +- res/raw/geoip.zip | Bin 0 -> 966562 bytes res/raw/tor.zip | Bin 0 -> 1553272 bytes res/raw/toraa | Bin 1048576 -> 0 bytes res/raw/torab | Bin 1048576 -> 0 bytes res/raw/torac | Bin 1048576 -> 0 bytes res/raw/torad | Bin 194605 -> 0 bytes res/raw/torrc | 8 +- res/raw/torrctether | 14 + res/values-ar/strings.xml | 5 - res/values-ca/strings.xml | 4 - res/values-de/strings.xml | 4 - res/values-es/strings.xml | 4 - res/values-fa/strings.xml | 4 - res/values-mk/strings.xml | 4 - res/values-nb/strings.xml | 4 - res/values-nl/strings.xml | 4 - res/values-pl/strings.xml | 5 - res/values-pt/strings.xml | 4 - res/values-ru/strings.xml | 4 - res/values-sv/strings.xml | 4 - res/values-zh/strings.xml | 4 - res/values/strings.xml | 71 ++-- res/xml/preferences.xml | 26 ++ src/org/torproject/android/AppManager.java | 272 ------------ .../torproject/android/ConfigureTransProxy.java | 183 -------- src/org/torproject/android/LotsaText.java | 133 ------ src/org/torproject/android/Orbot.java | 88 ++--- src/org/torproject/android/Permissions.java | 229 ---------- .../android/ProcessSettingsAsyncTask.java | 32 -- .../torproject/android/SettingsPreferences.java | 134 ------ src/org/torproject/android/TipsAndTricks.java | 139 ------- src/org/torproject/android/TorConstants.java | 7 +- src/org/torproject/android/TorifiedApp.java | 111 ----- src/org/torproject/android/WizardHelper.java | 425 ------------------- .../android/service/TorBinaryInstaller.java | 70 ++-- src/org/torproject/android/service/TorService.java | 70 ++-- .../android/service/TorServiceConstants.java | 9 +- .../android/service/TorServiceUtils.java | 44 +-- .../torproject/android/service/TorTransProxy.java | 6 +- .../torproject/android/service/TorrcConfig.java | 33 ++ .../torproject/android/service/WhisperManager.java | 93 +++++ .../torproject/android/settings/AppManager.java | 287 +++++++++++++ .../android/settings/ProcessSettingsAsyncTask.java | 32 ++ .../android/settings/SettingsPreferences.java | 132 ++++++ .../torproject/android/settings/TorifiedApp.java | 111 +++++ .../android/wizard/ConfigureTransProxy.java | 233 +++++++++++ src/org/torproject/android/wizard/LotsaText.java | 140 +++++++ src/org/torproject/android/wizard/Permissions.java | 247 +++++++++++ .../torproject/android/wizard/TipsAndTricks.java | 180 ++++++++ .../torproject/android/wizard/WizardHelper.java | 435 ++++++++++++++++++++ 68 files changed, 2237 insertions(+), 2082 deletions(-) diff --cc src/org/torproject/android/service/TorService.java index 68fe6e2,c4b7b1f..6af973b --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@@ -40,10 -40,10 +40,10 @@@ import android.os.RemoteException import android.preference.PreferenceManager; import android.util.Log; - public class TorService extends Service implements TorServiceConstants, Runnable, EventHandler + public class TorService extends Service implements TorServiceConstants, TorConstants, Runnable, EventHandler { - public static boolean ENABLE_DEBUG_LOG = false; + public static boolean ENABLE_DEBUG_LOG = true; private static int currentStatus = STATUS_OFF; @@@ -1273,11 -1274,9 +1274,10 @@@ private boolean applyPreferences () throws RemoteException { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - ENABLE_DEBUG_LOG = prefs.getBoolean("pref_enable_logging",false); + //ENABLE_DEBUG_LOG = prefs.getBoolean("pref_enable_logging",false); + ENABLE_DEBUG_LOG = true; Log.i(TAG,"debug logging:" + ENABLE_DEBUG_LOG); boolean useBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_ENABLED, false);

1 0

[orbot/master] Kill wizard activities on Exit
by n8fr8＠torproject.org 14 Nov '11

14 Nov '11

commit 4574c95b555e56aa5b60a11ca5937d66d42baf18 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Fri Nov 4 01:44:50 2011 +0530 Kill wizard activities on Exit Orbot.java's doExit() returns a RESULT_CLOSE_ALL to the wizard activities. The onActivityResult() is overrided in the wizard activities to kill all the activities if the result is RESULT_CLOSE_ALL --- src/org/torproject/android/Orbot.java | 4 +++- src/org/torproject/android/TorConstants.java | 2 +- .../android/wizard/ConfigureTransProxy.java | 14 +++++++++++++- src/org/torproject/android/wizard/LotsaText.java | 13 ++++++++++++- src/org/torproject/android/wizard/Permissions.java | 12 ++++++++++++ .../torproject/android/wizard/TipsAndTricks.java | 13 ++++++++++++- 6 files changed, 53 insertions(+), 5 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index e105db7..8493f00 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -228,7 +228,7 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants private void doExit () { try { - + //one of the confusing things about all of this code is the multiple //places where things like "stopTor" are called, both in the Activity and the Service //not something to tackle in your first iteration, but i thin we can talk about fixing @@ -247,6 +247,8 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants Log.w(TAG, e); } + //Kill all the wizard activities + setResult(RESULT_CLOSE_ALL); finish(); } diff --git a/src/org/torproject/android/TorConstants.java b/src/org/torproject/android/TorConstants.java index 38bb0d2..df430c6 100644 --- a/src/org/torproject/android/TorConstants.java +++ b/src/org/torproject/android/TorConstants.java @@ -41,7 +41,7 @@ public interface TorConstants { public final static String PREF_TRANSPARENT_ALL = "pref_transparent_all"; public final static String PREF_HAS_ROOT = "has_root"; - + public final static int RESULT_CLOSE_ALL = 0; } diff --git a/src/org/torproject/android/wizard/ConfigureTransProxy.java b/src/org/torproject/android/wizard/ConfigureTransProxy.java index a343e04..54336d4 100644 --- a/src/org/torproject/android/wizard/ConfigureTransProxy.java +++ b/src/org/torproject/android/wizard/ConfigureTransProxy.java @@ -61,6 +61,18 @@ public class ConfigureTransProxy extends Activity implements TorConstants { } + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + switch(resultCode) + { + case RESULT_CLOSE_ALL: + setResult(RESULT_CLOSE_ALL); + finish(); + } + super.onActivityResult(requestCode, resultCode, data); + } + private void setupUI () { @@ -202,7 +214,7 @@ public class ConfigureTransProxy extends Activity implements TorConstants { @Override public void onClick(DialogInterface dialog, int which) { - context.startActivity(new Intent(context, Orbot.class)); + startActivityForResult(new Intent(getBaseContext(), Orbot.class), 1); } }; diff --git a/src/org/torproject/android/wizard/LotsaText.java b/src/org/torproject/android/wizard/LotsaText.java index 1470a4b..5af1e39 100644 --- a/src/org/torproject/android/wizard/LotsaText.java +++ b/src/org/torproject/android/wizard/LotsaText.java @@ -55,7 +55,18 @@ public class LotsaText extends Activity implements TorConstants{ } + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + switch(resultCode) + { + case RESULT_CLOSE_ALL: + setResult(RESULT_CLOSE_ALL); + finish(); + } + super.onActivityResult(requestCode, resultCode, data); + } private void stepOne() { @@ -135,6 +146,6 @@ public class LotsaText extends Activity implements TorConstants{ }); } - + } \ No newline at end of file diff --git a/src/org/torproject/android/wizard/Permissions.java b/src/org/torproject/android/wizard/Permissions.java index f2c24a0..151e6cb 100644 --- a/src/org/torproject/android/wizard/Permissions.java +++ b/src/org/torproject/android/wizard/Permissions.java @@ -55,6 +55,18 @@ public class Permissions extends Activity implements TorConstants { } + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + switch(resultCode) + { + case RESULT_CLOSE_ALL: + setResult(RESULT_CLOSE_ALL); + finish(); + } + super.onActivityResult(requestCode, resultCode, data); + } + + private void stepThree(){ boolean isRootPossible = TorServiceUtils.isRootPossible(); diff --git a/src/org/torproject/android/wizard/TipsAndTricks.java b/src/org/torproject/android/wizard/TipsAndTricks.java index c46f2e4..ca8e416 100644 --- a/src/org/torproject/android/wizard/TipsAndTricks.java +++ b/src/org/torproject/android/wizard/TipsAndTricks.java @@ -49,6 +49,17 @@ public class TipsAndTricks extends Activity implements TorConstants { } + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + switch(resultCode) + { + case RESULT_CLOSE_ALL: + setResult(RESULT_CLOSE_ALL); + finish(); + } + super.onActivityResult(requestCode, resultCode, data); + } + void stepFive(){ String title = getString(R.string.wizard_tips_title); @@ -141,7 +152,7 @@ public class TipsAndTricks extends Activity implements TorConstants { @Override public void onClick(View v) { - startActivity(new Intent(getBaseContext(), Orbot.class)); + startActivityForResult(new Intent(getBaseContext(), Orbot.class), 1); } });

1 0

[orbot/master] Cleaner UI
by n8fr8＠torproject.org 14 Nov '11

14 Nov '11

commit c35e134fa7d193c9e856fd844629607f5c3932be Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Mon Nov 14 00:24:28 2011 +0530 Cleaner UI Signed-off-by: Nathan Freitas <nathan(a)freitas.net> --- res/layout/scrollingtext_buttons_view.xml | 31 +++++++++++++++------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/res/layout/scrollingtext_buttons_view.xml b/res/layout/scrollingtext_buttons_view.xml index 815f864..0f4ea72 100644 --- a/res/layout/scrollingtext_buttons_view.xml +++ b/res/layout/scrollingtext_buttons_view.xml @@ -6,20 +6,23 @@ android:layout_height="fill_parent" > -<RelativeLayout - android:layout_width="fill_parent" - android:layout_height="70sp" - android:id="@+id/relativeLayout1" - android:layout_gravity="center_vertical|center_horizontal" - android:background="#000000" - > - <ImageView - android:src="@drawable/warning" - android:id="@+id/orbot_image" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:paddingLeft="20sp" > +<RelativeLayout + android:id="@+id/relativeLayout1" + android:layout_width="fill_parent" + android:layout_height="70sp" + android:layout_gravity="center_vertical|center_horizontal" + android:background="#000000" + android:gravity="center" > + + <ImageView + android:id="@+id/orbot_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_marginTop="9dip" + android:paddingLeft="20sp" + android:src="@drawable/warning" > + </ImageView> <TextView android:textColor="#FFFFFF"

1 0

[orbot/master] extracted strings from preferences to put them properly in strings.xml
by n8fr8＠torproject.org 14 Nov '11

14 Nov '11

commit 66e1e82fde2e24cbe6e925bd4fe91f17b5001169 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Nov 14 03:20:11 2011 -0500 extracted strings from preferences to put them properly in strings.xml --- res/values/strings.xml | 33 +++++++++++++++++++++ res/xml/preferences.xml | 72 ++++++++++++++++++++++++---------------------- 2 files changed, 71 insertions(+), 34 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index e465e20..546be68 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -199,5 +199,38 @@ <string name="error">Error</string> <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string> <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string> +<string name="exit_nodes">Exit Nodes</string> +<string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string> +<string name="enter_exit_nodes">Enter Exit Nodes</string> +<string name="exclude_nodes">Exclude Nodes</string> +<string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string> +<string name="enter_exclude_nodes">Enter Exclude Nodes</string> +<string name="strict_nodes">Strict Nodes</string> +<string name="use_only_these_specified_nodes">Use *only* these specified nodes</string> +<string name="bridges">Bridges</string> +<string name="use_bridges">Use Bridges</string> +<string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</string> +<string name="ip_address_and_port_of_bridges">IP address and port of bridges</string> +<string name="enter_bridge_addresses">Enter Bridge Addresses</string> +<string name="relays">Relays</string> +<string name="relaying">Relaying</string> +<string name="enable_your_device_to_be_a_non_exit_relay">Enable your device to be a non-exit relay</string> +<string name="relay_port">Relay Port</string> +<string name="listening_port_for_your_tor_relay">Listening port for your Tor relay</string> +<string name="enter_or_port">Enter OR port</string> +<string name="relay_nickname">Relay nickname</string> +<string name="the_nickname_for_your_tor_relay">The nickname for your Tor relay</string> +<string name="enter_a_custom_relay_nickname">Enter a custom relay nickname</string> +<string name="reachable_addresses">Reachable Addresses</string> +<string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Run as a client behind a firewall with restrictive policies</string> +<string name="reachable_ports">Reachable ports</string> +<string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string> +<string name="enter_ports">Enter ports</string> +<string name="enable_hidden_services">Enable Hidden Services</string> +<string name="run_servers_accessible_via_the_tor_network">run servers accessible via the Tor network</string> +<string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string> +<string name="hidden_service_ports">Hidden Service Ports</string> +<string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string> +<string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">enable debug log to output (must use adb or aLogCat to view)</string> </resources> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 6665cfd..62eadc0 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -66,57 +66,57 @@ android:summary="@string/pref_entrance_node_summary" android:dialogTitle="@string/pref_entrance_node_dialog" /> <EditTextPreference android:key="pref_exit_nodes" -android:title="Exit Nodes" -android:summary="Fingerprints, nicks, countries and addresses for the last hop" -android:dialogTitle="Enter Exit Nodes" +android:title="@string/exit_nodes" +android:summary="@string/fingerprints_nicks_countries_and_addresses_for_the_last_hop" +android:dialogTitle="@string/enter_exit_nodes" /> <EditTextPreference android:key="pref_exclude_nodes" -android:title="Exclude Nodes" -android:summary="Fingerprints, nicks, countries and addresses to exclude" -android:dialogTitle="Enter Exclude Nodes" +android:title="@string/exclude_nodes" +android:summary="@string/fingerprints_nicks_countries_and_addresses_to_exclude" +android:dialogTitle="@string/enter_exclude_nodes" /> <CheckBoxPreference android:defaultValue="false" -android:title="Strict Nodes" android:key="pref_strict_nodes" -android:summary="Use *only* these specified nodes"/> +android:title="@string/strict_nodes" android:key="pref_strict_nodes" +android:summary="@string/use_only_these_specified_nodes"/> </PreferenceCategory> -<PreferenceCategory android:title="Bridges"> +<PreferenceCategory android:title="@string/bridges"> <CheckBoxPreference android:defaultValue="false" -android:title="Use Bridges" android:key="pref_bridges_enabled" -android:summary="Enable alternate entrance nodes into the Tor Network"></CheckBoxPreference> +android:title="@string/use_bridges" android:key="pref_bridges_enabled" +android:summary="@string/enable_alternate_entrance_nodes_into_the_tor_network"></CheckBoxPreference> <EditTextPreference android:key="pref_bridges_list" -android:title="Bridges" -android:summary="IP address and port of bridges" -android:dialogTitle="Enter Bridge Addresses" +android:title="@string/bridges" +android:summary="@string/ip_address_and_port_of_bridges" +android:dialogTitle="@string/enter_bridge_addresses" /> </PreferenceCategory> -<PreferenceCategory android:title="Relays"> +<PreferenceCategory android:title="@string/relays"> <CheckBoxPreference android:key="pref_or" android:defaultValue="false" -android:title="Relaying" -android:summary="Enable your device to be a non-exit relay" +android:title="@string/relaying" +android:summary="@string/enable_your_device_to_be_a_non_exit_relay" android:enabled="true" /> <EditTextPreference android:key="pref_or_port" android:defaultValue="9001" -android:title="Relay Port" -android:summary="Listening port for your Tor relay" -android:dialogTitle="Enter OR port" +android:title="@string/relay_port" +android:summary="@string/listening_port_for_your_tor_relay" +android:dialogTitle="@string/enter_or_port" /> <EditTextPreference android:key="pref_or_nickname" -android:defaultValue="Orbot" -android:title="Relay nickname" -android:summary="The nickname for your Tor relay" -android:dialogTitle="Enter a custom relay nickname" +android:defaultValue="OrbotRelay" +android:title="@string/relay_nickname" +android:summary="@string/the_nickname_for_your_tor_relay" +android:dialogTitle="@string/enter_a_custom_relay_nickname" /> </PreferenceCategory> @@ -125,24 +125,28 @@ android:dialogTitle="Enter a custom relay nickname" <CheckBoxPreference android:key="pref_reachable_addresses" android:defaultValue="false" -android:title="ReachableAddresses" -android:summary="Run as a client behind a firewall with restrictive policies" +android:title="@string/reachable_addresses" +android:summary="@string/run_as_a_client_behind_a_firewall_with_restrictive_policies" android:enabled="true"></CheckBoxPreference> <EditTextPreference android:key="pref_reachable_addresses_ports" android:defaultValue="*:80,*:443" -android:title="Reachable ports" -android:summary="Ports reachable behind a restrictive firewall" -android:dialogTitle="Enter ports" +android:title="@string/reachable_ports" +android:summary="@string/ports_reachable_behind_a_restrictive_firewall" +android:dialogTitle="@string/enter_ports" /> </PreferenceCategory> <PreferenceCategory android:title="@string/pref_hs_group"> -<CheckBoxPreference android:title="Enable Hidden Services" android:summary="run servers accessible via the Tor network" android:key="pref_hs_enable"></CheckBoxPreference> -<EditTextPreference android:summary="enter localhost ports for hidden services" android:title="Hidden Service Ports" android:enabled="false" android:key="pref_hs_ports"></EditTextPreference> - -<EditTextPreference android:key="pref_hs_hostname" android:summary="the addressable name for your hidden service (generated automatically)" android:title=".Onion Hostname"></EditTextPreference> +<CheckBoxPreference android:title="@string/enable_hidden_services" +android:summary="@string/run_servers_accessible_via_the_tor_network" android:key="pref_hs_enable"></CheckBoxPreference> +<EditTextPreference android:summary="@string/enter_localhost_ports_for_hidden_services" +android:title="@string/hidden_service_ports" android:enabled="false" android:key="pref_hs_ports"></EditTextPreference> + +<EditTextPreference android:key="pref_hs_hostname" +android:summary="@string/the_addressable_name_for_your_hidden_service_generated_automatically_" +android:title=".Onion Hostname"></EditTextPreference> </PreferenceCategory> <PreferenceCategory android:title="Proxy Service for Tor"> @@ -168,7 +172,7 @@ android:dialogTitle="@string/pref_proxy_port_dialog" android:key="pref_enable_logging" android:defaultValue="false" android:title="Debug Log" -android:summary="enable debug log to output (must use adb or aLogCat to view)" +android:summary="@string/enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_" android:enabled="true"></CheckBoxPreference>

1 0

[orbot/master] updated version
by n8fr8＠torproject.org 14 Nov '11

14 Nov '11

commit 7cf37322db59604d560a3baa373b573ea2dc4ae6 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Nov 14 03:24:42 2011 -0500 updated version --- AndroidManifest.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 004907f..051c847 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.7-alpha-orbot-1.0.6-FINAL" android:versionCode="21"> + package="org.torproject.android" android:versionName="0.2.3.7-alpha-orbot-1.0.7-ALPHA" android:versionCode="21"> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>

1 0

[orbot/master] Merge branch 'fixwizard'
by n8fr8＠torproject.org 14 Nov '11

14 Nov '11

commit 64ed05eb5a2a8990a301102c48ab72777131e1ca Merge: 7cf3732 4574c95 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Nov 14 03:25:27 2011 -0500 Merge branch 'fixwizard' AUTHORS | 2 +- GSoC.txt | 45 ++++++++++++++++++++ src/org/torproject/android/Orbot.java | 4 +- src/org/torproject/android/TorConstants.java | 2 +- src/org/torproject/android/service/TorService.java | 7 ++- .../android/wizard/ConfigureTransProxy.java | 14 ++++++- src/org/torproject/android/wizard/LotsaText.java | 13 +++++- src/org/torproject/android/wizard/Permissions.java | 12 +++++ .../torproject/android/wizard/TipsAndTricks.java | 13 +++++- 9 files changed, 103 insertions(+), 9 deletions(-)

1 0

[orbot/master] more string work, this time on service notifications
by n8fr8＠torproject.org 14 Nov '11

14 Nov '11

commit 76fc2cd01477c15f53f4d025263c2fd62a094e1a Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Nov 14 04:18:33 2011 -0500 more string work, this time on service notifications --- res/values/strings.xml | 5 +++++ src/org/torproject/android/service/TorService.java | 16 ++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 0cbd848..30db5d5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -242,4 +242,9 @@ <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="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> +<string name="hidden_service_on">hidden service on:</string> +<string name="unable_to_read_hidden_service_name">unable to read hidden service name</string> +<string name="unable_to_start_tor">Unable to start Tor:</string> </resources> diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 1828d8f..25d415b 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -96,7 +96,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst { logNotice("Found existing Tor process"); - sendCallbackLogMessage ("found existing Tor process..."); + sendCallbackLogMessage (getString(R.string.found_existing_tor_process)); try { currentStatus = STATUS_CONNECTING; @@ -281,7 +281,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst { Log.d(TAG, "An error occured stopping Tor",e); logNotice("An error occured stopping Tor: " + e.getMessage()); - sendCallbackStatusMessage("Something bad happened. Check the log"); + sendCallbackStatusMessage(getString(R.string.something_bad_happened)); } } @@ -326,7 +326,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst { try { String onionHostname = Utils.readString(new FileInputStream(file)); - showToolbarNotification("hidden service on: " + onionHostname, NOTIFY_ID, R.drawable.tornotification); + showToolbarNotification(getString(R.string.hidden_service_on) + ' ' + onionHostname, NOTIFY_ID, R.drawable.tornotification); Editor pEdit = prefs.edit(); pEdit.putString("pref_hs_hostname",onionHostname); pEdit.commit(); @@ -334,13 +334,13 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (FileNotFoundException e) { logException("unable to read onion hostname file",e); - showToolbarNotification("unable to read hidden service name", NOTIFY_ID, R.drawable.tornotificationerr); + showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), NOTIFY_ID, R.drawable.tornotificationerr); return; } } else { - showToolbarNotification("unable to read hidden service name", NOTIFY_ID, R.drawable.tornotificationerr); + showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), NOTIFY_ID, R.drawable.tornotificationerr); } @@ -501,7 +501,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (Exception e) { logException("Unable to start Tor: " + e.getMessage(),e); - sendCallbackStatusMessage("Unable to start Tor: " + e.getMessage()); + sendCallbackStatusMessage(getString(R.string.unable_to_start_tor) + ' ' + e.getMessage()); } @@ -889,7 +889,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (profile == PROFILE_ON) { currentStatus = STATUS_CONNECTING; - sendCallbackStatusMessage ("starting..."); + sendCallbackStatusMessage (getString(R.string.status_starting_up)); Thread thread = new Thread(this); thread.start(); @@ -898,7 +898,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst else if (profile == PROFILE_OFF) { currentStatus = STATUS_OFF; - sendCallbackStatusMessage ("shutting down..."); + sendCallbackStatusMessage (getString(R.string.status_shutting_down)); _torInstance.stopTor();

1 0

[orbot/master] small changes to layout title centering
by n8fr8＠torproject.org 14 Nov '11

14 Nov '11

commit bfeceb7fd07bda0d7aa5aba4e7e2a58a8028cf70 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Nov 14 03:38:09 2011 -0500 small changes to layout title centering --- res/layout/scrollingtext_buttons_view.xml | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/res/layout/scrollingtext_buttons_view.xml b/res/layout/scrollingtext_buttons_view.xml index 0f4ea72..cde7405 100644 --- a/res/layout/scrollingtext_buttons_view.xml +++ b/res/layout/scrollingtext_buttons_view.xml @@ -11,22 +11,22 @@ android:layout_width="fill_parent" android:layout_height="70sp" android:layout_gravity="center_vertical|center_horizontal" - android:background="#000000" - android:gravity="center" > + android:background="#000000" > <ImageView android:id="@+id/orbot_image" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_marginTop="9dip" + android:layout_height="fill_parent" android:paddingLeft="20sp" - android:src="@drawable/warning" > + android:src="@drawable/warning" + android:gravity="center_vertical" + + > </ImageView> <TextView android:textColor="#FFFFFF" - android:textSize="10pt" + android:textSize="20dp" android:layout_toRightOf="@id/orbot_image" android:gravity="center_vertical" android:layout_height="fill_parent"

1 0

[orbot/master] a bit more cleanup on strings for about and hidden service requests
by n8fr8＠torproject.org 14 Nov '11

14 Nov '11

commit 2b8eef305cfe5dc33c3f1d4b59252688c481fab4 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Nov 14 04:03:41 2011 -0500 a bit more cleanup on strings for about and hidden service requests --- res/layout/layout_about.xml | 18 ++-- res/values/strings.xml | 11 +++- src/org/torproject/android/Orbot.java | 143 ++++++++++++++------------------- 3 files changed, 78 insertions(+), 94 deletions(-) diff --git a/res/layout/layout_about.xml b/res/layout/layout_about.xml index 0e0be56..fbc8cae 100644 --- a/res/layout/layout_about.xml +++ b/res/layout/layout_about.xml @@ -40,14 +40,14 @@ android:paddingLeft="15px" android:layout_gravity="center_vertical" android:textColor="#ffffff" /> - <TextView android:text="Project Home(s): " + <TextView android:text="@string/project_home" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingTop="15px" android:paddingLeft="15px" android:textStyle="bold" android:textColor="#00ff00" /> - <TextView android:text="https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…" + <TextView android:text="@string/project_urls" android:layout_width="fill_parent" android:layout_height="wrap_content" android:autoLink="web" @@ -61,47 +61,47 @@ android:paddingLeft="15px" android:textStyle="bold" android:textColor="#00ff00" /> - <TextView android:text="The Tor License" + <TextView android:text="@string/the_tor_license" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingLeft="15px" android:textColor="#ffffff" /> - <TextView android:text="https://torproject.org" + <TextView android:text="@string/https_torproject_org" android:layout_width="fill_parent" android:layout_height="wrap_content" android:autoLink="web" android:textColorLink="#ffffff" android:paddingLeft="15px" android:textColor="#ffffff" /> - <TextView android:text="3rd-Party-Software: " + <TextView android:text="@string/third_party_software" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingTop="15px" android:paddingLeft="15px" android:textStyle="bold" android:textColor="#00ff00" /> - <TextView android:text="Tor v0.2.3.6-alpha: https://www.torproject.org" + <TextView android:text="@string/tor_version" android:layout_width="fill_parent" android:layout_height="wrap_content" android:autoLink="web" android:textColorLink="#ffffff" android:paddingLeft="15px" android:textColor="#ffffff" /> - <TextView android:text="LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/" + <TextView android:text="@string/libevent_version" android:layout_width="fill_parent" android:layout_height="wrap_content" android:autoLink="web" android:textColorLink="#ffffff" android:paddingLeft="15px" android:textColor="#ffffff" /> - <TextView android:text="Privoxy v3.0.12: http://www.privoxy.org" + <TextView android:text="@string/privoxy_version" android:layout_width="fill_parent" android:layout_height="wrap_content" android:autoLink="web" android:textColorLink="#ffffff" android:paddingLeft="15px" android:textColor="#ffffff" /> - <TextView android:text="Iptables v1.4.7: http://www.netfilter.org" + <TextView android:text="@string/iptables_version" android:layout_width="fill_parent" android:layout_height="wrap_content" android:autoLink="web" diff --git a/res/values/strings.xml b/res/values/strings.xml index 546be68..0cbd848 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -232,5 +232,14 @@ <string name="hidden_service_ports">Hidden Service Ports</string> <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string> <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">enable debug log to output (must use adb or aLogCat to view)</string> - +<string name="project_home">Project Home(s): </string> +<string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> +<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="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="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> </resources> diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 8493f00..b7bb62f 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -3,9 +3,6 @@ package org.torproject.android; - - - import org.torproject.android.service.ITorService; import org.torproject.android.service.ITorServiceCallback; import org.torproject.android.service.TorServiceConstants; @@ -253,30 +250,6 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants } - /* Return to the main view when the back key is pressed - * (non-Javadoc) - * @see android.app.Activity#onKeyDown(int, android.view.KeyEvent) - */ - /* - public boolean onKeyDown(int keyCode, KeyEvent event){ - - //yeah this should probably go away now :) - or not - if(keyCode==KeyEvent.KEYCODE_BACK){ - - if(currentView != R.layout.layout_main){ - - showMain (); - return true; - } - else{ - return super.onKeyDown(keyCode, event); - } - } - - return super.onKeyDown(keyCode, event); - - }*/ - /* (non-Javadoc) * @see android.app.Activity#onPause() */ @@ -405,7 +378,7 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants int hsPort = getIntent().getIntExtra("hs_port", -1); - String requestMsg = "An app wants to open a server port (" + hsPort + ") to the Tor network. This is safe if you trust the app."; + String requestMsg = getString(R.string.hidden_service_request, hsPort); AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setMessage(requestMsg).setPositiveButton("Allow", dialogClickListener) .setNegativeButton("Deny", dialogClickListener).show(); @@ -499,61 +472,62 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants /* * Load the basic settings application to display torrc */ - private void showSettings () - { - - startActivityForResult(new Intent(this, SettingsPreferences.class), 1); - } - - - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - super.onActivityResult(requestCode, resultCode, data); - - //if we get a response from an activity we launched (like from line 527 where we launch the Settings/Prefs screen) - //and the resultCode matches our arbitrary 1010 value, AND Tor is running - //then update the preferences in an async background task - if (requestCode == 1 && resultCode == 1010 && mService != null) - { - new ProcessSettingsAsyncTask().execute(mService); - } - } - - AlertDialog aDialog = null; - - //general alert dialog for mostly Tor warning messages - //sometimes this can go haywire or crazy with too many error - //messages from Tor, and the user cannot stop or exit Orbot - //so need to ensure repeated error messages are not spamming this method - private void showAlert(String title, String msg, boolean button) - { - try - { - if (aDialog != null && aDialog.isShowing()) - aDialog.dismiss(); - } - catch (Exception e){} //swallow any errors - - if (button) - { - aDialog = new AlertDialog.Builder(this) - .setIcon(R.drawable.icon) - .setTitle(title) - .setMessage(msg) - .setPositiveButton(android.R.string.ok, null) - .show(); - } - else - { - aDialog = new AlertDialog.Builder(this) - .setIcon(R.drawable.icon) - .setTitle(title) - .setMessage(msg) - .show(); - } - - aDialog.setCanceledOnTouchOutside(true); - } + private void showSettings () + { + + startActivityForResult(new Intent(this, SettingsPreferences.class), 1); + } + + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); + + //if we get a response from an activity we launched (like from line 527 where we launch the Settings/Prefs screen) + //and the resultCode matches our arbitrary 1010 value, AND Tor is running + //then update the preferences in an async background task + if (requestCode == 1 && resultCode == 1010 && mService != null) + { + new ProcessSettingsAsyncTask().execute(mService); + } + } + + AlertDialog aDialog = null; + + //general alert dialog for mostly Tor warning messages + //sometimes this can go haywire or crazy with too many error + //messages from Tor, and the user cannot stop or exit Orbot + //so need to ensure repeated error messages are not spamming this method + private void showAlert(String title, String msg, boolean button) + { + try + { + if (aDialog != null && aDialog.isShowing()) + aDialog.dismiss(); + } + catch (Exception e){} //swallow any errors + + if (button) + { + aDialog = new AlertDialog.Builder(this) + .setIcon(R.drawable.icon) + .setTitle(title) + .setMessage(msg) + .setPositiveButton(android.R.string.ok, null) + .show(); + } + else + { + aDialog = new AlertDialog.Builder(this) + .setIcon(R.drawable.icon) + .setTitle(title) + .setMessage(msg) + .show(); + } + + aDialog.setCanceledOnTouchOutside(true); + } + /* * Set the state of the running/not running graphic and label * this all needs to be looked at w/ the shift to progressDialog @@ -875,6 +849,7 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants } //unbind removes the callback, and unbinds the service + /* private void unbindService () { if (mIsBound) { @@ -898,7 +873,7 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants mIsBound = false; } - } + }*/ private void createProgressDialog (String msg) {

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 14 Nov '11

14 Nov '11

commit 9f060d031b1fa5129380a9d370cfe5a35fca421b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 14 09:15:26 2011 +0000 Update translations for vidalia_help --- de/services.po | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/de/services.po b/de/services.po index 47ed8e3..e85602a 100644 --- a/de/services.po +++ b/de/services.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2011-11-14 08:44+0000\n" +"PO-Revision-Date: 2011-11-14 09:10+0000\n" "Last-Translator: freedompenguin <sebastian(a)urbach.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -101,6 +101,8 @@ msgid "" "Configure your hidden service, so that Tor relays requests coming from Tor " "users to your local server." msgstr "" +"Konfigurieren Sie den Hidden Service so das Tor Relay Anfragen von Tor-" +"Benutzern zu Ihrem lokalen Server durchgehen." #. type: Content of: <html><body><p> #: en/services.html:50 @@ -108,16 +110,19 @@ msgid "" "There is a fine tutorial on the Tor website (https://www.torproject.org/docs" "/tor-hidden-service.html) that describes these steps in more detail." msgstr "" +"Es gibt eine hervorragende Anleitung auf der Tor Webseite " +"(https://www.torproject.org/docs/tor-hidden-service.html) das die Schritte " +"ausführlich beschreibt." #. type: Content of: <html><body> #: en/services.html:55 msgid "<a name=\"data\"/>" -msgstr "" +msgstr "<a name=\"data\"/>" #. type: Content of: <html><body><h3> #: en/services.html:56 msgid "What data do I need to provide?" -msgstr "" +msgstr "Welche Daten muß ich zur Verfügung stellen ?" #. type: Content of: <html><body><p> #: en/services.html:58 @@ -125,6 +130,8 @@ msgid "" "The services table contains five columns containing data about configured " "hidden services:" msgstr "" +"Die Service-Tabelle beinhaltet 5 Spalten die Daten über die konfigurierten " +"Hidden Services enthalten:" #. type: Content of: <html><body><p><ul><li> #: en/services.html:61 @@ -189,17 +196,18 @@ msgstr "" #. type: Content of: <html><body> #: en/services.html:103 msgid "<a name=\"buttons\"/>" -msgstr "" +msgstr "<a name=\"buttons\"/>" #. type: Content of: <html><body><h3> #: en/services.html:104 msgid "What are the five buttons used for?" -msgstr "" +msgstr "Wofür werden die Buttons benötigt ?" #. type: Content of: <html><body><p><ul><li> #: en/services.html:107 msgid "Add service: Creates a new empty service configuration." msgstr "" +"Service hinzufügen: Erstelle eine neue, leere Service Konfigurations-Datei" #. type: Content of: <html><body><p><ul><li> #: en/services.html:108 @@ -223,7 +231,7 @@ msgstr "" #. type: Content of: <html><body> #: en/services.html:119 msgid "<a name=\"advanced\"/>" -msgstr "" +msgstr "<a name=\"advanced\"/>" #. type: Content of: <html><body><h3> #: en/services.html:120 @@ -251,7 +259,7 @@ msgstr "" #. type: Content of: <html><body> #: en/services.html:135 msgid "<a name=\"client\"/>" -msgstr "" +msgstr "<a name=\"client\"/>" #. type: Content of: <html><body><h3> #: en/services.html:136

1 0