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

[orbot/dev_gradle] add the compiled tun2socks lib for devs who just want to work on UI
by n8fr8＠torproject.org 07 Nov '16

07 Nov '16

commit cd8b549d1a7487d2f1ae7f9878856c76f0a82837 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Oct 13 15:31:59 2016 -0400 add the compiled tun2socks lib for devs who just want to work on UI --- orbotservice/src/main/jniLibs/armeabi/libtun2socks.so | Bin 0 -> 129472 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/orbotservice/src/main/jniLibs/armeabi/libtun2socks.so b/orbotservice/src/main/jniLibs/armeabi/libtun2socks.so new file mode 100755 index 0000000..74d7c34 Binary files /dev/null and b/orbotservice/src/main/jniLibs/armeabi/libtun2socks.so differ

1 0

[orbot/dev_gradle] improve the code for launching the pdnsd daemon
by n8fr8＠torproject.org 07 Nov '16

07 Nov '16

commit 330860216a27897aa4c1dd943ea8375af78f889a Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Oct 12 16:46:53 2016 -0400 improve the code for launching the pdnsd daemon --- .../android/service/vpn/OrbotVpnManager.java | 37 +++++++++++----------- 1 file changed, 19 insertions(+), 18 deletions(-) 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 5830a85..1b4cca0 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 @@ -41,10 +41,13 @@ import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.transproxy.TorifiedApp; import org.torproject.android.service.util.TorServiceUtils; +import java.io.BufferedReader; import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; import java.io.PrintStream; import java.net.InetAddress; import java.util.ArrayList; @@ -405,13 +408,25 @@ public class OrbotVpnManager implements Handler.Callback { ArrayList<String> customEnv = new ArrayList<String>(); String baseDirectory = filePdnsd.getParent(); - String cmdString = "sh " + filePdnsd.getCanonicalPath() + - " -c " + baseDirectory + "/pdnsd.conf"; - - Process proc = Runtime.getRuntime().exec(cmdString); + String[] cmdString = {filePdnsd.getCanonicalPath(),"-c",baseDirectory + "/pdnsd.conf"}; + ProcessBuilder pb = new ProcessBuilder(cmdString); + pb.redirectErrorStream(true); + Process proc = pb.start(); try { proc.waitFor();} catch (Exception e){} Log.i(TAG,"PDNSD: " + proc.exitValue()); + + if (proc.exitValue() != 0) + { + BufferedReader br = new BufferedReader(new InputStreamReader(proc.getInputStream())); + + String line = null; + while ((line = br.readLine ()) != null) { + Log.d(TAG,"pdnsd: " + line); + } + + } + } @@ -428,20 +443,6 @@ public class OrbotVpnManager implements Handler.Callback { PrintStream ps = new PrintStream(fos); ps.print(conf); ps.close(); - - //f.withWriter { out -> out.print conf }; - - /** - * - - server { - label= "upstream"; - ip = %s; - port = %d; - uptest = none; - } - */ - File cache = new File(fileDir,"pdnsd.cache");

1 0

[orbot/master] improve UI setup here for list to reduce NPE crashes
by n8fr8＠torproject.org 07 Nov '16

07 Nov '16

commit e7443890c5cd694acba2ccc07d3210378948d1dd Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Nov 6 23:58:50 2016 -0500 improve UI setup here for list to reduce NPE crashes --- .../java/org/torproject/android/ui/AppManager.java | 47 +++++++++++++--------- 1 file changed, 28 insertions(+), 19 deletions(-) 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 9a15dae..8ba26f2 100644 --- a/app/src/main/java/org/torproject/android/ui/AppManager.java +++ b/app/src/main/java/org/torproject/android/ui/AppManager.java @@ -190,31 +190,40 @@ public class AppManager extends AppCompatActivity implements OnCheckedChangeList entry.icon = (ImageView) convertView.findViewById(R.id.itemicon); entry.box = (CheckBox) convertView.findViewById(R.id.itemcheck); entry.text = (TextView) convertView.findViewById(R.id.itemtext); - - entry.text.setOnClickListener(AppManager.this); - entry.text.setOnClickListener(AppManager.this); - + + convertView.setTag(entry); - - entry.box.setOnCheckedChangeListener(AppManager.this); + + } final TorifiedApp app = mApps.get(position); - if (app.getIcon() != null && entry.icon != null) - entry.icon.setImageDrawable(app.getIcon()); - else - entry.icon.setVisibility(View.GONE); + if (entry.icon != null) { + if (app.getIcon() != null) + entry.icon.setImageDrawable(app.getIcon()); + else + entry.icon.setVisibility(View.GONE); + } + + if (entry.text != null) { + entry.text.setText(app.getName()); + entry.text.setOnClickListener(AppManager.this); + entry.text.setOnClickListener(AppManager.this); + + if (entry.box != null) + entry.text.setTag(entry.box); + } + + + if (entry.box != null) { + entry.box.setOnCheckedChangeListener(AppManager.this); + entry.box.setTag(app); + entry.box.setChecked(app.isTorified()); + + + } - entry.text.setText(app.getName()); - - final CheckBox box = entry.box; - box.setTag(app); - box.setChecked(app.isTorified()); - - entry.text.setTag(box); - entry.icon.setTag(box); - return convertView; } };

