September 2018 - tor-commits - lists.torproject.org

[orbot/master] update version and constrains library
by n8fr8＠torproject.org 14 Sep '18

14 Sep '18

commit bd61739db05793c93ea345ea2de9277989a0c850 Author: n8fr8 <nathan(a)freitas.net> Date: Wed Sep 5 22:04:09 2018 -0400 update version and constrains library --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7fd095b1..be2c1830 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -44,7 +44,7 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 27 - versionCode 16020041 + versionCode 16020043 versionName '16.0.2-RC-1' archivesBaseName = "Orbot-$versionName" } @@ -78,7 +78,7 @@ android { dependencies { implementation 'com.github.delight-im:Android-Languages:v1.0.1' - implementation 'com.android.support.constraint:constraint-layout:1.1.0' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation project(':orbotservice') implementation 'com.android.support:design:27.1.1' implementation 'pl.bclogic:pulsator4droid:1.0.3'

1 0

[orbot/master] update launcher web graphic
by n8fr8＠torproject.org 14 Sep '18

14 Sep '18

commit 06c343c8f2f59289ce0360af7c19b19d4ec7808e Author: n8fr8 <nathan(a)freitas.net> Date: Wed Sep 5 22:04:46 2018 -0400 update launcher web graphic --- app/src/main/ic_launcher-web.png | Bin 0 -> 23371 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png new file mode 100644 index 00000000..d28872f5 Binary files /dev/null and b/app/src/main/ic_launcher-web.png differ

1 0

[orbot/master] Merge branch 'Unpublished-deprecated_torrc'
by n8fr8＠torproject.org 14 Sep '18

14 Sep '18

commit 1bef963271634d0315b314016184f70f122e6525 Merge: 06c343c8 b2bf3d9a Author: n8fr8 <nathan(a)freitas.net> Date: Thu Sep 6 23:24:25 2018 -0400 Merge branch 'Unpublished-deprecated_torrc' BUILD | 7 +- app/build.gradle | 4 +- app/proguard-rules.txt | 8 + .../ui/onboarding/BridgeWizardActivity.java | 212 ++++++--------------- app/src/main/res/layout/content_bridge_wizard.xml | 70 +++---- app/src/main/res/layout/layout_diag.xml | 14 -- app/src/main/res/values/strings.xml | 4 +- .../org/torproject/android/service/TorService.java | 5 +- .../android/service/util/NativeLoader.java | 6 +- 9 files changed, 108 insertions(+), 222 deletions(-)

1 0

[orbot/master] update launcher graphics
by n8fr8＠torproject.org 14 Sep '18

14 Sep '18

commit 34331120b3f2507e9a74adfe9bdb8be1a49c4fea Author: n8fr8 <nathan(a)freitas.net> Date: Wed Sep 5 22:04:34 2018 -0400 update launcher graphics --- app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 5 +++++ .../main/res/mipmap-anydpi-v26/ic_launcher_round.xml | 5 +++++ app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 2253 bytes app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png | Bin 0 -> 2146 bytes app/src/main/res/mipmap-hdpi/ic_launcher_round.png | Bin 0 -> 4325 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 1580 bytes app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png | Bin 0 -> 1376 bytes app/src/main/res/mipmap-mdpi/ic_launcher_round.png | Bin 0 -> 2723 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 3071 bytes .../main/res/mipmap-xhdpi/ic_launcher_foreground.png | Bin 0 -> 3075 bytes app/src/main/res/mipmap-xhdpi/ic_launcher_round.png | Bin 0 -> 6103 bytes app/src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 4682 bytes .../main/res/mipmap-xxhdpi/ic_launcher_foreground.png | Bin 0 -> 5112 bytes app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png | Bin 0 -> 9447 bytes app/src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 6541 bytes .../main/res/mipmap-xxxhdpi/ic_launcher_foreground.png | Bin 0 -> 7372 bytes app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 0 -> 13447 bytes app/src/main/res/values/ic_launcher_background.xml | 4 ++++ 18 files changed, 14 insertions(+) diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 00000000..036d09bc --- /dev/null +++ b/app/src/main/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/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 00000000..036d09bc --- /dev/null +++ b/app/src/main/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/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 00000000..bfa1a8aa Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..97a6f3b1 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 00000000..747bf3a7 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 00000000..fd6ee423 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..69131a09 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 00000000..9462c6c9 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 00000000..ac7dc49e Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..505a60aa Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 00000000..95a1e66d Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 00000000..84b7fa9b Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..99a2d160 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 00000000..da1ddc7a Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 00000000..ab49f658 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..cc79a13c Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 00000000..e43f5c14 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 00000000..247d8776 --- /dev/null +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <color name="ic_launcher_background">#E7275A</color> +</resources> \ No newline at end of file

1 0

[orbot/master] Merge branch 'deprecated_torrc' of https://github.com/Unpublished/orbot into Unpublished-deprecated_torrc
by n8fr8＠torproject.org 14 Sep '18

14 Sep '18

commit b2bf3d9a4bce9976da3d557fb8b67032e321f30e Merge: 06c343c8 f74dea24 Author: n8fr8 <nathan(a)freitas.net> Date: Wed Sep 5 22:12:43 2018 -0400 Merge branch 'deprecated_torrc' of https://github.com/Unpublished/orbot into Unpublished-deprecated_torrc BUILD | 7 +- app/build.gradle | 4 +- app/proguard-rules.txt | 8 + .../ui/onboarding/BridgeWizardActivity.java | 212 ++++++--------------- app/src/main/res/layout/content_bridge_wizard.xml | 70 +++---- app/src/main/res/layout/layout_diag.xml | 14 -- app/src/main/res/values/strings.xml | 4 +- .../org/torproject/android/service/TorService.java | 5 +- .../android/service/util/NativeLoader.java | 6 +- 9 files changed, 108 insertions(+), 222 deletions(-)

1 0

[orbot/master] update to Tor 0.3.4.8
by n8fr8＠torproject.org 14 Sep '18

14 Sep '18

commit 6bc161b677a5f43b1d5dd96f90ed7ec260efd274 Author: n8fr8 <nathan(a)freitas.net> Date: Thu Sep 13 12:55:43 2018 -0400 update to Tor 0.3.4.8 --- orbotservice/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index c4729bd7..1c9cda0f 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -27,7 +27,7 @@ android { dependencies { implementation project(':jsocksAndroid') - implementation 'org.torproject:tor-android-binary:0.3.4.7-rc' + implementation 'org.torproject:tor-android-binary:0.3.4.8' implementation 'com.android.support:appcompat-v7:27.1.1' implementation 'com.jrummyapps:android-shell:1.0.1' implementation fileTree(dir: 'libs', include: ['.so'])

1 0

[orbot/master] Merge branch 'master' of github.com:n8fr8/orbot
by n8fr8＠torproject.org 14 Sep '18

14 Sep '18

commit 129b55a4e3c0a7e54a71c94e651154145171014e Merge: 1bef9632 b0a49903 Author: n8fr8 <nathan(a)freitas.net> Date: Thu Sep 6 23:24:38 2018 -0400 Merge branch 'master' of github.com:n8fr8/orbot app/src/main/res/values-de/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[orbot/master] improve service checking for running Tor instance
by n8fr8＠torproject.org 14 Sep '18

14 Sep '18

commit 66cc8ad5499d66c88adca8703e89693261da2ae3 Author: n8fr8 <nathan(a)freitas.net> Date: Thu Sep 13 12:55:50 2018 -0400 improve service checking for running Tor instance --- .../java/org/torproject/android/service/TorService.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) 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 c7cc708e..d1558565 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -787,26 +787,35 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon * The entire process for starting tor and related services is run from this method. */ private void startTor() { + + String torProcId = null; + + try { if (conn != null) torProcId = conn.getInfo("process/pid"); } + catch (Exception e){} + // STATUS_STARTING is set in onCreate() if (mCurrentStatus == STATUS_STOPPING) { // these states should probably be handled better sendCallbackLogMessage("Ignoring start request, currently " + mCurrentStatus); return; - } else if (mCurrentStatus == STATUS_ON) { + } else if (mCurrentStatus == STATUS_ON && (torProcId != null)) { sendCallbackLogMessage("Ignoring start request, already started."); setTorNetworkEnabled (true); return; } - try { // make sure there are no stray daemons running // killAllDaemons(); - - sendCallbackStatus(STATUS_STARTING); + + SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); + String version = prefs.getString(PREF_BINARY_TOR_VERSION_INSTALLED,null); + logNotice("checking binary version: " + version); + + sendCallbackStatus(STATUS_STARTING); showToolbarNotification(getString(R.string.status_starting_up),NOTIFY_ID,R.drawable.ic_stat_tor); sendCallbackLogMessage(getString(R.string.status_starting_up)); logNotice(getString(R.string.status_starting_up));

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 14 Sep '18

14 Sep '18

commit 9f04b9cddea8aa98338a4a4b61d1069af2ba7364 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 13 16:18:30 2018 +0000 Update translations for torcheck_completed --- es/torcheck.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/es/torcheck.po b/es/torcheck.po index 4ef3340bc..65c10be66 100644 --- a/es/torcheck.po +++ b/es/torcheck.po @@ -24,7 +24,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2018-03-02 11:43+0000\n" +"PO-Revision-Date: 2018-09-13 16:05+0000\n" "Last-Translator: Emma Peel\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -62,15 +62,15 @@ msgid "" msgstr "Si estás intentando utilizar el cliente Tor, visita el <a href=\"https://www.torproject.org/\">sitio web de Tor</a> y específicamente las <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instrucciones para configurar tu cliente Tor</a>." msgid "Sorry, your query failed or an unexpected response was received." -msgstr "Lo sentimos, su consulta falló o se recibió una respuesta inesperada." +msgstr "Lo sentimos, tu consulta falló o se recibió una respuesta inesperada." msgid "" "A temporary service outage prevents us from determining if your source IP " "address is a <a href=\"https://www.torproject.org/\">Tor</a> node." -msgstr "Un fallo temporal del servicio no nos permite determinar si su dirección IP de origen es un nodo <a href=\"https://www.torproject.org/\">Tor</a>." +msgstr "Un fallo temporal del servicio no nos permite determinar si tu dirección IP de origen es un nodo <a href=\"https://www.torproject.org/\">Tor</a>." msgid "Your IP address appears to be: " -msgstr "Su dirección IP parece ser: " +msgstr "Tu dirección IP parece ser: " msgid "Are you using Tor?" msgstr "¿Estás usando Tor?"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 14 Sep '18

14 Sep '18

commit 4137c76cee8d79d0552191b645c67cf14016979e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 13 16:18:24 2018 +0000 Update translations for torcheck --- es/torcheck.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/es/torcheck.po b/es/torcheck.po index 4ef3340bc..65c10be66 100644 --- a/es/torcheck.po +++ b/es/torcheck.po @@ -24,7 +24,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2018-03-02 11:43+0000\n" +"PO-Revision-Date: 2018-09-13 16:05+0000\n" "Last-Translator: Emma Peel\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -62,15 +62,15 @@ msgid "" msgstr "Si estás intentando utilizar el cliente Tor, visita el <a href=\"https://www.torproject.org/\">sitio web de Tor</a> y específicamente las <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instrucciones para configurar tu cliente Tor</a>." msgid "Sorry, your query failed or an unexpected response was received." -msgstr "Lo sentimos, su consulta falló o se recibió una respuesta inesperada." +msgstr "Lo sentimos, tu consulta falló o se recibió una respuesta inesperada." msgid "" "A temporary service outage prevents us from determining if your source IP " "address is a <a href=\"https://www.torproject.org/\">Tor</a> node." -msgstr "Un fallo temporal del servicio no nos permite determinar si su dirección IP de origen es un nodo <a href=\"https://www.torproject.org/\">Tor</a>." +msgstr "Un fallo temporal del servicio no nos permite determinar si tu dirección IP de origen es un nodo <a href=\"https://www.torproject.org/\">Tor</a>." msgid "Your IP address appears to be: " -msgstr "Su dirección IP parece ser: " +msgstr "Tu dirección IP parece ser: " msgid "Are you using Tor?" msgstr "¿Estás usando Tor?"

1 0