July 2019 - tor-commits - lists.torproject.org

[orbot/master] Merge pull request #223 from bitmold/farsi_settings_crash_no_custom_prefs
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit 53940073a18a771959ecefe58320e5dfcf545ab7 Merge: f0eede1d 7887e119 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Fri Jun 7 10:02:28 2019 -0400 Merge pull request #223 from bitmold/farsi_settings_crash_no_custom_prefs Fixes Farsi Settings Crash app/src/main/res/xml-fa/preferences.xml | 230 -------------------------------- 1 file changed, 230 deletions(-)

1 0

[orbot/master] fixes Farsi settings crash
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit 7887e119b0546e20b7e482f9ff6fd2c6c09d001c Author: bim <dsnake(a)protonmail.com> Date: Thu Jun 6 17:35:04 2019 -0400 fixes Farsi settings crash --- app/src/main/res/xml-fa/preferences.xml | 230 -------------------------------- 1 file changed, 230 deletions(-) diff --git a/app/src/main/res/xml-fa/preferences.xml b/app/src/main/res/xml-fa/preferences.xml deleted file mode 100644 index 3ad8a086..00000000 --- a/app/src/main/res/xml-fa/preferences.xml +++ /dev/null @@ -1,230 +0,0 @@ -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> - -<PreferenceCategory android:title="@string/pref_general_group"> - - <im.delight.android.languages.LanguagePreference - android:key="pref_default_locale" - android:title="@string/set_locale_title" - android:enabled="true" - android:selectable="true" - android:defaultValue="fa" - /> - - <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"/> - - -</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="true" -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="meek" -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> -</PreferenceScreen>

1 0

[orbot/master] improve how bridge lines are configured
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit dd3a8b0b94fb7118cd27a0452502127567fd67e8 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Jun 5 15:05:34 2019 -0400 improve how bridge lines are configured --- .../src/main/java/org/torproject/android/service/TorService.java | 6 ++++-- .../main/java/org/torproject/android/service/util/CustomShell.java | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index 9eced17b..f4785a0f 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -1597,8 +1597,10 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon //check if any PT bridges are needed if (obfsBridges) { - extraLines.append("ClientTransportPlugin obfs3 exec " + fileObfsclient.getCanonicalPath()).append('\n'); - extraLines.append("ClientTransportPlugin obfs4 exec " + fileObfsclient.getCanonicalPath()).append('\n'); + extraLines.append("ClientTransportPlugin obfs3 exec ") + .append(fileObfsclient.getCanonicalPath()).append('\n'); + extraLines.append("ClientTransportPlugin obfs4 exec ") + .append(fileObfsclient.getCanonicalPath()).append('\n'); } if (meekBridges) { diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/CustomShell.java b/orbotservice/src/main/java/org/torproject/android/service/util/CustomShell.java index f5d4c921..889e8b4d 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/CustomShell.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/CustomShell.java @@ -32,7 +32,6 @@ public class CustomShell extends Shell { //Process process = runWithEnv(command, env); ProcessBuilder builder = new ProcessBuilder(); - if (env != null && (!env.isEmpty())) builder.environment().putAll(env);

1 0

[orbot/master] update to 16.1.0-BETA-4-tor-0.4.0.4-rc
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit f58ef4c0735740ad94a1f455cb1d041a84920f05 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Jun 5 15:09:24 2019 -0400 update to 16.1.0-BETA-4-tor-0.4.0.4-rc --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1026756c..bd03c4f6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,8 +34,8 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 28 - versionCode 16103000 - versionName '16.1.0-BETA-3-tor-0.4.0.4-rc' + versionCode 16104000 + versionName '16.1.0-BETA-4-tor-0.4.0.4-rc' archivesBaseName = "Orbot-$versionName" } }

1 0

