- tor-commits - lists.torproject.org

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 07 Jan '16

07 Jan '16

commit ba5f57a576a95adeffe2ba4f12ba1cc89bc9551d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 7 11:15:16 2016 +0000 Update translations for torcheck_completed --- ko/torcheck.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ko/torcheck.po b/ko/torcheck.po index f3e1e9d..896254f 100644 --- a/ko/torcheck.po +++ b/ko/torcheck.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2016-01-07 01:40+0000\n" +"PO-Revision-Date: 2016-01-07 10:49+0000\n" "Last-Translator: sangmin lee <sangminlee7648(a)gmail.com>\n" "Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\n" "MIME-Version: 1.0\n" @@ -65,7 +65,7 @@ msgid "Are you using Tor?" msgstr "지금 Tor를 사용하고 계신가요?" msgid "This page is also available in the following languages:" -msgstr "이 페이지는 다른 언어로도 만나보실 수 있습니다." +msgstr "이 페이지는 다음 언어로도 만나보실 수 있습니다:" msgid "For more information about this exit relay, see:" msgstr "출구 중계 서버 대한 정보를 더 얻고 싶으신가요?" @@ -103,7 +103,7 @@ msgid "However, it does not appear to be Tor Browser." msgstr "그러나 Tor 브라우저가 아닌 것 같습니다." msgid "Run a Relay" -msgstr "중셰서버 실행" +msgstr "중계서버 실행" msgid "Stay Anonymous" msgstr "익명으로"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 07 Jan '16

07 Jan '16

commit d6d1b5f3a5fb15c9aeabcf51910ab588e1a6c228 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 7 11:15:12 2016 +0000 Update translations for torcheck --- ko/torcheck.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ko/torcheck.po b/ko/torcheck.po index f3e1e9d..896254f 100644 --- a/ko/torcheck.po +++ b/ko/torcheck.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2016-01-07 01:40+0000\n" +"PO-Revision-Date: 2016-01-07 10:49+0000\n" "Last-Translator: sangmin lee <sangminlee7648(a)gmail.com>\n" "Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\n" "MIME-Version: 1.0\n" @@ -65,7 +65,7 @@ msgid "Are you using Tor?" msgstr "지금 Tor를 사용하고 계신가요?" msgid "This page is also available in the following languages:" -msgstr "이 페이지는 다른 언어로도 만나보실 수 있습니다." +msgstr "이 페이지는 다음 언어로도 만나보실 수 있습니다:" msgid "For more information about this exit relay, see:" msgstr "출구 중계 서버 대한 정보를 더 얻고 싶으신가요?" @@ -103,7 +103,7 @@ msgid "However, it does not appear to be Tor Browser." msgstr "그러나 Tor 브라우저가 아닌 것 같습니다." msgid "Run a Relay" -msgstr "중셰서버 실행" +msgstr "중계서버 실행" msgid "Stay Anonymous" msgstr "익명으로"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 07 Jan '16

07 Jan '16

commit 64ffa09f74785887de5915c7f1e34534b96eafef Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 7 11:15:03 2016 +0000 Update translations for bridgedb --- ko/LC_MESSAGES/bridgedb.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ko/LC_MESSAGES/bridgedb.po b/ko/LC_MESSAGES/bridgedb.po index c1790f9..4022c54 100644 --- a/ko/LC_MESSAGES/bridgedb.po +++ b/ko/LC_MESSAGES/bridgedb.po @@ -19,7 +19,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-01-07 01:33+0000\n" +"PO-Revision-Date: 2016-01-07 11:06+0000\n" "Last-Translator: sangmin lee <sangminlee7648(a)gmail.com>\n" "Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\n" "MIME-Version: 1.0\n" @@ -89,7 +89,7 @@ msgstr "QR 코드를 불러 오는 중 오류가 생긴 것 같습니다." msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "" +msgstr "이 QR코드는 당신의 브릿지 행을 포함하고 있습니다. 브릿지 행을 다른 기기로 복사하려면 QR코드 리더로 스캔하세요." #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." @@ -130,7 +130,7 @@ msgstr "%s3%s번째 단계 " #: bridgedb/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "이제 %s는 그 브릿지를 Tor 브라우저 %s에 더합니다." +msgstr "이제 %s 그 브릿지를 Tor 브라우저에 더합니다 %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -139,7 +139,7 @@ msgstr "이제 %s는 그 브릿지를 Tor 브라우저 %s에 더합니다." #: bridgedb/https/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "" +msgstr "%s그%s냥 브릿지 주세요!" #: bridgedb/https/templates/options.html:51 msgid "Advanced Options" @@ -187,7 +187,7 @@ msgstr "속도 제한을 초과하였습니다. 속도를 낮추세요! 이메 #: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" -msgstr "" +msgstr "COMMANDs: (COMMANDs를 섞어서 여러 옵션을 동시에 구체화 하세요)" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". #: bridgedb/strings.py:53 @@ -220,7 +220,7 @@ msgstr "공개 키" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "" +msgstr "이 이메일은 %s를 위해 %s에 %s에서\n무지개, 유니콘 그리고 반짝이로 작성되었습니다." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".

