[tor-commits] [orbot/master] Merge branch 'master' of github.com:guardianproject/orbot

[n8fr8 at torproject.org]

commit 855bc72d89c55d02328b2b7825866f7aaf8fbaec
Merge: c2cb00f1 4e425cb0
Author: n8fr8 <nathan at guardianproject.info>
Date:   Mon Jul 27 17:41:49 2020 -0400

    Merge branch 'master' of github.com:guardianproject/orbot

 app/build.gradle                                   |   4 +
 .../integration/android/IntentIntegrator.java      |  40 ++++----
 .../org/torproject/android/OnBootReceiver.java     |   6 +-
 .../main/java/org/torproject/android/OrbotApp.java |  52 +---------
 .../org/torproject/android/OrbotMainActivity.java  |  98 ++++---------------
 .../org/torproject/android/settings/Languages.java |  18 ----
 .../android/settings/SettingsPreferences.java      |  18 ++--
 .../torproject/android/ui/AppManagerActivity.java  |  21 ++--
 .../ui/hiddenservices/ClientCookiesActivity.java   |  51 ++++------
 .../ui/hiddenservices/HiddenServicesActivity.java  |  55 +++++------
 .../ui/hiddenservices/adapters/BackupAdapter.java  |   7 +-
 .../adapters/ClientCookiesAdapter.java             |  30 +++---
 .../hiddenservices/adapters/OnionListAdapter.java  |  34 +++----
 .../ui/hiddenservices/dialogs/AddCookieDialog.java |  28 +++---
 .../dialogs/CookieActionsDialog.java               |  24 ++---
 .../hiddenservices/dialogs/CookieDeleteDialog.java |  33 +++----
 .../ui/hiddenservices/dialogs/HSActionsDialog.java |  75 ++++++---------
 .../ui/hiddenservices/dialogs/HSCookieDialog.java  |  56 +++++------
 .../ui/hiddenservices/dialogs/HSDataDialog.java    |  44 ++++-----
 .../ui/hiddenservices/dialogs/HSDeleteDialog.java  |  51 +++++-----
 .../dialogs/SelectCookieBackupDialog.java          |  35 ++-----
 .../dialogs/SelectHSBackupDialog.java              |  35 ++-----
 .../permissions/PermissionManager.java             |  37 +++----
 .../ui/hiddenservices/storage/ExternalStorage.java |   8 +-
 .../ui/onboarding/BridgeWizardActivity.java        |  49 +++-------
 .../ui/onboarding/CustomBridgesActivity.java       |  13 +--
 .../android/ui/onboarding/MoatActivity.java        | 106 ++++++++++-----------
 .../android/ui/onboarding/OnboardingActivity.java  |  15 +--
 orbotservice/build.gradle                          |   4 +
 .../android/service/ApplicationTest.java           |  13 ---
 .../torproject/android/service/OrbotService.java   |  30 ++----
 .../android/service/TorEventHandler.java           |   1 -
 .../android/service/util/ExternalIPFetcher.java    |   1 -
 .../android/service/util/TorServiceUtils.java      |   3 -
 .../torproject/android/service/vpn/VpnUtils.java   |   3 -
 35 files changed, 379 insertions(+), 719 deletions(-)