commit 1ce3bd05a34fe49e0b8f80497d26877bbf3d3a8f Merge: bf584ccf 9142dfdb Author: n8fr8 nathan@guardianproject.info Date: Mon Sep 14 22:21:18 2020 -0400

Merge branch 'bitmold-orbot-kt-modularization'

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 | 995 +++++++++------------ .../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/build.gradle | 2 + app/src/main/AndroidManifest.xml | 4 +- .../zxing/integration/android/IntentResult.java | 95 -- .../org/torproject/android/OnBootReceiver.java | 42 - .../main/java/org/torproject/android/OrbotApp.java | 6 +- .../org/torproject/android/OrbotMainActivity.java | 12 +- .../org/torproject/android/settings/Languages.java | 195 ---- .../torproject/android/settings/LocaleHelper.java | 80 -- .../android/settings/SettingsPreferences.java | 68 -- .../android/ui/NoPersonalizedLearningEditText.java | 13 - .../torproject/android/ui/Rotate3dAnimation.java | 76 -- .../ui/hiddenservices/ClientCookiesActivity.java | 2 +- .../ui/hiddenservices/HiddenServicesActivity.java | 2 +- .../ui/hiddenservices/backup/BackupUtils.java | 2 +- .../dialogs/SelectCookieBackupDialog.java | 2 +- .../dialogs/SelectHSBackupDialog.java | 2 +- .../ui/hiddenservices/storage/ExternalStorage.java | 28 - .../ui/onboarding/BridgeWizardActivity.java | 4 +- .../android/ui/onboarding/OnboardingActivity.java | 2 +- .../res/layout/layout_add_client_cookie_dialog.xml | 4 +- app/src/main/res/layout/layout_hs_data_dialog.xml | 6 +- 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/ExternalStorage.kt | 15 + .../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 + build.gradle | 4 + 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 settings.gradle | 2 + 59 files changed, 1017 insertions(+), 2350 deletions(-)