From 1f50a702bc1742ad773ecd30f10a04ac67fc2d39 Mon Sep 17 00:00:00 2001 From: Andrew Date: Wed, 26 Jun 2024 23:02:45 +0930 Subject: [PATCH] SES-2229 Fix NewMessage ONS timeout error message for real --- .../conversation/start/newmessage/NewMessageViewModel.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/newmessage/NewMessageViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/newmessage/NewMessageViewModel.kt index 31645999f7..b0dc2ec550 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/newmessage/NewMessageViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/newmessage/NewMessageViewModel.kt @@ -20,6 +20,7 @@ import org.session.libsession.snode.SnodeAPI import org.session.libsignal.utilities.PublicKeyValidation import org.session.libsignal.utilities.timeout import org.thoughtcrime.securesms.ui.GetString +import java.util.concurrent.TimeoutException import javax.inject.Inject import kotlin.coroutines.cancellation.CancellationException import kotlin.time.Duration.Companion.seconds @@ -100,8 +101,8 @@ internal class NewMessageViewModel @Inject constructor( private fun Exception.toMessage() = when (this) { is SnodeAPI.Error.Generic -> application.getString(R.string.onsErrorNotRecognized) - is TimeoutCancellationException -> application.getString(R.string.onsErrorUnableToSearch) - else -> localizedMessage ?: application.getString(R.string.fragment_enter_public_key_error_message) + is TimeoutException -> application.getString(R.string.onsErrorUnableToSearch) + else -> application.getString(R.string.fragment_enter_public_key_error_message) } }