Fix proxying through Orbot on current versions of WebView. https://redmine.stoutner...

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 f02c00f698d9b9290773a9257bb5ecbe9996c459..4f6cff18aa649e595487cfa636a8416e9c5446bf 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/helpers/OrbotProxyHelper.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/helpers/OrbotProxyHelper.java
@@ -39,7 +39,6 @@ import java.lang.reflect.Method;
 
 public class OrbotProxyHelper {
     public static void setProxy(Context privacyBrowserContext, Activity parentActivity, String proxyHost, String proxyPort) {
 
 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);
         // Set the proxy values
         System.setProperty("http.proxyHost", proxyHost);
         System.setProperty("http.proxyPort", proxyPort);


@@ -48,33 +47,40 @@ public class OrbotProxyHelper {
 
         // Use reflection to apply the new proxy values.
         try {
 
         // 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.

             Class applicationClass = Class.forName("android.app.Application");
             Class applicationClass = Class.forName("android.app.Application");

+            @SuppressLint("PrivateApi") Class loadedApkClass = Class.forName("android.app.LoadedApk");

 
 

-            // Suppress the lint warning that `mLoadedApk` cannot be resolved.
+            // Get the declared fields.  Suppress the lint warning that `mLoadedApk` cannot be resolved.

             @SuppressWarnings("JavaReflectionMemberAccess") Field mLoadedApkField = applicationClass.getDeclaredField("mLoadedApk");
             @SuppressWarnings("JavaReflectionMemberAccess") Field mLoadedApkField = applicationClass.getDeclaredField("mLoadedApk");

-
-            // `setAccessible(true)` allows the value of `mLoadedApkField` to be changed..
-            mLoadedApkField.setAccessible(true);
-            Object mLoadedApkObject = mLoadedApkField.get(privacyBrowserContext);
-
-            // Suppress the lint warning that reflection may not always work in the future and on all devices.
-            @SuppressLint("PrivateApi") Class loadedApkClass = Class.forName("android.app.LoadedApk");

             Field mReceiversField = loadedApkClass.getDeclaredField("mReceivers");
 
             Field mReceiversField = loadedApkClass.getDeclaredField("mReceivers");
 

-            // `setAccessible(true)` allows the value of `mReceiversField` to be changed.
+            // Allow the values to be changed.
+            mLoadedApkField.setAccessible(true);

             mReceiversField.setAccessible(true);
 
             mReceiversField.setAccessible(true);
 

+            // Get the APK object.
+            Object mLoadedApkObject = mLoadedApkField.get(privacyBrowserContext);
+
+            // Get an array map of the receivers.

             ArrayMap receivers = (ArrayMap) mReceiversField.get(mLoadedApkObject);
 
             ArrayMap receivers = (ArrayMap) mReceiversField.get(mLoadedApkObject);
 

+            // Set the proxy.

             for (Object receiverMap : receivers.values()) {
                 for (Object receiver : ((ArrayMap) receiverMap).keySet()) {
             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` below will produce an error.
+                    // `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();
                     Class<?> receiverClass = receiver.getClass();

-                    if (receiverClass.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);
+
+                    // Get the declared fields.
+                    final Field[] declaredFieldArray = receiverClass.getDeclaredFields();
+
+                    // 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);
+                        }

                     }
                 }
             }
                     }
                 }
             }

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f7263b1ed0f7d77a0112e237103a29274b3be726..f08dd4a41d5cefa965cb95795661f58a6f36cf16 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -222,7 +222,7 @@
     <string name="parent_folder">Parent folder:</string>
     <string name="display_order">Display order:</string>
 
     <string name="parent_folder">Parent folder:</string>
     <string name="display_order">Display order:</string>
 

-    <!-- Block Lists. -->
+    <!-- Requests. -->

     <string name="requests">Requests</string>
     <string name="request_details">Request details</string>
     <string name="disposition">Disposition</string>
     <string name="requests">Requests</string>
     <string name="request_details">Request details</string>
     <string name="disposition">Disposition</string>