[tor-commits] [orbot/master] Merge remote-tracking branch 'upstream/master'
n8fr8 at torproject.org
n8fr8 at torproject.org
Wed Dec 23 16:36:11 UTC 2020
commit e2be309004d99d2efad37112e365e52959cf4a26
Merge: d9861e90 860908d1
Author: Benjamin Erhart <berhart at netzarchitekten.com>
Date: Thu Oct 8 09:34:58 2020 +0200
Merge remote-tracking branch 'upstream/master'
.classpath | 13 -
.github/workflows/android.yml | 21 +
.project | 79 -
.tx/config | 7 +
BUILD | 42 -
BUILD.md | 46 +
LICENSE | 20 +-
add-proguard-release.xml | 46 -
app-mini/build.gradle | 6 +-
app-mini/src/debug/AndroidManifest.xml | 2 +-
app-mini/src/main/AndroidManifest.xml | 29 +-
.../integration/android/IntentIntegrator.java | 506 ------
.../org/torproject/android/mini/MainConstants.java | 15 -
.../torproject/android/mini/MiniMainActivity.java | 997 +++++-------
.../torproject/android/mini/OnBootReceiver.java | 39 -
.../org/torproject/android/mini/OrbotMiniApp.java | 79 +-
.../android/mini/settings/Languages.java | 228 ---
.../android/mini/settings/LocaleHelper.java | 86 -
.../android/mini/settings/SettingsPreferences.java | 72 -
.../mini/ui/NoPersonalizedLearningEditText.java | 13 -
.../android/mini/ui/Rotate3dAnimation.java | 76 -
.../mini/ui/onboarding/OnboardingActivity.java | 3 +-
.../src/main/res/layout/content_app_config.xml | 1 -
app-mini/src/main/res/values-ar/strings.xml | 26 +-
app-mini/src/main/res/values-ay/strings.xml | 29 +-
app-mini/src/main/res/values-az/strings.xml | 19 +-
app-mini/src/main/res/values-be/strings.xml | 29 +-
app-mini/src/main/res/values-bg/strings.xml | 19 +-
app-mini/src/main/res/values-bn-rBD/strings.xml | 5 +-
app-mini/src/main/res/values-bn-rIN/strings.xml | 3 +-
app-mini/src/main/res/values-bn/strings.xml | 3 +-
app-mini/src/main/res/values-brx/strings.xml | 3 +-
app-mini/src/main/res/values-bs/strings.xml | 3 +-
app-mini/src/main/res/values-ca/strings.xml | 31 +-
app-mini/src/main/res/values-cs-rCZ/strings.xml | 19 +-
app-mini/src/main/res/values-cs/strings.xml | 5 +-
app-mini/src/main/res/values-cy/strings.xml | 5 +-
app-mini/src/main/res/values-da/strings.xml | 6 +-
app-mini/src/main/res/values-de/strings.xml | 31 +-
app-mini/src/main/res/values-el/strings.xml | 31 +-
app-mini/src/main/res/values-en-rGB/strings.xml | 5 +-
app-mini/src/main/res/values-eo/strings.xml | 5 +-
app-mini/src/main/res/values-es-rAR/strings.xml | 8 +-
app-mini/src/main/res/values-es/arrays.xml | 4 -
app-mini/src/main/res/values-es/strings.xml | 31 +-
app-mini/src/main/res/values-et/strings.xml | 9 +-
app-mini/src/main/res/values-eu/strings.xml | 31 +-
app-mini/src/main/res/values-fa/strings.xml | 31 +-
app-mini/src/main/res/values-fi/strings.xml | 15 +-
app-mini/src/main/res/values-fr-rFR/strings.xml | 19 +-
app-mini/src/main/res/values-fr/strings.xml | 31 +-
app-mini/src/main/res/values-gl/strings.xml | 31 +-
app-mini/src/main/res/values-gu-rIN/strings.xml | 3 +-
app-mini/src/main/res/values-gu/strings.xml | 3 +-
app-mini/src/main/res/values-he/strings.xml | 31 +-
app-mini/src/main/res/values-hi/strings.xml | 31 +-
app-mini/src/main/res/values-hr-rHR/strings.xml | 3 +-
app-mini/src/main/res/values-hr/strings.xml | 15 +-
app-mini/src/main/res/values-hu/strings.xml | 31 +-
app-mini/src/main/res/values-hy-rAM/strings.xml | 3 +-
app-mini/src/main/res/values-ia/strings.xml | 3 +-
app-mini/src/main/res/values-id/strings.xml | 19 +-
app-mini/src/main/res/values-in-rID/strings.xml | 19 +-
app-mini/src/main/res/values-in/strings.xml | 3 +-
app-mini/src/main/res/values-is/strings.xml | 31 +-
app-mini/src/main/res/values-it/strings.xml | 31 +-
app-mini/src/main/res/values-iw/strings.xml | 13 +-
app-mini/src/main/res/values-ja/strings.xml | 31 +-
app-mini/src/main/res/values-kn/strings.xml | 3 +-
app-mini/src/main/res/values-ko/strings.xml | 19 +-
app-mini/src/main/res/values-ky/strings.xml | 3 +-
app-mini/src/main/res/values-lt/strings.xml | 5 +-
app-mini/src/main/res/values-lv/strings.xml | 19 +-
app-mini/src/main/res/values-mk/strings.xml | 29 +-
app-mini/src/main/res/values-ml/strings.xml | 3 +-
app-mini/src/main/res/values-mn/strings.xml | 3 +-
app-mini/src/main/res/values-ms-rMY/strings.xml | 5 +-
app-mini/src/main/res/values-ms/strings.xml | 5 +-
app-mini/src/main/res/values-my/strings.xml | 3 +-
app-mini/src/main/res/values-nb/strings.xml | 26 +-
app-mini/src/main/res/values-nl/strings.xml | 31 +-
app-mini/src/main/res/values-pa/strings.xml | 3 +-
app-mini/src/main/res/values-pl/strings.xml | 22 +-
app-mini/src/main/res/values-ps/strings.xml | 3 +-
app-mini/src/main/res/values-pt-rBR/strings.xml | 28 +-
app-mini/src/main/res/values-pt-rPT/strings.xml | 8 +-
app-mini/src/main/res/values-pt/strings.xml | 10 +-
app-mini/src/main/res/values-ro-rRO/strings.xml | 3 +-
app-mini/src/main/res/values-ro/strings.xml | 19 +-
app-mini/src/main/res/values-rs-rAR/strings.xml | 4 +-
app-mini/src/main/res/values-ru/strings.xml | 31 +-
app-mini/src/main/res/values-si-rLK/strings.xml | 5 +-
app-mini/src/main/res/values-sk/strings.xml | 19 +-
app-mini/src/main/res/values-sl/strings.xml | 5 +-
app-mini/src/main/res/values-sn/strings.xml | 3 +-
app-mini/src/main/res/values-sq/strings.xml | 3 +-
app-mini/src/main/res/values-sr/strings.xml | 28 +-
app-mini/src/main/res/values-sv/strings.xml | 31 +-
app-mini/src/main/res/values-ta/strings.xml | 5 +-
app-mini/src/main/res/values-th/strings.xml | 31 +-
app-mini/src/main/res/values-tl/strings.xml | 9 +-
app-mini/src/main/res/values-tr/strings.xml | 29 +-
app-mini/src/main/res/values-uk/strings.xml | 31 +-
app-mini/src/main/res/values-ur/strings.xml | 3 +-
app-mini/src/main/res/values-uz/strings.xml | 3 +-
app-mini/src/main/res/values-vi/strings.xml | 19 +-
app-mini/src/main/res/values-zh-rCN/strings.xml | 20 +-
app-mini/src/main/res/values-zh-rTW/strings.xml | 31 +-
app-mini/src/main/res/values/arrays.xml | 4 -
app-mini/src/main/res/values/strings.xml | 21 -
app/build.gradle | 6 +-
app/src/appmax/ic_launcher-web.png | Bin 26340 -> 0 bytes
.../appmax/res/mipmap-anydpi-v26/ic_launcher.xml | 5 -
.../res/mipmap-anydpi-v26/ic_launcher_round.xml | 5 -
app/src/appmax/res/mipmap-hdpi/ic_launcher.png | Bin 2858 -> 0 bytes
.../res/mipmap-hdpi/ic_launcher_foreground.png | Bin 2629 -> 0 bytes
.../appmax/res/mipmap-hdpi/ic_launcher_round.png | Bin 5049 -> 0 bytes
app/src/appmax/res/mipmap-mdpi/ic_launcher.png | Bin 1713 -> 0 bytes
.../res/mipmap-mdpi/ic_launcher_foreground.png | Bin 1663 -> 0 bytes
.../appmax/res/mipmap-mdpi/ic_launcher_round.png | Bin 2928 -> 0 bytes
app/src/appmax/res/mipmap-xhdpi/ic_launcher.png | Bin 3827 -> 0 bytes
.../res/mipmap-xhdpi/ic_launcher_foreground.png | Bin 3594 -> 0 bytes
.../appmax/res/mipmap-xhdpi/ic_launcher_round.png | Bin 6995 -> 0 bytes
app/src/appmax/res/mipmap-xxhdpi/ic_launcher.png | Bin 5759 -> 0 bytes
.../res/mipmap-xxhdpi/ic_launcher_foreground.png | Bin 5804 -> 0 bytes
.../appmax/res/mipmap-xxhdpi/ic_launcher_round.png | Bin 10664 -> 0 bytes
app/src/appmax/res/mipmap-xxxhdpi/ic_launcher.png | Bin 7711 -> 0 bytes
.../res/mipmap-xxxhdpi/ic_launcher_foreground.png | Bin 8206 -> 0 bytes
.../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 14870 -> 0 bytes
.../appmax/res/values/ic_launcher_background.xml | 4 -
app/src/main/AndroidManifest.xml | 12 +-
.../zxing/integration/android/IntentResult.java | 95 --
.../java/org/torproject/android/MainConstants.java | 2 +-
.../org/torproject/android/OnBootReceiver.java | 42 -
.../main/java/org/torproject/android/OrbotApp.java | 6 +-
.../org/torproject/android/OrbotMainActivity.java | 321 ++--
.../org/torproject/android/settings/Languages.java | 195 ---
.../torproject/android/settings/LocaleHelper.java | 80 -
.../android/settings/SettingsPreferences.java | 68 -
.../torproject/android/ui/AppManagerActivity.java | 150 +-
.../android/ui/NoPersonalizedLearningEditText.java | 13 -
.../torproject/android/ui/Rotate3dAnimation.java | 76 -
.../android/ui/dialog/AboutDialogFragment.java | 24 +-
.../android/ui/dialog/MoatErrorDialogFragment.java | 2 +-
.../ui/hiddenservices/ClientCookiesActivity.java | 155 +-
.../ui/hiddenservices/HiddenServicesActivity.java | 217 ++-
.../ui/hiddenservices/adapters/BackupAdapter.java | 44 -
.../adapters/ClientCookiesAdapter.java | 21 +-
.../hiddenservices/adapters/OnionListAdapter.java | 25 +-
.../ui/hiddenservices/backup/BackupUtils.java | 246 +--
.../android/ui/hiddenservices/backup/ZipIt.java | 83 +-
.../ui/hiddenservices/dialogs/AddCookieDialog.java | 90 +-
.../dialogs/CookieActionsDialog.java | 148 +-
.../hiddenservices/dialogs/CookieDeleteDialog.java | 39 +-
.../ui/hiddenservices/dialogs/HSActionsDialog.java | 155 +-
.../ui/hiddenservices/dialogs/HSCookieDialog.java | 82 +-
.../ui/hiddenservices/dialogs/HSDataDialog.java | 112 +-
.../ui/hiddenservices/dialogs/HSDeleteDialog.java | 61 +-
.../dialogs/SelectCookieBackupDialog.java | 64 -
.../dialogs/SelectHSBackupDialog.java | 64 -
.../permissions/PermissionManager.java | 39 +-
.../providers/CookieContentProvider.java | 4 +-
.../providers/HSContentProvider.java | 4 +-
.../ui/hiddenservices/storage/ExternalStorage.java | 28 -
.../ui/onboarding/BridgeWizardActivity.java | 181 ++-
.../ui/onboarding/CustomBridgesActivity.java | 46 +-
.../android/ui/onboarding/CustomSlideBigText.java | 7 +-
.../android/ui/onboarding/MoatActivity.java | 24 +-
.../android/ui/onboarding/OnboardingActivity.java | 2 +-
app/src/main/res/layout/layout_about.xml | 254 ++-
.../res/layout/layout_activity_client_cookies.xml | 5 +-
.../res/layout/layout_add_client_cookie_dialog.xml | 51 +-
app/src/main/res/layout/layout_apps.xml | 1 -
.../res/layout/layout_client_cookie_list_item.xml | 5 +-
app/src/main/res/layout/layout_cookie_actions.xml | 24 -
app/src/main/res/layout/layout_hs_actions.xml | 36 -
app/src/main/res/layout/layout_hs_backups_list.xml | 11 -
.../res/layout/layout_hs_backups_list_item.xml | 24 -
app/src/main/res/layout/layout_hs_cookie.xml | 31 -
app/src/main/res/layout/layout_hs_data_dialog.xml | 72 +-
app/src/main/res/layout/layout_hs_list_item.xml | 78 +-
app/src/main/res/layout/layout_hs_list_view.xml | 5 +-
.../main/res/layout/layout_hs_list_view_main.xml | 35 +-
app/src/main/res/layout/layout_main.xml | 54 +-
app/src/main/res/menu/cookie_menu.xml | 3 +-
app/src/main/res/menu/hs_menu.xml | 10 +-
app/src/main/res/values-ar/strings.xml | 26 +-
app/src/main/res/values-ay/strings.xml | 27 +-
app/src/main/res/values-az/strings.xml | 20 +-
app/src/main/res/values-be/strings.xml | 27 +-
app/src/main/res/values-bg/strings.xml | 20 +-
app/src/main/res/values-bn-rBD/strings.xml | 6 +-
app/src/main/res/values-bn-rIN/strings.xml | 3 +-
app/src/main/res/values-bn/strings.xml | 3 +-
app/src/main/res/values-brx/strings.xml | 3 +-
app/src/main/res/values-bs/strings.xml | 4 +-
app/src/main/res/values-ca/strings.xml | 29 +-
app/src/main/res/values-cs-rCZ/strings.xml | 20 +-
app/src/main/res/values-cs/strings.xml | 8 +-
app/src/main/res/values-cy/strings.xml | 7 +-
app/src/main/res/values-da/strings.xml | 10 +-
app/src/main/res/values-de/strings.xml | 29 +-
app/src/main/res/values-el/strings.xml | 31 +-
app/src/main/res/values-en-rGB/strings.xml | 6 +-
app/src/main/res/values-eo/strings.xml | 8 +-
app/src/main/res/values-es-rAR/strings.xml | 13 +-
app/src/main/res/values-es/arrays.xml | 9 -
app/src/main/res/values-es/strings.xml | 31 +-
app/src/main/res/values-et/strings.xml | 10 +-
app/src/main/res/values-eu/strings.xml | 29 +-
app/src/main/res/values-fa/strings.xml | 33 +-
app/src/main/res/values-fi/strings.xml | 16 +-
app/src/main/res/values-fr-rFR/strings.xml | 20 +-
app/src/main/res/values-fr/strings.xml | 31 +-
app/src/main/res/values-gl/strings.xml | 31 +-
app/src/main/res/values-gu-rIN/strings.xml | 3 +-
app/src/main/res/values-gu/strings.xml | 3 -
app/src/main/res/values-he/strings.xml | 31 +-
app/src/main/res/values-hi/strings.xml | 31 +-
app/src/main/res/values-hr-rHR/strings.xml | 3 +-
app/src/main/res/values-hr/strings.xml | 16 +-
app/src/main/res/values-hu/strings.xml | 31 +-
app/src/main/res/values-hy-rAM/strings.xml | 3 +-
app/src/main/res/values-ia/strings.xml | 3 +-
app/src/main/res/values-id/strings.xml | 20 +-
app/src/main/res/values-in-rID/strings.xml | 20 +-
app/src/main/res/values-in/strings.xml | 3 +-
app/src/main/res/values-is/strings.xml | 31 +-
app/src/main/res/values-it/strings.xml | 31 +-
app/src/main/res/values-iw/strings.xml | 14 +-
app/src/main/res/values-ja/strings.xml | 31 +-
app/src/main/res/values-kn/strings.xml | 3 +-
app/src/main/res/values-ko/strings.xml | 20 +-
app/src/main/res/values-ky/strings.xml | 3 +-
app/src/main/res/values-lt/strings.xml | 7 +-
app/src/main/res/values-lv/strings.xml | 20 +-
app/src/main/res/values-mk/strings.xml | 29 +-
app/src/main/res/values-ml/strings.xml | 3 +-
app/src/main/res/values-mn/strings.xml | 3 +-
app/src/main/res/values-ms-rMY/strings.xml | 6 +-
app/src/main/res/values-ms/strings.xml | 6 +-
app/src/main/res/values-my/strings.xml | 4 +-
app/src/main/res/values-nb/strings.xml | 26 +-
app/src/main/res/values-nl/strings.xml | 31 +-
app/src/main/res/values-pa/strings.xml | 3 +-
app/src/main/res/values-pl/strings.xml | 23 +-
app/src/main/res/values-ps/strings.xml | 3 +-
app/src/main/res/values-pt-rBR/strings.xml | 28 +-
app/src/main/res/values-pt-rPT/strings.xml | 9 +-
app/src/main/res/values-pt/strings.xml | 13 +-
app/src/main/res/values-ro-rRO/strings.xml | 3 +-
app/src/main/res/values-ro/strings.xml | 20 +-
app/src/main/res/values-ru/strings.xml | 31 +-
app/src/main/res/values-si-rLK/strings.xml | 7 +-
app/src/main/res/values-sk/strings.xml | 20 +-
app/src/main/res/values-sl/strings.xml | 7 +-
app/src/main/res/values-sn/strings.xml | 3 +-
app/src/main/res/values-sq/strings.xml | 3 -
app/src/main/res/values-sr/strings.xml | 28 +-
app/src/main/res/values-sv/strings.xml | 31 +-
app/src/main/res/values-ta/strings.xml | 7 +-
app/src/main/res/values-th/strings.xml | 31 +-
app/src/main/res/values-tl/strings.xml | 14 +-
app/src/main/res/values-tr/strings.xml | 29 +-
app/src/main/res/values-uk/strings.xml | 31 +-
app/src/main/res/values-ur/strings.xml | 3 +-
app/src/main/res/values-uz/strings.xml | 3 +-
app/src/main/res/values-vi/strings.xml | 20 +-
app/src/main/res/values-zh-rCN/strings.xml | 21 +-
app/src/main/res/values-zh-rTW/strings.xml | 31 +-
app/src/main/res/values/arrays.xml | 9 -
app/src/main/res/values/ic_launcher_background.xml | 2 -
app/src/main/res/values/strings.xml | 26 +-
app/src/main/res/xml/hidden_services_paths.xml | 2 +-
appcore/.gitignore | 1 +
appcore/build.gradle | 41 +
appcore/consumer-rules.pro | 0
appcore/proguard-rules.pro | 21 +
.../android/core/ExampleInstrumentedTest.kt | 24 +
appcore/src/main/AndroidManifest.xml | 3 +
.../org/torproject/android/core/ClipboardUtils.kt | 17 +
.../java/org/torproject/android/core/DiskUtils.kt | 76 +
.../java/org/torproject/android/core/Languages.kt | 174 ++
.../org/torproject/android/core/LocaleHelper.kt | 55 +
.../org/torproject/android/core/OnBootReceiver.kt | 31 +
.../core/ui/NoPersonalizedLearningEditText.kt | 12 +
.../android/core/ui/Rotate3dAnimation.kt | 48 +
.../android/core/ui/SettingsPreferencesActivity.kt | 65 +
.../org/torproject/android/core/ExampleUnitTest.kt | 17 +
bcdroid.manifest | 3 -
build.gradle | 6 +-
build.xml | 92 --
custom_rules.xml | 57 -
intentintegrator/.gitignore | 1 +
intentintegrator/build.gradle | 30 +
intentintegrator/consumer-rules.pro | 0
intentintegrator/proguard-rules.pro | 21 +
intentintegrator/src/main/AndroidManifest.xml | 5 +
.../integration/android/IntentIntegrator.java | 0
.../zxing/integration/android/IntentResult.java | 0
orbotservice/build.gradle | 3 +-
orbotservice/src/main/AndroidManifest.xml | 2 -
.../torproject/android/service/OrbotConstants.java | 32 +-
.../torproject/android/service/OrbotService.java | 1677 ++++++++------------
.../android/service/StartTorReceiver.java | 2 +-
.../android/service/TorEventHandler.java | 137 +-
.../android/service/TorServiceConstants.java | 1 -
.../android/service/util/CustomNativeLoader.java | 10 +-
.../android/service/util/CustomShell.java | 29 +-
.../service/util/CustomTorResourceInstaller.java | 164 +-
.../android/service/util/DummyActivity.java | 10 +-
.../android/service/util/ExternalIPFetcher.java | 30 +-
.../android/service/util/NativeLoader.java | 17 +-
.../android/service/util/PortForwarder.java | 20 +-
.../org/torproject/android/service/util/Prefs.java | 22 +-
.../android/service/util/TCPSourceApp.java | 138 +-
.../android/service/util/TorServiceUtils.java | 8 +-
.../org/torproject/android/service/util/Utils.java | 325 ++--
.../android/service/vpn/OrbotVpnManager.java | 535 +++----
.../android/service/vpn/TorifiedApp.java | 465 +++---
.../torproject/android/service/vpn/Tun2Socks.java | 97 +-
.../android/service/vpn/VpnConstants.java | 14 -
.../torproject/android/service/vpn/VpnPrefs.java | 9 +-
.../torproject/android/service/vpn/VpnUtils.java | 40 +-
.../main/res/drawable-hdpi-v11/ic_stat_tor_off.png | Bin 944 -> 0 bytes
orbotservice/src/main/res/drawable/ic_onion.xml | 9 -
orbotservice/src/main/res/drawable/ic_transfer.xml | 9 -
.../notification_template_part_chronometer.xml | 25 -
.../res/layout/notification_template_part_time.xml | 25 -
orbotservice/src/main/res/values-ar/strings.xml | 7 +-
orbotservice/src/main/res/values-az/strings.xml | 9 +-
orbotservice/src/main/res/values-bg/strings.xml | 7 +-
.../src/main/res/values-bn-rBD/strings.xml | 2 -
orbotservice/src/main/res/values-ca/strings.xml | 2 -
.../src/main/res/values-cs-rCZ/strings.xml | 4 +-
orbotservice/src/main/res/values-cs/strings.xml | 2 -
orbotservice/src/main/res/values-cy/strings.xml | 2 -
orbotservice/src/main/res/values-da/strings.xml | 3 -
orbotservice/src/main/res/values-de/strings.xml | 7 +-
orbotservice/src/main/res/values-el/strings.xml | 2 -
orbotservice/src/main/res/values-eo/strings.xml | 2 -
.../src/main/res/values-es-rAR/strings.xml | 2 -
orbotservice/src/main/res/values-es/strings.xml | 7 +-
orbotservice/src/main/res/values-et/strings.xml | 4 -
orbotservice/src/main/res/values-eu/strings.xml | 3 -
orbotservice/src/main/res/values-fa/strings.xml | 7 +-
orbotservice/src/main/res/values-fi/strings.xml | 7 +-
.../src/main/res/values-fr-rFR/strings.xml | 7 +-
orbotservice/src/main/res/values-fr/strings.xml | 2 -
orbotservice/src/main/res/values-gl/strings.xml | 2 -
orbotservice/src/main/res/values-he/strings.xml | 7 +-
orbotservice/src/main/res/values-hr/strings.xml | 7 +-
orbotservice/src/main/res/values-hu/strings.xml | 7 +-
orbotservice/src/main/res/values-id/strings.xml | 7 +-
.../src/main/res/values-in-rID/strings.xml | 7 +-
orbotservice/src/main/res/values-is/strings.xml | 7 +-
orbotservice/src/main/res/values-it/strings.xml | 7 +-
orbotservice/src/main/res/values-iw/strings.xml | 7 +-
orbotservice/src/main/res/values-ja/strings.xml | 7 +-
orbotservice/src/main/res/values-ko/strings.xml | 2 -
orbotservice/src/main/res/values-lv/strings.xml | 7 +-
orbotservice/src/main/res/values-mk/strings.xml | 7 +-
.../src/main/res/values-ms-rMY/strings.xml | 2 -
orbotservice/src/main/res/values-ms/strings.xml | 2 -
orbotservice/src/main/res/values-nb/strings.xml | 7 +-
orbotservice/src/main/res/values-nl/strings.xml | 7 +-
orbotservice/src/main/res/values-pl/strings.xml | 7 +-
.../src/main/res/values-pt-rBR/strings.xml | 7 +-
orbotservice/src/main/res/values-pt/strings.xml | 6 +-
orbotservice/src/main/res/values-ro/strings.xml | 7 +-
orbotservice/src/main/res/values-ru/strings.xml | 7 +-
.../src/main/res/values-si-rLK/strings.xml | 2 -
orbotservice/src/main/res/values-sk/strings.xml | 2 -
orbotservice/src/main/res/values-sl/strings.xml | 2 -
orbotservice/src/main/res/values-sr/strings.xml | 2 -
orbotservice/src/main/res/values-sv/strings.xml | 7 +-
orbotservice/src/main/res/values-ta/strings.xml | 2 -
orbotservice/src/main/res/values-th/strings.xml | 1 -
orbotservice/src/main/res/values-tl/strings.xml | 3 -
orbotservice/src/main/res/values-tr/strings.xml | 7 +-
orbotservice/src/main/res/values-uk/strings.xml | 7 +-
orbotservice/src/main/res/values-vi/strings.xml | 7 +-
.../src/main/res/values-zh-rCN/strings.xml | 7 +-
.../src/main/res/values-zh-rTW/strings.xml | 2 -
orbotservice/src/main/res/values/colors.xml | 9 -
orbotservice/src/main/res/values/strings.xml | 39 +-
settings.gradle | 2 +
update.json | 10 -
388 files changed, 4648 insertions(+), 9259 deletions(-)
diff --cc app/build.gradle
index 55d331c1,3d069fa4..2b51efbd
--- a/app/build.gradle
+++ b/app/build.gradle
@@@ -122,9 -122,11 +122,11 @@@ android
dependencies {
implementation project(':orbotservice')
- implementation 'com.google.android.material:material:1.1.0'
+ implementation 'com.google.android.material:material:1.2.0'
implementation 'pl.bclogic:pulsator4droid:1.0.3'
implementation 'com.github.apl-devs:appintro:v4.2.2'
+ implementation project(path: ':appcore')
+ implementation project(path: ':intentintegrator')
androidTestImplementation "tools.fastlane:screengrab:1.2.0"
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
implementation 'com.android.volley:volley:1.1.1'
diff --cc app/src/main/java/org/torproject/android/ui/onboarding/MoatActivity.java
index 44c86c2c,8525659c..329c8aff
--- a/app/src/main/java/org/torproject/android/ui/onboarding/MoatActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/onboarding/MoatActivity.java
@@@ -47,24 -46,15 +47,24 @@@ import org.torproject.android.service.T
import org.torproject.android.service.util.Prefs;
import org.torproject.android.ui.dialog.MoatErrorDialogFragment;
+import java.util.ArrayList;
+import java.util.Properties;
+
+import goptbundle.Goptbundle;
+import info.pluggabletransports.dispatch.DispatchConstants;
+import info.pluggabletransports.dispatch.Dispatcher;
+import info.pluggabletransports.dispatch.Transport;
+import info.pluggabletransports.dispatch.transports.legacy.MeekTransport;
+
/**
- Implements the MOAT protocol: Fetches OBFS4 bridges via Meek Azure.
-
- The bare minimum of the communication is implemented. E.g. no check, if OBFS4 is possible or which
- protocol version the server wants to speak. The first should be always good, as OBFS4 is the most widely
- supported bridge type, the latter should be the same as we requested (0.1.0) anyway.
-
- API description:
- https://github.com/NullHypothesis/bridgedb#accessing-the-moat-interface
+ * Implements the MOAT protocol: Fetches OBFS4 bridges via Meek Azure.
+ * <p>
+ * The bare minimum of the communication is implemented. E.g. no check, if OBFS4 is possible or which
+ * protocol version the server wants to speak. The first should be always good, as OBFS4 is the most widely
+ * supported bridge type, the latter should be the same as we requested (0.1.0) anyway.
+ * <p>
+ * API description:
+ * https://github.com/NullHypothesis/bridgedb#accessing-the-moat-interface
*/
public class MoatActivity extends AppCompatActivity implements View.OnClickListener, TextView.OnEditorActionListener {
More information about the tor-commits
mailing list