diff options
| author | Mikael Magnusson <mikma@users.sourceforge.net> | 2022-03-29 23:51:21 +0200 |
|---|---|---|
| committer | Mikael Magnusson <mikma@users.sourceforge.net> | 2023-04-04 23:08:18 +0200 |
| commit | d30de1298cdca5617cc65662c64ad834172c3416 (patch) | |
| tree | 5443739710f1f811bd4baef472909e582e12b5b7 /ui/src | |
| parent | 9c4bdf604fbdf5e1d9922fb5440c1ff46398619e (diff) | |
ui,tunnel: implement http proxy for Android 10+
Allow getting package names of tv apps.
Diffstat (limited to 'ui/src')
| -rw-r--r-- | ui/src/main/AndroidManifest.xml | 5 | ||||
| -rw-r--r-- | ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt | 2 |
2 files changed, 6 insertions, 1 deletions
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 e8617c93..9597fef6 100644 --- a/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt +++ b/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt @@ -105,7 +105,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) |