May 2018 - tor-commits - lists.torproject.org

[orbot/master] port settings use inputType=number
by n8fr8＠torproject.org 12 May '18

12 May '18

commit 8a141368e10df4c6ad75872df5d8e0b8a2addc07 Author: lexi <bird.s.lex(a)gmail.com> Date: Wed Mar 28 10:53:47 2018 -0400 port settings use inputType=number --- app/src/main/res/xml/preferences.xml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 7720b4cb..e78017b9 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -38,7 +38,7 @@ android:defaultValue="en" android:key="pref_default_locale" android:summary="@string/set_locale_summary" - android:title="@string/set_locale_title"/> + android:title="@string/set_locale_title" /> </PreferenceCategory> <!-- @@ -138,6 +138,7 @@ <EditTextPreference android:defaultValue="9001" android:dialogTitle="@string/enter_or_port" + android:inputType="number" android:key="pref_or_port" android:summary="@string/listening_port_for_your_tor_relay" android:title="@string/relay_port" /> @@ -157,7 +158,7 @@ android:enabled="true" android:key="pref_reachable_addresses" android:summary="@string/run_as_a_client_behind_a_firewall_with_restrictive_policies" - android:title="@string/reachable_addresses"/> + android:title="@string/reachable_addresses" /> <EditTextPreference android:defaultValue="*:80,*:443" @@ -173,7 +174,7 @@ android:enabled="true" android:key="pref_isolate_dest" android:summary="@string/pref_isolate_dest_summary" - android:title="@string/pref_isolate_dest"/> + android:title="@string/pref_isolate_dest" /> </PreferenceCategory> <PreferenceCategory android:title="ConnectionPadding"> @@ -182,13 +183,13 @@ android:enabled="true" android:key="pref_connection_padding" android:summary="@string/pref_connection_padding_summary" - android:title="@string/pref_connection_padding"/> + android:title="@string/pref_connection_padding" /> <CheckBoxPreference android:defaultValue="true" android:enabled="true" android:key="pref_reduced_connection_padding" android:summary="@string/pref_reduced_connection_padding_summary" - android:title="@string/pref_reduced_connection_padding"/> + android:title="@string/pref_reduced_connection_padding" /> </PreferenceCategory> @@ -205,6 +206,7 @@ android:title="@string/pref_proxy_host_title" /> <EditTextPreference android:dialogTitle="@string/pref_proxy_port_dialog" + android:inputType="number" android:key="pref_proxy_port" android:summary="@string/pref_proxy_port_summary" android:title="@string/pref_proxy_port_title" /> @@ -226,6 +228,7 @@ <EditTextPreference android:defaultValue="9050" android:dialogTitle="@string/pref_socks_dialog" + android:inputType="number" android:key="pref_socks" android:summary="@string/pref_socks_summary" android:title="@string/pref_socks_title" /> @@ -233,6 +236,7 @@ <EditTextPreference android:defaultValue="9040" android:dialogTitle="@string/pref_transport_dialog" + android:inputType="number" android:key="pref_transport" android:summary="@string/pref_transport_summary" android:title="@string/pref_transport_title" /> @@ -240,6 +244,7 @@ <EditTextPreference android:defaultValue="5400" android:dialogTitle="@string/pref_dnsport_dialog" + android:inputType="number" android:key="pref_dnsport" android:summary="@string/pref_dnsport_summary" android:title="@string/pref_dnsport_title" />

1 0

[orbot/master] update preference summaries
by n8fr8＠torproject.org 12 May '18

12 May '18

commit 13ea11d7a8fddbdf07947c564c4976d61c1efc26 Author: lexi <bird.s.lex(a)gmail.com> Date: Wed Mar 28 15:26:57 2018 -0400 update preference summaries --- app/src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f2f81e86..acc48dcc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -136,7 +136,7 @@ <string name="pref_proxy_title">Outbound Network Proxy (Optional)</string> <string name="pref_proxy_type_title">Outbound Proxy Type</string> - <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string> + <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, SOCKS4, SOCKS5</string> <string name="pref_proxy_type_dialog">Enter Proxy Type</string> <string name="pref_proxy_host_title">Outbound Proxy Host</string> @@ -206,7 +206,7 @@ <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> + <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>

