Migrate to AndroidX from the Android Support Library. https://redmine.stoutner.com...

[PrivacyBrowserAndroid.git] / app / src / main / java / com / stoutner / privacybrowser / helpers / OrbotProxyHelper.java

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 4f6cff18aa649e595487cfa636a8416e9c5446bf..371735455971b5c0c6400191fd22ffcb8490abf8 100644 (file)
--- 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 <soren@stoutner.com>.
+ * Copyright © 2016-2019 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/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;
 
@@ -40,10 +41,14 @@ 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);
-        System.setProperty("https.proxyHost", proxyHost);
-        System.setProperty("https.proxyPort", proxyPort);
+        System.setProperty("proxyHost", proxyHost);
+        System.setProperty("proxyPort", proxyPort);
+
+        // 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);
+        //System.setProperty("https.proxyPort", proxyPort);
 
         // Use reflection to apply the new proxy values.
         try {
@@ -91,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")) {