[orbot/master] make sure we set HOME env variable
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit 1f36689b90cf372ee5bc70ecf3b24b03c352a659 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Jun 5 14:45:46 2019 -0400 make sure we set HOME env variable some devices don't have it for their sh commands --- .../src/main/java/org/torproject/android/service/TorService.java | 6 +++++- .../java/org/torproject/android/service/util/CustomShell.java | 9 ++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index 7881339d..9eced17b 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -69,6 +69,7 @@ import java.text.Normalizer; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Random; @@ -986,7 +987,10 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private int exec (String cmd, boolean wait) throws Exception { - CommandResult result = CustomShell.run("sh",wait, null, cmd); + HashMap<String,String> mapEnv = new HashMap(); + mapEnv.put("HOME",appBinHome.getAbsolutePath()); + + CommandResult result = CustomShell.run("sh",wait, mapEnv, cmd); debug("executing: " + cmd); debug("stdout: " + result.getStdout()); debug("stderr: " + result.getStderr()); diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/CustomShell.java b/orbotservice/src/main/java/org/torproject/android/service/util/CustomShell.java index 8bd5fe6f..b959405d 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/CustomShell.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/CustomShell.java @@ -13,13 +13,15 @@ import java.io.DataOutputStream; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; +import java.util.Iterator; import java.util.List; +import java.util.Map; public class CustomShell extends Shell { @WorkerThread - public static CommandResult run(@NonNull String shell, boolean waitFor, @Nullable String[] env, @NonNull String command) { + public static CommandResult run(@NonNull String shell, boolean waitFor, @Nullable Map<String,String> env, @NonNull String command) { List<String> stdout = Collections.synchronizedList(new ArrayList<String>()); List<String> stderr = Collections.synchronizedList(new ArrayList<String>()); int exitCode = -1; @@ -29,6 +31,11 @@ public class CustomShell extends Shell { // setup our process, retrieve stdin stream, and stdout/stderr gobblers //Process process = runWithEnv(command, env); ProcessBuilder builder = new ProcessBuilder(); + + + if (env != null && (!env.isEmpty())) + builder.environment().putAll(env); + builder.command("/system/bin/sh", "-c", command); Process process = builder.start();

1 0

[orbot/master] Merge pull request #222 from pgerber/onion-service
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit f0eede1d2172af910d68fa6dbd11f5ced65e6169 Merge: aea140cf dc942cde Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Fri Jun 7 10:02:12 2019 -0400 Merge pull request #222 from pgerber/onion-service Rename hidden services to onion services app/src/main/res/values/strings.xml | 8 ++++---- orbotservice/src/main/res/values/strings.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)

1 0

