Fix proxying through Orbot on API 19. https://redmine.stoutner.com/issues/474

[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 201cf60917df7d2280c81f4d03a4b9652505cbf5..2a55d6197887fe23a0bc9f4d28a83281c6b20461 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.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.net.Proxy;

+import android.os.Build;

 import android.os.Parcelable;
 import android.preference.PreferenceManager;
 import android.util.ArrayMap;
 import android.os.Parcelable;
 import android.preference.PreferenceManager;
 import android.util.ArrayMap;


@@ -72,18 +73,18 @@ public class OrbotProxyHelper {
             @SuppressLint("PrivateApi") Class loadedApkClass = Class.forName("android.app.LoadedApk");
 
             // Get the declared fields.  Suppress the lint warning that `mLoadedApk` cannot be resolved.
             @SuppressLint("PrivateApi") 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");
+            @SuppressWarnings("JavaReflectionMemberAccess") Field methodLoadedApkField = applicationClass.getDeclaredField("mLoadedApk");
+            Field methodReceiversField = loadedApkClass.getDeclaredField("mReceivers");

 
             // Allow the values to be changed.
 
             // Allow the values to be changed.

-            mLoadedApkField.setAccessible(true);
-            mReceiversField.setAccessible(true);
+            methodLoadedApkField.setAccessible(true);
+            methodReceiversField.setAccessible(true);

 
             // Get the APK object.
 
             // Get the APK object.

-            Object mLoadedApkObject = mLoadedApkField.get(privacyBrowserContext);
+            Object methodLoadedApkObject = methodLoadedApkField.get(privacyBrowserContext);

 
             // Get an array map of the receivers.
 
             // Get an array map of the receivers.

-            ArrayMap receivers = (ArrayMap) mReceiversField.get(mLoadedApkObject);
+            ArrayMap receivers = (ArrayMap) methodReceiversField.get(methodLoadedApkObject);

 
             // Set the proxy.
             for (Object receiverMap : receivers.values()) {
 
             // Set the proxy.
             for (Object receiverMap : receivers.values()) {


@@ -100,18 +101,20 @@ public class OrbotProxyHelper {
                         // Create a proxy change intent.
                         Intent proxyChangeIntent = new Intent(Proxy.PROXY_CHANGE_ACTION);
 
                         // 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");
+                        if (Build.VERSION.SDK_INT >= 21) {
+                            // 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);
+                            // 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));
+                            // 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);
+                            // Add the proxy info object into the proxy change intent.
+                            proxyChangeIntent.putExtra("proxy", (Parcelable) proxyInfoObject);
+                        }

 
                         // Pass the proxy change intent to the `onReceive` method of the receiver class.
                         onReceiveMethod.invoke(receiver, privacyBrowserContext, proxyChangeIntent);
 
                         // Pass the proxy change intent to the `onReceive` method of the receiver class.
                         onReceiveMethod.invoke(receiver, privacyBrowserContext, proxyChangeIntent);