From 03819a7a9bba4dc3e688c9b3b4ff8f0f956b143e Mon Sep 17 00:00:00 2001 From: Florent Azavant Date: Mon, 13 Jan 2025 16:00:09 +0100 Subject: [PATCH] display `Unexpected error: {exception message}` instead of `Unknown error` upon login --- lib/l10n/intl_messages.arb | 10 ++++++++++ lib/main/localizations/app_localizations.dart | 6 ++++++ lib/main/utils/toast_manager.dart | 6 +++++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/lib/l10n/intl_messages.arb b/lib/l10n/intl_messages.arb index cbbcd7955..f1eaad3fd 100644 --- a/lib/l10n/intl_messages.arb +++ b/lib/l10n/intl_messages.arb @@ -120,6 +120,16 @@ "placeholders_order": [], "placeholders": {} }, + "unexpectedError": "Unexpected error: {errorMessage}", + "@unexpectedError": { + "type": "text", + "placeholders_order": [ + "errorMessage" + ], + "placeholders": { + "errorMessage": {} + } + }, "search_folder": "Search folder", "@search_folder": { "type": "text", diff --git a/lib/main/localizations/app_localizations.dart b/lib/main/localizations/app_localizations.dart index 5f701cdee..a29e63d0d 100644 --- a/lib/main/localizations/app_localizations.dart +++ b/lib/main/localizations/app_localizations.dart @@ -114,6 +114,12 @@ class AppLocalizations { name: 'unknownError'); } + String unexpectedError(String errorMessage) { + return Intl.message('Unexpected error: $errorMessage', + name: 'unexpectedError', + args: [errorMessage]); + } + String get search_folder { return Intl.message( 'Search folder', diff --git a/lib/main/utils/toast_manager.dart b/lib/main/utils/toast_manager.dart index 2cd39b5cf..3869b320f 100644 --- a/lib/main/utils/toast_manager.dart +++ b/lib/main/utils/toast_manager.dart @@ -50,7 +50,11 @@ class ToastManager { } else if (exception is NoNetworkError) { return AppLocalizations.of(context).youAreOffline; } else { - return null; + try { + return AppLocalizations.of(context).unexpectedError(exception.message); + } catch(_) { + return AppLocalizations.of(context).unexpectedError(exception.toString()); + } } }