1 0

[orbot/master] textPassword inputType for proxypasswd dialog
by n8fr8＠torproject.org 12 May '18

12 May '18

commit 49ee3aef4391da87c211dbc7bfda2c1e3f2e2d6d Author: lexi <bird.s.lex(a)gmail.com> Date: Wed Mar 28 15:20:50 2018 -0400 textPassword inputType for proxypasswd dialog --- app/src/main/res/xml/preferences.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index e78017b9..3fd74394 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -218,6 +218,7 @@ android:title="@string/pref_proxy_username_title" /> <EditTextPreference android:dialogTitle="@string/pref_proxy_password_dialog" + android:inputType="textPassword" android:key="pref_proxy_password" android:summary="@string/pref_proxy_password_summary" android:title="@string/pref_proxy_password_title" /> @@ -251,6 +252,7 @@ <EditTextPreference android:dialogTitle="@string/pref_torrc_dialog" + android:inputType="textMultiLine|textNoSuggestions" android:key="pref_custom_torrc" android:summary="@string/pref_torrc_summary" android:title="@string/pref_torrc_title" />

1 0

[orbot/master] When log is open, the back btn closes it
by n8fr8＠torproject.org 12 May '18

12 May '18

commit 87401d04fe4072ae53c32c1a7c88a632bc120c86 Author: lexi <bird.s.lex(a)gmail.com> Date: Sat Apr 7 23:22:24 2018 -0400 When log is open, the back btn closes it --- .../java/org/torproject/android/OrbotMainActivity.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index cbc7349e..1a2b177f 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -126,6 +126,8 @@ public class OrbotMainActivity extends AppCompatActivity private final static int REQUEST_SETTINGS = 0x9874; private final static int REQUEST_VPN_APPS_SELECT = 8889; + private final static int LOG_DRAWER_GRAVITY = Gravity.END; + // message types for mStatusUpdateHandler private final static int STATUS_UPDATE = 1; private static final int MESSAGE_TRAFFIC_COUNT = 2; @@ -284,7 +286,7 @@ public class OrbotMainActivity extends AppCompatActivity lblStatus.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - mDrawer.openDrawer(Gravity.END); + mDrawer.openDrawer(LOG_DRAWER_GRAVITY); } }); @@ -564,6 +566,18 @@ public class OrbotMainActivity extends AppCompatActivity } } + + @Override + public void onBackPressed() { + // check to see if the log is open, if so close it + if (mDrawer.isDrawerOpen(LOG_DRAWER_GRAVITY)) { + mDrawer.closeDrawers(); + } + else { + super.onBackPressed(); + } + } + private void refreshVPNApps () { stopVpnService();

1 0

[orbot/master] update gradle to 4.4
by n8fr8＠torproject.org 12 May '18

12 May '18

commit 5d9fc75418261b3771ad5093424ec15dcba3c569 Author: n8fr8 <nathan(a)freitas.net> Date: Fri Apr 20 00:10:00 2018 -0400 update gradle to 4.4 --- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c77faa60..72adb233 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Oct 31 09:37:18 EDT 2017 +#Thu Apr 19 23:56:48 EDT 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

1 0

[orbot/master] formatted preferences.xml
by n8fr8＠torproject.org 12 May '18

12 May '18

