Update to SDK 29 so we can use setHttpProxy to capture more traffic

On Android 10+, this should allow us to capture HTTP(S) sent to
_any_ port, not just to the hardcoded 80/443/8080/etc list.

Author: pimterry

.travis.yml

@@ -2,8 +2,8 @@ language: android
 dist: trusty
 android:
   components:
-  - build-tools-29.0.2
-  - android-28
+  - build-tools-29.0.3
+  - android-29
 before_install:
 - openssl aes-256-cbc -K $encrypted_410c058128c0_key -iv $encrypted_410c058128c0_iv
   -in android-travis-cert-store.enc -out ./android-travis-cert-store.jks -d
@@ -12,7 +12,7 @@ script:
 - jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -storepass $CERT_STORE_PWD
   -keypass $CERT_STORE_PWD -keystore ./android-travis-cert-store.jks app/build/outputs/apk/release/app-release-unsigned.apk
   $CERT_ALIAS
-- ${ANDROID_HOME}/build-tools/29.0.2/zipalign -v 4 app/build/outputs/apk/release/app-release-unsigned.apk ./httptoolkit.apk
+- ${ANDROID_HOME}/build-tools/29.0.3/zipalign -v 4 app/build/outputs/apk/release/app-release-unsigned.apk ./httptoolkit.apk
 deploy:
   provider: releases
   api_key:

app/build.gradle

@@ -4,12 +4,12 @@ apply plugin: 'kotlin-android-extensions'
 
 android {
 
-    compileSdkVersion 28
-    buildToolsVersion "29.0.2"
+    compileSdkVersion 29
+    buildToolsVersion "29.0.3"
     defaultConfig {
         applicationId "tech.httptoolkit.android.v1"
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 9
         versionName "1.0.0-alpha9"
 

app/src/main/java/tech/httptoolkit/android/ProxyVpnService.kt

@@ -5,6 +5,7 @@ import android.content.Intent
 import android.app.*
 import android.content.pm.PackageManager
 import android.graphics.BitmapFactory
+import android.net.ProxyInfo
 import android.os.Build
 import android.os.ParcelFileDescriptor
 import android.util.Log
@@ -148,6 +149,15 @@ class ProxyVpnService : VpnService(), IProtectSocket {
             vpnInterface = Builder()
                 .addAddress(VPN_IP_ADDRESS, 32)
                 .addRoute(ALL_ROUTES, 0)
+                .apply {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                        // Where possible, we want to explicitly set the proxy in addition to
+                        // manually redirecting traffic. This is useful because it captures HTTP sent
+                        // to non-default ports. We still need to do both though, as not all clients
+                        // will use the proxy settings.
+                        setHttpProxy(ProxyInfo.buildDirectProxy(proxyConfig.ip, proxyConfig.port))
+                    }
+                }
 
                 .setMtu(MAX_PACKET_LEN) // Limit the packet size to the buffer used by ProxyVpnRunnable
                 .setBlocking(true) // We use a blocking loop to read in ProxyVpnRunnable