tor-commits
Threads by month
- ----- 2026 -----
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- 1 participants
- 215143 discussions
commit 9437d9dda0687b078d9a3c6ca9d692567945c551
Author: n8fr8 <nathan(a)guardianproject.info>
Date: Tue Sep 10 09:34:37 2019 -0400
add changelog for 16123000
---
fastlane/metadata/android/en-US/changelogs/16123000.txt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/fastlane/metadata/android/en-US/changelogs/16123000.txt b/fastlane/metadata/android/en-US/changelogs/16123000.txt
new file mode 100644
index 00000000..047ea713
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/16123000.txt
@@ -0,0 +1,2 @@
+* fixes for Bridge support
+* updated to tor 0.4.1.5
1
0
[orbot/master] Merge pull request #252 from eighthave/png-repro-build
by n8fr8＠torproject.org 29 Apr '20
by n8fr8＠torproject.org 29 Apr '20
29 Apr '20
commit 4d4020ac4f18c95b3a33fc59ab5977b6c6f0b7a6
Merge: 10e6a421 30cdfa93
Author: Nathan Freitas <nathan(a)guardianproject.info>
Date: Mon Oct 7 11:40:30 2019 -0400
Merge pull request #252 from eighthave/png-repro-build
manually use `aapt singleCrunch` for reproducible builds
app-mini/src/main/ic_launcher-web.png | Bin 18915 -> 20211 bytes
.../res/drawable-hdpi-v11/ic_stat_notifyerr.png | Bin 480 -> 359 bytes
.../main/res/drawable-hdpi-v11/ic_stat_tor_off.png | Bin 744 -> 944 bytes
.../res/drawable-hdpi-v9/ic_stat_notifyerr.png | Bin 616 -> 508 bytes
.../main/res/drawable-hdpi/ic_action_settings.png | Bin 553 -> 329 bytes
.../res/drawable-hdpi/ic_settings_white_24dp.png | Bin 460 -> 816 bytes
.../main/res/drawable-hdpi/ic_stat_notifyerr.png | Bin 1312 -> 901 bytes
.../src/main/res/drawable-hdpi/ic_stat_tor.png | Bin 606 -> 912 bytes
.../res/drawable-ldpi-v11/ic_stat_notifyerr.png | Bin 294 -> 262 bytes
.../res/drawable-ldpi-v9/ic_stat_notifyerr.png | Bin 342 -> 326 bytes
.../main/res/drawable-ldpi/ic_action_settings.png | Bin 319 -> 250 bytes
.../main/res/drawable-ldpi/ic_stat_notifyerr.png | Bin 647 -> 443 bytes
.../res/drawable-mdpi-v11/ic_stat_notifyerr.png | Bin 357 -> 317 bytes
.../res/drawable-mdpi-v9/ic_stat_notifyerr.png | Bin 458 -> 417 bytes
.../res/drawable-mdpi/ic_settings_white_24dp.png | Bin 326 -> 598 bytes
.../src/main/res/drawable-mdpi/ic_stat_tor.png | Bin 389 -> 576 bytes
.../res/drawable-xhdpi-v11/ic_stat_notifyerr.png | Bin 618 -> 406 bytes
.../res/drawable-xhdpi-v9/ic_stat_notifyerr.png | Bin 747 -> 580 bytes
.../res/drawable-xhdpi/ic_settings_white_24dp.png | Bin 562 -> 982 bytes
.../src/main/res/drawable-xhdpi/ic_stat_tor.png | Bin 773 -> 1115 bytes
.../res/drawable-xxhdpi/ic_settings_white_24dp.png | Bin 843 -> 1455 bytes
.../src/main/res/drawable-xxhdpi/ic_stat_tor.png | Bin 1131 -> 1496 bytes
.../drawable-xxxhdpi/ic_settings_white_24dp.png | Bin 1074 -> 1764 bytes
.../src/main/res/drawable-xxxhdpi/ic_stat_tor.png | Bin 1564 -> 1899 bytes
app-mini/src/main/res/drawable/ic_menu_about.png | Bin 1771 -> 1479 bytes
app-mini/src/main/res/drawable/ic_menu_exit.png | Bin 2693 -> 1031 bytes
app-mini/src/main/res/drawable/ic_stat_tor_off.png | Bin 744 -> 944 bytes
app-mini/src/main/res/drawable/onion32.png | Bin 1599 -> 1402 bytes
app-mini/src/main/res/drawable/toroff.png | Bin 19187 -> 19161 bytes
app-mini/src/main/res/drawable/toron.png | Bin 19057 -> 19035 bytes
app-mini/src/main/res/drawable/torstarting.png | Bin 18052 -> 18019 bytes
app-mini/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 2019 -> 2579 bytes
.../res/mipmap-hdpi/ic_launcher_foreground.png | Bin 1815 -> 2048 bytes
.../src/main/res/mipmap-hdpi/ic_launcher_round.png | Bin 4055 -> 5226 bytes
app-mini/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 1456 -> 1473 bytes
.../res/mipmap-mdpi/ic_launcher_foreground.png | Bin 1174 -> 1536 bytes
.../src/main/res/mipmap-mdpi/ic_launcher_round.png | Bin 2620 -> 3414 bytes
app-mini/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 2761 -> 3479 bytes
.../res/mipmap-xhdpi/ic_launcher_foreground.png | Bin 2495 -> 2543 bytes
.../main/res/mipmap-xhdpi/ic_launcher_round.png | Bin 5714 -> 7313 bytes
.../src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin 4143 -> 5120 bytes
.../res/mipmap-xxhdpi/ic_launcher_foreground.png | Bin 3922 -> 3468 bytes
.../main/res/mipmap-xxhdpi/ic_launcher_round.png | Bin 8706 -> 10885 bytes
.../src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 5726 -> 6935 bytes
.../res/mipmap-xxxhdpi/ic_launcher_foreground.png | Bin 5467 -> 4466 bytes
.../main/res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 12555 -> 15090 bytes
app/build.gradle | 3 +++
.../res/drawable-hdpi-v11/ic_stat_notifyerr.png | Bin 480 -> 359 bytes
app/src/main/res/drawable-hdpi-v11/ic_stat_tor.png | Bin 802 -> 660 bytes
.../main/res/drawable-hdpi-v11/ic_stat_tor_off.png | Bin 744 -> 944 bytes
.../res/drawable-hdpi-v11/ic_stat_tor_xfer.png | Bin 967 -> 1073 bytes
.../res/drawable-hdpi-v9/ic_stat_notifyerr.png | Bin 616 -> 508 bytes
app/src/main/res/drawable-hdpi-v9/ic_stat_tor.png | Bin 713 -> 640 bytes
.../main/res/drawable-hdpi/ic_action_settings.png | Bin 553 -> 329 bytes
app/src/main/res/drawable-hdpi/ic_launcher.png | Bin 4194 -> 3616 bytes
.../res/drawable-hdpi/ic_settings_white_24dp.png | Bin 460 -> 816 bytes
.../main/res/drawable-hdpi/ic_stat_notifyerr.png | Bin 1312 -> 901 bytes
app/src/main/res/drawable-hdpi/ic_stat_tor.png | Bin 852 -> 715 bytes
.../main/res/drawable-hdpi/ic_stat_tor_xfer.png | Bin 990 -> 969 bytes
.../res/drawable-ldpi-v11/ic_stat_notifyerr.png | Bin 294 -> 262 bytes
app/src/main/res/drawable-ldpi-v11/ic_stat_tor.png | Bin 390 -> 420 bytes
.../res/drawable-ldpi-v9/ic_stat_notifyerr.png | Bin 342 -> 326 bytes
app/src/main/res/drawable-ldpi-v9/ic_stat_tor.png | Bin 358 -> 365 bytes
.../main/res/drawable-ldpi/ic_action_settings.png | Bin 319 -> 250 bytes
app/src/main/res/drawable-ldpi/ic_launcher.png | Bin 2394 -> 2004 bytes
.../main/res/drawable-ldpi/ic_stat_notifyerr.png | Bin 647 -> 443 bytes
app/src/main/res/drawable-ldpi/ic_stat_tor.png | Bin 606 -> 494 bytes
.../res/drawable-mdpi-v11/ic_stat_notifyerr.png | Bin 357 -> 317 bytes
app/src/main/res/drawable-mdpi-v11/ic_stat_tor.png | Bin 517 -> 441 bytes
.../res/drawable-mdpi-v11/ic_stat_tor_xfer.png | Bin 607 -> 741 bytes
.../res/drawable-mdpi-v9/ic_stat_notifyerr.png | Bin 458 -> 417 bytes
app/src/main/res/drawable-mdpi-v9/ic_stat_tor.png | Bin 475 -> 464 bytes
.../res/drawable-mdpi/ic_settings_white_24dp.png | Bin 326 -> 598 bytes
.../res/drawable-xhdpi-v11/ic_stat_notifyerr.png | Bin 618 -> 406 bytes
.../main/res/drawable-xhdpi-v11/ic_stat_tor.png | Bin 1165 -> 887 bytes
.../res/drawable-xhdpi-v11/ic_stat_tor_xfer.png | Bin 1337 -> 1348 bytes
.../res/drawable-xhdpi-v9/ic_stat_notifyerr.png | Bin 747 -> 580 bytes
app/src/main/res/drawable-xhdpi-v9/ic_stat_tor.png | Bin 970 -> 864 bytes
.../res/drawable-xhdpi/ic_settings_white_24dp.png | Bin 562 -> 982 bytes
.../main/res/drawable-xxhdpi-v11/ic_stat_tor.png | Bin 1903 -> 1307 bytes
.../res/drawable-xxhdpi-v11/ic_stat_tor_xfer.png | Bin 2019 -> 1734 bytes
.../res/drawable-xxhdpi/ic_settings_white_24dp.png | Bin 843 -> 1455 bytes
.../main/res/drawable-xxxhdpi-v11/ic_stat_tor.png | Bin 2661 -> 1734 bytes
.../res/drawable-xxxhdpi-v11/ic_stat_tor_xfer.png | Bin 3156 -> 2424 bytes
.../drawable-xxxhdpi/ic_settings_white_24dp.png | Bin 1074 -> 1764 bytes
app/src/main/res/drawable/ic_launcher.png | Bin 6055 -> 5111 bytes
app/src/main/res/drawable/ic_menu_about.png | Bin 1771 -> 1479 bytes
app/src/main/res/drawable/ic_menu_exit.png | Bin 2693 -> 1031 bytes
app/src/main/res/drawable/ic_stat_tor_off.png | Bin 744 -> 944 bytes
app/src/main/res/drawable/ic_stat_tor_xfer.png | Bin 600 -> 628 bytes
app/src/main/res/drawable/onion32.png | Bin 1599 -> 1402 bytes
app/src/main/res/drawable/toroff.png | Bin 19187 -> 19161 bytes
app/src/main/res/drawable/toron.png | Bin 19057 -> 19035 bytes
app/src/main/res/drawable/torstarting.png | Bin 18052 -> 18019 bytes
.../android/en-US/images/featureGraphic.png | Bin 299999 -> 224893 bytes
fastlane/metadata/android/en-US/images/icon.png | Bin 46595 -> 31345 bytes
.../phoneScreenshots/device-2018-01-05-122015.png | Bin 337474 -> 254422 bytes
.../phoneScreenshots/device-2018-01-05-122035.png | Bin 119904 -> 96898 bytes
.../phoneScreenshots/device-2018-01-05-122111.png | Bin 472163 -> 358410 bytes
.../phoneScreenshots/device-2018-01-05-122301.png | Bin 65793 -> 52269 bytes
.../phoneScreenshots/device-2018-01-05-122310.png | Bin 65793 -> 52269 bytes
.../phoneScreenshots/device-2018-01-05-122314.png | Bin 65793 -> 52269 bytes
.../phoneScreenshots/device-2018-01-05-122344.png | Bin 236020 -> 193597 bytes
.../phoneScreenshots/device-2018-01-05-123814.png | Bin 282081 -> 222617 bytes
.../phoneScreenshots/device-2018-01-05-123828.png | Bin 148480 -> 120576 bytes
.../phoneScreenshots/device-2018-01-05-123836.png | Bin 161380 -> 130945 bytes
.../phoneScreenshots/device-2018-01-05-123908.png | Bin 344849 -> 259920 bytes
.../phoneScreenshots/device-2018-01-05-124039.png | Bin 49019 -> 39303 bytes
.../phoneScreenshots/device-2018-01-05-124045.png | Bin 73495 -> 58218 bytes
.../phoneScreenshots/device-2018-01-05-124052.png | Bin 80358 -> 64827 bytes
.../phoneScreenshots/device-2018-01-05-124059.png | Bin 120833 -> 96786 bytes
orbotservice/build.gradle | 4 ++++
.../res/drawable-hdpi-v11/ic_stat_notifyerr.png | Bin 480 -> 359 bytes
.../main/res/drawable-hdpi-v11/ic_stat_tor_off.png | Bin 744 -> 944 bytes
.../res/drawable-hdpi-v9/ic_stat_notifyerr.png | Bin 616 -> 508 bytes
.../res/drawable-hdpi/ic_refresh_white_24dp.png | Bin 387 -> 675 bytes
.../main/res/drawable-hdpi/ic_stat_notifyerr.png | Bin 1312 -> 901 bytes
.../src/main/res/drawable-hdpi/ic_stat_tor.png | Bin 1136 -> 1519 bytes
.../res/drawable-ldpi-v11/ic_stat_notifyerr.png | Bin 294 -> 262 bytes
.../res/drawable-ldpi-v9/ic_stat_notifyerr.png | Bin 342 -> 326 bytes
.../main/res/drawable-ldpi/ic_stat_notifyerr.png | Bin 647 -> 443 bytes
.../res/drawable-mdpi-v11/ic_stat_notifyerr.png | Bin 357 -> 317 bytes
.../res/drawable-mdpi-v9/ic_stat_notifyerr.png | Bin 458 -> 417 bytes
.../drawable-mdpi/ic_action_settings.png | Bin 364 -> 251 bytes
.../drawable-mdpi/ic_autorenew_black_36dp.png | Bin 369 -> 578 bytes
.../drawable-mdpi/ic_filter_none_black_36dp.png | Bin 198 -> 251 bytes
.../drawable-mdpi/drawable-mdpi/ic_launcher.png | Bin 2677 -> 2319 bytes
.../ic_playlist_add_check_black_36dp.png | Bin 163 -> 202 bytes
.../drawable-mdpi/ic_stat_notifyerr.png | Bin 883 -> 617 bytes
.../drawable-mdpi/drawable-mdpi/ic_stat_tor.png | Bin 535 -> 479 bytes
.../drawable-mdpi/ic_stat_tor_xfer.png | Bin 600 -> 628 bytes
.../res/drawable-mdpi/drawable-mdpi/inverse.png | Bin 1027 -> 1231 bytes
.../res/drawable-mdpi/ic_refresh_white_24dp.png | Bin 254 -> 426 bytes
.../main/res/drawable-mdpi/ic_stat_notifyerr.png | Bin 883 -> 617 bytes
.../src/main/res/drawable-mdpi/ic_stat_tor.png | Bin 622 -> 943 bytes
.../res/drawable-xhdpi-v11/ic_stat_notifyerr.png | Bin 618 -> 406 bytes
.../res/drawable-xhdpi-v9/ic_stat_notifyerr.png | Bin 747 -> 580 bytes
.../res/drawable-xhdpi/ic_refresh_white_24dp.png | Bin 509 -> 895 bytes
.../main/res/drawable-xhdpi/ic_stat_notifyerr.png | Bin 1796 -> 1370 bytes
.../src/main/res/drawable-xhdpi/ic_stat_tor.png | Bin 1774 -> 2148 bytes
.../drawable-xxhdpi/ic_autorenew_black_36dp.png | Bin 1000 -> 1440 bytes
.../drawable-xxhdpi/ic_filter_none_black_36dp.png | Bin 415 -> 518 bytes
.../drawable-xxhdpi/ic_launcher.png | Bin 9556 -> 7975 bytes
.../ic_playlist_add_check_black_36dp.png | Bin 325 -> 413 bytes
.../drawable-xxhdpi/ic_stat_tor.png | Bin 1872 -> 1430 bytes
.../drawable-xxhdpi/ic_stat_tor_xfer.png | Bin 2216 -> 1295 bytes
.../drawable-xxhdpi/drawable-xxhdpi/inverse.png | Bin 1027 -> 1231 bytes
.../res/drawable-xxhdpi/ic_refresh_white_24dp.png | Bin 734 -> 1231 bytes
.../src/main/res/drawable-xxhdpi/ic_stat_tor.png | Bin 3241 -> 3296 bytes
.../drawable-xxxhdpi/ic_autorenew_black_36dp.png | Bin 1362 -> 1953 bytes
.../drawable-xxxhdpi/ic_filter_none_black_36dp.png | Bin 505 -> 577 bytes
.../drawable-xxxhdpi/ic_launcher.png | Bin 13297 -> 11077 bytes
.../ic_playlist_add_check_black_36dp.png | Bin 379 -> 440 bytes
.../drawable-xxxhdpi/ic_stat_tor.png | Bin 2631 -> 1998 bytes
.../drawable-xxxhdpi/ic_stat_tor_xfer.png | Bin 2859 -> 1585 bytes
.../drawable-xxxhdpi/drawable-xxxhdpi/inverse.png | Bin 1027 -> 1231 bytes
.../res/drawable-xxxhdpi/ic_refresh_white_24dp.png | Bin 967 -> 1553 bytes
.../src/main/res/drawable-xxxhdpi/ic_stat_tor.png | Bin 3188 -> 3580 bytes
tools/png-pre-compress | 18 ++++++++++++++++++
159 files changed, 25 insertions(+)
1
0
[orbot/master] Merge pull request #266 from eighthave/clean-up-imports
by n8fr8＠torproject.org 29 Apr '20
by n8fr8＠torproject.org 29 Apr '20
29 Apr '20
commit 4150ef67d13a76fee43eb05ccbc77e521c450eb7
Merge: 4d4020ac 667f37e3
Author: Nathan Freitas <nathan(a)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(-)
1
0
[orbot/master] do not startForegroundService() if persistNotifications is false
by n8fr8＠torproject.org 29 Apr '20
by n8fr8＠torproject.org 29 Apr '20
29 Apr '20
commit 2a5eec5dfa291a760870ea410c67c679cbe58f7d
Author: Hans-Christoph Steiner <hans(a)eds.org>
Date: Fri Oct 25 11:25:38 2019 +0200
do not startForegroundService() if persistNotifications is false
---
.../java/org/torproject/android/service/StartTorReceiver.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/orbotservice/src/main/java/org/torproject/android/service/StartTorReceiver.java b/orbotservice/src/main/java/org/torproject/android/service/StartTorReceiver.java
index b6f96789..b10c97b6 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/StartTorReceiver.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/StartTorReceiver.java
@@ -21,13 +21,12 @@ public class StartTorReceiver extends BroadcastReceiver implements TorServiceCon
if (Prefs.allowBackgroundStarts()) {
Intent startTorIntent = new Intent(context, TorService.class);
startTorIntent.setAction(action);
- if (packageName != null)
- startTorIntent.putExtra(EXTRA_PACKAGE_NAME, packageName);
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
- context.startForegroundService(startTorIntent);
+ if (packageName != null) {
+ startTorIntent.putExtra(TorService.EXTRA_PACKAGE_NAME, packageName);
}
- else
- {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && Prefs.persistNotifications()) {
+ context.startForegroundService(startTorIntent);
+ } else {
context.startService(startTorIntent);
}
} else if (!TextUtils.isEmpty(packageName)) {
1
0
[orbot/master] run Android Studio's Optimize Imports on whole project
by n8fr8＠torproject.org 29 Apr '20
by n8fr8＠torproject.org 29 Apr '20
29 Apr '20
commit 667f37e301c06f052cad2da974b9056970d41c32
Author: Hans-Christoph Steiner <hans(a)eds.org>
Date: Mon Oct 7 17:58:38 2019 +0200
run Android Studio's Optimize Imports on whole project
---
.../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 +--
.../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 +-
.../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 -
51 files changed, 78 insertions(+), 181 deletions(-)
diff --git a/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java b/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java
index 54cf23a9..6710778d 100644
--- a/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java
+++ b/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java
@@ -3,7 +3,6 @@
package org.torproject.android.mini;
-import android.Manifest;
import android.app.ActivityManager;
import android.app.ActivityManager.RunningServiceInfo;
import android.app.AlertDialog;
@@ -14,13 +13,10 @@ import android.content.IntentFilter;
import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
import android.graphics.Canvas;
-import android.graphics.drawable.AdaptiveIconDrawable;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.net.Uri;
@@ -47,15 +43,11 @@ import android.view.View;
import android.view.View.OnLongClickListener;
import android.view.ViewGroup;
import android.view.animation.AccelerateInterpolator;
-import android.widget.Button;
import android.widget.CompoundButton;
import android.widget.ImageView;
-import android.widget.LinearLayout;
import android.widget.TextView;
-
import com.google.zxing.integration.android.IntentIntegrator;
import com.google.zxing.integration.android.IntentResult;
-
import org.json.JSONArray;
import org.torproject.android.mini.settings.Languages;
import org.torproject.android.mini.settings.LocaleHelper;
@@ -77,19 +69,13 @@ import org.torproject.android.service.vpn.VpnPrefs;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
-import java.net.URLEncoder;
import java.text.NumberFormat;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
import java.util.Locale;
import java.util.StringTokenizer;
import static org.torproject.android.mini.MainConstants.RESULT_CLOSE_ALL;
-import static org.torproject.android.mini.MainConstants.URL_TOR_CHECK;
import static org.torproject.android.service.vpn.VpnPrefs.PREFS_KEY_TORIFIED;
import static org.torproject.android.service.vpn.VpnUtils.getSharedPrefs;
diff --git a/app-mini/src/main/java/org/torproject/android/mini/OnBootReceiver.java b/app-mini/src/main/java/org/torproject/android/mini/OnBootReceiver.java
index 6ddaf47e..d2dab5d8 100644
--- a/app-mini/src/main/java/org/torproject/android/mini/OnBootReceiver.java
+++ b/app-mini/src/main/java/org/torproject/android/mini/OnBootReceiver.java
@@ -5,11 +5,10 @@ import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
-
-import org.torproject.android.service.util.Prefs;
+import org.torproject.android.mini.vpn.VPNEnableActivity;
import org.torproject.android.service.TorService;
import org.torproject.android.service.TorServiceConstants;
-import org.torproject.android.mini.vpn.VPNEnableActivity;
+import org.torproject.android.service.util.Prefs;
public class OnBootReceiver extends BroadcastReceiver {
diff --git a/app-mini/src/main/java/org/torproject/android/mini/OrbotMiniApp.java b/app-mini/src/main/java/org/torproject/android/mini/OrbotMiniApp.java
index 95e867cf..80b34d6d 100644
--- a/app-mini/src/main/java/org/torproject/android/mini/OrbotMiniApp.java
+++ b/app-mini/src/main/java/org/torproject/android/mini/OrbotMiniApp.java
@@ -12,16 +12,13 @@ import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.support.v4.app.NotificationCompat;
-
import com.github.javiersantos.appupdater.AppUpdater;
import com.github.javiersantos.appupdater.enums.Display;
import com.github.javiersantos.appupdater.enums.UpdateFrom;
-
-import org.torproject.android.service.OrbotConstants;
-import org.torproject.android.service.util.Prefs;
-
import org.torproject.android.mini.settings.Languages;
import org.torproject.android.mini.settings.LocaleHelper;
+import org.torproject.android.service.OrbotConstants;
+import org.torproject.android.service.util.Prefs;
import java.util.Locale;
diff --git a/app-mini/src/main/java/org/torproject/android/mini/settings/LocaleHelper.java b/app-mini/src/main/java/org/torproject/android/mini/settings/LocaleHelper.java
index 2d84e988..e4b29be2 100644
--- a/app-mini/src/main/java/org/torproject/android/mini/settings/LocaleHelper.java
+++ b/app-mini/src/main/java/org/torproject/android/mini/settings/LocaleHelper.java
@@ -5,7 +5,6 @@ import android.content.Context;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.os.Build;
-
import org.torproject.android.service.util.Prefs;
import java.util.Locale;
diff --git a/app-mini/src/main/java/org/torproject/android/mini/settings/SettingsPreferences.java b/app-mini/src/main/java/org/torproject/android/mini/settings/SettingsPreferences.java
index f551f306..e5b5074b 100644
--- a/app-mini/src/main/java/org/torproject/android/mini/settings/SettingsPreferences.java
+++ b/app-mini/src/main/java/org/torproject/android/mini/settings/SettingsPreferences.java
@@ -15,7 +15,6 @@ import android.preference.PreferenceCategory;
import android.preference.PreferenceScreen;
import android.view.inputmethod.EditorInfo;
import android.widget.EditText;
-
import org.torproject.android.mini.R;
public class SettingsPreferences extends PreferenceActivity {
diff --git a/app-mini/src/main/java/org/torproject/android/mini/ui/AppConfigActivity.java b/app-mini/src/main/java/org/torproject/android/mini/ui/AppConfigActivity.java
index d57674d3..a8488e3d 100644
--- a/app-mini/src/main/java/org/torproject/android/mini/ui/AppConfigActivity.java
+++ b/app-mini/src/main/java/org/torproject/android/mini/ui/AppConfigActivity.java
@@ -4,19 +4,13 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.ApplicationInfo;
import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
-import android.view.View;
import android.widget.CompoundButton;
import android.widget.Switch;
-
-import org.torproject.android.mini.MainConstants;
-import org.torproject.android.mini.MiniMainActivity;
import org.torproject.android.mini.R;
import org.torproject.android.service.OrbotConstants;
import org.torproject.android.service.util.TorServiceUtils;
diff --git a/app-mini/src/main/java/org/torproject/android/mini/ui/AppManagerActivity.java b/app-mini/src/main/java/org/torproject/android/mini/ui/AppManagerActivity.java
index ea66d7f2..27425bce 100644
--- a/app-mini/src/main/java/org/torproject/android/mini/ui/AppManagerActivity.java
+++ b/app-mini/src/main/java/org/torproject/android/mini/ui/AppManagerActivity.java
@@ -3,19 +3,6 @@
package org.torproject.android.mini.ui;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.torproject.android.mini.R;
-import org.torproject.android.service.OrbotConstants;
-import org.torproject.android.service.util.TorServiceUtils;
-import org.torproject.android.service.vpn.TorifiedApp;
-
import android.Manifest;
import android.content.Intent;
import android.content.SharedPreferences;
@@ -34,12 +21,22 @@ import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
-import android.widget.CheckBox;
import android.widget.GridView;
import android.widget.ImageView;
import android.widget.ListAdapter;
import android.widget.ProgressBar;
import android.widget.TextView;
+import org.torproject.android.mini.R;
+import org.torproject.android.service.OrbotConstants;
+import org.torproject.android.service.util.TorServiceUtils;
+import org.torproject.android.service.vpn.TorifiedApp;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
import static org.torproject.android.service.vpn.VpnPrefs.PREFS_KEY_TORIFIED;
diff --git a/app-mini/src/main/java/org/torproject/android/mini/ui/onboarding/CustomSlideBigText.java b/app-mini/src/main/java/org/torproject/android/mini/ui/onboarding/CustomSlideBigText.java
index 133b3241..a370c6f1 100644
--- a/app-mini/src/main/java/org/torproject/android/mini/ui/onboarding/CustomSlideBigText.java
+++ b/app-mini/src/main/java/org/torproject/android/mini/ui/onboarding/CustomSlideBigText.java
@@ -9,7 +9,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;
-
import org.torproject.android.mini.R;
diff --git a/app-mini/src/main/java/org/torproject/android/mini/ui/onboarding/OnboardingActivity.java b/app-mini/src/main/java/org/torproject/android/mini/ui/onboarding/OnboardingActivity.java
index f6531a7d..5e661999 100644
--- a/app-mini/src/main/java/org/torproject/android/mini/ui/onboarding/OnboardingActivity.java
+++ b/app-mini/src/main/java/org/torproject/android/mini/ui/onboarding/OnboardingActivity.java
@@ -4,9 +4,7 @@ import android.content.Context;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
-
import com.github.paolorotolo.appintro.AppIntro;
-
import org.torproject.android.mini.R;
import org.torproject.android.mini.settings.LocaleHelper;
diff --git a/app-mini/src/main/java/org/torproject/android/mini/vpn/VPNEnableActivity.java b/app-mini/src/main/java/org/torproject/android/mini/vpn/VPNEnableActivity.java
index 29492d3e..c252852b 100644
--- a/app-mini/src/main/java/org/torproject/android/mini/vpn/VPNEnableActivity.java
+++ b/app-mini/src/main/java/org/torproject/android/mini/vpn/VPNEnableActivity.java
@@ -1,9 +1,5 @@
package org.torproject.android.mini.vpn;
-import org.torproject.android.service.util.Prefs;
-import org.torproject.android.service.TorService;
-import org.torproject.android.service.TorServiceConstants;
-
import android.content.Intent;
import android.net.VpnService;
import android.os.Build;
@@ -12,6 +8,9 @@ import android.os.Handler;
import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import android.view.Window;
+import org.torproject.android.service.TorService;
+import org.torproject.android.service.TorServiceConstants;
+import org.torproject.android.service.util.Prefs;
/**
* To combat background service being stopped/swiped
diff --git a/app/src/main/java/org/torproject/android/OnBootReceiver.java b/app/src/main/java/org/torproject/android/OnBootReceiver.java
index b18aff78..6a3cc6fa 100644
--- a/app/src/main/java/org/torproject/android/OnBootReceiver.java
+++ b/app/src/main/java/org/torproject/android/OnBootReceiver.java
@@ -5,10 +5,9 @@ import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
-
-import org.torproject.android.service.util.Prefs;
import org.torproject.android.service.TorService;
import org.torproject.android.service.TorServiceConstants;
+import org.torproject.android.service.util.Prefs;
import org.torproject.android.ui.VPNEnableActivity;
public class OnBootReceiver extends BroadcastReceiver {
diff --git a/app/src/main/java/org/torproject/android/OrbotApp.java b/app/src/main/java/org/torproject/android/OrbotApp.java
index dbd9d469..f022f611 100644
--- a/app/src/main/java/org/torproject/android/OrbotApp.java
+++ b/app/src/main/java/org/torproject/android/OrbotApp.java
@@ -12,14 +12,11 @@ import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.support.v4.app.NotificationCompat;
-
import com.github.javiersantos.appupdater.AppUpdater;
import com.github.javiersantos.appupdater.enums.Display;
import com.github.javiersantos.appupdater.enums.UpdateFrom;
-
import org.torproject.android.service.OrbotConstants;
import org.torproject.android.service.util.Prefs;
-
import org.torproject.android.settings.Languages;
import org.torproject.android.settings.LocaleHelper;
diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index 91683ea9..82a0cef9 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -3,40 +3,6 @@
package org.torproject.android;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.Locale;
-import java.util.StringTokenizer;
-
-import org.json.JSONArray;
-import org.torproject.android.service.OrbotConstants;
-import org.torproject.android.service.util.Prefs;
-import org.torproject.android.service.TorService;
-import org.torproject.android.service.TorServiceConstants;
-import org.torproject.android.service.util.TorServiceUtils;
-import org.torproject.android.service.vpn.VpnConstants;
-import org.torproject.android.service.vpn.VpnPrefs;
-import org.torproject.android.settings.Languages;
-import org.torproject.android.settings.LocaleHelper;
-import org.torproject.android.settings.SettingsPreferences;
-import org.torproject.android.ui.AppManagerActivity;
-import org.torproject.android.ui.Rotate3dAnimation;
-import org.torproject.android.ui.onboarding.BridgeWizardActivity;
-import org.torproject.android.ui.onboarding.OnboardingActivity;
-import org.torproject.android.ui.hiddenservices.ClientCookiesActivity;
-import org.torproject.android.ui.hiddenservices.HiddenServicesActivity;
-import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
-import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
-import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
-import org.torproject.android.ui.VPNEnableActivity;
-
import android.app.ActivityManager;
import android.app.ActivityManager.RunningServiceInfo;
import android.app.AlertDialog;
@@ -84,12 +50,43 @@ import android.widget.LinearLayout;
import android.widget.Spinner;
import android.widget.TextView;
import android.widget.Toast;
-
import com.google.zxing.integration.android.IntentIntegrator;
import com.google.zxing.integration.android.IntentResult;
-
+import org.json.JSONArray;
+import org.torproject.android.service.OrbotConstants;
+import org.torproject.android.service.TorService;
+import org.torproject.android.service.TorServiceConstants;
+import org.torproject.android.service.util.Prefs;
+import org.torproject.android.service.util.TorServiceUtils;
+import org.torproject.android.service.vpn.VpnConstants;
+import org.torproject.android.service.vpn.VpnPrefs;
+import org.torproject.android.settings.Languages;
+import org.torproject.android.settings.LocaleHelper;
+import org.torproject.android.settings.SettingsPreferences;
+import org.torproject.android.ui.AppManagerActivity;
+import org.torproject.android.ui.Rotate3dAnimation;
+import org.torproject.android.ui.VPNEnableActivity;
+import org.torproject.android.ui.hiddenservices.ClientCookiesActivity;
+import org.torproject.android.ui.hiddenservices.HiddenServicesActivity;
+import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
+import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
+import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
+import org.torproject.android.ui.onboarding.BridgeWizardActivity;
+import org.torproject.android.ui.onboarding.OnboardingActivity;
import pl.bclogic.pulsator4droid.library.PulsatorLayout;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.text.NumberFormat;
+import java.util.ArrayList;
+import java.util.Locale;
+import java.util.StringTokenizer;
+
import static android.support.v4.content.FileProvider.getUriForFile;
import static org.torproject.android.MainConstants.COUNTRY_CODES;
import static org.torproject.android.MainConstants.RESULT_CLOSE_ALL;
diff --git a/app/src/main/java/org/torproject/android/settings/LocaleHelper.java b/app/src/main/java/org/torproject/android/settings/LocaleHelper.java
index e1f496e4..ea3fde93 100644
--- a/app/src/main/java/org/torproject/android/settings/LocaleHelper.java
+++ b/app/src/main/java/org/torproject/android/settings/LocaleHelper.java
@@ -5,7 +5,6 @@ import android.content.Context;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.os.Build;
-
import org.torproject.android.service.util.Prefs;
import java.util.Locale;
diff --git a/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
index 040b7b57..2af632ee 100644
--- a/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
+++ b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
@@ -15,7 +15,6 @@ import android.preference.PreferenceCategory;
import android.preference.PreferenceScreen;
import android.view.inputmethod.EditorInfo;
import android.widget.EditText;
-
import org.torproject.android.R;
public class SettingsPreferences extends PreferenceActivity {
diff --git a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
index 56b83430..d5ea6f8e 100644
--- a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
@@ -3,19 +3,6 @@
package org.torproject.android.ui;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.torproject.android.service.OrbotConstants;
-import org.torproject.android.R;
-import org.torproject.android.service.util.TorServiceUtils;
-import org.torproject.android.service.vpn.TorifiedApp;
-
import android.Manifest;
import android.content.Intent;
import android.content.SharedPreferences;
@@ -40,6 +27,18 @@ import android.widget.ImageView;
import android.widget.ListAdapter;
import android.widget.ProgressBar;
import android.widget.TextView;
+import org.torproject.android.R;
+import org.torproject.android.service.OrbotConstants;
+import org.torproject.android.service.util.TorServiceUtils;
+import org.torproject.android.service.vpn.TorifiedApp;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
import static org.torproject.android.service.vpn.VpnPrefs.PREFS_KEY_TORIFIED;
diff --git a/app/src/main/java/org/torproject/android/ui/VPNEnableActivity.java b/app/src/main/java/org/torproject/android/ui/VPNEnableActivity.java
index fd8df38c..09bdf84a 100644
--- a/app/src/main/java/org/torproject/android/ui/VPNEnableActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/VPNEnableActivity.java
@@ -1,9 +1,5 @@
package org.torproject.android.ui;
-import org.torproject.android.service.util.Prefs;
-import org.torproject.android.service.TorService;
-import org.torproject.android.service.TorServiceConstants;
-
import android.content.Intent;
import android.net.VpnService;
import android.os.Build;
@@ -12,6 +8,9 @@ import android.os.Handler;
import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import android.view.Window;
+import org.torproject.android.service.TorService;
+import org.torproject.android.service.TorServiceConstants;
+import org.torproject.android.service.util.Prefs;
/**
* To combat background service being stopped/swiped
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java
index e6939800..8ff14fbb 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java
@@ -18,10 +18,8 @@ import android.view.View;
import android.widget.AdapterView;
import android.widget.ListView;
import android.widget.Toast;
-
import com.google.zxing.integration.android.IntentIntegrator;
import com.google.zxing.integration.android.IntentResult;
-
import org.json.JSONException;
import org.json.JSONObject;
import org.torproject.android.R;
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java
index d7c1f313..f41babdf 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java
@@ -20,7 +20,6 @@ import android.widget.ArrayAdapter;
import android.widget.ListView;
import android.widget.Spinner;
import android.widget.Toast;
-
import org.torproject.android.R;
import org.torproject.android.settings.LocaleHelper;
import org.torproject.android.ui.hiddenservices.adapters.OnionListAdapter;
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/BackupAdapter.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/BackupAdapter.java
index 196023b3..272dbf36 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/BackupAdapter.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/BackupAdapter.java
@@ -6,7 +6,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.TextView;
-
import org.torproject.android.R;
import java.io.File;
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/ClientCookiesAdapter.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/ClientCookiesAdapter.java
index bbc317a6..10108ba8 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/ClientCookiesAdapter.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/ClientCookiesAdapter.java
@@ -12,7 +12,6 @@ import android.widget.CompoundButton;
import android.widget.Switch;
import android.widget.TextView;
import android.widget.Toast;
-
import org.torproject.android.R;
import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/OnionListAdapter.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/OnionListAdapter.java
index 9824c773..a41befdf 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/OnionListAdapter.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/OnionListAdapter.java
@@ -12,7 +12,6 @@ import android.widget.CompoundButton;
import android.widget.Switch;
import android.widget.TextView;
import android.widget.Toast;
-
import org.torproject.android.R;
import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java
index a4790dd8..8efa47d3 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java
@@ -7,7 +7,6 @@ import android.database.Cursor;
import android.net.Uri;
import android.os.ParcelFileDescriptor;
import android.widget.Toast;
-
import org.json.JSONException;
import org.json.JSONObject;
import org.torproject.android.R;
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/AddCookieDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/AddCookieDialog.java
index 8441d53f..af8922d6 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/AddCookieDialog.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/AddCookieDialog.java
@@ -12,7 +12,6 @@ import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.Toast;
-
import org.torproject.android.R;
import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieActionsDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieActionsDialog.java
index 7b5a2cfe..03dddbd6 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieActionsDialog.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieActionsDialog.java
@@ -12,7 +12,6 @@ import android.support.v7.app.AlertDialog;
import android.view.View;
import android.widget.Button;
import android.widget.Toast;
-
import org.torproject.android.R;
import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieDeleteDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieDeleteDialog.java
index 60c4d8e3..d2b1220d 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieDeleteDialog.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieDeleteDialog.java
@@ -8,7 +8,6 @@ import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.support.v7.app.AlertDialog;
-
import org.torproject.android.R;
import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSActionsDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSActionsDialog.java
index 5be76917..ce77fd2a 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSActionsDialog.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSActionsDialog.java
@@ -14,7 +14,6 @@ import android.support.v7.app.AlertDialog;
import android.view.View;
import android.widget.Button;
import android.widget.Toast;
-
import org.torproject.android.R;
import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSCookieDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSCookieDialog.java
index 39c1b510..eb9ee9ce 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSCookieDialog.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSCookieDialog.java
@@ -12,9 +12,7 @@ import android.view.View;
import android.widget.Button;
import android.widget.TextView;
import android.widget.Toast;
-
import com.google.zxing.integration.android.IntentIntegrator;
-
import org.json.JSONException;
import org.json.JSONObject;
import org.torproject.android.R;
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java
index 01e09dff..d7ba35e3 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java
@@ -13,7 +13,6 @@ import android.widget.Button;
import android.widget.CheckBox;
import android.widget.EditText;
import android.widget.Toast;
-
import org.torproject.android.R;
import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java
index ac5df743..cf38ffab 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java
@@ -8,7 +8,6 @@ import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.support.v7.app.AlertDialog;
-
import org.torproject.android.R;
import org.torproject.android.service.TorServiceConstants;
import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/SelectCookieBackupDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/SelectCookieBackupDialog.java
index de5b7848..af362358 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/SelectCookieBackupDialog.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/SelectCookieBackupDialog.java
@@ -9,7 +9,6 @@ import android.support.v7.app.AlertDialog;
import android.view.View;
import android.widget.AdapterView;
import android.widget.ListView;
-
import org.torproject.android.R;
import org.torproject.android.ui.hiddenservices.adapters.BackupAdapter;
import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/SelectHSBackupDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/SelectHSBackupDialog.java
index a6e3bac9..cb0c2bfe 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/SelectHSBackupDialog.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/SelectHSBackupDialog.java
@@ -9,7 +9,6 @@ import android.support.v7.app.AlertDialog;
import android.view.View;
import android.widget.AdapterView;
import android.widget.ListView;
-
import org.torproject.android.R;
import org.torproject.android.ui.hiddenservices.adapters.BackupAdapter;
import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/permissions/PermissionManager.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/permissions/PermissionManager.java
index a9df5a95..3ee11ec8 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/permissions/PermissionManager.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/permissions/PermissionManager.java
@@ -15,7 +15,6 @@ import android.support.design.widget.Snackbar;
import android.support.v4.app.ActivityCompat;
import android.support.v4.app.FragmentActivity;
import android.view.View;
-
import org.torproject.android.R;
public class PermissionManager {
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/CookieContentProvider.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/CookieContentProvider.java
index f420a6d8..1f31b9cb 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/CookieContentProvider.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/CookieContentProvider.java
@@ -11,7 +11,6 @@ import android.net.Uri;
import android.provider.BaseColumns;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
-
import org.torproject.android.ui.hiddenservices.database.HSDatabase;
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/HSContentProvider.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/HSContentProvider.java
index d7b558fd..07641ea0 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/HSContentProvider.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/HSContentProvider.java
@@ -11,7 +11,6 @@ import android.net.Uri;
import android.provider.BaseColumns;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
-
import org.torproject.android.ui.hiddenservices.database.HSDatabase;
diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
index cd43ea0c..15216333 100644
--- a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
@@ -15,7 +15,6 @@ import android.view.MenuItem;
import android.view.View;
import android.widget.RadioButton;
import android.widget.TextView;
-
import org.torproject.android.R;
import org.torproject.android.service.util.Prefs;
import org.torproject.android.settings.LocaleHelper;
diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/CustomSlideBigText.java b/app/src/main/java/org/torproject/android/ui/onboarding/CustomSlideBigText.java
index 35f5a55a..2ed1c01c 100644
--- a/app/src/main/java/org/torproject/android/ui/onboarding/CustomSlideBigText.java
+++ b/app/src/main/java/org/torproject/android/ui/onboarding/CustomSlideBigText.java
@@ -9,7 +9,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;
-
import org.torproject.android.R;
public class CustomSlideBigText extends Fragment {
diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java
index da473ef1..88359434 100644
--- a/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java
@@ -6,14 +6,12 @@ import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.view.View;
-
import com.github.paolorotolo.appintro.AppIntro;
-
import org.torproject.android.R;
import org.torproject.android.settings.LocaleHelper;
import org.torproject.android.ui.AppManagerActivity;
-import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
import org.torproject.android.ui.VPNEnableActivity;
+import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
public class OnboardingActivity extends AppIntro {
diff --git a/orbotservice/src/main/java/org/torproject/android/control/TorControlConnection.java b/orbotservice/src/main/java/org/torproject/android/control/TorControlConnection.java
index 4f1fe95b..52f9be49 100644
--- a/orbotservice/src/main/java/org/torproject/android/control/TorControlConnection.java
+++ b/orbotservice/src/main/java/org/torproject/android/control/TorControlConnection.java
@@ -13,7 +13,6 @@ import java.io.PrintWriter;
import java.io.Reader;
import java.io.Writer;
import java.net.Socket;
-import java.net.SocketException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -22,7 +21,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
-import java.util.concurrent.CancellationException;
/** A connection to a running Tor process as specified in control-spec.txt. */
public class TorControlConnection implements TorControlCommands {
diff --git a/orbotservice/src/main/java/org/torproject/android/service/StartTorReceiver.java b/orbotservice/src/main/java/org/torproject/android/service/StartTorReceiver.java
index 0876174b..b6f96789 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/StartTorReceiver.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/StartTorReceiver.java
@@ -6,7 +6,6 @@ import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.text.TextUtils;
-
import org.torproject.android.service.util.Prefs;
diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java b/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java
index ae2841d9..62f14308 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java
@@ -1,27 +1,15 @@
package org.torproject.android.service;
import android.text.TextUtils;
+import org.torproject.android.control.EventHandler;
+import org.torproject.android.service.util.Prefs;
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.InetSocketAddress;
-import java.net.Proxy;
-import java.net.URL;
-import java.net.URLConnection;
import java.text.NumberFormat;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.StringTokenizer;
-
-import org.torproject.android.control.EventHandler;
-import org.torproject.android.service.util.Prefs;
-
/**
* Created by n8fr8 on 9/25/16.
*/
diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
index a566b6d4..e2eb9589 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
@@ -38,9 +38,9 @@ import android.support.v4.app.NotificationCompat;
import android.support.v4.content.LocalBroadcastManager;
import android.text.TextUtils;
import android.util.Log;
-
import com.jaredrummler.android.shell.CommandResult;
-
+import info.pluggabletransports.dispatch.util.TransportListener;
+import info.pluggabletransports.dispatch.util.TransportManager;
import org.torproject.android.control.ConfigEntry;
import org.torproject.android.control.TorControlConnection;
import org.torproject.android.service.util.CustomShell;
@@ -79,9 +79,6 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeoutException;
-import info.pluggabletransports.dispatch.util.TransportListener;
-import info.pluggabletransports.dispatch.util.TransportManager;
-
import static org.torproject.android.service.vpn.VpnUtils.getSharedPrefs;
import static org.torproject.android.service.vpn.VpnUtils.killProcess;
diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/CustomShell.java b/orbotservice/src/main/java/org/torproject/android/service/util/CustomShell.java
index 889e8b4d..db1a08e2 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/util/CustomShell.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/util/CustomShell.java
@@ -3,17 +3,14 @@ package org.torproject.android.service.util;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.WorkerThread;
-
import com.jaredrummler.android.shell.CommandResult;
import com.jaredrummler.android.shell.Shell;
import com.jaredrummler.android.shell.ShellExitCode;
import com.jaredrummler.android.shell.StreamGobbler;
-import java.io.DataOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/CustomTorResourceInstaller.java b/orbotservice/src/main/java/org/torproject/android/service/util/CustomTorResourceInstaller.java
index cb4f5c6a..a44ff18d 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/util/CustomTorResourceInstaller.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/util/CustomTorResourceInstaller.java
@@ -3,7 +3,6 @@ package org.torproject.android.service.util;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.util.Log;
-
import org.torproject.android.binary.TorServiceConstants;
import java.io.File;
diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/NativeLoader.java b/orbotservice/src/main/java/org/torproject/android/service/util/NativeLoader.java
index 8621add2..e79d4457 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/util/NativeLoader.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/util/NativeLoader.java
@@ -9,10 +9,8 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
-import java.util.Enumeration;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
-import java.util.zip.ZipInputStream;
public class NativeLoader {
diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/PortForwarder.java b/orbotservice/src/main/java/org/torproject/android/service/util/PortForwarder.java
index d487fb43..052aeed0 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/util/PortForwarder.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/util/PortForwarder.java
@@ -1,7 +1,6 @@
package org.torproject.android.service.util;
import android.util.Log;
-
import com.offbynull.portmapper.PortMapperFactory;
import com.offbynull.portmapper.gateway.Bus;
import com.offbynull.portmapper.gateway.Gateway;
diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/TCPSourceApp.java b/orbotservice/src/main/java/org/torproject/android/service/util/TCPSourceApp.java
index 610e1ab4..2985ae3d 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/util/TCPSourceApp.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/util/TCPSourceApp.java
@@ -27,6 +27,12 @@ package org.torproject.android.service.util;
*
*/
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileNotFoundException;
@@ -35,19 +41,12 @@ import java.io.IOException;
import java.net.Inet4Address;
import java.net.InetAddress;
import java.net.NetworkInterface;
-import java.net.Socket;
import java.net.SocketException;
import java.util.Collections;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-
/**
* Main class for the TCPSourceApp library.
* @author Sebastiano Gottardo
diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/TorServiceUtils.java b/orbotservice/src/main/java/org/torproject/android/service/util/TorServiceUtils.java
index 938bb465..e9e88590 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/util/TorServiceUtils.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/util/TorServiceUtils.java
@@ -4,7 +4,6 @@ package org.torproject.android.service.util;
import android.content.Context;
import android.content.SharedPreferences;
-
import org.torproject.android.service.OrbotConstants;
import org.torproject.android.service.TorServiceConstants;
diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java
index 98de7bbb..b78c7a4f 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java
@@ -19,10 +19,8 @@ package org.torproject.android.service.vpn;
import android.annotation.TargetApi;
import android.app.PendingIntent;
import android.app.Service;
-import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
-import android.content.IntentFilter;
import android.content.SharedPreferences;
import android.content.pm.PackageManager.NameNotFoundException;
import android.net.VpnService;
@@ -31,13 +29,10 @@ import android.os.Build;
import android.os.Handler;
import android.os.Message;
import android.os.ParcelFileDescriptor;
-import android.support.v4.content.LocalBroadcastManager;
import android.util.Log;
import android.widget.Toast;
-
import com.runjva.sourceforge.jsocks.protocol.ProxyServer;
import com.runjva.sourceforge.jsocks.server.ServerAuthenticatorNone;
-
import org.torproject.android.service.OrbotConstants;
import org.torproject.android.service.R;
import org.torproject.android.service.TorService;
diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/TorVpnService.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/TorVpnService.java
index 78c405f4..ceae17e2 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/vpn/TorVpnService.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/TorVpnService.java
@@ -7,7 +7,6 @@ import android.content.Intent;
import android.content.IntentFilter;
import android.net.VpnService;
import android.support.v4.content.LocalBroadcastManager;
-
import org.torproject.android.service.TorService;
import org.torproject.android.service.TorServiceConstants;
diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/Tun2Socks.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/Tun2Socks.java
index a0ded90e..11c6203e 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/vpn/Tun2Socks.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/Tun2Socks.java
@@ -21,12 +21,10 @@ package org.torproject.android.service.vpn;
import android.annotation.TargetApi;
import android.content.Context;
-import android.content.pm.ApplicationInfo;
import android.net.ConnectivityManager;
import android.os.Build;
import android.os.ParcelFileDescriptor;
import android.util.Log;
-
import org.torproject.android.service.util.TCPSourceApp;
import java.net.DatagramSocket;
1
0
commit 84c3c3e57b51d6f119908726f9a6345e2f2f0eda
Author: n8fr8 <nathan(a)guardianproject.info>
Date: Tue Oct 29 09:37:16 2019 -0400
update app mini main activity
---
app-mini/src/debug/AndroidManifest.xml | 15 ---------------
.../org/torproject/android/mini/MiniMainActivity.java | 1 +
2 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/app-mini/src/debug/AndroidManifest.xml b/app-mini/src/debug/AndroidManifest.xml
index b07d6957..84b9c1b1 100644
--- a/app-mini/src/debug/AndroidManifest.xml
+++ b/app-mini/src/debug/AndroidManifest.xml
@@ -124,22 +124,7 @@
</receiver>
-
-
- <provider
- android:name="android.support.v4.content.FileProvider"
- android:authorities="org.torproject.android.ui.hiddenservices.storage"
- android:exported="false"
- android:grantUriPermissions="true">
- <meta-data
- android:name="android.support.FILE_PROVIDER_PATHS"
- android:resource="@xml/hidden_services_paths" />
- </provider>
-
-
-
<activity android:name=".ui.onboarding.OnboardingActivity"/>
- <activity android:name=".ui.onboarding.BridgeWizardActivity"/>
</application>
diff --git a/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java b/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java
index 54cf23a9..90daeb0b 100644
--- a/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java
+++ b/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java
@@ -493,6 +493,7 @@ public class MiniMainActivity extends AppCompatActivity
}
else {
Prefs.putUseVpn(enable);
+ Prefs.putStartOnBoot(enable);
if (enable) {
startActivityForResult(new Intent(MiniMainActivity.this, VPNEnableActivity.class), REQUEST_VPN);
1
0
29 Apr '20
commit 516eb8a7eb49522b5bc40e0cffa22335d28dfea7
Author: Hans-Christoph Steiner <hans(a)eds.org>
Date: Mon Oct 7 17:51:11 2019 +0200
buildToolsVersion '29.0.0' has been released
---
app-mini/build.gradle | 2 +-
app/build.gradle | 2 +-
orbotservice/build.gradle | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-mini/build.gradle b/app-mini/build.gradle
index 58f8a714..e48340e8 100644
--- a/app-mini/build.gradle
+++ b/app-mini/build.gradle
@@ -25,7 +25,7 @@ android {
}
compileSdkVersion 29
- buildToolsVersion '29.0.0 rc2'
+ buildToolsVersion '29.0.0'
defaultConfig {
applicationId "org.torproject.android.mini"
minSdkVersion 16
diff --git a/app/build.gradle b/app/build.gradle
index 4d606125..3c6e1b6c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,7 +25,7 @@ android {
}
compileSdkVersion 29
- buildToolsVersion '29.0.0 rc2'
+ buildToolsVersion '29.0.0'
defaultConfig {
applicationId "org.torproject.android"
minSdkVersion 16
diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle
index cbf7e5a7..6e1dda4e 100644
--- a/orbotservice/build.gradle
+++ b/orbotservice/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion 29
- buildToolsVersion '29.0.0 rc2'
+ buildToolsVersion '29.0.0'
sourceSets {
main {
1
0
commit faef65ee6e1cb0969ed7adb0cbbb21b7947ebd19
Author: n8fr8 <nathan(a)guardianproject.info>
Date: Tue Oct 29 09:37:04 2019 -0400
add appmax flavor builds
---
app/src/appmax/ic_launcher-web.png | Bin 0 -> 26340 bytes
app/src/appmax/res/mipmap-anydpi-v26/ic_launcher.xml | 5 +++++
.../appmax/res/mipmap-anydpi-v26/ic_launcher_round.xml | 5 +++++
app/src/appmax/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 2858 bytes
.../appmax/res/mipmap-hdpi/ic_launcher_foreground.png | Bin 0 -> 2629 bytes
app/src/appmax/res/mipmap-hdpi/ic_launcher_round.png | Bin 0 -> 5049 bytes
app/src/appmax/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 1713 bytes
.../appmax/res/mipmap-mdpi/ic_launcher_foreground.png | Bin 0 -> 1663 bytes
app/src/appmax/res/mipmap-mdpi/ic_launcher_round.png | Bin 0 -> 2928 bytes
app/src/appmax/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 3827 bytes
.../appmax/res/mipmap-xhdpi/ic_launcher_foreground.png | Bin 0 -> 3594 bytes
app/src/appmax/res/mipmap-xhdpi/ic_launcher_round.png | Bin 0 -> 6995 bytes
app/src/appmax/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 5759 bytes
.../appmax/res/mipmap-xxhdpi/ic_launcher_foreground.png | Bin 0 -> 5804 bytes
app/src/appmax/res/mipmap-xxhdpi/ic_launcher_round.png | Bin 0 -> 10664 bytes
app/src/appmax/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 7711 bytes
.../res/mipmap-xxxhdpi/ic_launcher_foreground.png | Bin 0 -> 8206 bytes
app/src/appmax/res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 0 -> 14870 bytes
app/src/appmax/res/values/ic_launcher_background.xml | 4 ++++
19 files changed, 14 insertions(+)
diff --git a/app/src/appmax/ic_launcher-web.png b/app/src/appmax/ic_launcher-web.png
new file mode 100644
index 00000000..64e54bb0
Binary files /dev/null and b/app/src/appmax/ic_launcher-web.png differ
diff --git a/app/src/appmax/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/appmax/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 00000000..036d09bc
--- /dev/null
+++ b/app/src/appmax/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+ <background android:drawable="@color/ic_launcher_background"/>
+ <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/appmax/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/appmax/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 00000000..036d09bc
--- /dev/null
+++ b/app/src/appmax/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+ <background android:drawable="@color/ic_launcher_background"/>
+ <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/appmax/res/mipmap-hdpi/ic_launcher.png b/app/src/appmax/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..dbd6e745
Binary files /dev/null and b/app/src/appmax/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/appmax/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/appmax/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 00000000..dc0c1811
Binary files /dev/null and b/app/src/appmax/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/app/src/appmax/res/mipmap-hdpi/ic_launcher_round.png b/app/src/appmax/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 00000000..52607429
Binary files /dev/null and b/app/src/appmax/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/appmax/res/mipmap-mdpi/ic_launcher.png b/app/src/appmax/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..cf639a2c
Binary files /dev/null and b/app/src/appmax/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/appmax/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/appmax/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 00000000..9038937b
Binary files /dev/null and b/app/src/appmax/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/app/src/appmax/res/mipmap-mdpi/ic_launcher_round.png b/app/src/appmax/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 00000000..fe7f8737
Binary files /dev/null and b/app/src/appmax/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app/src/appmax/res/mipmap-xhdpi/ic_launcher.png b/app/src/appmax/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..cb327015
Binary files /dev/null and b/app/src/appmax/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/appmax/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/appmax/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 00000000..c93ae0ce
Binary files /dev/null and b/app/src/appmax/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/appmax/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/appmax/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..96148faf
Binary files /dev/null and b/app/src/appmax/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/appmax/res/mipmap-xxhdpi/ic_launcher.png b/app/src/appmax/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..8474d14f
Binary files /dev/null and b/app/src/appmax/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/appmax/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/appmax/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 00000000..bf41594e
Binary files /dev/null and b/app/src/appmax/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/appmax/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/appmax/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..0579eabc
Binary files /dev/null and b/app/src/appmax/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/appmax/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/appmax/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..1795e37d
Binary files /dev/null and b/app/src/appmax/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/appmax/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/appmax/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 00000000..5a4c77bc
Binary files /dev/null and b/app/src/appmax/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/appmax/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/appmax/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..7e2084c6
Binary files /dev/null and b/app/src/appmax/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/app/src/appmax/res/values/ic_launcher_background.xml b/app/src/appmax/res/values/ic_launcher_background.xml
new file mode 100644
index 00000000..225a1525
--- /dev/null
+++ b/app/src/appmax/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <color name="ic_launcher_background">#EAA9E5</color>
+</resources>
\ No newline at end of file
1
0
[orbot/master] Merge pull request #270 from SkewedZeppelin/master
by n8fr8＠torproject.org 29 Apr '20
by n8fr8＠torproject.org 29 Apr '20
29 Apr '20
commit dbf13dcc5942436b7e3124761091219ce25dc84a
Merge: 2055823e e71c225e
Author: Nathan Freitas <nathan(a)guardianproject.info>
Date: Tue Oct 29 09:27:30 2019 -0400
Merge pull request #270 from SkewedZeppelin/master
Expose *CircuitPadding
app-mini/src/main/res/values/strings.xml | 4 ++++
app-mini/src/main/res/xml/preferences.xml | 14 +++++++++++++-
app/src/main/res/values/strings.xml | 4 ++++
app/src/main/res/xml/preferences.xml | 14 +++++++++++++-
.../org/torproject/android/service/OrbotConstants.java | 2 ++
.../java/org/torproject/android/service/TorService.java | 12 ++++++++++++
6 files changed, 48 insertions(+), 2 deletions(-)
1
0
[orbot/master] move getSharedPrefs() from TorServiceUtils to Prefs
by n8fr8＠torproject.org 29 Apr '20
by n8fr8＠torproject.org 29 Apr '20
29 Apr '20
commit 22bf175cc027f40a2a66d6532a7b483e2263e03e
Author: Hans-Christoph Steiner <hans(a)eds.org>
Date: Mon Oct 7 17:18:09 2019 +0200
move getSharedPrefs() from TorServiceUtils to Prefs
---
.../java/org/torproject/android/mini/MiniMainActivity.java | 3 +--
.../org/torproject/android/mini/ui/AppConfigActivity.java | 4 ++--
.../org/torproject/android/mini/ui/AppManagerActivity.java | 4 ++--
.../java/org/torproject/android/OrbotMainActivity.java | 3 +--
.../java/org/torproject/android/ui/AppManagerActivity.java | 4 ++--
.../java/org/torproject/android/service/TorService.java | 14 +++++++-------
.../java/org/torproject/android/service/util/Prefs.java | 7 ++++++-
.../torproject/android/service/util/TorServiceUtils.java | 4 ----
8 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java b/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java
index 6710778d..e8612ed5 100644
--- a/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java
+++ b/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java
@@ -61,7 +61,6 @@ import org.torproject.android.service.OrbotConstants;
import org.torproject.android.service.TorService;
import org.torproject.android.service.TorServiceConstants;
import org.torproject.android.service.util.Prefs;
-import org.torproject.android.service.util.TorServiceUtils;
import org.torproject.android.service.vpn.TorifiedApp;
import org.torproject.android.service.vpn.VpnConstants;
import org.torproject.android.service.vpn.VpnPrefs;
@@ -124,7 +123,7 @@ public class MiniMainActivity extends AppCompatActivity
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+ mPrefs = Prefs.getSharedPrefs(getApplicationContext());
/* Create the widgets before registering for broadcasts to guarantee
* that the widgets exist when the status updates try to update them */
diff --git a/app-mini/src/main/java/org/torproject/android/mini/ui/AppConfigActivity.java b/app-mini/src/main/java/org/torproject/android/mini/ui/AppConfigActivity.java
index a8488e3d..a731ef29 100644
--- a/app-mini/src/main/java/org/torproject/android/mini/ui/AppConfigActivity.java
+++ b/app-mini/src/main/java/org/torproject/android/mini/ui/AppConfigActivity.java
@@ -13,7 +13,7 @@ import android.widget.CompoundButton;
import android.widget.Switch;
import org.torproject.android.mini.R;
import org.torproject.android.service.OrbotConstants;
-import org.torproject.android.service.util.TorServiceUtils;
+import org.torproject.android.service.util.Prefs;
import org.torproject.android.service.vpn.TorifiedApp;
import static org.torproject.android.mini.MiniMainActivity.getApp;
@@ -40,7 +40,7 @@ public class AppConfigActivity extends AppCompatActivity {
final String pkgId = getIntent().getStringExtra(Intent.EXTRA_PACKAGE_NAME);
- mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+ mPrefs = Prefs.getSharedPrefs(getApplicationContext());
ApplicationInfo aInfo = null;
try {
diff --git a/app-mini/src/main/java/org/torproject/android/mini/ui/AppManagerActivity.java b/app-mini/src/main/java/org/torproject/android/mini/ui/AppManagerActivity.java
index 27425bce..489aba4c 100644
--- a/app-mini/src/main/java/org/torproject/android/mini/ui/AppManagerActivity.java
+++ b/app-mini/src/main/java/org/torproject/android/mini/ui/AppManagerActivity.java
@@ -28,7 +28,7 @@ import android.widget.ProgressBar;
import android.widget.TextView;
import org.torproject.android.mini.R;
import org.torproject.android.service.OrbotConstants;
-import org.torproject.android.service.util.TorServiceUtils;
+import org.torproject.android.service.util.Prefs;
import org.torproject.android.service.vpn.TorifiedApp;
import java.util.ArrayList;
@@ -63,7 +63,7 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList
@Override
protected void onResume() {
super.onResume();
- mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+ mPrefs = Prefs.getSharedPrefs(getApplicationContext());
reloadApps();
}
diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index 82a0cef9..947f3a76 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -57,7 +57,6 @@ import org.torproject.android.service.OrbotConstants;
import org.torproject.android.service.TorService;
import org.torproject.android.service.TorServiceConstants;
import org.torproject.android.service.util.Prefs;
-import org.torproject.android.service.util.TorServiceUtils;
import org.torproject.android.service.vpn.VpnConstants;
import org.torproject.android.service.vpn.VpnPrefs;
import org.torproject.android.settings.Languages;
@@ -167,7 +166,7 @@ public class OrbotMainActivity extends AppCompatActivity
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+ mPrefs = Prefs.getSharedPrefs(getApplicationContext());
migratePreferences(); // Migrate old preferences
diff --git a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
index d5ea6f8e..111dda5f 100644
--- a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
@@ -29,7 +29,7 @@ import android.widget.ProgressBar;
import android.widget.TextView;
import org.torproject.android.R;
import org.torproject.android.service.OrbotConstants;
-import org.torproject.android.service.util.TorServiceUtils;
+import org.torproject.android.service.util.Prefs;
import org.torproject.android.service.vpn.TorifiedApp;
import java.util.ArrayList;
@@ -65,7 +65,7 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList
@Override
protected void onResume() {
super.onResume();
- mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+ mPrefs = Prefs.getSharedPrefs(getApplicationContext());
reloadApps();
}
diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
index 96dedfd8..f8137632 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
@@ -610,7 +610,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
private boolean torUpgradeAndConfig() throws IOException, TimeoutException {
- SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+ SharedPreferences prefs = Prefs.getSharedPrefs(getApplicationContext());
String version = prefs.getString(PREF_BINARY_TOR_VERSION_INSTALLED,null);
logNotice("checking binary version: " + version);
@@ -638,7 +638,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
private File updateTorrcCustomFile () throws IOException, TimeoutException
{
- SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+ SharedPreferences prefs = Prefs.getSharedPrefs(getApplicationContext());
StringBuffer extraLines = new StringBuffer();
@@ -838,7 +838,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
// make sure there are no stray daemons running
killAllDaemons();
- SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+ SharedPreferences prefs = Prefs.getSharedPrefs(getApplicationContext());
String version = prefs.getString(PREF_BINARY_TOR_VERSION_INSTALLED,null);
logNotice("checking binary version: " + version);
@@ -1152,7 +1152,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
bufferedReader.close();
//store last valid control port
- SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+ SharedPreferences prefs = Prefs.getSharedPrefs(getApplicationContext());
prefs.edit().putInt("controlport", result).commit();
}
@@ -1471,7 +1471,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
if (mCurrentStatus == STATUS_OFF)
return;
- SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+ SharedPreferences prefs = Prefs.getSharedPrefs(getApplicationContext());
boolean doNetworKSleep = prefs.getBoolean(OrbotConstants.PREF_DISABLE_NETWORK, true);
@@ -1530,7 +1530,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
{
logNotice(getString(R.string.updating_settings_in_tor_service));
- SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+ SharedPreferences prefs = Prefs.getSharedPrefs(getApplicationContext());
boolean useBridges = Prefs.bridgesEnabled();
@@ -1897,7 +1897,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
private void setExitNode (String newExits)
{
- SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+ SharedPreferences prefs = Prefs.getSharedPrefs(getApplicationContext());
if (TextUtils.isEmpty(newExits))
{
diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java
index 7b5f132b..9b6ab825 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java
@@ -3,6 +3,7 @@ package org.torproject.android.service.util;
import android.content.Context;
import android.content.SharedPreferences;
+import org.torproject.android.service.OrbotConstants;
import java.util.Locale;
@@ -24,7 +25,7 @@ public class Prefs {
public static void setContext(Context context) {
if (prefs == null)
- prefs = TorServiceUtils.getSharedPrefs(context);
+ prefs = getSharedPrefs(context);
}
private static void putBoolean(String key, boolean value) {
@@ -109,4 +110,8 @@ public class Prefs {
{
putString(PREF_EXIT_NODES,exits);
}
+
+ public static SharedPreferences getSharedPrefs (Context context) {
+ return context.getSharedPreferences(OrbotConstants.PREF_TOR_SHARED_PREFS,0 | Context.MODE_MULTI_PROCESS);
+ }
}
diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/TorServiceUtils.java b/orbotservice/src/main/java/org/torproject/android/service/util/TorServiceUtils.java
index e9e88590..018d7e42 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/util/TorServiceUtils.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/util/TorServiceUtils.java
@@ -13,10 +13,6 @@ import java.net.Socket;
public class TorServiceUtils implements TorServiceConstants {
- public static SharedPreferences getSharedPrefs (Context context) {
- return context.getSharedPreferences(OrbotConstants.PREF_TOR_SHARED_PREFS,0 | Context.MODE_MULTI_PROCESS);
- }
-
public static boolean isPortOpen(final String ip, final int port, final int timeout) {
try {
Socket socket = new Socket();
1
0