brianhansonxyz/vpnhotspotmod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v2.4' into q-beta

Browse Source
This commit is contained in:
Mygod
2019-05-10 15:14:56 +08:00
parent 34d232afd6 1d6d3b7dcc
commit c8c57d9c95
3 changed files with 54 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mobile/build.gradle
View File

@@ -19,8 +19,8 @@ android {
minSdkVersion 21
targetSdkVersion 28
resConfigs "ru", "zh-rCN"
versionCode 202
versionName "2.4.2"
versionCode 203
versionName "2.4.3"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
javaCompileOptions {
annotationProcessorOptions {

60
mobile/src/main/java/be/mygod/vpnhotspot/net/TetherType.kt
View File

@@ -1,25 +1,54 @@
package be.mygod.vpnhotspot.net
import android.net.ConnectivityManager
import android.content.res.Resources
import be.mygod.vpnhotspot.App.Companion.app
import be.mygod.vpnhotspot.R
import java.util.regex.Pattern
enum class TetherType(val icon: Int, val isWifi: Boolean = false) {
NONE(R.drawable.ic_device_wifi_tethering),
WIFI_P2P(R.drawable.ic_action_settings_input_antenna, true),
USB(R.drawable.ic_device_usb),
WIFI(R.drawable.ic_device_network_wifi, true),
BLUETOOTH(R.drawable.ic_device_bluetooth);
enum class TetherType {
NONE, WIFI_P2P, USB, WIFI, WIMAX, BLUETOOTH;
val icon get() = when (this) {
USB -> R.drawable.ic_device_usb
WIFI_P2P -> R.drawable.ic_action_settings_input_antenna
WIFI, WIMAX -> R.drawable.ic_device_network_wifi
BLUETOOTH -> R.drawable.ic_device_bluetooth
else -> R.drawable.ic_device_wifi_tethering
}
val isWifi get() = when (this) {
WIFI_P2P, WIFI, WIMAX -> true
else -> false
}
companion object {
private fun getRegexs(type: String) =
(ConnectivityManager::class.java.getDeclaredMethod("getTetherable${type}Regexs")
.invoke(app.connectivity) as Array<String?>)
.filterNotNull()
.map { it.toPattern() }
private val usbRegexs = getRegexs("Usb")
private val wifiRegexs = getRegexs("Wifi")
private val bluetoothRegexs = getRegexs("Bluetooth")
private val usbRegexs: List<Pattern>
private val wifiRegexs: List<Pattern>
private val wimaxRegexs: List<Pattern>
private val bluetoothRegexs: List<Pattern>
/**
* Source: https://android.googlesource.com/platform/frameworks/base/+/61fa313/core/res/res/values/config.xml#328
*/
init {
val appRes = app.resources
val sysRes = Resources.getSystem()
usbRegexs = appRes.getStringArray(sysRes
.getIdentifier("config_tether_usb_regexs", "array", "android"))
.filterNotNull()
.map { it.toPattern() }
wifiRegexs = appRes.getStringArray(sysRes
.getIdentifier("config_tether_wifi_regexs", "array", "android"))
.filterNotNull()
.map { it.toPattern() }
wimaxRegexs = appRes.getStringArray(sysRes
.getIdentifier("config_tether_wimax_regexs", "array", "android"))
.filterNotNull()
.map { it.toPattern() }
bluetoothRegexs = appRes.getStringArray(sysRes
.getIdentifier("config_tether_bluetooth_regexs", "array", "android"))
.filterNotNull()
.map { it.toPattern() }
}
/**
* Based on: https://android.googlesource.com/platform/frameworks/base/+/0e3d092/services/core/java/com/android/server/connectivity/Tethering.java#311
@@ -30,6 +59,7 @@ enum class TetherType(val icon: Int, val isWifi: Boolean = false) {
wifiRegexs.any { it.matcher(iface).matches() } -> WIFI
usbRegexs.any { it.matcher(iface).matches() } -> USB
bluetoothRegexs.any { it.matcher(iface).matches() } -> BLUETOOTH
wimaxRegexs.any { it.matcher(iface).matches() } -> WIMAX
else -> NONE
}
}