1 0

[orbot/master] improvements to app selection UI for better layout and error handling
by n8fr8＠torproject.org 07 Nov '16

07 Nov '16

commit fd92359ccd2c709333e8a2470e28bf885eeae51d Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Nov 7 00:19:06 2016 -0500 improvements to app selection UI for better layout and error handling --- .../java/org/torproject/android/ui/AppManager.java | 8 ++++---- .../res/drawable-hdpi/ic_autorenew_black_36dp.png | Bin 0 -> 546 bytes .../drawable-hdpi/ic_filter_none_black_36dp.png | Bin 0 -> 232 bytes .../ic_playlist_add_check_black_36dp.png | Bin 0 -> 221 bytes .../res/drawable-mdpi/ic_autorenew_black_36dp.png | Bin 0 -> 369 bytes .../drawable-mdpi/ic_filter_none_black_36dp.png | Bin 0 -> 198 bytes .../ic_playlist_add_check_black_36dp.png | Bin 0 -> 163 bytes .../res/drawable-xhdpi/ic_autorenew_black_36dp.png | Bin 0 -> 682 bytes .../drawable-xhdpi/ic_filter_none_black_36dp.png | Bin 0 -> 252 bytes .../ic_playlist_add_check_black_36dp.png | Bin 0 -> 236 bytes .../drawable-xxhdpi/ic_autorenew_black_36dp.png | Bin 0 -> 1000 bytes .../drawable-xxhdpi/ic_filter_none_black_36dp.png | Bin 0 -> 415 bytes .../ic_playlist_add_check_black_36dp.png | Bin 0 -> 325 bytes .../drawable-xxxhdpi/ic_autorenew_black_36dp.png | Bin 0 -> 1362 bytes .../drawable-xxxhdpi/ic_filter_none_black_36dp.png | Bin 0 -> 505 bytes .../ic_playlist_add_check_black_36dp.png | Bin 0 -> 379 bytes app/src/main/res/layout/layout_apps.xml | 22 ++++++++++++--------- app/src/main/res/values/strings.xml | 2 +- 18 files changed, 18 insertions(+), 14 deletions(-) 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 8ba26f2..d59eeac 100644 --- a/app/src/main/java/org/torproject/android/ui/AppManager.java +++ b/app/src/main/java/org/torproject/android/ui/AppManager.java @@ -53,11 +53,11 @@ public class AppManager extends AppCompatActivity implements OnCheckedChangeList setTitle(R.string.apps_mode); getSupportActionBar().setDisplayHomeAsUpEnabled(true); - Button buttonSelectAll, buttonSelectNone, buttonInvert; + View buttonSelectAll, buttonSelectNone, buttonInvert; - buttonSelectAll = (Button) findViewById(R.id.button_proxy_all); - buttonSelectNone = (Button) findViewById(R.id.button_proxy_none); - buttonInvert = (Button) findViewById(R.id.button_invert_selection); + buttonSelectAll = findViewById(R.id.button_proxy_all); + buttonSelectNone = findViewById(R.id.button_proxy_none); + buttonInvert = findViewById(R.id.button_invert_selection); buttonSelectAll.setOnClickListener(new OnAutoClickListener(0)); buttonSelectNone.setOnClickListener(new OnAutoClickListener(1)); diff --git a/app/src/main/res/drawable-hdpi/ic_autorenew_black_36dp.png b/app/src/main/res/drawable-hdpi/ic_autorenew_black_36dp.png new file mode 100644 index 0000000..6ae7ac8 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_autorenew_black_36dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_filter_none_black_36dp.png b/app/src/main/res/drawable-hdpi/ic_filter_none_black_36dp.png new file mode 100644 index 0000000..7543f32 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_filter_none_black_36dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_playlist_add_check_black_36dp.png b/app/src/main/res/drawable-hdpi/ic_playlist_add_check_black_36dp.png new file mode 100644 index 0000000..7835899 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_playlist_add_check_black_36dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_autorenew_black_36dp.png b/app/src/main/res/drawable-mdpi/ic_autorenew_black_36dp.png new file mode 100644 index 0000000..39be19e Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_autorenew_black_36dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_filter_none_black_36dp.png b/app/src/main/res/drawable-mdpi/ic_filter_none_black_36dp.png new file mode 100644 index 0000000..ebe663d Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_filter_none_black_36dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_playlist_add_check_black_36dp.png b/app/src/main/res/drawable-mdpi/ic_playlist_add_check_black_36dp.png new file mode 100644 index 0000000..9244884 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_playlist_add_check_black_36dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_autorenew_black_36dp.png b/app/src/main/res/drawable-xhdpi/ic_autorenew_black_36dp.png new file mode 100644 index 0000000..910746e Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_autorenew_black_36dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_filter_none_black_36dp.png b/app/src/main/res/drawable-xhdpi/ic_filter_none_black_36dp.png new file mode 100644 index 0000000..4c6e500 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_filter_none_black_36dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_playlist_add_check_black_36dp.png b/app/src/main/res/drawable-xhdpi/ic_playlist_add_check_black_36dp.png new file mode 100644 index 0000000..ac03e19 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_playlist_add_check_black_36dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_autorenew_black_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_autorenew_black_36dp.png new file mode 100644 index 0000000..2b9fd98 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_autorenew_black_36dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_filter_none_black_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_filter_none_black_36dp.png new file mode 100644 index 0000000..d6e77c7 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_filter_none_black_36dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_playlist_add_check_black_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_playlist_add_check_black_36dp.png new file mode 100644 index 0000000..38b8b27 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_playlist_add_check_black_36dp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_autorenew_black_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_autorenew_black_36dp.png new file mode 100644 index 0000000..5f614e4 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_autorenew_black_36dp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_filter_none_black_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_filter_none_black_36dp.png new file mode 100644 index 0000000..d88cd35 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_filter_none_black_36dp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_playlist_add_check_black_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_playlist_add_check_black_36dp.png new file mode 100644 index 0000000..2542690 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_playlist_add_check_black_36dp.png differ diff --git a/app/src/main/res/layout/layout_apps.xml b/app/src/main/res/layout/layout_apps.xml index 00d46d6..33e0748 100644 --- a/app/src/main/res/layout/layout_apps.xml +++ b/app/src/main/res/layout/layout_apps.xml @@ -3,7 +3,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" android:duplicateParentState="true"> <!-- @@ -25,14 +24,14 @@ </ListView> - <RelativeLayout + <LinearLayout android:id="@+id/layout_button_filters" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:orientation="horizontal" > - <Button + <android.support.v7.widget.AppCompatImageButton android:id="@+id/button_proxy_all" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -40,26 +39,31 @@ android:layout_alignParentStart="true" android:layout_toLeftOf="@+id/button_proxy_none" android:layout_toStartOf="@+id/button_proxy_none" - android:text="@string/button_proxy_all" /> - <Button + android:layout_weight="1" + android:src="@drawable/ic_playlist_add_check_black_36dp"/> + + <android.support.v7.widget.AppCompatImageButton android:id="@+id/button_invert_selection" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" android:layout_alignParentEnd="true" android:layout_alignParentTop="true" - android:text="@string/button_invert_selection" /> - <Button + android:layout_weight="1" + android:src="@drawable/ic_autorenew_black_36dp"/> + + <android.support.v7.widget.AppCompatImageButton android:id="@+id/button_proxy_none" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentTop="true" + android:layout_weight="1" android:layout_toLeftOf="@+id/button_invert_selection" android:layout_toStartOf="@+id/button_invert_selection" - android:text="@string/button_proxy_none" /> + android:src='@drawable/ic_filter_none_black_36dp' /> - </RelativeLayout> + </LinearLayout> </RelativeLayout> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f3aa4a8..26a7aeb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -218,7 +218,7 @@ <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string> <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string> <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string> - <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string> + <string name="hidden_service_request">An app wants to open hidden server port %1$s to the Tor network. This is safe if you trust the app.</string> <string name="found_existing_tor_process">found existing Tor process…</string> <string name="something_bad_happened">Something bad happened. Check the log</string> <string name="hidden_service_on">hidden service on:</string>

