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

[orbot/master] launch the internal or system browser depending upon VPN mode
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 7f422651588eedcfbaa5cac98a956fef9a0b2d61 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Feb 4 16:07:45 2015 -0500 launch the internal or system browser depending upon VPN mode --- src/org/torproject/android/OrbotMainActivity.java | 58 ++++----------------- 1 file changed, 11 insertions(+), 47 deletions(-) diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index 2b4e9d3..8abc43e 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -184,7 +184,6 @@ public class OrbotMainActivity extends Activity implements TorConstants, OnLongC }; - private void doLayout () { setContentView(R.layout.layout_main); @@ -654,62 +653,27 @@ public class OrbotMainActivity extends Activity implements TorConstants, OnLongC /* * Launch the system activity for Uri viewing with the provided url */ - private void openBrowser(final String browserLaunchUrl) + private void openBrowser(String browserLaunchUrl) { //startIntent("info.guardianproject.browser.Browser",Intent.ACTION_VIEW,Uri.parse(browserLaunchUrl)); - Intent intentBrowser = new Intent(this, Browser.class); - intentBrowser.setAction(Intent.ACTION_VIEW); - intentBrowser.setData(Uri.parse(browserLaunchUrl)); - startActivity(intentBrowser); - - /** - boolean isOrwebInstalled = appInstalledOrNot("info.guardianproject.browser"); - boolean isTransProxy = mPrefs.getBoolean("pref_transparent", false); - - if (isOrwebInstalled) - { - } - else if (isTransProxy) + if (mBtnVPN.isChecked()) { + //use the system browser since VPN is on Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(browserLaunchUrl)); intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP|Intent.FLAG_ACTIVITY_NEW_TASK); startActivity(intent); } else { - AlertDialog aDialog = new AlertDialog.Builder(Orbot.this) - .setIcon(R.drawable.onion32) - .setTitle(R.string.install_apps_) - .setMessage(R.string.it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_) - .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener () - { - - @Override - public void onClick(DialogInterface dialog, int which) { - - //prompt to install Orweb - Intent intent = new Intent(Orbot.this,TipsAndTricks.class); - startActivity(intent); - - } - - }) - .setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener () - { - - @Override - public void onClick(DialogInterface dialog, int which) { - Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(browserLaunchUrl)); - intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP|Intent.FLAG_ACTIVITY_NEW_TASK); - startActivity(intent); - - } - - }) - .show(); - - }*/ + //use the built-in browser + Intent intentBrowser = new Intent(this, Browser.class); + intentBrowser.setAction(Intent.ACTION_VIEW); + intentBrowser.setData(Uri.parse(browserLaunchUrl)); + startActivity(intentBrowser); + } + + }

1 0

[orbot/master] fix NPE for when mHandler is null
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 9b4ef18b13b5d68c80b61dd7c706fd0983ae9c2f Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Feb 4 16:28:40 2015 -0500 fix NPE for when mHandler is null --- src/org/torproject/android/vpn/OrbotVpnService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/org/torproject/android/vpn/OrbotVpnService.java b/src/org/torproject/android/vpn/OrbotVpnService.java index c53d288..7919b07 100644 --- a/src/org/torproject/android/vpn/OrbotVpnService.java +++ b/src/org/torproject/android/vpn/OrbotVpnService.java @@ -81,7 +81,8 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { else if (action.equals("stop")) { stopVPN(); - mHandler.postDelayed(new Runnable () { public void run () { stopSelf(); }}, 1000); + if (mHandler != null) + mHandler.postDelayed(new Runnable () { public void run () { stopSelf(); }}, 1000); }

1 0

[orbot/master] use IP instead of "localhost" name
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 6832363905126b2061b6c63b4bbba4059816f289 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Feb 4 16:28:25 2015 -0500 use IP instead of "localhost" name --- res/raw/torpolipo.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/raw/torpolipo.conf b/res/raw/torpolipo.conf index 0bdefbe..0aeaf63 100644 --- a/res/raw/torpolipo.conf +++ b/res/raw/torpolipo.conf @@ -2,9 +2,9 @@ proxyAddress = "127.0.0.1" proxyPort = 8118 allowedClients = 127.0.0.1 allowedPorts = 1-65535 -proxyName = "localhost" +proxyName = "127.0.0.1" cacheIsShared = false -socksParentProxy = "localhost:9050" +socksParentProxy = "127.0.0.1:9050" socksProxyType = socks5 diskCacheRoot = "" localDocumentRoot = ""

1 0

[orbot/master] remove unneeded README
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit a41367cf50e25bde3ef7641ec775f5dbda078334 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Feb 4 16:28:56 2015 -0500 remove unneeded README --- libs/README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/libs/README.md b/libs/README.md deleted file mode 100644 index 72f796a..0000000 --- a/libs/README.md +++ /dev/null @@ -1,3 +0,0 @@ -Please build the necessary dependency jars from the external folder: - -make -c external

1 0

[orbot/master] add new gitmodules for orweb and pluto support
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 5a8aa888b1392dd2466c60989e1e536fc373055f Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Feb 5 09:42:39 2015 -0500 add new gitmodules for orweb and pluto support --- .gitmodules | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitmodules b/.gitmodules index 6d1ec94..42162a3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -32,3 +32,9 @@ [submodule "external/badvpn"] path = external/badvpn url = https://github.com/guardianproject/badvpn.git +[submodule "external/pluto"] + path = external/pluto + url = https://github.com/guardianproject/pluto.git +[submodule "external/orweb"] + path = external/orweb + url = https://github.com/guardianproject/Orweb.git

1 0

[orbot/master] v15 alpha 2
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 65460409211b8f845e00c2013acbc4c1b766c2e1 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Feb 4 16:54:14 2015 -0500 v15 alpha 2 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 88f5885..2123bc7 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.0-alpha-1" - android:versionCode="15001" + android:versionName="15.0.0-alpha-2" + android:versionCode="15002" android:installLocation="auto" >

1 0

[orbot/master] re-enable DNS settings after you start Tor
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit c220ec9183179d5c8c2ab0d0a497b1a38131d250 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Feb 4 22:02:32 2015 -0500 re-enable DNS settings after you start Tor --- src/org/torproject/android/service/TorService.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index b287975..9bd64f1 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -809,6 +809,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst shellRoot.close(); } + else if (mUseVPN) + { + enableVpnProxy(); + } getHiddenServiceHostname (); }

1 0

[orbot/master] ensure x86_64 case of NDK is supported
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 50519d8a0bbadbe54697dbe6bec118fb26eb013d Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Feb 4 16:29:03 2015 -0500 ensure x86_64 case of NDK is supported --- external/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Makefile b/external/Makefile index 8e0e082..37563a7 100644 --- a/external/Makefile +++ b/external/Makefile @@ -16,7 +16,7 @@ EXTERNAL_ROOT := $(shell pwd) # user building this will have to manually set NDK_PROCESSOR or NDK_TOOLCHAIN. CPU := $(shell uname -m) ifeq ($(CPU),x86_64) - NDK_PROCESSOR=x86 + NDK_PROCESSOR=x86_64 else NDK_PROCESSOR=x86 endif

1 0

[orbot/master] add pluto for PT integration
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 33a5962fe62e62687216bbbf43f960242d77ab98 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Feb 5 09:42:52 2015 -0500 add pluto for PT integration --- external/pluto | 1 + 1 file changed, 1 insertion(+) diff --git a/external/pluto b/external/pluto new file mode 160000 index 0000000..bb501fb --- /dev/null +++ b/external/pluto @@ -0,0 +1 @@ +Subproject commit bb501fbf5ff545ee04909214ade5e7c9ce935186

1 0

[orbot/master] set to lib_orweb branch
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 40b8f48c662ddd9c85a733582141c8383a951025 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Feb 5 09:42:30 2015 -0500 set to lib_orweb branch --- external/orweb | 1 + 1 file changed, 1 insertion(+) diff --git a/external/orweb b/external/orweb new file mode 160000 index 0000000..fd0bd46 --- /dev/null +++ b/external/orweb @@ -0,0 +1 @@ +Subproject commit fd0bd469a062b52f98ff7d4cf8d3ca6bed1896b9

1 0