Fix proxying through Orbot. https://redmine.stoutner.com/issues/473

[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 02f76466a7aeb592e84e3a73c8eeba4323457a18..201cf60917df7d2280c81f4d03a4b9652505cbf5 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/helpers/OrbotProxyHelper.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/helpers/OrbotProxyHelper.java
@@ -27,6 +27,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.net.Proxy;
+import android.os.Parcelable;
 import android.preference.PreferenceManager;
 import android.util.ArrayMap;
 import android.util.Log;
@@ -58,6 +59,12 @@ public class OrbotProxyHelper {
         // System.setProperty("https.proxyHost", proxyHost);
         // System.setProperty("https.proxyPort", proxyPort);
 
+        // The SOCKS entries do not appear to do anything.  But maybe someday they will.
+        // System.setProperty("socksProxyHost", proxyHost);
+        // System.setProperty("socksProxyPort", "9050");
+        // System.setProperty("socks.ProxyHost", proxyHost);
+        // System.setProperty("socks.ProxyPort", "9050");
+
         // Use reflection to apply the new proxy values.
         try {
             // Get the application and APK classes.  Suppress the lint warning that reflection may not always work in the future and on all devices.
@@ -81,19 +88,33 @@ public class OrbotProxyHelper {
             // Set the proxy.
             for (Object receiverMap : receivers.values()) {
                 for (Object receiver : ((ArrayMap) receiverMap).keySet()) {
-                    // `Class<?>`, which is an `unbounded wildcard parameterized type`, must be used instead of `Class`, which is a `raw type`.  Otherwise, `receiveClass.getDeclaredMethod` is unhappy.
+                    // Get the receiver class.
+                    // `Class<?>`, which is an `unbounded wildcard parameterized type`, must be used instead of `Class`, which is a `raw type`.  Otherwise, `receiveClass.getDeclaredMethod()` is unhappy.
                     Class<?> receiverClass = receiver.getClass();
 
-                    // Get the declared fields.
-                    final Field[] declaredFieldArray = receiverClass.getDeclaredFields();
+                    // Apply the new proxy settings to any classes whose names contain `ProxyChangeListener`.
+                    if (receiverClass.getName().contains("ProxyChangeListener")) {
+                        // Get the `onReceive` method from the class.
+                        Method onReceiveMethod = receiverClass.getDeclaredMethod("onReceive", Context.class, Intent.class);
+
+                        // Create a proxy change intent.
+                        Intent proxyChangeIntent = new Intent(Proxy.PROXY_CHANGE_ACTION);
+
+                        // Get a proxy info class.
+                        // `Class<?>`, which is an `unbounded wildcard parameterized type`, must be used instead of `Class`, which is a `raw type`.  Otherwise, `proxyInfoClass.getMethod()` is unhappy.
+                        Class<?> proxyInfoClass = Class.forName("android.net.ProxyInfo");
+
+                        // Get the build direct proxy method from the proxy info class.
+                        Method buildDirectProxyMethod = proxyInfoClass.getMethod("buildDirectProxy", String.class, Integer.TYPE);
+
+                        // Populate a proxy info object with the new proxy information.
+                        Object proxyInfoObject = buildDirectProxyMethod.invoke(proxyInfoClass, proxyHost, Integer.valueOf(proxyPort));
+
+                        // Add the proxy info object into the proxy change intent.
+                        proxyChangeIntent.putExtra("proxy", (Parcelable) proxyInfoObject);
 
-                    // Set the proxy for each field that is a `ProxyChangeListener`.
-                    for (Field field : declaredFieldArray) {
-                        if (field.getType().getName().contains("ProxyChangeListener")) {
-                            Method onReceiveMethod = receiverClass.getDeclaredMethod("onReceive", Context.class, Intent.class);
-                            Intent intent = new Intent(Proxy.PROXY_CHANGE_ACTION);
-                            onReceiveMethod.invoke(receiver, privacyBrowserContext, intent);
-                        }
+                        // Pass the proxy change intent to the `onReceive` method of the receiver class.
+                        onReceiveMethod.invoke(receiver, privacyBrowserContext, proxyChangeIntent);
                     }
                 }
             }
@@ -153,4 +174,4 @@ public class OrbotProxyHelper {
             }
         }
     }
-}
+}
\ No newline at end of file