TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-27 12:05:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

SES-2229 Fix NewMessage ONS timeout error message for real

Browse Source
This commit is contained in:
Andrew 2024-06-26 23:02:45 +09:30
parent f2e72d794b
commit 1f50a702bc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/conversation/start/newmessage/NewMessageViewModel.kt
View File

@ -20,6 +20,7 @@ import org.session.libsession.snode.SnodeAPI
import org.session.libsignal.utilities.PublicKeyValidation import org.session.libsignal.utilities.PublicKeyValidation
import org.session.libsignal.utilities.timeout import org.session.libsignal.utilities.timeout
import org.thoughtcrime.securesms.ui.GetString import org.thoughtcrime.securesms.ui.GetString
import java.util.concurrent.TimeoutException
import javax.inject.Inject import javax.inject.Inject
import kotlin.coroutines.cancellation.CancellationException import kotlin.coroutines.cancellation.CancellationException
import kotlin.time.Duration.Companion.seconds import kotlin.time.Duration.Companion.seconds
@ -100,8 +101,8 @@ internal class NewMessageViewModel @Inject constructor(
private fun Exception.toMessage() = when (this) { private fun Exception.toMessage() = when (this) {
is SnodeAPI.Error.Generic -> application.getString(R.string.onsErrorNotRecognized) is SnodeAPI.Error.Generic -> application.getString(R.string.onsErrorNotRecognized)
is TimeoutCancellationException -> application.getString(R.string.onsErrorUnableToSearch) is TimeoutException -> application.getString(R.string.onsErrorUnableToSearch)
else -> localizedMessage ?: application.getString(R.string.fragment_enter_public_key_error_message) else -> application.getString(R.string.fragment_enter_public_key_error_message)
} }
} }