X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fhelpers%2FOrbotProxyHelper.java;h=b41d0999bc568e6d78be883121efdbd70d44b1e0;hp=b56269b15079289cc9e50385d326d52a9ef07d4d;hb=f0393ca22075be3e5fe9199c7db87381256236fa;hpb=dbe9e3b03b125ee631665d0395e235414370d40e 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 b56269b1..b41d0999 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-2018 Soren Stoutner . + * Copyright © 2016-2019 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -24,12 +24,15 @@ import android.app.Activity; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.net.Proxy; -import android.support.v7.app.AlertDialog; +import android.preference.PreferenceManager; import android.util.ArrayMap; import android.util.Log; +import androidx.appcompat.app.AlertDialog; + import com.stoutner.privacybrowser.activities.MainWebViewActivity; import com.stoutner.privacybrowser.R; @@ -39,42 +42,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 alwasy 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 +98,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")) { @@ -105,8 +118,14 @@ public class OrbotProxyHelper { // Use `AlertDialog.Builder` to create the `AlertDialog`. AlertDialog.Builder dialogBuilder; + // Get a handle for the shared preferences. + SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(privacyBrowserContext); + + // Get the theme preference. + boolean darkTheme = sharedPreferences.getBoolean("dark_theme", false); + // Set the style according to the theme. - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { dialogBuilder = new AlertDialog.Builder(parentActivity, R.style.PrivacyBrowserAlertDialogDark); } else { dialogBuilder = new AlertDialog.Builder(parentActivity, R.style.PrivacyBrowserAlertDialogLight);