tor-commits June 2015

tor-commits@lists.torproject.org

22 participants
1870 discussions

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 26 Jun '15

26 Jun '15

commit 083b4bcd9ecaa72a29c74ffac996f26c86401d00 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 26 19:45:21 2015 +0000 Update translations for https_everywhere_completed --- da/ssl-observatory.dtd | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/da/ssl-observatory.dtd b/da/ssl-observatory.dtd index b139aab..82ef329 100644 --- a/da/ssl-observatory.dtd +++ b/da/ssl-observatory.dtd @@ -20,11 +20,10 @@ to turn it on?">-->  <!ENTITY ssl-observatory.prefs.adv_priv_opts1 -"Dette kan trygt aktiveres, medmindre du anvender et -meget påtrængende virksomhedsnetværk:"> +"Dette kan trygt aktiveres, medmindre du anvender et meget påtrængende virksomhedsnetværk:"> <!ENTITY ssl-observatory.prefs.adv_priv_opts2 -"Dette er sikker, medmindre du bruger et virksomhedsnetværk med skjulte/hemmelige intranet-servernavne:"> +"Dette er sikkert, medmindre du bruger et virksomhedsnetværk med skjulte/hemmelige intranet-servernavne:"> <!ENTITY ssl-observatory.prefs.alt_roots "Indsend og tjek certifikater signeret af ikke-standardiserede rod-certifikat-autoriteter">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 26 Jun '15

26 Jun '15

commit 669fd730095259899a2a01f1cb81c611384eb647 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 26 19:45:15 2015 +0000 Update translations for https_everywhere --- da/ssl-observatory.dtd | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/da/ssl-observatory.dtd b/da/ssl-observatory.dtd index b139aab..82ef329 100644 --- a/da/ssl-observatory.dtd +++ b/da/ssl-observatory.dtd @@ -20,11 +20,10 @@ to turn it on?">-->  <!ENTITY ssl-observatory.prefs.adv_priv_opts1 -"Dette kan trygt aktiveres, medmindre du anvender et -meget påtrængende virksomhedsnetværk:"> +"Dette kan trygt aktiveres, medmindre du anvender et meget påtrængende virksomhedsnetværk:"> <!ENTITY ssl-observatory.prefs.adv_priv_opts2 -"Dette er sikker, medmindre du bruger et virksomhedsnetværk med skjulte/hemmelige intranet-servernavne:"> +"Dette er sikkert, medmindre du bruger et virksomhedsnetværk med skjulte/hemmelige intranet-servernavne:"> <!ENTITY ssl-observatory.prefs.alt_roots "Indsend og tjek certifikater signeret af ikke-standardiserede rod-certifikat-autoriteter">

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 26 Jun '15

26 Jun '15

commit 2c866f78e265aa12f80a4633bf50de5a3bc70a4e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 26 18:15:47 2015 +0000 Update translations for abouttor-homepage_completed --- nb/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nb/aboutTor.dtd b/nb/aboutTor.dtd index fce49cc..e6a0a83 100644 --- a/nb/aboutTor.dtd +++ b/nb/aboutTor.dtd @@ -25,7 +25,7 @@ <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> +<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> <!ENTITY aboutTor.torInfo1.label "Tilleggsinformasjon:"> <!ENTITY aboutTor.torInfo2.label "Land & IP-adresse:">

1 0

[tor-messenger-build/master] Set app name to Tor Messenger for OS X builds
by sukhbir＠torproject.org 26 Jun '15

26 Jun '15

