April 2020 - tor-commits - lists.torproject.org

[orbot/master] more metadata edits
by n8fr8＠torproject.org 29 Apr '20

29 Apr '20

commit 564c17d9c98ecd9b8c664827362e654b01fe942b Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Sep 10 09:45:01 2019 -0400 more metadata edits --- fastlane/metadata/android/en-US/full_description.txt | 2 -- fastlane/metadata/android/es-ES/full_description.txt | 2 -- fastlane/metadata/android/tr-TR/full_description.txt | 2 -- 3 files changed, 6 deletions(-) diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt index bdfb3703..d56be037 100644 --- a/fastlane/metadata/android/en-US/full_description.txt +++ b/fastlane/metadata/android/en-US/full_description.txt @@ -9,8 +9,6 @@ On some devices, a Samsung app is listening on the same network port that Orbot Orbot is the only app that creates a truly private internet connection. As the New York Times writes, “when a communication arrives from Tor, you can never know where or whom it’s from.” Tor won the 2012 Electronic Frontier Foundation (EFF) Pioneer Award. ★ ACCEPT NO SUBSTITUTES: Orbot is the safest way to use the Internet on Android. Period. Orbot bounces your encrypted traffic several times through computers around the world, instead of connecting you directly like VPNs and proxies. This process takes a little longer, but the strongest privacy and identity protection available is worth the wait. -★ PRIVATE WEB SURFING: Use with Orfox, the most anonymous way to access any website, even if it’s normally blocked, monitored, or on the hidden web. Get Orfox: https://play.google.com/store/apps/details?id=info.guardianproject.orfox -★ PRIVATE CHAT MESSAGING: Use ChatSecure with Orbot to chat confidentially with anyone, anywhere for free. Get ChatSecure: https://goo.gl/O3FfS ★ PRIVACY FOR APPS: Any installed app can use Tor if it has a proxy feature, using the settings found here: https://goo.gl/2OA1y Use Orbot with Twitter, or try private web searching with DuckDuckGo: https://goo.gl/lgh1p ★ PRIVACY FOR EVERYONE: Tor can help you confidentially research a competitor, get around the Facebook block at school, or circumvent a firewall to watch sports at work. ★ PRIVACY MADE EASY: Check out our fun, interactive walkthrough: https://guardianproject.info/howto/browsefreely diff --git a/fastlane/metadata/android/es-ES/full_description.txt b/fastlane/metadata/android/es-ES/full_description.txt index b07891ff..5996c6c7 100644 --- a/fastlane/metadata/android/es-ES/full_description.txt +++ b/fastlane/metadata/android/es-ES/full_description.txt @@ -23,5 +23,3 @@ EN TWITTER: https://twitter.com/guardianproject CÓDIGO ABIERTO: Orweb es software libre. Puedes mirar el código fuente o ser parte de la comunidad y ayudar a mejorarlo: https://gitweb.torproject.org/orbot.git ACERCA DE TOR: https://TorProject.org CONTÁCTENOS: ¿Cree que deberíamos añadir una nueva función? ¿Encontró un error? ¡Por favor contáctenos! Envíenos un e-mail a support(a)guardianproject.info -AYÚDENOS A LLEVAR ORBOT A SU PAÍS: Estamos tratando de conseguir Orbot en tantos idiomas como sea posible. En este momento está en: Árabe (العربية), Vasco (Euskara), Búlgaro (български език), Chino (中文简体), Checo (Čeština), Danés (Dansk), Holandés (Nederlands), Inglés (English), Persa (فارسی), Francés (Français), Alemán (Deutsch), Griego (Ελληνικά), Hebreo (עברית), Húngaro (Magyar Nyelv), Italiano, Japonés (日本語) Koreano (조선말), Letón (Latviešu), Malayo (بهاس ملايو ), Polaco (Polski), Portugués (Português), Ruso (Русский), Español, Sueco (Svensk), y Vietnamita (Tiếng Việt). -Si Orbot no está aún en su idioma, nos encantaría que usted se uniera a nuestro equipo de traducción: https://www.transifex.com/otf/orbot/ diff --git a/fastlane/metadata/android/tr-TR/full_description.txt b/fastlane/metadata/android/tr-TR/full_description.txt index d7d29bd7..980279b9 100644 --- a/fastlane/metadata/android/tr-TR/full_description.txt +++ b/fastlane/metadata/android/tr-TR/full_description.txt @@ -22,5 +22,3 @@ TWITTER ADRESİMİZ: https://twitter.com/guardianproject AÇIK KAYNAK KODU: Orbot ücretsiz bir uygulamadır. Kaynak kodumuza bakabilir, ve geliştirmek için destek grubuna katılabilirsiniz: https://gitweb.torproject.org/orbot.git TOR HAKKINDA: https://TorProject.org BİZE YAZIN: İstediğiniz bir özellik eksik mi? Uygulamada bir hata mı buldunuz? Lütfen bize bildirin! Sizden geri bildirim almak bizi çok mutlu eder. Bize e-posta gönderebilirsiniz: root(a)guardianproject.info -ORBOT'U SİZİN ÜLKENİZE ULAŞTIRMAMIZA YARDIM EDİN: Orbot uygulamasını mümkün olan tüm dillere çevirmeye çalışıyoruz. Şimdilik bu dillere çevrildi: Arabic (العربية), Basque (Euskara), Bulgarian (български език), Chinese (中文简体), Czech (Čeština), Danish (Dansk), Dutch (Nederlands), English, Farsi (فارسی), French (Français), French (Français), German (Deutsch), Greek (Ελληνικά), Hebrew (עברית), Hungarian (Magyar Nyelv), Italian (Italiano), Japanese (日本語) Korean (조선말), Latvian (Latviešu), Malaysian (بهاس ملايو ), Polish (Polski), Portuguese (Português), Turkish (Türkçe), Russian (Русский), Spanish (Español), Swedish (Svensk), and Vietnamese (Tiếng Việt). -Eğer Orbot sizin dilinizde yoksa, çeviri ekibimize katılmanız bizi çok mutlu eder: https://www.transifex.com/otf/orbot/

