commit 0e59b55cf045c4b7cf9153e5758033ba6c7afcc2 Merge: d8f6ebb3 03ef5ef9 Author: n8fr8 nathan@guardianproject.info Date: Fri Dec 17 18:10:24 2021 -0500

Merge branch 'master' into external_app_request_v3

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 - .../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 | 11 +- app/src/main/res/xml/preferences.xml | 7 + .../android/core/ui/SettingsPreferencesActivity.kt | 1 + dependencies.gradle | 2 +- .../torproject/android/service/OrbotService.java | 54 ++++-- .../org/torproject/android/service/util/Prefs.java | 6 + orbotservice/src/main/res/values/strings.xml | 3 + 97 files changed, 97 insertions(+), 480 deletions(-)