commit becad462c72d96f3a6466a0abd2fa18fd0728e7c Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Jun 26 13:48:26 2015 -0400 Set app name to Tor Messenger for OS X builds --- projects/tor-messenger/build.osx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx index 579df2a..ad85e78 100644 --- a/projects/tor-messenger/build.osx +++ b/projects/tor-messenger/build.osx @@ -2,7 +2,7 @@ set -e rootdir=$(pwd) tar xf [% c('input_files_by_name/instantbird') %] -mv Instantbird.app TorMessenger.app +mv Instantbird.app Tor\ Messenger.app tar xf [% c('input_files_by_name/libdmg') %] export PATH="$(pwd)/libdmg-hfsplus:$PATH" @@ -18,23 +18,23 @@ sed -i 's/^ControlPort .*/ControlPort [% c("var/tor_control_port") %]/' TorBrows mkdir -p tor-launcher(a)torproject.org/TorBrowser/Data mv TorBrowser.app/TorBrowser/Tor tor-launcher(a)torproject.org/TorBrowser/Tor mv TorBrowser.app/TorBrowser/Data/Tor tor-launcher(a)torproject.org/TorBrowser/Data/Tor -mv tor-launcher(a)torproject.org $rootdir/TorMessenger.app/Contents/Resources/extensions/ +mv tor-launcher(a)torproject.org $rootdir/Tor\ Messenger.app/Contents/Resources/extensions/ cd .. mkdir ctypes-otr cd ctypes-otr tar xf $rootdir/[% c('input_files_by_name/ctypes-otr') %] -mv ctypes-otr* $rootdir/TorMessenger.app/Contents/Resources/extensions/ctypes-otr@tormessenger +mv ctypes-otr* $rootdir/Tor\ Messenger.app/Contents/Resources/extensions/ctypes-otr@tormessenger cd .. mkdir dmg -mv TorMessenger.app dmg +mv Tor\ Messenger.app dmg cd dmg find $@ -executable -exec chmod 750 {} \; find $@ ! -executable -exec chmod 640 {} \; find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > ../filelist.txt find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> ../filelist.txt -mkisofs -D -V "Tor Messenger" -no-pad -R -apple -o ../TorMessenger-uncompressed.dmg -path-list ../filelist.txt -graft-points -gid 20 -dir-mode 0750 -new-dir-mode 0750 +mkisofs -D -V "Tor Messenger" -no-pad -R -apple -o ../Tor\ Messenger-uncompressed.dmg -path-list ../filelist.txt -graft-points -gid 20 -dir-mode 0750 -new-dir-mode 0750 cd .. -dmg dmg TorMessenger-uncompressed.dmg [% dest_dir _ '/' _ c('filename') %] +dmg dmg Tor\ Messenger-uncompressed.dmg [% dest_dir _ '/' _ c('filename') %]

1 0

[orbot/master] final fixes for AppsVPN mode on boot and Android 4.x support
by n8fr8＠torproject.org 26 Jun '15

26 Jun '15