commit db74f05efb38d2bfb80dcef2d767a7992e9e9758 Author: lexi <bird.s.lex(a)gmail.com> Date: Wed Mar 28 10:47:41 2018 -0400 formatted preferences.xml --- app/src/main/res/xml/preferences.xml | 532 ++++++++++++++++++----------------- 1 file changed, 267 insertions(+), 265 deletions(-) diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 9e07f26f..7720b4cb 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -1,268 +1,270 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> -<PreferenceCategory android:title="@string/pref_general_group"> -<CheckBoxPreference -android:defaultValue="true" -android:key="pref_start_boot" -android:title="@string/pref_start_boot_title" -android:summary="@string/pref_start_boot_summary" -android:enabled="true"/> - -<CheckBoxPreference -android:defaultValue="true" -android:key="pref_persistent_notifications" -android:summary="@string/pref_use_persistent_notifications" -android:enabled="true" -android:title="@string/pref_use_persistent_notifications_title"/> - -<CheckBoxPreference -android:defaultValue="true" -android:key="pref_expanded_notifications" -android:summary="@string/pref_use_expanded_notifications" -android:enabled="true" -android:title="@string/pref_use_expanded_notifications_title"/> - -<CheckBoxPreference -android:defaultValue="true" -android:key="pref_allow_background_starts" -android:summary="@string/pref_allow_background_starts_summary" -android:title="@string/pref_allow_background_starts_title"/> - -<CheckBoxPreference -android:defaultValue="false" -android:key="pref_open_proxy_on_all_interfaces" -android:summary="@string/pref_open_proxy_on_all_interfaces_summary" -android:title="@string/pref_open_proxy_on_all_interfaces_title"/> - - <ListPreference android:title="@string/set_locale_title" - android:key="pref_default_locale" - android:summary="@string/set_locale_summary" - android:defaultValue="en"> - </ListPreference> - -</PreferenceCategory> - -<PreferenceCategory android:title="@string/pref_node_configuration" - android:summary="@string/pref_node_configuration_summary"> - -<EditTextPreference android:key="pref_entrance_nodes" -android:title="@string/pref_entrance_node" -android:summary="@string/pref_entrance_node_summary" -android:dialogTitle="@string/pref_entrance_node_dialog" -/> -<EditTextPreference android:key="pref_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="@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="@string/strict_nodes" android:key="pref_strict_nodes" -android:summary="@string/use_only_these_specified_nodes"/> - -</PreferenceCategory> -<PreferenceCategory android:title="@string/bridges"> - -<CheckBoxPreference android:defaultValue="false" -android:title="@string/use_bridges" android:key="pref_bridges_enabled" -android:summary="@string/enable_alternate_entrance_nodes_into_the_tor_network"/> - -<EditTextPreference android:key="pref_bridges_list" -android:title="@string/bridges" -android:summary="@string/ip_address_and_port_of_bridges" -android:dialogTitle="@string/enter_bridge_addresses" -android:defaultValue="" -android:inputType="textMultiLine|textNoSuggestions" -/> - -</PreferenceCategory> - -<PreferenceCategory android:title="@string/relays"> -<CheckBoxPreference android:key="pref_or" -android:defaultValue="false" -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="@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="OrbotRelay" -android:title="@string/relay_nickname" -android:summary="@string/the_nickname_for_your_tor_relay" -android:dialogTitle="@string/enter_a_custom_relay_nickname" -/> - -</PreferenceCategory> - -<PreferenceCategory android:title="ReachableAddresses"> -<CheckBoxPreference -android:key="pref_reachable_addresses" -android:defaultValue="false" -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="@string/reachable_ports" -android:summary="@string/ports_reachable_behind_a_restrictive_firewall" -android:dialogTitle="@string/enter_ports" -/> -</PreferenceCategory> - -<PreferenceCategory android:title="Isolation"> -<CheckBoxPreference -android:key="pref_isolate_dest" -android:defaultValue="false" -android:title="@string/pref_isolate_dest" -android:summary="@string/pref_isolate_dest_summary" -android:enabled="true"></CheckBoxPreference> -</PreferenceCategory> - -<PreferenceCategory android:title="ConnectionPadding"> -<CheckBoxPreference -android:key="pref_connection_padding" -android:defaultValue="false" -android:title="@string/pref_connection_padding" -android:summary="@string/pref_connection_padding_summary" -android:enabled="true"></CheckBoxPreference> -<CheckBoxPreference -android:key="pref_reduced_connection_padding" -android:defaultValue="true" -android:title="@string/pref_reduced_connection_padding" -android:summary="@string/pref_reduced_connection_padding_summary" -android:enabled="true"></CheckBoxPreference> -</PreferenceCategory> - - -<PreferenceCategory android:title="@string/pref_proxy_title"> -<EditTextPreference android:key="pref_proxy_type" -android:title="@string/pref_proxy_type_title" -android:summary="@string/pref_proxy_type_summary" -android:dialogTitle="@string/pref_proxy_type_dialog" -/> -<EditTextPreference android:key="pref_proxy_host" -android:title="@string/pref_proxy_host_title" -android:summary="@string/pref_proxy_host_summary" -android:dialogTitle="@string/pref_proxy_host_dialog" -/> -<EditTextPreference android:key="pref_proxy_port" -android:title="@string/pref_proxy_port_title" -android:summary="@string/pref_proxy_port_summary" -android:dialogTitle="@string/pref_proxy_port_dialog" -/> - -<EditTextPreference android:key="pref_proxy_username" -android:title="@string/pref_proxy_username_title" -android:summary="@string/pref_proxy_username_summary" -android:dialogTitle="@string/pref_proxy_username_dialog" -/> -<EditTextPreference android:key="pref_proxy_password" -android:title="@string/pref_proxy_password_title" -android:summary="@string/pref_proxy_password_summary" -android:dialogTitle="@string/pref_proxy_password_dialog" -/> -</PreferenceCategory> - -<PreferenceCategory android:title="Debug"> - - <EditTextPreference android:key="pref_socks" -android:title="@string/pref_socks_title" -android:summary="@string/pref_socks_summary" -android:dialogTitle="@string/pref_socks_dialog" -android:defaultValue="9050" -/> - - <EditTextPreference android:key="pref_transport" -android:title="@string/pref_transport_title" -android:summary="@string/pref_transport_summary" -android:dialogTitle="@string/pref_transport_dialog" -android:defaultValue="9040" -/> - - <EditTextPreference android:key="pref_dnsport" -android:title="@string/pref_dnsport_title" -android:summary="@string/pref_dnsport_summary" -android:dialogTitle="@string/pref_dnsport_dialog" -android:defaultValue="5400" -/> - - <EditTextPreference android:key="pref_custom_torrc" -android:title="@string/pref_torrc_title" -android:summary="@string/pref_torrc_summary" -android:dialogTitle="@string/pref_torrc_dialog" -/> - - -<CheckBoxPreference -android:key="pref_enable_logging" -android:defaultValue="false" -android:title="Debug Log" -android:summary="@string/enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_" -android:enabled="true" -/> - - - -<CheckBoxPreference -android:defaultValue="true" -android:key="pref_disable_network" -android:summary="@string/pref_disable_network_summary" -android:enabled="true" -android:title="@string/pref_disable_network_title"/> - -</PreferenceCategory> + <PreferenceCategory android:title="@string/pref_general_group"> + <CheckBoxPreference + android:defaultValue="true" + android:enabled="true" + android:key="pref_start_boot" + android:summary="@string/pref_start_boot_summary" + android:title="@string/pref_start_boot_title" /> + + <CheckBoxPreference + android:defaultValue="true" + android:enabled="true" + android:key="pref_persistent_notifications" + android:summary="@string/pref_use_persistent_notifications" + android:title="@string/pref_use_persistent_notifications_title" /> + + <CheckBoxPreference + android:defaultValue="true" + android:enabled="true" + android:key="pref_expanded_notifications" + android:summary="@string/pref_use_expanded_notifications" + android:title="@string/pref_use_expanded_notifications_title" /> + + <CheckBoxPreference + android:defaultValue="true" + android:key="pref_allow_background_starts" + android:summary="@string/pref_allow_background_starts_summary" + android:title="@string/pref_allow_background_starts_title" /> + + <CheckBoxPreference + android:defaultValue="false" + android:key="pref_open_proxy_on_all_interfaces" + android:summary="@string/pref_open_proxy_on_all_interfaces_summary" + android:title="@string/pref_open_proxy_on_all_interfaces_title" /> + + <ListPreference + android:defaultValue="en" + android:key="pref_default_locale" + android:summary="@string/set_locale_summary" + android:title="@string/set_locale_title"/> + + </PreferenceCategory> +  + <PreferenceCategory + android:summary="@string/pref_node_configuration_summary" + android:title="@string/pref_node_configuration"> + + <EditTextPreference + android:dialogTitle="@string/pref_entrance_node_dialog" + android:key="pref_entrance_nodes" + android:summary="@string/pref_entrance_node_summary" + android:title="@string/pref_entrance_node" /> + <EditTextPreference + android:dialogTitle="@string/enter_exit_nodes" + android:key="pref_exit_nodes" + android:summary="@string/fingerprints_nicks_countries_and_addresses_for_the_last_hop" + android:title="@string/exit_nodes" /> + <EditTextPreference + android:dialogTitle="@string/enter_exclude_nodes" + android:key="pref_exclude_nodes" + android:summary="@string/fingerprints_nicks_countries_and_addresses_to_exclude" + android:title="@string/exclude_nodes" /> + + <CheckBoxPreference + android:defaultValue="false" + android:key="pref_strict_nodes" + android:summary="@string/use_only_these_specified_nodes" + android:title="@string/strict_nodes" /> + + </PreferenceCategory> + <PreferenceCategory android:title="@string/bridges"> + + <CheckBoxPreference + android:defaultValue="false" + android:key="pref_bridges_enabled" + android:summary="@string/enable_alternate_entrance_nodes_into_the_tor_network" + android:title="@string/use_bridges" /> + + <EditTextPreference + android:defaultValue="" + android:dialogTitle="@string/enter_bridge_addresses" + android:inputType="textMultiLine|textNoSuggestions" + android:key="pref_bridges_list" + android:summary="@string/ip_address_and_port_of_bridges" + android:title="@string/bridges" /> + + </PreferenceCategory> + + <PreferenceCategory android:title="@string/relays"> + <CheckBoxPreference + android:defaultValue="false" + android:enabled="true" + android:key="pref_or" + android:summary="@string/enable_your_device_to_be_a_non_exit_relay" + android:title="@string/relaying" /> + + <EditTextPreference + android:defaultValue="9001" + android:dialogTitle="@string/enter_or_port" + android:key="pref_or_port" + android:summary="@string/listening_port_for_your_tor_relay" + android:title="@string/relay_port" /> + + <EditTextPreference + android:defaultValue="OrbotRelay" + android:dialogTitle="@string/enter_a_custom_relay_nickname" + android:key="pref_or_nickname" + android:summary="@string/the_nickname_for_your_tor_relay" + android:title="@string/relay_nickname" /> + + </PreferenceCategory> + + <PreferenceCategory android:title="ReachableAddresses"> + <CheckBoxPreference + android:defaultValue="false" + android:enabled="true" + android:key="pref_reachable_addresses" + android:summary="@string/run_as_a_client_behind_a_firewall_with_restrictive_policies" + android:title="@string/reachable_addresses"/> + + <EditTextPreference + android:defaultValue="*:80,*:443" + android:dialogTitle="@string/enter_ports" + android:key="pref_reachable_addresses_ports" + android:summary="@string/ports_reachable_behind_a_restrictive_firewall" + android:title="@string/reachable_ports" /> + </PreferenceCategory> + + <PreferenceCategory android:title="Isolation"> + <CheckBoxPreference + android:defaultValue="false" + android:enabled="true" + android:key="pref_isolate_dest" + android:summary="@string/pref_isolate_dest_summary" + android:title="@string/pref_isolate_dest"/> + </PreferenceCategory> + + <PreferenceCategory android:title="ConnectionPadding"> + <CheckBoxPreference + android:defaultValue="false" + android:enabled="true" + android:key="pref_connection_padding" + android:summary="@string/pref_connection_padding_summary" + android:title="@string/pref_connection_padding"/> + <CheckBoxPreference + android:defaultValue="true" + android:enabled="true" + android:key="pref_reduced_connection_padding" + android:summary="@string/pref_reduced_connection_padding_summary" + android:title="@string/pref_reduced_connection_padding"/> + </PreferenceCategory> + + + <PreferenceCategory android:title="@string/pref_proxy_title"> + <EditTextPreference + android:dialogTitle="@string/pref_proxy_type_dialog" + android:key="pref_proxy_type" + android:summary="@string/pref_proxy_type_summary" + android:title="@string/pref_proxy_type_title" /> + <EditTextPreference + android:dialogTitle="@string/pref_proxy_host_dialog" + android:key="pref_proxy_host" + android:summary="@string/pref_proxy_host_summary" + android:title="@string/pref_proxy_host_title" /> + <EditTextPreference + android:dialogTitle="@string/pref_proxy_port_dialog" + android:key="pref_proxy_port" + android:summary="@string/pref_proxy_port_summary" + android:title="@string/pref_proxy_port_title" /> + + <EditTextPreference + android:dialogTitle="@string/pref_proxy_username_dialog" + android:key="pref_proxy_username" + android:summary="@string/pref_proxy_username_summary" + android:title="@string/pref_proxy_username_title" /> + <EditTextPreference + android:dialogTitle="@string/pref_proxy_password_dialog" + android:key="pref_proxy_password" + android:summary="@string/pref_proxy_password_summary" + android:title="@string/pref_proxy_password_title" /> + </PreferenceCategory> + + <PreferenceCategory android:title="Debug"> + + <EditTextPreference + android:defaultValue="9050" + android:dialogTitle="@string/pref_socks_dialog" + android:key="pref_socks" + android:summary="@string/pref_socks_summary" + android:title="@string/pref_socks_title" /> + + <EditTextPreference + android:defaultValue="9040" + android:dialogTitle="@string/pref_transport_dialog" + android:key="pref_transport" + android:summary="@string/pref_transport_summary" + android:title="@string/pref_transport_title" /> + + <EditTextPreference + android:defaultValue="5400" + android:dialogTitle="@string/pref_dnsport_dialog" + android:key="pref_dnsport" + android:summary="@string/pref_dnsport_summary" + android:title="@string/pref_dnsport_title" /> + + <EditTextPreference + android:dialogTitle="@string/pref_torrc_dialog" + android:key="pref_custom_torrc" + android:summary="@string/pref_torrc_summary" + android:title="@string/pref_torrc_title" /> + + + <CheckBoxPreference + android:defaultValue="false" + android:enabled="true" + android:key="pref_enable_logging" + android:summary="@string/enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_" + android:title="Debug Log" /> + + + <CheckBoxPreference + android:defaultValue="true" + android:enabled="true" + android:key="pref_disable_network" + android:summary="@string/pref_disable_network_summary" + android:title="@string/pref_disable_network_title" /> + + </PreferenceCategory> </PreferenceScreen>

