diff --git a/README.md b/README.md index 4e0fb53e..396bd9f2 100644 --- a/README.md +++ b/README.md @@ -153,7 +153,6 @@ Greylisted/blacklisted APIs or internal constants: (some constants are hardcoded * (prior to API 30) `Landroid/net/ConnectivityManager;->getLastTetherError(Ljava/lang/String;)I,max-target-r` * (since API 30) `Landroid/net/ConnectivityModuleConnector;->IN_PROCESS_SUFFIX:Ljava/lang/String;` * (since API 30) `Landroid/net/TetheringManager$TetheringEventCallback;->onTetherableInterfaceRegexpsChanged(Landroid/net/TetheringManager$TetheringInterfaceRegexps;)V,blocked` -* (since API 30) `Landroid/net/TetheringManager;->TETHERING_WIGIG:I,blocked` * (since API 31) `Landroid/net/wifi/SoftApConfiguration$Builder;->setUserConfiguration(Z)Landroid/net/wifi/SoftApConfiguration$Builder;,blocked` * (since API 31) `Landroid/net/wifi/SoftApConfiguration;->BAND_TYPES:[I,blocked` * (since API 31) `Landroid/net/wifi/SoftApInfo;->getApInstanceIdentifier()Ljava/lang/String;,blocked` diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml index 0dc395d0..6330f35c 100644 --- a/mobile/src/main/AndroidManifest.xml +++ b/mobile/src/main/AndroidManifest.xml @@ -209,22 +209,6 @@ android:name="android.service.quicksettings.TOGGLEABLE_TILE" android:value="true" /> - - - - - - { TetherManager.ViewHolder(ListitemInterfaceBinding.inflate(inflater, parent, false)) } diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetherManager.kt b/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetherManager.kt index 685ee034..2d05e581 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetherManager.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetherManager.kt @@ -362,15 +362,6 @@ sealed class TetherManager(protected val parent: TetheringFragment) : Manager(), override fun start() = TetheringManager.startTethering(TetheringManager.TETHERING_NCM, true, this) override fun stop() = TetheringManager.stopTethering(TetheringManager.TETHERING_NCM, this::onException) } - @RequiresApi(30) - class WiGig(parent: TetheringFragment) : TetherManager(parent) { - override val title get() = parent.getString(R.string.tethering_manage_wigig) - override val tetherType get() = TetherType.WIGIG - override val type get() = VIEW_TYPE_WIGIG - - override fun start() = TetheringManager.startTethering(TetheringManager.TETHERING_WIGIG, true, this) - override fun stop() = TetheringManager.stopTethering(TetheringManager.TETHERING_WIGIG, this::onException) - } @Suppress("DEPRECATION") @Deprecated("Not usable since API 26, malfunctioning on API 25") diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt index 6253db9f..dd0add5d 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt @@ -66,9 +66,7 @@ class TetheringFragment : Fragment(), ServiceConnection, Toolbar.OnMenuItemClick } @get:RequiresApi(30) private val tetherManagers30 by lazy @TargetApi(30) { - listOf(TetherManager.Ethernet(this@TetheringFragment), - TetherManager.Ncm(this@TetheringFragment), - TetherManager.WiGig(this@TetheringFragment)) + listOf(TetherManager.Ethernet(this@TetheringFragment), TetherManager.Ncm(this@TetheringFragment)) } private val wifiManagerLegacy by lazy { TetherManager.WifiLegacy(this@TetheringFragment) } diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringTileService.kt b/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringTileService.kt index 18442497..0c9d9197 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringTileService.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringTileService.kt @@ -236,14 +236,6 @@ sealed class TetheringTileService : IpNeighbourMonitoringTileService(), Tetherin override fun start() = TetheringManager.startTethering(TetheringManager.TETHERING_NCM, true, this) override fun stop() = TetheringManager.stopTethering(TetheringManager.TETHERING_NCM, this::onException) } - @RequiresApi(30) - class WiGig : TetheringTileService() { - override val labelString get() = R.string.tethering_manage_wigig - override val tetherType get() = TetherType.WIGIG - - override fun start() = TetheringManager.startTethering(TetheringManager.TETHERING_WIGIG, true, this) - override fun stop() = TetheringManager.stopTethering(TetheringManager.TETHERING_WIGIG, this::onException) - } @Suppress("DEPRECATION") @Deprecated("Not usable since API 25") 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 8fc28bec..0521e7b4 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/net/TetheringManager.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/TetheringManager.kt @@ -165,14 +165,6 @@ object TetheringManager { */ @RequiresApi(30) const val TETHERING_ETHERNET = 5 - /** - * WIGIG tethering type. Use a separate type to prevent - * conflicts with TETHERING_WIFI - * This type is only used internally by the tethering module - * @hide - */ - @RequiresApi(30) - const val TETHERING_WIGIG = 6 @get:RequiresApi(30) private val clazz by lazy { Class.forName("android.net.TetheringManager") }