diff options
| author | Mikael Magnusson <mikma@users.sourceforge.net> | 2022-03-29 23:51:21 +0200 |
|---|---|---|
| committer | Mikael Magnusson <mikma@users.sourceforge.net> | 2024-01-07 23:52:43 +0100 |
| commit | 26e98083788727ae3b8165a02d60e4e1f32c7506 (patch) | |
| tree | 5985668f037a71ec856a45bfe6ea43fab20c0643 /ui | |
| parent | 00592888182607e8db047e265f9bbe8ef5fef4ed (diff) | |
ui,tunnel: implement http proxy for Android 10+
Allow getting package names of tv apps.
Diffstat (limited to 'ui')
| -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 d895b495..902c6530 100644 --- a/ui/src/main/AndroidManifest.xml +++ b/ui/src/main/AndroidManifest.xml @@ -164,5 +164,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 a677ef58..6be27f94 100644 --- a/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt +++ b/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt @@ -102,7 +102,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) |