1 0

[orbot/master] Expose *CircuitPadding
by n8fr8＠torproject.org 29 Apr '20

29 Apr '20

commit e71c225ef146f663c1841bcea432d1884601d228 Author: Tad <tad(a)spotco.us> Date: Tue Oct 8 20:44:23 2019 -0400 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(-) diff --git a/app-mini/src/main/res/values/strings.xml b/app-mini/src/main/res/values/strings.xml index 810ced96..78723c10 100644 --- a/app-mini/src/main/res/values/strings.xml +++ b/app-mini/src/main/res/values/strings.xml @@ -233,6 +233,10 @@ <string name="pref_connection_padding_summary">Always enables connection padding to defend against some forms of traffic analysis. Default: auto</string> <string name="pref_reduced_connection_padding">Reduced connection padding</string> <string name="pref_reduced_connection_padding_summary">Closes relay connections sooner and sends less padding packets to reduce data and battery usage</string> + <string name="pref_circuit_padding">Circuit padding</string> + <string name="pref_circuit_padding_summary">Enable circuit padding to defend against some forms of traffic analysis</string> + <string name="pref_reduced_circuit_padding">Reduced circuit padding</string> + <string name="pref_reduced_circuit_padding_summary">Use lower overhead padding algorithms to reduce data and battery usage</string> <string name="pref_prefer_ipv6">Prefer IPv6 connections</string> <string name="pref_prefer_ipv6_summary">Tells exits that IPv6 addresses are preferred</string> <string name="pref_disable_ipv4">Disable IPv4 connections</string> diff --git a/app-mini/src/main/res/xml/preferences.xml b/app-mini/src/main/res/xml/preferences.xml index bda86acc..49be87a0 100644 --- a/app-mini/src/main/res/xml/preferences.xml +++ b/app-mini/src/main/res/xml/preferences.xml @@ -198,7 +198,7 @@ android:title="@string/pref_disable_ipv4" /> </PreferenceCategory> - <PreferenceCategory android:title="ConnectionPadding"> + <PreferenceCategory android:title="Padding"> <CheckBoxPreference android:defaultValue="false" android:enabled="true" @@ -211,6 +211,18 @@ android:key="pref_reduced_connection_padding" android:summary="@string/pref_reduced_connection_padding_summary" android:title="@string/pref_reduced_connection_padding" /> + <CheckBoxPreference + android:defaultValue="true" + android:enabled="true" + android:key="pref_circuit_padding" + android:summary="@string/pref_circuit_padding_summary" + android:title="@string/pref_circuit_padding" /> + <CheckBoxPreference + android:defaultValue="true" + android:enabled="true" + android:key="pref_reduced_circuit_padding" + android:summary="@string/pref_reduced_circuit_padding_summary" + android:title="@string/pref_reduced_circuit_padding" /> </PreferenceCategory> <PreferenceCategory android:title="@string/pref_proxy_title"> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4400c048..bff412a2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -233,6 +233,10 @@ <string name="pref_connection_padding_summary">Always enables connection padding to defend against some forms of traffic analysis. Default: auto</string> <string name="pref_reduced_connection_padding">Reduced connection padding</string> <string name="pref_reduced_connection_padding_summary">Closes relay connections sooner and sends less padding packets to reduce data and battery usage</string> + <string name="pref_circuit_padding">Circuit padding</string> + <string name="pref_circuit_padding_summary">Enable circuit padding to defend against some forms of traffic analysis</string> + <string name="pref_reduced_circuit_padding">Reduced circuit padding</string> + <string name="pref_reduced_circuit_padding_summary">Use lower overhead padding algorithms to reduce data and battery usage</string> <string name="pref_prefer_ipv6">Prefer IPv6 connections</string> <string name="pref_prefer_ipv6_summary">Tells exits that IPv6 addresses are preferred</string> <string name="pref_disable_ipv4">Disable IPv4 connections</string> diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 49b90dfa..8477efbd 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -195,7 +195,7 @@ android:title="@string/pref_disable_ipv4" /> </PreferenceCategory> - <PreferenceCategory android:title="ConnectionPadding"> + <PreferenceCategory android:title="Padding"> <CheckBoxPreference android:defaultValue="false" android:enabled="true" @@ -208,6 +208,18 @@ android:key="pref_reduced_connection_padding" android:summary="@string/pref_reduced_connection_padding_summary" android:title="@string/pref_reduced_connection_padding" /> + <CheckBoxPreference + android:defaultValue="true" + android:enabled="true" + android:key="pref_circuit_padding" + android:summary="@string/pref_circuit_padding_summary" + android:title="@string/pref_circuit_padding" /> + <CheckBoxPreference + android:defaultValue="true" + android:enabled="true" + android:key="pref_reduced_circuit_padding" + android:summary="@string/pref_reduced_circuit_padding_summary" + android:title="@string/pref_reduced_circuit_padding" /> </PreferenceCategory> <PreferenceCategory android:title="@string/pref_proxy_title"> diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java index a5dec36e..8416f15e 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java @@ -25,6 +25,8 @@ public interface OrbotConstants { String PREF_CONNECTION_PADDING = "pref_connection_padding"; String PREF_REDUCED_CONNECTION_PADDING = "pref_reduced_connection_padding"; + String PREF_CIRCUIT_PADDING = "pref_circuit_padding"; + String PREF_REDUCED_CIRCUIT_PADDING = "pref_reduced_circuit_padding"; String PREF_PREFER_IPV6 = "pref_prefer_ipv6"; String PREF_DISABLE_IPV4 = "pref_disable_ipv4"; 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 e2eb9589..ce6e3086 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -700,6 +700,18 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon extraLines.append("ReducedConnectionPadding 1").append('\n'); } + if(prefs.getBoolean(OrbotConstants.PREF_CIRCUIT_PADDING, true)) + { + extraLines.append("CircuitPadding 1").append('\n'); + } else { + extraLines.append("CircuitPadding 0").append('\n'); + } + + if(prefs.getBoolean(OrbotConstants.PREF_REDUCED_CIRCUIT_PADDING, true)) + { + extraLines.append("ReducedCircuitPadding 1").append('\n'); + } + String transPort = prefs.getString("pref_transport", TorServiceConstants.TOR_TRANSPROXY_PORT_DEFAULT+""); String dnsPort = prefs.getString("pref_dnsport", TorServiceConstants.TOR_DNS_PORT_DEFAULT+"");

