From cf987872859280e2319a13cc7657b323b9615545 Mon Sep 17 00:00:00 2001 From: Mygod Date: Thu, 9 Mar 2023 23:16:45 -0500 Subject: [PATCH] Update weird supported tethering types filtering --- README.md | 1 - .../main/java/be/mygod/vpnhotspot/net/TetheringManager.kt | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index f8e6aa52..f194d989 100644 --- a/README.md +++ b/README.md @@ -227,7 +227,6 @@ Greylisted/blacklisted APIs or internal constants: (some constants are hardcoded * (since API 30) `Landroid/net/TetheringManager;->TETHERING_ETHERNET:I,sdk,system-api,test-api` * `Landroid/net/TetheringManager;->TETHERING_USB:I,sdk,system-api,test-api` * `Landroid/net/TetheringManager;->TETHERING_WIFI:I,sdk,system-api,test-api` -* (since API 31) `Landroid/net/TetheringManager;->TETHERING_WIFI_P2P:I,sdk,system-api,test-api` * `Landroid/net/TetheringManager;->TETHER_ERROR_*:I,sdk,system-api,test-api` * (since API 30) `Landroid/net/TetheringManager;->TETHER_ERROR_NO_CHANGE_TETHERING_PERMISSION:I,sdk,system-api,test-api` * (since API 30) `Landroid/net/TetheringManager;->TETHER_HARDWARE_OFFLOAD_FAILED:I,sdk,system-api,test-api` diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/TetheringManager.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/TetheringManager.kt index 08f74b24..a84032bc 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/net/TetheringManager.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/TetheringManager.kt @@ -153,8 +153,6 @@ object TetheringManager { */ @RequiresApi(30) const val TETHERING_ETHERNET = 5 - @RequiresApi(31) // TETHERING_WIFI_P2P - private val expectedTypes = setOf(TETHERING_WIFI, TETHERING_USB, TETHERING_BLUETOOTH, 3, TETHERING_ETHERNET) @get:RequiresApi(30) private val clazz by lazy { Class.forName("android.net.TetheringManager") } @@ -412,8 +410,9 @@ object TetheringManager { */ @TargetApi(31) fun onSupportedTetheringTypes(supportedTypes: Set) { - if ((supportedTypes - expectedTypes).isNotEmpty()) Timber.w(Exception( - "Unexpected supported tethering types: ${supportedTypes.joinToString()}")) + val filtered = supportedTypes.filter { it !in 0..5 } + if (filtered.isNotEmpty()) Timber.w(Exception( + "Unexpected supported tethering types: ${filtered.joinToString()}")) } /**