1 0

[orbot/master] revert back to NDK toolchain 4.8 since it is more stable
by n8fr8＠torproject.org 07 Nov '16

07 Nov '16

commit 540db0f00bcaa0c0e6cc7d7bd283a19438c4de75 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Nov 7 00:23:19 2016 -0500 revert back to NDK toolchain 4.8 since it is more stable --- external/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Makefile b/external/Makefile index fc96ead..84da1c1 100644 --- a/external/Makefile +++ b/external/Makefile @@ -24,7 +24,7 @@ endif # Android NDK setup ANDROID_NDK_HOME ?= /opt/android-ndk NDK_PLATFORM_LEVEL ?= 16 -NDK_TOOLCHAIN_VERSION=4.9 +NDK_TOOLCHAIN_VERSION=4.8 APP_ABI ?= armeabi NDK_ABI ?= $(APP_ABI)

1 0

[orbot/master] update for RC8 multi
by n8fr8＠torproject.org 07 Nov '16

07 Nov '16

commit 84d6a767ae08b6462f6afc60d41cf725c57c5339 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Nov 7 00:27:15 2016 -0500 update for RC8 multi --- CHANGELOG | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index b089f69..20dc8eb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,14 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +/** 15.2.0 RC 8 / 7 November 2016 / 34079c7a159a94eb738c0410b4642394d712c44e **/ + +540db0f revert back to NDK toolchain 4.8 since it is more stable +73e9ac8 just go back to basic arm and x86 builds other builds and new ndk toolchain is causing crashes +fd92359 improvements to app selection UI for better layout and error handling +7bbfd4e tune line length here for other locales +e744389 improve UI setup here for list to reduce NPE crashes +dedf213 make sure browser intent exists before you open it for some reason, we see a lot of random crashes here do people really run d + /** 15.2.0 RC 7 / 4 November 2016 / eb45d61dc90a31d41d33ad6be7cfed3e022284b7 **/ b147d5d update tor binary flag for new SSL