1 0

[orbot/master] set versionName from git release tags
by n8fr8＠torproject.org 29 Apr '20

29 Apr '20

commit 04bdf167d14c12034ff8103ead3d817aa0c9637e Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Wed Nov 22 15:29:07 2017 +0100 set versionName from git release tags This makes git release tags the one canonical place to set the version name --- app/build.gradle | 14 +++++++++++++- make-release-build | 6 +++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3c6e1b6c..d7d8957c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,6 @@ apply plugin: 'com.android.application' + // Create a variable called keystorePropertiesFile, and initialize it to your // keystore.properties file, in the rootProject folder. def keystorePropertiesFile = rootProject.file("keystore.properties") @@ -12,6 +13,16 @@ if (keystorePropertiesFile.canRead()) { keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) } +/* gets the version name from the latest Git tag, stripping the leading v off */ +def getVersionName = { -> + def stdout = new ByteArrayOutputStream() + exec { + commandLine 'git', 'describe', '--tags', '--always' + standardOutput = stdout + } + return stdout.toString().trim() +} + android { signingConfigs { release { @@ -28,6 +39,7 @@ android { buildToolsVersion '29.0.0' defaultConfig { applicationId "org.torproject.android" + versionName getVersionName() minSdkVersion 16 targetSdkVersion 29 } @@ -62,7 +74,7 @@ android { applicationId 'org.torproject.android' targetSdkVersion 28 versionCode 16123000 - versionName '16.1.2-RC-2-tor-0.4.1.5-rc' + versionName getVersionName() archivesBaseName = "Orbot-$versionName" } } diff --git a/make-release-build b/make-release-build index d15e6f0c..fb712011 100755 --- a/make-release-build +++ b/make-release-build @@ -6,9 +6,9 @@ set -e set -x # make sure we're on a signed tag that matches the version name -versionName=`sed -n 's,.*versionName="$[^"]*$".*,\1,p' app/src/main/AndroidManifest.xml` -describe=`git describe` -if [ $versionName != $describe ]; then +describe=`git describe --tags --always` +versionName=`echo $describe | sed 's,-[0-9][0-9]*-g.*,,'` +if [ "$versionName" != "$describe" ]; then echo "WARNING: building $describe, which is not the latest release ($versionName)" else # make a clearer warning above by putting this here

