Date: Tue, 12 Nov 2024 19:16:36 +0100
Subject: [PATCH 4/5] Reorganize cert prompt flow & simplify 'skip' logic to
match
---
.../tech/httptoolkit/android/MainActivity.kt | 106 +++++++++---------
1 file changed, 51 insertions(+), 55 deletions(-)
diff --git a/app/src/main/java/tech/httptoolkit/android/MainActivity.kt b/app/src/main/java/tech/httptoolkit/android/MainActivity.kt
index 2cc706a..6f552de 100644
--- a/app/src/main/java/tech/httptoolkit/android/MainActivity.kt
+++ b/app/src/main/java/tech/httptoolkit/android/MainActivity.kt
@@ -43,7 +43,6 @@ import java.security.cert.X509Certificate
const val START_VPN_REQUEST = 123
-const val START_VPN_REQUEST_NO_CERT = 124
const val INSTALL_CERT_REQUEST = 456
const val SCAN_REQUEST = 789
const val PICK_APPS_REQUEST = 499
@@ -343,48 +342,11 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
Log.i(TAG, if (vpnIntent != null) "got intent" else "no intent")
val vpnNotConfigured = vpnIntent != null
- if (whereIsCertTrusted(config) == null && PROMPTED_CERT_SETUP_SUPPORTED) {
- // The cert isn't trusted, and the VPN may need setup, so there'll be a series of prompts
- // here. Explain them beforehand, so users understand what's going on.
- withContext(Dispatchers.Main) {
- MaterialAlertDialogBuilder(this@MainActivity)
- .setTitle("Enable interception")
- .setIcon(R.drawable.ic_info_circle)
- .setMessage(
- "To intercept traffic from this device, you need to " +
- (if (vpnNotConfigured) "activate HTTP Toolkit's VPN and " else "") +
- "trust your HTTP Toolkit's certificate authority. " +
- "\n\n" +
- "Please accept the following prompts to allow this." +
- if (!isDeviceSecured(applicationContext))
- "\n\n" +
- "Due to Android security requirements, trusting the certificate will " +
- "require you to set a PIN, password or pattern for this device."
- else " To trust the certificate, your device PIN will be required."
- )
- .setPositiveButton("Ok") { _, _ ->
- if (vpnNotConfigured) {
- startActivityForResult(vpnIntent, START_VPN_REQUEST)
- } else {
- onActivityResult(START_VPN_REQUEST, RESULT_OK, null)
- }
- }
- .setNegativeButton("Continue without certificate") { _, _ ->
- if (vpnNotConfigured) {
- startActivityForResult(vpnIntent, START_VPN_REQUEST_NO_CERT)
- } else {
- onActivityResult(START_VPN_REQUEST_NO_CERT, RESULT_OK, null)
- }
- }
- .show()
- }
- } else if (vpnNotConfigured) {
- // In this case the VPN needs setup, but the cert is trusted already, so it's
- // a single confirmation. Pretty clear, no need to explain. This happens if the
- // VPN/app was removed from the device in the past, or when using injected system certs.
+ if (vpnNotConfigured) {
+ // Show the 'Enable the VPN' prompt
startActivityForResult(vpnIntent, START_VPN_REQUEST)
} else {
- // VPN is trusted & cert setup already, lets get to it.
+ // VPN is trusted already, continue
onActivityResult(START_VPN_REQUEST, RESULT_OK, null)
}
@@ -512,7 +474,6 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
Log.i(TAG, "onActivityResult: " + (
when (requestCode) {
START_VPN_REQUEST -> "start-vpn"
- START_VPN_REQUEST_NO_CERT -> "start-vpn-nocrt"
INSTALL_CERT_REQUEST -> "install-cert"
SCAN_REQUEST -> "scan-request"
PICK_APPS_REQUEST -> "pick-apps"
@@ -529,9 +490,6 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
if (requestCode == START_VPN_REQUEST && currentProxyConfig != null) {
Log.i(TAG, "Installing cert...")
ensureCertificateTrusted(currentProxyConfig!!)
- } else if (requestCode == START_VPN_REQUEST_NO_CERT && currentProxyConfig != null) {
- Log.i(TAG, "Ignore cert...")
- onActivityResult(INSTALL_CERT_REQUEST, RESULT_OK, null)
} else if (requestCode == INSTALL_CERT_REQUEST) {
Log.i(TAG ,"Cert installed, checking notification perms...")
ensureNotificationsEnabled()
@@ -656,19 +614,16 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
if (existingTrust == null) {
Log.i(TAG, "Certificate not trusted, prompting to install")
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
- // Android 11+, with no trusted cert: we need to download the cert to Downloads and
- // then tell the user how to install it manually:
- launch { promptToManuallyInstallCert(proxyConfig.certificate) }
- } else {
+ if (PROMPTED_CERT_SETUP_SUPPORTED) {
// Up until Android 11, we can prompt the user to install the CA cert into the user
// CA store. Notably, if the cert is already installed as a system cert but
// disabled, this will get triggered, and will enable the cert, rather than adding
// a normal user cert.
- val certInstallIntent = KeyChain.createInstallIntent()
- certInstallIntent.putExtra(EXTRA_NAME, "HTTP Toolkit CA")
- certInstallIntent.putExtra(EXTRA_CERTIFICATE, proxyConfig.certificate.encoded)
- startActivityForResult(certInstallIntent, INSTALL_CERT_REQUEST)
+ launch { promptToAutoInstallCert(proxyConfig.certificate) }
+ } else {
+ // Android 11+, with no trusted cert: we need to download the cert to Downloads and
+ // then tell the user how to install it manually:
+ launch { promptToManuallyInstallCert(proxyConfig.certificate) }
}
} else {
Log.i(TAG, "Certificate already trusted, continuing")
@@ -676,6 +631,39 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
}
}
+ private suspend fun promptToAutoInstallCert(certificate: Certificate) {
+ withContext(Dispatchers.Main) {
+ MaterialAlertDialogBuilder(this@MainActivity)
+ .setTitle("Enable HTTPS interception")
+ .setIcon(R.drawable.ic_info_circle)
+ .setMessage(
+ "To intercept HTTPS traffic from this device, you need to " +
+ "trust your HTTP Toolkit's certificate authority. " +
+ "\n\n" +
+ "Please accept the following prompts to allow this." +
+ if (!isDeviceSecured(applicationContext))
+ "\n\n" +
+ "Due to Android security requirements, trusting the certificate will " +
+ "require you to set a PIN, password or pattern for this device."
+ else " To trust the certificate, your device PIN will be required."
+ )
+ .setPositiveButton("Install") { _, _ ->
+ val certInstallIntent = KeyChain.createInstallIntent()
+ certInstallIntent.putExtra(EXTRA_NAME, "HTTP Toolkit CA")
+ certInstallIntent.putExtra(EXTRA_CERTIFICATE, certificate.encoded)
+ startActivityForResult(certInstallIntent, INSTALL_CERT_REQUEST)
+ }
+ .setNeutralButton("Skip") { _, _ ->
+ onActivityResult(INSTALL_CERT_REQUEST, RESULT_OK, null)
+ }
+ .setNegativeButton("Cancel") { _, _ ->
+ disconnect()
+ }
+ .setCancelable(false)
+ .show()
+ }
+ }
+
@RequiresApi(Build.VERSION_CODES.Q)
private suspend fun promptToManuallyInstallCert(cert: Certificate, repeatPrompt: Boolean = false) {
if (!repeatPrompt) {
@@ -713,7 +701,12 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
Html.fromHtml(
"""
- Android ${Build.VERSION.RELEASE} doesn't allow automatic certificate setup.
+ ${
+ if (PROMPTED_CERT_SETUP_SUPPORTED)
+ "Automatic certificate installation failed, so it must be done manually."
+ else
+ "Android ${Build.VERSION.RELEASE} doesn't allow automatic certificate setup."
+ }
To allow HTTP Toolkit to intercept HTTPS traffic:
@@ -740,6 +733,9 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
.setPositiveButton("Open security settings") { _, _ ->
startActivityForResult(Intent(Settings.ACTION_SECURITY_SETTINGS), INSTALL_CERT_REQUEST)
}
+ .setNeutralButton("Skip") { _, _ ->
+ onActivityResult(INSTALL_CERT_REQUEST, RESULT_OK, null)
+ }
.setNegativeButton("Cancel") { _, _ ->
disconnect()
}
From bb41a934f4231a46ecf0120654cd9201a3610b6b Mon Sep 17 00:00:00 2001
From: Dmitry Kazantsev <0rufim0@gmail.com>
Date: Wed, 13 Nov 2024 16:03:15 +0300
Subject: [PATCH 5/5] Fix Android TV icon for old tv boxes
---
.../{drawable => drawable-nodpi}/ic_tv_banner.png | Bin
1 file changed, 0 insertions(+), 0 deletions(-)
rename app/src/main/res/{drawable => drawable-nodpi}/ic_tv_banner.png (100%)
diff --git a/app/src/main/res/drawable/ic_tv_banner.png b/app/src/main/res/drawable-nodpi/ic_tv_banner.png
similarity index 100%
rename from app/src/main/res/drawable/ic_tv_banner.png
rename to app/src/main/res/drawable-nodpi/ic_tv_banner.png