X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fhelpers%2FOrbotProxyHelper.java;h=371735455971b5c0c6400191fd22ffcb8490abf8;hb=ba40295dffd761ccdc95d3b46ca7acbad1f00d5e;hp=a3607dad9ebaa98bd9f947871aeb4c9cca997098;hpb=5a385f0ba12a7af005761e30155f7fd18767d2f9;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 a3607dad..37173545 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-2018 Soren Stoutner . + * Copyright © 2016-2019 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -26,10 +26,11 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageManager; import android.net.Proxy; -import android.support.v7.app.AlertDialog; import android.util.ArrayMap; import android.util.Log; +import androidx.appcompat.app.AlertDialog; + import com.stoutner.privacybrowser.activities.MainWebViewActivity; import com.stoutner.privacybrowser.R; @@ -43,7 +44,7 @@ public class OrbotProxyHelper { System.setProperty("proxyHost", proxyHost); System.setProperty("proxyPort", proxyPort); - // These entries shouldn't be needed if the above general settings are applied. But I leave them in here for troubleshooting just in case. + // These entries shouldn't be needed if the above general settings are applied. They are here for troubleshooting just in case. //System.setProperty("http.proxyHost", proxyHost); //System.setProperty("http.proxyPort", proxyPort); //System.setProperty("https.proxyHost", proxyHost); @@ -95,7 +96,7 @@ public class OrbotProxyHelper { if (proxyPort.equals("8118")) { // Orbot proxy was turned on. try { // Check to see if Orbot is installed. PackageManager packageManager = privacyBrowserContext.getPackageManager(); - packageManager.getPackageInfo("org.torproject.android", PackageManager.GET_ACTIVITIES); + packageManager.getPackageInfo("org.torproject.android", 0); // Ask Orbot to connect if its current status is not "ON". if (!MainWebViewActivity.orbotStatus.equals("ON")) {