commit 172b0234a53b70d7856b14fbb320f880258491dd Merge: 1abfd73f 65640ebb Author: Nathan Freitas nathan@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> - <!-- CustomBridgesActivity --> <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>