1 0

[orbot/master] Update BUILD
by n8fr8＠torproject.org 12 May '18

12 May '18

commit ca3856ce2b9584edcc9863d6011b9fbee9353c4f Author: lex <bird.s.lex(a)gmail.com> Date: Sun Apr 1 18:25:21 2018 -0400 Update BUILD x86 asset was under armeabi --- BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD b/BUILD index 510cab32..bbbeaa8f 100644 --- a/BUILD +++ b/BUILD @@ -26,7 +26,7 @@ You then need to run "ndk-build" from: mkdir -p assets/armeabi zip assets/armeabi/pdnsd.mp3 libs/armeabi/pdnsd mkdir -p assets/x86 - zip assets/x86/pdnsd.mp3 libs/armeabi/pdnsd + zip assets/x86/pdnsd.mp3 libs/x86/pdnsd This isn't enough though and we'll now sew up the binary into a small package that will handle basic Tor controlling features.

1 0

[orbot/master] cleanup
by n8fr8＠torproject.org 12 May '18

12 May '18

commit f117dac336f0d6943a5fb87bd55c4113942938c6 Author: lexi <bird.s.lex(a)gmail.com> Date: Wed Mar 28 15:21:18 2018 -0400 cleanup --- .../android/settings/SettingsPreferences.java | 24 ++++++---------------- app/src/main/res/xml/preferences.xml | 1 - 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java index d79055b4..fb01cde1 100644 --- a/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java +++ b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java @@ -5,34 +5,26 @@ package org.torproject.android.settings; import android.content.Context; import android.content.Intent; -import android.content.SharedPreferences; import android.os.Bundle; import android.preference.ListPreference; import android.preference.Preference; import android.preference.Preference.OnPreferenceChangeListener; -import android.preference.Preference.OnPreferenceClickListener; import android.preference.PreferenceActivity; -import org.torproject.android.OrbotApp; import org.torproject.android.R; import org.torproject.android.service.util.Prefs; -import org.torproject.android.service.util.TorServiceUtils; -import java.util.Locale; - - -public class SettingsPreferences - extends PreferenceActivity { +public class SettingsPreferences + extends PreferenceActivity { private static final String TAG = "SettingsPreferences"; - private ListPreference prefLocale = null; - + private ListPreference prefLocale = null; + protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); addPreferencesFromResource(R.xml.preferences); getPreferenceManager().setSharedPreferencesMode(Context.MODE_MULTI_PROCESS); - SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); prefLocale = (ListPreference) findPreference("pref_default_locale"); Languages languages = Languages.get(this); @@ -46,21 +38,17 @@ public class SettingsPreferences Prefs.setDefaultLocale(language); LocaleHelper.setLocale(getApplicationContext(), language); Intent intentResult = new Intent(); - intentResult.putExtra("locale",language); - setResult(RESULT_OK,intentResult); + intentResult.putExtra("locale", language); + setResult(RESULT_OK, intentResult); finish(); return false; } }); - } - @Override protected void attachBaseContext(Context base) { super.attachBaseContext(LocaleHelper.onAttach(base)); } - - } diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 3fd74394..322db8f3 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -118,7 +118,6 @@ android:title="@string/use_bridges" /> <EditTextPreference - android:defaultValue="" android:dialogTitle="@string/enter_bridge_addresses" android:inputType="textMultiLine|textNoSuggestions" android:key="pref_bridges_list"