[orbot/master] make sure to use the request shell for exec()
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit 553528cbbe11790bcf4c3813e154e4a329e15ca5 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Jun 5 14:50:38 2019 -0400 make sure to use the request shell for exec() --- .../android/service/util/CustomShell.java | 27 +--------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/CustomShell.java b/orbotservice/src/main/java/org/torproject/android/service/util/CustomShell.java index b959405d..f5d4c921 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/CustomShell.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/CustomShell.java @@ -36,10 +36,9 @@ public class CustomShell extends Shell { if (env != null && (!env.isEmpty())) builder.environment().putAll(env); - builder.command("/system/bin/sh", "-c", command); + builder.command("/system/bin/" + shell, "-c", command); Process process = builder.start(); - // DataOutputStream stdin = new DataOutputStream(process.getOutputStream()); StreamGobbler stdoutGobbler = null; StreamGobbler stderrGobbler = null; @@ -52,30 +51,6 @@ public class CustomShell extends Shell { stderrGobbler.start(); } - /** - - try { - for (String write : commands) { - stdin.write((write + " &\n").getBytes("UTF-8")); - stdin.flush(); - } - - if (waitFor) - stdin.write("exit\n".getBytes("UTF-8")); - - stdin.flush(); - } catch (IOException e) { - //noinspection StatementWithEmptyBody - if (e.getMessage().contains("EPIPE")) { - // method most horrid to catch broken pipe, in which case we do nothing. the command is not a shell, the - // shell closed stdin, the script already contained the exit command, etc. these cases we want the output - // instead of returning null - } else { - // other issues we don't know how to handle, leads to returning null - throw e; - } - }**/ - // wait for our process to finish, while we gobble away in the background if (waitFor) exitCode = process.waitFor();

1 0

[orbot/master] update built-in bridges
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit 67b69164760ac5e0c3a5765007e6e9183efd7c38 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Jun 4 07:21:21 2019 -0400 update built-in bridges --- orbotservice/src/main/res/raw-fa/bridges.txt | 4 ++++ orbotservice/src/main/res/raw/bridges.txt | 10 ++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/orbotservice/src/main/res/raw-fa/bridges.txt b/orbotservice/src/main/res/raw-fa/bridges.txt index 1e448ea1..3069edb3 100644 --- a/orbotservice/src/main/res/raw-fa/bridges.txt +++ b/orbotservice/src/main/res/raw-fa/bridges.txt @@ -4,4 +4,8 @@ obfs4 79.136.160.201:46501 66AC975BF7CB429D057AE07FC0312C57D61BAEC1 cert=dCtn9Ya obfs4 94.242.249.2:58809 6AF3024788A7EA8F84E3FA3F60018B62291803E4 cert=X0sDCJLKMM/EISdGDEfGrsks41UYmScjIIXQ9AZgWFVKNKS6klcNEpdF4tNXFz6kIyk4Ug iat-mode=0 obfs4 35.203.134.33:2224 15524C683CC872C8C8FB5B779A8D53F54F7ADCD4 cert=bXLTv0Kwt1zgPBoeVF86vC+0tYAHepR7+QMczhhTQw9hpAIhatt/Bpe6rSGY63Zh8aZ+dQ iat-mode=0 obfs4 188.166.252.228:9443 595770328CA95E39FF5B81013880B46CA1B29546 cert=3PjhGUq3xWDMrBAzbV1eU4zPSB3GRGBpYdXQEs9hkrwC9RSZdnEe1P+cg7VgLgYTj/2MMg iat-mode=0 +obfs4 89.163.181.169:443 6A17D1E29E2807A1A4314215553079001031A7FF cert=e8JIYivx1zbYNOqq3a3+nDf/NDHoDQ/th/RVAnlVQePUIHxllG7aOku7pSwZisZ7i6ybVw iat-mode=0 +obfs4 94.242.249.2:40190 C7BE8154678E7537CCAC60B097D51A8A7EF8BCDF cert=8jw57wlMlVXCKsCnF7gCdApx7sRZLD5zPl8qdccwp0zltYG6kMYqBNm60dP8IxRH/l8OcQ iat-mode=0 +obfs4 77.81.104.251:443 115C90EBD0EB631C177560A872535772215478D9 cert=UsuF7oN4KNKviZP54JOyTCoCphrdM5gwZK4vT8GnCAcmqLUJEJxyw1dpko9a/ii6He4iZg iat-mode=0 +obfs4 5.249.146.133:80 FAF3A0073330D6AD92F3B4874B0D945562A633EF cert=TRe8bAODtjcGij7EPQaUayWEOqR99wDh2l3B4hFtCsn1JTJCph03pRZ9tx8wynpLYKWMQg iat-mode=0 meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com diff --git a/orbotservice/src/main/res/raw/bridges.txt b/orbotservice/src/main/res/raw/bridges.txt index 1e448ea1..101db60a 100644 --- a/orbotservice/src/main/res/raw/bridges.txt +++ b/orbotservice/src/main/res/raw/bridges.txt @@ -1,7 +1,5 @@ -obfs4 78.215.187.186:45675 AE907EE5FAA5D0D27E0C83EFA6ADF8E79FCC0FF1 cert=/TRjMo+RinKaixARMjMtZZBhystaBe+aDaapPrbiITFtWx3M/AJcvpjHjO54tJqLd1+IWQ iat-mode=0 -obfs4 107.160.7.24:443 7A0904F6D182B81BEFE0DEDAFEC974494672627B cert=a5/IlZMnDvb8d92LTHMfsBIgL7QlDLPiXiLwe85uedC80mGD0QerygzmsWnMEdwG9ER9Eg iat-mode=0 -obfs4 79.136.160.201:46501 66AC975BF7CB429D057AE07FC0312C57D61BAEC1 cert=dCtn9Ya8z+R8YQikdWgC3XTAt58z5Apnm95QHrJwnhFSdnphPPEz+NMm6OawWc2srKLjJg iat-mode=0 -obfs4 94.242.249.2:58809 6AF3024788A7EA8F84E3FA3F60018B62291803E4 cert=X0sDCJLKMM/EISdGDEfGrsks41UYmScjIIXQ9AZgWFVKNKS6klcNEpdF4tNXFz6kIyk4Ug iat-mode=0 -obfs4 35.203.134.33:2224 15524C683CC872C8C8FB5B779A8D53F54F7ADCD4 cert=bXLTv0Kwt1zgPBoeVF86vC+0tYAHepR7+QMczhhTQw9hpAIhatt/Bpe6rSGY63Zh8aZ+dQ iat-mode=0 -obfs4 188.166.252.228:9443 595770328CA95E39FF5B81013880B46CA1B29546 cert=3PjhGUq3xWDMrBAzbV1eU4zPSB3GRGBpYdXQEs9hkrwC9RSZdnEe1P+cg7VgLgYTj/2MMg iat-mode=0 +obfs4 89.163.181.169:443 6A17D1E29E2807A1A4314215553079001031A7FF cert=e8JIYivx1zbYNOqq3a3+nDf/NDHoDQ/th/RVAnlVQePUIHxllG7aOku7pSwZisZ7i6ybVw iat-mode=0 +obfs4 94.242.249.2:40190 C7BE8154678E7537CCAC60B097D51A8A7EF8BCDF cert=8jw57wlMlVXCKsCnF7gCdApx7sRZLD5zPl8qdccwp0zltYG6kMYqBNm60dP8IxRH/l8OcQ iat-mode=0 +obfs4 77.81.104.251:443 115C90EBD0EB631C177560A872535772215478D9 cert=UsuF7oN4KNKviZP54JOyTCoCphrdM5gwZK4vT8GnCAcmqLUJEJxyw1dpko9a/ii6He4iZg iat-mode=0 +obfs4 5.249.146.133:80 FAF3A0073330D6AD92F3B4874B0D945562A633EF cert=TRe8bAODtjcGij7EPQaUayWEOqR99wDh2l3B4hFtCsn1JTJCph03pRZ9tx8wynpLYKWMQg iat-mode=0 meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com

1 0

[orbot/master] Removed unused Eclipse IDE settings files. I think there are old
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit f0103bf46599397fa607c9531854dde8846e6bf9 Author: bim <dsnake(a)protonmail.com> Date: Fri Jun 7 13:59:04 2019 -0400 Removed unused Eclipse IDE settings files. I think there are old Eclipse build files in the root of the repository that should also get deleted but I'm not 100% sure if some of them are still used or not --- .settings/.jsdtscope | 11 ----------- .settings/org.eclipse.wst.jsdt.ui.superType.container | 1 - .settings/org.eclipse.wst.jsdt.ui.superType.name | 1 - 3 files changed, 13 deletions(-) diff --git a/.settings/.jsdtscope b/.settings/.jsdtscope deleted file mode 100644 index bbb8e68b..00000000 --- a/.settings/.jsdtscope +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject"> - <attributes> - <attribute name="hide" value="true"/> - </attributes> - </classpathentry> - <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/> - <classpathentry kind="output" path=""/> -</classpath> diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.container b/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a4..00000000 --- a/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.name b/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b6..00000000 --- a/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file

1 0

[orbot/master] remove unused settings for root and transproxy
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit ecdff5ce5cd7c40cec04f6a8ed60c0a8b6aae705 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Jun 14 23:07:39 2019 -0400 remove unused settings for root and transproxy --- .../org/torproject/android/OrbotMainActivity.java | 6 ---- .../org/torproject/android/service/util/Prefs.java | 34 ---------------------- 2 files changed, 40 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index a87da30d..59a6d89b 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -1065,12 +1065,6 @@ public class OrbotMainActivity extends AppCompatActivity else updateStatus(null, torStatus); - if (Prefs.useTransparentProxying()) - { - showAlert(getString(R.string.no_transproxy_warning_short),getString(R.string.no_transproxy_warning),true); - Prefs.disableTransparentProxying(); - } - addAppShortcuts(); //now you can handle the intents properly diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java index 0a2bf45e..7b5f132b 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java @@ -13,16 +13,10 @@ public class Prefs { private final static String PREF_DEFAULT_LOCALE = "pref_default_locale"; private final static String PREF_ENABLE_LOGGING = "pref_enable_logging"; private final static String PREF_EXPANDED_NOTIFICATIONS = "pref_expanded_notifications"; - private final static String PREF_HAS_ROOT = "has_root"; private final static String PREF_PERSIST_NOTIFICATIONS = "pref_persistent_notifications"; private final static String PREF_START_ON_BOOT = "pref_start_boot"; private final static String PREF_ALLOW_BACKGROUND_STARTS = "pref_allow_background_starts"; private final static String PREF_OPEN_PROXY_ON_ALL_INTERFACES = "pref_open_proxy_on_all_interfaces"; - private final static String PREF_TRANSPARENT = "pref_transparent"; - private final static String PREF_TRANSPARENT_ALL = "pref_transparent_all"; - private final static String PREF_TRANSPARENT_TETHERING = "pref_transparent_tethering"; - private final static String PREF_TRANSPROXY_REFRESH = "pref_transproxy_refresh"; - private final static String PREF_USE_SYSTEM_IPTABLES = "pref_use_sys_iptables"; private final static String PREF_USE_VPN = "pref_vpn"; private final static String PREF_EXIT_NODES = "pref_exit_nodes"; @@ -70,34 +64,6 @@ public class Prefs { putString(PREF_DEFAULT_LOCALE, value); } - public static boolean useSystemIpTables() { - return prefs.getBoolean(PREF_USE_SYSTEM_IPTABLES, false); - } - - public static boolean useRoot() { - return prefs.getBoolean(PREF_HAS_ROOT, false); - } - - public static boolean useTransparentProxying() { - return prefs.getBoolean(PREF_TRANSPARENT, false); - } - - public static void disableTransparentProxying() { - putBoolean(PREF_TRANSPARENT, false); - } - - public static boolean transparentProxyAll() { - return prefs.getBoolean(PREF_TRANSPARENT_ALL, false); - } - - public static boolean transparentTethering() { - return prefs.getBoolean(PREF_TRANSPARENT_TETHERING, false); - } - - public static boolean transProxyNetworkRefresh() { - return prefs.getBoolean(PREF_TRANSPROXY_REFRESH, false); - } - public static boolean expandedNotifications() { return prefs.getBoolean(PREF_EXPANDED_NOTIFICATIONS, true); }

1 0