Add OpenPGP encrypted export. https://redmine.stoutner.com/issues/338

[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 f02c00f698d9b9290773a9257bb5ecbe9996c459..9852dd0bdd37c717928644fe507e1157f35f9376 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,42 +39,52 @@ 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 {
+            // 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");
+            @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");
-
-            // `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");
 
-            // `setAccessible(true)` allows the value of `mReceiversField` to be changed.
+            // 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()) {
-                    // `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();
-                    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);
+                        }
                     }
                 }
             }
@@ -85,7 +95,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")) {