X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fhelpers%2FOrbotProxyHelper.java;h=c4cbc6b96d74a8c9eaea7a4a061d5b079f4c6da4;hb=01ea38154356a57335a0f7cc975a69e62f22b586;hp=3a877ccbf79e377640687072e93a7a6434245353;hpb=6d3d23ab62cfdd6ef142dbdb764a6bac8fc38ce1;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/helpers/OrbotProxyHelper.java b/app/src/main/java/com/stoutner/privacybrowser/helpers/OrbotProxyHelper.java index 3a877ccb..c4cbc6b9 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/helpers/OrbotProxyHelper.java +++ b/app/src/main/java/com/stoutner/privacybrowser/helpers/OrbotProxyHelper.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 Soren Stoutner . + * Copyright 2016-2017 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -39,6 +39,7 @@ import java.lang.reflect.Method; public class OrbotProxyHelper { public static void setProxy(Context privacyBrowserContext, Activity parentActivity, String proxyHost, String proxyPort) { + // Set the proxy values System.setProperty("http.proxyHost", proxyHost); System.setProperty("http.proxyPort", proxyPort); @@ -82,6 +83,13 @@ public class OrbotProxyHelper { try { // Check to see if Orbot is installed. PackageManager packageManager = privacyBrowserContext.getPackageManager(); packageManager.getPackageInfo("org.torproject.android", PackageManager.GET_ACTIVITIES); + + // Ask Orbot to connect if its current status is not "ON". + if (!MainWebView.orbotStatus.equals("ON")) { + Intent orbotIntent = new Intent("org.torproject.android.intent.action.START"); + orbotIntent.setPackage("org.torproject.android"); + privacyBrowserContext.sendBroadcast(orbotIntent); + } } catch (PackageManager.NameNotFoundException exception){ // If an exception is thrown, Orbot is not installed. // Build an `AlertDialog`. `R.style.LightAlertDialog` formats the color of the button text. AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(parentActivity, R.style.LightAlertDialog);