1 0

[orbot/master] make-release-build: fix breakage, strip unworkable reprobuild stuff
by n8fr8＠torproject.org 29 Apr '20

29 Apr '20

commit 4bbe3e021eb6a382010953855cf0d44687eeebc3 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Wed Nov 22 15:02:00 2017 +0100 make-release-build: fix breakage, strip unworkable reprobuild stuff --- make-release-build | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/make-release-build b/make-release-build index a80d495e..d15e6f0c 100755 --- a/make-release-build +++ b/make-release-build @@ -6,7 +6,7 @@ set -e set -x # make sure we're on a signed tag that matches the version name -versionName=`sed -n 's,.*versionName="$[^"]*$".*,\1,p' AndroidManifest.xml` +versionName=`sed -n 's,.*versionName="$[^"]*$".*,\1,p' app/src/main/AndroidManifest.xml` describe=`git describe` if [ $versionName != $describe ]; then echo "WARNING: building $describe, which is not the latest release ($versionName)" @@ -31,7 +31,7 @@ if [ -z $ANDROID_HOME ]; then . ~/.android/bashrc-ant-build else echo "ANDROID_HOME must be set!" - exit + exit 1 fi fi @@ -40,7 +40,7 @@ if [ -z $ANDROID_NDK_HOME ]; then ANDROID_NDK_HOME=`which ndk-build | sed 's,/ndk-build,,'` else echo "ANDROID_NDK_HOME not set and 'ndk-build' not in PATH" - exit + exit 1 fi fi @@ -49,8 +49,6 @@ projectname=`sed -n 's,.*name="app_name">$.*$<.*,\1,p' app/src/main/res/values # standardize timezone to reduce build differences export TZ=UTC -TIMESTAMP=`printf '%(%Y-%m-%d %H:%M:%S)T' \ - $(git log -n1 --format=format:%at)` git reset --hard git clean -fdx @@ -68,26 +66,18 @@ else fi cd $projectroot/orbotservice/src/main -faketime "$TIMESTAMP" $ANDROID_NDK_HOME/ndk-build +$ANDROID_NDK_HOME/ndk-build cd $projectroot #clean, build, clean and build! make -C external clean -APP_ABI=armeabi faketime "$TIMESTAMP" make -C external +APP_ABI=armeabi make -C external #make -C external clean -#APP_ABI=x86 faketime "$TIMESTAMP" make -C external +#APP_ABI=x86 make -C external ./gradlew assembleRelease -#./setup-ant -#ant release - -#apk=$projectroot/bin/$projectname-v$describe.apk -apk=$projectroot/app/build/outputs/apk/app-release-unsigned.apk - -# standardize timestamps in ZIP headers, requires strip-nondeterminism 0.014 -if which strip-nondeterminism > /dev/null; then - strip-nondeterminism -t zip -T $(git log -n1 --format=format:%at) $apk -fi +ls -l $projectroot/app/build/outputs/apk/ +apk=`ls -1 $projectroot/app/build/outputs/apk/*-release-unsigned.apk |head -1` # echo the checksum to build logs sha256sum $apk

1 0

[orbot/master] Merge pull request #272 from 05nelsonm/bug-fix-#271
by n8fr8＠torproject.org 29 Apr '20

29 Apr '20

commit 2055823e8fba2e34afb68251d9a22515b50b7946 Merge: bf720400 3fbeeb20 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Mon Oct 21 10:02:05 2019 -0400 Merge pull request #272 from 05nelsonm/bug-fix-#271 bugfix issue #271 fixes HiddenService creation by adding correct vers… .../src/main/java/org/torproject/android/service/TorService.java | 1 + 1 file changed, 1 insertion(+)

1 0

[orbot/master] add changelog for 16123000
by n8fr8＠torproject.org 29 Apr '20

29 Apr '20

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

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

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

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

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