December 2021 - tor-commits - lists.torproject.org

[orbot/master] Merge branch 'master' into weblate-guardianproject-orbot
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 172b0234a53b70d7856b14fbb320f880258491dd Merge: 1abfd73f 65640ebb Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Fri Dec 17 18:19:11 2021 -0500 Merge branch 'master' into weblate-guardianproject-orbot app-mini/src/main/res/values-ar/strings.xml | 5 +- app-mini/src/main/res/values-ay/strings.xml | 3 - app-mini/src/main/res/values-be/strings.xml | 3 - app-mini/src/main/res/values-ca/strings.xml | 3 - app-mini/src/main/res/values-de/strings.xml | 3 - app-mini/src/main/res/values-el/strings.xml | 5 +- app-mini/src/main/res/values-es/strings.xml | 5 +- app-mini/src/main/res/values-eu/strings.xml | 5 +- app-mini/src/main/res/values-fa/strings.xml | 5 +- app-mini/src/main/res/values-fr/strings.xml | 5 +- app-mini/src/main/res/values-gl/strings.xml | 5 +- app-mini/src/main/res/values-hi/strings.xml | 3 - app-mini/src/main/res/values-hu/strings.xml | 3 - app-mini/src/main/res/values-is/strings.xml | 3 - app-mini/src/main/res/values-it/strings.xml | 3 - app-mini/src/main/res/values-ja/strings.xml | 3 - app-mini/src/main/res/values-mk/strings.xml | 3 - app-mini/src/main/res/values-nl/strings.xml | 3 - app-mini/src/main/res/values-pt-rBR/strings.xml | 3 - app-mini/src/main/res/values-ru/strings.xml | 3 - app-mini/src/main/res/values-sv/strings.xml | 5 +- app-mini/src/main/res/values-th/strings.xml | 5 +- app-mini/src/main/res/values-tr/strings.xml | 5 +- app-mini/src/main/res/values-uk/strings.xml | 5 +- app-mini/src/main/res/values-zh-rTW/strings.xml | 5 +- app-mini/src/main/res/values/strings.xml | 3 - app-tv/src/main/res/values-ar/strings.xml | 3 - app-tv/src/main/res/values-ay/strings.xml | 3 - app-tv/src/main/res/values-be/strings.xml | 3 - app-tv/src/main/res/values-ca/strings.xml | 3 - app-tv/src/main/res/values-de/strings.xml | 3 - app-tv/src/main/res/values-el/strings.xml | 3 - app-tv/src/main/res/values-es/strings.xml | 3 - app-tv/src/main/res/values-eu/strings.xml | 3 - app-tv/src/main/res/values-fa/strings.xml | 3 - app-tv/src/main/res/values-fr/strings.xml | 3 - app-tv/src/main/res/values-gl/strings.xml | 3 - app-tv/src/main/res/values-hi/strings.xml | 3 - app-tv/src/main/res/values-hu/strings.xml | 3 - app-tv/src/main/res/values-is/strings.xml | 3 - app-tv/src/main/res/values-it/strings.xml | 3 - app-tv/src/main/res/values-ja/strings.xml | 3 - app-tv/src/main/res/values-mk/strings.xml | 3 - app-tv/src/main/res/values-nl/strings.xml | 3 - app-tv/src/main/res/values-pt-rBR/strings.xml | 3 - app-tv/src/main/res/values-ru/strings.xml | 3 - app-tv/src/main/res/values-sv/strings.xml | 3 - app-tv/src/main/res/values-th/strings.xml | 3 - app-tv/src/main/res/values-tr/strings.xml | 3 - app-tv/src/main/res/values-uk/strings.xml | 3 - app-tv/src/main/res/values-zh-rTW/strings.xml | 3 - app-tv/src/main/res/values/strings.xml | 3 - .../org/torproject/android/OrbotMainActivity.java | 40 ++++- .../ui/onboarding/BridgeWizardActivity.java | 188 ++------------------- .../ui/onboarding/CustomBridgesActivity.java | 2 +- app/src/main/res/layout/content_bridge_wizard.xml | 18 +- app/src/main/res/values-ar/strings.xml | 3 - app/src/main/res/values-ay/strings.xml | 3 - app/src/main/res/values-be/strings.xml | 3 - app/src/main/res/values-ca/strings.xml | 3 - app/src/main/res/values-de/strings.xml | 3 - app/src/main/res/values-el/strings.xml | 3 - app/src/main/res/values-es/strings.xml | 3 - app/src/main/res/values-eu/strings.xml | 3 - app/src/main/res/values-fa/strings.xml | 3 - app/src/main/res/values-fi/strings.xml | 3 - app/src/main/res/values-fr-rFR/strings.xml | 3 - app/src/main/res/values-fr/strings.xml | 3 - app/src/main/res/values-gl/strings.xml | 3 - app/src/main/res/values-hi/strings.xml | 3 - app/src/main/res/values-hu/strings.xml | 3 - app/src/main/res/values-is/strings.xml | 3 - app/src/main/res/values-it/strings.xml | 3 - app/src/main/res/values-ja/strings.xml | 3 - app/src/main/res/values-lt-rLT/strings.xml | 3 - app/src/main/res/values-mk/strings.xml | 3 - app/src/main/res/values-nb/strings.xml | 3 - app/src/main/res/values-nl/strings.xml | 3 - app/src/main/res/values-pl/strings.xml | 3 - app/src/main/res/values-pt-rBR/strings.xml | 3 - app/src/main/res/values-pt-rPT/strings.xml | 3 - app/src/main/res/values-pt/strings.xml | 3 - app/src/main/res/values-ro-rRO/strings.xml | 3 - app/src/main/res/values-ru/strings.xml | 3 - app/src/main/res/values-sv/strings.xml | 3 - app/src/main/res/values-th/strings.xml | 3 - app/src/main/res/values-tr/strings.xml | 3 - app/src/main/res/values-uk/strings.xml | 3 - app/src/main/res/values-vi/strings.xml | 3 - app/src/main/res/values-zh-rCN/strings.xml | 3 - app/src/main/res/values-zh-rTW/strings.xml | 3 - app/src/main/res/values/strings.xml | 22 ++- app/src/main/res/xml/preferences.xml | 17 +- .../android/core/ui/SettingsPreferencesActivity.kt | 8 +- dependencies.gradle | 2 +- .../torproject/android/service/OrbotService.java | 102 ++++++----- .../android/service/TorServiceConstants.java | 5 + .../org/torproject/android/service/util/Prefs.java | 6 + orbotservice/src/main/res/values/strings.xml | 3 + 99 files changed, 184 insertions(+), 514 deletions(-) diff --cc app/src/main/res/values/strings.xml index df9a15c8,3a4987d0..32898103 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@@ -211,15 -242,24 +208,24 @@@ <string name="request_bridges_from_torproject">Request Bridges from torproject.org</string> <string name="custom_bridges">Custom Bridges</string> <string name="configure_custom_bridges">Configure Custom Bridges</string> -  <string name="use_custom_bridges">Use Custom Bridges</string> - <string name="in_a_browser">In a browser, visit %s and tap "Get Bridges" > "Just Give Me Bridges!"</string> + <string name="in_a_browser">In a browser, visit %s and tap "Get Bridges" > "Just Give Me Bridges!"</string> <string name="paste_bridges">Paste Bridges</string> <string name="use_qr_code">Use QR Code</string> - <string name="bridge_snowflake">Connect through other Tor peers (experimental)</string> + <string name="snowflake_proxy_pref_category">Snowflake Proxy (Experimental)</string> + <string name="bridge_snowflake">Connect through peers via the snowflake proxy (using domain fronting)</string> + <string name="bridge_snowflake_amp">Connect through peers via the snowflake proxy (using AMP cache rendezvous)</string> <string name="be_a_snowflake_title">Run Snowflake Proxy</string> - <string name="be_a_snowflake_desc">Allow other Tor users to connect to Tor through your device</string> ++ + <string name="be_a_snowflake_desc">Allow other Tor users to connect to Tor through your device. (This can\'t be used if you connect alongside bridges)</string> + <string name="be_a_snowflake_title_limit">Snowflake Proxy Limits</string> - <string name="be_a_snowflake_desc_limit">Only when the device is charging and on Wi-Fi</string> - <string name="snowflake_proxy_enabled">Snowflake proxy mode on</string> - </resources> + <string name="be_a_snowflake_desc_limit">Only when device is plugged in and on wifi</string> + <string formatted="true" name="snowflake_proxy_enabled">Snowflake proxy mode enabled</string> + <string name="snowflake_proxy_msg_title">Show Connection Notification</string> + <string name="snowflake_proxy_msg_description">Show a message when your snowflake helps someone circumvent censorship</string> + + + + </resources>

1 0

[orbot/master] add comment about how snowlfake bridges may sometimes take a minute
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit b2001961e4f73da37f23c1b3c928dbd550ddbe25 Author: b <dsnake(a)protonmail.com> Date: Sat Dec 18 12:04:11 2021 -0500 add comment about how snowlfake bridges may sometimes take a minute --- app/src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 32898103..6130dbd1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -214,8 +214,8 @@ <string name="paste_bridges">Paste Bridges</string> <string name="use_qr_code">Use QR Code</string> <string name="snowflake_proxy_pref_category">Snowflake Proxy (Experimental)</string> - <string name="bridge_snowflake">Connect through peers via the snowflake proxy (using domain fronting)</string> - <string name="bridge_snowflake_amp">Connect through peers via the snowflake proxy (using AMP cache rendezvous)</string> + <string name="bridge_snowflake">Connect through peers via the snowflake proxy using domain fronting (Snowflake connections can sometimes take a long time to establish)</string> + <string name="bridge_snowflake_amp">Connect through peers via the snowflake proxy using AMP cache rendezvous (Snowflake connections can sometimes take a long time to establish)</string> <string name="be_a_snowflake_title">Run Snowflake Proxy</string> <string name="be_a_snowflake_desc">Allow other Tor users to connect to Tor through your device. (This can\'t be used if you connect alongside bridges)</string>

1 0

[orbot/master] Merge pull request #542 from weblate/weblate-guardianproject-orbot
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 5615b751e9b581203fb6aaa8d38abc7ff5eae42f Merge: 65640ebb 172b0234 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Fri Dec 17 18:19:33 2021 -0500 Merge pull request #542 from weblate/weblate-guardianproject-orbot Translations update from Hosted Weblate app/src/main/res/values-fa/strings.xml | 79 +++++++++++++++------- app/src/main/res/values-fi/strings.xml | 2 +- app/src/main/res/values-in/strings.xml | 10 +++ app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-lt-rLT/strings.xml | 13 ++-- app/src/main/res/values-pt-rBR/strings.xml | 12 ++-- app/src/main/res/values-ro-rRO/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 14 ++-- app/src/main/res/values-uk/strings.xml | 16 +++-- app/src/main/res/values-vi/strings.xml | 12 ++-- app/src/main/res/values-zh-rCN/strings.xml | 4 +- app/src/main/res/values/strings.xml | 48 ++----------- .../metadata/android/fa/changelogs/16000010.txt | 2 +- .../metadata/android/fa/changelogs/16000011.txt | 2 +- fastlane/metadata/android/fa/full_description.txt | 21 ++++-- fastlane/metadata/android/fa/short_description.txt | 2 +- 16 files changed, 135 insertions(+), 106 deletions(-)

1 0

[orbot/master] move v3 onion name status to a "local action" instead
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit ac3d1bafb69ca87ba0b2d843b21bba7ce8721820 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Dec 20 14:55:10 2021 -0500 move v3 onion name status to a "local action" instead --- .../src/main/java/org/torproject/android/service/OrbotService.java | 5 ++++- .../java/org/torproject/android/service/TorServiceConstants.java | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) 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 49e3240a..5fd05409 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -763,7 +763,10 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb status, perhaps just adding it as an extra to the normal Intent callback... */ String oldStatus = mCurrentStatus; - sendCallbackStatus(STATUS_V3_NAMES_UPDATED); + Intent intent = new Intent(LOCAL_ACTION_V3_NAMES_UPDATED); + intent.putExtra(EXTRA_STATUS, mCurrentStatus); + LocalBroadcastManager.getInstance(this).sendBroadcast(intent); + mCurrentStatus = oldStatus; } catch (Exception e) { e.printStackTrace(); diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java index b9b410ad..ea89dbb1 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java @@ -75,14 +75,13 @@ public interface TorServiceConstants { String LOCAL_ACTION_BANDWIDTH = "bandwidth"; String LOCAL_EXTRA_LOG = "log"; String LOCAL_ACTION_PORTS = "ports"; + String LOCAL_ACTION_V3_NAMES_UPDATED = "V3_NAMES_UPDATED"; /** * All tor-related services and daemons are stopped */ String STATUS_OFF = "OFF"; - String STATUS_V3_NAMES_UPDATED = "V3_NAMES_UPDATED"; - /** * All tor-related services and daemons have completed starting */

1 0

[orbot/master] removed new translations for strings that were removed from orbot
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 9770ce87cbbc53808e739530d78eed7e11d1f503 Author: b <dsnake(a)protonmail.com> Date: Sat Dec 18 13:17:16 2021 -0500 removed new translations for strings that were removed from orbot --- app/src/main/res/values-fi/strings.xml | 7 ------- app/src/main/res/values-in/strings.xml | 3 --- app/src/main/res/values-it/strings.xml | 1 - 3 files changed, 11 deletions(-) diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index ee537c7e..8f800266 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -200,12 +200,6 @@ <string name="consider_enable_battery_optimizations">Harkitse virransäästöasetusten käyttöönottoa</string> <string name="consider_disable_battery_optimizations">Harkitse virransäästöasetusten poistamista</string> <string name="share_as_qr">Jaa QR-koodina</string> - <string name="hosted_services">Ylläpidetyt palvelut</string> - <string name="confirm_cookie_deletion">Vahvista evästeen poisto</string> - <string name="delete_cookie">Poista eväste</string> - <string name="backup_cookie">Varmuuskopioi eväste</string> - <string name="cookie_from_QR">Lue QR-koodista</string> - <string name="auth_cookie_was_not_configured">Tunnistautumisevästettä ei määritelty</string> <string name="auth_cookie">Tunnistautumiseväste</string> <string name="backup_port_exist">Virhe: Sipulipalvelu käyttää jo porttia %s</string> <string name="backup_service">Varmuuskopiopalvelu <i>( Varoitus: Tämä voi paljastaa avaimesi toisille sovelluksille )</i></string> @@ -217,7 +211,6 @@ <string name="v3_client_auth_activity_title">v3 Asiakasohjelman todentaminen</string> <string name="v3_client_auth">v3 Onion Service asiakasohjelman todentaminen</string> <string name="v3_hosted_services">Ylläpidetty v3 Onion Services</string> - <string name="v2_hidden_services">v2 Onion Services (Vanhentunut)</string> <string name="get_bridges_email_request">Pyydä siltoja sähköpostitse</string> <string name="pref_open_proxy_on_all_interfaces_summary">Salli Wi-Fi -vertaisten, yhdistettyjen laitteiden ja kenen tahansa, joka voi yhdistää sinun IP-osoitteeseesi, yhdistää Tor-verkkoon.</string> <string name="pref_open_proxy_on_all_interfaces_title">Avaa välityspalvelin kaikilla rajapinnoilla</string> diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index b4242d8e..4489de51 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -121,8 +121,6 @@ <string name="apps_mode">Mode VPN</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> <string name="pref_http_title">Tor HTTP</string> <string name="deny">Pangkar</string> <string name="allow">Izinkan</string> @@ -137,7 +135,6 @@ <string name="get_bridges_email_request">Minta Bridges melalui Email</string> <string name="vpn_default_world">Global (Otomatis)</string> <string name="hidden_services">Layanan Onion</string> - <string name="v2_hidden_services">Layanan Onion v2 (Usang)</string> <string name="v3_hosted_services">Layanan Onion v3 Yang Dihosting</string> <string name="v3_client_auth">Otorisasi Klien Layanan Onion v3</string> <string name="v3_client_auth_activity_title">Otorisasi Klien v3</string> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index ac957b26..1703e968 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -185,7 +185,6 @@ <string name="v3_client_auth_activity_title">Autorizzazione client v3</string> <string name="v3_client_auth">Autorizzazione client servizio nascosto v3</string> <string name="v3_hosted_services">Servizi nascosti v3 ospitati</string> - <string name="v2_hidden_services">Servizi nascosti v2 (deprecato)</string> <string name="get_bridges_email_request">Richiedi bridge via email</string> <string name="mebibyte">MiB</string> <string name="kibibyte">KiB</string>

1 0

[orbot/master] update tor to 0.4.6.8w
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 1d47994f9d8f7dcbc5958b817c6f9c5c472ce16e Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Dec 20 14:52:01 2021 -0500 update tor to 0.4.6.8w --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index c9b4f783..4feeb6e5 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -22,7 +22,7 @@ ext { guardian_jtorctl : "0.4.5.7", ipt_proxy : "1.3.0", portmapper : "2.0.5", - tor_android : "0.4.6.7" + tor_android : "0.4.6.8" ] libs = [

1 0

[orbot/master] Merge pull request #558 from guardianproject/tor-android-0.4.6.8
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 1ed8efd0f241000fdc6d355e2bef842cc66a5ab2 Merge: dd723e49 06453716 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Mon Dec 20 15:54:23 2021 -0500 Merge pull request #558 from guardianproject/tor-android-0.4.6.8 tor-android 0.4.6.7 -> 0.4.6.8

1 0

[orbot/master] register local v3 name receiver
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 06851dd156abf220979d815766a0b3733314f077 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Dec 20 22:01:44 2021 -0500 register local v3 name receiver --- app/src/main/java/org/torproject/android/OrbotMainActivity.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index ba40d5c5..86043921 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -252,6 +252,8 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan new IntentFilter(TorServiceConstants.LOCAL_ACTION_LOG)); lbm.registerReceiver(mLocalBroadcastReceiver, new IntentFilter(TorServiceConstants.LOCAL_ACTION_PORTS)); + lbm.registerReceiver(mLocalBroadcastReceiver, + new IntentFilter(TorServiceConstants.LOCAL_ACTION_V3_NAMES_UPDATED)); boolean showFirstTime = mPrefs.getBoolean("connect_first_time", true);

1 0

[orbot/master] disable MOAT and Snowflake on SDK < 28 since they don't currently work
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 816c5825098a7a5d98f600feae00e90117a6eca9 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Dec 20 23:18:43 2021 -0500 disable MOAT and Snowflake on SDK < 28 since they don't currently work --- .../android/ui/onboarding/BridgeWizardActivity.java | 14 ++++++++++---- app/src/main/res/layout/content_bridge_wizard.xml | 3 ++- 2 files changed, 12 insertions(+), 5 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 5dc4e770..c28515ed 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 @@ -43,10 +43,16 @@ public class BridgeWizardActivity extends AppCompatActivity { if (actionBar != null) { actionBar.setDisplayHomeAsUpEnabled(true); } - - findViewById(R.id.btnMoat).setOnClickListener(v -> { - startActivityForResult(new Intent(BridgeWizardActivity.this, MoatActivity.class), MOAT_REQUEST_CODE); - }); + if(android.os.Build.VERSION.SDK_INT < 28){ + findViewById(R.id.btnMoat).setVisibility(View.GONE); + findViewById(R.id.btnBridgesSnowflake).setVisibility(View.GONE); + findViewById(R.id.btnSnowflakeAmp).setVisibility(View.GONE); + } + else { + findViewById(R.id.btnMoat).setOnClickListener(v -> { + startActivityForResult(new Intent(BridgeWizardActivity.this, MoatActivity.class), MOAT_REQUEST_CODE); + }); + } mBtDirect = findViewById(R.id.btnBridgesDirect); mBtDirect.setOnCheckedChangeListener((buttonView, isChecked) -> { diff --git a/app/src/main/res/layout/content_bridge_wizard.xml b/app/src/main/res/layout/content_bridge_wizard.xml index 65364846..887e5ea4 100644 --- a/app/src/main/res/layout/content_bridge_wizard.xml +++ b/app/src/main/res/layout/content_bridge_wizard.xml @@ -30,7 +30,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="12dp" - android:text="@string/request_bridges_from_torproject" /> + android:text="@string/request_bridges_from_torproject" + /> <RadioGroup android:layout_width="match_parent"

1 0

[orbot/master] simplify snowflake strings
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 03470d46b3cde0ef3611cb78b8d16c836b333018 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Dec 20 22:16:38 2021 -0500 simplify snowflake strings --- app/src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6130dbd1..1771bd29 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -214,8 +214,8 @@ <string name="paste_bridges">Paste Bridges</string> <string name="use_qr_code">Use QR Code</string> <string name="snowflake_proxy_pref_category">Snowflake Proxy (Experimental)</string> - <string name="bridge_snowflake">Connect through peers via the snowflake proxy using domain fronting (Snowflake connections can sometimes take a long time to establish)</string> - <string name="bridge_snowflake_amp">Connect through peers via the snowflake proxy using AMP cache rendezvous (Snowflake connections can sometimes take a long time to establish)</string> + <string name="bridge_snowflake">Connect through other Tor users using Snowflake (Method 1 - Fastly)</string> + <string name="bridge_snowflake_amp">Connect through other Tor users using Snowflake (Method 2 - AMP)</string> <string name="be_a_snowflake_title">Run Snowflake Proxy</string> <string name="be_a_snowflake_desc">Allow other Tor users to connect to Tor through your device. (This can\'t be used if you connect alongside bridges)</string>

1 0