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=371735455971b5c0c6400191fd22ffcb8490abf8;hp=696bd504f76df088cda6c95bcd7b5bd6d0ea8ac9;hb=ba40295dffd761ccdc95d3b46ca7acbad1f00d5e;hpb=f82135d919d64d4909c37c79a18e14ceba802579 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 696bd504..37173545 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 . + * Copyright © 2016-2019 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -19,17 +19,18 @@ package com.stoutner.privacybrowser.helpers; +import android.annotation.SuppressLint; import android.app.Activity; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageManager; import android.net.Proxy; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AlertDialog; 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,36 +40,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"); - 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); + } } } } @@ -77,12 +94,9 @@ public class OrbotProxyHelper { } if (proxyPort.equals("8118")) { // Orbot proxy was turned on. - // Set the `appBar` background to be light blue if Orbot proxy support is enabled. - MainWebViewActivity.appBar.setBackgroundDrawable(ContextCompat.getDrawable(privacyBrowserContext, R.color.blue_50)); - 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")) { @@ -99,22 +113,30 @@ public class OrbotProxyHelper { privacyBrowserContext.sendBroadcast(orbotIntent); } } catch (PackageManager.NameNotFoundException exception){ // If an exception is thrown, Orbot is not installed. - // Build an `AlertDialog`. `R.style.LightAlertDialog` formats the color of the button text. - AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(parentActivity, R.style.LightAlertDialog); + // Use `AlertDialog.Builder` to create the `AlertDialog`. + AlertDialog.Builder dialogBuilder; + + // Set the style according to the theme. + if (MainWebViewActivity.darkTheme) { + dialogBuilder = new AlertDialog.Builder(parentActivity, R.style.PrivacyBrowserAlertDialogDark); + } else { + dialogBuilder = new AlertDialog.Builder(parentActivity, R.style.PrivacyBrowserAlertDialogLight); + } + + // Set the message. dialogBuilder.setMessage(R.string.orbot_proxy_not_installed); - dialogBuilder.setPositiveButton(R.string.close, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - // Do nothing. The `AlertDialog` will close automatically. - } + + // Set the positive button. + dialogBuilder.setPositiveButton(R.string.close, (DialogInterface dialog, int which) -> { + // Do nothing. The `AlertDialog` will close automatically. }); - // Convert `dialogBuilder` to `alertDialog` and display it on the screen. + // Convert `dialogBuilder` to `alertDialog`. AlertDialog alertDialog = dialogBuilder.create(); + + // Make it so. alertDialog.show(); } - } else { // Otherwise set the default grey `appBar` background. - MainWebViewActivity.appBar.setBackgroundDrawable(ContextCompat.getDrawable(privacyBrowserContext, R.color.gray_100)); } } }