1 0

[orbot/master] tune line length here for other locales
by n8fr8＠torproject.org 07 Nov '16

07 Nov '16

commit 7bbfd4eff8205dad6e20955c38f1a90f13061139 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Nov 6 23:59:12 2016 -0500 tune line length here for other locales --- app/src/main/res/layout/layout_apps_item.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/layout_apps_item.xml b/app/src/main/res/layout/layout_apps_item.xml index 763581c..e124013 100644 --- a/app/src/main/res/layout/layout_apps_item.xml +++ b/app/src/main/res/layout/layout_apps_item.xml @@ -6,9 +6,9 @@ android:stretchColumns="1"> <TableRow> - <ImageView android:id="@+id/itemicon" android:layout_width="50dip" android:layout_height="50dip" android:padding="3dip" android:visibility="gone"></ImageView> + <ImageView android:id="@+id/itemicon" android:layout_width="50dp" android:layout_height="50dp" android:padding="3dp" android:visibility="gone"></ImageView> -<TextView android:layout_height="wrap_content" android:id="@+id/itemtext" android:text="uid:packages" android:textSize="18sp" android:padding="3dip"></TextView> +<TextView android:layout_height="wrap_content" android:layout_width="150dp" android:id="@+id/itemtext" android:text="uid:packages" android:textSize="18sp" android:padding="3dip"></TextView> <CheckBox android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/itemcheck" ></CheckBox>

