X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fhelpers%2FOrbotProxyHelper.java;h=4f6cff18aa649e595487cfa636a8416e9c5446bf;hb=bd81420583b6de9be6c8068c0749bcf01d86e1b1;hp=ef49afe1f9fc331da9f160050460aff800451ba7;hpb=5bcf4ca90f27512b94fb7aca4fad37b4e4774655;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 ef49afe1..4f6cff18 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-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2018 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
@@ -19,6 +19,7 @@
 
 package com.stoutner.privacybrowser.helpers;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -38,7 +39,6 @@ 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);
@@ -47,27 +47,40 @@ public class OrbotProxyHelper {
 
         // 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");
-            Field mLoadedApkField = applicationClass.getDeclaredField("mLoadedApk");
-            // `setAccessible(true)` allows us to change the value of `mLoadedApkField`.
-            mLoadedApkField.setAccessible(true);
-            Object mLoadedApkObject = mLoadedApkField.get(privacyBrowserContext);
+            @SuppressLint("PrivateApi") Class loadedApkClass = Class.forName("android.app.LoadedApk");
 
-            Class loadedApkClass = Class.forName("android.app.LoadedApk");
+            // Get the declared fields.  Suppress the lint warning that `mLoadedApk` cannot be resolved.
+            @SuppressWarnings("JavaReflectionMemberAccess") Field mLoadedApkField = applicationClass.getDeclaredField("mLoadedApk");
             Field mReceiversField = loadedApkClass.getDeclaredField("mReceivers");
-            // `setAccessible(true)` allows us to change the value of `mReceiversField`.
+
+            // Allow the values to be changed.
+            mLoadedApkField.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);
 
+            // Set the proxy.
             for (Object receiverMap : receivers.values()) {
                 for (Object receiver : ((ArrayMap) receiverMap).keySet()) {
-                    // We have to use `Class<?>`, which is an `unbounded wildcard parameterized type`, instead of `Class`, which is a `raw type`, or `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();
-                    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);
+                        }
                     }
                 }
             }
@@ -109,11 +122,8 @@ public class OrbotProxyHelper {
                 dialogBuilder.setMessage(R.string.orbot_proxy_not_installed);
 
                 // Set the positive button.
-                dialogBuilder.setPositiveButton(R.string.close, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        // Do nothing.  The `AlertDialog` will close automatically.
-                    }
+                dialogBuilder.setPositiveButton(R.string.close, (DialogInterface dialog, int which) -> {
+                    // Do nothing.  The `AlertDialog` will close automatically.
                 });
 
                 // Convert `dialogBuilder` to `alertDialog`.