From a323baea9b1337ae69c6fb90bbd90f87873192af Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikma@users.sourceforge.net>
Date: Tue, 29 Mar 2022 23:51:21 +0200
Subject: tunnel: implement http proxy for Android 10+

Allow getting package names of tv apps.
---
 ui/src/main/AndroidManifest.xml                                      | 5 +++++
 .../main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'ui/src/main')

diff --git a/ui/src/main/AndroidManifest.xml b/ui/src/main/AndroidManifest.xml
index a7538a6e..904a3402 100644
--- a/ui/src/main/AndroidManifest.xml
+++ b/ui/src/main/AndroidManifest.xml
@@ -142,5 +142,10 @@
             <action android:name="android.intent.action.MAIN" />
             <category android:name="android.intent.category.LAUNCHER" />
         </intent>
+
+        <intent>
+            <action android:name="android.intent.action.MAIN" />
+            <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+        </intent>
     </queries>
 </manifest>
diff --git a/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt
index 401c1a14..f37475c2 100644
--- a/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt
+++ b/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt
@@ -104,7 +104,7 @@ class TunnelEditorFragment : BaseFragment(), MenuProvider {
         }
 
         var httpProxyMenu = binding?.root?.findViewById<TextInputLayout>(R.id.http_proxy_menu)
-        var httpProxyItems = listOf(Constants.HTTP_PROXY_NONE, Constants.HTTP_PROXY_MANUAL) // Constants.HTTP_PROXY_PAC is currently unsupported
+        var httpProxyItems = listOf(Constants.HTTP_PROXY_NONE, Constants.HTTP_PROXY_MANUAL, Constants.HTTP_PROXY_PAC)
         var httpProxyAdapter = MaterialSpinnerAdapter(requireContext(), R.layout.http_proxy_menu_item, httpProxyItems)
         var httpProxyMenuText = httpProxyMenu?.editText as? AutoCompleteTextView
         httpProxyMenuText?.setAdapter(httpProxyAdapter)
-- 
cgit v1.2.3