From 9edb90d52a00386c75d0417301843f341928238c Mon Sep 17 00:00:00 2001 From: Mygod Date: Fri, 29 May 2020 03:57:50 +0800 Subject: [PATCH 1/2] Update dependencies --- build.gradle.kts | 2 +- mobile/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 1ea35a00..2e49fb45 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:4.0.0-rc01") + classpath("com.android.tools.build:gradle:4.0.0") classpath("com.github.ben-manes:gradle-versions-plugin:0.28.0") classpath("com.google.firebase:firebase-crashlytics-gradle:2.1.1") classpath("com.google.android.gms:oss-licenses-plugin:0.10.2") diff --git a/mobile/build.gradle.kts b/mobile/build.gradle.kts index d04956da..8e02790f 100644 --- a/mobile/build.gradle.kts +++ b/mobile/build.gradle.kts @@ -83,7 +83,7 @@ dependencies { implementation("com.android.billingclient:billing-ktx:2.2.1") implementation("com.github.topjohnwu.libsu:core:2.5.1") implementation("com.google.android.gms:play-services-oss-licenses:17.0.0") - implementation("com.google.android.material:material:1.1.0") + implementation("com.google.android.material:material:1.2.0-beta01") implementation("com.google.firebase:firebase-analytics-ktx:17.4.2") implementation("com.google.firebase:firebase-crashlytics:17.0.0") implementation("com.google.zxing:core:3.4.0") From 29be356e36321f854704f0fb93e04383f65f5424 Mon Sep 17 00:00:00 2001 From: Mygod Date: Fri, 29 May 2020 04:32:41 +0800 Subject: [PATCH 2/2] 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() }