November 2016 - tor-commits - lists.torproject.org

[tor-messenger-build/master] Use urls in input_files
by arlo＠torproject.org 03 Nov '16

03 Nov '16

commit f9a3a092d01c5fc4e0b29c15443213be576f1ea9 Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Nov 3 09:56:07 2016 -0700 Use urls in input_files --- projects/tor-messenger/build | 4 ++-- projects/tor-messenger/config | 8 ++++++-- projects/tor-messenger/future-0.16.0.tar.gz | Bin 824484 -> 0 bytes projects/tor-messenger/pefile-2016.3.28.tar.gz | Bin 58110 -> 0 bytes 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index fb3a27d..c855675 100755 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -92,12 +92,12 @@ mv bundle tor-messenger [% IF c('var/windows') -%] makensis tor-messenger.nsi -tar xf future-0.16.0.tar.gz +tar xf $rootdir/[% c('input_files_by_name/python-future') %] cd future-0.16.0/ python setup.py install --user cd .. -tar xf pefile-2016.3.28.tar.gz +tar xf $rootdir/[% c('input_files_by_name/python-pefile') %] cd pefile-2016.3.28/ python setup.py install --user cd .. diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index f1e4b88..70ae860 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -26,9 +26,13 @@ input_files: enable: '[% c("var/osx") %]' - filename: tor-messenger.nsi enable: '[% c("var/windows") %]' - - filename: future-0.16.0.tar.gz + - name: python-future + URL: https://pypi.python.org/packages/00/2b/8d082ddfed935f3608cc61140df6dcbf0ede… + sha256sum: e39ced1ab767b5936646cedba8bcce582398233d6a627067d4c6a454c90cfedb enable: '[% c("var/windows") %]' - - filename: pefile-2016.3.28.tar.gz + - name: python-pefile + URL: https://pypi.python.org/packages/92/c0/8589ce9734ffdba258bd3e5acd4afb2e3586… + sha256sum: f24021085b5c3ef7b0898bb1f1d93eecd3839e03512769e22b0c5a10d9095f7b enable: '[% c("var/windows") %]' - filename: pe_checksum_fix.py enable: '[% c("var/windows") %]' diff --git a/projects/tor-messenger/future-0.16.0.tar.gz b/projects/tor-messenger/future-0.16.0.tar.gz deleted file mode 100644 index 271b7e0..0000000 Binary files a/projects/tor-messenger/future-0.16.0.tar.gz and /dev/null differ diff --git a/projects/tor-messenger/pefile-2016.3.28.tar.gz b/projects/tor-messenger/pefile-2016.3.28.tar.gz deleted file mode 100644 index c045e69..0000000 Binary files a/projects/tor-messenger/pefile-2016.3.28.tar.gz and /dev/null differ

1 0

[stem/master] fix for .swo file expected in installation
by atagar＠torproject.org 03 Nov '16

03 Nov '16

commit c3b7f258847a26750991c87a98e03fdeaca2d113 Author: Chelsea H. Komlo <chelsea.komlo(a)gmail.com> Date: Mon Oct 31 22:30:06 2016 -0500 fix for .swo file expected in installation --- .gitignore | 1 + test/integ/installation.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index fda679b..7f97772 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.pyc *.swp +*.swo .tox test/data/ docs/_build/ diff --git a/test/integ/installation.py b/test/integ/installation.py index d068d57..e830446 100644 --- a/test/integ/installation.py +++ b/test/integ/installation.py @@ -81,7 +81,8 @@ class TestInstallation(unittest.TestCase): for root, dirnames, filenames in os.walk(os.path.join(BASE_DIRECTORY, 'stem')): for filename in filenames: - if not filename.endswith('.pyc') and not filename.endswith('.swp'): + if (not filename.endswith('.pyc') and not filename.endswith('.swp') and + not filename.endswith('.swo')): expected.add(os.path.join(root, filename)[len(BASE_DIRECTORY) + 1:]) for root, dirnames, filenames in os.walk(self.site_packages_path):

1 0

[stem/master] Slightly tweak new swo check
by atagar＠torproject.org 03 Nov '16

03 Nov '16

