/*
- * Copyright © 2016-2018 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2019 Soren Stoutner <soren@stoutner.com>.
*
* This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
*
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.os.Parcelable;
+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;
public class OrbotProxyHelper {
public static void setProxy(Context privacyBrowserContext, Activity parentActivity, String proxyHost, String proxyPort) {
- // Set the proxy values
- System.setProperty("proxyHost", proxyHost);
- System.setProperty("proxyPort", proxyPort);
+ if (proxyPort.equals("0")) {
+ // Clear the proxy values.
+ System.clearProperty("proxyHost");
+ System.clearProperty("proxyPort");
+ } else {
+ // Set the proxy values
+ 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);
- // These entries shouldn't be needed if the above general settings are applied. But I leave them in 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);
+ // The SOCKS entries do not appear to do anything. But maybe someday they will.
+ // System.setProperty("socksProxyHost", proxyHost);
+ // System.setProperty("socksProxyPort", "9050");
+ // System.setProperty("socks.ProxyHost", proxyHost);
+ // System.setProperty("socks.ProxyPort", "9050");
// Use reflection to apply the new proxy values.
try {
// 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` is unhappy.
+ // Get the receiver class.
+ // `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();
- // Get the declared fields.
- final Field[] declaredFieldArray = receiverClass.getDeclaredFields();
+ // Apply the new proxy settings to any classes whose names contain `ProxyChangeListener`.
+ if (receiverClass.getName().contains("ProxyChangeListener")) {
+ // Get the `onReceive` method from the class.
+ Method onReceiveMethod = receiverClass.getDeclaredMethod("onReceive", Context.class, Intent.class);
+
+ // 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");
- // 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);
- }
+ // 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));
+
+ // 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);
}
}
}
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")) {
// 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);
}
}
}
-}
+}
\ No newline at end of file
projects / PrivacyBrowserAndroid.git / blobdiff