From a5adff4b654ec2596396d531318a3f592b871ac5 Mon Sep 17 00:00:00 2001 From: Mygod Date: Thu, 2 Jul 2020 06:27:34 +0800 Subject: [PATCH] Discard if some regexs are missing --- .../main/java/be/mygod/vpnhotspot/net/TetherType.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 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 0c64f6f6..5b2b5287 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/net/TetherType.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/TetherType.kt @@ -42,10 +42,12 @@ enum class TetherType(@DrawableRes val icon: Int) { @RequiresApi(30) // unused on lower APIs val listener = Event0() - private fun Pair.getRegexs(name: String) = second - .getStringArray(second.getIdentifier(name, "array", first)) - .filterNotNull() - .map { it.toPattern() } + private fun Pair.getRegexs(name: String) = second.getIdentifier(name, "array", first).let { + if (it == 0) { + Timber.i("$name is empty") + emptyList() + } else second.getStringArray(it).filterNotNull().map { it.toPattern() } + } @RequiresApi(30) private fun updateRegexs() = synchronized(this) {