commit dc06eedcfdffb7bc12a8198fc2f9b4b21f9e1269 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jun 26 09:52:42 2015 -0400 final fixes for AppsVPN mode on boot and Android 4.x support --- AndroidManifest.xml | 7 +- external/appcompat/project.properties | 2 +- src/org/torproject/android/OrbotMainActivity.java | 47 ++----- .../torproject/android/service/OnBootReceiver.java | 28 ++-- src/org/torproject/android/service/TorService.java | 1 - .../torproject/android/vpn/VPNEnableActivity.java | 137 ++++++++++++++++++++ 6 files changed, 164 insertions(+), 58 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 328d57e..3b5ba41 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -73,7 +73,12 @@ android:finishOnTaskLaunch="true" /> - + + <activity + android:name=".vpn.VPNEnableActivity" android:label="@string/app_name" android:exported="false" + android:theme="@android:style/Theme.NoDisplay" + /> + <activity android:name="org.torproject.android.ui.PromoAppsActivity" android:exported="false"/> diff --git a/external/appcompat/project.properties b/external/appcompat/project.properties index 93c8c3c..362a0a3 100644 --- a/external/appcompat/project.properties +++ b/external/appcompat/project.properties @@ -11,5 +11,5 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-21 +target=android-22 android.library=true diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index 7ff6068..c88f129 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -59,6 +59,7 @@ import org.torproject.android.settings.SettingsPreferences; import org.torproject.android.ui.ImageProgressView; import org.torproject.android.ui.PromoAppsActivity; import org.torproject.android.ui.Rotate3dAnimation; +import org.torproject.android.vpn.VPNEnableActivity; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -252,10 +253,11 @@ public class OrbotMainActivity extends Activity boolean useVPN = Prefs.useVpn(); mBtnVPN.setChecked(useVPN); + /** if (useVPN) { - startVpnService (); - } + startActivity(new Intent(OrbotMainActivity.this,VPNEnableActivity.class)); + }*/ mBtnVPN.setOnClickListener(new View.OnClickListener () { @@ -264,7 +266,7 @@ public class OrbotMainActivity extends Activity public void onClick(View v) { if (mBtnVPN.isChecked()) - promptStartVpnService(); + startActivity(new Intent(OrbotMainActivity.this,VPNEnableActivity.class)); else stopVpnService(); @@ -943,45 +945,12 @@ public class OrbotMainActivity extends Activity sendIntentToService(TorServiceConstants.CMD_SIGNAL_HUP); } - public void promptStartVpnService () - { - LayoutInflater li = LayoutInflater.from(this); - View view = li.inflate(R.layout.layout_diag, null); - - TextView versionName = (TextView)view.findViewById(R.id.diaglog); - versionName.setText(R.string.you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_); - - new AlertDialog.Builder(this) - .setTitle(R.string.apps_mode) - .setView(view) - .setPositiveButton(R.string.activate, new Dialog.OnClickListener () - { - - @Override - public void onClick(DialogInterface dialog, int which) { - Prefs.putUseVpn(true); - startVpnService(); - } - - - }) - .setNegativeButton(R.string.btn_cancel, new Dialog.OnClickListener () - { - - @Override - public void onClick(DialogInterface dialog, int which) { - - mBtnVPN.setChecked(false); - } - - }) - .show(); - } + /** @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH) public void startVpnService () { - Intent intent = VpnService.prepare(this); + Intent intent = VpnService.prepare(getApplicationContext()); if (intent != null) { startActivityForResult(intent,REQUEST_VPN); } @@ -989,7 +958,7 @@ public class OrbotMainActivity extends Activity { sendIntentToService(TorServiceConstants.CMD_VPN); } - } + }*/ public void stopVpnService () { diff --git a/src/org/torproject/android/service/OnBootReceiver.java b/src/org/torproject/android/service/OnBootReceiver.java index 2429c4d..36891e8 100644 --- a/src/org/torproject/android/service/OnBootReceiver.java +++ b/src/org/torproject/android/service/OnBootReceiver.java @@ -1,13 +1,12 @@ package org.torproject.android.service; -import android.annotation.SuppressLint; +import org.torproject.android.Prefs; +import org.torproject.android.vpn.VPNEnableActivity; + import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import android.net.VpnService; - -import org.torproject.android.Prefs; public class OnBootReceiver extends BroadcastReceiver { @@ -15,24 +14,21 @@ public class OnBootReceiver extends BroadcastReceiver { public void onReceive(Context context, Intent intent) { Prefs.setContext(context); if (Prefs.startOnBoot()) - { - startService(TorServiceConstants.ACTION_START, context); + { if (Prefs.useVpn()) - startVpnService(context); + startVpnService(context); //VPN will start Tor once it is done + else + startService(TorServiceConstants.ACTION_START, context); + } } - @SuppressLint("NewApi") - public void startVpnService (Context context) + public void startVpnService (final Context context) { - Intent intent = VpnService.prepare(context); - - if (intent != null) { - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - context.startActivity(intent); - } - + Intent intent = new Intent(context,VPNEnableActivity.class); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + context.startActivity(intent); } private void startService (String action, Context context) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index a515333..2ee02bd 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -93,7 +93,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private Socket torConnSocket = null; private int mLastProcessId = -1; - private int mPortHTTP = HTTP_PROXY_PORT_DEFAULT; private int mPortSOCKS = SOCKS_PROXY_PORT_DEFAULT; diff --git a/src/org/torproject/android/vpn/VPNEnableActivity.java b/src/org/torproject/android/vpn/VPNEnableActivity.java new file mode 100644 index 0000000..273a1cd --- /dev/null +++ b/src/org/torproject/android/vpn/VPNEnableActivity.java @@ -0,0 +1,137 @@ +package org.torproject.android.vpn; + +import org.torproject.android.Prefs; +import org.torproject.android.R; +import org.torproject.android.service.TorService; +import org.torproject.android.service.TorServiceConstants; + +import android.annotation.TargetApi; +import android.app.Activity; +import android.app.AlertDialog; +import android.app.Dialog; +import android.content.DialogInterface; +import android.content.Intent; +import android.net.VpnService; +import android.os.Build; +import android.os.Bundle; +import android.os.Handler; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.TextView; + +/* + * To combat background service being stopped/swiped + */ +public class VPNEnableActivity extends Activity { + + private final static int REQUEST_VPN = 7777; + private Intent intent = null; + + @Override + public void onCreate( Bundle icicle ) { + super.onCreate( icicle ); + + Log.d("VPNEnableActivity","prompting user to start Orbot VPN"); + + intent = VpnService.prepare(this); + + if (intent != null) + promptStartVpnService(); + else + startVpnService (); + + } + + public void promptStartVpnService () + { + LayoutInflater li = LayoutInflater.from(this); + View view = li.inflate(R.layout.layout_diag, null); + + TextView versionName = (TextView)view.findViewById(R.id.diaglog); + versionName.setText(R.string.you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_); + + new AlertDialog.Builder(this) + .setTitle(getString(R.string.app_name) + ' ' + getString(R.string.apps_mode)) + .setView(view) + .setPositiveButton(R.string.activate, new Dialog.OnClickListener () + { + + @Override + public void onClick(DialogInterface dialog, int which) { + Prefs.putUseVpn(true); + + startVpnService(); + + } + + + }) + .setNegativeButton(R.string.btn_cancel, new Dialog.OnClickListener () + { + + @Override + public void onClick(DialogInterface dialog, int which) { + + finish(); + } + + }) + .show(); + } + + private void startVpnService () + { + if (intent == null) + { + Log.d("VPNEnableActivity","VPN enabled, starting Tor..."); + sendIntentToService(TorServiceConstants.CMD_VPN); + + Handler h = new Handler(); + h.postDelayed(new Runnable () { + + public void run () + { + sendIntentToService(TorServiceConstants.ACTION_START); + finish(); + } + }, 1000); + + } + else + { + Log.w("VPNEnableActivity","prompt for VPN"); + startActivityForResult(intent,REQUEST_VPN); + + } + + } + + @Override + protected void onActivityResult(int request, int response, Intent data) { + super.onActivityResult(request, response, data); + + if (request == REQUEST_VPN && response == RESULT_OK) + { + sendIntentToService(TorServiceConstants.CMD_VPN); + Handler h = new Handler(); + h.postDelayed(new Runnable () { + + public void run () + { + sendIntentToService(TorServiceConstants.ACTION_START); + finish(); + } + }, 1000); + + } + } + + + private void sendIntentToService(String action) { + Intent torService = new Intent(this, TorService.class); + torService.setAction(action); + startService(torService); + } + +} \ No newline at end of file

1 0

[orbot/master] update to beta 3
by n8fr8＠torproject.org 26 Jun '15

26 Jun '15

commit dd2a144f4b02dd51038c5b8205daad4a15c1b71e Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jun 26 09:53:16 2015 -0400 update to beta 3 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3b5ba41..f81f3f4 100644 --- a/AndroidManifest.xml +++ b/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.0.1-beta-2" - android:versionCode="150012" + android:versionName="15.0.1-beta-3" + android:versionCode="150013" android:installLocation="auto" >

1 0

[orbot/master] update changelog
by n8fr8＠torproject.org 26 Jun '15

26 Jun '15

commit e00f830ecadbca1b02eff2bfee804cd1e7b920e9 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jun 26 09:54:19 2015 -0400 update changelog --- CHANGELOG | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 8da5abe..087a596 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,10 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ + +/** 15.0.1 BETA 3 / 26-Jun-2015 / dd2a144f4b02dd51038c5b8205daad4a15c1b71e */ + +* dc06eed final fixes for AppsVPN mode on boot and Android 4.x support + /** 15.0.1 BETA 2 / 25-Jun-2015 / c56e5d635f758f2ed5ab4e20e0805777686b4536 **/ * VPN Mode Improvements

1 0

[tor-messenger-build/master] Add OS X branding (logo in ICNS)
by sukhbir＠torproject.org 26 Jun '15

26 Jun '15

commit 6b994d4893e65847bf1e75a6904e41929801287e Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Jun 26 08:18:30 2015 -0400 Add OS X branding (logo in ICNS) --- projects/instantbird/branding/instantbird.icns | Bin 0 -> 21624 bytes projects/instantbird/build | 1 + projects/instantbird/config | 1 + 3 files changed, 2 insertions(+) diff --git a/projects/instantbird/branding/instantbird.icns b/projects/instantbird/branding/instantbird.icns new file mode 100644 index 0000000..0843171 Binary files /dev/null and b/projects/instantbird/branding/instantbird.icns differ diff --git a/projects/instantbird/build b/projects/instantbird/build index 23b23d0..15659ec 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -60,6 +60,7 @@ cp ../branding/convWindow.ico im/branding/messenger/windows/ cp ../branding/default.ico im/branding/messenger/windows/ cp ../branding/instantbird.ico im/branding/messenger/ +cp ../branding/instantbird.icns im/branding/messenger/ cd mozilla if ls -1 $rootdir/*.mozpatch > /dev/null 2>&1 diff --git a/projects/instantbird/config b/projects/instantbird/config index 92adb3f..5f321d9 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -100,6 +100,7 @@ input_files: - filename: branding/default.ico - filename: branding/instantbird.ico - filename: branding/name.patch + - filename: branding/instantbird.icns - filename: fix-mingw-build.patch enable: '[% c("var/windows") %]' - filename: f2e7cea9bc6a-bug-1150967.patch

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 26 Jun '15

26 Jun '15

commit b555d4eb5d81db6af9948e4b0a3c3b3068137d0d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 26 11:45:09 2015 +0000 Update translations for bridgedb_completed --- cs/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cs/LC_MESSAGES/bridgedb.po b/cs/LC_MESSAGES/bridgedb.po index 1cdbe97..3f3901c 100644 --- a/cs/LC_MESSAGES/bridgedb.po +++ b/cs/LC_MESSAGES/bridgedb.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-06-26 10:44+0000\n" +"PO-Revision-Date: 2015-06-26 11:15+0000\n" "Last-Translator: Vlastimil Burián <burian.vlastimil2(a)gmail.com>\n" "Language-Team: Czech (http://www.transifex.com/projects/p/torproject/language/cs/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 26 Jun '15

26 Jun '15

commit 8867fd2be5f76530110714ebf0b1c4710d13ba51 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 26 11:45:05 2015 +0000 Update translations for bridgedb --- cs/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cs/LC_MESSAGES/bridgedb.po b/cs/LC_MESSAGES/bridgedb.po index 1cdbe97..3f3901c 100644 --- a/cs/LC_MESSAGES/bridgedb.po +++ b/cs/LC_MESSAGES/bridgedb.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-06-26 10:44+0000\n" +"PO-Revision-Date: 2015-06-26 11:15+0000\n" "Last-Translator: Vlastimil Burián <burian.vlastimil2(a)gmail.com>\n" "Language-Team: Czech (http://www.transifex.com/projects/p/torproject/language/cs/)\n" "MIME-Version: 1.0\n"

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2015