- tor-commits - lists.torproject.org

[orbot/master] remove Meek supprt from briges (MSFT Azure no longer supports domain fronting)
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit b46195c14ba177e74fa6f69c9244a66c06951488 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Apr 9 14:29:11 2021 -0400 remove Meek supprt from briges (MSFT Azure no longer supports domain fronting) --- .../android/ui/onboarding/BridgeWizardActivity.java | 11 ----------- app/src/main/res/layout/content_bridge_wizard.xml | 2 ++ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java index 2f29300d..916541c6 100644 --- a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java +++ b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java @@ -39,7 +39,6 @@ public class BridgeWizardActivity extends AppCompatActivity { private static HostTester runningHostTest; private RadioButton mBtDirect; private RadioButton mBtObfs4; - private RadioButton mBtMeek; private RadioButton mBtCustom; private RadioButton mBtSnowflake; private View mBtnConfgiureCustomBridges; @@ -116,14 +115,6 @@ public class BridgeWizardActivity extends AppCompatActivity { testBridgeConnection(); }); - mBtMeek = findViewById(R.id.btnBridgesMeek); - mBtMeek.setOnCheckedChangeListener((buttonView, isChecked) -> { - if (!isChecked) return; - Prefs.setBridgesList("meek"); - Prefs.putBridgesEnabled(true); - testBridgeConnection(); - }); - mBtSnowflake = findViewById(R.id.btnBridgesSnowflake); mBtSnowflake.setOnCheckedChangeListener((buttonView, isChecked) -> { if (!isChecked) return; @@ -252,8 +243,6 @@ public class BridgeWizardActivity extends AppCompatActivity { Log.d(getClass().getSimpleName(), String.format("bridgesEnabled=%b, bridgesList=%s", Prefs.bridgesEnabled(), Prefs.getBridgesList())); if (noBridgesSet()) { mBtDirect.setChecked(true); - } else if (Prefs.getBridgesList().equals("meek")) { - mBtMeek.setChecked(true); } else if (Prefs.getBridgesList().equals("obfs4")) { mBtObfs4.setChecked(true); } else if (Prefs.getBridgesList().equals("snowflake")) { diff --git a/app/src/main/res/layout/content_bridge_wizard.xml b/app/src/main/res/layout/content_bridge_wizard.xml index d5bdea3d..6dbca868 100644 --- a/app/src/main/res/layout/content_bridge_wizard.xml +++ b/app/src/main/res/layout/content_bridge_wizard.xml @@ -51,12 +51,14 @@ android:layout_margin="12dp" android:text="@string/bridge_community" /> +  <RadioButton android:id="@+id/btnBridgesSnowflake"

1 0

[orbot/master] Translated using Weblate (Ukrainian)
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 376b972330c038c4547081dcce4db4b30d85eeaa Author: Ihor Hordiichuk <igor_ck(a)outlook.com> Date: Fri Apr 9 15:26:56 2021 +0200 Translated using Weblate (Ukrainian) Currently translated at 100.0% (19 of 19 strings) Translated using Weblate (Ukrainian) Currently translated at 100.0% (220 of 220 strings) Translated using Weblate (Ukrainian) Currently translated at 100.0% (19 of 19 strings) Translated using Weblate (Ukrainian) Currently translated at 100.0% (220 of 220 strings) Co-authored-by: Ihor Hordiichuk <igor_ck(a)outlook.com> Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot-metadata/uk/ Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/uk/ Translation: Guardian Project/Orbot Translation: Guardian Project/Orbot metadata --- app/src/main/res/values-uk/strings.xml | 23 +++++++++++++++++++--- .../metadata/android/uk/changelogs/1641200200.txt | 4 ++++ fastlane/metadata/android/uk/full_description.txt | 12 ++++------- 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 60e9adbf..85560c09 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_description">Orbot â ÑÐµ Ð²ÑÐ»ÑÐœÐ° Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐ° ÐŽÐ»Ñ Ð¿ÑÐŸÐºÑÑ-Ð·\'ÑÐŽÐœÐ°ÐœÑ, ÑÐºÐ° ÐŽÐŸÐ·Ð²ÐŸÐ»ÑÑ ÑÐœÑÐžÐŒ ÐŽÐŸÐŽÐ°ÑÐºÐ°ÐŒ Ð±ÐµÐ·Ð¿ÐµÑÐœÑÑÐµ Ð²ÐžÐºÐŸÑÐžÑÑÐŸÐ²ÑÐ²Ð°ÑÐž ÑÐœÑÐµÑÐœÐµÑ-Ð·\'ÑÐŽÐœÐ°ÐœÐœÑ. Orbot Ð²ÐžÐºÐŸÑÐžÑÑÐŸÐ²ÑÑ Tor ÐŽÐ»Ñ ÑÐžÑÑÑÐ²Ð°ÐœÐœÑ ÑÐœÑÐµÑÐœÐµÑ-ÑÑÐ°ÑÑÐºÑ, ÑÐºÐžÐ¹ ÐŽÐ°Ð»Ñ Ð¿ÑÐžÑÐŸÐ²ÑÑÑÑÑÑ Ð¿ÑÐŽ ÑÐ°Ñ Ð¿ÐµÑÐµÑÐžÐ»Ð°ÐœÐœÑ ÑÐµÑÐµÐ· ÐºÑÐ»ÑÐºÐ° ÐºÐŸÐŒÐ¿\'ÑÑÐµÑÑÐ² Ñ ÑÑÐ·ÐœÐžÑ ÑÐ°ÑÑÐžÐœÐ°Ñ Ð¿Ð»Ð°ÐœÐµÑÐž. Tor Ñ Ð²ÑÐ»ÑÐœÐžÐŒ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐœÐžÐŒ Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑÐµÐœÐœÑÐŒ, Ð° ÑÐ°ÐºÐŸÐ¶ Ð²ÑÐŽÐºÑÐžÑÐŸÑ ÐŒÐµÑÐµÐ¶ÐµÑ, ÑÐŸ ÐŽÐŸÐ¿ÐŸÐŒÐ°Ð³Ð°Ñ Ð·Ð°ÑÐžÑÑÐžÑÐžÑÑ Ð²ÑÐŽ ÐŒÐµÑÐµÐ¶ÐµÐ²ÐŸÐ³ÐŸ ÑÑÐµÐ¶ÐµÐœÐœÑ, ÑÐºÐµ Ð·Ð°Ð³ÑÐŸÐ¶ÑÑ ÐŸÑÐŸÐ±ÐžÑÑÑÐ¹ ÑÐ²ÐŸÐ±ÐŸÐŽÑ ÑÐ° Ð¿ÑÐžÐ²Ð°ÑÐœÐŸÐŒÑ Ð¶ÐžÑÑÑ, ÐºÐŸÐœÑÑÐŽÐµÐœÑÑÐ¹ÐœÑÐ¹ Ð±ÑÐ·ÐœÐµÑ-ÐŽÑÑÐ»ÑÐœÐŸÑÑÑ Ñ ÐºÐŸÐœÑÐ°ÐºÑÐ°ÐŒ, Ð° ÑÐ°ÐºÐŸÐ¶ ÐŽÐµÑÐ¶Ð°Ð²ÐœÐŸÑ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐž Ð±ÐµÐ·Ð¿ÐµÐºÐž, ÑÐŸ Ð²ÑÐŽÐŸÐŒÐ° ÑÐº Ð°ÐœÐ°Ð»ÑÐ· ÑÑÐ°ÑÑÐºÑ.</string> + <string name="app_description">Orbot â ÑÐµ Ð²ÑÐ»ÑÐœÐžÐ¹ Ð·Ð°ÑÑÐŸÑÑÐœÐŸÐº ÐŽÐ»Ñ Ð¿ÑÐŸÐºÑÑ-Ð·\'ÑÐŽÐœÐ°ÐœÑ, ÑÐºÐ° ÐŽÐŸÐ·Ð²ÐŸÐ»ÑÑ ÑÐœÑÐžÐŒ Ð·Ð°ÑÑÐŸÑÑÐœÐºÐ°ÐŒ Ð±ÐµÐ·Ð¿ÐµÑÐœÑÑÐµ Ð²ÐžÐºÐŸÑÐžÑÑÐŸÐ²ÑÐ²Ð°ÑÐž ÑÐœÑÐµÑÐœÐµÑ-Ð·\'ÑÐŽÐœÐ°ÐœÐœÑ. Orbot Ð²ÐžÐºÐŸÑÐžÑÑÐŸÐ²ÑÑ Tor ÐŽÐ»Ñ ÑÐžÑÑÑÐ²Ð°ÐœÐœÑ ÑÐœÑÐµÑÐœÐµÑ-ÑÑÐ°ÑÑÐºÑ, ÑÐºÐžÐ¹ ÐŽÐ°Ð»Ñ Ð¿ÑÐžÑÐŸÐ²ÑÑÑÑÑÑ Ð¿ÑÐŽ ÑÐ°Ñ Ð¿ÐµÑÐµÑÐžÐ»Ð°ÐœÐœÑ ÑÐµÑÐµÐ· ÐºÑÐ»ÑÐºÐ° ÐºÐŸÐŒÐ¿\'ÑÑÐµÑÑÐ² Ñ ÑÑÐ·ÐœÐžÑ ÑÐ°ÑÑÐžÐœÐ°Ñ Ð¿Ð»Ð°ÐœÐµÑÐž. Tor Ñ Ð²ÑÐ»ÑÐœÐžÐŒ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐœÐžÐŒ Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑÐµÐœÐœÑÐŒ, Ð° ÑÐ°ÐºÐŸÐ¶ Ð²ÑÐŽÐºÑÐžÑÐŸÑ ÐŒÐµÑÐµÐ¶ÐµÑ, ÑÐŸ ÐŽÐŸÐ¿ÐŸÐŒÐ°Ð³Ð°Ñ Ð·Ð°ÑÐžÑÑÐžÑÐžÑÑ Ð²ÑÐŽ ÐŒÐµÑÐµÐ¶ÐµÐ²ÐŸÐ³ÐŸ ÑÑÐµÐ¶ÐµÐœÐœÑ, ÑÐºÐµ Ð·Ð°Ð³ÑÐŸÐ¶ÑÑ ÐŸÑÐŸÐ±ÐžÑÑÑÐ¹ ÑÐ²ÐŸÐ±ÐŸÐŽÑ ÑÐ° Ð¿ÑÐžÐ²Ð°ÑÐœÐŸÐŒÑ Ð¶ÐžÑÑÑ, ÐºÐŸÐœÑÑÐŽÐµÐœÑÑÐ¹ÐœÑÐ¹ Ð±ÑÐ·ÐœÐµÑ-ÐŽÑÑÐ»ÑÐœÐŸÑÑÑ Ð¹ ÐºÐŸÐœÑÐ°ÐºÑÐ°ÐŒ, Ð° ÑÐ°ÐºÐŸÐ¶ ÐŽÐµÑÐ¶Ð°Ð²ÐœÐŸÑ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐž Ð±ÐµÐ·Ð¿Ð µÐºÐž, ÑÐŸ Ð²ÑÐŽÐŸÐŒÐ° ÑÐº Ð°ÐœÐ°Ð»ÑÐ· ÑÑÐ°ÑÑÐºÑ.</string> <string name="status_starting_up">ÐÐ°Ð¿ÑÑÐº OrbotâŠ</string> <string name="status_activated">ÐÑÐŽ\'ÑÐŽÐœÐ°ÐœÐžÐ¹ ÐŽÐŸ ÐŒÐµÑÐµÐ¶Ñ Tor</string> <string name="status_disabled">Â«OrbotÂ» Ð²ÑÐŽ\'ÑÐŽÐœÐ°ÐœÐžÐ¹</string> @@ -89,7 +89,7 @@ <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string> <string name="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string> <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string> - <string name="hidden_service_request">ÐÑÐŸÐ³ÑÐ°ÐŒÐ° ÑÐŸÑÐµ Ð²ÑÐŽÐºÑÐžÑÐž Ð¿ÑÐžÑÐŸÐ²Ð°ÐœÐžÐ¹ ÑÐµÑÐ²ÐµÑÐœÐžÐ¹ Ð¿ÐŸÑÑ %1$s Ñ ÐŒÐµÑÐµÐ¶Ñ Tor. ÐŠÐµ Ð±ÐµÐ·Ð¿ÐµÑÐœÐŸ, ÑÐºÑÐŸ Ð²Ðž ÐŽÐŸÐ²ÑÑÑÑÑÐµ Ð·Ð°ÑÑÐŸÑÑÐœÐºÑ.</string> + <string name="hidden_service_request">ÐÑÐŸÐ³ÑÐ°ÐŒÐ° ÑÐŸÑÐµ Ð²ÑÐŽÐºÑÐžÑÐž Ð¿ÑÐžÑÐŸÐ²Ð°ÐœÐžÐ¹ ÑÐµÑÐ²ÐµÑ ÐœÐ° Ð¿ÐŸÑÑÑ %1$s Ñ ÐŒÐµÑÐµÐ¶Ñ Tor. ÐŠÐµ Ð±ÐµÐ·Ð¿ÐµÑÐœÐŸ, ÑÐºÑÐŸ Ð²Ðž ÐŽÐŸÐ²ÑÑÑÑÑÐµ Ð·Ð°ÑÑÐŸÑÑÐœÐºÑ.</string> <string name="found_existing_tor_process">Ð·ÐœÐ°Ð¹ÐŽÐµÐœÐŸ ÐœÐ°ÑÐ²ÐœÐžÐ¹ Ð¿ÑÐŸÑÐµÑ TorâŠ</string> <string name="something_bad_happened">ÐÐžÐœÐžÐºÐ»Ð° ÑÐºÐ°ÑÑ Ð¿ÐŸÐŒÐžÐ»ÐºÐ°. ÐÐµÑÐµÐ²ÑÑÑÐµ Ð»ÐŸÐ³</string> <string name="unable_to_read_hidden_service_name">ÐœÐµÐŒÐŸÐ¶Ð»ÐžÐ²ÐŸ Ð¿ÑÐŸÑÐžÑÐ°ÑÐž ÑÐŒ\'Ñ Ð¿ÑÐžÑÐŸÐ²Ð°ÐœÐŸÑ ÑÐ»ÑÐ¶Ð±Ðž</string> @@ -132,7 +132,7 @@ <string name="done">ÐÑÐŸÐ±Ð»ÐµÐœÐŸ!</string> <string name="copy_address_to_clipboard">Ð¡ÐºÐŸÐ¿ÑÑÐ²Ð°ÑÐž Ð°ÐŽÑÐµÑÑ Ð² Ð±ÑÑÐµÑ ÐŸÐ±ÐŒÑÐœÑ</string> <string name="show_auth_cookie">ÐÐŸÐºÐ°Ð·Ð°ÑÐž Ð°Ð²ÑÐŸÑÐžÐ·Ð°ÑÑÑ ÑÐµÐ¿\'ÑÑÐºÑÐ²</string> - <string name="backup_service">Ð ÐµÐ·ÐµÑÐ²ÐœÐµ ÐºÐŸÐ¿ÑÑÐ²Ð°ÐœÐœÑ</string> + <string name="backup_service">Ð ÐµÐ·ÐµÑÐ²ÐœÐµ ÐºÐŸÐ¿ÑÑÐ²Ð°ÐœÐœÑ <i>(ÐÐŸÐ¿ÐµÑÐµÐŽÐ¶ÐµÐœÐœÑ: ÑÐµ ÐŒÐŸÐ¶Ðµ ÐœÐ°ÐŽÐ°ÑÐž ÐºÐŸÐœÑÑÐ³ÑÑÐ°ÑÑÑ Ð²Ð°ÑÐŸÑ ÑÐ»ÑÐ¶Ð±Ðž ÑÐœÑÐžÐŒ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐ°ÐŒ)</i></string> <string name="delete_service">ÐÐžÐ»ÑÑÐžÑÐž Ð¡ÐµÑÐ²ÑÑ</string> <string name="backup_saved_at_external_storage">Ð ÐµÐ·ÐµÑÐ²ÐœÐ° ÐºÐŸÐ¿ÑÑ Ð·Ð±ÐµÑÐµÐ¶ÐµÐœÐ° ÐœÐ° Ð·ÐŸÐ²ÐœÑÑÐœÑÐ¹ Ð¿Ð°ÐŒ\'ÑÑÑ</string> <string name="backup_restored">Ð ÐµÐ·ÐµÑÐ²ÐœÐµ ÐºÐŸÐ¿ÑÑÐ²Ð°ÐœÐœÑ Ð²ÑÐŽÐœÐŸÐ²Ð»ÐµÐœÐŸ</string> @@ -211,4 +211,21 @@ <string name="pref_reduced_circuit_padding">Ð¡ÐºÐŸÑÐŸÑÐµÐœÐµ Ð·Ð°Ð¿ÐŸÐ²ÐœÐµÐœÐœÑ Ð»Ð°ÐœÑÑÐ¶ÐºÐ°</string> <string name="pref_circuit_padding_summary">Ð£Ð²ÑÐŒÐºÐœÑÑÐž Ð·Ð°Ð¿ÐŸÐ²ÐœÐµÐœÐœÑ Ð»Ð°ÐœÑÑÐ¶ÐºÐ° ÐŽÐ»Ñ Ð·Ð°ÑÐžÑÑÑ Ð²ÑÐŽ ÐŽÐµÑÐºÐžÑ ÑÐŸÑÐŒ Ð°ÐœÐ°Ð»ÑÐ·Ñ ÑÑÐ°ÑÑÐºÑ</string> <string name="pref_circuit_padding">ÐÐ°Ð¿ÐŸÐ²ÐœÐµÐœÐœÑ Ð»Ð°ÐœÑÑÐ¶ÐºÐ°</string> + <string name="be_a_snowflake_desc">ÐÐŸÐ·Ð²ÐŸÐ»ÐžÑÐž ÑÐœÑÐžÐŒ ÐºÐŸÑÐžÑÑÑÐ²Ð°ÑÐ°ÐŒ Tor Ð¿ÑÐŽÐºÐ»ÑÑÐ°ÑÐžÑÑ ÐŽÐŸ Tor ÑÐµÑÐµÐ· Ð²Ð°Ñ Ð¿ÑÐžÑÑÑÑÐ¹</string> + <string name="be_a_snowflake_title">ÐÐ°Ð¿ÑÑÐº Ð¿ÑÐŸÐºÑÑ-ÑÐµÑÐ²ÐµÑÐ° Snowflake</string> + <string name="confirm">Ð¡ÑÐ²Ð°Ð»ÐžÑÐž</string> + <string name="v3_import_auth_private">ÐÐŒÐ¿ÐŸÑÑ .auth_private</string> + <string name="v3_backup_name_hint">ÐÐ°Ð·Ð²Ð° ÑÐ°Ð¹Ð»Ñ ÑÐµÐ·ÐµÑÐ²ÐœÐŸÑ ÐºÐŸÐ¿ÑÑâŠ</string> + <string name="v3_delete_client_authorization_confirm">ÐÐžÐŽÐ°Ð»ÐžÑÐž Ð°Ð²ÑÐŸÑÐžÐ·Ð°ÑÑÑ ÐºÐ»ÑÑÐœÑÐ°</string> + <string name="v3_delete_client_authorization">ÐÐžÐŽÐ°Ð»ÐžÑÐž ÐºÐ»ÑÑ Ð°Ð²ÑÐŸÑÐžÐ·Ð°ÑÑÑ ÐºÐ»ÑÑÐœÑÐ°</string> + <string name="v3_backup_key_warning">ÐÐŸÐ¿ÐµÑÐµÐŽÐ¶ÐµÐœÐœÑ. ÐŠÐµ ÐŒÐŸÐ¶Ðµ Ð²ÑÐŽÐºÑÐžÑÐž Ð²Ð°Ñ ÐºÐ»ÑÑ ÐŽÐ»Ñ ÑÐœÑÐžÑ Ð¿ÑÐŸÐ³ÑÐ°ÐŒ</string> + <string name="v3_backup_key">Ð ÐµÐ·ÐµÑÐ²ÐœÐµ ÐºÐŸÐ¿ÑÑÐ²Ð°ÐœÐœÑ ÐºÐ»ÑÑÐ° Ð°Ð²ÑÐŸÑÐžÐ·Ð°ÑÑÑ ÐºÐ»ÑÑÐœÑÐ°</string> + <string name="v3_onion">ÐÐŸÐŒÐµÐœ .onion v3</string> + <string name="v3_key_hash">x25519 ÐÐ°ÐºÑÐžÑÐžÐ¹ ÐºÐ»ÑÑ Ñ Ð±Ð°Ð·Ñ 32</string> + <string name="v3_client_auth_activity_title">ÐÐ²ÑÐŸÑÐžÐ·Ð°ÑÑÑ ÐºÐ»ÑÑÐœÑÐ° v3</string> + <string name="v3_client_auth">ÐÐ²ÑÐŸÑÐžÐ·Ð°ÑÑÑ ÐºÐ»ÑÑÐœÑÐ° ÑÐ»ÑÐ¶Ð±Ðž Onion v3</string> + <string name="v3_hosted_services">Ð¥ÐŸÑÑÐžÐœÐ³ ÑÐ»ÑÐ¶Ð± Onion v3</string> + <string name="v2_hidden_services">Ð¡Ð»ÑÐ¶Ð±Ðž Onion v2 (Ð·Ð°ÑÑÐ°ÑÑÐ»Ñ)</string> + <string name="deny">ÐÐ°Ð±ÐŸÑÐŸÐœÐžÑÐž</string> + <string name="allow">ÐÐ»Ð·Ð²ÐŸÐ»ÐžÑÐž</string> </resources> \ No newline at end of file diff --git a/fastlane/metadata/android/uk/changelogs/1641200200.txt b/fastlane/metadata/android/uk/changelogs/1641200200.txt new file mode 100644 index 00000000..658f609a --- /dev/null +++ b/fastlane/metadata/android/uk/changelogs/1641200200.txt @@ -0,0 +1,4 @@ +* Ð¿ÑÐŽÑÑÐžÐŒÐºÐ° OnionServices v3 +* Ð²ÐŽÐŸÑÐºÐŸÐœÐ°Ð»ÐµÐœÐœÑ ÐºÐŸÐœÑÑÐ³ÑÑÐ°ÑÑÑ ÐŒÐŸÑÑÑ +* Ð³Ð°ÑÐ°ÐœÑÑÑ, ÑÐŸ ÑÐµÐ¶ÐžÐŒ VPN ÑÐŸÐ·Ð³Ð»ÑÐŽÐ°ÑÑÑÑÑ ÑÐº "ÐœÐµÐŸÐ±Ð»ÑÐºÐŸÐ²Ð°ÐœÐžÐ¹ Ð·Ð²'ÑÐ·ÐŸÐº" +* ÐµÐºÑÐ¿ÐµÑÐžÐŒÐµÐœÑÐ°Ð»ÑÐœÐžÐ¹ ÑÐµÐ¶ÐžÐŒ, ÑÐŸÐ± ÑÐ²ÑÐŒÐºÐœÑÑÐž ÑÐŸÐ±ÐŸÑÑ Ð¿ÑÐŸÐºÑÑ Snowflake diff --git a/fastlane/metadata/android/uk/full_description.txt b/fastlane/metadata/android/uk/full_description.txt index 652e030f..6de24343 100644 --- a/fastlane/metadata/android/uk/full_description.txt +++ b/fastlane/metadata/android/uk/full_description.txt @@ -1,21 +1,17 @@ -Orbot â ÑÐµ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐœÐžÐ¹ Ð¿ÑÐŸÐºÑÑ-Ð·Ð°ÑÑÐŸÑÑÐœÐŸÐº, ÑÐºÐžÐ¹ ÐŽÐ°Ñ ÐŒÐŸÐ¶Ð»ÐžÐ²ÑÑÑÑ ÑÐœÑÐžÐŒ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐ°ÐŒ Ð±ÐµÐ·Ð¿ÐµÑÐœÑÑÐµ ÐºÐŸÑÐžÑÑÑÐ²Ð°ÑÐžÑÑ ÐÐœÑÐµÑÐœÐµÑÐŸÐŒ. Orbot Ð²ÐžÐºÐŸÑÐžÑÑÐŸÐ²ÑÑ Tor ÐŽÐ»Ñ ÑÐžÑÑÑÐ²Ð°ÐœÐœÑ Ð²Ð°ÑÐŸÐ³ÐŸ ÑÐœÑÐµÑÐœÐµÑ-ÑÑÐ°ÑÑÐºÑ, Ð° Ð¿ÐŸÑÑÐŒ Ð¿ÑÐžÑÐŸÐ²ÑÑ Ð¹ÐŸÐ³ÐŸ, Ð¿ÐµÑÐµÑÑÑÐžÐ±ÑÑÑÐž ÑÐµÑÐµÐ· ÑÐµÑÑÑ ÐºÐŸÐŒÐ¿'ÑÑÐµÑÑÐ² Ð¿ÐŸ Ð²ÑÑÐŸÐŒÑ ÑÐ²ÑÑÑ. Tor â ÑÐµ Ð²ÑÐ»ÑÐœÐµ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐœÐµ Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑÐµÐœÐœÑ ÑÐ° Ð²ÑÐŽÐºÑÐžÑÐ° ÐŒÐµÑÐµÐ¶Ð°, ÑÐºÐ° ÐŽÐŸÐ¿ÐŸÐŒÐ°Ð³Ð°Ñ Ð·Ð°ÑÐžÑÑÐžÑÐžÑÑ Ð²ÑÐŽ ÑÐŸÑÐŒÐž ÐŒÐµÑÐµÐ¶ÐœÐŸÐ³ÐŸ ÑÐ¿ÐŸÑÑÐµÑÐµÐ¶ÐµÐœÐœÑ, ÑÐºÐ° Ð·Ð°Ð³ÑÐŸÐ¶ÑÑ ÐŸÑÐŸÐ±ÐžÑÑÑÐ¹ ÑÐ²ÐŸÐ±ÐŸÐŽÑ ÑÐ° Ð¿ÑÐžÐ²Ð°ÑÐœÐŸÑÑÑ, ÐºÐŸÐœÑÑÐŽÐµÐœÑÑÐ¹ÐœÑÐ¹ ÐŽÑÐ»ÐŸÐ²ÑÐ¹ ÐŽÑÑÐ»ÑÐœÐŸÑÑÑ ÑÐ° ÑÑÐŸÑÑÐœÐºÐ°ÐŒ, Ð° ÑÐ°ÐºÐŸÐ¶ ÐŽÐµÑÐ¶Ð°Ð²ÐœÑÐ¹ Ð±ÐµÐ·Ð¿ÐµÑÑ, Ð²ÑÐŽÐŸÐŒÑÐ¹ ÑÐº Ð°ÐœÐ°Ð»ÑÐ· ÑÑÐ°ÑÑÐºÑ. +Orbot â ÑÐµ Ð²ÑÐ»ÑÐœÐžÐ¹ Ð¿ÑÐŸÐºÑÑ-Ð·Ð°ÑÑÐŸÑÑÐœÐŸÐº, ÑÐºÐžÐ¹ ÐŽÐ°Ñ ÐŒÐŸÐ¶Ð»ÐžÐ²ÑÑÑÑ ÑÐœÑÐžÐŒ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐ°ÐŒ Ð±ÐµÐ·Ð¿ÐµÑÐœÑÑÐµ ÐºÐŸÑÐžÑÑÑÐ²Ð°ÑÐžÑÑ ÐÐœÑÐµÑÐœÐµÑÐŸÐŒ. Orbot Ð²ÐžÐºÐŸÑÐžÑÑÐŸÐ²ÑÑ Tor ÐŽÐ»Ñ ÑÐžÑÑÑÐ²Ð°ÐœÐœÑ Ð²Ð°ÑÐŸÐ³ÐŸ ÑÐœÑÐµÑÐœÐµÑ-ÑÑÐ°ÑÑÐºÑ, Ð° Ð¿ÐŸÑÑÐŒ Ð¿ÑÐžÑÐŸÐ²ÑÑ Ð¹ÐŸÐ³ÐŸ, Ð¿ÐµÑÐµÑÑÑÐžÐ±ÑÑÑÐž ÑÐµÑÐµÐ· ÑÐµÑÑÑ ÐºÐŸÐŒÐ¿'ÑÑÐµÑÑÐ² Ð¿ÐŸ Ð²ÑÑÐŸÐŒÑ ÑÐ²ÑÑÑ. Tor â ÑÐµ Ð²ÑÐ»ÑÐœÐµ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐœÐµ Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑÐµÐœÐœÑ ÑÐ° Ð²ÑÐŽÐºÑÐžÑÐ° ÐŒÐµÑÐµÐ¶Ð°, ÑÐºÐ° ÐŽÐŸÐ¿ÐŸÐŒÐ°Ð³Ð°Ñ Ð·Ð°ÑÐžÑÑÐžÑÐžÑÑ Ð²ÑÐŽ ÑÐŸÑÐŒÐž ÐŒÐµÑÐµÐ¶ÐœÐŸÐ³ÐŸ ÑÐ¿ÐŸÑÑÐµÑÐµÐ¶ÐµÐœÐœÑ, ÑÐºÐ° Ð·Ð°Ð³ÑÐŸÐ¶ÑÑ ÐŸÑÐŸÐ±ÐžÑÑÑÐ¹ ÑÐ²ÐŸÐ±ÐŸÐŽÑ ÑÐ° Ð¿ÑÐžÐ²Ð°ÑÐœÐŸÑÑÑ, ÐºÐŸÐœÑÑÐŽÐµÐœÑÑÐ¹ÐœÑÐ¹ ÐŽÑÐ»ÐŸÐ²ÑÐ¹ ÐŽÑÑÐ»ÑÐœÐŸÑÑÑ ÑÐ° ÑÑÐŸÑÑÐœÐºÐ°ÐŒ, Ð° ÑÐ°ÐºÐŸÐ¶ ÐŽÐµÑÐ¶Ð°Ð²ÐœÑÐ¹ Ð±ÐµÐ·Ð¿ÐµÑÑ, Ð²ÑÐŽÐŸÐŒÑÐ¹ ÑÐº Ð°ÐœÐ°Ð»ÑÐ· ÑÑÐ°ÑÑÐºÑ. -*** ÐÐÐ ÐÐ¡Ð¢Ð£ÐÐÐ§Ð SAMSUNG GALAXY *** -ÐÐ° ÐŽÐµÑÐºÐžÑ Ð¿ÑÐžÑÑÑÐŸÑÑ Ð·Ð°ÑÑÐŸÑÑÐœÐŸÐº Samsung ÐºÐŸÑÐžÑÑÑÑÑÑÑÑ ÑÐžÐŒ ÑÐ°ÐŒÐžÐŒ ÐŒÐµÑÐµÐ¶ÐœÐžÐŒ Ð¿ÐŸÑÑÐŸÐŒ ÑÐŸ Ð¹ Orbot. ÐÐ°Ð²Ð°ÐœÑÐ°Ð¶ÑÐµ 'SockStat' Ð· Google Play. ÐÐœÐ°Ð¹ÐŽÑÑÑ Ð¿ÐŸÑÑ 9050 Ñ Ð·Ð°ÑÑÐŸÑÑÐœÐºÑ. ÐÑÐžÐŒÑÑÐŸÐ²ÐŸ Ð·ÑÐ¿ÐžÐœÑÑÑ Ñ Ð²ÐžÐŒÐºÐœÑÑÑ ÑÑ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÑ. ÐÐž ÑÐ°ÐºÐŸÐ¶ ÐŒÐŸÐ¶ÐµÑÐµ ÑÐ¿ÑÐŸÐ±ÑÐ²Ð°ÑÐž Ð·ÐŒÑÐœÐžÑÐž ÐœÐ°Ð»Ð°ÑÑÑÐ²Ð°ÐœÐœÑ Orbot "Tor SOCKS" Ð² ÑÐŸÐ·ÐŽÑÐ»Ñ ÐÐœÐµÐ²Ð°ÐŽÐ¶ÐµÐœÐœÑ ÐœÐ° 9051 Ð°Ð±ÐŸ AUTO. ÐÐž ÐŒÐŸÐ¶ÐµÑÐµ Ð¿ÐŸÐ±Ð°ÑÐžÑÐž Ð²ÐžÐ¿ÑÐ°Ð²Ð»ÐµÐœÐœÑ Ð² ÑÑÐŸÐŒÑ Ð²ÑÐŽÐµÐŸ: video: https://www.youtube.com/watch?v=yK-nK4F67_g -***** +Orbot Ñ ÑÐŽÐžÐœÐžÐŒ Ð·Ð°ÑÑÐŸÑÑÐœÐºÐŸÐŒ, ÑÐºÐžÐ¹ ÑÑÐ²ÐŸÑÑÑ ÐŽÑÐ¹ÑÐœÐŸ Ð¿ÑÐžÐ²Ð°ÑÐœÐµ Ð·'ÑÐŽÐœÐ°ÐœÐœÑ Ð· ÐÐœÑÐµÑÐœÐµÑÐŸÐŒ. Ð¯Ðº Ð¿ÐžÑÐµ New York Times, "ÐºÐŸÐ»Ðž Ð·Ð²'ÑÐ·ÐŸÐº Ð¿ÑÐžÐ±ÑÐ²Ð°Ñ Ð· Tor, Ð²Ðž ÐœÑÐºÐŸÐ»Ðž ÐœÐµ ÐŒÐŸÐ¶ÐµÑÐµ Ð·ÐœÐ°ÑÐž, Ð·Ð²ÑÐŽÐºÐž Ð²ÑÐœ ÑÐ° Ð²ÑÐŽ ÐºÐŸÐ³ÐŸ". -Orbot Ñ ÑÐŽÐžÐœÐžÐŒ Ð·Ð°ÑÑÐŸÑÑÐœÐºÐŸÐŒ, ÑÐºÐžÐ¹ ÑÑÐ²ÐŸÑÑÑ ÐŽÑÐ¹ÑÐœÐŸ Ð¿ÑÐžÐ²Ð°ÑÐœÐµ Ð·'ÑÐŽÐœÐ°ÐœÐœÑ Ð· ÐÐœÑÐµÑÐœÐµÑÐŸÐŒ. Ð¯Ðº Ð¿ÐžÑÐµ New York Times, "ÐºÐŸÐ»Ðž Ð·Ð²'ÑÐ·ÐŸÐº Ð¿ÑÐžÐ±ÑÐ²Ð°Ñ Ð· Tor, Ð²Ðž ÐœÑÐºÐŸÐ»Ðž ÐœÐµ ÐŒÐŸÐ¶ÐµÑÐµ Ð·ÐœÐ°ÑÐž, Ð·Ð²ÑÐŽÐºÐž Ð²ÑÐœ ÑÐ° Ð²ÑÐŽ ÐºÐŸÐ³ÐŸ". Tor ÐŸÑÑÐžÐŒÐ°Ð² ÐœÐ°Ð³ÐŸÑÐŸÐŽÑ 2012 Electronic Frontier Foundation (EFF) Pioneer Award. +Tor ÐŸÑÑÐžÐŒÐ°Ð² ÐœÐ°Ð³ÐŸÑÐŸÐŽÑ 2012 Electronic Frontier Foundation (EFF) Pioneer Award. â ÐÐ ÐÐ ÐÐÐÐ¯Ð¢Ð¢Ð¯ ÐÐÐÐÐÐÐÐÐÐ: Orbot Ñ ÐœÐ°Ð¹Ð±ÐµÐ·Ð¿ÐµÑÐœÑÑÐžÐŒ ÑÐ¿ÐŸÑÐŸÐ±ÐŸÐŒ Ð²ÐžÐºÐŸÑÐžÑÑÐ°ÐœÐœÑ ÐÐœÑÐµÑÐœÐµÑÑ ÐœÐ° Android. ÐÐµÑÑÐŸÐŽ. Orbot ÐºÑÐ»ÑÐºÐ° ÑÐ°Ð·ÑÐ² Ð¿ÐµÑÐµÑÑÑÐžÐ±ÑÑ ÑÐ· Ð·Ð°ÑÐžÑÑÐŸÐ²Ð°ÐœÐžÐŒ ÑÑÐ°ÑÑÐºÐŸÐŒ ÑÐµÑÐµÐ· ÑÑÐ·ÐœÑ ÐºÐŸÐŒÐ¿'ÑÑÐµÑÐž Ð¿ÐŸ Ð²ÑÑÐŸÐŒÑ ÑÐ²ÑÑÑ, Ð·Ð°ÐŒÑÑÑÑ ÑÐŸÐ³ÐŸ, ÑÐŸÐ± Ð·'ÑÐŽÐœÐ°ÑÐž Ð²Ð°Ñ Ð±ÐµÐ·Ð¿ÐŸÑÐµÑÐµÐŽÐœÑÐŸ, ÑÐº VPN Ñ Ð¿ÑÐŸÐºÑÑ. ÐŠÐµÐ¹ Ð¿ÑÐŸÑÐµÑ ÐŽÐµÑÐŸ ÑÑÐžÐ²Ð°Ð»ÑÑÐžÐ¹, Ð°Ð»Ðµ ÐœÐ°Ð¹ÐºÑÐ°ÑÐžÐ¹ Ð·Ð°ÑÐžÑÑ Ð¿ÑÐžÐ²Ð°ÑÐœÐŸÑÑÐž ÑÐ° ÑÐŽÐµÐœÑÐžÑÐœÐŸÑÑÐž Ð²Ð°ÑÑÐžÐ¹ ÐŸÑÑÐºÑÐ²Ð°ÐœÐœÑ. â ÐÐ ÐÐÐÐ¢ÐÐÐ¡Ð¢Ð¬ ÐÐÐ¯ ÐÐÐ¡Ð¢ÐÐ¡Ð£ÐÐÐÐ: ÐÑÐŽÑ-ÑÐºÐ° Ð²ÑÑÐ°ÐœÐŸÐ²Ð»ÐµÐœÐ° Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐ° ÐŒÐŸÐ¶Ðµ Ð²ÐžÐºÐŸÑÐžÑÑÐŸÐ²ÑÐ²Ð°ÑÐž Tor, ÑÐºÑÐŸ Ð²ÐŸÐœÐ° ÐŒÐ°Ñ ÑÑÐœÐºÑÑÑ Ð¿ÑÐŸÐºÑÑ, Ð²ÐžÐºÐŸÑÐžÑÑÐŸÐ²ÑÑÑÐž ÐœÐ°Ð»Ð°ÑÑÑÐ²Ð°ÐœÐœÑ, Ð·ÐœÐ°Ð¹ÐŽÐµÐœÑ ÑÑÑ: https://goo.gl/2OA1y ÐÐŸÑÐžÑÑÑÐ¹ÑÐµÑÑ Orbot Ð· Twitter Ð°Ð±ÐŸ ÑÐ¿ÑÐŸÐ±ÑÐ¹ÑÐµ Ð¿ÑÐžÐ²Ð°ÑÐœÐžÐ¹ Ð¿ÐŸÑÑÐº Ð² ÐÐœÑÐµÑÐœÐµÑÑ Ð· DuckDuckGo: https://goo.gl/lgh1p â ÐÐ ÐÐÐÐ¢ÐÐÐ¡Ð¢Ð¬ ÐÐÐ¯ ÐÐ¡ÐÐ¥: Tor ÐŒÐŸÐ¶Ðµ ÐŽÐŸÐ¿ÐŸÐŒÐŸÐ³ÑÐž Ð²Ð°ÐŒ ÐºÐŸÐœÑÑÐŽÐµÐœÑÑÐ¹ÐœÐŸ ÐŽÐŸÑÐ»ÑÐŽÐ¶ÑÐ²Ð°ÑÐž ÐºÐŸÐœÐºÑÑÐµÐœÑÐ°, ÐŸÐ±ÑÐ¹ÑÐž Ð±Ð»ÐŸÐºÑÐ²Ð°ÐœÐœÑ Facebook Ð² ÑÐºÐŸÐ»Ñ Ð°Ð±ÐŸ ÐŸÐ±ÑÐ¹ÑÐž Ð±ÑÐ°ÐœÐŽÐŒÐ°ÑÐµÑ, ÑÐŸÐ± ÐŽÐžÐ²ÐžÑÐžÑÑ ÑÐ¿ÐŸÑÑ ÐœÐ° ÑÐŸÐ±ÐŸÑÑ. -â ÐÐ ÐÐÐÐ¢ÐÐÐ¡Ð¢Ð¬ ÐÐÐÐÐ: ÐÐ·ÐœÐ°Ð¹ÐŸÐŒÑÐµÑÑ Ð· ÐœÐ°ÑÐžÐŒÐž Ð²ÐµÑÐµÐ»ÐžÐŒÐž, ÑÐœÑÐµÑÐ°ÐºÑÐžÐ²ÐœÐžÐŒÐž Ð¿ÑÐŸÐ³ÑÐ»ÑÐœÐºÐ°ÐŒÐž: https://guardianproject.info/howto/browsefreely -â ÐŠÐ ÐÐ€ÐÐŠÐÐÐÐ: ÐŠÐµ ÐŸÑÑÑÑÐ¹ÐœÐ° Ð²ÐµÑÑÑÑ ÑÐ»ÑÐ¶Ð±Ðž ÐŒÐ°ÑÑÑÑÑÐžÐ·Ð°ÑÑÑ onion Tor ÐŽÐ»Ñ Android. ***ÐÐž Ð»ÑÐ±ÐžÐŒÐŸ Ð²ÑÐŽÐ³ÑÐºÐž*** â ÐÐ Ð ÐÐÐ¡: Guardian Project â ÑÐµ Ð³ÑÑÐ¿Ð° ÑÐŸÐ·ÑÐŸÐ±ÐœÐžÐºÑÐ², ÑÐºÑ ÑÐŸÐ±Ð»ÑÑÑ Ð±ÐµÐ·Ð¿ÐµÑÐœÑ ÐŒÐŸÐ±ÑÐ»ÑÐœÑ Ð·Ð°ÑÑÐŸÑÑÐœÐºÐž ÑÐ° Ð²ÑÐŽÐºÑÐžÑÐžÐ¹ ÐºÐŸÐŽ ÐŽÐ»Ñ ÐºÑÐ°ÑÐŸÐ³ÐŸ Ð·Ð°Ð²ÑÑÐ°. â OPEN-SOURCE: Orbot â ÑÐµ Ð²ÑÐ»ÑÐœÐµ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐœÐµ Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑÐµÐœÐœÑ. ÐÐŸÐ³Ð»ÑÐœÑÑÐµ ÐœÐ° ÐœÐ°Ñ ÐŽÐ¶ÐµÑÐµÐ»ÑÐœÐžÐ¹ ÐºÐŸÐŽ Ð°Ð±ÐŸ Ð¿ÑÐžÑÐŽÐœÑÐ¹ÑÐµÑÑ ÐŽÐŸ ÑÐ¿ÑÐ»ÑÐœÐŸÑÐž, ÑÐŸÐ± Ð¿ÐŸÐ»ÑÐ¿ÑÐžÑÐž Ð¹ÐŸÐ³ÐŸ: https://gitweb.torproject.org/orbot.git â ÐÐÐÐÐÐšÐÐ¢Ð¬ ÐÐÐ: ÐÐ°ÐŒ Ð±ÑÐ°ÐºÑÑ ÑÐ»ÑÐ±Ð»ÐµÐœÐŸÑ ÑÑÐœÐºÑÑÑ? ÐÐœÐ°Ð¹ÑÐ»Ðž Ð¿ÑÐžÐºÑÑ Ð²Ð°ÐŽÑ? ÐÐž ÑÐŸÑÑÐ»Ðž Ð± Ð¿ÐŸÑÑÑÐž Ð¿ÑÐŸ ÑÐµ Ð²ÑÐŽ Ð²Ð°Ñ! ÐÐ°ÐŽÑÑÐ»ÑÑÑ ÐœÐ°ÐŒ Ð»ÐžÑÑÐ°: support(a)guardianproject.info -***ÐÑÐŽÐŒÐŸÐ²Ð° Ð²ÑÐŽ Ð²ÑÐŽÐ¿ÐŸÐ²ÑÐŽÐ°Ð»ÑÐœÐŸÑÑÐž*** +***ÐÐ°ÑÑÐµÑÐµÐ¶ÐµÐœÐœÑ*** ÐÑÐŸÑÐºÑ Guardian ÑÑÐ²ÐŸÑÑÑ Ð·Ð°ÑÑÐŸÑÑÐœÐºÐž, Ð¿ÑÐžÐ·ÐœÐ°ÑÐµÐœÑ ÐŽÐ»Ñ Ð·Ð°ÑÐžÑÑÑ Ð²Ð°ÑÐŸÑ Ð±ÐµÐ·Ð¿ÐµÐºÐž ÑÐ° Ð°ÐœÐŸÐœÑÐŒÐœÐŸÑÑÑ. ÐÑÐŸÑÐŸÐºÐŸÐ»Ðž, ÑÐºÑ ÐŒÐž Ð²ÐžÐºÐŸÑÐžÑÑÐŸÐ²ÑÑÐŒÐŸ, ÑÐžÑÐŸÐºÐŸ ÑÐŸÐ·Ð³Ð»ÑÐŽÐ°ÑÑÑÑÑ ÑÐº ÑÑÐ°Ðœ ÐŒÐžÑÑÐµÑÑÐ²Ð° Ð² ÑÐµÑÐœÐŸÐ»ÐŸÐ³ÑÑ Ð±ÐµÐ·Ð¿ÐµÐºÐž. Ð¥ÐŸÑÐ° ÐŒÐž Ð¿ÐŸÑÑÑÐ¹ÐœÐŸ ÐŸÐœÐŸÐ²Ð»ÑÑÐŒÐŸ ÐœÐ°ÑÐµ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐœÐµ Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑÐµÐœÐœÑ ÐŽÐ»Ñ Ð±ÐŸÑÐŸÑÑÐ±Ðž Ð· ÐŸÑÑÐ°ÐœÐœÑÐŒÐž Ð·Ð°Ð³ÑÐŸÐ·Ð°ÐŒÐž ÑÐ° ÑÑÑÐœÐµÐœÐœÑÐŒ Ð²Ð°ÐŽ, Ð¶ÐŸÐŽÐœÐ° ÑÐµÑÐœÐŸÐ»ÐŸÐ³ÑÑ ÐœÐµ Ñ 100% Ð¿ÐŸÐ·Ð±Ð°Ð²Ð»ÐµÐœÐŸÑ ÐœÐµÐŽÐŸÐ»ÑÐºÑÐ². ÐÐ»Ñ ÐŒÐ°ÐºÑÐžÐŒÐ°Ð»ÑÐœÐŸÑ Ð±ÐµÐ·Ð¿ÐµÐºÐž ÑÐ° Ð°ÐœÐŸÐœÑÐŒÐœÐŸÑÑÑ ÐºÐŸÑÐžÑÑÑÐ²Ð°ÑÑ Ð¿ÐŸÐ²ÐžÐœÐœÑ Ð²ÐžÐºÐŸÑÐžÑÑÐŸÐ²ÑÐ²Ð°ÑÐž ÐºÑÐ°ÑÑ Ð¿ÑÐ°ÐºÑÐžÐºÐž, ÑÐŸÐ± Ð±ÑÑÐž Ð² Ð±ÐµÐ·Ð¿ÐµÑÑ. ÐÐž ÐŒÐŸÐ¶ÐµÑÐµ Ð·ÐœÐ°Ð¹ÑÐž ÑÐŸÑÐŸÑÐžÐ¹ Ð¿ÐŸÑÑÐ±ÐœÐžÐº ÐŸÑÐœÐŸÐ² ÑÐžÑ ÑÐµÐŒ ÐœÐ° https://securityinabox.org

1 0

[orbot/master] Translated using Weblate (German)
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit af0e1173a4fae2b0a0dac1dd7373edc8d925358a Author: nautilusx <translate(a)disroot.org> Date: Fri Apr 9 15:26:56 2021 +0200 Translated using Weblate (German) Currently translated at 82.2% (181 of 220 strings) Co-authored-by: nautilusx <translate(a)disroot.org> Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/de/ Translation: Guardian Project/Orbot --- app/src/main/res/values-de/strings.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 5bc1b7a3..cb2d6016 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -19,7 +19,7 @@ <string name="menu_share_bridge">BrückenQR teilen</string>  <string name="wizard_details">Nähere Informationen zu Orbot</string> - <string name="wizard_details_msg">Orbot ist eine quelloffene Anwendung, die Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent und Polipo enthält. Sie stellt einen lokalen HTTP-Proxy (Port: 8118) und einen SOCKS-Proxy (Port: 9050) in das Tor-Netzwerk bereit. Auf gerooteten Geräten kann Orbot auch sämtliche Internetverbindungen durch Tor leiten.</string> + <string name="wizard_details_msg">Orbot ist eine quelloffene Anwendung, die Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent enthält. Sie stellt einen lokalen HTTP-Proxy (Port: 8118) und einen SOCKS-Proxy (Port: 9050) in das Tor-Netzwerk bereit. Auf gerooteten Geräten kann Orbot auch sämtliche Internetverbindungen durch Tor leiten.</string>  <string name="pref_general_group">Allgemein</string> <string name="pref_start_boot_title">Orbot beim Systemstart ausführen</string> @@ -187,4 +187,10 @@ <string name="refresh_apps">Apps neu einlesen</string> <string name="pref_open_proxy_on_all_interfaces_title">Proxy an allen Schnittstellen öffnen</string> <string name="pref_open_proxy_on_all_interfaces_summary">WLAN-Rechnernetzen, per Tethering verbundenen Geräten und allen anderen, die sich mit Ihrer IP verbinden können, erlauben, auf Tor zuzugreifen</string> + <string name="use_qr_code">QR-Code verwenden</string> + <string name="confirm">Bestätigen</string> + <string name="mebibyte">MiB</string> + <string name="kibibyte">KiB</string> + <string name="mebibyte_per_second">MiB/s</string> + <string name="kibibyte_per_second">KiB/s</string> </resources> \ No newline at end of file

1 0

[orbot/master] Translated using Weblate (Portuguese (Brazil))
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 5a5b4032f7d14f5d76c429f1c5c9919cadb878f5 Author: Wellington Terumi Uemura <wellingtonuemura(a)gmail.com> Date: Fri Apr 9 15:26:56 2021 +0200 Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (19 of 19 strings) Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (220 of 220 strings) Co-authored-by: Wellington Terumi Uemura <wellingtonuemura(a)gmail.com> Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot-metadata/pt_BR/ Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/pt_BR/ Translation: Guardian Project/Orbot Translation: Guardian Project/Orbot metadata --- app/src/main/res/values-pt-rBR/strings.xml | 25 ++++++++++++++++++---- .../android/pt-BR/changelogs/1641200200.txt | 4 ++++ fastlane/metadata/android/pt-BR/title.txt | 2 +- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 6151444f..b5af88be 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_description">Orbot é um aplicativo de proxy livre que capacita outros aplicativos a usar a internet com mais segurança. O Orbot usa o Tor para criptografar o seu tráfego na internet e então o esconde \"saltando\" entre uma série de computadores ao redor do mundo. Tor é um software livre e de rede aberta que ajuda você a se defender de certas formas de vigilância que ameaçam privacidade e liberdade pessoais, atividades e relações comerciais confidenciais e segurança estatal conhecida como análise de tráfego.</string> + <string name="app_description">O Orbot é um aplicativo de proxy livre que capacita outros aplicativos a usar a internet com mais segurança. O Orbot usa o Tor para criptografar o seu tráfego na internet e então o esconde \"saltando\" entre uma série de computadores ao redor do mundo. O Tor é um software livre e de rede aberta que ajuda você a se defender de certas formas de vigilância que ameacem a privacidade e a sua liberdade pessoal, as atividades e as relações comerciais confidenciais e o estado de segurança conhecida como análise de tráfego.</string> <string name="status_starting_up">O Orbot está iniciando…</string> <string name="status_activated">Conectado à rede Tor</string> <string name="status_disabled">O Orbot está desativado</string> @@ -89,7 +89,7 @@ <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string> <string name="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string> <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string> - <string name="hidden_service_request">Um aplicativo quer abrir uma porta do servidor onion %1$s para a rede Tor. É seguro caso você confie neste aplicativo.</string> + <string name="hidden_service_request">Um aplicativo quer abrir uma porta no servidor onion %1$s para a rede Tor. É seguro caso você confie neste aplicativo.</string> <string name="found_existing_tor_process">processos Tor existentes foram encontrados…</string> <string name="something_bad_happened">Algo ruim aconteceu. Verifique o registro de log</string> <string name="unable_to_read_hidden_service_name">incapaz de ler o nome do serviço onion</string> @@ -125,14 +125,14 @@ <string name="hidden_services">Serviços Ocultos</string> <string name="title_activity_hidden_services">Serviços Ocultos</string> <string name="menu_hidden_services">Serviços Ocultos</string> - <string name="save">Salvar</string> + <string name="save">Salve</string> <string name="local_port">Porta Local</string> <string name="onion_port">Porta Onion</string> <string name="name">Nome</string> <string name="done">Feito!</string> <string name="copy_address_to_clipboard">Copiar para a area de transferência </string> <string name="show_auth_cookie">Mostre cookie de autenticação</string> - <string name="backup_service">Serviço de Backup</string> + <string name="backup_service">Serviço de Backup <i>(Aviso: Isso pode expor a sua configuração de serviço para os outros aplicativos)</i></string> <string name="delete_service">Remover Serviço</string> <string name="backup_saved_at_external_storage">Backup salvo em mídia externa</string> <string name="backup_restored">Backup Restaurado</string> @@ -211,4 +211,21 @@ <string name="kibibyte">KiB</string> <string name="mebibyte_per_second">MiB/s</string> <string name="kibibyte_per_second">KiB/s</string> + <string name="be_a_snowflake_desc">Permita que os outros usuários do Tor se conectem ao Tor através do seu dispositivo</string> + <string name="be_a_snowflake_title">Execute o proxy Snowflake</string> + <string name="confirm">Confirme</string> + <string name="v3_import_auth_private">Importe o .auth_private</string> + <string name="v3_backup_name_hint">Nome do arquivo de backup…</string> + <string name="v3_delete_client_authorization_confirm">Exclua a autorização do cliente</string> + <string name="v3_delete_client_authorization">Exclua a chave de autorização do cliente</string> + <string name="v3_backup_key_warning">Aviso: Isso pode expor a sua chave a os outros aplicativos</string> + <string name="v3_backup_key">Chave de autorização do cliente de backup</string> + <string name="v3_onion">Domínio v3 .onion</string> + <string name="v3_key_hash">Chave privada x25519 na Base 32</string> + <string name="v3_client_auth_activity_title">Autorização v3 do cliente</string> + <string name="v3_client_auth">Autorização do cliente do serviço Onion v3</string> + <string name="v3_hosted_services">Serviços Onion v3 hospedados</string> + <string name="v2_hidden_services">v2 Onion Services (Descontinuado)</string> + <string name="deny">Negue</string> + <string name="allow">Permita</string> </resources> \ No newline at end of file diff --git a/fastlane/metadata/android/pt-BR/changelogs/1641200200.txt b/fastlane/metadata/android/pt-BR/changelogs/1641200200.txt new file mode 100644 index 00000000..db6c825b --- /dev/null +++ b/fastlane/metadata/android/pt-BR/changelogs/1641200200.txt @@ -0,0 +1,4 @@ +* suporte ao OnionServices v3 +* melhorias na configuração da ponte +* garante que o modo VPN seja tratado como uma "conexão que não seja medida" +* modo experimental para habilitar a execução como um proxy Snowflake diff --git a/fastlane/metadata/android/pt-BR/title.txt b/fastlane/metadata/android/pt-BR/title.txt index a5a3ca80..ee5d9fe0 100644 --- a/fastlane/metadata/android/pt-BR/title.txt +++ b/fastlane/metadata/android/pt-BR/title.txt @@ -1 +1 @@ -Orbot: Proxy com Tor +Orbot: O Tor para Android

1 0

[orbot/master] Formatted HTML string res in v2 hosted onions dialog
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 6515ac2e9da06a4c8d484f282ba161778d36ef4b Author: bim <dsnake(a)protonmail.com> Date: Mon Apr 12 10:53:49 2021 -0400 Formatted HTML string res in v2 hosted onions dialog --- .../torproject/android/ui/hiddenservices/dialogs/HSActionsDialog.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSActionsDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSActionsDialog.java index 1d2e7844..5a7165fe 100644 --- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSActionsDialog.java +++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSActionsDialog.java @@ -6,6 +6,7 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Bundle; +import android.text.Html; import android.widget.Toast; import androidx.annotation.NonNull; @@ -33,7 +34,7 @@ public class HSActionsDialog extends DialogFragment { .setItems(new CharSequence[]{ getString(R.string.copy_address_to_clipboard), getString(R.string.show_auth_cookie), - getString(R.string.backup_service), + Html.fromHtml(getString(R.string.backup_service)), getString(R.string.delete_service)}, null) .setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.dismiss()) .setTitle(R.string.hidden_services)

1 0

[orbot/master] update fastlane 1641300100 metadata
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 068516d233454e2f90aeca7a6dc76fcfad4ba0a7 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Apr 9 15:12:47 2021 -0400 update fastlane 1641300100 metadata --- fastlane/metadata/android/en-US/changelogs/1641300100.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fastlane/metadata/android/en-US/changelogs/1641300100.txt b/fastlane/metadata/android/en-US/changelogs/1641300100.txt new file mode 100644 index 00000000..5ca5ae99 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/1641300100.txt @@ -0,0 +1,3 @@ +- removed Meek "Cloud" bridge option due to no longer being supported +- more improvements to Onion V3 service support +- for #441, fixes app lookup for app-based VPN selection

1 0

[orbot/master] Translated using Weblate (Bengali)
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 66d906162c1b3d64b598b4340576cdce6160eb38 Author: Oymate <dhruboadittya96(a)gmail.com> Date: Tue Apr 27 12:32:02 2021 +0200 Translated using Weblate (Bengali) Currently translated at 15.0% (33 of 220 strings) Translated using Weblate (Bengali (Bangladesh)) Currently translated at 15.4% (34 of 220 strings) Co-authored-by: Oymate <dhruboadittya96(a)gmail.com> Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/bn/ Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/bn_BD/ Translation: Guardian Project/Orbot --- app/src/main/res/values-bn-rBD/strings.xml | 2 +- app/src/main/res/values-bn/strings.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml index 0162170c..1865d1a9 100644 --- a/app/src/main/res/values-bn-rBD/strings.xml +++ b/app/src/main/res/values-bn-rBD/strings.xml @@ -6,7 +6,7 @@ <string name="status_activated">টর নেটওয়ার্কের সাথে সংযুক্ত হয়েছে</string> <string name="status_disabled">অরবট নিষ্ক্রিয় করা হয়েছে</string> <string name="status_shutting_down">টর সার্ভিস বন্ধ করা হচ্ছে</string> - <string name="menu_settings">নিয়ম বিন্যাস</string> + <string name="menu_settings">পছন্দসমূহ</string> <string name="menu_log">লগ</string> <string name="menu_start">শুরু</string> <string name="menu_stop">শেষ</string> diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index ac9f6d96..dd3f7a56 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="menu_settings">বিন্যাস</string> + <string name="menu_settings">পছন্দসমূহ</string> <string name="menu_log">লগ</string> <string name="menu_start">শুরু</string> <string name="menu_stop">থামুন</string>

1 0

[orbot/master] Fix bug where Orbot couldn't host multiple onion services of the same version (v2 or v3) off the same local port
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 8db5c3a0b4ebaf0bc5f1cf67fb8f2cea590f53fe Author: bim <dsnake(a)protonmail.com> Date: Sat Apr 24 20:55:52 2021 -0400 Fix bug where Orbot couldn't host multiple onion services of the same version (v2 or v3) off the same local port --- .../ui/hiddenservices/database/HSDatabase.java | 11 ++-- .../ui/v3onionservice/OnionServiceDatabase.java | 8 ++- .../torproject/android/service/OrbotService.java | 61 +++++++++++++++++----- 3 files changed, 60 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/database/HSDatabase.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/database/HSDatabase.java index 18bc7aa0..d9a398bd 100644 --- a/app/src/main/java/org/torproject/android/ui/hiddenservices/database/HSDatabase.java +++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/database/HSDatabase.java @@ -9,7 +9,7 @@ public class HSDatabase extends SQLiteOpenHelper { public static final String HS_DATA_TABLE_NAME = "hs_data"; public static final String HS_CLIENT_COOKIE_TABLE_NAME = "hs_client_cookie"; - private static final int DATABASE_VERSION = 2; + private static final int DATABASE_VERSION = 4; private static final String DATABASE_NAME = "hidden_services"; private static final String HS_DATA_TABLE_CREATE = "CREATE TABLE " + HS_DATA_TABLE_NAME + " (" + @@ -21,7 +21,8 @@ public class HSDatabase extends SQLiteOpenHelper { "auth_cookie_value TEXT, " + "created_by_user INTEGER DEFAULT 0, " + "enabled INTEGER DEFAULT 1, " + - "port INTEGER);"; + "port INTEGER, " + + "filepath TEXT);"; private static final String HS_CLIENT_COOKIE_TABLE_CREATE = "CREATE TABLE " + HS_CLIENT_COOKIE_TABLE_NAME + " (" + @@ -42,6 +43,8 @@ public class HSDatabase extends SQLiteOpenHelper { @Override public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + if (newVersion > oldVersion) { + db.execSQL("ALTER TABLE " + HS_DATA_TABLE_NAME + " ADD COLUMN filepath TEXT"); + } } -} - +} \ No newline at end of file diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceDatabase.java b/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceDatabase.java index 558babac..d2c62a9d 100644 --- a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceDatabase.java +++ b/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceDatabase.java @@ -8,7 +8,7 @@ public class OnionServiceDatabase extends SQLiteOpenHelper { static final String DATABASE_NAME = "onion_service", ONION_SERVICE_TABLE_NAME = "onion_services"; - private static final int DATABASE_VERSION = 1; + private static final int DATABASE_VERSION = 2; private static final String ONION_SERVICES_CREATE_SQL = "CREATE TABLE " + ONION_SERVICE_TABLE_NAME + " (" + @@ -18,7 +18,8 @@ public class OnionServiceDatabase extends SQLiteOpenHelper { "onion_port INTEGER, " + "created_by_user INTEGER DEFAULT 0, " + "enabled INTEGER DEFAULT 1, " + - "port INTEGER);"; + "port INTEGER, " + + "filepath TEXT);"; OnionServiceDatabase(Context context) { super(context, DATABASE_NAME, null, DATABASE_VERSION); @@ -31,6 +32,9 @@ public class OnionServiceDatabase extends SQLiteOpenHelper { @Override public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + if (newVersion > oldVersion) { + db.execSQL("ALTER TABLE " + ONION_SERVICE_TABLE_NAME + " ADD COLUMN filepath text"); + } } diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 5d5eb3fd..6808f088 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -72,6 +72,7 @@ import java.util.HashMap; import java.util.Objects; import java.util.Random; import java.util.StringTokenizer; +import java.util.UUID; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeoutException; @@ -98,7 +99,8 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb OnionService.AUTH_COOKIE, OnionService.AUTH_COOKIE_VALUE, OnionService.ONION_PORT, - OnionService.ENABLED}; + OnionService.ENABLED, + OnionService.PATH}; private static final String[] V3_ONION_SERVICE_PROJECTION = new String[]{ OnionService._ID, OnionService.NAME, @@ -106,6 +108,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb OnionService.PORT, OnionService.ONION_PORT, OnionService.ENABLED, + OnionService.PATH }; private static final String[] LEGACY_COOKIE_PROJECTION = new String[]{ ClientCookie._ID, @@ -841,16 +844,16 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb try { while (onionServices.moveToNext()) { String domain = onionServices.getString(onionServices.getColumnIndex(OnionService.DOMAIN)); - int localPort = onionServices.getInt(onionServices.getColumnIndex(OnionService.PORT)); - if (domain == null || TextUtils.isEmpty(domain)) { - String v3OnionDirPath = new File(mV3OnionBasePath.getAbsolutePath(), "v3" + localPort).getCanonicalPath(); + String path = onionServices.getString(onionServices.getColumnIndex(OnionService.PATH)); + String v3OnionDirPath = new File(mV3OnionBasePath.getAbsolutePath(), path).getCanonicalPath(); File hostname = new File(v3OnionDirPath, "hostname"); if (hostname.exists()) { + int id = onionServices.getInt(onionServices.getColumnIndex(OnionService._ID)); domain = Utils.readString(new FileInputStream(hostname)).trim(); ContentValues fields = new ContentValues(); fields.put(OnionService.DOMAIN, domain); - contentResolver.update(V3_ONION_SERVICES_CONTENT_URI, fields, "port=" + localPort, null); + contentResolver.update(V3_ONION_SERVICES_CONTENT_URI, fields, OnionService._ID + "=" + id, null); } } @@ -870,19 +873,18 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb try { while (hidden_services.moveToNext()) { String HSDomain = hidden_services.getString(hidden_services.getColumnIndex(OnionService.DOMAIN)); - Integer HSLocalPort = hidden_services.getInt(hidden_services.getColumnIndex(OnionService.PORT)); - Integer HSAuthCookie = hidden_services.getInt(hidden_services.getColumnIndex(OnionService.AUTH_COOKIE)); + int HSAuthCookie = hidden_services.getInt(hidden_services.getColumnIndex(OnionService.AUTH_COOKIE)); String HSAuthCookieValue = hidden_services.getString(hidden_services.getColumnIndex(OnionService.AUTH_COOKIE_VALUE)); - // Update only new domains or restored from backup with auth cookie if ((HSDomain == null || HSDomain.length() < 1) || (HSAuthCookie == 1 && (HSAuthCookieValue == null || HSAuthCookieValue.length() < 1))) { - String hsDirPath = new File(mHSBasePath.getAbsolutePath(), "hs" + HSLocalPort).getCanonicalPath(); + String hsDirPath = new File(mHSBasePath.getAbsolutePath(), hidden_services.getString(hidden_services.getColumnIndex(OnionService.PATH))).getCanonicalPath(); File file = new File(hsDirPath, "hostname"); if (file.exists()) { ContentValues fields = new ContentValues(); try { + int id = hidden_services.getInt(hidden_services.getColumnIndex(OnionService._ID)); String onionHostname = Utils.readString(new FileInputStream(file)).trim(); if (HSAuthCookie == 1) { String[] aux = onionHostname.split(" "); @@ -890,14 +892,13 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb fields.put(OnionService.AUTH_COOKIE_VALUE, aux[1]); } fields.put(OnionService.DOMAIN, onionHostname); - mCR.update(V2_HS_CONTENT_URI, fields, "port=" + HSLocalPort, null); + mCR.update(V2_HS_CONTENT_URI, fields, OnionService._ID + "=" + id, null); } catch (FileNotFoundException e) { logException("unable to read onion hostname file", e); showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), HS_NOTIFY_ID, R.drawable.ic_stat_notifyerr); } } else { showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), HS_NOTIFY_ID, R.drawable.ic_stat_notifyerr); - } } } @@ -1390,9 +1391,22 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb Cursor onionServices = contentResolver.query(V3_ONION_SERVICES_CONTENT_URI, V3_ONION_SERVICE_PROJECTION, OnionService.ENABLED + "=1", null, null); if (onionServices != null) { while (onionServices.moveToNext()) { + int id = onionServices.getInt(onionServices.getColumnIndex(OnionService._ID)); int localPort = onionServices.getInt(onionServices.getColumnIndex(OnionService.PORT)); int onionPort = onionServices.getInt(onionServices.getColumnIndex(OnionService.ONION_PORT)); - String v3DirPath = new File(mV3OnionBasePath.getAbsolutePath(), "v3" + localPort).getCanonicalPath(); + String path = onionServices.getString(onionServices.getColumnIndex(OnionService.PATH)); + String domain = onionServices.getString(onionServices.getColumnIndex(OnionService.DOMAIN)); + if (path == null) { + path = "v3"; + if (domain == null) + path += UUID.randomUUID().toString(); + else + path += localPort; + ContentValues cv = new ContentValues(); + cv.put(OnionService.PATH, path); + contentResolver.update(V3_ONION_SERVICES_CONTENT_URI, cv, OnionService._ID + "=" + id, null); + } + String v3DirPath = new File(mV3OnionBasePath.getAbsolutePath(), path).getCanonicalPath(); torrc.append("HiddenServiceDir ").append(v3DirPath).append("\n"); torrc.append("HiddenServiceVersion 3").append("\n"); torrc.append("HiddenServicePort ").append(onionPort).append(" 127.0.0.1:").append(localPort).append("\n"); @@ -1404,18 +1418,36 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb } } - // todo needs modifications to set hidden service version back after doing v3 stuff... private void addV2HiddenServicesToTorrc(StringBuffer torrc, ContentResolver contentResolver) { try { Cursor hidden_services = contentResolver.query(V2_HS_CONTENT_URI, LEGACY_V2_ONION_SERVICE_PROJECTION, OnionService.ENABLED + "=1", null, null); if (hidden_services != null) { try { while (hidden_services.moveToNext()) { + int id = hidden_services.getInt(hidden_services.getColumnIndex(OnionService._ID)); String HSname = hidden_services.getString(hidden_services.getColumnIndex(OnionService.NAME)); + String domain = hidden_services.getString(hidden_services.getColumnIndex(OnionService.DOMAIN)); int HSLocalPort = hidden_services.getInt(hidden_services.getColumnIndex(OnionService.PORT)); int HSOnionPort = hidden_services.getInt(hidden_services.getColumnIndex(OnionService.ONION_PORT)); int HSAuthCookie = hidden_services.getInt(hidden_services.getColumnIndex(OnionService.AUTH_COOKIE)); - String hsDirPath = new File(mHSBasePath.getAbsolutePath(), "hs" + HSLocalPort).getCanonicalPath(); + String path = hidden_services.getString(hidden_services.getColumnIndex(OnionService.PATH)); + + // logic to fix bug where you can't have 2+ hidden services on same local port without breaking services that were configured before the bug fix + if (path == null) { + String newPath = "hs"; + if (domain == null) + newPath +=UUID.randomUUID().toString(); + else + newPath += HSLocalPort; + + ContentValues cv = new ContentValues(); + cv.put(OnionService.PATH, newPath); + contentResolver.update(V2_HS_CONTENT_URI, cv, OnionService._ID + "=" + id, null); + path = newPath; + } + + String hsDirPath = new File(mHSBasePath.getAbsolutePath(), path).getCanonicalPath(); + debug("Adding hidden service on port: " + HSLocalPort); @@ -1656,6 +1688,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb public static final String AUTH_COOKIE = "auth_cookie"; public static final String AUTH_COOKIE_VALUE = "auth_cookie_value"; public static final String ENABLED = "enabled"; + public static final String PATH = "filepath"; } public static final class V3ClientAuth implements BaseColumns {

1 0

[orbot/master] fix 448: hosted v3 onions would generate a new address on backup/restore, files from backup weren't being read in OrbotService but were in Orbot
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 09230c030491a88479e2fd76c609560bb8132533 Author: bim <dsnake(a)protonmail.com> Date: Mon Apr 12 13:52:57 2021 -0400 fix 448: hosted v3 onions would generate a new address on backup/restore, files from backup weren't being read in OrbotService but were in Orbot --- .../android/ui/hiddenservices/backup/BackupUtils.java | 16 +++++++++++++--- app/src/main/res/values/strings.xml | 1 + .../org/torproject/android/service/OrbotService.java | 10 +++------- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java index af7f1333..d6cb091c 100644 --- a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java +++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java @@ -187,7 +187,17 @@ public class BackupUtils { else mResolver.update(OnionServiceContentProvider.CONTENT_URI, fields, OnionServiceContentProvider.OnionService.PORT + "=" + port, null); dbService.close(); - Toast.makeText(mContext, R.string.backup_restored, Toast.LENGTH_LONG).show(); + + configFile.delete(); + if (v3Path.renameTo(new File(v3BasePath, "/v3" + port))) { + Toast.makeText(mContext, R.string.backup_restored, Toast.LENGTH_LONG).show(); + } else { + // collision, clean up files + for (File file: v3Path.listFiles()) + file.delete(); + v3Path.delete(); + Toast.makeText(mContext, mContext.getString(R.string.backup_port_exist, port), Toast.LENGTH_LONG).show(); + } } catch (IOException | JSONException e) { e.printStackTrace(); Toast.makeText(mContext, R.string.error, Toast.LENGTH_LONG).show(); @@ -309,8 +319,8 @@ public class BackupUtils { returnCursor.close(); String v3Dir = backupName.substring(0, backupName.lastIndexOf('.')); - File v3Paath = new File(getV3BasePath().getAbsolutePath(), v3Dir); - if (new ZipUtilities(null, zipUri, mResolver).unzip(v3Paath.getAbsolutePath())) + File v3Path = new File(getV3BasePath().getAbsolutePath(), v3Dir); + if (new ZipUtilities(null, zipUri, mResolver).unzip(v3Path.getAbsolutePath())) extractConfigFromUnzippedBackupV3(backupName); else Toast.makeText(mContext, R.string.error, Toast.LENGTH_LONG).show(); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5df2f74d..55637899 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -190,6 +190,7 @@ <string name="delete_service">Delete Service</string> <string name="backup_saved_at_external_storage">Backup saved at external storage</string> <string name="backup_restored">Backup restored</string> + <string name="backup_port_exist">Error: An Onion Service is Already Using Port %s</string> <string name="restore_backup">Restore Backup</string> <string name="create_a_backup_first">Create a backup first</string> <string name="start_tor_again_for_finish_the_process">Start Tor again for finish the process</string> diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 8f843189..5d5eb3fd 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -65,14 +65,10 @@ import java.io.InputStreamReader; import java.io.PrintStream; import java.io.PrintWriter; import java.net.Socket; -import java.net.URL; -import java.net.URLConnection; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.Date; import java.util.HashMap; -import java.util.Iterator; import java.util.Objects; import java.util.Random; import java.util.StringTokenizer; @@ -936,7 +932,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb + " --defaults-torrc " + fileTorRc.getAbsolutePath() + " -f " + fileTorrcCustom.getAbsolutePath(); - int exitCode = -1; + int exitCode; try { exitCode = exec(torCmdString + " --verify-config", true); @@ -1373,7 +1369,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb extraLines.append("ServerDNSResolvConfFile").append(' ').append(dnsFile).append('\n'); extraLines.append("ORPort").append(' ').append(ORPort).append('\n'); extraLines.append("Nickname").append(' ').append(nickname).append('\n'); - StringBuffer append = extraLines.append("ExitPolicy").append(' ').append("reject *:*").append('\n'); + extraLines.append("ExitPolicy").append(' ').append("reject *:*").append('\n'); } } catch (Exception e) { @@ -1424,8 +1420,8 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb debug("Adding hidden service on port: " + HSLocalPort); torrc.append("HiddenServiceDir" + ' ' + hsDirPath).append('\n'); - torrc.append("HiddenServicePort" + ' ' + HSOnionPort + " 127.0.0.1:" + HSLocalPort).append('\n'); torrc.append("HiddenServiceVersion 2").append('\n'); + torrc.append("HiddenServicePort" + ' ' + HSOnionPort + " 127.0.0.1:" + HSLocalPort).append('\n'); if (HSAuthCookie == 1) torrc.append("HiddenServiceAuthorizeClient stealth " + HSname).append('\n');

1 0

[orbot/master] Translated using Weblate (Finnish)
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit f115981f6d3c95b06c4ea78cc0357630238935d6 Author: janne ojanperä <janne.ojanpera(a)iki.fi> Date: Tue Apr 27 12:32:03 2021 +0200 Translated using Weblate (Finnish) Currently translated at 64.0% (141 of 220 strings) Co-authored-by: janne ojanperä <janne.ojanpera(a)iki.fi> Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/fi/ Translation: Guardian Project/Orbot --- app/src/main/res/values-fi/strings.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 3700b6af..6b305bec 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -149,4 +149,8 @@ <string name="copy_cookie_to_clipboard">Kopioi eväste leikepöydälle</string> <string name="client_cookies">Asiakasohjelman evästeet</string> <string name="onion">.onion</string> + <string name="use_qr_code">Käytä QR-koodia</string> + <string name="confirm">Vahvista</string> + <string name="deny">Kiellä</string> + <string name="allow">Salli</string> </resources> \ No newline at end of file

1 0