1 0

[orbot/master] 15.2.0-RC-8-multi
by n8fr8＠torproject.org 07 Nov '16

07 Nov '16

commit 34079c7a159a94eb738c0410b4642394d712c44e Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Nov 7 00:26:11 2016 -0500 15.2.0-RC-8-multi --- 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 75d179b..171567e 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-7-multi" - android:versionCode="15207000" + android:versionName="15.2.0-RC-8-multi" + android:versionCode="15208000" android:installLocation="auto" > <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23"/>

1 0

[orbot/master] just go back to basic arm and x86 builds
by n8fr8＠torproject.org 07 Nov '16

07 Nov '16

commit 73e9ac820e6efe3b6fe51ed3871a22ad3fe5082f Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Nov 7 00:19:43 2016 -0500 just go back to basic arm and x86 builds other builds and new ndk toolchain is causing crashes --- orbotservice/src/main/jni/Application.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/orbotservice/src/main/jni/Application.mk b/orbotservice/src/main/jni/Application.mk index 5f3200f..554a462 100644 --- a/orbotservice/src/main/jni/Application.mk +++ b/orbotservice/src/main/jni/Application.mk @@ -1,4 +1,4 @@ -APP_ABI := armeabi armeabi-v7a arm64-v8a x86 +APP_ABI := armeabi x86 APP_PLATFORM := android-16 APP_STL := stlport_static -NDK_TOOLCHAIN_VERSION := 4.9 +NDK_TOOLCHAIN_VERSION := 4.8

1 0

[orbot/master] make sure browser intent exists before you open it
by n8fr8＠torproject.org 07 Nov '16

07 Nov '16

commit dedf213028ac5cbb63513d4ce3c2d2b756896e05 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Nov 6 23:57:37 2016 -0500 make sure browser intent exists before you open it for some reason, we see a lot of random crashes here do people really run devices without browsers on them? --- .../org/torproject/android/OrbotMainActivity.java | 34 ++++++++++++---------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index a67b2b9..c43928e 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -665,7 +665,6 @@ public class OrbotMainActivity extends AppCompatActivity } }; - String requestMsg = getString(R.string.hidden_service_request, hiddenServicePortRequest); AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setMessage(requestMsg).setPositiveButton("Allow", dialogClickListener) @@ -750,15 +749,11 @@ public class OrbotMainActivity extends AppCompatActivity else if (mBtnVPN.isChecked()||forceExternal) { //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); + startIntent(null,Intent.ACTION_VIEW, Uri.parse(browserLaunchUrl)); } else if (Prefs.useTransparentProxying()) { - Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(browserLaunchUrl)); - intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP|Intent.FLAG_ACTIVITY_NEW_TASK); - startActivity(intent); + startIntent(null,Intent.ACTION_VIEW, Uri.parse(browserLaunchUrl)); } else { @@ -793,9 +788,7 @@ public class OrbotMainActivity extends AppCompatActivity @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); + startIntent(null,Intent.ACTION_VIEW, Uri.parse(browserLaunchUrl)); } @@ -813,14 +806,25 @@ public class OrbotMainActivity extends AppCompatActivity private void startIntent (String pkg, String action, Uri data) { Intent i; - PackageManager manager = getPackageManager(); + PackageManager pm = getPackageManager(); + try { - i = manager.getLaunchIntentForPackage(pkg); - if (i == null) - throw new PackageManager.NameNotFoundException(); + if (pkg != null) { + i = pm.getLaunchIntentForPackage(pkg); + if (i == null) + throw new PackageManager.NameNotFoundException(); + } + else + { + i = new Intent(); + } + i.setAction(action); i.setData(data); - startActivity(i); + + if (i.resolveActivity(pm)!=null) + startActivity(i); + } catch (PackageManager.NameNotFoundException e) { }

1 0