From da7d8a2f09f24b627799d913aff108a52fc6e61a Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 13 Jul 2021 09:58:22 +1000 Subject: [PATCH] Make error more descriptive --- .../java/org/thoughtcrime/securesms/database/Storage.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt index 0335bbe5ff..ccb54fc4a6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt @@ -17,6 +17,7 @@ import org.session.libsession.messaging.sending_receiving.data_extraction.DataEx import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel import org.session.libsession.messaging.utilities.UpdateMessageData +import org.session.libsession.snode.OnionRequestAPI import org.session.libsession.utilities.* import org.session.libsession.utilities.Address.Companion.fromSerialized import org.session.libsession.utilities.recipients.Recipient @@ -331,7 +332,13 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context, smsDatabase.markAsSentFailed(messageRecord.getId()) } if (error.localizedMessage != null) { - DatabaseFactory.getLokiMessageDatabase(context).setErrorMessage(messageRecord.getId(), error.localizedMessage!!) + val message: String + if (error is OnionRequestAPI.HTTPRequestFailedAtDestinationException && error.statusCode == 429) { + message = "Rate limited." + } else { + message = error.localizedMessage!! + } + DatabaseFactory.getLokiMessageDatabase(context).setErrorMessage(messageRecord.getId(), message) } else { DatabaseFactory.getLokiMessageDatabase(context).setErrorMessage(messageRecord.getId(), error.javaClass.simpleName) }