From 3c834ac8e3828d3ac731e1568ddecd8f0c144b99 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 7 Apr 2023 15:22:00 +0200 Subject: ui: always show visible localized error messages Signed-off-by: Jason A. Donenfeld --- ui/src/main/java/com/wireguard/android/util/ErrorMessages.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ui') diff --git a/ui/src/main/java/com/wireguard/android/util/ErrorMessages.kt b/ui/src/main/java/com/wireguard/android/util/ErrorMessages.kt index 27495b60..66027d95 100644 --- a/ui/src/main/java/com/wireguard/android/util/ErrorMessages.kt +++ b/ui/src/main/java/com/wireguard/android/util/ErrorMessages.kt @@ -92,8 +92,8 @@ object ErrorMessages { rootCause is ChecksumException -> { resources.getString(R.string.error_qr_checksum) } - rootCause.message != null -> { - rootCause.message!! + rootCause.localizedMessage != null -> { + rootCause.localizedMessage!! } else -> { val errorType = rootCause.javaClass.simpleName @@ -109,7 +109,7 @@ object ErrorMessages { if (kfe!!.type == KeyFormatException.Type.LENGTH) return resources.getString(KFE_FORMAT_MAP.getValue(kfe.format)) } else if (bce.cause is ParseException) { val pe = bce.cause as ParseException? - if (pe!!.message != null) return ": ${pe.message}" + if (pe!!.localizedMessage != null) return ": ${pe.localizedMessage}" } else if (bce.location == BadConfigException.Location.LISTEN_PORT) { return resources.getString(R.string.bad_config_explanation_udp_port) } else if (bce.location == BadConfigException.Location.MTU) { -- cgit v1.2.3