[tor-commits] [orbot/master] Merge pull request #266 from eighthave/clean-up-imports

[n8fr8 at torproject.org]

commit 4150ef67d13a76fee43eb05ccbc77e521c450eb7
Merge: 4d4020ac 667f37e3
Author: Nathan Freitas <nathan at guardianproject.info>
Date:   Mon Oct 7 12:12:49 2019 -0400

    Merge pull request #266 from eighthave/clean-up-imports
    
    Clean up imports

 app-mini/build.gradle                              |  2 +-
 .../torproject/android/mini/MiniMainActivity.java  | 14 -----
 .../torproject/android/mini/OnBootReceiver.java    |  5 +-
 .../org/torproject/android/mini/OrbotMiniApp.java  |  7 +--
 .../android/mini/settings/LocaleHelper.java        |  1 -
 .../android/mini/settings/SettingsPreferences.java |  1 -
 .../android/mini/ui/AppConfigActivity.java         |  6 --
 .../android/mini/ui/AppManagerActivity.java        | 25 ++++----
 .../mini/ui/onboarding/CustomSlideBigText.java     |  1 -
 .../mini/ui/onboarding/OnboardingActivity.java     |  2 -
 .../android/mini/vpn/VPNEnableActivity.java        |  7 +--
 app/build.gradle                                   |  2 +-
 .../org/torproject/android/OnBootReceiver.java     |  3 +-
 .../main/java/org/torproject/android/OrbotApp.java |  3 -
 .../org/torproject/android/OrbotMainActivity.java  | 69 +++++++++++-----------
 .../torproject/android/settings/LocaleHelper.java  |  1 -
 .../android/settings/SettingsPreferences.java      |  1 -
 .../torproject/android/ui/AppManagerActivity.java  | 25 ++++----
 .../torproject/android/ui/VPNEnableActivity.java   |  7 +--
 .../ui/hiddenservices/ClientCookiesActivity.java   |  2 -
 .../ui/hiddenservices/HiddenServicesActivity.java  |  1 -
 .../ui/hiddenservices/adapters/BackupAdapter.java  |  1 -
 .../adapters/ClientCookiesAdapter.java             |  1 -
 .../hiddenservices/adapters/OnionListAdapter.java  |  1 -
 .../ui/hiddenservices/backup/BackupUtils.java      |  1 -
 .../ui/hiddenservices/dialogs/AddCookieDialog.java |  1 -
 .../dialogs/CookieActionsDialog.java               |  1 -
 .../hiddenservices/dialogs/CookieDeleteDialog.java |  1 -
 .../ui/hiddenservices/dialogs/HSActionsDialog.java |  1 -
 .../ui/hiddenservices/dialogs/HSCookieDialog.java  |  2 -
 .../ui/hiddenservices/dialogs/HSDataDialog.java    |  1 -
 .../ui/hiddenservices/dialogs/HSDeleteDialog.java  |  1 -
 .../dialogs/SelectCookieBackupDialog.java          |  1 -
 .../dialogs/SelectHSBackupDialog.java              |  1 -
 .../permissions/PermissionManager.java             |  1 -
 .../providers/CookieContentProvider.java           |  1 -
 .../providers/HSContentProvider.java               |  1 -
 .../ui/onboarding/BridgeWizardActivity.java        |  1 -
 .../android/ui/onboarding/CustomSlideBigText.java  |  1 -
 .../android/ui/onboarding/OnboardingActivity.java  |  4 +-
 make-release-build                                 | 26 +++-----
 orbotservice/build.gradle                          |  2 +-
 .../android/control/TorControlConnection.java      |  2 -
 .../android/service/StartTorReceiver.java          |  1 -
 .../android/service/TorEventHandler.java           | 16 +----
 .../org/torproject/android/service/TorService.java |  7 +--
 .../android/service/util/CustomShell.java          |  3 -
 .../service/util/CustomTorResourceInstaller.java   |  1 -
 .../android/service/util/NativeLoader.java         |  2 -
 .../android/service/util/PortForwarder.java        |  1 -
 .../android/service/util/TCPSourceApp.java         | 13 ++--
 .../android/service/util/TorServiceUtils.java      |  1 -
 .../android/service/vpn/OrbotVpnManager.java       |  5 --
 .../android/service/vpn/TorVpnService.java         |  1 -
 .../torproject/android/service/vpn/Tun2Socks.java  |  2 -
 55 files changed, 89 insertions(+), 202 deletions(-)