1 0

[metrics-db/master] Add length check before parsing identity-ed25519.
by karsten＠torproject.org 07 Jan '16

07 Jan '16

commit f5099ba84b5116eca6fb5d1805d9de05d5e65a0b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jan 7 11:53:05 2016 +0100 Add length check before parsing identity-ed25519. Found while implementing similar functionality in metrics-lib. --- .../torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java b/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java index af145c7..a0f9dda 100644 --- a/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java +++ b/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java @@ -950,7 +950,10 @@ public class SanitizedBridgesWriter extends Thread { private String parseMasterKeyEd25519FromIdentityEd25519( String identityEd25519Base64) { byte[] identityEd25519 = Base64.decodeBase64(identityEd25519Base64); - if (identityEd25519[0] != 0x01) { + if (identityEd25519.length < 40) { + this.logger.warning("Invalid length of identity-ed25519 (in " + + "bytes): " + identityEd25519.length); + } else if (identityEd25519[0] != 0x01) { this.logger.warning("Unknown version in identity-ed25519: " + identityEd25519[0]); } else if (identityEd25519[1] != 0x04) {

1 0

[webwml/master] Add new TBB version
by gk＠torproject.org 07 Jan '16

07 Jan '16

commit cb1272b4d9c05c16558dce154090f33df15bea13 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 7 08:46:33 2016 +0000 Add new TBB version --- include/versions.wmi | 12 ++++++------ projects/torbrowser/RecommendedTBBVersions | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 287c49d..f073126 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -18,10 +18,10 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.3.25</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag> -<define-tag version-torbrowserbundledir whitespace=delete>5.0.6</define-tag> +<define-tag version-torbrowserbundledir whitespace=delete>5.0.7</define-tag> <define-tag version-torbrowserbundlebetadir whitespace=delete>5.5a5</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>5.0.6</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>5.0.7</define-tag> <define-tag version-torbrowserbundlebeta whitespace=delete>5.5a5</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e</define-tag> @@ -31,8 +31,8 @@ <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>5.0.6</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>5.0.6</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>5.0.7</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>5.0.7</define-tag> <define-tag version-torbrowserbundlelinux32beta whitespace=delete>5.5a5</define-tag> <define-tag version-torbrowserbundlelinux64beta whitespace=delete>5.5a5</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> @@ -40,8 +40,8 @@ <define-tag version-gnu-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>5.0.6</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>5.0.6</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>5.0.7</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>5.0.7</define-tag> <define-tag version-torbrowserbundleosx64beta whitespace=delete>5.5a5</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index b0a53b2..e77f912 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -3,6 +3,10 @@ "5.0.6-Linux", "5.0.6-MacOS", "5.0.6-Windows", +"5.0.7", +"5.0.7-Linux", +"5.0.7-MacOS", +"5.0.7-Windows", "5.5a5", "5.5a5-Linux", "5.5a5-MacOS",

1 0

[orbot/master] update tfx config
by n8fr8＠torproject.org 06 Jan '16

06 Jan '16

commit dfc5101d1d626762106437647f9739c7e8fcf198 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jan 7 01:09:09 2016 -0500 update tfx config --- .tx/config | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.tx/config b/.tx/config index e5c960f..14456ab 100644 --- a/.tx/config +++ b/.tx/config @@ -16,8 +16,8 @@ source_file = description/source.xlf source_lang = en type = XLIFF -[orbot.olddescription] -file_filter = releases/assets/<lang>-description.txt -host = https://www.transifex.com -source_file = releases/assets/description.txt -source_lang = en +#[orbot.olddescription] +#file_filter = releases/assets/<lang>-description.txt +#host = https://www.transifex.com +#source_file = releases/assets/description.txt +#source_lang = en

1 0

[orbot/master] allow country exit node select to persist
by n8fr8＠torproject.org 06 Jan '16

06 Jan '16

commit 3b413657086b0ca013f418833e41534970652990 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jan 7 00:59:34 2016 -0500 allow country exit node select to persist --- src/org/torproject/android/OrbotMainActivity.java | 35 ++++--- src/org/torproject/android/Prefs.java | 15 ++- src/org/torproject/android/service/TorService.java | 110 ++++++++++---------- .../android/service/TorServiceConstants.java | 4 + 4 files changed, 95 insertions(+), 69 deletions(-) diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index a2e5a60..e93cdd7 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -72,6 +72,7 @@ import java.net.URLEncoder; import java.text.NumberFormat; import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.Locale; @@ -306,38 +307,46 @@ public class OrbotMainActivity extends Activity }); - Locale[] locale = Locale.getAvailableLocales(); - ArrayList<String> countries = new ArrayList<String>(); - countries.add("World (best)"); - countries.add("US"); - countries.add("DE"); - countries.add("CA"); - countries.add("FR"); + String currentExit = Prefs.getExitNodes(); + int selIdx = -1; + ArrayList<String> cList = new ArrayList<String>(); + cList.add(0, "WORLD"); + + for (int i = 0; i < TorServiceConstants.COUNTRY_CODES.length; i++) + { + Locale locale = new Locale("",TorServiceConstants.COUNTRY_CODES[i]); + cList.add(locale.getDisplayCountry()); + + if (currentExit.contains(TorServiceConstants.COUNTRY_CODES[i])) + selIdx = i+1; + } - spnCountries = (Spinner)findViewById(R.id.spinnerCountry); - ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,android.R.layout.simple_spinner_item, countries); + ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,android.R.layout.simple_spinner_item, cList); spnCountries.setAdapter(adapter); - + + if (selIdx != -1) + spnCountries.setSelection(selIdx); + spnCountries.setOnItemSelectedListener(new OnItemSelectedListener() { @Override public void onItemSelected(AdapterView<?> parentView, View selectedItemView, int position, long id) { // your code here - String country = (String)spnCountries.getItemAtPosition(position); + String country = null; if (position == 0) country = ""; else - country = '{' + country.toLowerCase() + '}'; + country = '{' + TorServiceConstants.COUNTRY_CODES[position-1] + '}'; Intent torService = new Intent(OrbotMainActivity.this, TorService.class); torService.setAction(TorServiceConstants.CMD_SET_EXIT); torService.putExtra("exit",country); startService(torService); - + } @Override diff --git a/src/org/torproject/android/Prefs.java b/src/org/torproject/android/Prefs.java index fad04ba..d79f160 100644 --- a/src/org/torproject/android/Prefs.java +++ b/src/org/torproject/android/Prefs.java @@ -3,6 +3,8 @@ package org.torproject.android; import android.content.Context; import android.content.SharedPreferences; +import android.text.TextUtils; + import org.torproject.android.service.TorServiceUtils; import java.util.Locale; @@ -23,7 +25,8 @@ public class Prefs { 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"; + private static SharedPreferences prefs; public static void setContext(Context context) { @@ -118,4 +121,14 @@ public class Prefs { public static void putStartOnBoot(boolean value) { putBoolean(PREF_START_ON_BOOT, value); } + + public static String getExitNodes () + { + return prefs.getString(PREF_EXIT_NODES, ""); + } + + public static void setExitNodes (String exits) + { + putString(PREF_EXIT_NODES,exits); + } } diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 24f5965..a1c0bfe 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -1414,71 +1414,71 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (mCurrentStatus == STATUS_STARTING && TextUtils.equals(status, "BUILT")) sendCallbackStatus(STATUS_ON); - StringBuilder sb = new StringBuilder(); - sb.append("Circuit ("); - sb.append((circID)); - sb.append(") "); - sb.append(status); - sb.append(": "); + StringBuilder sb = new StringBuilder(); + sb.append("Circuit ("); + sb.append((circID)); + sb.append(") "); + sb.append(status); + sb.append(": "); + + StringTokenizer st = new StringTokenizer(path,","); + Node node = null; + + while (st.hasMoreTokens()) + { + String nodePath = st.nextToken(); + node = new Node(); - StringTokenizer st = new StringTokenizer(path,","); - Node node = null; + String[] nodeParts; - while (st.hasMoreTokens()) + if (nodePath.contains("=")) + nodeParts = nodePath.split("="); + else + nodeParts = nodePath.split("~"); + + if (nodeParts.length == 1) { - String nodePath = st.nextToken(); - node = new Node(); - - String[] nodeParts; - - if (nodePath.contains("=")) - nodeParts = nodePath.split("="); - else - nodeParts = nodePath.split("~"); - - if (nodeParts.length == 1) - { - node.id = nodeParts[0].substring(1); - node.name = node.id; - } - else if (nodeParts.length == 2) - { - node.id = nodeParts[0].substring(1); - node.name = nodeParts[1]; - } - - node.status = status; + node.id = nodeParts[0].substring(1); + node.name = node.id; + } + else if (nodeParts.length == 2) + { + node.id = nodeParts[0].substring(1); + node.name = nodeParts[1]; + } + + node.status = status; + + sb.append(node.name); + + if (st.hasMoreTokens()) + sb.append (" > "); + } + + if (Prefs.useDebugLogging()) + debug(sb.toString()); + else if(status.equals("BUILT")) + logNotice(sb.toString()); + else if (status.equals("CLOSED")) + logNotice(sb.toString()); + + if (Prefs.expandedNotifications()) + { + //get IP from last nodename + if(status.equals("BUILT")){ - sb.append(node.name); + if (node.ipAddress == null) + mExecutor.execute(new ExternalIPFetcher(node)); - if (st.hasMoreTokens()) - sb.append (" > "); + hmBuiltNodes.put(node.id, node); } - if (Prefs.useDebugLogging()) - debug(sb.toString()); - else if(status.equals("BUILT")) - logNotice(sb.toString()); - else if (status.equals("CLOSED")) - logNotice(sb.toString()); - - if (Prefs.expandedNotifications()) + if (status.equals("CLOSED")) { - //get IP from last nodename - if(status.equals("BUILT")){ - - if (node.ipAddress == null) - mExecutor.execute(new ExternalIPFetcher(node)); - - hmBuiltNodes.put(node.id, node); - } + hmBuiltNodes.remove(node.id); - if (status.equals("CLOSED")) - { - hmBuiltNodes.remove(node.id); - - } } + } } diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index c9bb6ec..2e2002d 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -148,5 +148,9 @@ public interface TorServiceConstants { //DNS daemon for TCP DNS over TOr public final static String PDNSD_ASSET_KEY = "pdnsd"; + + //EXIT COUNTRY CODES + public final static String[] COUNTRY_CODES = {"DE","AT","SE","CH","IS","CA","US","FR","BG","AU","BR","CZ","DK","FI","GB","HU","NL","JP","HK","RO","RU","SG","SK","CN"}; + }

1 0

[orbot/master] 15.1.0-ALPHA-3
by n8fr8＠torproject.org 06 Jan '16

06 Jan '16

commit c687bc934eb22c190b41bee67f867e38211567b0 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jan 7 01:20:33 2016 -0500 15.1.0-ALPHA-3 --- AndroidManifest.xml | 4 ++-- libs/x86/pdnsd | Bin 214736 -> 0 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9f49e0b..fb8ed9a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="15.1.0-ALPHA-2" - android:versionCode="15100002" + android:versionName="15.1.0-ALPHA-3" + android:versionCode="15100003" android:installLocation="auto" > diff --git a/libs/x86/pdnsd b/libs/x86/pdnsd deleted file mode 100755 index c26cb12..0000000 Binary files a/libs/x86/pdnsd and /dev/null differ

1 0

[orbot/master] add initial support for easy exit country selection
by n8fr8＠torproject.org 06 Jan '16

06 Jan '16

commit b2081789f5d634a679a4d45dbd9c5fda1c8d650e Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jan 6 23:42:08 2016 -0500 add initial support for easy exit country selection --- res/layout/layout_main.xml | 6 + src/org/torproject/android/OrbotMainActivity.java | 47 +++++++ src/org/torproject/android/service/TorService.java | 130 +++++++++++++++----- .../android/service/TorServiceConstants.java | 5 +- 4 files changed, 157 insertions(+), 31 deletions(-) diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml index 104e96e..a3b99de 100644 --- a/res/layout/layout_main.xml +++ b/res/layout/layout_main.xml @@ -205,6 +205,12 @@ android:layout_gravity="center_horizontal|center_vertical"/> android:ellipsize="end" android:singleLine="true" /> + + <Spinner + android:id="@+id/spinnerCountry" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" /> </LinearLayout> </LinearLayout> diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index f56069e..a2e5a60 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -44,7 +44,11 @@ import android.view.View.OnLongClickListener; import android.view.View.OnTouchListener; import android.view.Window; import android.view.animation.AccelerateInterpolator; +import android.widget.AdapterView; +import android.widget.AdapterView.OnItemSelectedListener; +import android.widget.ArrayAdapter; import android.widget.Button; +import android.widget.Spinner; import android.widget.TextView; import android.widget.Toast; import android.widget.ToggleButton; @@ -66,6 +70,8 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.net.URLEncoder; import java.text.NumberFormat; +import java.util.ArrayList; +import java.util.Collections; import java.util.Locale; @@ -83,6 +89,9 @@ public class OrbotMainActivity extends Activity private Button mBtnBrowser = null; private ToggleButton mBtnVPN = null; private ToggleButton mBtnBridges = null; + + private Spinner spnCountries = null; + private DrawerLayout mDrawer; private ActionBarDrawerToggle mDrawerToggle; @@ -297,8 +306,46 @@ public class OrbotMainActivity extends Activity }); + Locale[] locale = Locale.getAvailableLocales(); + ArrayList<String> countries = new ArrayList<String>(); + countries.add("World (best)"); + countries.add("US"); + countries.add("DE"); + countries.add("CA"); + countries.add("FR"); + + + + spnCountries = (Spinner)findViewById(R.id.spinnerCountry); + ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,android.R.layout.simple_spinner_item, countries); + spnCountries.setAdapter(adapter); + + spnCountries.setOnItemSelectedListener(new OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView<?> parentView, View selectedItemView, int position, long id) { + // your code here + + String country = (String)spnCountries.getItemAtPosition(position); + + if (position == 0) + country = ""; + else + country = '{' + country.toLowerCase() + '}'; + + Intent torService = new Intent(OrbotMainActivity.this, TorService.class); + torService.setAction(TorServiceConstants.CMD_SET_EXIT); + torService.putExtra("exit",country); + startService(torService); + + } + + @Override + public void onNothingSelected(AdapterView<?> parentView) { + // your code here + } + }); } GestureDetector mGestureDetector; diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 5513e78..24f5965 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -339,6 +339,10 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon enableVpnProxy(); } else if (action.equals(CMD_VPN_CLEAR)) { clearVpnProxy(); + } else if (action.equals(CMD_SET_EXIT)) { + + setExitNode(mIntent.getStringExtra("exit")); + } else { Log.w(TAG, "unhandled TorService Intent: " + action); } @@ -2088,38 +2092,25 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (entranceNodes.length() > 0 || exitNodes.length() > 0 || excludeNodes.length() > 0) { - //only apply GeoIP if you need it - File fileGeoIP = new File(OrbotApp.appBinHome, GEOIP_ASSET_KEY); - File fileGeoIP6 = new File(OrbotApp.appBinHome, GEOIP6_ASSET_KEY); - - try - { - if ((!fileGeoIP.exists())) - { - TorResourceInstaller installer = new TorResourceInstaller(this, OrbotApp.appBinHome); - boolean success = installer.installGeoIP(); + + if (enableGeoIP ()) + { //only apply GeoIP if you need it + File fileGeoIP = new File(OrbotApp.appBinHome, GEOIP_ASSET_KEY); + File fileGeoIP6 = new File(OrbotApp.appBinHome, GEOIP6_ASSET_KEY); - } - extraLines.append("GeoIPFile" + ' ' + fileGeoIP.getCanonicalPath()).append('\n'); extraLines.append("GeoIPv6File" + ' ' + fileGeoIP6.getCanonicalPath()).append('\n'); - - } - catch (Exception e) - { - showToolbarNotification (getString(R.string.error_installing_binares),ERROR_NOTIFY_ID,R.drawable.ic_stat_notifyerr); - - return false; } + } - if (entranceNodes != null && entranceNodes.length() > 0) + if (!TextUtils.isEmpty(entranceNodes)) extraLines.append("EntryNodes" + ' ' + entranceNodes).append('\n'); - if (exitNodes != null && exitNodes.length() > 0) + if (!TextUtils.isEmpty(exitNodes)) extraLines.append("ExitNodes" + ' ' + exitNodes).append('\n'); - if (excludeNodes != null && excludeNodes.length() > 0) + if (!TextUtils.isEmpty(excludeNodes)) extraLines.append("ExcludeNodes" + ' ' + excludeNodes).append('\n'); extraLines.append("StrictNodes" + ' ' + (enableStrictNodes ? "1" : "0")).append('\n'); @@ -2210,14 +2201,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } - if (Prefs.useVpn()) - { - - //extraLines.append("DNSPort ").append(TOR_VPN_DNS_LISTEN_ADDRESS).append(":").append(TorServiceConstants.TOR_DNS_PORT_DEFAULT).append("\n"); - //extraLines.append("DNSPort ").append(TorServiceConstants.TOR_DNS_PORT_DEFAULT).append("\n"); - - } - return true; } @@ -2337,6 +2320,93 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon return null; } + private void setExitNode (String newExits) + { + SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); + + if (TextUtils.isEmpty(newExits)) + { + prefs.edit().remove("pref_exit_nodes").apply(); + + if (conn != null) + { + try + { + ArrayList<String> resetBuffer = new ArrayList<String>(); + resetBuffer.add("ExitNodes"); + resetBuffer.add("StrictNodes"); + conn.resetConf(resetBuffer); + conn.setConf("DisableNetwork","1"); + conn.setConf("DisableNetwork","0"); + + } + catch (IOException ioe) + { + ioe.printStackTrace(); + } + } + } + else + { + prefs.edit().putString("pref_exit_nodes", newExits).apply(); + + if (conn != null) + { + try + { + + enableGeoIP (); + + File fileGeoIP = new File(OrbotApp.appBinHome, GEOIP_ASSET_KEY); + File fileGeoIP6 = new File(OrbotApp.appBinHome, GEOIP6_ASSET_KEY); + + conn.setConf("GeoIPFile",fileGeoIP.getCanonicalPath()); + conn.setConf("GeoIPv6File",fileGeoIP6.getCanonicalPath()); + + conn.setConf("ExitNodes", newExits); + conn.setConf("StrictNodes","1"); + + conn.setConf("DisableNetwork","1"); + conn.setConf("DisableNetwork","0"); + + + + + } + catch (IOException ioe) + { + ioe.printStackTrace(); + } + } + } + + + + } + private boolean enableGeoIP () + { + File fileGeoIP = new File(OrbotApp.appBinHome, GEOIP_ASSET_KEY); + File fileGeoIP6 = new File(OrbotApp.appBinHome, GEOIP6_ASSET_KEY); + + try + { + if ((!fileGeoIP.exists())) + { + TorResourceInstaller installer = new TorResourceInstaller(this, OrbotApp.appBinHome); + boolean success = installer.installGeoIP(); + + } + + return true; + + } + catch (Exception e) + { + showToolbarNotification (getString(R.string.error_installing_binares),ERROR_NOTIFY_ID,R.drawable.ic_stat_notifyerr); + + return false; + } + } } diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 77b7a9b..c9bb6ec 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -131,7 +131,10 @@ public interface TorServiceConstants { public static final String CMD_VPN = "vpn"; public static final String CMD_VPN_CLEAR = "vpnclear"; public static final String CMD_UPDATE_TRANS_PROXY = "update"; - + public static final String CMD_SET_EXIT = "setexit"; + + + public static final String BINARY_TOR_VERSION = "0.2.7.5-020120160125"; public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED";

1 0

[orbot/master] move "World" string to resource
by n8fr8＠torproject.org 06 Jan '16

06 Jan '16

commit 52acf68ed4b3e73c6bf88c7f2e30d2423222982b Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jan 7 01:06:43 2016 -0500 move "World" string to resource --- res/values/strings.xml | 2 ++ src/org/torproject/android/OrbotMainActivity.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index dc0e880..7f1d349 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -334,4 +334,6 @@ <string name="standard_browser">Standard Browser</string> <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOTE: Only standard Tor bridges work on Intel X86/ATOM devices</string> + + <string name="vpn_default_world">World</string> </resources> diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index e93cdd7..7b7ca07 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -312,7 +312,7 @@ public class OrbotMainActivity extends Activity int selIdx = -1; ArrayList<String> cList = new ArrayList<String>(); - cList.add(0, "WORLD"); + cList.add(0, getString(R.string.vpn_default_world)); for (int i = 0; i < TorServiceConstants.COUNTRY_CODES.length; i++) {

1 0