1 0

[orbot/master] Merge pull request #137 from bitmold/patch-3
by n8fr8＠torproject.org 12 May '18

12 May '18

commit a4ce29db63338b0873dae82b111980e815aa4dff Merge: d681dced ca3856ce Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Apr 2 09:20:04 2018 -0400 Merge pull request #137 from bitmold/patch-3 Update BUILD BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[orbot/master] removed legacy READ_PHONE_STATE perm
by n8fr8＠torproject.org 12 May '18

12 May '18

commit 505223b3a1894588de0802669b3269a89edeb4b1 Author: lexi <bird.s.lex(a)gmail.com> Date: Thu Apr 12 13:29:22 2018 -0400 removed legacy READ_PHONE_STATE perm --- app/src/fullperm/AndroidManifest.xml | 1 - docs/WALKTHROUGH | 5 ----- 2 files changed, 6 deletions(-) diff --git a/app/src/fullperm/AndroidManifest.xml b/app/src/fullperm/AndroidManifest.xml index c3c5f8f6..d2497e4c 100644 --- a/app/src/fullperm/AndroidManifest.xml +++ b/app/src/fullperm/AndroidManifest.xml @@ -14,7 +14,6 @@ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" /> - <uses-permission android:name="android.permission.READ_PHONE_STATE" />  <uses-feature android:name="android.hardware.touchscreen" diff --git a/docs/WALKTHROUGH b/docs/WALKTHROUGH index 184a7d29..55a356b5 100644 --- a/docs/WALKTHROUGH +++ b/docs/WALKTHROUGH @@ -20,11 +20,6 @@ //this is the class registered in AndroidManifest.xml to handle Onboot events //to start Orbot/Tor when the device boots if the user has elected to do so - what kind of permissions does this require? // <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> - // BTW, this shows up as a fairly unintrusive type perm request now in Android / in older versions (1.6 and earlier) - // it was reported "as read / monitor phone state" and paranoid Tor-types didn't like the idea of it - // in 1.6+ it has a much better UX in terms of having a more granular permisions around boot since it is a very - // common request - ah , that's awesome, i think i remember seeing sth of this sorts when i was going through the guardianproject mailing list. iirc this is something ioerror wanted - ├── OrbotMainActivity.java //our wonderful main activity!

1 0