diff --git a/kotlin/android/app/src/main/java/dev/firezone/android/tunnel/TunnelService.kt b/kotlin/android/app/src/main/java/dev/firezone/android/tunnel/TunnelService.kt index f9b8bb0c5..40e2696d9 100644 --- a/kotlin/android/app/src/main/java/dev/firezone/android/tunnel/TunnelService.kt +++ b/kotlin/android/app/src/main/java/dev/firezone/android/tunnel/TunnelService.kt @@ -330,16 +330,24 @@ class TunnelService : VpnService() { addAddress(tunnelIpv6Address!!, 128) appRestrictions.getString("allowedApplications")?.let { - Firebase.crashlytics.log("Allowed applications: $it") - it.split(",").forEach { p -> - addAllowedApplication(p.trim()) + if (it.isNotBlank()) { + Firebase.crashlytics.log("Allowed applications: $it") + it.split(",").forEach { p -> + if (p.isNotBlank()) { + addAllowedApplication(p.trim()) + } + } } } appRestrictions.getString("disallowedApplications")?.let { - Firebase.crashlytics.log("Disallowed applications: $it") - it.split(",").forEach { p -> - addDisallowedApplication(p.trim()) + if (it.isNotBlank()) { + Firebase.crashlytics.log("Disallowed applications: $it") + it.split(",").forEach { p -> + if (p.isNotBlank()) { + addDisallowedApplication(p.trim()) + } + } } } diff --git a/kotlin/android/app/src/main/res/values/strings.xml b/kotlin/android/app/src/main/res/values/strings.xml index 778a15ebe..f640aa60c 100644 --- a/kotlin/android/app/src/main/res/values/strings.xml +++ b/kotlin/android/app/src/main/res/values/strings.xml @@ -30,18 +30,36 @@ Error - Oops! Something went wrong. Contact your admin if this issue persists. + + Oops! Something went wrong. Contact your admin if this issue persists. + Ok Enable VPN Permission - Firezone requires the VPN permission in order to route packets from your device to protected resources in a secure manner. All communication is end-to-end encrypted; we can never decrypt or otherwise monitor your communication. Please grant the VPN permission by tapping the button below. + + Firezone requires the VPN permission in order to route packets from your device to protected + resources in a secure manner. All communication is end-to-end encrypted; we can never + decrypt or otherwise monitor your communication. Please grant the VPN permission by tapping + the button below. + Request Permission Signing in requires Chrome browser Token - The token used for authentication. Set this to a service account token to enable headless operation. + + The token used for authentication. + Set this to a service account token to enable headless operation. + Allowed Applications - A comma-separated list of application package IDs that are allowed to use the Firezone tunnel. If this list is empty, all applications are allowed. + + A comma-separated list of application package IDs that are allowed to use the Firezone + tunnel. If this list is empty, all applications are allowed. Either "Allowed Applications" + OR "Disallowed Applications" may be set *but not* both. + Disallowed Applications - A comma-separated list of application package IDs that are disallowed to use the Firezone tunnel and will be routed outside of it. If this list is empty, no applications are disallowed. + A comma-separated list of application + package IDs that are disallowed to use the Firezone tunnel and will be routed outside of it. + If this list is empty, no applications are disallowed. Either "Allowed Applications" OR + "Disallowed Applications" may be set *but not* both. +