From 29be356e36321f854704f0fb93e04383f65f5424 Mon Sep 17 00:00:00 2001 From: Mygod Date: Fri, 29 May 2020 04:32:41 +0800 Subject: [PATCH] Ensure resource is being read from system --- .../main/java/be/mygod/vpnhotspot/net/TetherType.kt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/TetherType.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/TetherType.kt index 2e4ac67f..2b0c3509 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/net/TetherType.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/TetherType.kt @@ -1,7 +1,6 @@ package be.mygod.vpnhotspot.net import android.content.res.Resources -import be.mygod.vpnhotspot.App.Companion.app import be.mygod.vpnhotspot.R import java.util.regex.Pattern @@ -31,21 +30,20 @@ enum class TetherType { * 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 + val system = Resources.getSystem() + usbRegexs = system.getStringArray(system .getIdentifier("config_tether_usb_regexs", "array", "android")) .filterNotNull() .map { it.toPattern() } - wifiRegexs = appRes.getStringArray(sysRes + wifiRegexs = system.getStringArray(system .getIdentifier("config_tether_wifi_regexs", "array", "android")) .filterNotNull() .map { it.toPattern() } - wimaxRegexs = appRes.getStringArray(sysRes + wimaxRegexs = system.getStringArray(system .getIdentifier("config_tether_wimax_regexs", "array", "android")) .filterNotNull() .map { it.toPattern() } - bluetoothRegexs = appRes.getStringArray(sysRes + bluetoothRegexs = system.getStringArray(system .getIdentifier("config_tether_bluetooth_regexs", "array", "android")) .filterNotNull() .map { it.toPattern() }