commit 6a1764524990506bf09d2ec5ddea0b160e231077 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Nov 3 09:53:51 2016 -0700 Slightly tweak new swo check Minorest of minor nitpicks. Was perfectly fine, just prefer a blank line and for exclude to be in the conditional (imho didn't previously add any readability). --- test/integ/installation.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integ/installation.py b/test/integ/installation.py index 533aefd..50c0339 100644 --- a/test/integ/installation.py +++ b/test/integ/installation.py @@ -82,8 +82,8 @@ class TestInstallation(unittest.TestCase): for root, dirnames, filenames in os.walk(os.path.join(BASE_DIRECTORY, 'stem')): for filename in filenames: file_format = filename.split('.')[-1] - excluded = ['pyc', 'swp', 'swo'] - if not file_format in excluded: + + if file_format not in ('pyc', 'swp', 'swo'): expected.add(os.path.join(root, filename)[len(BASE_DIRECTORY) + 1:]) for root, dirnames, filenames in os.walk(self.site_packages_path):

1 0

[stem/master] refactor for extensibility, easier to exclude file formats from check for
by atagar＠torproject.org 03 Nov '16

03 Nov '16

commit 9a267690af2d6480753bfc794a5a7be2a89e7803 Author: Chelsea H. Komlo <chelsea.komlo(a)gmail.com> Date: Tue Nov 1 08:09:51 2016 -0500 refactor for extensibility, easier to exclude file formats from check for required files --- test/integ/installation.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/integ/installation.py b/test/integ/installation.py index e830446..533aefd 100644 --- a/test/integ/installation.py +++ b/test/integ/installation.py @@ -81,9 +81,10 @@ class TestInstallation(unittest.TestCase): for root, dirnames, filenames in os.walk(os.path.join(BASE_DIRECTORY, 'stem')): for filename in filenames: - if (not filename.endswith('.pyc') and not filename.endswith('.swp') and - not filename.endswith('.swo')): - expected.add(os.path.join(root, filename)[len(BASE_DIRECTORY) + 1:]) + file_format = filename.split('.')[-1] + excluded = ['pyc', 'swp', 'swo'] + if not file_format in excluded: + expected.add(os.path.join(root, filename)[len(BASE_DIRECTORY) + 1:]) for root, dirnames, filenames in os.walk(self.site_packages_path): for filename in filenames:

1 0

[stem/master] Integ tests failed if vim swo files were present
by atagar＠torproject.org 03 Nov '16

03 Nov '16

commit 0247044047e59fd74e91c908ab1792d7558f8534 Merge: 532f906 6a17645 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Nov 3 09:57:45 2016 -0700 Integ tests failed if vim swo files were present Interesting, I use vim but have never seen these. Maybe it's something with newer versions? Regardless, great catch from Chelsea... https://trac.torproject.org/projects/tor/ticket/20520 .gitignore | 1 + test/integ/installation.py | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[orbot/master] expanded notifications should be on by default for SDK 16+
by n8fr8＠torproject.org 03 Nov '16

03 Nov '16

commit 45f7ae23c642146c2b747a73f66e9b80c2c973c6 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Nov 3 12:44:41 2016 -0400 expanded notifications should be on by default for SDK 16+ --- .../src/main/java/org/torproject/android/service/util/Prefs.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java index 38f2399..cf3489e 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java @@ -89,7 +89,7 @@ public class Prefs { } public static boolean expandedNotifications() { - return prefs.getBoolean(PREF_EXPANDED_NOTIFICATIONS, false); + return prefs.getBoolean(PREF_EXPANDED_NOTIFICATIONS, true); } public static boolean useDebugLogging() {

1 0

[orbot/master] 15.2.0-RC-5 notification fixes!
by n8fr8＠torproject.org 03 Nov '16

03 Nov '16

commit 24dee21b96f67cbb5cf84482808fe432ebcff814 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Nov 3 12:49:54 2016 -0400 15.2.0-RC-5 notification fixes! --- app/src/main/AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1c63803..9d884ee 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="15.2.0-RC-4" - android:versionCode="15204000" + android:versionName="15.2.0-RC-5" + android:versionCode="15205000" android:installLocation="auto" > <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23"/>

1 0

[orbot/master] update changelog for RC5
by n8fr8＠torproject.org 03 Nov '16

03 Nov '16

commit 2a0145693d4d6217bd368062b8ba94b083705705 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Nov 3 12:50:45 2016 -0400 update changelog for RC5 --- CHANGELOG | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 0c46df3..66e24d7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,11 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +/** 15.2.0 RC 5 / 3 November 2016/ 24dee21b96f67cbb5cf84482808fe432ebcff814 **/ + +ba212a4 make sure notification is shown immediately while starting up +45f7ae2 expanded notifications should be on by default for SDK 16+ + + /** 15.2.0 RC 4 / 3 November 2016 / 6b2679cac16782a7a36a79f90f2dd0d8e330742f **/ 89f3fca make sure the binaries are cleanly installed (bump version number)

1 0

[orbot/master] make sure notification is shown immediately while starting up
by n8fr8＠torproject.org 03 Nov '16

03 Nov '16

commit ba212a447cd2873d806029992594b605c56ddc16 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Nov 3 12:45:00 2016 -0400 make sure notification is shown immediately while starting up --- .../main/java/org/torproject/android/service/TorService.java | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 47af4ac..d55e1cf 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -163,6 +163,8 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (mLastProcessId != -1 && conn != null) { sendCallbackLogMessage(getString(R.string.found_existing_tor_process)); sendCallbackStatus(STATUS_ON); + showToolbarNotification(getString(R.string.status_activated),NOTIFY_ID,R.drawable.ic_stat_tor); + return true; } } catch (Exception e) { @@ -335,6 +337,13 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } public void run() { + + while (!isTorUpgradeAndConfigComplete) + { + try { Thread.sleep (500);} + catch (Exception e){} + } + String action = mIntent.getAction(); if (action != null) { @@ -775,6 +784,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon // killAllDaemons(); 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

[orbot/master] fixes github #59 for crash on app list UI
by n8fr8＠torproject.org 03 Nov '16

03 Nov '16

commit 1ae0c71ac7d7c3e95d4e7f3b1ba02863cbb22dff Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Nov 3 10:36:39 2016 -0400 fixes github #59 for crash on app list UI --- app/src/main/java/org/torproject/android/ui/AppManager.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/torproject/android/ui/AppManager.java b/app/src/main/java/org/torproject/android/ui/AppManager.java index 85fe4b3..9a15dae 100644 --- a/app/src/main/java/org/torproject/android/ui/AppManager.java +++ b/app/src/main/java/org/torproject/android/ui/AppManager.java @@ -122,7 +122,9 @@ public class AppManager extends AppCompatActivity implements OnCheckedChangeList app.setTorified(!app.isTorified()); } - box.setChecked(app.isTorified()); + if (box != null) + box.setChecked(app.isTorified()); + } saveAppSettings(context); loadApps(prefs);

1 0